Merge branch 'sm/mv-dry-run-update' into maint
Code clean-up.
* sm/mv-dry-run-update:
mv: remove unneeded 'if (!show_only)'
t7001: add test case for --dry-run
diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..611ab47
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,169 @@
+# This file is an example configuration for clang-format 5.0.
+#
+# Note that this style definition should only be understood as a hint
+# for writing new code. The rules are still work-in-progress and does
+# not yet exactly match the style we have in the existing code.
+
+# Use tabs whenever we need to fill whitespace that spans at least from one tab
+# stop to the next one.
+UseTab: Always
+TabWidth: 8
+IndentWidth: 8
+ContinuationIndentWidth: 8
+ColumnLimit: 80
+
+# C Language specifics
+Language: Cpp
+
+# Align parameters on the open bracket
+# someLongFunction(argument1,
+# argument2);
+AlignAfterOpenBracket: Align
+
+# Don't align consecutive assignments
+# int aaaa = 12;
+# int b = 14;
+AlignConsecutiveAssignments: false
+
+# Don't align consecutive declarations
+# int aaaa = 12;
+# double b = 3.14;
+AlignConsecutiveDeclarations: false
+
+# Align escaped newlines as far left as possible
+# #define A \
+# int aaaa; \
+# int b; \
+# int cccccccc;
+AlignEscapedNewlines: Left
+
+# Align operands of binary and ternary expressions
+# int aaa = bbbbbbbbbbb +
+# cccccc;
+AlignOperands: true
+
+# Don't align trailing comments
+# int a; // Comment a
+# int b = 2; // Comment b
+AlignTrailingComments: false
+
+# By default don't allow putting parameters onto the next line
+# myFunction(foo, bar, baz);
+AllowAllParametersOfDeclarationOnNextLine: false
+
+# Don't allow short braced statements to be on a single line
+# if (a) not if (a) return;
+# return;
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: false
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+
+# By default don't add a line break after the return type of top-level functions
+# int foo();
+AlwaysBreakAfterReturnType: None
+
+# Pack as many parameters or arguments onto the same line as possible
+# int myFunction(int aaaaaaaaaaaa, int bbbbbbbb,
+# int cccc);
+BinPackArguments: true
+BinPackParameters: true
+
+# Attach braces to surrounding context except break before braces on function
+# definitions.
+# void foo()
+# {
+# if (true) {
+# } else {
+# }
+# };
+BreakBeforeBraces: Linux
+
+# Break after operators
+# int valuve = aaaaaaaaaaaaa +
+# bbbbbb -
+# ccccccccccc;
+BreakBeforeBinaryOperators: None
+BreakBeforeTernaryOperators: false
+
+# Don't break string literals
+BreakStringLiterals: false
+
+# Use the same indentation level as for the switch statement.
+# Switch statement body is always indented one level more than case labels.
+IndentCaseLabels: false
+
+# Don't indent a function definition or declaration if it is wrapped after the
+# type
+IndentWrappedFunctionNames: false
+
+# Align pointer to the right
+# int *a;
+PointerAlignment: Right
+
+# Don't insert a space after a cast
+# x = (int32)y; not x = (int32) y;
+SpaceAfterCStyleCast: false
+
+# Insert spaces before and after assignment operators
+# int a = 5; not int a=5;
+# a += 42; a+=42;
+SpaceBeforeAssignmentOperators: true
+
+# Put a space before opening parentheses only after control statement keywords.
+# void f() {
+# if (true) {
+# f();
+# }
+# }
+SpaceBeforeParens: ControlStatements
+
+# Don't insert spaces inside empty '()'
+SpaceInEmptyParentheses: false
+
+# The number of spaces before trailing line comments (// - comments).
+# This does not affect trailing block comments (/* - comments).
+SpacesBeforeTrailingComments: 1
+
+# Don't insert spaces in casts
+# x = (int32) y; not x = ( int32 ) y;
+SpacesInCStyleCastParentheses: false
+
+# Don't insert spaces inside container literals
+# var arr = [1, 2, 3]; not var arr = [ 1, 2, 3 ];
+SpacesInContainerLiterals: false
+
+# Don't insert spaces after '(' or before ')'
+# f(arg); not f( arg );
+SpacesInParentheses: false
+
+# Don't insert spaces after '[' or before ']'
+# int a[5]; not int a[ 5 ];
+SpacesInSquareBrackets: false
+
+# Insert a space after '{' and before '}' in struct initializers
+Cpp11BracedListStyle: false
+
+# A list of macros that should be interpreted as foreach loops instead of as
+# function calls.
+ForEachMacros: ['for_each_string_list_item']
+
+# The maximum number of consecutive empty lines to keep.
+MaxEmptyLinesToKeep: 1
+
+# No empty line at the start of a block.
+KeepEmptyLinesAtTheStartOfBlocks: false
+
+# Penalties
+# This decides what order things should be done if a line is too long
+PenaltyBreakAssignment: 10
+PenaltyBreakBeforeFirstCallParameter: 30
+PenaltyBreakComment: 10
+PenaltyBreakFirstLessLess: 0
+PenaltyBreakString: 10
+PenaltyExcessCharacter: 100
+PenaltyReturnTypeOnItsOwnLine: 5
+
+# Don't sort #include's
+SortIncludes: false
diff --git a/.mailmap b/.mailmap
index 224db83..7c71e88 100644
--- a/.mailmap
+++ b/.mailmap
@@ -113,6 +113,7 @@
Junio C Hamano <gitster@pobox.com> <junio@twinsun.com>
Junio C Hamano <gitster@pobox.com> <junkio@cox.net>
Junio C Hamano <gitster@pobox.com> <junkio@twinsun.com>
+Kaartic Sivaraam <kaartic.sivaraam@gmail.com> <kaarticsivaraam91196@gmail.com>
Karl Wiberg <kha@treskal.com> Karl Hasselström
Karl Wiberg <kha@treskal.com> <kha@yoghurt.hemma.treskal.com>
Karsten Blees <blees@dcon.de> <karsten.blees@dcon.de>
diff --git a/.travis.yml b/.travis.yml
index fead995..5f5ee4f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -21,49 +21,32 @@
- git-svn
- apache2
-env:
- global:
- - DEVELOPER=1
- # The Linux build installs the defined dependency versions below.
- # The OS X build installs the latest available versions. Keep that
- # in mind when you encounter a broken OS X build!
- - LINUX_P4_VERSION="16.2"
- - LINUX_GIT_LFS_VERSION="1.5.2"
- - DEFAULT_TEST_TARGET=prove
- - GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
- - GIT_TEST_OPTS="--verbose-log"
- - GIT_TEST_CLONE_2GB=YesPlease
- # t9810 occasionally fails on Travis CI OS X
- # t9816 occasionally fails with "TAP out of sequence errors" on Travis CI OS X
- - GIT_SKIP_TESTS="t9810 t9816"
-
matrix:
include:
- - env: GETTEXT_POISON=YesPlease
+ - env: jobname=GETTEXT_POISON
os: linux
compiler:
addons:
before_install:
- - env: Windows
+ - env: jobname=Windows
os: linux
compiler:
addons:
before_install:
- before_script:
script:
- >
test "$TRAVIS_REPO_SLUG" != "git/git" ||
ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
after_failure:
- - env: Linux32
+ - env: jobname=Linux32
os: linux
compiler:
+ addons:
services:
- docker
before_install:
- before_script:
script: ci/run-linux32-docker.sh
- - env: Static Analysis
+ - env: jobname=StaticAnalysis
os: linux
compiler:
addons:
@@ -71,10 +54,9 @@
packages:
- coccinelle
before_install:
- # "before_script" that builds Git is inherited from base job
script: ci/run-static-analysis.sh
after_failure:
- - env: Documentation
+ - env: jobname=Documentation
os: linux
compiler:
addons:
@@ -83,13 +65,11 @@
- asciidoc
- xmlto
before_install:
- before_script:
script: ci/test-documentation.sh
after_failure:
before_install: ci/install-dependencies.sh
-before_script: ci/run-build.sh
-script: ci/run-tests.sh
+script: ci/run-build-and-tests.sh
after_failure: ci/print-test-failures.sh
notifications:
diff --git a/Documentation/.gitignore b/Documentation/.gitignore
index 2c8b2d6..c7096f1 100644
--- a/Documentation/.gitignore
+++ b/Documentation/.gitignore
@@ -11,3 +11,4 @@
cmds-*.txt
mergetools-*.txt
manpage-base-url.xsl
+SubmittingPatches.txt
diff --git a/Documentation/Makefile b/Documentation/Makefile
index 2415e0d..4ae9ba5 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -39,6 +39,7 @@
MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
MAN_XML = $(patsubst %.txt,%.xml,$(MAN_TXT))
MAN_HTML = $(patsubst %.txt,%.html,$(MAN_TXT))
+GIT_MAN_REF = master
OBSOLETE_HTML += everyday.html
OBSOLETE_HTML += git-remote-helpers.html
@@ -67,6 +68,8 @@
API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technical/api-index.txt, $(wildcard technical/api-*.txt)))
SP_ARTICLES += $(API_DOCS)
+TECH_DOCS += SubmittingPatches
+TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
TECH_DOCS += technical/index-format
TECH_DOCS += technical/pack-format
@@ -180,6 +183,7 @@
ASCIIDOC_CONF =
ASCIIDOC_HTML = xhtml5
ASCIIDOC_DOCBOOK = docbook45
+ASCIIDOC_EXTRA += -acompat-mode
ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
DBLATEX_COMMON =
@@ -322,6 +326,7 @@
$(RM) *.pdf
$(RM) howto-index.txt howto/*.html doc.dep
$(RM) technical/*.html technical/api-index.txt
+ $(RM) SubmittingPatches.txt
$(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) manpage-base-url.xsl
@@ -360,6 +365,9 @@
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt
+SubmittingPatches.txt: SubmittingPatches
+ $(QUIET_GEN) cp $< $@
+
XSLT = docbook.xsl
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
@@ -430,14 +438,14 @@
then echo "git-manpages repository must exist at $(MAN_REPO)"; exit 1; fi
quick-install-man: require-manrepo
- '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir)
+ '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(MAN_REPO) $(DESTDIR)$(mandir) $(GIT_MAN_REF)
require-htmlrepo::
@if test ! -d $(HTML_REPO); \
then echo "git-htmldocs repository must exist at $(HTML_REPO)"; exit 1; fi
quick-install-html: require-htmlrepo
- '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir)
+ '$(SHELL_PATH_SQ)' ./install-doc-quick.sh $(HTML_REPO) $(DESTDIR)$(htmldir) $(GIT_MAN_REF)
print-man1:
@for i in $(MAN1_TXT); do echo $$i; done
diff --git a/Documentation/RelNotes/2.15.0.txt b/Documentation/RelNotes/2.15.0.txt
new file mode 100644
index 0000000..cdd761b
--- /dev/null
+++ b/Documentation/RelNotes/2.15.0.txt
@@ -0,0 +1,508 @@
+Git 2.15 Release Notes
+======================
+
+Backward compatibility notes and other notable changes.
+
+ * Use of an empty string as a pathspec element that is used for
+ 'everything matches' is still warned and Git asks users to use a
+ more explicit '.' for that instead. The hope is that existing
+ users will not mind this change, and eventually the warning can be
+ turned into a hard error, upgrading the deprecation into removal of
+ this (mis)feature. That is now scheduled to happen in Git v2.16,
+ the next major release after this one.
+
+ * Git now avoids blindly falling back to ".git" when the setup
+ sequence said we are _not_ in Git repository. A corner case that
+ happens to work right now may be broken by a call to BUG().
+ We've tried hard to locate such cases and fixed them, but there
+ might still be cases that need to be addressed--bug reports are
+ greatly appreciated.
+
+ * "branch --set-upstream" that has been deprecated in Git 1.8 has
+ finally been retired.
+
+
+Updates since v2.14
+-------------------
+
+UI, Workflows & Features
+
+ * An example that is now obsolete has been removed from a sample hook,
+ and an old example in it that added a sign-off manually has been
+ improved to use the interpret-trailers command.
+
+ * The advice message given when "git rebase" stops for conflicting
+ changes has been improved.
+
+ * The "rerere-train" script (in contrib/) learned the "--overwrite"
+ option to allow overwriting existing recorded resolutions.
+
+ * "git contacts" (in contrib/) now lists the address on the
+ "Reported-by:" trailer to its output, in addition to those on
+ S-o-b: and other trailers, to make it easier to notify (and thank)
+ the original bug reporter.
+
+ * "git rebase", especially when it is run by mistake and ends up
+ trying to replay many changes, spent long time in silence. The
+ command has been taught to show progress report when it spends
+ long time preparing these many changes to replay (which would give
+ the user a chance to abort with ^C).
+
+ * "git merge" learned a "--signoff" option to add the Signed-off-by:
+ trailer with the committer's name.
+
+ * "git diff" learned to optionally paint new lines that are the same
+ as deleted lines elsewhere differently from genuinely new lines.
+
+ * "git interpret-trailers" learned to take the trailer specifications
+ from the command line that overrides the configured values.
+
+ * "git interpret-trailers" has been taught a "--parse" and a few
+ other options to make it easier for scripts to grab existing
+ trailer lines from a commit log message.
+
+ * The "--format=%(trailers)" option "git log" and its friends take
+ learned to take the 'unfold' and 'only' modifiers to normalize its
+ output, e.g. "git log --format=%(trailers:only,unfold)".
+
+ * "gitweb" shows a link to visit the 'raw' contents of blobs in the
+ history overview page.
+
+ * "[gc] rerereResolved = 5.days" used to be invalid, as the variable
+ is defined to take an integer counting the number of days. It now
+ is allowed.
+
+ * The code to acquire a lock on a reference (e.g. while accepting a
+ push from a client) used to immediately fail when the reference is
+ already locked---now it waits for a very short while and retries,
+ which can make it succeed if the lock holder was holding it during
+ a read-only operation.
+
+ * "branch --set-upstream" that has been deprecated in Git 1.8 has
+ finally been retired.
+
+ * The codepath to call external process filter for smudge/clean
+ operation learned to show the progress meter.
+
+ * "git rev-parse" learned "--is-shallow-repository", that is to be
+ used in a way similar to existing "--is-bare-repository" and
+ friends.
+
+ * "git describe --match <pattern>" has been taught to play well with
+ the "--all" option.
+
+ * "git branch" learned "-c/-C" to create a new branch by copying an
+ existing one.
+
+ * Some commands (most notably "git status") makes an opportunistic
+ update when performing a read-only operation to help optimize later
+ operations in the same repository. The new "--no-optional-locks"
+ option can be passed to Git to disable them.
+
+ * "git for-each-ref --format=..." learned a new format element,
+ %(trailers), to show only the commit log trailer part of the log
+ message.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * Conversion from uchar[20] to struct object_id continues.
+
+ * Start using selected c99 constructs in small, stable and
+ essential part of the system to catch people who care about
+ older compilers that do not grok them.
+
+ * The filter-process interface learned to allow a process with long
+ latency give a "delayed" response.
+
+ * Many uses of comparison callback function the hashmap API uses
+ cast the callback function type when registering it to
+ hashmap_init(), which defeats the compile time type checking when
+ the callback interface changes (e.g. gaining more parameters).
+ The callback implementations have been updated to take "void *"
+ pointers and cast them to the type they expect instead.
+
+ * Because recent Git for Windows do come with a real msgfmt, the
+ build procedure for git-gui has been updated to use it instead of a
+ hand-rolled substitute.
+
+ * "git grep --recurse-submodules" has been reworked to give a more
+ consistent output across submodule boundary (and do its thing
+ without having to fork a separate process).
+
+ * A helper function to read a single whole line into strbuf
+ mistakenly triggered OOM error at EOF under certain conditions,
+ which has been fixed.
+
+ * The "ref-store" code reorganization continues.
+
+ * "git commit" used to discard the index and re-read from the filesystem
+ just in case the pre-commit hook has updated it in the middle; this
+ has been optimized out when we know we do not run the pre-commit hook.
+ (merge 680ee550d7 kw/commit-keep-index-when-pre-commit-is-not-run later to maint).
+
+ * Updates to the HTTP layer we made recently unconditionally used
+ features of libCurl without checking the existence of them, causing
+ compilation errors, which has been fixed. Also migrate the code to
+ check feature macros, not version numbers, to cope better with
+ libCurl that vendor ships with backported features.
+
+ * The API to start showing progress meter after a short delay has
+ been simplified.
+ (merge 8aade107dd jc/simplify-progress later to maint).
+
+ * Code clean-up to avoid mixing values read from the .gitmodules file
+ and values read from the .git/config file.
+
+ * We used to spend more than necessary cycles allocating and freeing
+ piece of memory while writing each index entry out. This has been
+ optimized.
+
+ * Platforms that ship with a separate sha1 with collision detection
+ library can link to it instead of using the copy we ship as part of
+ our source tree.
+
+ * Code around "notes" have been cleaned up.
+ (merge 3964281524 mh/notes-cleanup later to maint).
+
+ * The long-standing rule that an in-core lockfile instance, once it
+ is used, must not be freed, has been lifted and the lockfile and
+ tempfile APIs have been updated to reduce the chance of programming
+ errors.
+
+ * Our hashmap implementation in hashmap.[ch] is not thread-safe when
+ adding a new item needs to expand the hashtable by rehashing; add
+ an API to disable the automatic rehashing to work it around.
+
+ * Many of our programs consider that it is OK to release dynamic
+ storage that is used throughout the life of the program by simply
+ exiting, but this makes it harder to leak detection tools to avoid
+ reporting false positives. Plug many existing leaks and introduce
+ a mechanism for developers to mark that the region of memory
+ pointed by a pointer is not lost/leaking to help these tools.
+
+ * As "git commit" to conclude a conflicted "git merge" honors the
+ commit-msg hook, "git merge" that records a merge commit that
+ cleanly auto-merges should, but it didn't.
+
+ * The codepath for "git merge-recursive" has been cleaned up.
+
+ * Many leaks of strbuf have been fixed.
+
+ * "git imap-send" has our own implementation of the protocol and also
+ can use more recent libCurl with the imap protocol support. Update
+ the latter so that it can use the credential subsystem, and then
+ make it the default option to use, so that we can eventually
+ deprecate and remove the former.
+
+ * "make style" runs git-clang-format to help developers by pointing
+ out coding style issues.
+
+ * A test to demonstrate "git mv" failing to adjust nested submodules
+ has been added.
+ (merge c514167df2 hv/mv-nested-submodules-test later to maint).
+
+ * On Cygwin, "ulimit -s" does not report failure but it does not work
+ at all, which causes an unexpected success of some tests that
+ expect failures under a limited stack situation. This has been
+ fixed.
+
+ * Many codepaths have been updated to squelch -Wimplicit-fallthrough
+ warnings from Gcc 7 (which is a good code hygiene).
+
+ * Add a helper for DLL loading in anticipation for its need in a
+ future topic RSN.
+
+ * "git status --ignored", when noticing that a directory without any
+ tracked path is ignored, still enumerated all the ignored paths in
+ the directory, which is unnecessary. The codepath has been
+ optimized to avoid this overhead.
+
+ * The final batch to "git rebase -i" updates to move more code from
+ the shell script to C has been merged.
+
+ * Operations that do not touch (majority of) packed refs have been
+ optimized by making accesses to packed-refs file lazy; we no longer
+ pre-parse everything, and an access to a single ref in the
+ packed-refs does not touch majority of irrelevant refs, either.
+
+ * Add comment to clarify that the style file is meant to be used with
+ clang-5 and the rules are still work in progress.
+
+ * Many variables that points at a region of memory that will live
+ throughout the life of the program have been marked with UNLEAK
+ marker to help the leak checkers concentrate on real leaks..
+
+ * Plans for weaning us off of SHA-1 has been documented.
+
+ * A new "oidmap" API has been introduced and oidset API has been
+ rewritten to use it.
+
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.14
+-----------------
+
+ * "%C(color name)" in the pretty print format always produced ANSI
+ color escape codes, which was an early design mistake. They now
+ honor the configuration (e.g. "color.ui = never") and also tty-ness
+ of the output medium.
+
+ * The http.{sslkey,sslCert} configuration variables are to be
+ interpreted as a pathname that honors "~[username]/" prefix, but
+ weren't, which has been fixed.
+
+ * Numerous bugs in walking of reflogs via "log -g" and friends have
+ been fixed.
+
+ * "git commit" when seeing an totally empty message said "you did not
+ edit the message", which is clearly wrong. The message has been
+ corrected.
+
+ * When a directory is not readable, "gitweb" fails to build the
+ project list. Work this around by skipping such a directory.
+
+ * Some versions of GnuPG fails to kill gpg-agent it auto-spawned
+ and such a left-over agent can interfere with a test. Work it
+ around by attempting to kill one before starting a new test.
+
+ * A recently added test for the "credential-cache" helper revealed
+ that EOF detection done around the time the connection to the cache
+ daemon is torn down were flaky. This was fixed by reacting to
+ ECONNRESET and behaving as if we got an EOF.
+
+ * "git log --tag=no-such-tag" showed log starting from HEAD, which
+ has been fixed---it now shows nothing.
+
+ * The "tag.pager" configuration variable was useless for those who
+ actually create tag objects, as it interfered with the use of an
+ editor. A new mechanism has been introduced for commands to enable
+ pager depending on what operation is being carried out to fix this,
+ and then "git tag -l" is made to run pager by default.
+
+ * "git push --recurse-submodules $there HEAD:$target" was not
+ propagated down to the submodules, but now it is.
+
+ * Commands like "git rebase" accepted the --rerere-autoupdate option
+ from the command line, but did not always use it. This has been
+ fixed.
+
+ * "git clone --recurse-submodules --quiet" did not pass the quiet
+ option down to submodules.
+
+ * Test portability fix for OBSD.
+
+ * Portability fix for OBSD.
+
+ * "git am -s" has been taught that some input may end with a trailer
+ block that is not Signed-off-by: and it should refrain from adding
+ an extra blank line before adding a new sign-off in such a case.
+
+ * "git svn" used with "--localtime" option did not compute the tz
+ offset for the timestamp in question and instead always used the
+ current time, which has been corrected.
+
+ * Memory leak in an error codepath has been plugged.
+
+ * "git stash -u" used the contents of the committed version of the
+ ".gitignore" file to decide which paths are ignored, even when the
+ file has local changes. The command has been taught to instead use
+ the locally modified contents.
+
+ * bash 4.4 or newer gave a warning on NUL byte in command
+ substitution done in "git stash"; this has been squelched.
+
+ * "git grep -L" and "git grep --quiet -L" reported different exit
+ codes; this has been corrected.
+
+ * When handshake with a subprocess filter notices that the process
+ asked for an unknown capability, Git did not report what program
+ the offending subprocess was running. This has been corrected.
+
+ * "git apply" that is used as a better "patch -p1" failed to apply a
+ taken from a file with CRLF line endings to a file with CRLF line
+ endings. The root cause was because it misused convert_to_git()
+ that tried to do "safe-crlf" processing by looking at the index
+ entry at the same path, which is a nonsense---in that mode, "apply"
+ is not working on the data in (or derived from) the index at all.
+ This has been fixed.
+
+ * Killing "git merge --edit" before the editor returns control left
+ the repository in a state with MERGE_MSG but without MERGE_HEAD,
+ which incorrectly tells the subsequent "git commit" that there was
+ a squash merge in progress. This has been fixed.
+
+ * "git archive" did not work well with pathspecs and the
+ export-ignore attribute.
+
+ * In addition to "cc: <a@dd.re.ss> # cruft", "cc: a@dd.re.ss # cruft"
+ was taught to "git send-email" as a valid way to tell it that it
+ needs to also send a carbon copy to <a@dd.re.ss> in the trailer
+ section.
+
+ * "git branch -M a b" while on a branch that is completely unrelated
+ to either branch a or branch b misbehaved when multiple worktree
+ was in use. This has been fixed.
+ (merge 31824d180d nd/worktree-kill-parse-ref later to maint).
+
+ * "git gc" and friends when multiple worktrees are used off of a
+ single repository did not consider the index and per-worktree refs
+ of other worktrees as the root for reachability traversal, making
+ objects that are in use only in other worktrees to be subject to
+ garbage collection.
+
+ * A regression to "gitk --bisect" by a recent update has been fixed.
+
+ * "git -c submodule.recurse=yes pull" did not work as if the
+ "--recurse-submodules" option was given from the command line.
+ This has been corrected.
+
+ * Unlike "git commit-tree < file", "git commit-tree -F file" did not
+ pass the contents of the file verbatim and instead completed an
+ incomplete line at the end, if exists. The latter has been updated
+ to match the behaviour of the former.
+
+ * Many codepaths did not diagnose write failures correctly when disks
+ go full, due to their misuse of write_in_full() helper function,
+ which have been corrected.
+ (merge f48ecd38cb jk/write-in-full-fix later to maint).
+
+ * "git help co" now says "co is aliased to ...", not "git co is".
+ (merge b3a8076e0d ks/help-alias-label later to maint).
+
+ * "git archive", especially when used with pathspec, stored an empty
+ directory in its output, even though Git itself never does so.
+ This has been fixed.
+
+ * API error-proofing which happens to also squelch warnings from GCC.
+
+ * The explanation of the cut-line in the commit log editor has been
+ slightly tweaked.
+ (merge 8c4b1a3593 ks/commit-do-not-touch-cut-line later to maint).
+
+ * "git gc" tries to avoid running two instances at the same time by
+ reading and writing pid/host from and to a lock file; it used to
+ use an incorrect fscanf() format when reading, which has been
+ corrected.
+
+ * The scripts to drive TravisCI has been reorganized and then an
+ optimization to avoid spending cycles on a branch whose tip is
+ tagged has been implemented.
+ (merge 8376eb4a8f ls/travis-scriptify later to maint).
+
+ * The test linter has been taught that we do not like "echo -e".
+
+ * Code cmp.std.c nitpick.
+
+ * A regression fix for 2.11 that made the code to read the list of
+ alternate object stores overrun the end of the string.
+ (merge f0f7bebef7 jk/info-alternates-fix later to maint).
+
+ * "git describe --match" learned to take multiple patterns in v2.13
+ series, but the feature ignored the patterns after the first one
+ and did not work at all. This has been fixed.
+
+ * "git filter-branch" cannot reproduce a history with a tag without
+ the tagger field, which only ancient versions of Git allowed to be
+ created. This has been corrected.
+ (merge b2c1ca6b4b ic/fix-filter-branch-to-handle-tag-without-tagger later to maint).
+
+ * "git cat-file --textconv" started segfaulting recently, which
+ has been corrected.
+
+ * The built-in pattern to detect the "function header" for HTML did
+ not match <H1>..<H6> elements without any attributes, which has
+ been fixed.
+
+ * "git mailinfo" was loose in decoding quoted printable and produced
+ garbage when the two letters after the equal sign are not
+ hexadecimal. This has been fixed.
+
+ * The machinery to create xdelta used in pack files received the
+ sizes of the data in size_t, but lost the higher bits of them by
+ storing them in "unsigned int" during the computation, which is
+ fixed.
+
+ * The delta format used in the packfile cannot reference data at
+ offset larger than what can be expressed in 4-byte, but the
+ generator for the data failed to make sure the offset does not
+ overflow. This has been corrected.
+
+ * The documentation for '-X<option>' for merges was misleadingly
+ written to suggest that "-s theirs" exists, which is not the case.
+
+ * "git fast-export" with -M/-C option issued "copy" instruction on a
+ path that is simultaneously modified, which was incorrect.
+ (merge b3e8ca89cf jt/fast-export-copy-modify-fix later to maint).
+
+ * Many codepaths have been updated to squelch -Wsign-compare
+ warnings.
+ (merge 071bcaab64 rj/no-sign-compare later to maint).
+
+ * Memory leaks in various codepaths have been plugged.
+ (merge 4d01a7fa65 ma/leakplugs later to maint).
+
+ * Recent versions of "git rev-parse --parseopt" did not parse the
+ option specification that does not have the optional flags (*=?!)
+ correctly, which has been corrected.
+ (merge a6304fa4c2 bc/rev-parse-parseopt-fix later to maint).
+
+ * The checkpoint command "git fast-import" did not flush updates to
+ refs and marks unless at least one object was created since the
+ last checkpoint, which has been corrected, as these things can
+ happen without any new object getting created.
+ (merge 30e215a65c er/fast-import-dump-refs-on-checkpoint later to maint).
+
+ * Spell the name of our system as "Git" in the output from
+ request-pull script.
+
+ * Fixes for a handful memory access issues identified by valgrind.
+
+ * Backports a moral equivalent of 2015 fix to the poll() emulation
+ from the upstream gnulib to fix occasional breakages on HPE NonStop.
+
+ * Users with "color.ui = always" in their configuration were broken
+ by a recent change that made plumbing commands to pay attention to
+ them as the patch created internally by "git add -p" were colored
+ (heh) and made unusable. This has been fixed by reverting the
+ offending change.
+
+ * In the "--format=..." option of the "git for-each-ref" command (and
+ its friends, i.e. the listing mode of "git branch/tag"), "%(atom:)"
+ (e.g. "%(refname:)", "%(body:)" used to error out. Instead, treat
+ them as if the colon and an empty string that follows it were not
+ there.
+
+ * An ancient bug that made Git misbehave with creation/renaming of
+ refs has been fixed.
+
+ * "git fetch <there> <src>:<dst>" allows an object name on the <src>
+ side when the other side accepts such a request since Git v2.5, but
+ the documentation was left stale.
+ (merge 83558a412a jc/fetch-refspec-doc-update later to maint).
+
+ * Update the documentation for "git filter-branch" so that the filter
+ options are listed in the same order as they are applied, as
+ described in an earlier part of the doc.
+ (merge 07c4984508 dg/filter-branch-filter-order-doc later to maint).
+
+ * A possible oom error is now caught as a fatal error, instead of
+ continuing and dereferencing NULL.
+ (merge 55d7d15847 ao/path-use-xmalloc later to maint).
+
+ * Other minor doc, test and build updates and code cleanups.
+ (merge f094b89a4d ma/parse-maybe-bool later to maint).
+ (merge 6cdf8a7929 ma/ts-cleanups later to maint).
+ (merge 7560f547e6 ma/up-to-date later to maint).
+ (merge 0db3dc75f3 rs/apply-epoch later to maint).
+ (merge 276d0e35c0 ma/split-symref-update-fix later to maint).
+ (merge f777623514 ks/branch-tweak-error-message-for-extra-args later to maint).
+ (merge 33f3c683ec ks/verify-filename-non-option-error-message-tweak later to maint).
+ (merge 7cbbf9d6a2 ls/filter-process-delayed later to maint).
+ (merge 488aa65c8f wk/merge-options-gpg-sign-doc later to maint).
+ (merge e61cb19a27 jc/branch-force-doc-readability-fix later to maint).
+ (merge 32fceba3fd np/config-path-doc later to maint).
+ (merge e38c681fb7 sb/rev-parse-show-superproject-root later to maint).
+ (merge 4f851dc883 sg/rev-list-doc-reorder-fix later to maint).
diff --git a/Documentation/RelNotes/2.15.1.txt b/Documentation/RelNotes/2.15.1.txt
new file mode 100644
index 0000000..ec06704
--- /dev/null
+++ b/Documentation/RelNotes/2.15.1.txt
@@ -0,0 +1,88 @@
+Git v2.15.1 Release Notes
+=========================
+
+Fixes since v2.15
+-----------------
+
+ * TravisCI build updates.
+
+ * "auto" as a value for the columnar output configuration ought to
+ judge "is the output consumed by humans?" with the same criteria as
+ "auto" for coloured output configuration, i.e. either the standard
+ output stream is going to tty, or a pager is in use. We forgot the
+ latter, which has been fixed.
+
+ * The experimental "color moved lines differently in diff output"
+ feature was buggy around "ignore whitespace changes" edges, which
+ has been corrected.
+
+ * Instead of using custom line comparison and hashing functions to
+ implement "moved lines" coloring in the diff output, use the pair
+ of these functions from lower-layer xdiff/ code.
+
+ * Some codepaths did not check for errors when asking what branch the
+ HEAD points at, which have been fixed.
+
+ * "git commit", after making a commit, did not check for errors when
+ asking on what branch it made the commit, which has been corrected.
+
+ * "git status --ignored -u" did not stop at a working tree of a
+ separate project that is embedded in an ignored directory and
+ listed files in that other project, instead of just showing the
+ directory itself as ignored.
+
+ * A broken access to object databases in recent update to "git grep
+ --recurse-submodules" has been fixed.
+
+ * A recent regression in "git rebase -i" that broke execution of git
+ commands from subdirectories via "exec" instruction has been fixed.
+
+ * "git check-ref-format --branch @{-1}" bit a "BUG()" when run
+ outside a repository for obvious reasons; clarify the documentation
+ and make sure we do not even try to expand the at-mark magic in
+ such a case, but still call the validation logic for branch names.
+
+ * Command line completion (in contrib/) update.
+
+ * Description of blame.{showroot,blankboundary,showemail,date}
+ configuration variables have been added to "git config --help".
+
+ * After an error from lstat(), diff_populate_filespec() function
+ sometimes still went ahead and used invalid data in struct stat,
+ which has been fixed.
+
+ * UNC paths are also relevant in Cygwin builds and they are now
+ tested just like Mingw builds.
+
+ * Correct start-up sequence so that a repository could be placed
+ immediately under the root directory again (which was broken at
+ around Git 2.13).
+
+ * The credential helper for libsecret (in contrib/) has been improved
+ to allow possibly prompting the end user to unlock secrets that are
+ currently locked (otherwise the secrets may not be loaded).
+
+ * Updates from GfW project.
+
+ * "git rebase -i" recently started misbehaving when a submodule that
+ is configured with 'submodule.<name>.ignore' is dirty; this has
+ been corrected.
+
+ * Some error messages did not quote filenames shown in it, which have
+ been fixed.
+
+ * Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.
+
+ * We used to add an empty alternate object database to the system
+ that does not help anything; it has been corrected.
+
+ * Error checking in "git imap-send" for empty response has been
+ improved.
+
+ * An ancient bug in "git apply --ignore-space-change" codepath has
+ been fixed.
+
+ * There was a recent semantic mismerge in the codepath to write out a
+ section of a configuration section, which has been corrected.
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.15.2.txt b/Documentation/RelNotes/2.15.2.txt
new file mode 100644
index 0000000..9f7e28f
--- /dev/null
+++ b/Documentation/RelNotes/2.15.2.txt
@@ -0,0 +1,47 @@
+Git v2.15.2 Release Notes
+=========================
+
+Fixes since v2.15.1
+-------------------
+
+ * Recent update to the refs infrastructure implementation started
+ rewriting packed-refs file more often than before; this has been
+ optimized again for most trivial cases.
+
+ * The SubmittingPatches document has been converted to produce an
+ HTML version via AsciiDoc/Asciidoctor.
+
+ * Contrary to the documentation, "git pull -4/-6 other-args" did not
+ ask the underlying "git fetch" to go over IPv4/IPv6, which has been
+ corrected.
+
+ * When "git rebase" prepared an mailbox of changes and fed it to "git
+ am" to replay them, it was confused when a stray "From " happened
+ to be in the log message of one of the replayed changes. This has
+ been corrected.
+
+ * Command line completion (in contrib/) has been taught about the
+ "--copy" option of "git branch".
+
+ * "git apply --inaccurate-eof" when used with "--ignore-space-change"
+ triggered an internal sanity check, which has been fixed.
+
+ * The sequencer machinery (used by "git cherry-pick A..B", and "git
+ rebase -i", among other things) would have lost a commit if stopped
+ due to an unlockable index file, which has been fixed.
+
+ * The three-way merge performed by "git cherry-pick" was confused
+ when a new submodule was added in the meantime, which has been
+ fixed (or "papered over").
+
+ * "git notes" sent its error message to its standard output stream,
+ which was corrected.
+
+ * A few scripts (both in production and tests) incorrectly redirected
+ their error output. These have been corrected.
+
+ * Clarify and enhance documentation for "merge-base --fork-point", as
+ it was clear what it computed but not why/what for.
+
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/RelNotes/2.16.0.txt b/Documentation/RelNotes/2.16.0.txt
new file mode 100644
index 0000000..0c81c59
--- /dev/null
+++ b/Documentation/RelNotes/2.16.0.txt
@@ -0,0 +1,482 @@
+Git 2.16 Release Notes
+======================
+
+Backward compatibility notes and other notable changes.
+
+ * Use of an empty string as a pathspec element that is used for
+ 'everything matches' is now an error.
+
+
+Updates since v2.15
+-------------------
+
+UI, Workflows & Features
+
+ * An empty string as a pathspec element that means "everything"
+ i.e. 'git add ""', is now illegal. We started this by first
+ deprecating and warning a pathspec that has such an element in
+ 2.11 (Nov 2016).
+
+ * A hook script that is set unexecutable is simply ignored. Git
+ notifies when such a file is ignored, unless the message is
+ squelched via advice.ignoredHook configuration.
+
+ * "git pull" has been taught to accept "--[no-]signoff" option and
+ pass it down to "git merge".
+
+ * The "--push-option=<string>" option to "git push" now defaults to a
+ list of strings configured via push.pushOption variable.
+
+ * "gitweb" checks if a directory is searchable with Perl's "-x"
+ operator, which can be enhanced by using "filetest 'access'"
+ pragma, which now we do.
+
+ * "git stash save" has been deprecated in favour of "git stash push".
+
+ * The set of paths output from "git status --ignored" was tied
+ closely with its "--untracked=<mode>" option, but now it can be
+ controlled more flexibly. Most notably, a directory that is
+ ignored because it is listed to be ignored in the ignore/exclude
+ mechanism can be handled differently from a directory that ends up
+ to be ignored only because all files in it are ignored.
+
+ * The remote-helper for talking to MediaWiki has been updated to
+ truncate an overlong pagename so that ".mw" suffix can still be
+ added.
+
+ * The remote-helper for talking to MediaWiki has been updated to
+ work with mediawiki namespaces.
+
+ * The "--format=..." option "git for-each-ref" takes learned to show
+ the name of the 'remote' repository and the ref at the remote side
+ that is affected for 'upstream' and 'push' via "%(push:remotename)"
+ and friends.
+
+ * Doc and message updates to teach users "bisect view" is a synonym
+ for "bisect visualize".
+
+ * "git bisect run" that did not specify any command to run used to go
+ ahead and treated all commits to be tested as 'good'. This has
+ been corrected by making the command error out.
+
+ * The SubmittingPatches document has been converted to produce an
+ HTML version via AsciiDoc/Asciidoctor.
+
+ * We learned to optionally talk to a file system monitor via new
+ fsmonitor extension to speed up "git status" and other operations
+ that need to see which paths have been modified. Currently we only
+ support "watchman". See File System Monitor section of
+ git-update-index(1) for more detail.
+
+ * The "diff" family of commands learned to ignore differences in
+ carriage return at the end of line.
+
+ * Places that know about "sendemail.to", like documentation and shell
+ completion (in contrib/) have been taught about "sendemail.tocmd",
+ too.
+
+ * "git add --renormalize ." is a new and safer way to record the fact
+ that you are correcting the end-of-line convention and other
+ "convert_to_git()" glitches in the in-repository data.
+
+ * "git branch" and "git checkout -b" are now forbidden from creating
+ a branch whose name is "HEAD".
+
+ * "git branch --list" learned to show its output through the pager by
+ default when the output is going to a terminal, which is controlled
+ by the pager.branch configuration variable. This is similar to a
+ recent change to "git tag --list".
+
+ * "git grep -W", "git diff -W" and their friends learned a heuristic
+ to extend a pre-context beyond the line that matches the "function
+ pattern" (aka "diff.*.xfuncname") to include a comment block, if
+ exists, that immediately precedes it.
+
+ * "git config --expiry-date gc.reflogexpire" can read "2.weeks" from
+ the configuration and report it as a timestamp, just like "--int"
+ would read "1k" and report 1024, to help consumption by scripts.
+
+ * The shell completion (in contrib/) learned that "git pull" can take
+ the "--autostash" option.
+
+ * The tagnames "git log --decorate" uses to annotate the commits can
+ now be limited to subset of available refs with the two additional
+ options, --decorate-refs[-exclude]=<pattern>.
+
+ * "git grep" compiled with libpcre2 sometimes triggered a segfault,
+ which is being fixed.
+
+ * "git send-email" tries to see if the sendmail program is available
+ in /usr/lib and /usr/sbin; extend the list of locations to be
+ checked to also include directories on $PATH.
+
+ * "git diff" learned, "--anchored", a variant of the "--patience"
+ algorithm, to which the user can specify which 'unique' line to be
+ used as anchoring points.
+
+ * The way "git worktree add" determines what branch to create from
+ where and checkout in the new worktree has been updated a bit.
+
+ * Ancient part of codebase still shows dots after an abbreviated
+ object name just to show that it is not a full object name, but
+ these ellipses are confusing to people who newly discovered Git
+ who are used to seeing abbreviated object names and find them
+ confusing with the range syntax.
+
+ * With a configuration variable rebase.abbreviateCommands set,
+ "git rebase -i" produces the todo list with a single-letter
+ command names.
+
+ * "git worktree add" learned to run the post-checkout hook, just like
+ "git checkout" does, after the initial checkout.
+
+ * "git svn" has been updated to strip CRs in the commit messages, as
+ recent versions of Subversion rejects them.
+
+ * "git imap-send" did not correctly quote the folder name when
+ making a request to the server, which has been corrected.
+
+ * Error messages from "git rebase" have been somewhat cleaned up.
+
+ * Git has been taught to support an https:// URL used for http.proxy
+ when using recent versions of libcurl.
+
+ * "git merge" learned to pay attention to merge.verifySignatures
+ configuration variable and pretend as if '--verify-signatures'
+ option was given from the command line.
+
+ * "git describe" was taught to dig trees deeper to find a
+ <commit-ish>:<path> that refers to a given blob object.
+
+
+Performance, Internal Implementation, Development Support etc.
+
+ * An earlier update made it possible to use an on-stack in-core
+ lockfile structure (as opposed to having to deliberately leak an
+ on-heap one). Many codepaths have been updated to take advantage
+ of this new facility.
+
+ * Calling cmd_foo() as if it is a general purpose helper function is
+ a no-no. Correct two instances of such to set an example.
+
+ * We try to see if somebody runs our test suite with a shell that
+ does not support "local" like bash/dash does.
+
+ * An early part of piece-by-piece rewrite of "git bisect" in C.
+
+ * GSoC to piece-by-piece rewrite "git submodule" in C.
+
+ * Optimize the code to find shortest unique prefix of object names.
+
+ * Pathspec-limited revision traversal was taught not to keep finding
+ unneeded differences once it knows two trees are different inside
+ given pathspec.
+
+ * Conversion from uchar[20] to struct object_id continues.
+
+ * Code cleanup.
+
+ * A single-word "unsigned flags" in the diff options is being split
+ into a structure with many bitfields.
+
+ * TravisCI build updates.
+
+ * Parts of a test to drive the long-running content filter interface
+ has been split into its own module, hopefully to eventually become
+ reusable.
+
+ * Drop (perhaps overly cautious) sanity check before using the index
+ read from the filesystem at runtime.
+
+ * The build procedure has been taught to avoid some unnecessary
+ instability in the build products.
+
+ * A new mechanism to upgrade the wire protocol in place is proposed
+ and demonstrated that it works with the older versions of Git
+ without harming them.
+
+ * An infrastructure to define what hash function is used in Git is
+ introduced, and an effort to plumb that throughout various
+ codepaths has been started.
+
+ * The code to iterate over loose object files got optimized.
+
+ * An internal function that was left for backward compatibility has
+ been removed, as there is no remaining callers.
+
+ * Historically, the diff machinery for rename detection had a
+ hardcoded limit of 32k paths; this is being lifted to allow users
+ trade cycles with a (possibly) easier to read result.
+
+ * The tracing infrastructure has been optimized for cases where no
+ tracing is requested.
+
+ * In preparation for implementing narrow/partial clone, the object
+ walking machinery has been taught a way to tell it to "filter" some
+ objects from enumeration.
+
+ * A few structures and variables that are implementation details of
+ the decorate API have been renamed and then the API got documented
+ better.
+
+ * Assorted updates for TravisCI integration.
+ (merge 4f26366679 sg/travis-fixes later to maint).
+
+ * Introduce a helper to simplify code to parse a common pattern that
+ expects either "--key" or "--key=<something>".
+
+ * "git version --build-options" learned to report the host CPU and
+ the exact commit object name the binary was built from.
+
+Also contains various documentation updates and code clean-ups.
+
+
+Fixes since v2.15
+-----------------
+
+ * "auto" as a value for the columnar output configuration ought to
+ judge "is the output consumed by humans?" with the same criteria as
+ "auto" for coloured output configuration, i.e. either the standard
+ output stream is going to tty, or a pager is in use. We forgot the
+ latter, which has been fixed.
+
+ * The experimental "color moved lines differently in diff output"
+ feature was buggy around "ignore whitespace changes" edges, which
+ has been corrected.
+
+ * Instead of using custom line comparison and hashing functions to
+ implement "moved lines" coloring in the diff output, use the pair
+ of these functions from lower-layer xdiff/ code.
+
+ * Some codepaths did not check for errors when asking what branch the
+ HEAD points at, which have been fixed.
+
+ * "git commit", after making a commit, did not check for errors when
+ asking on what branch it made the commit, which has been corrected.
+
+ * "git status --ignored -u" did not stop at a working tree of a
+ separate project that is embedded in an ignored directory and
+ listed files in that other project, instead of just showing the
+ directory itself as ignored.
+
+ * A broken access to object databases in recent update to "git grep
+ --recurse-submodules" has been fixed.
+
+ * A recent regression in "git rebase -i" that broke execution of git
+ commands from subdirectories via "exec" instruction has been fixed.
+
+ * A (possibly flakey) test fix.
+
+ * "git check-ref-format --branch @{-1}" bit a "BUG()" when run
+ outside a repository for obvious reasons; clarify the documentation
+ and make sure we do not even try to expand the at-mark magic in
+ such a case, but still call the validation logic for branch names.
+
+ * "git fetch --recurse-submodules" now knows that submodules can be
+ moved around in the superproject in addition to getting updated,
+ and finds the ones that need to be fetched accordingly.
+
+ * Command line completion (in contrib/) update.
+
+ * Description of blame.{showroot,blankboundary,showemail,date}
+ configuration variables have been added to "git config --help".
+
+ * After an error from lstat(), diff_populate_filespec() function
+ sometimes still went ahead and used invalid data in struct stat,
+ which has been fixed.
+
+ * UNC paths are also relevant in Cygwin builds and they are now
+ tested just like Mingw builds.
+
+ * Correct start-up sequence so that a repository could be placed
+ immediately under the root directory again (which was broken at
+ around Git 2.13).
+
+ * The credential helper for libsecret (in contrib/) has been improved
+ to allow possibly prompting the end user to unlock secrets that are
+ currently locked (otherwise the secrets may not be loaded).
+
+ * MinGW updates.
+
+ * Error checking in "git imap-send" for empty response has been
+ improved.
+
+ * Recent update to the refs infrastructure implementation started
+ rewriting packed-refs file more often than before; this has been
+ optimized again for most trivial cases.
+
+ * Some error messages did not quote filenames shown in it, which have
+ been fixed.
+
+ * "git rebase -i" recently started misbehaving when a submodule that
+ is configured with 'submodule.<name>.ignore' is dirty; this has
+ been corrected.
+
+ * Building with NO_LIBPCRE1_JIT did not disable it, which has been fixed.
+
+ * We used to add an empty alternate object database to the system
+ that does not help anything; it has been corrected.
+
+ * Doc update around use of "format-patch --subject-prefix" etc.
+
+ * A fix for an ancient bug in "git apply --ignore-space-change" codepath.
+
+ * Clarify and enhance documentation for "merge-base --fork-point", as
+ it was clear what it computed but not why/what for.
+
+ * A few scripts (both in production and tests) incorrectly redirected
+ their error output. These have been corrected.
+
+ * "git notes" sent its error message to its standard output stream,
+ which was corrected.
+
+ * The three-way merge performed by "git cherry-pick" was confused
+ when a new submodule was added in the meantime, which has been
+ fixed (or "papered over").
+
+ * The sequencer machinery (used by "git cherry-pick A..B", and "git
+ rebase -i", among other things) would have lost a commit if stopped
+ due to an unlockable index file, which has been fixed.
+
+ * "git apply --inaccurate-eof" when used with "--ignore-space-change"
+ triggered an internal sanity check, which has been fixed.
+
+ * Command line completion (in contrib/) has been taught about the
+ "--copy" option of "git branch".
+
+ * When "git rebase" prepared a mailbox of changes and fed it to "git
+ am" to replay them, it was confused when a stray "From " happened
+ to be in the log message of one of the replayed changes. This has
+ been corrected.
+
+ * There was a recent semantic mismerge in the codepath to write out a
+ section of a configuration section, which has been corrected.
+
+ * Mentions of "git-rebase" and "git-am" (dashed form) still remained
+ in end-user visible strings emitted by the "git rebase" command;
+ they have been corrected.
+
+ * Contrary to the documentation, "git pull -4/-6 other-args" did not
+ ask the underlying "git fetch" to go over IPv4/IPv6, which has been
+ corrected.
+
+ * "git checkout --recursive" may overwrite and rewind the history of
+ the branch that happens to be checked out in submodule
+ repositories, which might not be desirable. Detach the HEAD but
+ still allow the recursive checkout to succeed in such a case.
+ (merge 57f22bf997 sb/submodule-recursive-checkout-detach-head later to maint).
+
+ * "git branch --set-upstream" has been deprecated and (sort of)
+ removed, as "--set-upstream-to" is the preferred one these days.
+ The documentation still had "--set-upstream" listed on its
+ synopsis section, which has been corrected.
+ (merge a060f3d3d8 tz/branch-doc-remove-set-upstream later to maint).
+
+ * Internally we use 0{40} as a placeholder object name to signal the
+ codepath that there is no such object (e.g. the fast-forward check
+ while "git fetch" stores a new remote-tracking ref says "we know
+ there is no 'old' thing pointed at by the ref, as we are creating
+ it anew" by passing 0{40} for the 'old' side), and expect that a
+ codepath to locate an in-core object to return NULL as a sign that
+ the object does not exist. A look-up for an object that does not
+ exist however is quite costly with a repository with large number
+ of packfiles. This access pattern has been optimized.
+ (merge 87b5e236a1 jk/fewer-pack-rescan later to maint).
+
+ * In addition to "git stash -m message", the command learned to
+ accept "git stash -mmessage" form.
+ (merge 5675473fcb ph/stash-save-m-option-fix later to maint).
+
+ * @{-N} in "git checkout @{-N}" may refer to a detached HEAD state,
+ but the documentation was not clear about it, which has been fixed.
+ (merge 75ce149575 ks/doc-checkout-previous later to maint).
+
+ * A regression in the progress eye-candy was fixed.
+ (merge 9c5951cacf jk/progress-delay-fix later to maint).
+
+ * The code internal to the recursive merge strategy was not fully
+ prepared to see a path that is renamed to try overwriting another
+ path that is only different in case on case insensitive systems.
+ This does not matter in the current code, but will start to matter
+ once the rename detection logic starts taking hints from nearby
+ paths moving to some directory and moves a new path along with them.
+ (merge 4cba2b0108 en/merge-recursive-icase-removal later to maint).
+
+ * An v2.12-era regression in pathspec match logic, which made it look
+ into submodule tree even when it is not desired, has been fixed.
+ (merge eef3df5a93 bw/pathspec-match-submodule-boundary later to maint).
+
+ * Amending commits in git-gui broke the author name that is non-ascii
+ due to incorrect enconding conversion.
+
+ * Recent update to the submodule configuration code broke "diff-tree"
+ by accidentally stopping to read from the index upfront.
+ (merge fd66bcc31f bw/submodule-config-cleanup later to maint).
+
+ * Git shows a message to tell the user that it is waiting for the
+ user to finish editing when spawning an editor, in case the editor
+ opens to a hidden window or somewhere obscure and the user gets
+ lost.
+ (merge abfb04d0c7 ls/editor-waiting-message later to maint).
+
+ * The "safe crlf" check incorrectly triggered for contents that does
+ not use CRLF as line endings, which has been corrected.
+ (merge 649f1f0948 tb/check-crlf-for-safe-crlf later to maint).
+
+ * "git clone --shared" to borrow from a (secondary) worktree did not
+ work, even though "git clone --local" did. Both are now accepted.
+ (merge b3b05971c1 es/clone-shared-worktree later to maint).
+
+ * The build procedure now allows not just the repositories but also
+ the refs to be used to take pre-formatted manpages and html
+ documents to install.
+ (merge 65289e9dcd rb/quick-install-doc later to maint).
+
+ * Update the shell prompt script (in contrib/) to strip trailing CR
+ from strings read from various "state" files.
+ (merge 041fe8fc83 ra/prompt-eread-fix later to maint).
+
+ * "git merge -s recursive" did not correctly abort when the index is
+ dirty, if the merged tree happened to be the same as the current
+ HEAD, which has been fixed.
+
+ * Bytes with high-bit set were encoded incorrectly and made
+ credential helper fail.
+ (merge 4c267f2ae3 jd/fix-strbuf-add-urlencode-bytes later to maint).
+
+ * "git rebase -p -X<option>" did not propagate the option properly
+ down to underlying merge strategy backend.
+ (merge dd6fb0053c js/fix-merge-arg-quoting-in-rebase-p later to maint).
+
+ * "git merge -s recursive" did not correctly abort when the index is
+ dirty, if the merged tree happened to be the same as the current
+ HEAD, which has been fixed.
+ (merge f309e8e768 ew/empty-merge-with-dirty-index-maint later to maint).
+
+ * Other minor doc, test and build updates and code cleanups.
+ (merge 1a1fc2d5b5 rd/man-prune-progress later to maint).
+ (merge 0ba014035a rd/man-reflog-add-n later to maint).
+ (merge e54b63359f rd/doc-notes-prune-fix later to maint).
+ (merge ff4c9b413a sp/doc-info-attributes later to maint).
+ (merge 7db2cbf4f1 jc/receive-pack-hook-doc later to maint).
+ (merge 5a0526264b tg/t-readme-updates later to maint).
+ (merge 5e83cca0b8 jk/no-optional-locks later to maint).
+ (merge 826c778f7c js/hashmap-update-sample later to maint).
+ (merge 176b2d328c sg/setup-doc-update later to maint).
+ (merge 1b09073514 rs/am-builtin-leakfix later to maint).
+ (merge addcf6cfde rs/fmt-merge-msg-string-leak-fix later to maint).
+ (merge c3ff8f6c14 rs/strbuf-read-once-reset-length later to maint).
+ (merge 6b0eb884f9 db/doc-workflows-neuter-the-maintainer later to maint).
+ (merge 8c87bdfb21 jk/cvsimport-quoting later to maint).
+ (merge 176cb979fe rs/fmt-merge-msg-leakfix later to maint).
+ (merge 5a03360e73 tb/delimit-pretty-trailers-args-with-comma later to maint).
+ (merge d0e6326026 ot/pretty later to maint).
+ (merge 44103f4197 sb/test-helper-excludes later to maint).
+ (merge 170078693f jt/transport-no-more-rsync later to maint).
+ (merge c07b3adff1 bw/path-doc later to maint).
+ (merge bf9d7df950 tz/lib-git-svn-svnserve-tests later to maint).
+ (merge dec366c9a8 sr/http-sslverify-config-doc later to maint).
+ (merge 3f824e91c8 jk/test-suite-tracing later to maint).
+ (merge 1feb061701 db/doc-config-section-names-with-bs later to maint).
+ (merge 74dea0e13c jh/memihash-opt later to maint).
+ (merge 2e9fdc795c ma/bisect-leakfix later to maint).
diff --git a/Documentation/RelNotes/2.16.1.txt b/Documentation/RelNotes/2.16.1.txt
new file mode 100644
index 0000000..66e6436
--- /dev/null
+++ b/Documentation/RelNotes/2.16.1.txt
@@ -0,0 +1,11 @@
+Git v2.16.1 Release Notes
+=========================
+
+Fixes since v2.16
+-----------------
+
+ * "git clone" segfaulted when cloning a project that happens to
+ track two paths that differ only in case on a case insensitive
+ filesystem.
+
+Does not contain any other documentation updates or code clean-ups.
diff --git a/Documentation/RelNotes/2.16.2.txt b/Documentation/RelNotes/2.16.2.txt
new file mode 100644
index 0000000..a216466
--- /dev/null
+++ b/Documentation/RelNotes/2.16.2.txt
@@ -0,0 +1,30 @@
+Git v2.16.2 Release Notes
+=========================
+
+Fixes since v2.16.1
+-------------------
+
+ * An old regression in "git describe --all $annotated_tag^0" has been
+ fixed.
+
+ * "git svn dcommit" did not take into account the fact that a
+ svn+ssh:// URL with a username@ (typically used for pushing) refers
+ to the same SVN repository without the username@ and failed when
+ svn.pushmergeinfo option is set.
+
+ * "git merge -Xours/-Xtheirs" learned to use our/their version when
+ resolving a conflicting updates to a symbolic link.
+
+ * "git clone $there $here" is allowed even when here directory exists
+ as long as it is an empty directory, but the command incorrectly
+ removed it upon a failure of the operation.
+
+ * "git stash -- <pathspec>" incorrectly blew away untracked files in
+ the directory that matched the pathspec, which has been corrected.
+
+ * "git add -p" was taught to ignore local changes to submodules as
+ they do not interfere with the partial addition of regular changes
+ anyway.
+
+
+Also contains various documentation updates and code clean-ups.
diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches
index 558d465..a1d0fec 100644
--- a/Documentation/SubmittingPatches
+++ b/Documentation/SubmittingPatches
@@ -1,40 +1,47 @@
+Submitting Patches
+==================
+
+== Guidelines
+
Here are some guidelines for people who want to contribute their code
to this software.
-(0) Decide what to base your work on.
+[[base-branch]]
+=== Decide what to base your work on.
In general, always base your work on the oldest branch that your
change is relevant to.
- - A bugfix should be based on 'maint' in general. If the bug is not
- present in 'maint', base it on 'master'. For a bug that's not yet
- in 'master', find the topic that introduces the regression, and
- base your work on the tip of the topic.
+* A bugfix should be based on `maint` in general. If the bug is not
+ present in `maint`, base it on `master`. For a bug that's not yet
+ in `master`, find the topic that introduces the regression, and
+ base your work on the tip of the topic.
- - A new feature should be based on 'master' in general. If the new
- feature depends on a topic that is in 'pu', but not in 'master',
- base your work on the tip of that topic.
+* A new feature should be based on `master` in general. If the new
+ feature depends on a topic that is in `pu`, but not in `master`,
+ base your work on the tip of that topic.
- - 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
- to 'next', it's alright to add a note to squash minor corrections
- into the series.
+* 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
+ to `next`, it's alright to add a note to squash minor corrections
+ into the series.
- - In the exceptional case that a new feature depends on several topics
- not in 'master', start working on 'next' or 'pu' privately and send
- 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.
+* In the exceptional case that a new feature depends on several topics
+ not in `master`, start working on `next` or `pu` 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.
- - Some parts of the system have dedicated maintainers with their own
- repositories (see the section "Subsystems" below). Changes to
- these parts should be based on their trees.
+* Some parts of the system have dedicated maintainers with their own
+ repositories (see the section "Subsystems" below). Changes to
+ these parts should be based on their trees.
-To find the tip of a topic branch, run "git log --first-parent
-master..pu" and look for the merge commit. The second parent of this
+To find the tip of a topic branch, run `git log --first-parent
+master..pu` and look for the merge commit. The second parent of this
commit is the tip of the topic branch.
-(1) Make separate commits for logically separate changes.
+[[separate-commits]]
+=== Make separate commits for logically separate changes.
Unless your patch is really trivial, you should not be sending
out a patch that was generated between your working tree and
@@ -58,8 +65,9 @@
to have.
Make sure that you have tests for the bug you are fixing. See
-t/README for guidance.
+`t/README` for guidance.
+[[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
@@ -84,41 +92,45 @@
more welcomed ("teh -> "the"), preferably submitted as independent
patches separate from other documentation changes.
+[[whitespace-check]]
Oh, another thing. We are picky about whitespaces. Make sure your
changes do not trigger errors with the sample pre-commit hook shipped
-in templates/hooks--pre-commit. To help ensure this does not happen,
-run "git diff --check" on your changes before you commit.
+in `templates/hooks--pre-commit`. To help ensure this does not happen,
+run `git diff --check` on your changes before you commit.
-
-(2) Describe your changes well.
+[[describe-changes]]
+=== Describe your changes well.
The first line of the commit message should be a short description (50
-characters is the soft limit, see DISCUSSION in git-commit(1)), and
-should skip the full stop. It is also conventional in most cases to
+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
prefix the first line with "area: " where the area is a filename or
identifier for the general area of the code being modified, e.g.
- . doc: clarify distinction between sign-off and pgp-signing
- . githooks.txt: improve the intro section
+* doc: clarify distinction between sign-off and pgp-signing
+* githooks.txt: improve the intro section
-If in doubt which identifier to use, run "git log --no-merges" on the
+If in doubt which identifier to use, run `git log --no-merges` on the
files you are modifying to see the current conventions.
+[[summary-section]]
It's customary to start the remainder of the first line after "area: "
with a lower-case letter. E.g. "doc: clarify...", not "doc:
Clarify...", or "githooks.txt: improve...", not "githooks.txt:
Improve...".
+[[meaningful-message]]
The body should provide a meaningful commit message, which:
- . explains the problem the change tries to solve, i.e. what is wrong
- with the current code without the change.
+. explains the problem the change tries to solve, i.e. what is wrong
+ with the current code without the change.
- . justifies the way the change solves the problem, i.e. why the
- result with the change is better.
+. justifies the way the change solves the problem, i.e. why the
+ result with the change is better.
- . alternate solutions considered but discarded, if any.
+. alternate solutions considered but discarded, if any.
+[[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
to do frotz", as if you are giving orders to the codebase to change
@@ -126,36 +138,43 @@
without external resources. Instead of giving a URL to a mailing list
archive, summarize the relevant points of the discussion.
+[[commit-reference]]
If you want to reference a previous commit in the history of a stable
branch, use the format "abbreviated sha1 (subject, date)",
with the subject enclosed in a pair of double-quotes, like this:
- Commit f86a374 ("pack-bitmap.c: fix a memleak", 2015-03-30)
- noticed that ...
+....
+ Commit f86a374 ("pack-bitmap.c: fix a memleak", 2015-03-30)
+ noticed that ...
+....
The "Copy commit summary" command of gitk can be used to obtain this
-format, or this invocation of "git show":
+format, or this invocation of `git show`:
- git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit>
+....
+ git show -s --date=short --pretty='format:%h ("%s", %ad)' <commit>
+....
-(3) Generate your patch using Git tools out of your commits.
+[[git-tools]]
+=== Generate your patch using Git tools out of your commits.
Git based diff tools generate unidiff which is the preferred format.
-You do not have to be afraid to use -M option to "git diff" or
-"git format-patch", if your patch involves file renames. The
+You do not have to be afraid to use `-M` option to `git diff` or
+`git format-patch`, if your patch involves file renames. The
receiving end can handle them just fine.
+[[review-patch]]
Please make sure your patch does not add commented out debugging code,
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"
+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.
-
-(4) Sending your patches.
+[[send-patches]]
+=== Sending your patches.
Learn to use format-patch and send-email if possible. These commands
are optimized for the workflow of sending patches, avoiding many ways
@@ -184,14 +203,15 @@
It is a common convention to prefix your subject line with
[PATCH]. This lets people easily distinguish patches from other
-e-mail discussions. Use of additional markers after PATCH and
-the closing bracket to mark the nature of the patch is also
-encouraged. E.g. [PATCH/RFC] is often used when the patch is
-not ready to be applied but it is for discussion, [PATCH v2],
-[PATCH v3] etc. are often seen when you are sending an update to
-what you have previously sent.
+e-mail discussions. Use of markers in addition to PATCH within
+the brackets to describe the nature of the patch is also
+encouraged. E.g. [RFC PATCH] (where RFC stands for "request for
+comments") is often used to indicate a patch needs further
+discussion before being accepted, [PATCH v2], [PATCH v3] etc.
+are often seen when you are sending an update to what you have
+previously sent.
-"git format-patch" command follows the best current practice to
+The `git format-patch` command follows the best current practice to
format the body of an e-mail message. At the beginning of the
patch should come your commit message, ending with the
Signed-off-by: lines, and a line that consists of three dashes,
@@ -199,6 +219,10 @@
you are forwarding a patch from somebody else, optionally, at
the beginning of the e-mail message just before the commit
message starts, you can put a "From: " line to name that person.
+To change the default "[PATCH]" in the subject to "[<text>]", use
+`git format-patch --subject-prefix=<text>`. As a shortcut, you
+can use `--rfc` instead of `--subject-prefix="RFC PATCH"`, or
+`-v <n>` instead of `--subject-prefix="PATCH v<n>"`.
You often want to add additional explanation about the patch,
other than the commit message itself. Place such "cover letter"
@@ -208,6 +232,7 @@
Git-notes and inserted automatically following the three-dash
line via `git format-patch --notes`.
+[[attachment]]
Do not attach the patch as a MIME attachment, compressed or not.
Do not let your e-mail client send quoted-printable. Do not let
your e-mail client send format=flowed which would destroy
@@ -222,6 +247,7 @@
Exception: If your mailer is mangling patches then someone may ask
you to re-send them using MIME, that is OK.
+[[pgp-signature]]
Do not PGP sign your patch. Most likely, your maintainer or other people on the
list would not have your PGP key and would not bother obtaining it anyway.
Your patch is not judged by who you are; a good patch from an unknown origin
@@ -230,28 +256,27 @@
If you really really really really want to do a PGP signed
patch, format it as "multipart/signed", not a text/plain message
-that starts with '-----BEGIN PGP SIGNED MESSAGE-----'. That is
+that starts with `-----BEGIN PGP SIGNED MESSAGE-----`. That is
not a text/plain, it's something else.
Send your patch with "To:" set to the mailing list, with "cc:" listing
people who are involved in the area you are touching (the output from
-"git blame $path" and "git shortlog --no-merges $path" would help to
+`git blame $path` and `git shortlog --no-merges $path` would help to
identify them), to solicit comments and reviews.
-After the list reached a consensus that it is a good idea to apply the
-patch, re-send it with "To:" set to the maintainer [*1*] and "cc:" the
-list [*2*] for inclusion.
+:1: footnote:[The current maintainer: gitster@pobox.com]
+:2: footnote:[The mailing list: git@vger.kernel.org]
-Do not forget to add trailers such as "Acked-by:", "Reviewed-by:" and
-"Tested-by:" lines as necessary to credit people who helped your
+After the list reached a consensus that it is a good idea to apply the
+patch, re-send it with "To:" set to the maintainer{1} and "cc:" the
+list{2} for inclusion.
+
+Do not forget to add trailers such as `Acked-by:`, `Reviewed-by:` and
+`Tested-by:` lines as necessary to credit people who helped your
patch.
- [Addresses]
- *1* The current maintainer: gitster@pobox.com
- *2* The mailing list: git@vger.kernel.org
-
-
-(5) Certify your work by adding your "Signed-off-by: " line
+[[sign-off]]
+=== Certify your work by adding your "Signed-off-by: " line
To improve tracking of who did what, we've borrowed the
"sign-off" procedure from the Linux kernel project on patches
@@ -263,35 +288,39 @@
the right to pass it on as a open-source patch. The rules are
pretty simple: if you can certify the below D-C-O:
- Developer's Certificate of Origin 1.1
+[[dco]]
+.Developer's Certificate of Origin 1.1
+____
+By making a contribution to this project, I certify that:
- By making a contribution to this project, I certify that:
+a. The contribution was created in whole or in part by me and I
+ have the right to submit it under the open source license
+ indicated in the file; or
- (a) The contribution was created in whole or in part by me and I
- have the right to submit it under the open source license
- indicated in the file; or
+b. The contribution is based upon previous work that, to the best
+ of my knowledge, is covered under an appropriate open source
+ license and I have the right under that license to submit that
+ work with modifications, whether created in whole or in part
+ by me, under the same open source license (unless I am
+ permitted to submit under a different license), as indicated
+ in the file; or
- (b) The contribution is based upon previous work that, to the best
- of my knowledge, is covered under an appropriate open source
- license and I have the right under that license to submit that
- work with modifications, whether created in whole or in part
- by me, under the same open source license (unless I am
- permitted to submit under a different license), as indicated
- in the file; or
+c. The contribution was provided directly to me by some other
+ person who certified (a), (b) or (c) and I have not modified
+ it.
- (c) The contribution was provided directly to me by some other
- person who certified (a), (b) or (c) and I have not modified
- it.
-
- (d) I understand and agree that this project and the contribution
- are public and that a record of the contribution (including all
- personal information I submit with it, including my sign-off) is
- maintained indefinitely and may be redistributed consistent with
- this project or the open source license(s) involved.
+d. I understand and agree that this project and the contribution
+ are public and that a record of the contribution (including all
+ personal information I submit with it, including my sign-off) is
+ maintained indefinitely and may be redistributed consistent with
+ this project or the open source license(s) involved.
+____
then you just add a line saying
- Signed-off-by: Random J Developer <random@developer.example.org>
+....
+ Signed-off-by: Random J Developer <random@developer.example.org>
+....
This line can be automatically added by Git if you run the git-commit
command with the -s option.
@@ -302,85 +331,86 @@
place an in-body "From: " line at the beginning to properly attribute
the change to its true author (see (2) above).
+[[real-name]]
Also notice that a real name is used in the Signed-off-by: line. Please
don't hide your real name.
+[[commit-trailers]]
If you like, you can put extra tags at the end:
-1. "Reported-by:" is used to credit someone who found the bug that
- the patch attempts to fix.
-2. "Acked-by:" says that the person who is more familiar with the area
- the patch attempts to modify liked the patch.
-3. "Reviewed-by:", unlike the other tags, can only be offered by the
- reviewer and means that she is completely satisfied that the patch
- is ready for application. It is usually offered only after a
- detailed review.
-4. "Tested-by:" is used to indicate that the person applied the patch
- and found it to have the desired effect.
+. `Reported-by:` is used to credit someone who found the bug that
+ the patch attempts to fix.
+. `Acked-by:` says that the person who is more familiar with the area
+ the patch attempts to modify liked the patch.
+. `Reviewed-by:`, unlike the other tags, can only be offered by the
+ reviewer and means that she is completely satisfied that the patch
+ is ready for application. It is usually offered only after a
+ detailed review.
+. `Tested-by:` is used to indicate that the person applied the patch
+ and found it to have the desired effect.
You can also create your own tag or use one that's in common usage
such as "Thanks-to:", "Based-on-patch-by:", or "Mentored-by:".
-------------------------------------------------
-Subsystems with dedicated maintainers
+== Subsystems with dedicated maintainers
Some parts of the system have dedicated maintainers with their own
repositories.
- - git-gui/ comes from git-gui project, maintained by Pat Thoyts:
+- 'git-gui/' comes from git-gui project, maintained by Pat Thoyts:
- git://repo.or.cz/git-gui.git
+ git://repo.or.cz/git-gui.git
- - gitk-git/ comes from Paul Mackerras's gitk project:
+- 'gitk-git/' comes from Paul Mackerras's gitk project:
- git://ozlabs.org/~paulus/gitk
+ git://ozlabs.org/~paulus/gitk
- - po/ comes from the localization coordinator, Jiang Xin:
+- 'po/' comes from the localization coordinator, Jiang Xin:
https://github.com/git-l10n/git-po/
Patches to these parts should be based on their trees.
-------------------------------------------------
-An ideal patch flow
+[[patch-flow]]
+== An ideal patch flow
Here is an ideal patch flow for this project the current maintainer
suggests to the contributors:
- (0) You come up with an itch. You code it up.
+. You come up with an itch. You code it up.
- (1) Send it to the list and cc people who may need to know about
- the change.
+. Send it to the list and cc people who may need to know about
+ the change.
++
+The people who may need to know are the ones whose code you
+are butchering. These people happen to be the ones who are
+most likely to be knowledgeable enough to help you, but
+they have no obligation to help you (i.e. you ask for help,
+don't demand). +git log -p {litdd} _$area_you_are_modifying_+ would
+help you find out who they are.
- The people who may need to know are the ones whose code you
- are butchering. These people happen to be the ones who are
- most likely to be knowledgeable enough to help you, but
- they have no obligation to help you (i.e. you ask for help,
- don't demand). "git log -p -- $area_you_are_modifying" would
- help you find out who they are.
+. You get comments and suggestions for improvements. You may
+ even get them in a "on top of your change" patch form.
- (2) You get comments and suggestions for improvements. You may
- even get them in a "on top of your change" patch form.
+. Polish, refine, and re-send to the list and the people who
+ spend their time to improve your patch. Go back to step (2).
- (3) Polish, refine, and re-send to the list and the people who
- spend their time to improve your patch. Go back to step (2).
+. The list forms consensus that the last round of your patch is
+ good. Send it to the maintainer and cc the list.
- (4) The list forms consensus that the last round of your patch is
- good. Send it to the maintainer and cc the list.
-
- (5) A topic branch is created with the patch and is merged to 'next',
- and cooked further and eventually graduates to 'master'.
+. A topic branch is created with the patch and is merged to `next`,
+ and cooked further and eventually graduates to `master`.
In any time between the (2)-(3) cycle, the maintainer may pick it up
-from the list and queue it to 'pu', in order to make it easier for
+from the list and queue it to `pu`, in order to make it easier for
people play with it without having to pick up and apply the patch to
their trees themselves.
-------------------------------------------------
-Know the status of your patch after submission
+[[patch-status]]
+== Know the status of your patch after submission
* You can use Git itself to find out when your patch is merged in
- master. 'git pull --rebase' will automatically skip already-applied
+ master. `git pull --rebase` will automatically skip already-applied
patches, and will let you know. This works only if you rebase on top
of the branch in which your patch has been merged (i.e. it will not
tell you if your patch is merged in pu if you rebase on top of
@@ -390,8 +420,8 @@
entitled "What's cooking in git.git" and "What's in git.git" giving
the status of various proposed changes.
---------------------------------------------------
-GitHub-Travis CI hints
+[[travis]]
+== GitHub-Travis CI hints
With an account at GitHub (you can get one for free to work on open
source projects), you can use Travis CI to test your changes on Linux,
@@ -400,25 +430,25 @@
Follow these steps for the initial setup:
- (1) Fork https://github.com/git/git to your GitHub account.
- You can find detailed instructions how to fork here:
- https://help.github.com/articles/fork-a-repo/
+. Fork https://github.com/git/git to your GitHub account.
+ You can find detailed instructions how to fork here:
+ https://help.github.com/articles/fork-a-repo/
- (2) Open the Travis CI website: https://travis-ci.org
+. Open the Travis CI website: https://travis-ci.org
- (3) Press the "Sign in with GitHub" button.
+. Press the "Sign in with GitHub" button.
- (4) Grant Travis CI permissions to access your GitHub account.
- You can find more information about the required permissions here:
- https://docs.travis-ci.com/user/github-oauth-scopes
+. Grant Travis CI permissions to access your GitHub account.
+ You can find more information about the required permissions here:
+ https://docs.travis-ci.com/user/github-oauth-scopes
- (5) Open your Travis CI profile page: https://travis-ci.org/profile
+. Open your Travis CI profile page: https://travis-ci.org/profile
- (6) Enable Travis CI builds for your Git fork.
+. Enable Travis CI builds for your Git fork.
After the initial setup, Travis 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://travis-ci.org/<Your GitHub handle>/git/branches
+branches here: https://travis-ci.org/__<Your GitHub handle>__/git/branches
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 Travis CI job and
@@ -430,17 +460,16 @@
Fix the problem and push your fix to your Git fork. This will trigger
a new Travis CI build to ensure all tests pass.
-
-------------------------------------------------
-MUA specific hints
+[[mua]]
+== MUA specific hints
Some of patches I receive or pick up from the list share common
patterns of breakage. Please make sure your MUA is set up
properly not to corrupt whitespaces.
-See the DISCUSSION section of git-format-patch(1) for hints on
+See the DISCUSSION section of linkgit:git-format-patch[1] for hints on
checking your patch by mailing it to yourself and applying with
-git-am(1).
+linkgit:git-am[1].
While you are at it, check the resulting commit log message from
a trial run of applying the patch. If what is in the resulting
@@ -452,23 +481,24 @@
commit message.
-Pine
-----
+=== Pine
(Johannes Schindelin)
+....
I don't know how many people still use pine, but for those poor
souls it may be good to mention that the quell-flowed-text is
needed for recent versions.
... the "no-strip-whitespace-before-send" option, too. AFAIK it
was introduced in 4.60.
+....
(Linus Torvalds)
+....
And 4.58 needs at least this.
----
diff-tree 8326dd8350be64ac7fc805f6563a1d61ad10d32c (from e886a61f76edf5410573e92e38ce22974f9c40f1)
Author: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon Aug 15 17:23:51 2005 -0700
@@ -490,10 +520,11 @@
+#endif
c |= COMP_EXIT;
break;
-
+....
(Daniel Barkalow)
+....
> A patch to SubmittingPatches, MUA specific help section for
> users of Pine 4.63 would be very much appreciated.
@@ -503,23 +534,21 @@
"no-strip-whitespace-before-send" option, unless the option you have is
"strip-whitespace-before-send", in which case you should avoid checking
it.
+....
+=== Thunderbird, KMail, GMail
-Thunderbird, KMail, GMail
--------------------------
+See the MUA-SPECIFIC HINTS section of linkgit:git-format-patch[1].
-See the MUA-SPECIFIC HINTS section of git-format-patch(1).
+=== Gnus
-Gnus
-----
-
-'|' in the *Summary* buffer can be used to pipe the current
+"|" in the `*Summary*` buffer can be used to pipe the current
message to an external program, and this is a handy way to drive
-"git am". However, if the message is MIME encoded, what is
+`git am`. However, if the message is MIME encoded, what is
piped into the program is the representation you see in your
-*Article* buffer after unwrapping MIME. This is often not what
+`*Article*` buffer after unwrapping MIME. This is often not what
you would want for two reasons. It tends to screw up non ASCII
characters (most notably in people's names), and also
-whitespaces (fatal in patches). Running 'C-u g' to display the
-message in raw form before using '|' to run the pipe can work
+whitespaces (fatal in patches). Running "C-u g" to display the
+message in raw form before using "|" to run the pipe can work
this problem around.
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2271809..0e25b2c 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -41,11 +41,13 @@
--------
Subsection names are case sensitive and can contain any characters except
-newline (doublequote `"` and backslash can be included by escaping them
-as `\"` and `\\`, respectively). Section headers cannot span multiple
-lines. Variables may belong directly to a section or to a given subsection.
-You can have `[section]` if you have `[section "subsection"]`, but you
-don't need to.
+newline and the null byte. Doublequote `"` and backslash can be included
+by escaping them as `\"` and `\\`, respectively. Backslashes preceding
+other characters are dropped when reading; for example, `\t` is read as
+`t` and `\0` is read as `0` Section headers cannot span multiple lines.
+Variables may belong directly to a section or to a given subsection. You
+can have `[section]` if you have `[section "subsection"]`, but you don't
+need to.
There is also a deprecated `[section.subsection]` syntax. With this
syntax, the subsection name is converted to lower-case and is also
@@ -351,6 +353,12 @@
addEmbeddedRepo::
Advice on what to do when you've accidentally added one
git repo inside of another.
+ ignoredHook::
+ Advice shown if an hook is ignored because the hook is not
+ set as executable.
+ waitingForEditor::
+ Print a message to the terminal whenever Git is waiting for
+ editor input from the user.
--
core.fileMode::
@@ -413,6 +421,13 @@
8.3 "short" names.
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].
+
core.trustctime::
If false, the ctime differences between the index and the
working tree are ignored; useful when the inode change time
@@ -776,6 +791,12 @@
If set to "auto", `git-commit` would select a character that is not
the beginning character of any line in existing commit messages.
+core.filesRefLockTimeout::
+ The length of time, in milliseconds, to retry when trying to
+ lock an individual reference. Value 0 means not to retry at
+ all; -1 means to try indefinitely. Default is 100 (i.e.,
+ retry for 100ms).
+
core.packedRefsTimeout::
The length of time, in milliseconds, to retry when trying to
lock the `packed-refs` file. Value 0 means not to retry at
@@ -943,6 +964,23 @@
Tells 'git apply' how to handle whitespaces, in the same way
as the `--whitespace` option. See linkgit:git-apply[1].
+blame.showRoot::
+ Do not treat root commits as boundaries in linkgit:git-blame[1].
+ This option defaults to false.
+
+blame.blankBoundary::
+ Show blank commit object name for boundary commits in
+ linkgit:git-blame[1]. This option defaults to false.
+
+blame.showEmail::
+ Show the author email instead of author name in linkgit:git-blame[1].
+ This option defaults to false.
+
+blame.date::
+ Specifies the format used to output dates in linkgit:git-blame[1].
+ If unset the iso format is used. For supported values,
+ see the discussion of the `--date` option at linkgit:git-log[1].
+
branch.autoSetupMerge::
Tells 'git branch' and 'git checkout' to set up new branches
so that linkgit:git-pull[1] will appropriately merge from the
@@ -1077,14 +1115,25 @@
'git-diff-{asterisk}' plumbing commands. Can be overridden on the
command line with the `--color[=<when>]` option.
+diff.colorMoved::
+ If set to either a valid `<mode>` or a true value, moved lines
+ in a diff are colored differently, for details of valid modes
+ see '--color-moved' in linkgit:git-diff[1]. If simply set to
+ true the default color mode will be used. When set to false,
+ moved lines are not colored.
+
color.diff.<slot>::
Use customized color for diff colorization. `<slot>` specifies
which part of the patch to use the specified color, and is one
of `context` (context text - `plain` is a historical synonym),
`meta` (metainformation), `frag`
(hunk header), 'func' (function in hunk header), `old` (removed lines),
- `new` (added lines), `commit` (commit headers), or `whitespace`
- (highlighting whitespace errors).
+ `new` (added lines), `commit` (commit headers), `whitespace`
+ (highlighting whitespace errors), `oldMoved` (deleted lines),
+ `newMoved` (added lines), `oldMovedDimmed`, `oldMovedAlternative`,
+ `oldMovedAlternativeDimmed`, `newMovedDimmed`, `newMovedAlternative`
+ and `newMovedAlternativeDimmed` (See the '<mode>'
+ setting of '--color-moved' in linkgit:git-diff[1] for details).
color.decorate.<slot>::
Use customized color for 'git log --decorate' output. `<slot>` is one
@@ -1553,11 +1602,13 @@
gc.rerereResolved::
Records of conflicted merge you resolved earlier are
kept for this many days when 'git rerere gc' is run.
+ You can also use more human-readable "1.month.ago", etc.
The default is 60 days. See linkgit:git-rerere[1].
gc.rerereUnresolved::
Records of conflicted merge you have not resolved are
kept for this many days when 'git rerere gc' is run.
+ You can also use more human-readable "1.month.ago", etc.
The default is 15 days. See linkgit:git-rerere[1].
gitcvs.commitMsgAnnotation::
@@ -1919,8 +1970,8 @@
http.sslVerify::
Whether to verify the SSL certificate when fetching or pushing
- over HTTPS. Can be overridden by the `GIT_SSL_NO_VERIFY` environment
- variable.
+ over HTTPS. Defaults to true. Can be overridden by the
+ `GIT_SSL_NO_VERIFY` environment variable.
http.sslCert::
File containing the SSL certificate when fetching or pushing
@@ -2062,15 +2113,40 @@
visited as a result of a redirection do not participate in matching.
ssh.variant::
- Depending on the value of the environment variables `GIT_SSH` or
- `GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git
- auto-detects whether to adjust its command-line parameters for use
- with plink or tortoiseplink, as opposed to the default (OpenSSH).
+ By default, Git determines the command line arguments to use
+ based on the basename of the configured SSH command (configured
+ using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or
+ the config setting `core.sshCommand`). If the basename is
+ unrecognized, Git will attempt to detect support of OpenSSH
+ options by first invoking the configured SSH command with the
+ `-G` (print configuration) option and will subsequently use
+ OpenSSH options (if that is successful) or no options besides
+ the host and remote command (if it fails).
+
-The config variable `ssh.variant` can be set to override this auto-detection;
-valid values are `ssh`, `plink`, `putty` or `tortoiseplink`. Any other value
-will be treated as normal ssh. This setting can be overridden via the
-environment variable `GIT_SSH_VARIANT`.
+The config variable `ssh.variant` can be set to override this detection.
+Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`,
+`tortoiseplink`, `simple` (no options except the host and remote command).
+The default auto-detection can be explicitly requested using the value
+`auto`. Any other value is treated as `ssh`. This setting can also be
+overridden via the environment variable `GIT_SSH_VARIANT`.
++
+The current command-line parameters used for each variant are as
+follows:
++
+--
+
+* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command
+
+* `simple` - [username@]host command
+
+* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command
+
+* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command
+
+--
++
+Except for the `simple` variant, command-line parameters are likely to
+change as git gains new features.
i18n.commitEncoding::
Character encoding the commit messages are stored in; Git itself
@@ -2498,6 +2574,23 @@
`hg` to allow the `git-remote-hg` helper)
--
+protocol.version::
+ Experimental. If set, clients will attempt to communicate with a
+ server using the specified protocol version. If unset, no
+ attempt will be made by the client to communicate using a
+ particular protocol version, this results in protocol version 0
+ being used.
+ Supported versions:
++
+--
+
+* `0` - the original wire protocol.
+
+* `1` - the original wire protocol with the addition of a version string
+ in the initial response from the server.
+
+--
+
pull.ff::
By default, Git does not create an extra merge commit when merging
a commit that is a descendant of the current commit. Instead, the
@@ -2602,6 +2695,35 @@
override a value from a lower-priority config file. An explicit
command-line flag always overrides this config option.
+push.pushOption::
+ When no `--push-option=<option>` argument is given from the
+ command line, `git push` behaves as if each <value> of
+ this variable is given as `--push-option=<value>`.
++
+This is a multi-valued variable, and an empty value can be used in a
+higher priority configuration file (e.g. `.git/config` in a
+repository) to clear the values inherited from a lower priority
+configuration files (e.g. `$HOME/.gitconfig`).
++
+--
+
+Example:
+
+/etc/gitconfig
+ push.pushoption = a
+ push.pushoption = b
+
+~/.gitconfig
+ push.pushoption = c
+
+repo/.git/config
+ push.pushoption =
+ push.pushoption = b
+
+This will result in only b (a and c are cleared).
+
+--
+
push.recurseSubmodules::
Make sure all submodule commits used by the revisions to be pushed
are available on a remote-tracking branch. If the value is 'check'
@@ -2616,36 +2738,7 @@
is retained. You may override this configuration at time of push by
specifying '--recurse-submodules=check|on-demand|no'.
-rebase.stat::
- Whether to show a diffstat of what changed upstream since the last
- rebase. False by default.
-
-rebase.autoSquash::
- If set to true enable `--autosquash` option by default.
-
-rebase.autoStash::
- When set to true, automatically create a temporary stash entry
- before the operation begins, and apply it after the operation
- ends. This means that you can run rebase on a dirty worktree.
- However, use with care: the final stash application after a
- successful rebase might result in non-trivial conflicts.
- Defaults to false.
-
-rebase.missingCommitsCheck::
- If set to "warn", git rebase -i will print a warning if some
- commits are removed (e.g. a line was deleted), however the
- rebase will still proceed. If set to "error", it will print
- the previous warning and stop the rebase, 'git rebase
- --edit-todo' can then be used to correct the error. If set to
- "ignore", no checking is done.
- To drop a commit without warning or error, use the `drop`
- command in the todo-list.
- Defaults to "ignore".
-
-rebase.instructionFormat::
- A format string, as specified in linkgit:git-log[1], to be used for
- the instruction list during an interactive rebase. The format will automatically
- have the long commit hash prepended to the format.
+include::rebase-config.txt[]
receive.advertiseAtomic::
By default, git-receive-pack will advertise the atomic push
@@ -2932,6 +3025,7 @@
sendemail.suppresscc::
sendemail.suppressFrom::
sendemail.to::
+sendemail.tocmd::
sendemail.smtpDomain::
sendemail.smtpServer::
sendemail.smtpServerPort::
@@ -3066,10 +3160,14 @@
See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
submodule.<name>.update::
- The default update procedure for a submodule. This variable
- is populated by `git submodule init` from the
- linkgit:gitmodules[5] file. See description of 'update'
- command in linkgit:git-submodule[1].
+ The method by which a submodule is updated by 'git submodule update',
+ which is the only affected command, others such as
+ 'git checkout --recurse-submodules' are unaffected. It exists for
+ historical reasons, when 'git submodule' was the only command to
+ interact with submodules; settings like `submodule.active`
+ and `pull.rebase` are more specific. It is populated by
+ `git submodule init` from the linkgit:gitmodules[5] file.
+ See description of 'update' command in linkgit:git-submodule[1].
submodule.<name>.branch::
The remote branch name for a submodule, used by `git submodule
@@ -3346,3 +3444,13 @@
Specify a web browser that may be used by some commands.
Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
may use it.
+
+worktree.guessRemote::
+ With `add`, if no branch argument, and neither of `-b` nor
+ `-B` nor `--detach` are given, the command defaults to
+ creating a new branch from HEAD. If `worktree.guessRemote` is
+ set to true, `worktree add` tries to find a remote-tracking
+ branch whose name uniquely matches the new branch name. If
+ such a branch exists, it is checked out and set as "upstream"
+ for the new branch. If no such match can be found, it falls
+ back to creating a new branch from the current HEAD.
diff --git a/Documentation/diff-heuristic-options.txt b/Documentation/diff-heuristic-options.txt
deleted file mode 100644
index d4f3d95..0000000
--- a/Documentation/diff-heuristic-options.txt
+++ /dev/null
@@ -1,5 +0,0 @@
---indent-heuristic::
---no-indent-heuristic::
- These are to help debugging and tuning experimental heuristics
- (which are off by default) that shift diff hunk boundaries to
- make patches easier to read.
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 56dedaf..743af97 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -63,7 +63,12 @@
Synonym for `-p --raw`.
endif::git-format-patch[]
-include::diff-heuristic-options.txt[]
+--indent-heuristic::
+ Enable the heuristic that shift diff hunk boundaries to make patches
+ easier to read. This is the default.
+
+--no-indent-heuristic::
+ Disable the indent heuristic.
--minimal::
Spend extra time to make sure the smallest possible
@@ -75,6 +80,16 @@
--histogram::
Generate a diff using the "histogram diff" algorithm.
+--anchored=<text>::
+ Generate a diff using the "anchored diff" algorithm.
++
+This option may be specified more than once.
++
+If a line exists in both the source and destination, exists only once,
+and starts with this text, this algorithm attempts to prevent it from
+appearing as a deletion or addition in the output. It uses the "patience
+diff" algorithm internally.
+
--diff-algorithm={patience|minimal|histogram|myers}::
Choose a diff algorithm. The variants are as follows:
+
@@ -231,6 +246,40 @@
endif::git-diff[]
It is the same as `--color=never`.
+--color-moved[=<mode>]::
+ Moved lines of code are colored differently.
+ifdef::git-diff[]
+ It can be changed by the `diff.colorMoved` configuration setting.
+endif::git-diff[]
+ The <mode> defaults to 'no' if the option is not given
+ and to 'zebra' if the option with no mode is given.
+ The mode must be one of:
++
+--
+no::
+ Moved lines are not highlighted.
+default::
+ Is a synonym for `zebra`. This may change to a more sensible mode
+ in the future.
+plain::
+ Any line that is added in one location and was removed
+ in another location will be colored with 'color.diff.newMoved'.
+ Similarly 'color.diff.oldMoved' will be used for removed lines
+ that are added somewhere else in the diff. This mode picks up any
+ moved line, but it is not very useful in a review to determine
+ if a block of code was moved without permutation.
+zebra::
+ Blocks of moved text of at least 20 alphanumeric characters
+ are detected greedily. The detected blocks are
+ painted using either the 'color.diff.{old,new}Moved' color or
+ 'color.diff.{old,new}MovedAlternative'. The change between
+ the two colors indicates that a new block was detected.
+dimmed_zebra::
+ Similar to 'zebra', but additional dimming of uninteresting parts
+ of moved code is performed. The bordering lines of two adjacent
+ blocks are considered interesting, the rest is uninteresting.
+--
+
--word-diff[=<mode>]::
Show a word diff, using the <mode> to delimit changed words.
By default, words are delimited by whitespace; see
@@ -420,6 +469,12 @@
+
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.
-S<string>::
Look for differences that change the number of occurrences of
@@ -518,6 +573,9 @@
--text::
Treat all files as text.
+--ignore-cr-at-eol::
+ Ignore carrige-return at the end of line when doing a comparison.
+
--ignore-space-at-eol::
Ignore changes in whitespace at EOL.
diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt
index b700bea..d50fa33 100644
--- a/Documentation/git-add.txt
+++ b/Documentation/git-add.txt
@@ -10,7 +10,7 @@
[verse]
'git add' [--verbose | -v] [--dry-run | -n] [--force | -f] [--interactive | -i] [--patch | -p]
[--edit | -e] [--[no-]all | --[no-]ignore-removal | [--update | -u]]
- [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing]
+ [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--renormalize]
[--chmod=(+|-)x] [--] [<pathspec>...]
DESCRIPTION
@@ -175,6 +175,13 @@
warning (e.g., if you are manually performing operations on
submodules).
+--renormalize::
+ Apply the "clean" process freshly to all tracked files to
+ forcibly add them again to the index. This is useful after
+ changing `core.autocrlf` configuration or the `text` attribute
+ in order to correct files added with wrong CRLF/LF line endings.
+ This option implies `-u`.
+
--chmod=(+|-)x::
Override the executable bit of the added files. The executable
bit is only changed in the index, the files on disk are left
diff --git a/Documentation/git-annotate.txt b/Documentation/git-annotate.txt
index 94be4b8..05fd482 100644
--- a/Documentation/git-annotate.txt
+++ b/Documentation/git-annotate.txt
@@ -23,7 +23,6 @@
OPTIONS
-------
include::blame-options.txt[]
-include::diff-heuristic-options.txt[]
SEE ALSO
--------
diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt
index 631cbd8..4ebc3d3 100644
--- a/Documentation/git-apply.txt
+++ b/Documentation/git-apply.txt
@@ -66,7 +66,7 @@
disables it is in effect), make sure the patch is
applicable to what the current index file records. If
the file to be patched in the working tree is not
- up-to-date, it is flagged as an error. This flag also
+ up to date, it is flagged as an error. This flag also
causes the index file to be updated.
--cached::
@@ -259,7 +259,7 @@
If `--index` is specified (explicitly or implicitly), then the submodule
commits must match the index exactly for the patch to apply. If any
of the submodules are checked-out, then these check-outs are completely
-ignored, i.e., they are not required to be up-to-date or clean and they
+ignored, i.e., they are not required to be up to date or clean and they
are not updated.
If `--index` is not specified, then the submodule commits in the patch
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt
index 6c42abf..4a1417b 100644
--- a/Documentation/git-bisect.txt
+++ b/Documentation/git-bisect.txt
@@ -23,7 +23,7 @@
git bisect terms [--term-good | --term-bad]
git bisect skip [(<rev>|<range>)...]
git bisect reset [<commit>]
- git bisect visualize
+ git bisect (visualize|view)
git bisect replay <logfile>
git bisect log
git bisect run <cmd>...
@@ -193,24 +193,23 @@
Then, use `git bisect <term-old>` and `git bisect <term-new>` instead
of `git bisect good` and `git bisect bad` to mark commits.
-Bisect visualize
-~~~~~~~~~~~~~~~~
+Bisect visualize/view
+~~~~~~~~~~~~~~~~~~~~~
To see the currently remaining suspects in 'gitk', issue the following
-command during the bisection process:
+command during the bisection process (the subcommand `view` can be used
+as an alternative to `visualize`):
------------
$ git bisect visualize
------------
-`view` may also be used as a synonym for `visualize`.
-
If the `DISPLAY` environment variable is not set, 'git log' is used
instead. You can also give command-line options such as `-p` and
`--stat`.
------------
-$ git bisect view --stat
+$ git bisect visualize --stat
------------
Bisect log and bisect replay
diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt
index fdc3aea..16323eb 100644
--- a/Documentation/git-blame.txt
+++ b/Documentation/git-blame.txt
@@ -89,8 +89,6 @@
abbreviated object name, use <n>+1 digits. Note that 1 column
is used for a caret to mark the boundary commit.
-include::diff-heuristic-options.txt[]
-
THE PORCELAIN FORMAT
--------------------
diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt
index 7463dc4..b3084c9 100644
--- a/Documentation/git-branch.txt
+++ b/Documentation/git-branch.txt
@@ -14,10 +14,11 @@
[(--merged | --no-merged) [<commit>]]
[--contains [<commit]] [--no-contains [<commit>]]
[--points-at <object>] [--format=<format>] [<pattern>...]
-'git branch' [--set-upstream | --track | --no-track] [-l] [-f] <branchname> [<start-point>]
+'git branch' [--track | --no-track] [-l] [-f] <branchname> [<start-point>]
'git branch' (--set-upstream-to=<upstream> | -u <upstream>) [<branchname>]
'git branch' --unset-upstream [<branchname>]
'git branch' (-m | -M) [<oldbranch>] <newbranch>
+'git branch' (-c | -C) [<oldbranch>] <newbranch>
'git branch' (-d | -D) [-r] <branchname>...
'git branch' --edit-description [<branchname>]
@@ -64,6 +65,10 @@
renaming. If <newbranch> exists, -M must be used to force the rename
to happen.
+The `-c` and `-C` options have the exact same semantics as `-m` and
+`-M`, except instead of the branch being renamed it along with its
+config and reflog will be copied to a new name.
+
With a `-d` or `-D` option, `<branchname>` will be deleted. You may
specify more than one branch for deletion. If the branch currently
has a reflog then the reflog will also be deleted.
@@ -81,7 +86,7 @@
--delete::
Delete a branch. The branch must be fully merged in its
upstream branch, or in `HEAD` if no upstream was set with
- `--track` or `--set-upstream`.
+ `--track` or `--set-upstream-to`.
-D::
Shortcut for `--delete --force`.
@@ -99,12 +104,12 @@
-f::
--force::
- Reset <branchname> to <startpoint> if <branchname> exists
- already. Without `-f` 'git branch' refuses to change an existing branch.
+ Reset <branchname> to <startpoint>, even if <branchname> exists
+ already. Without `-f`, 'git branch' refuses to change an existing branch.
In combination with `-d` (or `--delete`), allow deleting the
branch irrespective of its merged status. In combination with
`-m` (or `--move`), allow renaming the branch even if the new
- branch name already exists.
+ branch name already exists, the same applies for `-c` (or `--copy`).
-m::
--move::
@@ -113,6 +118,13 @@
-M::
Shortcut for `--move --force`.
+-c::
+--copy::
+ Copy a branch and the corresponding reflog.
+
+-C::
+ Shortcut for `--copy --force`.
+
--color[=<when>]::
Color branches to highlight current, local, and
remote-tracking branches.
@@ -195,10 +207,8 @@
branch.autoSetupMerge configuration variable is true.
--set-upstream::
- If specified branch does not exist yet or if `--force` has been
- given, acts exactly like `--track`. Otherwise sets up configuration
- like `--track` would when creating the branch, except that where
- branch points to is not changed.
+ As this option had confusing syntax, it is no longer supported.
+ Please use `--track` or `--set-upstream-to` instead.
-u <upstream>::
--set-upstream-to=<upstream>::
@@ -271,6 +281,12 @@
and the object it points at. The format is the same as
that of linkgit:git-for-each-ref[1].
+CONFIGURATION
+-------------
+`pager.branch` is only respected when listing branches, i.e., when
+`--list` is used or implied. The default is to use a pager.
+See linkgit:git-config[1].
+
Examples
--------
diff --git a/Documentation/git-cat-file.txt b/Documentation/git-cat-file.txt
index fb09cd6..f90f09b 100644
--- a/Documentation/git-cat-file.txt
+++ b/Documentation/git-cat-file.txt
@@ -42,8 +42,9 @@
<object>.
-e::
- Suppress all output; instead exit with zero status if <object>
- exists and is a valid object.
+ Exit with zero status if <object> exists and is a valid
+ object. If <object> is of an invalid format exit with non-zero and
+ emits an error on stderr.
-p::
Pretty-print the contents of <object> based on its type.
@@ -168,7 +169,7 @@
If `-s` is specified, the size of the <object> in bytes.
-If `-e` is specified, no output.
+If `-e` is specified, no output, unless the <object> is malformed.
If `-p` is specified, the contents of <object> are pretty-printed.
diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt
index 92777ce..d9de992 100644
--- a/Documentation/git-check-ref-format.txt
+++ b/Documentation/git-check-ref-format.txt
@@ -77,11 +77,23 @@
. at-open-brace `@{` is used as a notation to access a reflog entry.
-With the `--branch` option, it expands the ``previous branch syntax''
-`@{-n}`. For example, `@{-1}` is a way to refer the last branch you
-were on. This option should be used by porcelains to accept this
-syntax anywhere a branch name is expected, so they can act as if you
-typed the branch name.
+With the `--branch` option, the command takes a name and checks if
+it can be used as a valid branch name (e.g. when creating a new
+branch). But be cautious when using the
+previous checkout syntax that may refer to a detached HEAD state.
+The rule `git check-ref-format --branch $name` implements
+may be stricter than what `git check-ref-format refs/heads/$name`
+says (e.g. a dash may appear at the beginning of a ref component,
+but it is explicitly forbidden at the beginning of a branch name).
+When run with `--branch` option in a repository, the input is first
+expanded for the ``previous checkout syntax''
+`@{-n}`. For example, `@{-1}` is a way to refer the last thing that
+was checked out using "git checkout" operation. This option should be
+used by porcelains to accept this syntax anywhere a branch name is
+expected, so they can act as if you typed the branch name. As an
+exception note that, the ``previous checkout operation'' might result
+in a commit object name when the N-th last thing checked out was not
+a branch.
OPTIONS
-------
@@ -109,7 +121,7 @@
EXAMPLES
--------
-* Print the name of the previous branch:
+* Print the name of the previous thing checked out:
+
------------
$ git check-ref-format --branch @{-1}
diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt
index e108b0f..ca5fc9c 100644
--- a/Documentation/git-checkout.txt
+++ b/Documentation/git-checkout.txt
@@ -264,6 +264,8 @@
local modifications in a submodule would be overwritten the checkout
will fail unless `-f` is used. If nothing (or --no-recurse-submodules)
is used, the work trees of submodules will not be updated.
+ Just like linkgit:git-submodule[1], this will detach the
+ submodules HEAD.
<branch>::
Branch to checkout; if it refers to a branch (i.e., a name that,
@@ -272,11 +274,11 @@
commit, your HEAD becomes "detached" and you are no longer on
any branch (see below for details).
+
-As a special case, the `"@{-N}"` syntax for the N-th last branch/commit
-checks out branches (instead of detaching). You may also specify
-`-` which is synonymous with `"@{-1}"`.
+You can use the `"@{-N}"` syntax to refer to the N-th last
+branch/commit checked out using "git checkout" operation. You may
+also specify `-` which is synonymous to `"@{-1}`.
+
-As a further special case, you may use `"A...B"` as a shortcut for the
+As a special case, you may use `"A...B"` as a shortcut for the
merge base of `A` and `B` if there is exactly one merge base. You can
leave out at most one of `A` and `B`, in which case it defaults to `HEAD`.
diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt
index 83c8e9b3..42ca7b5 100644
--- a/Documentation/git-clone.txt
+++ b/Documentation/git-clone.txt
@@ -14,7 +14,7 @@
[-o <name>] [-b <name>] [-u <upload-pack>] [--reference <repository>]
[--dissociate] [--separate-git-dir <git dir>]
[--depth <depth>] [--[no-]single-branch] [--no-tags]
- [--recurse-submodules] [--[no-]shallow-submodules]
+ [--recurse-submodules[=<pathspec>]] [--[no-]shallow-submodules]
[--jobs <n>] [--] <repository> [<directory>]
DESCRIPTION
@@ -231,14 +231,17 @@
After the clone is created, initialize and clone submodules
within based on the provided pathspec. If no pathspec is
provided, all submodules are initialized and cloned.
- Submodules are initialized and cloned using their default
- settings. The resulting clone has `submodule.active` set to
+ This option can be given multiple times for pathspecs consisting
+ of multiple entries. The resulting clone has `submodule.active` set to
the provided pathspec, or "." (meaning all submodules) if no
- pathspec is provided. This is equivalent to running
- `git submodule update --init --recursive` immediately after
- the clone is finished. This option is ignored if the cloned
- repository does not have a worktree/checkout (i.e. if any of
- `--no-checkout`/`-n`, `--bare`, or `--mirror` is given)
+ pathspec is provided.
++
+Submodules are initialized and cloned using their default settings. This is
+equivalent to running
+`git submodule update --init --recursive <pathspec>` immediately after
+the clone is finished. This option is ignored if the cloned repository does
+not have a worktree/checkout (i.e. if any of `--no-checkout`/`-n`, `--bare`,
+or `--mirror` is given)
--[no-]shallow-submodules::
All submodules which are cloned will be shallow with a depth of 1.
diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt
index 8c74a2c..f970a43 100644
--- a/Documentation/git-commit.txt
+++ b/Documentation/git-commit.txt
@@ -144,6 +144,8 @@
Use the given <msg> as the commit message.
If multiple `-m` options are given, their values are
concatenated as separate paragraphs.
++
+The `-m` option is mutually exclusive with `-c`, `-C`, and `-F`.
-t <file>::
--template=<file>::
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 83f86b9..14da5fc 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -174,11 +174,16 @@
either --bool or --int, as described above.
--path::
- 'git-config' will expand leading '{tilde}' to the value of
- '$HOME', and '{tilde}user' to the home directory for the
+ `git config` will expand a leading `~` to the value of
+ `$HOME`, and `~user` to the home directory for the
specified user. This option has no effect when setting the
- value (but you can use 'git config bla {tilde}/' from the
- command line to let your shell do the expansion).
+ value (but you can use `git config section.variable ~/`
+ from the command line to let your shell do the expansion).
+
+--expiry-date::
+ `git config` will ensure that the output is converted from
+ a fixed or relative date-string to a timestamp. This option
+ has no effect when setting the value.
-z::
--null::
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index a336ae5..ba90066 100644
--- a/Documentation/git-cvsserver.txt
+++ b/Documentation/git-cvsserver.txt
@@ -223,7 +223,7 @@
That means that even if you offer only read access (e.g. by using
the pserver method), 'git-cvsserver' should have write access to
the database to work reliably (otherwise you need to make sure
-that the database is up-to-date any time 'git-cvsserver' is executed).
+that the database is up to date any time 'git-cvsserver' is executed).
By default it uses SQLite databases in the Git directory, named
`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt
index 26f19d3..e027fb8 100644
--- a/Documentation/git-describe.txt
+++ b/Documentation/git-describe.txt
@@ -3,14 +3,14 @@
NAME
----
-git-describe - Describe a commit using the most recent tag reachable from it
-
+git-describe - Give an object a human readable name based on an available ref
SYNOPSIS
--------
[verse]
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] [<commit-ish>...]
'git describe' [--all] [--tags] [--contains] [--abbrev=<n>] --dirty[=<mark>]
+'git describe' <blob>
DESCRIPTION
-----------
@@ -24,6 +24,12 @@
annotated tags. For more information about creating annotated tags
see the -a and -s options to linkgit:git-tag[1].
+If the given object refers to a blob, it will be described
+as `<commit-ish>:<path>`, such that the blob can be found
+at `<path>` in the `<commit-ish>`, which itself describes the
+first commit in which this blob occurs in a reverse revision walk
+from HEAD.
+
OPTIONS
-------
<commit-ish>...::
@@ -87,19 +93,23 @@
--match <pattern>::
Only consider tags matching the given `glob(7)` pattern,
- excluding the "refs/tags/" prefix. This can be used to avoid
- leaking private tags from the repository. If given multiple times, a
- list of patterns will be accumulated, and tags matching any of the
- patterns will be considered. Use `--no-match` to clear and reset the
- list of patterns.
+ excluding the "refs/tags/" prefix. If used with `--all`, it also
+ considers local branches and remote-tracking references matching the
+ pattern, excluding respectively "refs/heads/" and "refs/remotes/"
+ prefix; references of other types are never considered. If given
+ multiple times, a list of patterns will be accumulated, and tags
+ matching any of the patterns will be considered. Use `--no-match` to
+ clear and reset the list of patterns.
--exclude <pattern>::
Do not consider tags matching the given `glob(7)` pattern, excluding
- the "refs/tags/" prefix. This can be used to narrow the tag space and
- find only tags matching some meaningful criteria. If given multiple
- times, a list of patterns will be accumulated and tags matching any
- of the patterns will be excluded. When combined with --match a tag will
- be considered when it matches at least one --match pattern and does not
+ the "refs/tags/" prefix. If used with `--all`, it also does not consider
+ local branches and remote-tracking references matching the pattern,
+ excluding respectively "refs/heads/" and "refs/remotes/" prefix;
+ references of other types are never considered. If given multiple times,
+ a list of patterns will be accumulated and tags matching any of the
+ patterns will be excluded. When combined with --match a tag will be
+ considered when it matches at least one --match pattern and does not
match any of the --exclude patterns. Use `--no-exclude` to clear and
reset the list of patterns.
@@ -182,6 +192,14 @@
the number of commits which would be shown by `git log tag..input`
will be the smallest number of commits possible.
+BUGS
+----
+
+Tree objects as well as tag objects not pointing at commits, cannot be described.
+When describing blobs, the lightweight tags pointing at blobs are ignored,
+but the blob is still described as <committ-ish>:<path> despite the lightweight
+tag being favorable.
+
GIT
---
Part of the linkgit:git[1] suite
diff --git a/Documentation/git-diff-index.txt b/Documentation/git-diff-index.txt
index a171506..b380677 100644
--- a/Documentation/git-diff-index.txt
+++ b/Documentation/git-diff-index.txt
@@ -85,7 +85,7 @@
The non-cached version asks the question:
show me the differences between HEAD and the currently checked out
- tree - index contents _and_ files that aren't up-to-date
+ tree - index contents _and_ files that aren't up to date
which is obviously a very useful question too, since that tells you what
you *could* commit. Again, the output matches the 'git diff-tree -r'
@@ -100,8 +100,8 @@
torvalds@ppc970:~/v2.6/linux> git diff-index --abbrev HEAD
:100644 100664 7476bb... 000000... kernel/sched.c
-i.e., it shows that the tree has changed, and that `kernel/sched.c` has is
-not up-to-date and may contain new stuff. The all-zero sha1 means that to
+i.e., it shows that the tree has changed, and that `kernel/sched.c` is
+not up to date and may contain new stuff. The all-zero sha1 means that to
get the real diff, you need to look at the object in the working directory
directly rather than do an object-to-object diff.
diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt
index 9e5169a..3a52e4d 100644
--- a/Documentation/git-filter-branch.txt
+++ b/Documentation/git-filter-branch.txt
@@ -8,13 +8,13 @@
SYNOPSIS
--------
[verse]
-'git filter-branch' [--setup <command>] [--env-filter <command>]
- [--tree-filter <command>] [--index-filter <command>]
- [--parent-filter <command>] [--msg-filter <command>]
- [--commit-filter <command>] [--tag-name-filter <command>]
- [--subdirectory-filter <directory>] [--prune-empty]
+'git filter-branch' [--setup <command>] [--subdirectory-filter <directory>]
+ [--env-filter <command>] [--tree-filter <command>]
+ [--index-filter <command>] [--parent-filter <command>]
+ [--msg-filter <command>] [--commit-filter <command>]
+ [--tag-name-filter <command>] [--prune-empty]
[--original <namespace>] [-d <directory>] [-f | --force]
- [--] [<rev-list options>...]
+ [--state-branch <branch>] [--] [<rev-list options>...]
DESCRIPTION
-----------
@@ -89,6 +89,11 @@
can be used or modified in the following filter steps except
the commit filter, for technical reasons.
+--subdirectory-filter <directory>::
+ Only look at the history which touches the given subdirectory.
+ The result will contain that directory (and only that) as its
+ project root. Implies <<Remap_to_ancestor>>.
+
--env-filter <command>::
This filter may be used if you only need to modify the environment
in which the commit will be performed. Specifically, you might
@@ -167,11 +172,6 @@
author or timestamp (or the tag message for that matter). Tags which point
to other tags will be rewritten to point to the underlying commit.
---subdirectory-filter <directory>::
- Only look at the history which touches the given subdirectory.
- The result will contain that directory (and only that) as its
- project root. Implies <<Remap_to_ancestor>>.
-
--prune-empty::
Some filters will generate empty commits that leave the tree untouched.
This option instructs git-filter-branch to remove such commits if they
@@ -198,6 +198,12 @@
directory or when there are already refs starting with
'refs/original/', unless forced.
+--state-branch <branch>::
+ This option will cause the mapping from old to new objects to
+ be loaded from named branch upon startup and saved as a new
+ commit to that branch upon exit, enabling incremental of large
+ trees. If '<branch>' does not exist it will be created.
+
<rev-list options>...::
Arguments for 'git rev-list'. All positive refs included by
these options are rewritten. You may also specify options
diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt
index cbd0a62..dffa14a 100644
--- a/Documentation/git-for-each-ref.txt
+++ b/Documentation/git-for-each-ref.txt
@@ -145,18 +145,25 @@
(behind), "<>" (ahead and behind), or "=" (in sync). `:track`
also prints "[gone]" whenever unknown upstream ref is
encountered. Append `:track,nobracket` to show tracking
- information without brackets (i.e "ahead N, behind M"). Has
- no effect if the ref does not have tracking information
- associated with it. All the options apart from `nobracket`
- are mutually exclusive, but if used together the last option
- is selected.
+ information without brackets (i.e "ahead N, behind M").
++
+For any remote-tracking branch `%(upstream)`, `%(upstream:remotename)`
+and `%(upstream:remoteref)` refer to the name of the remote and the
+name of the tracked remote ref, respectively. In other words, the
+remote-tracking branch can be updated explicitly and individually by
+using the refspec `%(upstream:remoteref):%(upstream)` to fetch from
+`%(upstream:remotename)`.
++
+Has no effect if the ref does not have tracking information associated
+with it. All the options apart from `nobracket` are mutually exclusive,
+but if used together the last option is selected.
push::
The name of a local ref which represents the `@{push}`
location for the displayed ref. Respects `:short`, `:lstrip`,
- `:rstrip`, `:track`, and `:trackshort` options as `upstream`
- does. Produces an empty string if no `@{push}` ref is
- configured.
+ `:rstrip`, `:track`, `:trackshort`, `:remotename`, and `:remoteref`
+ options as `upstream` does. Produces an empty string if no `@{push}`
+ ref is configured.
HEAD::
'*' if HEAD matches current ref (the checked out branch), ' '
@@ -218,11 +225,15 @@
The complete message in a commit and tag object is `contents`.
Its first line is `contents:subject`, where subject is the concatenation
of all lines of the commit message up to the first blank line. The next
-line is 'contents:body', where body is all of the lines after the first
+line is `contents:body`, where body is all of the lines after the first
blank line. The optional GPG signature is `contents:signature`. The
first `N` lines of the message is obtained using `contents:lines=N`.
Additionally, the trailers as interpreted by linkgit:git-interpret-trailers[1]
-are obtained as 'contents:trailers'.
+are obtained as `trailers` (or by using the historical alias
+`contents:trailers`). Non-trailer lines from the trailer block can be omitted
+with `trailers:only`. Whitespace-continuations can be removed from trailers so
+that each trailer appears on a line by itself with its full content with
+`trailers:unfold`. Both can be used together as `trailers:unfold,only`.
For sorting purposes, fields with numeric values sort in numeric order
(`objectsize`, `authordate`, `committerdate`, `creatordate`, `taggerdate`).
diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt
index c890328..6cbe462 100644
--- a/Documentation/git-format-patch.txt
+++ b/Documentation/git-format-patch.txt
@@ -23,6 +23,7 @@
[(--reroll-count|-v) <n>]
[--to=<email>] [--cc=<email>]
[--[no-]cover-letter] [--quiet] [--notes[=<ref>]]
+ [--progress]
[<common diff options>]
[ <since> | <revision range> ]
@@ -283,6 +284,9 @@
range are always formatted as creation patches, independently
of this flag.
+--progress::
+ Show progress reports on stderr as patches are generated.
+
CONFIGURATION
-------------
You can specify extra mail header lines to be added to each message,
diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt
index 5edb1da..18b4947 100644
--- a/Documentation/git-grep.txt
+++ b/Documentation/git-grep.txt
@@ -95,13 +95,6 @@
<tree> option the prefix of all submodule output will be the name of
the parent project's <tree> object.
---parent-basename <basename>::
- For internal use only. In order to produce uniform output with the
- --recurse-submodules option, this option can be used to provide the
- basename of a parent's <tree> object to a submodule so the submodule
- can prefix its output with the parent's name rather than the SHA1 of
- the submodule.
-
-a::
--text::
Process binary files as if they were text.
diff --git a/Documentation/git-interpret-trailers.txt b/Documentation/git-interpret-trailers.txt
index 31cdeae..ff446f1 100644
--- a/Documentation/git-interpret-trailers.txt
+++ b/Documentation/git-interpret-trailers.txt
@@ -3,24 +3,27 @@
NAME
----
-git-interpret-trailers - help add structured information into commit messages
+git-interpret-trailers - add or parse structured information in commit messages
SYNOPSIS
--------
[verse]
-'git interpret-trailers' [--in-place] [--trim-empty] [(--trailer <token>[(=|:)<value>])...] [<file>...]
+'git interpret-trailers' [options] [(--trailer <token>[(=|:)<value>])...] [<file>...]
+'git interpret-trailers' [options] [--parse] [<file>...]
DESCRIPTION
-----------
-Help adding 'trailers' lines, that look similar to RFC 822 e-mail
+Help parsing or adding 'trailers' lines, that look similar to RFC 822 e-mail
headers, at the end of the otherwise free-form part of a commit
message.
This command reads some patches or commit messages from either the
-<file> arguments or the standard input if no <file> is specified. Then
-this command applies the arguments passed using the `--trailer`
-option, if any, to the commit message part of each input file. The
-result is emitted on the standard output.
+<file> arguments or the standard input if no <file> is specified. If
+`--parse` is specified, the output consists of the parsed trailers.
+
+Otherwise, this command applies the arguments passed using the
+`--trailer` option, if any, to the commit message part of each input
+file. The result is emitted on the standard output.
Some configuration variables control the way the `--trailer` arguments
are applied to each commit message and the way any existing trailer in
@@ -48,7 +51,7 @@
will be added before the new trailer.
Existing trailers are extracted from the input message by looking for
-a group of one or more lines that (i) are all trailers, or (ii) contains at
+a group of one or more lines that (i) is all trailers, or (ii) contains at
least one Git-generated or user-configured trailer and consists of at
least 25% trailers.
The group must be preceded by one or more empty (or whitespace-only) lines.
@@ -80,6 +83,45 @@
trailer to the input messages. See the description of this
command.
+--where <placement>::
+--no-where::
+ Specify where all new trailers will be added. A setting
+ provided with '--where' overrides all configuration variables
+ and applies to all '--trailer' options until the next occurrence of
+ '--where' or '--no-where'.
+
+--if-exists <action>::
+--no-if-exists::
+ Specify what action will be performed when there is already at
+ least one trailer with the same <token> in the message. A setting
+ provided with '--if-exists' overrides all configuration variables
+ and applies to all '--trailer' options until the next occurrence of
+ '--if-exists' or '--no-if-exists'.
+
+--if-missing <action>::
+--no-if-missing::
+ Specify what action will be performed when there is no other
+ trailer with the same <token> in the message. A setting
+ provided with '--if-missing' overrides all configuration variables
+ and applies to all '--trailer' options until the next occurrence of
+ '--if-missing' or '--no-if-missing'.
+
+--only-trailers::
+ Output only the trailers, not any other parts of the input.
+
+--only-input::
+ Output only trailers that exist in the input; do not add any
+ from the command-line or by following configured `trailer.*`
+ rules.
+
+--unfold::
+ Remove any whitespace-continuation in trailers, so that each
+ trailer appears on a line by itself with its full content.
+
+--parse::
+ A convenience alias for `--only-trailers --only-input
+ --unfold`.
+
CONFIGURATION VARIABLES
-----------------------
@@ -170,8 +212,8 @@
configuration variable and it overrides what is specified by
that option for trailers with the specified <token>.
-trailer.<token>.ifexist::
- This option takes the same values as the 'trailer.ifexist'
+trailer.<token>.ifexists::
+ This option takes the same values as the 'trailer.ifexists'
configuration variable and it overrides what is specified by
that option for trailers with the specified <token>.
diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt
index 32246fd..5437f8b 100644
--- a/Documentation/git-log.txt
+++ b/Documentation/git-log.txt
@@ -38,6 +38,13 @@
are shown as if 'short' were given, otherwise no ref names are
shown. The default option is 'short'.
+--decorate-refs=<pattern>::
+--decorate-refs-exclude=<pattern>::
+ If no `--decorate-refs` is given, pretend as if all refs were
+ included. For each candidate, do not use it for decoration if it
+ matches any patterns given to `--decorate-refs-exclude` or if it
+ doesn't match any of the patterns given to `--decorate-refs`.
+
--source::
Print out the ref name given on the command line by which each
commit was reached.
diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt
index d153c17..3ac3e3a 100644
--- a/Documentation/git-ls-files.txt
+++ b/Documentation/git-ls-files.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git ls-files' [-z] [-t] [-v]
+'git ls-files' [-z] [-t] [-v] [-f]
(--[cached|deleted|others|ignored|stage|unmerged|killed|modified])*
(-[c|d|o|i|s|u|k|m])*
[--eol]
@@ -133,6 +133,11 @@
that are marked as 'assume unchanged' (see
linkgit:git-update-index[1]).
+-f::
+ Similar to `-t`, but use lowercase letters for files
+ that are marked as 'fsmonitor valid' (see
+ linkgit:git-update-index[1]).
+
--full-name::
When run from a subdirectory, the command usually
outputs paths relative to the current directory. This
diff --git a/Documentation/git-merge-base.txt b/Documentation/git-merge-base.txt
index b968b64..502e00e 100644
--- a/Documentation/git-merge-base.txt
+++ b/Documentation/git-merge-base.txt
@@ -154,23 +154,71 @@
`origin/master` may have been rewound and rebuilt, leading to a
history of this shape:
- o---B1
+ o---B2
/
- ---o---o---B2--o---o---o---B (origin/master)
+ ---o---o---B1--o---o---o---B (origin/master)
\
- B3
+ B0
\
- Derived (topic)
+ D0---D1---D (topic)
-where `origin/master` used to point at commits B3, B2, B1 and now it
+where `origin/master` used to point at commits B0, B1, B2 and now it
points at B, and your `topic` branch was started on top of it back
-when `origin/master` was at B3. This mode uses the reflog of
-`origin/master` to find B3 as the fork point, so that the `topic`
-can be rebased on top of the updated `origin/master` by:
+when `origin/master` was at B0, and you built three commits, D0, D1,
+and D, on top of it. Imagine that you now want to rebase the work
+you did on the topic on top of the updated origin/master.
+
+In such a case, `git merge-base origin/master topic` would return the
+parent of B0 in the above picture, but B0^..D is *not* the range of
+commits you would want to replay on top of B (it includes B0, which
+is not what you wrote; it is a commit the other side discarded when
+it moved its tip from B0 to B1).
+
+`git merge-base --fork-point origin/master topic` is designed to
+help in such a case. It takes not only B but also B0, B1, and B2
+(i.e. old tips of the remote-tracking branches your repository's
+reflog knows about) into account to see on which commit your topic
+branch was built and finds B0, allowing you to replay only the
+commits on your topic, excluding the commits the other side later
+discarded.
+
+Hence
$ fork_point=$(git merge-base --fork-point origin/master topic)
+
+will find B0, and
+
$ git rebase --onto origin/master $fork_point topic
+will replay D0, D1 and D on top of B to create a new history of this
+shape:
+
+ o---B2
+ /
+ ---o---o---B1--o---o---o---B (origin/master)
+ \ \
+ B0 D0'--D1'--D' (topic - updated)
+ \
+ D0---D1---D (topic - old)
+
+A caveat is that older reflog entries in your repository may be
+expired by `git gc`. If B0 no longer appears in the reflog of the
+remote-tracking branch `origin/master`, the `--fork-point` mode
+obviously cannot find it and fails, avoiding to give a random and
+useless result (such as the parent of B0, like the same command
+without the `--fork-point` option gives).
+
+Also, the remote-tracking branch you use the `--fork-point` mode
+with must be the one your topic forked from its tip. If you forked
+from an older commit than the tip, this mode would not find the fork
+point (imagine in the above sample history B0 did not exist,
+origin/master started at B1, moved to B2 and then B, and you forked
+your topic at origin/master^ when origin/master was B1; the shape of
+the history would be the same as above, without B0, and the parent
+of B1 is what `git merge-base origin/master topic` correctly finds,
+but the `--fork-point` mode will not, because it is not one of the
+commits that used to be at the tip of origin/master).
+
See also
--------
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index f90faf7..d5dfd84 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -64,12 +64,6 @@
-------
include::merge-options.txt[]
--S[<keyid>]::
---gpg-sign[=<keyid>]::
- GPG-sign the resulting merge commit. The `keyid` argument is
- optional and defaults to the committer identity; if specified,
- it must be stuck to the option without a space.
-
-m <msg>::
Set the commit message to be used for the merge commit (in
case one is created).
@@ -133,7 +127,7 @@
would result from the merge already.)
If all named commits are already ancestors of `HEAD`, 'git merge'
-will exit early with the message "Already up-to-date."
+will exit early with the message "Already up to date."
FAST-FORWARD MERGE
------------------
diff --git a/Documentation/git-notes.txt b/Documentation/git-notes.txt
index 4367729..e8dec1b 100644
--- a/Documentation/git-notes.txt
+++ b/Documentation/git-notes.txt
@@ -18,7 +18,7 @@
'git notes' merge --commit [-v | -q]
'git notes' merge --abort [-v | -q]
'git notes' remove [--ignore-missing] [--stdin] [<object>...]
-'git notes' prune [-n | -v]
+'git notes' prune [-n] [-v]
'git notes' get-ref
diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt
index 7436c64..d8c8f11 100644
--- a/Documentation/git-p4.txt
+++ b/Documentation/git-p4.txt
@@ -157,6 +157,12 @@
according to the author of the Git commit. This option requires admin
privileges in p4, which can be granted using 'p4 protect'.
+To shelve changes instead of submitting, use `--shelve` and `--update-shelve`:
+
+----
+$ git p4 submit --shelve
+$ git p4 submit --update-shelve 1234 --update-shelve 2345
+----
OPTIONS
-------
@@ -310,7 +316,7 @@
--update-shelve CHANGELIST::
Update an existing shelved changelist with this commit. Implies
- --shelve.
+ --shelve. Repeat for multiple shelved changelists.
--conflict=(ask|skip|quit)::
Conflicts can occur when applying a commit to p4. When this
diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt
index 473a161..aa403d0 100644
--- a/Documentation/git-pack-objects.txt
+++ b/Documentation/git-pack-objects.txt
@@ -12,7 +12,8 @@
'git pack-objects' [-q | --progress | --all-progress] [--all-progress-implied]
[--no-reuse-delta] [--delta-base-offset] [--non-empty]
[--local] [--incremental] [--window=<n>] [--depth=<n>]
- [--revs [--unpacked | --all]] [--stdout | base-name]
+ [--revs [--unpacked | --all]]
+ [--stdout [--filter=<filter-spec>] | base-name]
[--shallow] [--keep-true-parents] < object-list
@@ -236,6 +237,25 @@
With this option, parents that are hidden by grafts are packed
nevertheless.
+--filter=<filter-spec>::
+ Requires `--stdout`. Omits certain objects (usually blobs) from
+ the resulting packfile. See linkgit:git-rev-list[1] for valid
+ `<filter-spec>` forms.
+
+--no-filter::
+ Turns off any previous `--filter=` argument.
+
+--missing=<missing-action>::
+ A debug option to help with future "partial clone" development.
+ This option specifies how missing objects are handled.
++
+The form '--missing=error' requests that pack-objects stop with an error if
+a missing object is encountered. This is the default action.
++
+The form '--missing=allow-any' will allow object traversal to continue
+if a missing object is encountered. Missing objects will silently be
+omitted from the results.
+
SEE ALSO
--------
linkgit:git-rev-list[1]
diff --git a/Documentation/git-prune.txt b/Documentation/git-prune.txt
index 7a493c8..a37c0af 100644
--- a/Documentation/git-prune.txt
+++ b/Documentation/git-prune.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git prune' [-n] [-v] [--expire <expire>] [--] [<head>...]
+'git prune' [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]
DESCRIPTION
-----------
@@ -42,12 +42,15 @@
--verbose::
Report all removed objects.
-\--::
- Do not interpret any more arguments as options.
+--progress::
+ Show progress.
--expire <time>::
Only expire loose objects older than <time>.
+\--::
+ Do not interpret any more arguments as options.
+
<head>...::
In addition to objects
reachable from any of our references, keep objects
diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt
index 0a63966..5b08302 100644
--- a/Documentation/git-push.txt
+++ b/Documentation/git-push.txt
@@ -12,7 +12,7 @@
'git push' [--all | --mirror | --tags] [--follow-tags] [--atomic] [-n | --dry-run] [--receive-pack=<git-receive-pack>]
[--repo=<repository>] [-f | --force] [-d | --delete] [--prune] [-v | --verbose]
[-u | --set-upstream] [--push-option=<string>]
- [--[no-]signed|--sign=(true|false|if-asked)]
+ [--[no-]signed|--signed=(true|false|if-asked)]
[--force-with-lease[=<refname>[:<expect>]]]
[--no-verify] [<repository> [<refspec>...]]
@@ -141,7 +141,7 @@
information, see `push.followTags` in linkgit:git-config[1].
--[no-]signed::
---sign=(true|false|if-asked)::
+--signed=(true|false|if-asked)::
GPG-sign the push request to update refs on the receiving
side, to allow it to be checked by the hooks and/or be
logged. If `false` or `--no-signed`, no signing will be
@@ -156,11 +156,17 @@
Either all refs are updated, or on error, no refs are updated.
If the server does not support atomic pushes the push will fail.
--o::
---push-option::
+-o <option>::
+--push-option=<option>::
Transmit the given string to the server, which passes them to
the pre-receive as well as the post-receive hook. The given string
must not contain a NUL or LF character.
+ When multiple `--push-option=<option>` are given, they are
+ all sent to the other side in the order listed on the
+ command line.
+ When no `--push-option=<option>` is given from the command
+ line, the values of configuration variable `push.pushOption`
+ are used instead.
--receive-pack=<git-receive-pack>::
--exec=<git-receive-pack>::
diff --git a/Documentation/git-read-tree.txt b/Documentation/git-read-tree.txt
index 72bd809..f2a07d5 100644
--- a/Documentation/git-read-tree.txt
+++ b/Documentation/git-read-tree.txt
@@ -81,12 +81,11 @@
* when both sides add a path identically. The resolution
is to add that path.
---prefix=<prefix>/::
+--prefix=<prefix>::
Keep the current index contents, and read the contents
of the named tree-ish under the directory at `<prefix>`.
The command will refuse to overwrite entries that already
- existed in the original index file. Note that the `<prefix>/`
- value must end with a slash.
+ existed in the original index file.
--exclude-per-directory=<gitignore>::
When running the command with `-u` and `-m` options, the
diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt
index 4f6bed6..8a861c1 100644
--- a/Documentation/git-rebase.txt
+++ b/Documentation/git-rebase.txt
@@ -203,24 +203,7 @@
CONFIGURATION
-------------
-rebase.stat::
- Whether to show a diffstat of what changed upstream since the last
- rebase. False by default.
-
-rebase.autoSquash::
- If set to true enable `--autosquash` option by default.
-
-rebase.autoStash::
- If set to true enable `--autostash` option by default.
-
-rebase.missingCommitsCheck::
- If set to "warn", print warnings about removed commits in
- interactive mode. If set to "error", print the warnings and
- stop the rebase. If set to "ignore", no checking is
- done. "ignore" by default.
-
-rebase.instructionFormat::
- Custom commit list format to use during an `--interactive` rebase.
+include::rebase-config.txt[]
OPTIONS
-------
@@ -334,7 +317,7 @@
-f::
--force-rebase::
- Force a rebase even if the current branch is up-to-date and
+ Force a rebase even if the current branch is up to date and
the command without `--force` would return without doing anything.
+
You may find this (or --no-ff with an interactive rebase) helpful after
@@ -430,13 +413,15 @@
--autosquash::
--no-autosquash::
When the commit log message begins with "squash! ..." (or
- "fixup! ..."), and there is a commit whose title begins with
- the same ..., automatically modify the todo list of rebase -i
- so that the commit marked for squashing comes right after the
- commit to be modified, and change the action of the moved
- commit from `pick` to `squash` (or `fixup`). Ignores subsequent
- "fixup! " or "squash! " after the first, in case you referred to an
- earlier fixup/squash with `git commit --fixup/--squash`.
+ "fixup! ..."), and there is already a commit in the todo list that
+ matches the same `...`, automatically modify the todo list of rebase
+ -i so that the commit marked for squashing comes right after the
+ commit to be modified, and change the action of the moved commit
+ from `pick` to `squash` (or `fixup`). A commit matches the `...` if
+ the commit subject matches, or if the `...` refers to the commit's
+ hash. As a fall-back, partial matches of the commit subject work,
+ too. The recommended way to create fixup/squash commits is by using
+ the `--fixup`/`--squash` options of linkgit:git-commit[1].
+
This option is only valid when the `--interactive` option is used.
+
diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt
index 44c736f..472a680 100644
--- a/Documentation/git-reflog.txt
+++ b/Documentation/git-reflog.txt
@@ -20,9 +20,9 @@
'git reflog' ['show'] [log-options] [<ref>]
'git reflog expire' [--expire=<time>] [--expire-unreachable=<time>]
[--rewrite] [--updateref] [--stale-fix]
- [--dry-run] [--verbose] [--all | <refs>...]
+ [--dry-run | -n] [--verbose] [--all | <refs>...]
'git reflog delete' [--rewrite] [--updateref]
- [--dry-run] [--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-rerere.txt b/Documentation/git-rerere.txt
index 9ee083c..031f31f 100644
--- a/Documentation/git-rerere.txt
+++ b/Documentation/git-rerere.txt
@@ -205,7 +205,7 @@
------------
you could run `git rebase master topic`, to bring yourself
-up-to-date before your topic is ready to be sent upstream.
+up to date before your topic is ready to be sent upstream.
This would result in falling back to a three-way merge, and it
would conflict the same way as the test merge you resolved earlier.
'git rerere' will be run by 'git rebase' to help you resolve this
diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt
index ef22f17..88609ff 100644
--- a/Documentation/git-rev-list.txt
+++ b/Documentation/git-rev-list.txt
@@ -47,7 +47,9 @@
[ --fixed-strings | -F ]
[ --date=<format>]
[ [ --objects | --objects-edge | --objects-edge-aggressive ]
- [ --unpacked ] ]
+ [ --unpacked ]
+ [ --filter=<filter-spec> [ --filter-print-omitted ] ] ]
+ [ --missing=<missing-action> ]
[ --pretty | --header ]
[ --bisect ]
[ --bisect-vars ]
diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt
index b1293f2..95326b8 100644
--- a/Documentation/git-rev-parse.txt
+++ b/Documentation/git-rev-parse.txt
@@ -235,6 +235,9 @@
--is-bare-repository::
When the repository is bare print "true", otherwise "false".
+--is-shallow-repository::
+ When the repository is shallow print "true", otherwise "false".
+
--resolve-git-dir <path>::
Check if <path> is a valid repository or a gitfile that
points at a valid repository, and print the location of the
@@ -261,7 +264,7 @@
--show-toplevel::
Show the absolute path of the top-level directory.
---show-superproject-working-tree
+--show-superproject-working-tree::
Show the absolute path of the root of the superproject's
working tree (if exists) that uses the current repository as
its submodule. Outputs nothing if the current repository is
diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt
index 683e591..b5c4622 100644
--- a/Documentation/git-rm.txt
+++ b/Documentation/git-rm.txt
@@ -146,7 +146,7 @@
in the linkgit:gitmodules[5] file will also be removed and that file
will be staged (unless --cached or -n are used).
-A submodule is considered up-to-date when the HEAD is the same as
+A submodule is considered up to date when the HEAD is the same as
recorded in the index, no tracked files are modified and no untracked
files that aren't ignored are present in the submodules work tree.
Ignored files are deemed expendable and won't stop a submodule's work
diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt
index bac9014..8060ea3 100644
--- a/Documentation/git-send-email.txt
+++ b/Documentation/git-send-email.txt
@@ -203,9 +203,9 @@
specify a full pathname of a sendmail-like program instead;
the program must support the `-i` option. Default value can
be specified by the `sendemail.smtpServer` configuration
- option; the built-in default is `/usr/sbin/sendmail` or
- `/usr/lib/sendmail` if such program is available, or
- `localhost` otherwise.
+ option; the built-in default is to search for `sendmail` in
+ `/usr/sbin`, `/usr/lib` and $PATH if such program is
+ available, falling back to `localhost` otherwise.
--smtp-server-port=<port>::
Specifies a port different from the default port (SMTP
diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt
index 966abb0..f51c649 100644
--- a/Documentation/git-send-pack.txt
+++ b/Documentation/git-send-pack.txt
@@ -11,7 +11,7 @@
[verse]
'git send-pack' [--all] [--dry-run] [--force] [--receive-pack=<git-receive-pack>]
[--verbose] [--thin] [--atomic]
- [--[no-]signed|--sign=(true|false|if-asked)]
+ [--[no-]signed|--signed=(true|false|if-asked)]
[<host>:]<directory> [<ref>...]
DESCRIPTION
@@ -71,7 +71,7 @@
refs.
--[no-]signed::
---sign=(true|false|if-asked)::
+--signed=(true|false|if-asked)::
GPG-sign the push request to update refs on the receiving
side, to allow it to be checked by the hooks and/or be
logged. If `false` or `--no-signed`, no signing will be
diff --git a/Documentation/git-show.txt b/Documentation/git-show.txt
index 82a4125..e73ef54 100644
--- a/Documentation/git-show.txt
+++ b/Documentation/git-show.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git show' [options] <object>...
+'git show' [options] [<object>...]
DESCRIPTION
-----------
@@ -35,7 +35,7 @@
OPTIONS
-------
<object>...::
- The names of objects to show.
+ The names of objects to show (defaults to 'HEAD').
For a more complete list of ways to spell object names, see
"SPECIFYING REVISIONS" section in linkgit:gitrevisions[7].
diff --git a/Documentation/git-stash.txt b/Documentation/git-stash.txt
index 00f95fe..056dfb8 100644
--- a/Documentation/git-stash.txt
+++ b/Documentation/git-stash.txt
@@ -13,8 +13,6 @@
'git stash' drop [-q|--quiet] [<stash>]
'git stash' ( pop | apply ) [--index] [-q|--quiet] [<stash>]
'git stash' branch <branchname> [<stash>]
-'git stash' save [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
- [-u|--include-untracked] [-a|--all] [<message>]
'git stash' [push [-p|--patch] [-k|--[no-]keep-index] [-q|--quiet]
[-u|--include-untracked] [-a|--all] [-m|--message <message>]]
[--] [<pathspec>...]]
@@ -33,7 +31,7 @@
The modifications stashed away by this command can be listed with
`git stash list`, inspected with `git stash show`, and restored
(potentially on top of a different commit) with `git stash apply`.
-Calling `git stash` without any arguments is equivalent to `git stash save`.
+Calling `git stash` without any arguments is equivalent to `git stash push`.
A stash is by default listed as "WIP on 'branchname' ...", but
you can give a more descriptive message on the command line when
you create one.
@@ -48,7 +46,6 @@
OPTIONS
-------
-save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
push [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [-m|--message <message>] [--] [<pathspec>...]::
Save your local modifications to a new 'stash entry' and roll them
@@ -87,6 +84,12 @@
The `--patch` option implies `--keep-index`. You can use
`--no-keep-index` to override this.
+save [-p|--patch] [-k|--[no-]keep-index] [-u|--include-untracked] [-a|--all] [-q|--quiet] [<message>]::
+
+ This option is deprecated in favour of 'git stash push'. It
+ differs from "stash push" in that it cannot take pathspecs,
+ and any non-option arguments form the message.
+
list [<options>]::
List the stash entries that you currently have. Each 'stash entry' is
@@ -118,7 +121,7 @@
Remove a single stashed state from the stash list and apply it
on top of the current working tree state, i.e., do the inverse
- operation of `git stash save`. The working directory must
+ operation of `git stash push`. The working directory must
match the index.
+
Applying the state can fail with conflicts; in this case, it is not
@@ -137,7 +140,7 @@
Like `pop`, but do not remove the state from the stash list. Unlike `pop`,
`<stash>` may be any commit that looks like a commit created by
- `stash save` or `stash create`.
+ `stash push` or `stash create`.
branch <branchname> [<stash>]::
@@ -148,7 +151,7 @@
`stash@{<revision>}`, it then drops the `<stash>`. When no `<stash>`
is given, applies the latest one.
+
-This is useful if the branch on which you ran `git stash save` has
+This is useful if the branch on which you ran `git stash push` has
changed enough that `git stash apply` fails due to conflicts. Since
the stash entry is applied on top of the commit that was HEAD at the
time `git stash` was run, it restores the originally stashed state
@@ -172,14 +175,14 @@
return its object name, without storing it anywhere in the ref
namespace.
This is intended to be useful for scripts. It is probably not
- the command you want to use; see "save" above.
+ the command you want to use; see "push" above.
store::
Store a given stash created via 'git stash create' (which is a
dangling merge commit) in the stash ref, updating the stash
reflog. This is intended to be useful for scripts. It is
- probably not the command you want to use; see "save" above.
+ probably not the command you want to use; see "push" above.
DISCUSSION
----------
@@ -255,14 +258,14 @@
Testing partial commits::
-You can use `git stash save --keep-index` when you want to make two or
+You can use `git stash push --keep-index` when you want to make two or
more commits out of the changes in the work tree, and you want to test
each change before committing:
+
----------------------------------------------------------------
# ... hack hack hack ...
$ git add --patch foo # add just first part to the index
-$ git stash save --keep-index # save all other changes to the stash
+$ git stash push --keep-index # save all other changes to the stash
$ edit/build/test first part
$ git commit -m 'First part' # commit fully tested change
$ git stash pop # prepare to work on all other changes
diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt
index 9f3a78a..f9c91c7 100644
--- a/Documentation/git-status.txt
+++ b/Documentation/git-status.txt
@@ -97,8 +97,27 @@
(and suppresses the output of submodule summaries when the config option
`status.submoduleSummary` is set).
---ignored::
+--ignored[=<mode>]::
Show ignored files as well.
++
+The mode parameter is used to specify the handling of ignored files.
+It is optional: it defaults to 'traditional'.
++
+The possible options are:
++
+ - 'traditional' - Shows ignored files and directories, unless
+ --untracked-files=all is specifed, in which case
+ individual files in ignored directories are
+ displayed.
+ - 'no' - Show no ignored files.
+ - 'matching' - Shows ignored files and directories matching an
+ ignore pattern.
++
+When 'matching' mode is specified, paths that explicity match an
+ignored pattern are shown. If a directory matches an ignore pattern,
+then it is shown, but not paths contained in the ignored directory. If
+a directory does not match an ignore pattern, but all contents are
+ignored, then the directory is not shown, but all contents are shown.
-z::
Terminate entries with NUL, instead of LF. This implies
@@ -130,14 +149,15 @@
Short Format
~~~~~~~~~~~~
-In the short-format, the status of each path is shown as
+In the short-format, the status of each path is shown as one of these
+forms
- XY PATH1 -> PATH2
+ XY PATH
+ XY ORIG_PATH -> PATH
-where `PATH1` is the path in the `HEAD`, and the " `-> PATH2`" part is
-shown only when `PATH1` corresponds to a different path in the
-index/worktree (i.e. the file is renamed). The `XY` is a two-letter
-status code.
+where `ORIG_PATH` is where the renamed/copied contents came
+from. `ORIG_PATH` is only shown when the entry is renamed or
+copied. The `XY` is a two-letter status code.
The fields (including the `->`) are separated from each other by a
single space. If a filename contains whitespace or other nonprintable
@@ -164,15 +184,17 @@
X Y Meaning
-------------------------------------------------
- [MD] not updated
+ [AMD] not updated
M [ MD] updated in index
A [ MD] added to index
- D [ M] deleted from 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
-------------------------------------------------
D D unmerged, both deleted
A U unmerged, added by us
@@ -290,13 +312,13 @@
of similarity between the source and target of the
move or copy). For example "R100" or "C75".
<path> The pathname. In a renamed/copied entry, this
- is the path in the index and in the working tree.
+ is the target path.
<sep> When the `-z` option is used, the 2 pathnames are separated
with a NUL (ASCII 0x00) byte; otherwise, a tab (ASCII 0x09)
byte separates them.
- <origPath> The pathname in the commit at HEAD. This is only
- present in a renamed/copied entry, and tells
- where the renamed/copied contents came from.
+ <origPath> The pathname in the commit at HEAD or in the index.
+ This is only present in a renamed/copied entry, and
+ tells where the renamed/copied contents came from.
--------------------------------------------------------
Unmerged entries have the following format; the first character is
@@ -368,6 +390,19 @@
line option or the 'git submodule summary' command, which shows a similar
output but does not honor these settings.
+BACKGROUND REFRESH
+------------------
+
+By default, `git status` will automatically refresh the index, updating
+the cached stat information from the working tree and writing out the
+result. Writing out the updated index is an optimization that isn't
+strictly necessary (`status` computes the values for itself, but writing
+them out is just to save subsequent programs from repeating our
+computation). When `status` is run in the background, the lock held
+during the write may conflict with other simultaneous processes, causing
+them to fail. Scripts running `status` in the background should consider
+using `git --no-optional-locks status` (see linkgit:git[1] for details).
+
SEE ALSO
--------
linkgit:gitignore[5]
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt
index ff61200..71c5618 100644
--- a/Documentation/git-submodule.txt
+++ b/Documentation/git-submodule.txt
@@ -70,8 +70,8 @@
Show the status of the submodules. This will print the SHA-1 of the
currently checked out commit for each submodule, along with the
submodule path and the output of 'git describe' for the
- SHA-1. Each SHA-1 will be prefixed with `-` if the submodule is not
- initialized, `+` if the currently checked out submodule commit
+ SHA-1. Each SHA-1 will possibly be prefixed with `-` if the submodule is
+ not initialized, `+` if the currently checked out submodule commit
does not match the SHA-1 found in the index of the containing
repository and `U` if the submodule has merge conflicts.
+
@@ -132,15 +132,15 @@
the submodules. The "updating" can be done in several ways depending
on command line options and the value of `submodule.<name>.update`
configuration variable. The command line option takes precedence over
-the configuration variable. if neither is given, a checkout is performed.
-update procedures supported both from the command line as well as setting
-`submodule.<name>.update`:
+the configuration variable. If neither is given, a 'checkout' is performed.
+The 'update' procedures supported both from the command line as well as
+through the `submodule.<name>.update` configuration are:
checkout;; the commit recorded in the superproject will be
checked out in the submodule on a detached HEAD.
+
If `--force` is specified, the submodule will be checked out (using
-`git checkout --force` if appropriate), even if the commit specified
+`git checkout --force`), even if the commit specified
in the index of the containing repository already matches the commit
checked out in the submodule.
@@ -150,8 +150,8 @@
merge;; the commit recorded in the superproject will be merged
into the current branch in the submodule.
-The following procedures are only available via the `submodule.<name>.update`
-configuration variable:
+The following 'update' procedures are only available via the
+`submodule.<name>.update` configuration variable:
custom command;; arbitrary shell command that takes a single
argument (the sha1 of the commit recorded in the
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index aa2aeab..636e090 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -424,7 +424,7 @@
'set-tree'::
You should consider using 'dcommit' instead of this command.
Commit specified commit or tree objects to SVN. This relies on
- your imported fetch data being up-to-date. This makes
+ your imported fetch data being up to date. This makes
absolutely no attempts to do patching when committing to SVN, it
simply overwrites files with those specified in the tree or
commit. All merging is assumed to have taken place
diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt
index a14e6ae..ad2383d 100644
--- a/Documentation/git-update-index.txt
+++ b/Documentation/git-update-index.txt
@@ -16,9 +16,11 @@
[--chmod=(+|-)x]
[--[no-]assume-unchanged]
[--[no-]skip-worktree]
+ [--[no-]fsmonitor-valid]
[--ignore-submodules]
[--[no-]split-index]
[--[no-|test-|force-]untracked-cache]
+ [--[no-]fsmonitor]
[--really-refresh] [--unresolve] [--again | -g]
[--info-only] [--index-info]
[-z] [--stdin] [--index-version <n>]
@@ -111,6 +113,12 @@
set and unset the "skip-worktree" bit for the paths. See
section "Skip-worktree bit" below for more information.
+--[no-]fsmonitor-valid::
+ When one of these flags is specified, the object name recorded
+ for the paths are not updated. Instead, these options
+ set and unset the "fsmonitor valid" bit for the paths. See
+ section "File System Monitor" below for more information.
+
-g::
--again::
Runs 'git update-index' itself on the paths whose index
@@ -201,6 +209,15 @@
`--untracked-cache` used to imply `--test-untracked-cache` but
this option would enable the extension unconditionally.
+--fsmonitor::
+--no-fsmonitor::
+ Enable or disable files system monitor feature. These options
+ take effect whatever the value of the `core.fsmonitor`
+ configuration variable (see linkgit:git-config[1]). But a warning
+ is emitted when the change goes against the configured value, as
+ the configured value will take effect next time the index is
+ read and this will remove the intended effect of the option.
+
\--::
Do not interpret any more arguments as options.
@@ -214,7 +231,7 @@
Using --refresh
---------------
`--refresh` does not calculate a new sha1 file or bring the index
-up-to-date for mode/content changes. But what it *does* do is to
+up to date for mode/content changes. But what it *does* do is to
"re-match" the stat information of a file with the index, so that you
can refresh the index for a file that hasn't been changed but where
the stat entry is out of date.
@@ -447,6 +464,34 @@
are used, the untracked cache is immediately added to or removed from
the index.
+File System Monitor
+-------------------
+
+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
+"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.
+
+When used in conjunction with the untracked cache, it can further improve
+performance by avoiding the cost of scanning the entire working directory
+looking for new files.
+
+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
+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.
+
+When the `core.fsmonitor` configuration variable is changed, the
+file system monitor is added to or removed from the index the next time
+a command reads the index. When `--[no-]fsmonitor` are used, the file
+system monitor is immediately added to or removed from the index.
+
Configuration
-------------
diff --git a/Documentation/git-worktree.txt b/Documentation/git-worktree.txt
index b472acc..5ac3f68 100644
--- a/Documentation/git-worktree.txt
+++ b/Documentation/git-worktree.txt
@@ -9,7 +9,7 @@
SYNOPSIS
--------
[verse]
-'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<branch>]
+'git worktree add' [-f] [--detach] [--checkout] [--lock] [-b <new-branch>] <path> [<commit-ish>]
'git worktree list' [--porcelain]
'git worktree lock' [--reason <string>] <worktree>
'git worktree prune' [-n] [-v] [--expire <expire>]
@@ -45,14 +45,23 @@
COMMANDS
--------
-add <path> [<branch>]::
+add <path> [<commit-ish>]::
-Create `<path>` and checkout `<branch>` into it. The new working directory
+Create `<path>` and checkout `<commit-ish>` into it. The new working directory
is linked to the current repository, sharing everything except working
directory specific files such as HEAD, index, etc. `-` may also be
-specified as `<branch>`; it is synonymous with `@{-1}`.
+specified as `<commit-ish>`; it is synonymous with `@{-1}`.
+
-If `<branch>` is omitted and neither `-b` nor `-B` nor `--detach` used,
+If <commit-ish> is a branch name (call it `<branch>`) and is not found,
+and neither `-b` nor `-B` nor `--detach` are used, but there does
+exist a tracking branch in exactly one remote (call it `<remote>`)
+with a matching name, treat as equivalent to:
++
+------------
+$ git worktree add --track -b <branch> <path> <remote>/<branch>
+------------
++
+If `<commit-ish>` is omitted and neither `-b` nor `-B` nor `--detach` used,
then, as a convenience, a new branch based at HEAD is created automatically,
as if `-b $(basename <path>)` was specified.
@@ -84,29 +93,45 @@
-f::
--force::
- By default, `add` refuses to create a new working tree when `<branch>`
+ By default, `add` refuses to create a new working tree when `<commit-ish>` is a branch name and
is already checked out by another working tree. This option overrides
that safeguard.
-b <new-branch>::
-B <new-branch>::
With `add`, create a new branch named `<new-branch>` starting at
- `<branch>`, and check out `<new-branch>` into the new working tree.
- If `<branch>` is omitted, it defaults to HEAD.
+ `<commit-ish>`, and check out `<new-branch>` into the new working tree.
+ 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
- `<branch>`.
+ `<commit-ish>`.
--detach::
With `add`, detach HEAD in the new working tree. See "DETACHED HEAD"
in linkgit:git-checkout[1].
--[no-]checkout::
- By default, `add` checks out `<branch>`, however, `--no-checkout` can
+ By default, `add` checks out `<commit-ish>`, however, `--no-checkout` can
be used to suppress checkout in order to make customizations,
such as configuring sparse-checkout. See "Sparse checkout"
in linkgit:git-read-tree[1].
+--[no-]guess-remote::
+ With `worktree add <path>`, without `<commit-ish>`, instead
+ of creating a new branch from HEAD, if there exists a tracking
+ branch in exactly one remote matching the basename of `<path>`,
+ base the new branch on the remote-tracking branch, and mark
+ the remote-tracking branch as "upstream" from the new branch.
++
+This can also be set up as the default behaviour by using the
+`worktree.guessRemote` config option.
+
+--[no-]track::
+ When creating a new branch, if `<commit-ish>` is a branch,
+ mark it as "upstream" from the new branch. This is the
+ default if `<commit-ish>` is a remote-tracking branch. See
+ "--track" in linkgit:git-branch[1] for details.
+
--lock::
Keep the working tree locked after creation. This is the
equivalent of `git worktree lock` after `git worktree add`,
diff --git a/Documentation/git.txt b/Documentation/git.txt
index 98b9b46..8163b57 100644
--- a/Documentation/git.txt
+++ b/Documentation/git.txt
@@ -159,6 +159,10 @@
Add "icase" magic to all pathspec. This is equivalent to setting
the `GIT_ICASE_PATHSPECS` environment variable to `1`.
+--no-optional-locks::
+ Do not perform optional operations that require locks. This is
+ equivalent to setting the `GIT_OPTIONAL_LOCKS` to `0`.
+
GIT COMMANDS
------------
@@ -518,11 +522,10 @@
If either of these environment variables is set then 'git fetch'
and 'git push' will use the specified command instead of 'ssh'
when they need to connect to a remote system.
- The command will be given exactly two or four arguments: the
- 'username@host' (or just 'host') from the URL and the shell
- command to execute on that remote system, optionally preceded by
- `-p` (literally) and the 'port' from the URL when it specifies
- something other than the default SSH port.
+ The command-line parameters passed to the configured command are
+ determined by the ssh variant. See `ssh.variant` option in
+ linkgit:git-config[1] for details.
+
+
`$GIT_SSH_COMMAND` takes precedence over `$GIT_SSH`, and is interpreted
by the shell, which allows additional arguments to be included.
@@ -591,6 +594,10 @@
Unsetting the variable, or setting it to empty, "0" or
"false" (case insensitive) disables trace messages.
+`GIT_TRACE_FSMONITOR`::
+ Enables trace messages for the filesystem monitor extension.
+ See `GIT_TRACE` for available trace output options.
+
`GIT_TRACE_PACK_ACCESS`::
Enables trace messages for all accesses to any packs. For each
access, the pack file name and an offset in the pack is
@@ -639,6 +646,16 @@
variable.
See `GIT_TRACE` for available trace output options.
+`GIT_TRACE_CURL_NO_DATA`::
+ When a curl trace is enabled (see `GIT_TRACE_CURL` above), do not dump
+ data (that is, only dump info lines and headers).
+
+`GIT_REDACT_COOKIES`::
+ This can be set to a comma-separated list of strings. When a curl trace
+ is enabled (see `GIT_TRACE_CURL` above), whenever a "Cookies:" header
+ sent by the client is dumped, values of cookies whose key is in that
+ list (case-sensitive) are redacted.
+
`GIT_LITERAL_PATHSPECS`::
Setting this variable to `1` will cause Git to treat all
pathspecs literally, rather than as glob patterns. For example,
@@ -697,6 +714,47 @@
which feed potentially-untrusted URLS to git commands. See
linkgit:git-config[1] for more details.
+`GIT_PROTOCOL`::
+ For internal use only. Used in handshaking the wire protocol.
+ Contains a colon ':' separated list of keys with optional values
+ 'key[=value]'. Presence of unknown keys and values must be
+ ignored.
+
+`GIT_OPTIONAL_LOCKS`::
+ If set to `0`, Git will complete any requested operation without
+ performing any optional sub-operations that require taking a lock.
+ For example, this will prevent `git status` from refreshing the
+ index as a side effect. This is useful for processes running in
+ the background which do not want to cause lock contention with
+ other operations on the repository. Defaults to `1`.
+
+`GIT_REDIRECT_STDIN`::
+`GIT_REDIRECT_STDOUT`::
+`GIT_REDIRECT_STDERR`::
+ Windows-only: allow redirecting the standard input/output/error
+ handles to paths specified by the environment variables. This is
+ particularly useful in multi-threaded applications where the
+ canonical way to pass standard handles via `CreateProcess()` is
+ not an option because it would require the handles to be marked
+ inheritable (and consequently *every* spawned process would
+ inherit them, possibly blocking regular Git operations). The
+ primary intended use case is to use named pipes for communication
+ (e.g. `\\.\pipe\my-git-stdin-123`).
++
+Two special values are supported: `off` will simply close the
+corresponding standard handle, and if `GIT_REDIRECT_STDERR` is
+`2>&1`, standard error will be redirected to the same handle as
+standard output.
+
+`GIT_PRINT_SHA1_ELLIPSIS` (deprecated)::
+ If set to `yes`, print an ellipsis following an
+ (abbreviated) SHA-1 value. This affects indications of
+ detached HEADs (linkgit:git-checkout[1]) and the raw
+ diff output (linkgit:git-diff[1]). Printing an
+ ellipsis in the cases mentioned is no longer considered
+ adequate and support for it is likely to be removed in the
+ foreseeable future (along with the variable).
+
Discussion[[Discussion]]
------------------------
diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt
index 4c68bc1..30687de 100644
--- a/Documentation/gitattributes.txt
+++ b/Documentation/gitattributes.txt
@@ -232,8 +232,7 @@
-------------------------------------------------
$ echo "* text=auto" >.gitattributes
-$ git read-tree --empty # Clean index, force re-scan of working directory
-$ git add .
+$ git add --renormalize .
$ git status # Show files that will be normalized
$ git commit -m "Introduce end-of-line normalization"
-------------------------------------------------
@@ -328,6 +327,9 @@
into a usable content by setting the filter.<driver>.required configuration
variable to `true`.
+Note: Whenever the clean filter is changed, the repo should be renormalized:
+$ git add --renormalize .
+
For example, in .gitattributes, you would assign the `filter`
attribute for paths.
diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt
index 7577f27..e29a9ef 100644
--- a/Documentation/gitcore-tutorial.txt
+++ b/Documentation/gitcore-tutorial.txt
@@ -631,7 +631,7 @@
$ git update-index --refresh
----------------
+
-in the new repository to make sure that the index file is up-to-date.
+in the new repository to make sure that the index file is up to date.
Note that the second point is true even across machines. You can
duplicate a remote Git repository with *any* regular copy mechanism, be it
@@ -701,7 +701,7 @@
----------------
where the `-u` flag means that you want the checkout to keep the index
-up-to-date (so that you don't have to refresh it afterward), and the
+up to date (so that you don't have to refresh it afterward), and the
`-a` flag means "check out all files" (if you have a stale copy or an
older version of a checked out tree you may also need to add the `-f`
flag first, to tell 'git checkout-index' to *force* overwriting of any old
@@ -1283,7 +1283,7 @@
First, you need to create an empty repository on the remote
machine that will house your public repository. This empty
-repository will be populated and be kept up-to-date by pushing
+repository will be populated and be kept up to date by pushing
into it later. Obviously, this repository creation needs to be
done only once.
@@ -1450,7 +1450,7 @@
would contain a call to 'git update-server-info'
but you need to manually enable the hook with
`mv post-update.sample post-update`. This makes sure
-'git update-server-info' keeps the necessary files up-to-date.
+'git update-server-info' keeps the necessary files up to date.
3. Push into the public repository from your primary
repository.
diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt
index b2514f4..f877f7b 100644
--- a/Documentation/githooks.txt
+++ b/Documentation/githooks.txt
@@ -121,17 +121,16 @@
means a failure of the hook and aborts the commit. It should not
be used as replacement for pre-commit hook.
-The sample `prepare-commit-msg` hook that comes with Git comments
-out the `Conflicts:` part of a merge's commit message.
+The sample `prepare-commit-msg` hook that comes with Git removes the
+help message found in the commented portion of the commit template.
commit-msg
~~~~~~~~~~
-This hook is invoked by 'git commit', and can be bypassed
-with the `--no-verify` option. It takes a single parameter, the
-name of the file that holds the proposed commit log message.
-Exiting with a non-zero status causes the 'git commit' to
-abort.
+This hook is invoked by 'git commit' and 'git merge', and can be
+bypassed with the `--no-verify` option. It takes a single parameter,
+the name of the file that holds the proposed commit log message.
+Exiting with a non-zero status causes the command to abort.
The hook is allowed to edit the message file in place, and can be used
to normalize the message into some project standard format. It
@@ -171,7 +170,8 @@
It is also run after 'git clone', unless the --no-checkout (-n) option is
used. The first parameter given to the hook is the null-ref, the second the
-ref of the new HEAD and the flag is always 1.
+ref of the new HEAD and the flag is always 1. Likewise for 'git worktree add'
+unless --no-checkout is used.
This hook can be used to perform repository validity checks, auto-display
differences from the previous HEAD if different, or set working dir metadata
@@ -224,8 +224,8 @@
pre-receive
~~~~~~~~~~~
-This hook is invoked by 'git-receive-pack' on the remote repository,
-which happens when a 'git push' is done on a local repository.
+This hook is invoked by 'git-receive-pack' when it reacts to
+'git push' and updates reference(s) in its repository.
Just before starting to update refs on the remote repository, the
pre-receive hook is invoked. Its exit status determines the success
or failure of the update.
@@ -265,8 +265,8 @@
update
~~~~~~
-This hook is invoked by 'git-receive-pack' on the remote repository,
-which happens when a 'git push' is done on a local repository.
+This hook is invoked by 'git-receive-pack' when it reacts to
+'git push' and updates reference(s) in its repository.
Just before updating the ref on the remote repository, the update hook
is invoked. Its exit status determines the success or failure of
the ref update.
@@ -310,8 +310,8 @@
post-receive
~~~~~~~~~~~~
-This hook is invoked by 'git-receive-pack' on the remote repository,
-which happens when a 'git push' is done on a local repository.
+This hook is invoked by 'git-receive-pack' when it reacts to
+'git push' and updates reference(s) in its repository.
It executes on the remote repository once after all the refs have
been updated.
@@ -349,8 +349,8 @@
post-update
~~~~~~~~~~~
-This hook is invoked by 'git-receive-pack' on the remote repository,
-which happens when a 'git push' is done on a local repository.
+This hook is invoked by 'git-receive-pack' when it reacts to
+'git push' and updates reference(s) in its repository.
It executes on the remote repository once after all the refs have
been updated.
@@ -369,7 +369,7 @@
When enabled, the default 'post-update' hook runs
'git update-server-info' to keep the information used by dumb
-transports (e.g., HTTP) up-to-date. If you are publishing
+transports (e.g., HTTP) up to date. If you are publishing
a Git repository that is accessible via HTTP, you should
probably enable this hook.
@@ -380,8 +380,8 @@
push-to-checkout
~~~~~~~~~~~~~~~~
-This hook is invoked by 'git-receive-pack' on the remote repository,
-which happens when a 'git push' is done on a local repository, when
+This hook is invoked by 'git-receive-pack' when it reacts to
+'git push' and updates reference(s) in its repository, and when
the push tries to update the branch that is currently checked out
and the `receive.denyCurrentBranch` configuration variable is set to
`updateInstead`. Such a push by default is refused if the working
@@ -455,6 +455,34 @@
non-zero status causes 'git send-email' to abort before sending any
e-mails.
+fsmonitor-watchman
+~~~~~~~~~~~~~~~~~~
+
+This hook is invoked when the configuration option core.fsmonitor is
+set to .git/hooks/fsmonitor-watchman. It takes two arguments, a version
+(currently 1) and the time in elapsed nanoseconds since midnight,
+January 1, 1970.
+
+The hook should output to stdout the list of all files in the working
+directory that may have changed since the requested time. The logic
+should be inclusive so that it does not miss any potential changes.
+The paths should be relative to the root of the working directory
+and be separated by a single NUL.
+
+It is OK to include files which have not actually changed. All changes
+including newly-created and deleted files should be included. When
+files are renamed, both the old and the new name should be included.
+
+Git will limit what files it checks for changes as well as which
+directories are checked for untracked files based on the path names
+given.
+
+An optimized way to tell git "all files have changed" is to return
+the filename '/'.
+
+The exit status determines whether git will use the data from the
+hook to limit its search. On error, it will fall back to verifying
+all files and folders.
GIT
---
diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt
index 63260f0..ff5d7f9 100644
--- a/Documentation/gitignore.txt
+++ b/Documentation/gitignore.txt
@@ -102,12 +102,11 @@
(relative to the toplevel of the work tree if not from a
`.gitignore` file).
- - Otherwise, Git treats the pattern as a shell glob suitable
- for consumption by fnmatch(3) with the FNM_PATHNAME flag:
- wildcards in the pattern will not match a / in the pathname.
- For example, "Documentation/{asterisk}.html" matches
- "Documentation/git.html" but not "Documentation/ppc/ppc.html"
- or "tools/perf/Documentation/perf.html".
+ - Otherwise, Git treats the pattern as a shell glob: "`*`" matches
+ anything except "`/`", "`?`" matches any one character except "`/`"
+ and "`[]`" matches one character in a selected range. See
+ fnmatch(3) and the FNM_PATHNAME flag for a more detailed
+ description.
- A leading slash matches the beginning of the pathname.
For example, "/{asterisk}.c" matches "cat-file.c" but not
diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt
index f51ed4e..c60bcad 100644
--- a/Documentation/gitrepository-layout.txt
+++ b/Documentation/gitrepository-layout.txt
@@ -71,7 +71,7 @@
This file is to help dumb transports discover what packs
are available in this object store. Whenever a pack is
added or removed, `git update-server-info` should be run
- to keep this file up-to-date if the repository is
+ to keep this file up to date if the repository is
published for dumb transports. 'git repack' does this
by default.
@@ -208,6 +208,10 @@
'git clean' look at it but the core Git commands do not look
at it. See also: linkgit:gitignore[5].
+info/attributes::
+ Defines which attributes to assign to a path, similar to per-directory
+ `.gitattributes` files. See also: linkgit:gitattributes[5].
+
info/sparse-checkout::
This file stores sparse checkout patterns.
See also: linkgit:git-read-tree[1].
diff --git a/Documentation/gitsubmodules.txt b/Documentation/gitsubmodules.txt
index 46cf120..4d6c177 100644
--- a/Documentation/gitsubmodules.txt
+++ b/Documentation/gitsubmodules.txt
@@ -36,8 +36,8 @@
superproject expects the submodule’s working directory to be at.
The section `submodule.foo.*` in the `.gitmodules` file gives additional
-hints to Gits porcelain layer such as where to obtain the submodule via
-the `submodule.foo.url` setting.
+hints to Git's porcelain layer. For example, the `submodule.foo.url`
+setting specifies where to obtain the submodule.
Submodules can be used for at least two different use cases:
@@ -51,18 +51,21 @@
2. Splitting a (logically single) project into multiple
repositories and tying them back together. This can be used to
- overcome current limitations of Gits implementation to have
+ overcome current limitations of Git's implementation to have
finer grained access:
- * Size of the git repository:
+ * Size of the Git repository:
In its current form Git scales up poorly for large repositories containing
content that is not compressed by delta computation between trees.
- However you can also use submodules to e.g. hold large binary assets
- and these repositories are then shallowly cloned such that you do not
+ For example, you can use submodules to hold large binary assets
+ and these repositories can be shallowly cloned such that you do not
have a large history locally.
* Transfer size:
In its current form Git requires the whole working tree present. It
does not allow partial trees to be transferred in fetch or clone.
+ If the project you work on consists of multiple repositories tied
+ together as submodules in a superproject, you can avoid fetching the
+ working trees of the repositories you are not interested in.
* Access control:
By restricting user access to submodules, this can be used to implement
read/write policies for different users.
@@ -73,9 +76,10 @@
Submodule operations can be configured using the following mechanisms
(from highest to lowest precedence):
- * The command line for those commands that support taking submodule specs.
- Most commands have a boolean flag '--recurse-submodules' whether to
- recurse into submodules. Examples are `ls-files` or `checkout`.
+ * The command line for those commands that support taking submodules
+ as part of their pathspecs. Most commands have a boolean flag
+ `--recurse-submodules` which specify whether to recurse into submodules.
+ Examples are `grep` and `checkout`.
Some commands take enums, such as `fetch` and `push`, where you can
specify how submodules are affected.
@@ -87,8 +91,8 @@
For example an effect from the submodule's `.gitignore` file
would be observed when you run `git status --ignore-submodules=none` in
the superproject. This collects information from the submodule's working
-directory by running `status` in the submodule, which does pay attention
-to its `.gitignore` file.
+directory by running `status` in the submodule while paying attention
+to the `.gitignore` file of the submodule.
+
The submodule's `$GIT_DIR/config` file would come into play when running
`git push --recurse-submodules=check` in the superproject, as this would
@@ -97,20 +101,20 @@
file.
* The configuration file `$GIT_DIR/config` in the superproject.
- Typical configuration at this place is controlling if a submodule
- is recursed into at all via the `active` flag for example.
+ Git only recurses into active submodules (see "ACTIVE SUBMODULES"
+ section below).
+
If the submodule is not yet initialized, then the configuration
-inside the submodule does not exist yet, so configuration where to
+inside the submodule does not exist yet, so where to
obtain the submodule from is configured here for example.
- * the `.gitmodules` file inside the superproject. Additionally to the
- required mapping between submodule's name and path, a project usually
+ * The `.gitmodules` file inside the superproject. A project usually
uses this file to suggest defaults for the upstream collection
- of repositories.
+ of repositories for the mapping that is required between a
+ submodule's name and its path.
+
-This file mainly serves as the mapping between name and path in
-the superproject, such that the submodule's git directory can be
+This file mainly serves as the mapping between the name and path of submodules
+in the superproject, such that the submodule's Git directory can be
located.
+
If the submodule has never been initialized, this is the only place
@@ -137,8 +141,8 @@
of the superproject.
* Deinitialized submodule: A `gitlink`, and a `.gitmodules` entry,
-but no submodule working directory. The submodule’s git directory
-may be there as after deinitializing the git directory is kept around.
+but no submodule working directory. The submodule’s Git directory
+may be there as after deinitializing the Git directory is kept around.
The directory which is supposed to be the working directory is empty instead.
+
A submodule can be deinitialized by running `git submodule deinit`.
@@ -160,6 +164,60 @@
To completely remove a submodule, manually delete
`$GIT_DIR/modules/<name>/`.
+ACTIVE SUBMODULES
+-----------------
+
+A submodule is considered active,
+
+ (a) if `submodule.<name>.active` is set to `true`
+ or
+ (b) if the submodule's path matches the pathspec in `submodule.active`
+ or
+ (c) if `submodule.<name>.url` is set.
+
+and these are evaluated in this order.
+
+For example:
+
+ [submodule "foo"]
+ active = false
+ url = https://example.org/foo
+ [submodule "bar"]
+ active = true
+ url = https://example.org/bar
+ [submodule "baz"]
+ url = https://example.org/baz
+
+In the above config only the submodule 'bar' and 'baz' are active,
+'bar' due to (a) and 'baz' due to (c). 'foo' is inactive because
+(a) takes precedence over (c)
+
+Note that (c) is a historical artefact and will be ignored if the
+(a) and (b) specify that the submodule is not active. In other words,
+if we have an `submodule.<name>.active` set to `false` or if the
+submodule's path is excluded in the pathspec in `submodule.active`, the
+url doesn't matter whether it is present or not. This is illustrated in
+the example that follows.
+
+ [submodule "foo"]
+ active = true
+ url = https://example.org/foo
+ [submodule "bar"]
+ url = https://example.org/bar
+ [submodule "baz"]
+ url = https://example.org/baz
+ [submodule "bob"]
+ ignore = true
+ [submodule]
+ active = b*
+ active = :(exclude) baz
+
+In here all submodules except 'baz' (foo, bar, bob) are active.
+'foo' due to its own active flag and all the others due to the
+submodule active pathspec, which specifies that any submodule
+starting with 'b' except 'baz' are also active, regardless of the
+presence of the .url field.
+
Workflow for a third party library
----------------------------------
diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt
index 794b833..242de31 100644
--- a/Documentation/gittutorial.txt
+++ b/Documentation/gittutorial.txt
@@ -109,7 +109,7 @@
$ git status
On branch master
Changes to be committed:
-Your branch is up-to-date with 'origin/master'.
+Your branch is up to date with 'origin/master'.
(use "git reset HEAD <file>..." to unstage)
modified: file1
diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt
index 177610e..926e044 100644
--- a/Documentation/gitworkflows.txt
+++ b/Documentation/gitworkflows.txt
@@ -40,7 +40,7 @@
to split one big commit into several. Don't be afraid of making too
small or imperfect steps along the way. You can always go back later
and edit the commits with `git rebase --interactive` before you
-publish them. You can use `git stash save --keep-index` to run the
+publish them. You can use `git stash push --keep-index` to run the
test suite independent of other uncommitted changes; see the EXAMPLES
section of linkgit:git-stash[1].
@@ -407,8 +407,8 @@
`git pull <url> <branch>`
=====================================
-Occasionally, the maintainer may get merge conflicts when he tries to
-pull changes from downstream. In this case, he can ask downstream to
+Occasionally, the maintainer may get merge conflicts when they try to
+pull changes from downstream. In this case, they can ask downstream to
do the merge and resolve the conflicts themselves (perhaps they will
know better how to resolve them). It is one of the rare cases where
downstream 'should' merge from upstream.
diff --git a/Documentation/install-doc-quick.sh b/Documentation/install-doc-quick.sh
index 327f69b..17231d8 100755
--- a/Documentation/install-doc-quick.sh
+++ b/Documentation/install-doc-quick.sh
@@ -3,11 +3,12 @@
repository=${1?repository}
destdir=${2?destination}
+GIT_MAN_REF=${3?master}
-head=master GIT_DIR=
+GIT_DIR=
for d in "$repository/.git" "$repository"
do
- if GIT_DIR="$d" git rev-parse refs/heads/master >/dev/null 2>&1
+ if GIT_DIR="$d" git rev-parse "$GIT_MAN_REF" >/dev/null 2>&1
then
GIT_DIR="$d"
export GIT_DIR
@@ -27,12 +28,12 @@
rm -f "$GIT_INDEX_FILE"
trap 'rm -f "$GIT_INDEX_FILE"' 0
-git read-tree $head
+git read-tree "$GIT_MAN_REF"
git checkout-index -a -f --prefix="$destdir"/
if test -n "$GZ"
then
- git ls-tree -r --name-only $head |
+ git ls-tree -r --name-only "$GIT_MAN_REF" |
xargs printf "$destdir/%s\n" |
xargs gzip -f
fi
diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt
index df3ea37..12b6bbf 100644
--- a/Documentation/merge-config.txt
+++ b/Documentation/merge-config.txt
@@ -26,6 +26,10 @@
allowed (equivalent to giving the `--ff-only` option from the
command line).
+merge.verifySignatures::
+ If true, this is equivalent to the --verify-signatures command
+ line option. See linkgit:git-merge[1] for details.
+
include::fmt-merge-msg-config.txt[]
merge.renameLimit::
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 5b4a62e..3888c3f 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -39,9 +39,15 @@
--ff-only::
Refuse to merge and exit with a non-zero status unless the
- current `HEAD` is already up-to-date or the merge can be
+ current `HEAD` is already up to date or the merge can be
resolved as a fast-forward.
+-S[<keyid>]::
+--gpg-sign[=<keyid>]::
+ GPG-sign the resulting merge commit. The `keyid` argument is
+ optional and defaults to the committer identity; if specified,
+ it must be stuck to the option without a space.
+
--log[=<n>]::
--no-log::
In addition to branch names, populate the log message with
@@ -51,6 +57,16 @@
With --no-log do not list one-line descriptions from the
actual commits being merged.
+--signoff::
+--no-signoff::
+ Add Signed-off-by line by the committer at the end of the commit
+ log message. The meaning of a signoff depends on the project,
+ but it typically certifies that committer has
+ the rights to submit this work under the same license and
+ agrees to a Developer Certificate of Origin
+ (see http://developercertificate.org/ for more information).
++
+With --no-signoff do not add a Signed-off-by line.
--stat::
-n::
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt
index a09d597..fd5d748 100644
--- a/Documentation/merge-strategies.txt
+++ b/Documentation/merge-strategies.txt
@@ -58,11 +58,12 @@
ignore-space-change;;
ignore-all-space;;
ignore-space-at-eol;;
+ignore-cr-at-eol;;
Treats lines with the indicated type of whitespace change as
unchanged for the sake of a three-way merge. Whitespace
changes mixed with other changes to a line are not ignored.
- See also linkgit:git-diff[1] `-b`, `-w`, and
- `--ignore-space-at-eol`.
+ See also linkgit:git-diff[1] `-b`, `-w`,
+ `--ignore-space-at-eol`, and `--ignore-cr-at-eol`.
+
* If 'their' version only introduces whitespace changes to a line,
'our' version is used;
diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt
index 973d196..e664c08 100644
--- a/Documentation/pretty-formats.txt
+++ b/Documentation/pretty-formats.txt
@@ -204,8 +204,13 @@
than given and there are spaces on its left, use those spaces
- '%><(<N>)', '%><|(<N>)': similar to '% <(<N>)', '%<|(<N>)'
respectively, but padding both sides (i.e. the text is centered)
-- %(trailers): display the trailers of the body as interpreted by
- linkgit:git-interpret-trailers[1]
+- %(trailers[:options]): display the trailers of the body as interpreted
+ by linkgit:git-interpret-trailers[1]. The `trailers` string may be
+ followed by a colon and zero or more comma-separated options. If the
+ `only` option is given, omit non-trailer lines from the trailer block.
+ If the `unfold` option is given, behave as if interpret-trailer's
+ `--unfold` option was given. E.g., `%(trailers:only,unfold)` to do
+ both.
NOTE: Some placeholders may depend on other options given to the
revision traversal engine. For example, the `%g*` reflog options will
diff --git a/Documentation/rebase-config.txt b/Documentation/rebase-config.txt
new file mode 100644
index 0000000..42e1ba7
--- /dev/null
+++ b/Documentation/rebase-config.txt
@@ -0,0 +1,52 @@
+rebase.stat::
+ Whether to show a diffstat of what changed upstream since the last
+ rebase. False by default.
+
+rebase.autoSquash::
+ If set to true enable `--autosquash` option by default.
+
+rebase.autoStash::
+ When set to true, automatically create a temporary stash entry
+ before the operation begins, and apply it after the operation
+ ends. This means that you can run rebase on a dirty worktree.
+ However, use with care: the final stash application after a
+ successful rebase might result in non-trivial conflicts.
+ This option can be overridden by the `--no-autostash` and
+ `--autostash` options of linkgit:git-rebase[1].
+ Defaults to false.
+
+rebase.missingCommitsCheck::
+ If set to "warn", git rebase -i will print a warning if some
+ commits are removed (e.g. a line was deleted), however the
+ rebase will still proceed. If set to "error", it will print
+ the previous warning and stop the rebase, 'git rebase
+ --edit-todo' can then be used to correct the error. If set to
+ "ignore", no checking is done.
+ To drop a commit without warning or error, use the `drop`
+ command in the todo list.
+ Defaults to "ignore".
+
+rebase.instructionFormat::
+ A format string, as specified in linkgit:git-log[1], to be used for the
+ todo list during an interactive rebase. The format will
+ automatically have the long commit hash prepended to the format.
+
+rebase.abbreviateCommands::
+ If set to true, `git rebase` will use abbreviated command names in the
+ todo list resulting in something like this:
++
+-------------------------------------------
+ p deadbee The oneline of the commit
+ p fa1afe1 The oneline of the next commit
+ ...
+-------------------------------------------
++
+instead of:
++
+-------------------------------------------
+ pick deadbee The oneline of the commit
+ pick fa1afe1 The oneline of the next commit
+ ...
+-------------------------------------------
++
+Defaults to false.
diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt
index a6cf9eb..22f5c9b 100644
--- a/Documentation/rev-list-options.txt
+++ b/Documentation/rev-list-options.txt
@@ -184,6 +184,14 @@
Pretend as if all objects mentioned by reflogs are listed on the
command line as `<commit>`.
+--single-worktree::
+ By default, all working trees will be examined by the
+ following options when there are more than one (see
+ linkgit:git-worktree[1]): `--all`, `--reflog` and
+ `--indexed-objects`.
+ This option forces them to examine the current working tree
+ only.
+
--ignore-missing::
Upon seeing an invalid object name in the input, pretend as if
the bad input was not given.
@@ -678,6 +686,11 @@
all object IDs which I need to download if I have the commit
object _bar_ but not _foo_''.
+--in-commit-order::
+ Print tree and blob ids in order of the commits. The tree
+ and blob ids are printed after they are first referenced
+ by a commit.
+
--objects-edge::
Similar to `--objects`, but also print the IDs of excluded
commits prefixed with a ``-'' character. This is used by
@@ -698,6 +711,47 @@
--unpacked::
Only useful with `--objects`; print the object IDs that are not
in packs.
+
+--filter=<filter-spec>::
+ Only useful with one of the `--objects*`; omits objects (usually
+ blobs) from the list of printed objects. The '<filter-spec>'
+ may be one of the following:
++
+The form '--filter=blob:none' omits all blobs.
++
+The form '--filter=blob:limit=<n>[kmg]' omits blobs larger than n bytes
+or units. n may be zero. The suffixes k, m, and g can be used to name
+units in KiB, MiB, or GiB. For example, 'blob:limit=1k' is the same
+as 'blob:limit=1024'.
++
+The form '--filter=sparse:oid=<blob-ish>' uses a sparse-checkout
+specification contained in the blob (or blob-expression) '<blob-ish>'
+to omit blobs that would not be not required for a sparse checkout on
+the requested refs.
++
+The form '--filter=sparse:path=<path>' similarly uses a sparse-checkout
+specification contained in <path>.
+
+--no-filter::
+ Turn off any previous `--filter=` argument.
+
+--filter-print-omitted::
+ Only useful with `--filter=`; prints a list of the objects omitted
+ by the filter. Object IDs are prefixed with a ``~'' character.
+
+--missing=<missing-action>::
+ A debug option to help with future "partial clone" development.
+ This option specifies how missing objects are handled.
++
+The form '--missing=error' requests that rev-list stop with an error if
+a missing object is encountered. This is the default action.
++
+The form '--missing=allow-any' will allow object traversal to continue
+if a missing object is encountered. Missing objects will silently be
+omitted from the results.
++
+The form '--missing=print' is like 'allow-any', but will also print a
+list of the missing objects. Object IDs are prefixed with a ``?'' character.
endif::git-rev-list[]
--no-walk[=(sorted|unsorted)]::
@@ -791,11 +845,11 @@
--parents::
Print also the parents of the commit (in the form "commit parent...").
- Also enables parent rewriting, see 'History Simplification' below.
+ Also enables parent rewriting, see 'History Simplification' above.
--children::
Print also the children of the commit (in the form "commit child...").
- Also enables parent rewriting, see 'History Simplification' below.
+ Also enables parent rewriting, see 'History Simplification' above.
ifdef::git-rev-list[]
--timestamp::
@@ -838,7 +892,7 @@
to be drawn properly.
Cannot be combined with `--no-walk`.
+
-This enables parent rewriting, see 'History Simplification' below.
+This enables parent rewriting, see 'History Simplification' above.
+
This implies the `--topo-order` option by default, but the
`--date-order` option may also be specified.
diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt
index 6127746..dfcc49c 100644
--- a/Documentation/revisions.txt
+++ b/Documentation/revisions.txt
@@ -271,7 +271,7 @@
for commits that are reachable from r2 excluding those that are reachable
from r1 by '{caret}r1 r2' and it can be written as 'r1..r2'.
-The '...' (three dot) Symmetric Difference Notation::
+The '...' (three-dot) Symmetric Difference Notation::
A similar notation 'r1\...r2' is called symmetric difference
of 'r1' and 'r2' and is defined as
'r1 r2 --not $(git merge-base --all r1 r2)'.
diff --git a/Documentation/technical/api-argv-array.txt b/Documentation/technical/api-argv-array.txt
index cfc0630..870c8ed 100644
--- a/Documentation/technical/api-argv-array.txt
+++ b/Documentation/technical/api-argv-array.txt
@@ -8,7 +8,7 @@
makes the result suitable for passing to functions expecting to receive
argv from main(), or the link:api-run-command.html[run-command API].
-The link:api-string-list.html[string-list API] is similar, but cannot be
+The string-list API (documented in string-list.h) is similar, but cannot be
used for these purposes; instead of storing a straight string pointer,
it contains an item structure with a `util` field that is not compatible
with the traditional argv interface.
diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt
index 20741f3..9a778b0 100644
--- a/Documentation/technical/api-config.txt
+++ b/Documentation/technical/api-config.txt
@@ -186,7 +186,7 @@
Same as `git_config_bool`, except that integers are returned as-is, and
an `is_bool` flag is unset.
-`git_config_maybe_bool`::
+`git_parse_maybe_bool`::
Same as `git_config_bool`, except that it returns -1 on error rather
than dying.
diff --git a/Documentation/technical/api-decorate.txt b/Documentation/technical/api-decorate.txt
deleted file mode 100644
index 1d52a6c..0000000
--- a/Documentation/technical/api-decorate.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-decorate API
-============
-
-Talk about <decorate.h>
-
-(Linus)
diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt
index 6c77b49..7fae00f 100644
--- a/Documentation/technical/api-directory-listing.txt
+++ b/Documentation/technical/api-directory-listing.txt
@@ -22,16 +22,20 @@
`flags`::
- A bit-field of options (the `*IGNORED*` flags are mutually exclusive):
+ A bit-field of options:
`DIR_SHOW_IGNORED`:::
- Return just ignored files in `entries[]`, not untracked files.
+ Return just ignored files in `entries[]`, not untracked
+ files. This flag is mutually exclusive with
+ `DIR_SHOW_IGNORED_TOO`.
`DIR_SHOW_IGNORED_TOO`:::
- Similar to `DIR_SHOW_IGNORED`, but return ignored files in `ignored[]`
- in addition to untracked files in `entries[]`.
+ Similar to `DIR_SHOW_IGNORED`, but return ignored files in
+ `ignored[]` in addition to untracked files in
+ `entries[]`. This flag is mutually exclusive with
+ `DIR_SHOW_IGNORED`.
`DIR_KEEP_UNTRACKED_CONTENTS`:::
@@ -39,6 +43,21 @@
untracked contents of untracked directories are also returned in
`entries[]`.
+`DIR_SHOW_IGNORED_TOO_MODE_MATCHING`:::
+
+ Only has meaning if `DIR_SHOW_IGNORED_TOO` is also set; if
+ this is set, returns ignored files and directories that match
+ an exclude pattern. If a directory matches an exclude pattern,
+ then the directory is returned and the contained paths are
+ not. A directory that does not match an exclude pattern will
+ not be returned even if all of its contents are ignored. In
+ this case, the contents are returned as individual entries.
++
+If this is set, files and directories that explicity match an ignore
+pattern are reported. Implicity ignored directories (directories that
+do not match an ignore pattern, but whose contents are all ignored)
+are not reported, instead all of the contents are reported.
+
`DIR_COLLECT_IGNORED`:::
Special mode for git-add. Return ignored files in `ignored[]` and
diff --git a/Documentation/technical/api-ref-iteration.txt b/Documentation/technical/api-ref-iteration.txt
index 37379d8..46c3d5c 100644
--- a/Documentation/technical/api-ref-iteration.txt
+++ b/Documentation/technical/api-ref-iteration.txt
@@ -32,11 +32,8 @@
* `for_each_glob_ref_in()` the previous and `for_each_ref_in()` combined.
-* `head_ref_submodule()`, `for_each_ref_submodule()`,
- `for_each_ref_in_submodule()`, `for_each_tag_ref_submodule()`,
- `for_each_branch_ref_submodule()`, `for_each_remote_ref_submodule()`
- do the same as the functions described above but for a specified
- submodule.
+* Use `refs_` API for accessing submodules. The submodule ref store could
+ be obtained with `get_submodule_ref_store()`.
* `for_each_rawref()` can be used to learn about broken ref and symref.
diff --git a/Documentation/technical/api-string-list.txt b/Documentation/technical/api-string-list.txt
deleted file mode 100644
index c08402b..0000000
--- a/Documentation/technical/api-string-list.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-string-list API
-===============
-
-The string_list API offers a data structure and functions to handle
-sorted and unsorted string lists. A "sorted" list is one whose
-entries are sorted by string value in `strcmp()` order.
-
-The 'string_list' struct used to be called 'path_list', but was renamed
-because it is not specific to paths.
-
-The caller:
-
-. Allocates and clears a `struct string_list` variable.
-
-. Initializes the members. You might want to set the flag `strdup_strings`
- if the strings should be strdup()ed. For example, this is necessary
- when you add something like git_path("..."), since that function returns
- a static buffer that will change with the next call to git_path().
-+
-If you need something advanced, you can manually malloc() the `items`
-member (you need this if you add things later) and you should set the
-`nr` and `alloc` members in that case, too.
-
-. Adds new items to the list, using `string_list_append`,
- `string_list_append_nodup`, `string_list_insert`,
- `string_list_split`, and/or `string_list_split_in_place`.
-
-. Can check if a string is in the list using `string_list_has_string` or
- `unsorted_string_list_has_string` and get it from the list using
- `string_list_lookup` for sorted lists.
-
-. Can sort an unsorted list using `string_list_sort`.
-
-. Can remove duplicate items from a sorted list using
- `string_list_remove_duplicates`.
-
-. Can remove individual items of an unsorted list using
- `unsorted_string_list_delete_item`.
-
-. Can remove items not matching a criterion from a sorted or unsorted
- list using `filter_string_list`, or remove empty strings using
- `string_list_remove_empty_items`.
-
-. Finally it should free the list using `string_list_clear`.
-
-Example:
-
-----
-struct string_list list = STRING_LIST_INIT_NODUP;
-int i;
-
-string_list_append(&list, "foo");
-string_list_append(&list, "bar");
-for (i = 0; i < list.nr; i++)
- printf("%s\n", list.items[i].string)
-----
-
-NOTE: It is more efficient to build an unsorted list and sort it
-afterwards, instead of building a sorted list (`O(n log n)` instead of
-`O(n^2)`).
-+
-However, if you use the list to check if a certain string was added
-already, you should not do that (using unsorted_string_list_has_string()),
-because the complexity would be quadratic again (but with a worse factor).
-
-Functions
----------
-
-* General ones (works with sorted and unsorted lists as well)
-
-`string_list_init`::
-
- Initialize the members of the string_list, set `strdup_strings`
- member according to the value of the second parameter.
-
-`filter_string_list`::
-
- Apply a function to each item in a list, retaining only the
- items for which the function returns true. If free_util is
- true, call free() on the util members of any items that have
- to be deleted. Preserve the order of the items that are
- retained.
-
-`string_list_remove_empty_items`::
-
- Remove any empty strings from the list. If free_util is true,
- call free() on the util members of any items that have to be
- deleted. Preserve the order of the items that are retained.
-
-`print_string_list`::
-
- Dump a string_list to stdout, useful mainly for debugging purposes. It
- can take an optional header argument and it writes out the
- string-pointer pairs of the string_list, each one in its own line.
-
-`string_list_clear`::
-
- Free a string_list. The `string` pointer of the items will be freed in
- case the `strdup_strings` member of the string_list is set. The second
- parameter controls if the `util` pointer of the items should be freed
- or not.
-
-* Functions for sorted lists only
-
-`string_list_has_string`::
-
- Determine if the string_list has a given string or not.
-
-`string_list_insert`::
-
- Insert a new element to the string_list. The returned pointer can be
- handy if you want to write something to the `util` pointer of the
- string_list_item containing the just added string. If the given
- string already exists the insertion will be skipped and the
- pointer to the existing item returned.
-+
-Since this function uses xrealloc() (which die()s if it fails) if the
-list needs to grow, it is safe not to check the pointer. I.e. you may
-write `string_list_insert(...)->util = ...;`.
-
-`string_list_lookup`::
-
- Look up a given string in the string_list, returning the containing
- string_list_item. If the string is not found, NULL is returned.
-
-`string_list_remove_duplicates`::
-
- Remove all but the first of consecutive entries that have the
- same string value. If free_util is true, call free() on the
- util members of any items that have to be deleted.
-
-* Functions for unsorted lists only
-
-`string_list_append`::
-
- Append a new string to the end of the string_list. If
- `strdup_string` is set, then the string argument is copied;
- otherwise the new `string_list_entry` refers to the input
- string.
-
-`string_list_append_nodup`::
-
- Append a new string to the end of the string_list. The new
- `string_list_entry` always refers to the input string, even if
- `strdup_string` is set. This function can be used to hand
- ownership of a malloc()ed string to a `string_list` that has
- `strdup_string` set.
-
-`string_list_sort`::
-
- Sort the list's entries by string value in `strcmp()` order.
-
-`unsorted_string_list_has_string`::
-
- It's like `string_list_has_string()` but for unsorted lists.
-
-`unsorted_string_list_lookup`::
-
- It's like `string_list_lookup()` but for unsorted lists.
-+
-The above two functions need to look through all items, as opposed to their
-counterpart for sorted lists, which performs a binary search.
-
-`unsorted_string_list_delete_item`::
-
- Remove an item from a string_list. The `string` pointer of the items
- will be freed in case the `strdup_strings` member of the string_list
- is set. The third parameter controls if the `util` pointer of the
- items should be freed or not.
-
-`string_list_split`::
-`string_list_split_in_place`::
-
- Split a string into substrings on a delimiter character and
- append the substrings to a `string_list`. If `maxsplit` is
- non-negative, then split at most `maxsplit` times. Return the
- number of substrings appended to the list.
-+
-`string_list_split` requires a `string_list` that has `strdup_strings`
-set to true; it leaves the input string untouched and makes copies of
-the substrings in newly-allocated memory.
-`string_list_split_in_place` requires a `string_list` that has
-`strdup_strings` set to false; it splits the input string in place,
-overwriting the delimiter characters with NULs and creating new
-string_list_items that point into the original string (the original
-string must therefore not be modified or freed while the `string_list`
-is in use).
-
-
-Data structures
----------------
-
-* `struct string_list_item`
-
-Represents an item of the list. The `string` member is a pointer to the
-string, and you may use the `util` member for any purpose, if you want.
-
-* `struct string_list`
-
-Represents the list itself.
-
-. The array of items are available via the `items` member.
-. The `nr` member contains the number of items stored in the list.
-. The `alloc` member is used to avoid reallocating at every insertion.
- You should not tamper with it.
-. Setting the `strdup_strings` member to 1 will strdup() the strings
- before adding them, see above.
-. The `compare_strings_fn` member is used to specify a custom compare
- function, otherwise `strcmp()` is used as the default function.
diff --git a/Documentation/technical/api-submodule-config.txt b/Documentation/technical/api-submodule-config.txt
index 3dce003..ee907c4 100644
--- a/Documentation/technical/api-submodule-config.txt
+++ b/Documentation/technical/api-submodule-config.txt
@@ -4,7 +4,7 @@
The submodule config cache API allows to read submodule
configurations/information from specified revisions. Internally
information is lazily read into a cache that is used to avoid
-unnecessary parsing of the same .gitmodule files. Lookups can be done by
+unnecessary parsing of the same .gitmodules files. Lookups can be done by
submodule path or name.
Usage
diff --git a/Documentation/technical/api-tree-walking.txt b/Documentation/technical/api-tree-walking.txt
index 14af37c..bde1862 100644
--- a/Documentation/technical/api-tree-walking.txt
+++ b/Documentation/technical/api-tree-walking.txt
@@ -55,9 +55,9 @@
`fill_tree_descriptor`::
- Initialize a `tree_desc` and decode its first entry given the sha1 of
- a tree. Returns the `buffer` member if the sha1 is a valid tree
- identifier and NULL otherwise.
+ Initialize a `tree_desc` and decode its first entry given the
+ object ID of a tree. Returns the `buffer` member if the latter
+ is a valid tree identifier and NULL otherwise.
`setup_traverse_info`::
diff --git a/Documentation/technical/hash-function-transition.txt b/Documentation/technical/hash-function-transition.txt
new file mode 100644
index 0000000..417ba49
--- /dev/null
+++ b/Documentation/technical/hash-function-transition.txt
@@ -0,0 +1,797 @@
+Git hash function transition
+============================
+
+Objective
+---------
+Migrate Git from SHA-1 to a stronger hash function.
+
+Background
+----------
+At its core, the Git version control system is a content addressable
+filesystem. It uses the SHA-1 hash function to name content. For
+example, files, directories, and revisions are referred to by hash
+values unlike in other traditional version control systems where files
+or versions are referred to via sequential numbers. The use of a hash
+function to address its content delivers a few advantages:
+
+* Integrity checking is easy. Bit flips, for example, are easily
+ detected, as the hash of corrupted content does not match its name.
+* Lookup of objects is fast.
+
+Using a cryptographically secure hash function brings additional
+advantages:
+
+* Object names can be signed and third parties can trust the hash to
+ address the signed object and all objects it references.
+* Communication using Git protocol and out of band communication
+ methods have a short reliable string that can be used to reliably
+ address stored content.
+
+Over time some flaws in SHA-1 have been discovered by security
+researchers. https://shattered.io demonstrated a practical SHA-1 hash
+collision. As a result, SHA-1 cannot be considered cryptographically
+secure any more. This impacts the communication of hash values because
+we cannot trust that a given hash value represents the known good
+version of content that the speaker intended.
+
+SHA-1 still possesses the other properties such as fast object lookup
+and safe error checking, but other hash functions are equally suitable
+that are believed to be cryptographically secure.
+
+Goals
+-----
+Where NewHash is a strong 256-bit hash function to replace SHA-1 (see
+"Selection of a New Hash", below):
+
+1. The transition to NewHash can be done one local repository at a time.
+ a. Requiring no action by any other party.
+ b. A NewHash repository can communicate with SHA-1 Git servers
+ (push/fetch).
+ c. Users can use SHA-1 and NewHash identifiers for objects
+ interchangeably (see "Object names on the command line", below).
+ d. New signed objects make use of a stronger hash function than
+ SHA-1 for their security guarantees.
+2. Allow a complete transition away from SHA-1.
+ a. Local metadata for SHA-1 compatibility can be removed from a
+ repository if compatibility with SHA-1 is no longer needed.
+3. Maintainability throughout the process.
+ a. The object format is kept simple and consistent.
+ b. Creation of a generalized repository conversion tool.
+
+Non-Goals
+---------
+1. Add NewHash support to Git protocol. This is valuable and the
+ logical next step but it is out of scope for this initial design.
+2. Transparently improving the security of existing SHA-1 signed
+ objects.
+3. Intermixing objects using multiple hash functions in a single
+ repository.
+4. Taking the opportunity to fix other bugs in Git's formats and
+ protocols.
+5. Shallow clones and fetches into a NewHash repository. (This will
+ change when we add NewHash support to Git protocol.)
+6. Skip fetching some submodules of a project into a NewHash
+ repository. (This also depends on NewHash support in Git
+ protocol.)
+
+Overview
+--------
+We introduce a new repository format extension. Repositories with this
+extension enabled use NewHash instead of SHA-1 to name their objects.
+This affects both object names and object content --- both the names
+of objects and all references to other objects within an object are
+switched to the new hash function.
+
+NewHash repositories cannot be read by older versions of Git.
+
+Alongside the packfile, a NewHash repository stores a bidirectional
+mapping between NewHash and SHA-1 object names. The mapping is generated
+locally and can be verified using "git fsck". Object lookups use this
+mapping to allow naming objects using either their SHA-1 and NewHash names
+interchangeably.
+
+"git cat-file" and "git hash-object" gain options to display an object
+in its sha1 form and write an object given its sha1 form. This
+requires all objects referenced by that object to be present in the
+object database so that they can be named using the appropriate name
+(using the bidirectional hash mapping).
+
+Fetches from a SHA-1 based server convert the fetched objects into
+NewHash form and record the mapping in the bidirectional mapping table
+(see below for details). Pushes to a SHA-1 based server convert the
+objects being pushed into sha1 form so the server does not have to be
+aware of the hash function the client is using.
+
+Detailed Design
+---------------
+Repository format extension
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+A NewHash repository uses repository format version `1` (see
+Documentation/technical/repository-version.txt) with extensions
+`objectFormat` and `compatObjectFormat`:
+
+ [core]
+ repositoryFormatVersion = 1
+ [extensions]
+ objectFormat = newhash
+ compatObjectFormat = sha1
+
+Specifying a repository format extension ensures that versions of Git
+not aware of NewHash do not try to operate on these repositories,
+instead producing an error message:
+
+ $ git status
+ fatal: unknown repository extensions found:
+ objectformat
+ compatobjectformat
+
+See the "Transition plan" section below for more details on these
+repository extensions.
+
+Object names
+~~~~~~~~~~~~
+Objects can be named by their 40 hexadecimal digit sha1-name or 64
+hexadecimal digit newhash-name, plus names derived from those (see
+gitrevisions(7)).
+
+The sha1-name of an object is the SHA-1 of the concatenation of its
+type, length, a nul byte, and the object's sha1-content. This is the
+traditional <sha1> used in Git to name objects.
+
+The newhash-name of an object is the NewHash of the concatenation of its
+type, length, a nul byte, and the object's newhash-content.
+
+Object format
+~~~~~~~~~~~~~
+The content as a byte sequence of a tag, commit, or tree object named
+by sha1 and newhash differ because an object named by newhash-name refers to
+other objects by their newhash-names and an object named by sha1-name
+refers to other objects by their sha1-names.
+
+The newhash-content of an object is the same as its sha1-content, except
+that objects referenced by the object are named using their newhash-names
+instead of sha1-names. Because a blob object does not refer to any
+other object, its sha1-content and newhash-content are the same.
+
+The format allows round-trip conversion between newhash-content and
+sha1-content.
+
+Object storage
+~~~~~~~~~~~~~~
+Loose objects use zlib compression and packed objects use the packed
+format described in Documentation/technical/pack-format.txt, just like
+today. The content that is compressed and stored uses newhash-content
+instead of sha1-content.
+
+Pack index
+~~~~~~~~~~
+Pack index (.idx) files use a new v3 format that supports multiple
+hash functions. They have the following format (all integers are in
+network byte order):
+
+- A header appears at the beginning and consists of the following:
+ - The 4-byte pack index signature: '\377t0c'
+ - 4-byte version number: 3
+ - 4-byte length of the header section, including the signature and
+ version number
+ - 4-byte number of objects contained in the pack
+ - 4-byte number of object formats in this pack index: 2
+ - For each object format:
+ - 4-byte format identifier (e.g., 'sha1' for SHA-1)
+ - 4-byte length in bytes of shortened object names. This is the
+ shortest possible length needed to make names in the shortened
+ object name table unambiguous.
+ - 4-byte integer, recording where tables relating to this format
+ are stored in this index file, as an offset from the beginning.
+ - 4-byte offset to the trailer from the beginning of this file.
+ - Zero or more additional key/value pairs (4-byte key, 4-byte
+ value). Only one key is supported: 'PSRC'. See the "Loose objects
+ and unreachable objects" section for supported values and how this
+ is used. All other keys are reserved. Readers must ignore
+ unrecognized keys.
+- Zero or more NUL bytes. This can optionally be used to improve the
+ alignment of the full object name table below.
+- Tables for the first object format:
+ - A sorted table of shortened object names. These are prefixes of
+ the names of all objects in this pack file, packed together
+ without offset values to reduce the cache footprint of the binary
+ search for a specific object name.
+
+ - A table of full object names in pack order. This allows resolving
+ a reference to "the nth object in the pack file" (from a
+ reachability bitmap or from the next table of another object
+ format) to its object name.
+
+ - A table of 4-byte values mapping object name order to pack order.
+ For an object in the table of sorted shortened object names, the
+ value at the corresponding index in this table is the index in the
+ previous table for that same object.
+
+ This can be used to look up the object in reachability bitmaps or
+ to look up its name in another object format.
+
+ - A table of 4-byte CRC32 values of the packed object data, in the
+ order that the objects appear in the pack file. This is to allow
+ compressed data to be copied directly from pack to pack during
+ repacking without undetected data corruption.
+
+ - A table of 4-byte offset values. For an object in the table of
+ sorted shortened object names, the value at the corresponding
+ index in this table indicates where that object can be found in
+ the pack file. These are usually 31-bit pack file offsets, but
+ large offsets are encoded as an index into the next table with the
+ most significant bit set.
+
+ - A table of 8-byte offset entries (empty for pack files less than
+ 2 GiB). Pack files are organized with heavily used objects toward
+ the front, so most object references should not need to refer to
+ this table.
+- Zero or more NUL bytes.
+- Tables for the second object format, with the same layout as above,
+ up to and not including the table of CRC32 values.
+- Zero or more NUL bytes.
+- The trailer consists of the following:
+ - A copy of the 20-byte NewHash checksum at the end of the
+ corresponding packfile.
+
+ - 20-byte NewHash checksum of all of the above.
+
+Loose object index
+~~~~~~~~~~~~~~~~~~
+A new file $GIT_OBJECT_DIR/loose-object-idx contains information about
+all loose objects. Its format is
+
+ # loose-object-idx
+ (newhash-name SP sha1-name LF)*
+
+where the object names are in hexadecimal format. The file is not
+sorted.
+
+The loose object index is protected against concurrent writes by a
+lock file $GIT_OBJECT_DIR/loose-object-idx.lock. To add a new loose
+object:
+
+1. Write the loose object to a temporary file, like today.
+2. Open loose-object-idx.lock with O_CREAT | O_EXCL to acquire the lock.
+3. Rename the loose object into place.
+4. Open loose-object-idx with O_APPEND and write the new object
+5. Unlink loose-object-idx.lock to release the lock.
+
+To remove entries (e.g. in "git pack-refs" or "git-prune"):
+
+1. Open loose-object-idx.lock with O_CREAT | O_EXCL to acquire the
+ lock.
+2. Write the new content to loose-object-idx.lock.
+3. Unlink any loose objects being removed.
+4. Rename to replace loose-object-idx, releasing the lock.
+
+Translation table
+~~~~~~~~~~~~~~~~~
+The index files support a bidirectional mapping between sha1-names
+and newhash-names. The lookup proceeds similarly to ordinary object
+lookups. For example, to convert a sha1-name to a newhash-name:
+
+ 1. Look for the object in idx files. If a match is present in the
+ idx's sorted list of truncated sha1-names, then:
+ a. Read the corresponding entry in the sha1-name order to pack
+ name order mapping.
+ b. Read the corresponding entry in the full sha1-name table to
+ verify we found the right object. If it is, then
+ c. Read the corresponding entry in the full newhash-name table.
+ That is the object's newhash-name.
+ 2. Check for a loose object. Read lines from loose-object-idx until
+ we find a match.
+
+Step (1) takes the same amount of time as an ordinary object lookup:
+O(number of packs * log(objects per pack)). Step (2) takes O(number of
+loose objects) time. To maintain good performance it will be necessary
+to keep the number of loose objects low. See the "Loose objects and
+unreachable objects" section below for more details.
+
+Since all operations that make new objects (e.g., "git commit") add
+the new objects to the corresponding index, this mapping is possible
+for all objects in the object store.
+
+Reading an object's sha1-content
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The sha1-content of an object can be read by converting all newhash-names
+its newhash-content references to sha1-names using the translation table.
+
+Fetch
+~~~~~
+Fetching from a SHA-1 based server requires translating between SHA-1
+and NewHash based representations on the fly.
+
+SHA-1s named in the ref advertisement that are present on the client
+can be translated to NewHash and looked up as local objects using the
+translation table.
+
+Negotiation proceeds as today. Any "have"s generated locally are
+converted to SHA-1 before being sent to the server, and SHA-1s
+mentioned by the server are converted to NewHash when looking them up
+locally.
+
+After negotiation, the server sends a packfile containing the
+requested objects. We convert the packfile to NewHash format using
+the following steps:
+
+1. index-pack: inflate each object in the packfile and compute its
+ SHA-1. Objects can contain deltas in OBJ_REF_DELTA format against
+ objects the client has locally. These objects can be looked up
+ using the translation table and their sha1-content read as
+ described above to resolve the deltas.
+2. topological sort: starting at the "want"s from the negotiation
+ phase, walk through objects in the pack and emit a list of them,
+ excluding blobs, in reverse topologically sorted order, with each
+ object coming later in the list than all objects it references.
+ (This list only contains objects reachable from the "wants". If the
+ pack from the server contained additional extraneous objects, then
+ they will be discarded.)
+3. convert to newhash: open a new (newhash) packfile. Read the topologically
+ sorted list just generated. For each object, inflate its
+ sha1-content, convert to newhash-content, and write it to the newhash
+ pack. Record the new sha1<->newhash mapping entry for use in the idx.
+4. sort: reorder entries in the new pack to match the order of objects
+ in the pack the server generated and include blobs. Write a newhash idx
+ file
+5. clean up: remove the SHA-1 based pack file, index, and
+ topologically sorted list obtained from the server in steps 1
+ and 2.
+
+Step 3 requires every object referenced by the new object to be in the
+translation table. This is why the topological sort step is necessary.
+
+As an optimization, step 1 could write a file describing what non-blob
+objects each object it has inflated from the packfile references. This
+makes the topological sort in step 2 possible without inflating the
+objects in the packfile for a second time. The objects need to be
+inflated again in step 3, for a total of two inflations.
+
+Step 4 is probably necessary for good read-time performance. "git
+pack-objects" on the server optimizes the pack file for good data
+locality (see Documentation/technical/pack-heuristics.txt).
+
+Details of this process are likely to change. It will take some
+experimenting to get this to perform well.
+
+Push
+~~~~
+Push is simpler than fetch because the objects referenced by the
+pushed objects are already in the translation table. The sha1-content
+of each object being pushed can be read as described in the "Reading
+an object's sha1-content" section to generate the pack written by git
+send-pack.
+
+Signed Commits
+~~~~~~~~~~~~~~
+We add a new field "gpgsig-newhash" to the commit object format to allow
+signing commits without relying on SHA-1. It is similar to the
+existing "gpgsig" field. Its signed payload is the newhash-content of the
+commit object with any "gpgsig" and "gpgsig-newhash" fields removed.
+
+This means commits can be signed
+1. using SHA-1 only, as in existing signed commit objects
+2. using both SHA-1 and NewHash, by using both gpgsig-newhash and gpgsig
+ fields.
+3. using only NewHash, by only using the gpgsig-newhash field.
+
+Old versions of "git verify-commit" can verify the gpgsig signature in
+cases (1) and (2) without modifications and view case (3) as an
+ordinary unsigned commit.
+
+Signed Tags
+~~~~~~~~~~~
+We add a new field "gpgsig-newhash" to the tag object format to allow
+signing tags without relying on SHA-1. Its signed payload is the
+newhash-content of the tag with its gpgsig-newhash field and "-----BEGIN PGP
+SIGNATURE-----" delimited in-body signature removed.
+
+This means tags can be signed
+1. using SHA-1 only, as in existing signed tag objects
+2. using both SHA-1 and NewHash, by using gpgsig-newhash and an in-body
+ signature.
+3. using only NewHash, by only using the gpgsig-newhash field.
+
+Mergetag embedding
+~~~~~~~~~~~~~~~~~~
+The mergetag field in the sha1-content of a commit contains the
+sha1-content of a tag that was merged by that commit.
+
+The mergetag field in the newhash-content of the same commit contains the
+newhash-content of the same tag.
+
+Submodules
+~~~~~~~~~~
+To convert recorded submodule pointers, you need to have the converted
+submodule repository in place. The translation table of the submodule
+can be used to look up the new hash.
+
+Loose objects and unreachable objects
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Fast lookups in the loose-object-idx require that the number of loose
+objects not grow too high.
+
+"git gc --auto" currently waits for there to be 6700 loose objects
+present before consolidating them into a packfile. We will need to
+measure to find a more appropriate threshold for it to use.
+
+"git gc --auto" currently waits for there to be 50 packs present
+before combining packfiles. Packing loose objects more aggressively
+may cause the number of pack files to grow too quickly. This can be
+mitigated by using a strategy similar to Martin Fick's exponential
+rolling garbage collection script:
+https://gerrit-review.googlesource.com/c/gerrit/+/35215
+
+"git gc" currently expels any unreachable objects it encounters in
+pack files to loose objects in an attempt to prevent a race when
+pruning them (in case another process is simultaneously writing a new
+object that refers to the about-to-be-deleted object). This leads to
+an explosion in the number of loose objects present and disk space
+usage due to the objects in delta form being replaced with independent
+loose objects. Worse, the race is still present for loose objects.
+
+Instead, "git gc" will need to move unreachable objects to a new
+packfile marked as UNREACHABLE_GARBAGE (using the PSRC field; see
+below). To avoid the race when writing new objects referring to an
+about-to-be-deleted object, code paths that write new objects will
+need to copy any objects from UNREACHABLE_GARBAGE packs that they
+refer to to new, non-UNREACHABLE_GARBAGE packs (or loose objects).
+UNREACHABLE_GARBAGE are then safe to delete if their creation time (as
+indicated by the file's mtime) is long enough ago.
+
+To avoid a proliferation of UNREACHABLE_GARBAGE packs, they can be
+combined under certain circumstances. If "gc.garbageTtl" is set to
+greater than one day, then packs created within a single calendar day,
+UTC, can be coalesced together. The resulting packfile would have an
+mtime before midnight on that day, so this makes the effective maximum
+ttl the garbageTtl + 1 day. If "gc.garbageTtl" is less than one day,
+then we divide the calendar day into intervals one-third of that ttl
+in duration. Packs created within the same interval can be coalesced
+together. The resulting packfile would have an mtime before the end of
+the interval, so this makes the effective maximum ttl equal to the
+garbageTtl * 4/3.
+
+This rule comes from Thirumala Reddy Mutchukota's JGit change
+https://git.eclipse.org/r/90465.
+
+The UNREACHABLE_GARBAGE setting goes in the PSRC field of the pack
+index. More generally, that field indicates where a pack came from:
+
+ - 1 (PACK_SOURCE_RECEIVE) for a pack received over the network
+ - 2 (PACK_SOURCE_AUTO) for a pack created by a lightweight
+ "gc --auto" operation
+ - 3 (PACK_SOURCE_GC) for a pack created by a full gc
+ - 4 (PACK_SOURCE_UNREACHABLE_GARBAGE) for potential garbage
+ discovered by gc
+ - 5 (PACK_SOURCE_INSERT) for locally created objects that were
+ written directly to a pack file, e.g. from "git add ."
+
+This information can be useful for debugging and for "gc --auto" to
+make appropriate choices about which packs to coalesce.
+
+Caveats
+-------
+Invalid objects
+~~~~~~~~~~~~~~~
+The conversion from sha1-content to newhash-content retains any
+brokenness in the original object (e.g., tree entry modes encoded with
+leading 0, tree objects whose paths are not sorted correctly, and
+commit objects without an author or committer). This is a deliberate
+feature of the design to allow the conversion to round-trip.
+
+More profoundly broken objects (e.g., a commit with a truncated "tree"
+header line) cannot be converted but were not usable by current Git
+anyway.
+
+Shallow clone and submodules
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Because it requires all referenced objects to be available in the
+locally generated translation table, this design does not support
+shallow clone or unfetched submodules. Protocol improvements might
+allow lifting this restriction.
+
+Alternates
+~~~~~~~~~~
+For the same reason, a newhash repository cannot borrow objects from a
+sha1 repository using objects/info/alternates or
+$GIT_ALTERNATE_OBJECT_REPOSITORIES.
+
+git notes
+~~~~~~~~~
+The "git notes" tool annotates objects using their sha1-name as key.
+This design does not describe a way to migrate notes trees to use
+newhash-names. That migration is expected to happen separately (for
+example using a file at the root of the notes tree to describe which
+hash it uses).
+
+Server-side cost
+~~~~~~~~~~~~~~~~
+Until Git protocol gains NewHash support, using NewHash based storage
+on public-facing Git servers is strongly discouraged. Once Git
+protocol gains NewHash support, NewHash based servers are likely not
+to support SHA-1 compatibility, to avoid what may be a very expensive
+hash reencode during clone and to encourage peers to modernize.
+
+The design described here allows fetches by SHA-1 clients of a
+personal NewHash repository because it's not much more difficult than
+allowing pushes from that repository. This support needs to be guarded
+by a configuration option --- servers like git.kernel.org that serve a
+large number of clients would not be expected to bear that cost.
+
+Meaning of signatures
+~~~~~~~~~~~~~~~~~~~~~
+The signed payload for signed commits and tags does not explicitly
+name the hash used to identify objects. If some day Git adopts a new
+hash function with the same length as the current SHA-1 (40
+hexadecimal digit) or NewHash (64 hexadecimal digit) objects then the
+intent behind the PGP signed payload in an object signature is
+unclear:
+
+ object e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7
+ type commit
+ tag v2.12.0
+ tagger Junio C Hamano <gitster@pobox.com> 1487962205 -0800
+
+ Git 2.12
+
+Does this mean Git v2.12.0 is the commit with sha1-name
+e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7 or the commit with
+new-40-digit-hash-name e7e07d5a4fcc2a203d9873968ad3e6bd4d7419d7?
+
+Fortunately NewHash and SHA-1 have different lengths. If Git starts
+using another hash with the same length to name objects, then it will
+need to change the format of signed payloads using that hash to
+address this issue.
+
+Object names on the command line
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+To support the transition (see Transition plan below), this design
+supports four different modes of operation:
+
+ 1. ("dark launch") Treat object names input by the user as SHA-1 and
+ convert any object names written to output to SHA-1, but store
+ objects using NewHash. This allows users to test the code with no
+ visible behavior change except for performance. This allows
+ allows running even tests that assume the SHA-1 hash function, to
+ sanity-check the behavior of the new mode.
+
+ 2. ("early transition") Allow both SHA-1 and NewHash object names in
+ input. Any object names written to output use SHA-1. This allows
+ users to continue to make use of SHA-1 to communicate with peers
+ (e.g. by email) that have not migrated yet and prepares for mode 3.
+
+ 3. ("late transition") Allow both SHA-1 and NewHash object names in
+ input. Any object names written to output use NewHash. In this
+ mode, users are using a more secure object naming method by
+ default. The disruption is minimal as long as most of their peers
+ are in mode 2 or mode 3.
+
+ 4. ("post-transition") Treat object names input by the user as
+ NewHash and write output using NewHash. This is safer than mode 3
+ because there is less risk that input is incorrectly interpreted
+ using the wrong hash function.
+
+The mode is specified in configuration.
+
+The user can also explicitly specify which format to use for a
+particular revision specifier and for output, overriding the mode. For
+example:
+
+git --output-format=sha1 log abac87a^{sha1}..f787cac^{newhash}
+
+Selection of a New Hash
+-----------------------
+In early 2005, around the time that Git was written, Xiaoyun Wang,
+Yiqun Lisa Yin, and Hongbo Yu announced an attack finding SHA-1
+collisions in 2^69 operations. In August they published details.
+Luckily, no practical demonstrations of a collision in full SHA-1 were
+published until 10 years later, in 2017.
+
+The hash function NewHash to replace SHA-1 should be stronger than
+SHA-1 was: we would like it to be trustworthy and useful in practice
+for at least 10 years.
+
+Some other relevant properties:
+
+1. A 256-bit hash (long enough to match common security practice; not
+ excessively long to hurt performance and disk usage).
+
+2. High quality implementations should be widely available (e.g. in
+ OpenSSL).
+
+3. The hash function's properties should match Git's needs (e.g. Git
+ requires collision and 2nd preimage resistance and does not require
+ length extension resistance).
+
+4. As a tiebreaker, the hash should be fast to compute (fortunately
+ many contenders are faster than SHA-1).
+
+Some hashes under consideration are SHA-256, SHA-512/256, SHA-256x16,
+K12, and BLAKE2bp-256.
+
+Transition plan
+---------------
+Some initial steps can be implemented independently of one another:
+- adding a hash function API (vtable)
+- teaching fsck to tolerate the gpgsig-newhash field
+- excluding gpgsig-* from the fields copied by "git commit --amend"
+- annotating tests that depend on SHA-1 values with a SHA1 test
+ prerequisite
+- using "struct object_id", GIT_MAX_RAWSZ, and GIT_MAX_HEXSZ
+ consistently instead of "unsigned char *" and the hardcoded
+ constants 20 and 40.
+- introducing index v3
+- adding support for the PSRC field and safer object pruning
+
+
+The first user-visible change is the introduction of the objectFormat
+extension (without compatObjectFormat). This requires:
+- implementing the loose-object-idx
+- teaching fsck about this mode of operation
+- using the hash function API (vtable) when computing object names
+- signing objects and verifying signatures
+- rejecting attempts to fetch from or push to an incompatible
+ repository
+
+Next comes introduction of compatObjectFormat:
+- translating object names between object formats
+- translating object content between object formats
+- generating and verifying signatures in the compat format
+- adding appropriate index entries when adding a new object to the
+ object store
+- --output-format option
+- ^{sha1} and ^{newhash} revision notation
+- configuration to specify default input and output format (see
+ "Object names on the command line" above)
+
+The next step is supporting fetches and pushes to SHA-1 repositories:
+- allow pushes to a repository using the compat format
+- generate a topologically sorted list of the SHA-1 names of fetched
+ objects
+- convert the fetched packfile to newhash format and generate an idx
+ file
+- re-sort to match the order of objects in the fetched packfile
+
+The infrastructure supporting fetch also allows converting an existing
+repository. In converted repositories and new clones, end users can
+gain support for the new hash function without any visible change in
+behavior (see "dark launch" in the "Object names on the command line"
+section). In particular this allows users to verify NewHash signatures
+on objects in the repository, and it should ensure the transition code
+is stable in production in preparation for using it more widely.
+
+Over time projects would encourage their users to adopt the "early
+transition" and then "late transition" modes to take advantage of the
+new, more futureproof NewHash object names.
+
+When objectFormat and compatObjectFormat are both set, commands
+generating signatures would generate both SHA-1 and NewHash signatures
+by default to support both new and old users.
+
+In projects using NewHash heavily, users could be encouraged to adopt
+the "post-transition" mode to avoid accidentally making implicit use
+of SHA-1 object names.
+
+Once a critical mass of users have upgraded to a version of Git that
+can verify NewHash signatures and have converted their existing
+repositories to support verifying them, we can add support for a
+setting to generate only NewHash signatures. This is expected to be at
+least a year later.
+
+That is also a good moment to advertise the ability to convert
+repositories to use NewHash only, stripping out all SHA-1 related
+metadata. This improves performance by eliminating translation
+overhead and security by avoiding the possibility of accidentally
+relying on the safety of SHA-1.
+
+Updating Git's protocols to allow a server to specify which hash
+functions it supports is also an important part of this transition. It
+is not discussed in detail in this document but this transition plan
+assumes it happens. :)
+
+Alternatives considered
+-----------------------
+Upgrading everyone working on a particular project on a flag day
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Projects like the Linux kernel are large and complex enough that
+flipping the switch for all projects based on the repository at once
+is infeasible.
+
+Not only would all developers and server operators supporting
+developers have to switch on the same flag day, but supporting tooling
+(continuous integration, code review, bug trackers, etc) would have to
+be adapted as well. This also makes it difficult to get early feedback
+from some project participants testing before it is time for mass
+adoption.
+
+Using hash functions in parallel
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+(e.g. https://public-inbox.org/git/22708.8913.864049.452252@chiark.greenend.org.uk/ )
+Objects newly created would be addressed by the new hash, but inside
+such an object (e.g. commit) it is still possible to address objects
+using the old hash function.
+* You cannot trust its history (needed for bisectability) in the
+ future without further work
+* Maintenance burden as the number of supported hash functions grows
+ (they will never go away, so they accumulate). In this proposal, by
+ comparison, converted objects lose all references to SHA-1.
+
+Signed objects with multiple hashes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Instead of introducing the gpgsig-newhash field in commit and tag objects
+for newhash-content based signatures, an earlier version of this design
+added "hash newhash <newhash-name>" fields to strengthen the existing
+sha1-content based signatures.
+
+In other words, a single signature was used to attest to the object
+content using both hash functions. This had some advantages:
+* Using one signature instead of two speeds up the signing process.
+* Having one signed payload with both hashes allows the signer to
+ attest to the sha1-name and newhash-name referring to the same object.
+* All users consume the same signature. Broken signatures are likely
+ to be detected quickly using current versions of git.
+
+However, it also came with disadvantages:
+* Verifying a signed object requires access to the sha1-names of all
+ objects it references, even after the transition is complete and
+ translation table is no longer needed for anything else. To support
+ this, the design added fields such as "hash sha1 tree <sha1-name>"
+ and "hash sha1 parent <sha1-name>" to the newhash-content of a signed
+ commit, complicating the conversion process.
+* Allowing signed objects without a sha1 (for after the transition is
+ complete) complicated the design further, requiring a "nohash sha1"
+ field to suppress including "hash sha1" fields in the newhash-content
+ and signed payload.
+
+Lazily populated translation table
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Some of the work of building the translation table could be deferred to
+push time, but that would significantly complicate and slow down pushes.
+Calculating the sha1-name at object creation time at the same time it is
+being streamed to disk and having its newhash-name calculated should be
+an acceptable cost.
+
+Document History
+----------------
+
+2017-03-03
+bmwill@google.com, jonathantanmy@google.com, jrnieder@gmail.com,
+sbeller@google.com
+
+Initial version sent to
+http://public-inbox.org/git/20170304011251.GA26789@aiede.mtv.corp.google.com
+
+2017-03-03 jrnieder@gmail.com
+Incorporated suggestions from jonathantanmy and sbeller:
+* describe purpose of signed objects with each hash type
+* redefine signed object verification using object content under the
+ first hash function
+
+2017-03-06 jrnieder@gmail.com
+* Use SHA3-256 instead of SHA2 (thanks, Linus and brian m. carlson).[1][2]
+* Make sha3-based signatures a separate field, avoiding the need for
+ "hash" and "nohash" fields (thanks to peff[3]).
+* Add a sorting phase to fetch (thanks to Junio for noticing the need
+ for this).
+* Omit blobs from the topological sort during fetch (thanks to peff).
+* Discuss alternates, git notes, and git servers in the caveats
+ section (thanks to Junio Hamano, brian m. carlson[4], and Shawn
+ Pearce).
+* Clarify language throughout (thanks to various commenters,
+ especially Junio).
+
+2017-09-27 jrnieder@gmail.com, sbeller@google.com
+* use placeholder NewHash instead of SHA3-256
+* describe criteria for picking a hash function.
+* include a transition plan (thanks especially to Brandon Williams
+ for fleshing these ideas out)
+* define the translation table (thanks, Shawn Pearce[5], Jonathan
+ Tan, and Masaya Suzuki)
+* avoid loose object overhead by packing more aggressively in
+ "git gc --auto"
+
+[1] http://public-inbox.org/git/CA+55aFzJtejiCjV0e43+9oR3QuJK2PiFiLQemytoLpyJWe6P9w@mail.gmail.com/
+[2] http://public-inbox.org/git/CA+55aFz+gkAsDZ24zmePQuEs1XPS9BP_s8O7Q4wQ7LV7X5-oDA@mail.gmail.com/
+[3] http://public-inbox.org/git/20170306084353.nrns455dvkdsfgo5@sigill.intra.peff.net/
+[4] http://public-inbox.org/git/20170304224936.rqqtkdvfjgyezsht@genre.crustytoothpaste.net
+[5] https://public-inbox.org/git/CAJo=hJtoX9=AyLHHpUJS7fueV9ciZ_MNpnEPHUz8Whui6g9F0A@mail.gmail.com/
diff --git a/Documentation/technical/http-protocol.txt b/Documentation/technical/http-protocol.txt
index 1c561bd..a0e45f2 100644
--- a/Documentation/technical/http-protocol.txt
+++ b/Documentation/technical/http-protocol.txt
@@ -219,6 +219,10 @@
S: 003c2cb58b79488a98d2721cea644875a8dd0026b115 refs/tags/v1.0\n
S: 003fa3c2e2402b99163d1d59756e5f207ae21cccba4c refs/tags/v1.0^{}\n
+The client may send Extra Parameters (see
+Documentation/technical/pack-protocol.txt) as a colon-separated string
+in the Git-Protocol HTTP header.
+
Dumb Server Response
^^^^^^^^^^^^^^^^^^^^
Dumb servers MUST respond with the dumb server reply format.
@@ -269,7 +273,11 @@
named `HEAD` as the first ref. The stream MUST include capability
declarations behind a NUL on the first ref.
+The returned response contains "version 1" if "version=1" was sent as an
+Extra Parameter.
+
smart_reply = PKT-LINE("# service=$servicename" LF)
+ *1("version 1")
ref_list
"0000"
ref_list = empty_list / non_empty_list
diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt
index ade0b0c..db35726 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -295,3 +295,22 @@
in the previous ewah bitmap.
- One NUL.
+
+== File System Monitor cache
+
+ The file system monitor cache tracks files for which the core.fsmonitor
+ hook has told us about changes. The signature for this extension is
+ { 'F', 'S', 'M', 'N' }.
+
+ The extension starts with
+
+ - 32-bit version number: the current supported version is 1.
+
+ - 64-bit time: the extension data reflects all changes through the given
+ time which is stored as the nanoseconds elapsed since midnight,
+ January 1, 1970.
+
+ - 32-bit bitmap size: the size of the CE_FSMONITOR_VALID bitmap.
+
+ - An ewah bitmap, the n-th bit indicates whether the n-th index entry
+ is not CE_FSMONITOR_VALID.
diff --git a/Documentation/technical/pack-protocol.txt b/Documentation/technical/pack-protocol.txt
index a349171..cd31edc 100644
--- a/Documentation/technical/pack-protocol.txt
+++ b/Documentation/technical/pack-protocol.txt
@@ -39,6 +39,19 @@
The file:// transport runs the 'upload-pack' or 'receive-pack'
process locally and communicates with it over a pipe.
+Extra Parameters
+----------------
+
+The protocol provides a mechanism in which clients can send additional
+information in its first message to the server. These are called "Extra
+Parameters", and are supported by the Git, SSH, and HTTP protocols.
+
+Each Extra Parameter takes the form of `<key>=<value>` or `<key>`.
+
+Servers that receive any such Extra Parameters MUST ignore all
+unrecognized keys. Currently, the only Extra Parameter recognized is
+"version=1".
+
Git Transport
-------------
@@ -46,18 +59,25 @@
on the wire using the pkt-line format, followed by a NUL byte and a
hostname parameter, terminated by a NUL byte.
- 0032git-upload-pack /project.git\0host=myserver.com\0
+ 0033git-upload-pack /project.git\0host=myserver.com\0
+
+The transport may send Extra Parameters by adding an additional NUL
+byte, and then adding one or more NUL-terminated strings:
+
+ 003egit-upload-pack /project.git\0host=myserver.com\0\0version=1\0
--
- git-proto-request = request-command SP pathname NUL [ host-parameter NUL ]
+ git-proto-request = request-command SP pathname NUL
+ [ host-parameter NUL ] [ NUL extra-parameters ]
request-command = "git-upload-pack" / "git-receive-pack" /
"git-upload-archive" ; case sensitive
pathname = *( %x01-ff ) ; exclude NUL
host-parameter = "host=" hostname [ ":" port ]
+ extra-parameters = 1*extra-parameter
+ extra-parameter = 1*( %x01-ff ) NUL
--
-Only host-parameter is allowed in the git-proto-request. Clients
-MUST NOT attempt to send additional parameters. It is used for the
+host-parameter is used for the
git-daemon name based virtual hosting. See --interpolated-path
option to git daemon, with the %H/%CH format characters.
@@ -117,6 +137,12 @@
v
ssh user@example.com "git-upload-pack '~alice/project.git'"
+Depending on the value of the `protocol.version` configuration variable,
+Git may attempt to send Extra Parameters as a colon-separated string in
+the GIT_PROTOCOL environment variable. This is done only if
+the `ssh.variant` configuration variable indicates that the ssh command
+supports passing environment variables as an argument.
+
A few things to remember here:
- The "command name" is spelled with dash (e.g. git-upload-pack), but
@@ -137,11 +163,13 @@
-------------------
When the client initially connects the server will immediately respond
-with a listing of each reference it has (all branches and tags) along
+with a version number (if "version=1" is sent as an Extra Parameter),
+and a listing of each reference it has (all branches and tags) along
with the object name that each reference currently points to.
- $ echo -e -n "0039git-upload-pack /schacon/gitbook.git\0host=example.com\0" |
+ $ echo -e -n "0044git-upload-pack /schacon/gitbook.git\0host=example.com\0\0version=1\0" |
nc -v example.com 9418
+ 000aversion 1
00887217a7c7e582c46cec22a130adf4b9d7d950fba0 HEAD\0multi_ack thin-pack
side-band side-band-64k ofs-delta shallow no-progress include-tag
00441d3fcd5ced445d1abc402225c0b8a1299641f497 refs/heads/integration
@@ -165,7 +193,8 @@
MUST peel the ref if it's an annotated tag.
----
- advertised-refs = (no-refs / list-of-refs)
+ advertised-refs = *1("version 1")
+ (no-refs / list-of-refs)
*shallow
flush-pkt
@@ -199,7 +228,7 @@
terminate the connection by sending a flush-pkt, telling the server it can
now gracefully terminate, and disconnect, when it does not need any pack
data. This can happen with the ls-remote command, and also can happen when
-the client already is up-to-date.
+the client already is up to date.
Otherwise, it enters the negotiation phase, where the client and
server determine what the minimal packfile necessary for transport is,
diff --git a/Documentation/technical/partial-clone.txt b/Documentation/technical/partial-clone.txt
new file mode 100644
index 0000000..0bed247
--- /dev/null
+++ b/Documentation/technical/partial-clone.txt
@@ -0,0 +1,324 @@
+Partial Clone Design Notes
+==========================
+
+The "Partial Clone" feature is a performance optimization for Git that
+allows Git to function without having a complete copy of the repository.
+The goal of this work is to allow Git better handle extremely large
+repositories.
+
+During clone and fetch operations, Git downloads the complete contents
+and history of the repository. This includes all commits, trees, and
+blobs for the complete life of the repository. For extremely large
+repositories, clones can take hours (or days) and consume 100+GiB of disk
+space.
+
+Often in these repositories there are many blobs and trees that the user
+does not need such as:
+
+ 1. files outside of the user's work area in the tree. For example, in
+ a repository with 500K directories and 3.5M files in every commit,
+ we can avoid downloading many objects if the user only needs a
+ narrow "cone" of the source tree.
+
+ 2. large binary assets. For example, in a repository where large build
+ artifacts are checked into the tree, we can avoid downloading all
+ previous versions of these non-mergeable binary assets and only
+ download versions that are actually referenced.
+
+Partial clone allows us to avoid downloading such unneeded objects *in
+advance* during clone and fetch operations and thereby reduce download
+times and disk usage. Missing objects can later be "demand fetched"
+if/when needed.
+
+Use of partial clone requires that the user be online and the origin
+remote be available for on-demand fetching of missing objects. This may
+or may not be problematic for the user. For example, if the user can
+stay within the pre-selected subset of the source tree, they may not
+encounter any missing objects. Alternatively, the user could try to
+pre-fetch various objects if they know that they are going offline.
+
+
+Non-Goals
+---------
+
+Partial clone is a mechanism to limit the number of blobs and trees downloaded
+*within* a given range of commits -- and is therefore independent of and not
+intended to conflict with existing DAG-level mechanisms to limit the set of
+requested commits (i.e. shallow clone, single branch, or fetch '<refspec>').
+
+
+Design Overview
+---------------
+
+Partial clone logically consists of the following parts:
+
+- A mechanism for the client to describe unneeded or unwanted objects to
+ the server.
+
+- A mechanism for the server to omit such unwanted objects from packfiles
+ sent to the client.
+
+- A mechanism for the client to gracefully handle missing objects (that
+ were previously omitted by the server).
+
+- A mechanism for the client to backfill missing objects as needed.
+
+
+Design Details
+--------------
+
+- A new pack-protocol capability "filter" is added to the fetch-pack and
+ upload-pack negotiation.
+
+ This uses the existing capability discovery mechanism.
+ See "filter" in Documentation/technical/pack-protocol.txt.
+
+- Clients pass a "filter-spec" to clone and fetch which is passed to the
+ server to request filtering during packfile construction.
+
+ There are various filters available to accommodate different situations.
+ See "--filter=<filter-spec>" in Documentation/rev-list-options.txt.
+
+- On the server pack-objects applies the requested filter-spec as it
+ creates "filtered" packfiles for the client.
+
+ These filtered packfiles are *incomplete* in the traditional sense because
+ they may contain objects that reference objects not contained in the
+ packfile and that the client doesn't already have. For example, the
+ filtered packfile may contain trees or tags that reference missing blobs
+ or commits that reference missing trees.
+
+- On the client these incomplete packfiles are marked as "promisor packfiles"
+ and treated differently by various commands.
+
+- On the client a repository extension is added to the local config to
+ prevent older versions of git from failing mid-operation because of
+ missing objects that they cannot handle.
+ See "extensions.partialClone" in Documentation/technical/repository-version.txt"
+
+
+Handling Missing Objects
+------------------------
+
+- An object may be missing due to a partial clone or fetch, or missing due
+ to repository corruption. To differentiate these cases, the local
+ repository specially indicates such filtered packfiles obtained from the
+ promisor remote as "promisor packfiles".
+
+ These promisor packfiles consist of a "<name>.promisor" file with
+ arbitrary contents (like the "<name>.keep" files), in addition to
+ their "<name>.pack" and "<name>.idx" files.
+
+- The local repository considers a "promisor object" to be an object that
+ it knows (to the best of its ability) that the promisor remote has promised
+ that it has, either because the local repository has that object in one of
+ its promisor packfiles, or because another promisor object refers to it.
+
+ When Git encounters a missing object, Git can see if it a promisor object
+ and handle it appropriately. If not, Git can report a corruption.
+
+ This means that there is no need for the client to explicitly maintain an
+ expensive-to-modify list of missing objects.[a]
+
+- Since almost all Git code currently expects any referenced object to be
+ present locally and because we do not want to force every command to do
+ a dry-run first, a fallback mechanism is added to allow Git to attempt
+ to dynamically fetch missing objects from the promisor remote.
+
+ When the normal object lookup fails to find an object, Git invokes
+ fetch-object to try to get the object from the server and then retry
+ the object lookup. This allows objects to be "faulted in" without
+ complicated prediction algorithms.
+
+ For efficiency reasons, no check as to whether the missing object is
+ actually a promisor object is performed.
+
+ Dynamic object fetching tends to be slow as objects are fetched one at
+ a time.
+
+- `checkout` (and any other command using `unpack-trees`) has been taught
+ to bulk pre-fetch all required missing blobs in a single batch.
+
+- `rev-list` has been taught to print missing objects.
+
+ This can be used by other commands to bulk prefetch objects.
+ For example, a "git log -p A..B" may internally want to first do
+ something like "git rev-list --objects --quiet --missing=print A..B"
+ and prefetch those objects in bulk.
+
+- `fsck` has been updated to be fully aware of promisor objects.
+
+- `repack` in GC has been updated to not touch promisor packfiles at all,
+ and to only repack other objects.
+
+- The global variable "fetch_if_missing" is used to control whether an
+ object lookup will attempt to dynamically fetch a missing object or
+ report an error.
+
+ We are not happy with this global variable and would like to remove it,
+ but that requires significant refactoring of the object code to pass an
+ additional flag. We hope that concurrent efforts to add an ODB API can
+ encompass this.
+
+
+Fetching Missing Objects
+------------------------
+
+- Fetching of objects is done using the existing transport mechanism using
+ transport_fetch_refs(), setting a new transport option
+ TRANS_OPT_NO_DEPENDENTS to indicate that only the objects themselves are
+ desired, not any object that they refer to.
+
+ Because some transports invoke fetch_pack() in the same process, fetch_pack()
+ has been updated to not use any object flags when the corresponding argument
+ (no_dependents) is set.
+
+- The local repository sends a request with the hashes of all requested
+ objects as "want" lines, and does not perform any packfile negotiation.
+ It then receives a packfile.
+
+- Because we are reusing the existing fetch-pack mechanism, fetching
+ currently fetches all objects referred to by the requested objects, even
+ though they are not necessary.
+
+
+Current Limitations
+-------------------
+
+- The remote used for a partial clone (or the first partial fetch
+ following a regular clone) is marked as the "promisor remote".
+
+ We are currently limited to a single promisor remote and only that
+ remote may be used for subsequent partial fetches.
+
+ We accept this limitation because we believe initial users of this
+ feature will be using it on repositories with a strong single central
+ server.
+
+- Dynamic object fetching will only ask the promisor remote for missing
+ objects. We assume that the promisor remote has a complete view of the
+ repository and can satisfy all such requests.
+
+- Repack essentially treats promisor and non-promisor packfiles as 2
+ distinct partitions and does not mix them. Repack currently only works
+ on non-promisor packfiles and loose objects.
+
+- Dynamic object fetching invokes fetch-pack once *for each item*
+ because most algorithms stumble upon a missing object and need to have
+ it resolved before continuing their work. This may incur significant
+ overhead -- and multiple authentication requests -- if many objects are
+ needed.
+
+- Dynamic object fetching currently uses the existing pack protocol V0
+ which means that each object is requested via fetch-pack. The server
+ will send a full set of info/refs when the connection is established.
+ If there are large number of refs, this may incur significant overhead.
+
+
+Future Work
+-----------
+
+- Allow more than one promisor remote and define a strategy for fetching
+ missing objects from specific promisor remotes or of iterating over the
+ set of promisor remotes until a missing object is found.
+
+ A user might want to have multiple geographically-close cache servers
+ for fetching missing blobs while continuing to do filtered `git-fetch`
+ commands from the central server, for example.
+
+ Or the user might want to work in a triangular work flow with multiple
+ promisor remotes that each have an incomplete view of the repository.
+
+- Allow repack to work on promisor packfiles (while keeping them distinct
+ from non-promisor packfiles).
+
+- Allow non-pathname-based filters to make use of packfile bitmaps (when
+ present). This was just an omission during the initial implementation.
+
+- Investigate use of a long-running process to dynamically fetch a series
+ of objects, such as proposed in [5,6] to reduce process startup and
+ overhead costs.
+
+ It would be nice if pack protocol V2 could allow that long-running
+ process to make a series of requests over a single long-running
+ connection.
+
+- Investigate pack protocol V2 to avoid the info/refs broadcast on
+ each connection with the server to dynamically fetch missing objects.
+
+- Investigate the need to handle loose promisor objects.
+
+ Objects in promisor packfiles are allowed to reference missing objects
+ that can be dynamically fetched from the server. An assumption was
+ made that loose objects are only created locally and therefore should
+ not reference a missing object. We may need to revisit that assumption
+ if, for example, we dynamically fetch a missing tree and store it as a
+ loose object rather than a single object packfile.
+
+ This does not necessarily mean we need to mark loose objects as promisor;
+ it may be sufficient to relax the object lookup or is-promisor functions.
+
+
+Non-Tasks
+---------
+
+- Every time the subject of "demand loading blobs" comes up it seems
+ that someone suggests that the server be allowed to "guess" and send
+ additional objects that may be related to the requested objects.
+
+ No work has gone into actually doing that; we're just documenting that
+ it is a common suggestion. We're not sure how it would work and have
+ no plans to work on it.
+
+ It is valid for the server to send more objects than requested (even
+ for a dynamic object fetch), but we are not building on that.
+
+
+Footnotes
+---------
+
+[a] expensive-to-modify list of missing objects: Earlier in the design of
+ partial clone we discussed the need for a single list of missing objects.
+ This would essentially be a sorted linear list of OIDs that the were
+ omitted by the server during a clone or subsequent fetches.
+
+ This file would need to be loaded into memory on every object lookup.
+ It would need to be read, updated, and re-written (like the .git/index)
+ on every explicit "git fetch" command *and* on any dynamic object fetch.
+
+ The cost to read, update, and write this file could add significant
+ overhead to every command if there are many missing objects. For example,
+ if there are 100M missing blobs, this file would be at least 2GiB on disk.
+
+ With the "promisor" concept, we *infer* a missing object based upon the
+ type of packfile that references it.
+
+
+Related Links
+-------------
+[0] https://bugs.chromium.org/p/git/issues/detail?id=2
+ Chromium work item for: Partial Clone
+
+[1] https://public-inbox.org/git/20170113155253.1644-1-benpeart@microsoft.com/
+ Subject: [RFC] Add support for downloading blobs on demand
+ Date: Fri, 13 Jan 2017 10:52:53 -0500
+
+[2] https://public-inbox.org/git/cover.1506714999.git.jonathantanmy@google.com/
+ Subject: [PATCH 00/18] Partial clone (from clone to lazy fetch in 18 patches)
+ Date: Fri, 29 Sep 2017 13:11:36 -0700
+
+[3] https://public-inbox.org/git/20170426221346.25337-1-jonathantanmy@google.com/
+ Subject: Proposal for missing blob support in Git repos
+ Date: Wed, 26 Apr 2017 15:13:46 -0700
+
+[4] https://public-inbox.org/git/1488999039-37631-1-git-send-email-git@jeffhostetler.com/
+ Subject: [PATCH 00/10] RFC Partial Clone and Fetch
+ Date: Wed, 8 Mar 2017 18:50:29 +0000
+
+[5] https://public-inbox.org/git/20170505152802.6724-1-benpeart@microsoft.com/
+ Subject: [PATCH v7 00/10] refactor the filter process code into a reusable module
+ Date: Fri, 5 May 2017 11:27:52 -0400
+
+[6] https://public-inbox.org/git/20170714132651.170708-1-benpeart@microsoft.com/
+ Subject: [RFC/PATCH v2 0/1] Add support for downloading blobs on demand
+ Date: Fri, 14 Jul 2017 09:26:50 -0400
diff --git a/Documentation/technical/trivial-merge.txt b/Documentation/technical/trivial-merge.txt
index c79d4a7..1f1c33d 100644
--- a/Documentation/technical/trivial-merge.txt
+++ b/Documentation/technical/trivial-merge.txt
@@ -32,7 +32,7 @@
If multiple cases apply, the one used is listed first.
A result which changes the index is an error if the index is not empty
-and not up-to-date.
+and not up to date.
Entries marked '+' have stat information. Spaces marked '*' don't
affect the result.
@@ -65,7 +65,7 @@
left in stage 0, and there are no other entries.
A result of "no merge" is an error if the index is not empty and not
-up-to-date.
+up to date.
*empty* means that the tree must not have a directory-file conflict
with the entry.
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index bc29298..eff7890 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -319,7 +319,7 @@
git checkout -b new_branch_name
-HEAD is now at 427abfa... Linux v2.6.17
+HEAD is now at 427abfa Linux v2.6.17
------------------------------------------------
The HEAD then refers to the SHA-1 of the commit instead of to a branch,
@@ -508,7 +508,7 @@
If you run `git branch` at this point, you'll see that Git has
temporarily moved you in "(no branch)". HEAD is now detached from any
-branch and points directly to a commit (with commit id 65934...) that
+branch and points directly to a commit (with commit id 65934) that
is reachable from "master" but not from v2.6.18. Compile and test it,
and see whether it crashes. Assume it does crash. Then:
@@ -549,14 +549,14 @@
id, and check it out with:
-------------------------------------------------
-$ git reset --hard fb47ddb2db...
+$ git reset --hard fb47ddb2db
-------------------------------------------------
then test, run `bisect good` or `bisect bad` as appropriate, and
continue.
Instead of `git bisect visualize` and then `git reset --hard
-fb47ddb2db...`, you might just want to tell Git that you want to skip
+fb47ddb2db`, you might just want to tell Git that you want to skip
the current commit:
-------------------------------------------------
@@ -1556,7 +1556,7 @@
work-in-progress changes.
------------------------------------------------
-$ git stash save "work in progress for foo feature"
+$ git stash push -m "work in progress for foo feature"
------------------------------------------------
This command will save your changes away to the `stash`, and
@@ -2044,10 +2044,12 @@
remote branch, then it will fail with an error like:
-------------------------------------------------
-error: remote 'refs/heads/master' is not an ancestor of
- local 'refs/heads/master'.
- Maybe you are not up-to-date and need to pull first?
-error: failed to push to 'ssh://yourserver.com/~you/proj.git'
+ ! [rejected] master -> master (non-fast-forward)
+error: failed to push some refs to '...'
+hint: Updates were rejected because the tip of your current branch is behind
+hint: its remote counterpart. Integrate the remote changes (e.g.
+hint: 'git pull ...') before pushing again.
+hint: See the 'Note about fast-forwards' in 'git push --help' for details.
-------------------------------------------------
This can happen, for example, if you:
@@ -2193,7 +2195,7 @@
Linus's tree will be stored in the remote-tracking branch named origin/master,
and can be updated using linkgit:git-fetch[1]; you can track other
public trees using linkgit:git-remote[1] to set up a "remote" and
-linkgit:git-fetch[1] to keep them up-to-date; see
+linkgit:git-fetch[1] to keep them up to date; see
<<repositories-and-branches>>.
Now create the branches in which you are going to work; these start out
@@ -3414,7 +3416,7 @@
Author:
Date:
...
-:100644 100644 4b9458b... newsha... M somedirectory/myfile
+:100644 100644 4b9458b newsha M somedirectory/myfile
commit xyz
@@ -3422,7 +3424,7 @@
Date:
...
-:100644 100644 oldsha... 4b9458b... M somedirectory/myfile
+:100644 100644 oldsha 4b9458b M somedirectory/myfile
------------------------------------------------
This tells you that the immediately following version of the file was
@@ -3447,7 +3449,7 @@
$ git log --raw --all
------------------------------------------------
-and just looked for the sha of the missing object (4b9458b..) in that
+and just looked for the sha of the missing object (4b9458b) in that
whole thing. It's up to you--Git does *have* a lot of information, it is
just missing one particular blob version.
@@ -4112,9 +4114,9 @@
the blob objects from these three stages yourself, like this:
------------------------------------------------
-$ git cat-file blob 263414f... >hello.c~1
-$ git cat-file blob 06fa6a2... >hello.c~2
-$ git cat-file blob cc44c73... >hello.c~3
+$ git cat-file blob 263414f >hello.c~1
+$ git cat-file blob 06fa6a2 >hello.c~2
+$ git cat-file blob cc44c73 >hello.c~3
$ git merge-file hello.c~2 hello.c~1 hello.c~3
------------------------------------------------
@@ -4372,7 +4374,7 @@
------------------------
In the pager (`less`), just search for "bundle", go a few lines back,
-and see that it is in commit 18449ab0... Now just copy this object name,
+and see that it is in commit 18449ab0. Now just copy this object name,
and paste it into the command line
-------------------
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
index 9c203fb..19e45a7 100755
--- a/GIT-VERSION-GEN
+++ b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v2.14.3
+DEF_VER=v2.16.2
LF='
'
diff --git a/Makefile b/Makefile
index 043ec83..7f40f76 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,6 @@
# it at all).
#
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
-# This also implies BLK_SHA1.
#
# Define USE_LIBPCRE if you have and want to use libpcre. Various
# commands such as log and grep offer runtime options to use
@@ -162,6 +161,11 @@
# algorithm. This is slower, but may detect attempted collision attacks.
# Takes priority over other *_SHA1 knobs.
#
+# Define DC_SHA1_EXTERNAL in addition to DC_SHA1 if you want to build / link
+# git with the external SHA1 collision-detect library.
+# Without this option, i.e. the default behavior is to build git with its
+# own built-in code (or submodule).
+#
# Define DC_SHA1_SUBMODULE in addition to DC_SHA1 to use the
# sha1collisiondetection shipped as a submodule instead of the
# non-submodule copy in sha1dc/. This is an experimental option used
@@ -200,6 +204,9 @@
#
# Define NO_MMAP if you want to avoid mmap.
#
+# Define MMAP_PREVENTS_DELETE if a file that is currently mmapped cannot be
+# deleted or cannot be replaced using rename().
+#
# Define NO_SYS_POLL_H if you don't have sys/poll.h.
#
# Define NO_POLL if you do not have or don't want to use poll().
@@ -417,6 +424,13 @@
#
# to say "export LESS=FRX (and LV=-c) if the environment variable
# LESS (and LV) is not set, respectively".
+#
+# Define TEST_SHELL_PATH if you want to use a shell besides SHELL_PATH for
+# running the test scripts (e.g., bash has better support for "set -x"
+# tracing).
+#
+# When cross-compiling, define HOST_CPU as the canonical name of the CPU on
+# which the built Git will run (for instance "x86_64").
GIT-VERSION-FILE: FORCE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -638,9 +652,12 @@
TEST_PROGRAMS_NEED_X += test-config
TEST_PROGRAMS_NEED_X += test-date
TEST_PROGRAMS_NEED_X += test-delta
+TEST_PROGRAMS_NEED_X += test-drop-caches
TEST_PROGRAMS_NEED_X += test-dump-cache-tree
+TEST_PROGRAMS_NEED_X += test-dump-fsmonitor
TEST_PROGRAMS_NEED_X += test-dump-split-index
TEST_PROGRAMS_NEED_X += test-dump-untracked-cache
+TEST_PROGRAMS_NEED_X += test-example-decorate
TEST_PROGRAMS_NEED_X += test-fake-ssh
TEST_PROGRAMS_NEED_X += test-genrandom
TEST_PROGRAMS_NEED_X += test-hashmap
@@ -655,6 +672,7 @@
TEST_PROGRAMS_NEED_X += test-path-utils
TEST_PROGRAMS_NEED_X += test-prio-queue
TEST_PROGRAMS_NEED_X += test-read-cache
+TEST_PROGRAMS_NEED_X += test-write-cache
TEST_PROGRAMS_NEED_X += test-ref-store
TEST_PROGRAMS_NEED_X += test-regex
TEST_PROGRAMS_NEED_X += test-revision-walking
@@ -718,6 +736,8 @@
export PERL_PATH
export PYTHON_PATH
+TEST_SHELL_PATH = $(SHELL_PATH)
+
LIB_FILE = libgit.a
XDIFF_LIB = xdiff/lib.a
VCSSVN_LIB = vcs-svn/lib.a
@@ -748,6 +768,7 @@
LIB_OBJS += bulk-checkin.o
LIB_OBJS += bundle.o
LIB_OBJS += cache-tree.o
+LIB_OBJS += checkout.o
LIB_OBJS += color.o
LIB_OBJS += column.o
LIB_OBJS += combine-diff.o
@@ -785,6 +806,7 @@
LIB_OBJS += exec_cmd.o
LIB_OBJS += fetch-pack.o
LIB_OBJS += fsck.o
+LIB_OBJS += fsmonitor.o
LIB_OBJS += gettext.o
LIB_OBJS += gpg-interface.o
LIB_OBJS += graph.o
@@ -798,6 +820,8 @@
LIB_OBJS += line-log.o
LIB_OBJS += line-range.o
LIB_OBJS += list-objects.o
+LIB_OBJS += list-objects-filter.o
+LIB_OBJS += list-objects-filter-options.o
LIB_OBJS += ll-merge.o
LIB_OBJS += lockfile.o
LIB_OBJS += log-tree.o
@@ -815,7 +839,9 @@
LIB_OBJS += notes-merge.o
LIB_OBJS += notes-utils.o
LIB_OBJS += object.o
+LIB_OBJS += oidmap.o
LIB_OBJS += oidset.o
+LIB_OBJS += packfile.o
LIB_OBJS += pack-bitmap.o
LIB_OBJS += pack-bitmap-write.o
LIB_OBJS += pack-check.o
@@ -835,6 +861,7 @@
LIB_OBJS += prio-queue.o
LIB_OBJS += progress.o
LIB_OBJS += prompt.o
+LIB_OBJS += protocol.o
LIB_OBJS += quote.o
LIB_OBJS += reachable.o
LIB_OBJS += read-cache.o
@@ -842,6 +869,7 @@
LIB_OBJS += refs.o
LIB_OBJS += refs/files-backend.o
LIB_OBJS += refs/iterator.o
+LIB_OBJS += refs/packed-backend.o
LIB_OBJS += refs/ref-cache.o
LIB_OBJS += ref-filter.o
LIB_OBJS += remote.o
@@ -1033,6 +1061,9 @@
ifneq ($(filter undefined,$(SANITIZERS)),)
BASIC_CFLAGS += -DNO_UNALIGNED_LOADS
endif
+ifneq ($(filter leak,$(SANITIZERS)),)
+BASIC_CFLAGS += -DSUPPRESS_ANNOTATED_LEAKS
+endif
endif
ifndef sysconfdir
@@ -1076,6 +1107,12 @@
BROKEN_PATH_FIX = '/^\# @@BROKEN_PATH_FIX@@$$/d'
endif
+ifeq (,$(HOST_CPU))
+ BASIC_CFLAGS += -DGIT_HOST_CPU="\"$(firstword $(subst -, ,$(uname_M)))\""
+else
+ BASIC_CFLAGS += -DGIT_HOST_CPU="\"$(HOST_CPU)\""
+endif
+
ifneq (,$(INLINE))
BASIC_CFLAGS += -Dinline=$(INLINE)
endif
@@ -1237,7 +1274,6 @@
endif
else
BASIC_CFLAGS += -DNO_OPENSSL
- BLK_SHA1 = 1
OPENSSL_LIBSSL =
endif
ifdef NO_OPENSSL
@@ -1380,6 +1416,9 @@
COMPAT_OBJS += compat/win32mmap.o
endif
endif
+ifdef MMAP_PREVENTS_DELETE
+ BASIC_CFLAGS += -DMMAP_PREVENTS_DELETE
+endif
ifdef OBJECT_CREATION_USES_RENAMES
COMPAT_CFLAGS += -DOBJECT_CREATION_MODE=1
endif
@@ -1472,6 +1511,15 @@
BASIC_CFLAGS += -DSHA1_APPLE
else
DC_SHA1 := YesPlease
+ BASIC_CFLAGS += -DSHA1_DC
+ LIB_OBJS += sha1dc_git.o
+ifdef DC_SHA1_EXTERNAL
+ ifdef DC_SHA1_SUBMODULE
+$(error Only set DC_SHA1_EXTERNAL or DC_SHA1_SUBMODULE, not both)
+ endif
+ BASIC_CFLAGS += -DDC_SHA1_EXTERNAL
+ EXTLIBS += -lsha1detectcoll
+else
ifdef DC_SHA1_SUBMODULE
LIB_OBJS += sha1collisiondetection/lib/sha1.o
LIB_OBJS += sha1collisiondetection/lib/ubc_check.o
@@ -1481,17 +1529,15 @@
LIB_OBJS += sha1dc/ubc_check.o
endif
BASIC_CFLAGS += \
- -DSHA1_DC \
-DSHA1DC_NO_STANDARD_INCLUDES \
-DSHA1DC_INIT_SAFE_HASH_DEFAULT=0 \
-DSHA1DC_CUSTOM_INCLUDE_SHA1_C="\"cache.h\"" \
- -DSHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_C="\"sha1dc_git.c\"" \
- -DSHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_H="\"sha1dc_git.h\"" \
-DSHA1DC_CUSTOM_INCLUDE_UBC_CHECK_C="\"git-compat-util.h\""
endif
endif
endif
endif
+endif
ifdef SHA1_MAX_BLOCK_SIZE
LIB_OBJS += compat/sha1-chunked.o
@@ -1696,6 +1742,7 @@
gitwebdir_SQ = $(subst ','\'',$(gitwebdir))
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+TEST_SHELL_PATH_SQ = $(subst ','\'',$(TEST_SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
@@ -1864,7 +1911,9 @@
version.sp version.s version.o: GIT-VERSION-FILE GIT-USER-AGENT
version.sp version.s version.o: EXTRA_CPPFLAGS = \
'-DGIT_VERSION="$(GIT_VERSION)"' \
- '-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)'
+ '-DGIT_USER_AGENT=$(GIT_USER_AGENT_CQ_SQ)' \
+ '-DGIT_BUILT_FROM_COMMIT="$(shell GIT_CEILING_DIRECTORIES=\"$(CURDIR)/..\" \
+ git rev-parse -q --verify HEAD || :)"'
$(BUILT_INS): git$X
$(QUIET_BUILT_IN)$(RM) $@ && \
@@ -1915,7 +1964,8 @@
git.res: git.rc GIT-VERSION-FILE
$(QUIET_RC)$(RC) \
- $(join -DMAJOR= -DMINOR=, $(wordlist 1,2,$(subst -, ,$(subst ., ,$(GIT_VERSION))))) \
+ $(join -DMAJOR= -DMINOR= -DMICRO= -DPATCHLEVEL=, $(wordlist 1, 4, \
+ $(shell echo $(GIT_VERSION) 0 0 0 0 | tr '.a-zA-Z-' ' '))) \
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" -i $< -o $@
# This makes sure we depend on the NO_PERL setting itself.
@@ -2126,6 +2176,8 @@
http-push.sp http.sp http-walker.sp remote-curl.sp imap-send.sp: SPARSE_FLAGS += \
-DCURL_DISABLE_TYPECHECK
+pack-revindex.sp: SPARSE_FLAGS += -Wno-memcpy-max-count
+
ifdef NO_EXPAT
http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT
endif
@@ -2325,6 +2377,7 @@
# and the first level quoting from the shell that runs "echo".
GIT-BUILD-OPTIONS: FORCE
@echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@+
+ @echo TEST_SHELL_PATH=\''$(subst ','\'',$(TEST_SHELL_PATH_SQ))'\' >>$@+
@echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@+
@echo DIFF=\''$(subst ','\'',$(subst ','\'',$(DIFF)))'\' >>$@+
@echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@+
@@ -2439,6 +2492,10 @@
.PHONY: sparse $(SP_OBJ)
sparse: $(SP_OBJ)
+.PHONY: style
+style:
+ git clang-format --style file --diff --extensions c,h
+
check: common-cmds.h
@if sparse; \
then \
diff --git a/RelNotes b/RelNotes
index 8612bbd..35c3c32 120000
--- a/RelNotes
+++ b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes/2.14.3.txt
\ No newline at end of file
+Documentation/RelNotes/2.16.2.txt
\ No newline at end of file
diff --git a/abspath.c b/abspath.c
index 708aff8..9857985 100644
--- a/abspath.c
+++ b/abspath.c
@@ -202,6 +202,10 @@
return retval;
}
+/*
+ * Resolve `path` into an absolute, cleaned-up path. The return value
+ * comes from a shared buffer.
+ */
const char *real_path(const char *path)
{
static struct strbuf realpath = STRBUF_INIT;
diff --git a/advice.c b/advice.c
index d81e1cb..406efc1 100644
--- a/advice.c
+++ b/advice.c
@@ -17,6 +17,8 @@
int advice_object_name_warning = 1;
int advice_rm_hints = 1;
int advice_add_embedded_repo = 1;
+int advice_ignored_hook = 1;
+int advice_waiting_for_editor = 1;
static struct {
const char *name;
@@ -38,6 +40,8 @@
{ "objectnamewarning", &advice_object_name_warning },
{ "rmhints", &advice_rm_hints },
{ "addembeddedrepo", &advice_add_embedded_repo },
+ { "ignoredhook", &advice_ignored_hook },
+ { "waitingforeditor", &advice_waiting_for_editor },
/* make this an alias for backward compatibility */
{ "pushnonfastforward", &advice_push_update_rejected }
diff --git a/advice.h b/advice.h
index c84a445..70568fa 100644
--- a/advice.h
+++ b/advice.h
@@ -19,6 +19,8 @@
extern int advice_object_name_warning;
extern int advice_rm_hints;
extern int advice_add_embedded_repo;
+extern int advice_ignored_hook;
+extern int advice_waiting_for_editor;
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))
diff --git a/apply.c b/apply.c
index 0c7b259..321a9fa 100644
--- a/apply.c
+++ b/apply.c
@@ -75,13 +75,10 @@
}
int init_apply_state(struct apply_state *state,
- const char *prefix,
- struct lock_file *lock_file)
+ const char *prefix)
{
memset(state, 0, sizeof(*state));
state->prefix = prefix;
- state->lock_file = lock_file;
- state->newfd = -1;
state->apply = 1;
state->line_termination = '\n';
state->p_value = 1;
@@ -146,8 +143,6 @@
}
if (state->check_index)
state->unsafe_paths = 0;
- if (!state->lock_file)
- return error("BUG: state->lock_file should not be NULL");
if (state->apply_verbosity <= verbosity_silent) {
state->saved_error_routine = get_error_routine();
@@ -305,52 +300,33 @@
static int fuzzy_matchlines(const char *s1, size_t n1,
const char *s2, size_t n2)
{
- const char *last1 = s1 + n1 - 1;
- const char *last2 = s2 + n2 - 1;
- int result = 0;
+ const char *end1 = s1 + n1;
+ const char *end2 = s2 + n2;
/* ignore line endings */
- while ((*last1 == '\r') || (*last1 == '\n'))
- last1--;
- while ((*last2 == '\r') || (*last2 == '\n'))
- last2--;
+ while (s1 < end1 && (end1[-1] == '\r' || end1[-1] == '\n'))
+ end1--;
+ while (s2 < end2 && (end2[-1] == '\r' || end2[-1] == '\n'))
+ end2--;
- /* skip leading whitespaces, if both begin with whitespace */
- if (s1 <= last1 && s2 <= last2 && isspace(*s1) && isspace(*s2)) {
- while (isspace(*s1) && (s1 <= last1))
- s1++;
- while (isspace(*s2) && (s2 <= last2))
- s2++;
- }
- /* early return if both lines are empty */
- if ((s1 > last1) && (s2 > last2))
- return 1;
- while (!result) {
- result = *s1++ - *s2++;
- /*
- * Skip whitespace inside. We check for whitespace on
- * both buffers because we don't want "a b" to match
- * "ab"
- */
- if (isspace(*s1) && isspace(*s2)) {
- while (isspace(*s1) && s1 <= last1)
+ while (s1 < end1 && s2 < end2) {
+ if (isspace(*s1)) {
+ /*
+ * Skip whitespace. We check on both buffers
+ * because we don't want "a b" to match "ab".
+ */
+ if (!isspace(*s2))
+ return 0;
+ while (s1 < end1 && isspace(*s1))
s1++;
- while (isspace(*s2) && s2 <= last2)
+ while (s2 < end2 && isspace(*s2))
s2++;
- }
- /*
- * If we reached the end on one side only,
- * lines don't match
- */
- if (
- ((s2 > last2) && (s1 <= last1)) ||
- ((s1 > last1) && (s2 <= last2)))
+ } else if (*s1++ != *s2++)
return 0;
- if ((s1 > last1) && (s2 > last2))
- break;
}
- return !result;
+ /* If we reached the end on one side only, lines don't match. */
+ return s1 == end1 && s2 == end2;
}
static void add_line_info(struct image *img, const char *bol, size_t len, unsigned flag)
@@ -812,16 +788,13 @@
* 1970-01-01, and the seconds part must be "00".
*/
const char stamp_regexp[] =
- "^(1969-12-31|1970-01-01)"
- " "
- "[0-2][0-9]:[0-5][0-9]:00(\\.0+)?"
+ "^[0-2][0-9]:([0-5][0-9]):00(\\.0+)?"
" "
"([-+][0-2][0-9]:?[0-5][0-9])\n";
const char *timestamp = NULL, *cp, *colon;
static regex_t *stamp;
regmatch_t m[10];
- int zoneoffset;
- int hourminute;
+ int zoneoffset, epoch_hour, hour, minute;
int status;
for (cp = nameline; *cp != '\n'; cp++) {
@@ -830,6 +803,18 @@
}
if (!timestamp)
return 0;
+
+ /*
+ * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
+ * (west of GMT) or 1970-01-01 (east of GMT)
+ */
+ if (skip_prefix(timestamp, "1969-12-31 ", ×tamp))
+ epoch_hour = 24;
+ else if (skip_prefix(timestamp, "1970-01-01 ", ×tamp))
+ epoch_hour = 0;
+ else
+ return 0;
+
if (!stamp) {
stamp = xmalloc(sizeof(*stamp));
if (regcomp(stamp, stamp_regexp, REG_EXTENDED)) {
@@ -847,6 +832,9 @@
return 0;
}
+ hour = strtol(timestamp, NULL, 10);
+ minute = strtol(timestamp + m[1].rm_so, NULL, 10);
+
zoneoffset = strtol(timestamp + m[3].rm_so + 1, (char **) &colon, 10);
if (*colon == ':')
zoneoffset = zoneoffset * 60 + strtol(colon + 1, NULL, 10);
@@ -855,20 +843,7 @@
if (timestamp[m[3].rm_so] == '-')
zoneoffset = -zoneoffset;
- /*
- * YYYY-MM-DD hh:mm:ss must be from either 1969-12-31
- * (west of GMT) or 1970-01-01 (east of GMT)
- */
- if ((zoneoffset < 0 && memcmp(timestamp, "1969-12-31", 10)) ||
- (0 <= zoneoffset && memcmp(timestamp, "1970-01-01", 10)))
- return 0;
-
- hourminute = (strtol(timestamp + 11, NULL, 10) * 60 +
- strtol(timestamp + 14, NULL, 10) -
- zoneoffset);
-
- return ((zoneoffset < 0 && hourminute == 1440) ||
- (0 <= zoneoffset && !hourminute));
+ return hour * 60 + minute - zoneoffset == epoch_hour * 60;
}
/*
@@ -2921,6 +2896,7 @@
if (plen && (ws_rule & WS_BLANK_AT_EOF) &&
ws_blank_line(patch + 1, plen, ws_rule))
is_blank_context = 1;
+ /* fallthrough */
case '-':
memcpy(old, patch + 1, plen);
add_line_info(&preimage, old, plen,
@@ -2928,7 +2904,7 @@
old += plen;
if (first == '-')
break;
- /* Fall-through for ' ' */
+ /* fallthrough */
case '+':
/* --no-add does not add new lines */
if (first == '+' && state->no_add)
@@ -2977,6 +2953,8 @@
newlines.len > 0 && newlines.buf[newlines.len - 1] == '\n') {
old--;
strbuf_setlen(&newlines, newlines.len - 1);
+ preimage.line_allocated[preimage.nr - 1].len--;
+ postimage.line_allocated[postimage.nr - 1].len--;
}
leading = frag->leading;
@@ -3577,7 +3555,7 @@
/* Preimage the patch was prepared for */
if (patch->is_new)
write_sha1_file("", 0, blob_type, pre_oid.hash);
- else if (get_sha1(patch->old_sha1_prefix, pre_oid.hash) ||
+ else if (get_oid(patch->old_sha1_prefix, &pre_oid) ||
read_blob_object(&buf, &pre_oid, patch->old_mode))
return error(_("repository lacks the necessary blob to fall back on 3-way merge."));
@@ -4101,7 +4079,7 @@
else
return error(_("sha1 information is lacking or "
"useless for submodule %s"), name);
- } else if (!get_sha1_blob(patch->old_sha1_prefix, oid.hash)) {
+ } else if (!get_oid_blob(patch->old_sha1_prefix, &oid)) {
; /* ok */
} else if (!patch->lines_added && !patch->lines_deleted) {
/* mode-only change: update the current */
@@ -4709,13 +4687,13 @@
state->apply = 0;
state->update_index = state->check_index && state->apply;
- if (state->update_index && state->newfd < 0) {
+ if (state->update_index && !is_lock_file_locked(&state->lock_file)) {
if (state->index_file)
- state->newfd = hold_lock_file_for_update(state->lock_file,
- state->index_file,
- LOCK_DIE_ON_ERROR);
+ hold_lock_file_for_update(&state->lock_file,
+ state->index_file,
+ LOCK_DIE_ON_ERROR);
else
- state->newfd = hold_locked_index(state->lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&state->lock_file, LOCK_DIE_ON_ERROR);
}
if (state->check_index && read_apply_cache(state) < 0) {
@@ -4911,22 +4889,18 @@
}
if (state->update_index) {
- res = write_locked_index(&the_index, state->lock_file, COMMIT_LOCK);
+ res = write_locked_index(&the_index, &state->lock_file, COMMIT_LOCK);
if (res) {
error(_("Unable to write new index file"));
res = -128;
goto end;
}
- state->newfd = -1;
}
res = !!errs;
end:
- if (state->newfd >= 0) {
- rollback_lock_file(state->lock_file);
- state->newfd = -1;
- }
+ rollback_lock_file(&state->lock_file);
if (state->apply_verbosity <= verbosity_silent) {
set_error_routine(state->saved_error_routine);
diff --git a/apply.h b/apply.h
index d9b3957..dc4a019 100644
--- a/apply.h
+++ b/apply.h
@@ -36,9 +36,8 @@
struct apply_state {
const char *prefix;
- /* These are lock_file related */
- struct lock_file *lock_file;
- int newfd;
+ /* Lock file */
+ struct lock_file lock_file;
/* These control what gets looked at and modified */
int apply; /* this is not a dry-run */
@@ -116,8 +115,7 @@
int *force_apply, int *options,
const char * const *apply_usage);
extern int init_apply_state(struct apply_state *state,
- const char *prefix,
- struct lock_file *lock_file);
+ const char *prefix);
extern void clear_apply_state(struct apply_state *state);
extern int check_apply_state(struct apply_state *state, int force_apply);
diff --git a/archive.c b/archive.c
index f81bd36..0b7b62a 100644
--- a/archive.c
+++ b/archive.c
@@ -371,12 +371,12 @@
const char *colon = strchrnul(name, ':');
int refnamelen = colon - name;
- if (!dwim_ref(name, refnamelen, oid.hash, &ref))
+ if (!dwim_ref(name, refnamelen, &oid, &ref))
die("no such ref: %.*s", refnamelen, name);
free(ref);
}
- if (get_sha1(name, oid.hash))
+ if (get_oid(name, &oid))
die("Not a valid object name");
commit = lookup_commit_reference_gently(&oid, 1);
diff --git a/attr.c b/attr.c
index 56961f0..dfc3a55 100644
--- a/attr.c
+++ b/attr.c
@@ -76,18 +76,20 @@
};
/* attr_hashmap comparison function */
-static int attr_hash_entry_cmp(void *unused_cmp_data,
- const struct attr_hash_entry *a,
- const struct attr_hash_entry *b,
- void *unused_keydata)
+static int attr_hash_entry_cmp(const void *unused_cmp_data,
+ const void *entry,
+ const void *entry_or_key,
+ const void *unused_keydata)
{
+ const struct attr_hash_entry *a = entry;
+ const struct attr_hash_entry *b = entry_or_key;
return (a->keylen != b->keylen) || strncmp(a->key, b->key, a->keylen);
}
/* Initialize an 'attr_hashmap' object */
static void attr_hashmap_init(struct attr_hashmap *map)
{
- hashmap_init(&map->map, (hashmap_cmp_fn) attr_hash_entry_cmp, NULL, 0);
+ hashmap_init(&map->map, attr_hash_entry_cmp, NULL, 0);
}
/*
@@ -149,10 +151,12 @@
static void all_attrs_init(struct attr_hashmap *map, struct attr_check *check)
{
int i;
+ unsigned int size;
hashmap_lock(map);
- if (map->map.size < check->all_attrs_nr)
+ size = hashmap_get_size(&map->map);
+ if (size < check->all_attrs_nr)
die("BUG: interned attributes shouldn't be deleted");
/*
@@ -161,13 +165,13 @@
* field), reallocate the provided attr_check instance's all_attrs
* field and fill each entry with its corresponding git_attr.
*/
- if (map->map.size != check->all_attrs_nr) {
+ if (size != check->all_attrs_nr) {
struct attr_hash_entry *e;
struct hashmap_iter iter;
hashmap_iter_init(&map->map, &iter);
- REALLOC_ARRAY(check->all_attrs, map->map.size);
- check->all_attrs_nr = map->map.size;
+ REALLOC_ARRAY(check->all_attrs, size);
+ check->all_attrs_nr = size;
while ((e = hashmap_iter_next(&iter))) {
const struct git_attr *a = e->value;
@@ -235,10 +239,11 @@
if (!a) {
FLEX_ALLOC_MEM(a, name, name, namelen);
- a->attr_nr = g_attr_hashmap.map.size;
+ a->attr_nr = hashmap_get_size(&g_attr_hashmap.map);
attr_hashmap_add(&g_attr_hashmap, a->name, namelen, a);
- assert(a->attr_nr == (g_attr_hashmap.map.size - 1));
+ assert(a->attr_nr ==
+ (hashmap_get_size(&g_attr_hashmap.map) - 1));
}
hashmap_unlock(&g_attr_hashmap);
diff --git a/bisect.c b/bisect.c
index a9fd9fb..f6d05bd 100644
--- a/bisect.c
+++ b/bisect.c
@@ -132,7 +132,7 @@
unsigned flags = commit->object.flags;
enum object_type type;
unsigned long size;
- char *buf = read_sha1_file(commit->object.sha1, &type, &size);
+ char *buf = read_sha1_file(commit->object.oid.hash, &type, &size);
const char *subject_start;
int subject_len;
@@ -144,10 +144,10 @@
fprintf(stderr, "%3d", weight(p));
else
fprintf(stderr, "---");
- fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.sha1));
+ fprintf(stderr, " %.*s", 8, sha1_to_hex(commit->object.oid.hash));
for (pp = commit->parents; pp; pp = pp->next)
fprintf(stderr, " %.*s", 8,
- sha1_to_hex(pp->item->object.sha1));
+ sha1_to_hex(pp->item->object.oid.hash));
subject_len = find_commit_subject(buf, &subject_start);
if (subject_len)
@@ -226,10 +226,13 @@
add_name_decoration(DECORATION_NONE, buf.buf, obj);
p->item = array[i].commit;
- p = p->next;
+ if (i < cnt - 1)
+ p = p->next;
}
- if (p)
+ if (p) {
+ free_commit_list(p->next);
p->next = NULL;
+ }
strbuf_release(&buf);
free(array);
return list;
@@ -360,28 +363,29 @@
return best_bisection_sorted(list, nr);
}
-struct commit_list *find_bisection(struct commit_list *list,
- int *reaches, int *all,
- int find_all)
+void find_bisection(struct commit_list **commit_list, int *reaches,
+ int *all, int find_all)
{
int nr, on_list;
- struct commit_list *p, *best, *next, *last;
+ struct commit_list *list, *p, *best, *next, *last;
int *weights;
- show_list("bisection 2 entry", 0, 0, list);
+ show_list("bisection 2 entry", 0, 0, *commit_list);
/*
* Count the number of total and tree-changing items on the
* list, while reversing the list.
*/
- for (nr = on_list = 0, last = NULL, p = list;
+ for (nr = on_list = 0, last = NULL, p = *commit_list;
p;
p = next) {
unsigned flags = p->item->object.flags;
next = p->next;
- if (flags & UNINTERESTING)
+ if (flags & UNINTERESTING) {
+ free(p);
continue;
+ }
p->next = last;
last = p;
if (!(flags & TREESAME))
@@ -397,12 +401,16 @@
/* Do the real work of finding bisection commit. */
best = do_find_bisection(list, nr, weights, find_all);
if (best) {
- if (!find_all)
+ if (!find_all) {
+ list->item = best->item;
+ free_commit_list(list->next);
+ best = list;
best->next = NULL;
+ }
*reaches = weight(best);
}
free(weights);
- return best;
+ *commit_list = best;
}
static int register_ref(const char *refname, const struct object_id *oid,
@@ -433,7 +441,12 @@
static GIT_PATH_FUNC(git_path_bisect_names, "BISECT_NAMES")
static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
+static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
+static GIT_PATH_FUNC(git_path_bisect_run, "BISECT_RUN")
+static GIT_PATH_FUNC(git_path_bisect_start, "BISECT_START")
+static GIT_PATH_FUNC(git_path_bisect_log, "BISECT_LOG")
static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
+static GIT_PATH_FUNC(git_path_head_name, "head-name")
static void read_bisect_paths(struct argv_array *array)
{
@@ -680,16 +693,17 @@
return res;
}
-static int bisect_checkout(const unsigned char *bisect_rev, int no_checkout)
+static int bisect_checkout(const struct object_id *bisect_rev, int no_checkout)
{
char bisect_rev_hex[GIT_MAX_HEXSZ + 1];
- memcpy(bisect_rev_hex, sha1_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
+ memcpy(bisect_rev_hex, oid_to_hex(bisect_rev), GIT_SHA1_HEXSZ + 1);
update_ref(NULL, "BISECT_EXPECTED_REV", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
argv_checkout[2] = bisect_rev_hex;
if (no_checkout) {
- update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
+ update_ref(NULL, "BISECT_HEAD", bisect_rev, NULL, 0,
+ UPDATE_REFS_DIE_ON_ERR);
} else {
int res;
res = run_command_v_opt(argv_checkout, RUN_GIT_CMD);
@@ -778,11 +792,9 @@
* - If one is "skipped", we can't know but we should warn.
* - If we don't know, we should check it out and ask the user to test.
*/
-static void check_merge_bases(int no_checkout)
+static void check_merge_bases(int rev_nr, struct commit **rev, int no_checkout)
{
struct commit_list *result;
- int rev_nr;
- struct commit **rev = get_bad_and_good_commits(&rev_nr);
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
@@ -796,37 +808,25 @@
handle_skipped_merge_base(mb);
} else {
printf(_("Bisecting: a merge base must be tested\n"));
- exit(bisect_checkout(mb->hash, no_checkout));
+ exit(bisect_checkout(mb, no_checkout));
}
}
- free(rev);
free_commit_list(result);
}
-static int check_ancestors(const char *prefix)
+static int check_ancestors(int rev_nr, struct commit **rev, const char *prefix)
{
struct rev_info revs;
- struct object_array pending_copy;
int res;
bisect_rev_setup(&revs, prefix, "^%s", "%s", 0);
- /* Save pending objects, so they can be cleaned up later. */
- pending_copy = revs.pending;
- revs.leak_pending = 1;
-
- /*
- * bisect_common calls prepare_revision_walk right away, which
- * (together with .leak_pending = 1) makes us the sole owner of
- * the list of pending objects.
- */
bisect_common(&revs);
res = (revs.commits != NULL);
/* Clean up objects used, as they will be reused. */
- clear_commit_marks_for_object_array(&pending_copy, ALL_REV_FLAGS);
- free(pending_copy.objects);
+ clear_commit_marks_many(rev_nr, rev, ALL_REV_FLAGS);
return res;
}
@@ -843,7 +843,8 @@
{
char *filename = git_pathdup("BISECT_ANCESTORS_OK");
struct stat st;
- int fd;
+ int fd, rev_nr;
+ struct commit **rev;
if (!current_bad_oid)
die(_("a %s revision is needed"), term_bad);
@@ -857,8 +858,10 @@
goto done;
/* Check if all good revs are ancestor of the bad rev. */
- if (check_ancestors(prefix))
- check_merge_bases(no_checkout);
+ rev = get_bad_and_good_commits(&rev_nr);
+ if (check_ancestors(rev_nr, rev, prefix))
+ check_merge_bases(rev_nr, rev, no_checkout);
+ free(rev);
/* Create file BISECT_ANCESTORS_OK. */
fd = open(filename, O_CREAT | O_TRUNC | O_WRONLY, 0600);
@@ -939,7 +942,7 @@
struct rev_info revs;
struct commit_list *tried;
int reaches = 0, all = 0, nr, steps;
- const unsigned char *bisect_rev;
+ struct object_id *bisect_rev;
char *steps_msg;
read_bisect_terms(&term_bad, &term_good);
@@ -953,8 +956,7 @@
bisect_common(&revs);
- revs.commits = find_bisection(revs.commits, &reaches, &all,
- !!skipped_revs.nr);
+ find_bisection(&revs.commits, &reaches, &all, !!skipped_revs.nr);
revs.commits = managed_skipped(revs.commits, &tried);
if (!revs.commits) {
@@ -977,11 +979,11 @@
exit(4);
}
- bisect_rev = revs.commits->item->object.oid.hash;
+ bisect_rev = &revs.commits->item->object.oid;
- if (!hashcmp(bisect_rev, current_bad_oid->hash)) {
+ if (!oidcmp(bisect_rev, current_bad_oid)) {
exit_if_skipped_commits(tried, current_bad_oid);
- printf("%s is the first %s commit\n", sha1_to_hex(bisect_rev),
+ printf("%s is the first %s commit\n", oid_to_hex(bisect_rev),
term_bad);
show_diff_tree(prefix, revs.commits->item);
/* This means the bisection process succeeded. */
@@ -1043,3 +1045,40 @@
return (e < 3 * x) ? n : n - 1;
}
+
+static int mark_for_removal(const char *refname, const struct object_id *oid,
+ int flag, void *cb_data)
+{
+ struct string_list *refs = cb_data;
+ char *ref = xstrfmt("refs/bisect%s", refname);
+ string_list_append(refs, ref);
+ return 0;
+}
+
+int bisect_clean_state(void)
+{
+ int result = 0;
+
+ /* There may be some refs packed during bisection */
+ struct string_list refs_for_removal = STRING_LIST_INIT_NODUP;
+ for_each_ref_in("refs/bisect", mark_for_removal, (void *) &refs_for_removal);
+ string_list_append(&refs_for_removal, xstrdup("BISECT_HEAD"));
+ result = delete_refs("bisect: remove", &refs_for_removal, REF_NO_DEREF);
+ refs_for_removal.strdup_strings = 1;
+ string_list_clear(&refs_for_removal, 0);
+ unlink_or_warn(git_path_bisect_expected_rev());
+ unlink_or_warn(git_path_bisect_ancestors_ok());
+ unlink_or_warn(git_path_bisect_log());
+ unlink_or_warn(git_path_bisect_names());
+ unlink_or_warn(git_path_bisect_run());
+ unlink_or_warn(git_path_bisect_terms());
+ /* Cleanup head-name if it got left by an old version of git-bisect */
+ unlink_or_warn(git_path_head_name());
+ /*
+ * Cleanup BISECT_START last to support the --no-checkout option
+ * introduced in the commit 4796e823a.
+ */
+ unlink_or_warn(git_path_bisect_start());
+
+ return result;
+}
diff --git a/bisect.h b/bisect.h
index acd12ef..a5d9248 100644
--- a/bisect.h
+++ b/bisect.h
@@ -1,9 +1,15 @@
#ifndef BISECT_H
#define BISECT_H
-extern struct commit_list *find_bisection(struct commit_list *list,
- int *reaches, int *all,
- int find_all);
+/*
+ * Find bisection. If something is found, `reaches` will be the number of
+ * commits that the best commit reaches. `all` will be the count of
+ * non-SAMETREE commits. If nothing is found, `list` will be NULL.
+ * Otherwise, it will be either all non-SAMETREE commits or the single
+ * best commit, as chosen by `find_all`.
+ */
+extern void find_bisection(struct commit_list **list, int *reaches, int *all,
+ int find_all);
extern struct commit_list *filter_skipped(struct commit_list *list,
struct commit_list **tried,
@@ -28,4 +34,6 @@
extern void read_bisect_terms(const char **bad, const char **good);
+extern int bisect_clean_state(void);
+
#endif
diff --git a/blame.c b/blame.c
index f575e9c..2893f3c 100644
--- a/blame.c
+++ b/blame.c
@@ -166,7 +166,7 @@
commit->date = now;
parent_tail = &commit->parents;
- if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL))
+ if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))
die("no such ref: HEAD");
parent_tail = append_parent(parent_tail, &head_oid);
@@ -209,7 +209,7 @@
switch (st.st_mode & S_IFMT) {
case S_IFREG:
- if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
+ if (opt->flags.allow_textconv &&
textconv_object(read_from, mode, &null_oid, 0, &buf_ptr, &buf_len))
strbuf_attach(&buf, buf_ptr, buf_len, buf_len + 1);
else if (strbuf_read_file(&buf, read_from, st.st_size) != st.st_size)
@@ -293,7 +293,7 @@
unsigned long file_size;
(*num_read_blob)++;
- if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV) &&
+ if (opt->flags.allow_textconv &&
textconv_object(o->path, o->mode, &o->blob_oid, 1, &file->ptr, &file_size))
;
else
@@ -541,7 +541,7 @@
* same and diff-tree is fairly efficient about this.
*/
diff_setup(&diff_opts);
- DIFF_OPT_SET(&diff_opts, RECURSIVE);
+ diff_opts.flags.recursive = 1;
diff_opts.detect_rename = 0;
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
paths[0] = origin->path;
@@ -615,7 +615,7 @@
int i;
diff_setup(&diff_opts);
- DIFF_OPT_SET(&diff_opts, RECURSIVE);
+ diff_opts.flags.recursive = 1;
diff_opts.detect_rename = DIFF_DETECT_RENAME;
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_opts.single_follow = origin->path;
@@ -1238,7 +1238,7 @@
return; /* nothing remains for this target */
diff_setup(&diff_opts);
- DIFF_OPT_SET(&diff_opts, RECURSIVE);
+ diff_opts.flags.recursive = 1;
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_setup_done(&diff_opts);
@@ -1253,7 +1253,7 @@
if ((opt & PICKAXE_BLAME_COPY_HARDEST)
|| ((opt & PICKAXE_BLAME_COPY_HARDER)
&& (!porigin || strcmp(target->path, porigin->path))))
- DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
+ diff_opts.flags.find_copies_harder = 1;
if (is_null_oid(&target->commit->object.oid))
do_diff_cache(&parent->tree->object.oid, &diff_opts);
@@ -1262,7 +1262,7 @@
&target->commit->tree->object.oid,
"", &diff_opts);
- if (!DIFF_OPT_TST(&diff_opts, FIND_COPIES_HARDER))
+ if (!diff_opts.flags.find_copies_harder)
diffcore_std(&diff_opts);
do {
@@ -1689,7 +1689,7 @@
return NULL;
/* Do we have HEAD? */
- if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL))
+ if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))
return NULL;
head_commit = lookup_commit_reference_gently(&head_oid, 1);
if (!head_commit)
@@ -1825,7 +1825,7 @@
if (fill_blob_sha1_and_mode(o))
die(_("no such path %s in %s"), path, final_commit_name);
- if (DIFF_OPT_TST(&sb->revs->diffopt, ALLOW_TEXTCONV) &&
+ if (sb->revs->diffopt.flags.allow_textconv &&
textconv_object(path, o->mode, &o->blob_oid, 1, (char **) &sb->final_buf,
&sb->final_buf_size))
;
diff --git a/branch.c b/branch.c
index 86360d3..2672054 100644
--- a/branch.c
+++ b/branch.c
@@ -90,24 +90,24 @@
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."),
+ _("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."),
+ _("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."),
+ _("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."),
+ _("Branch '%s' set up to track local ref '%s' by rebasing.") :
+ _("Branch '%s' set up to track local ref '%s'."),
local, remote);
}
}
@@ -178,25 +178,40 @@
return 0;
}
-int validate_new_branchname(const char *name, struct strbuf *ref,
- int force, int attr_only)
+/*
+ * 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.
+ */
+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);
- if (!ref_exists(ref->buf))
+ return ref_exists(ref->buf);
+}
+
+/*
+ * Check if a branch 'name' can be created as a new branch; die otherwise.
+ * 'force' can be used when it is OK for the named branch already exists.
+ * Return 1 if the named branch already exists; return 0 otherwise.
+ * Fill ref with the full refname for the branch.
+ */
+int validate_new_branchname(const char *name, struct strbuf *ref, int force)
+{
+ const char *head;
+
+ if (!validate_branchname(name, ref))
return 0;
- else if (!force && !attr_only)
- die(_("A branch named '%s' already exists."), ref->buf + strlen("refs/heads/"));
- if (!attr_only) {
- const char *head;
- struct object_id oid;
+ if (!force)
+ die(_("A branch named '%s' already exists."),
+ ref->buf + strlen("refs/heads/"));
- head = resolve_ref_unsafe("HEAD", 0, oid.hash, NULL);
- if (!is_bare_repository() && head && !strcmp(head, ref->buf))
- die(_("Cannot force update the current branch."));
- }
+ head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
+ if (!is_bare_repository() && head && !strcmp(head, ref->buf))
+ die(_("Cannot force update the current branch."));
+
return 1;
}
@@ -229,7 +244,7 @@
"\"git push -u\" to set the upstream config as you push.");
void create_branch(const char *name, const char *start_name,
- int force, int reflog, int clobber_head,
+ int force, int clobber_head_ok, int reflog,
int quiet, enum branch_track track)
{
struct commit *commit;
@@ -243,9 +258,9 @@
if (track == BRANCH_TRACK_EXPLICIT || track == BRANCH_TRACK_OVERRIDE)
explicit_tracking = 1;
- if (validate_new_branchname(name, &ref, force,
- track == BRANCH_TRACK_OVERRIDE ||
- clobber_head)) {
+ 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
@@ -265,7 +280,7 @@
die(_("Not a valid object name: '%s'."), start_name);
}
- switch (dwim_ref(start_name, strlen(start_name), oid.hash, &real_ref)) {
+ switch (dwim_ref(start_name, strlen(start_name), &oid, &real_ref)) {
case 0:
/* Not branching from any existing branch */
if (explicit_tracking)
@@ -306,7 +321,7 @@
transaction = ref_transaction_begin(&err);
if (!transaction ||
ref_transaction_update(transaction, ref.buf,
- oid.hash, forcing ? NULL : null_sha1,
+ &oid, forcing ? NULL : &null_oid,
0, msg, &err) ||
ref_transaction_commit(transaction, &err))
die("%s", err.buf);
diff --git a/branch.h b/branch.h
index b077885..473d0a9 100644
--- a/branch.h
+++ b/branch.h
@@ -13,32 +13,35 @@
*
* - 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.
+ *
* - reflog creates a reflog for the branch
*
+ * - quiet suppresses tracking information
+ *
* - track causes the new branch to be configured to merge the remote branch
* that start_name is a tracking branch for (if any).
+ *
*/
void create_branch(const char *name, const char *start_name,
- int force, int reflog,
- int clobber_head, int quiet, enum branch_track track);
+ int force, int clobber_head_ok,
+ int reflog, int quiet, enum branch_track track);
/*
- * Validates that the requested branch may be created, returning the
- * interpreted ref in ref, force indicates whether (non-head) branches
- * may be overwritten. A non-zero return value indicates that the force
- * parameter was non-zero and the branch already exists.
- *
- * Contrary to all of the above, when attr_only is 1, the caller is
- * not interested in verifying if it is Ok to update the named
- * branch to point at a potentially different commit. It is merely
- * asking if it is OK to change some attribute for the named branch
- * (e.g. tracking upstream).
- *
- * NEEDSWORK: This needs to be split into two separate functions in the
- * longer run for sanity.
- *
+ * 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.
*/
-int validate_new_branchname(const char *name, struct strbuf *ref, int force, int attr_only);
+extern int validate_branchname(const char *name, struct strbuf *ref);
+
+/*
+ * Check if a branch 'name' can be created as a new branch; die otherwise.
+ * 'force' can be used when it is OK for the named branch already exists.
+ * Return 1 if the named branch already exists; return 0 otherwise.
+ * Fill ref with the full refname for the branch.
+ */
+extern int validate_new_branchname(const char *name, struct strbuf *ref, int force);
/*
* Remove information about the state of working on the current
diff --git a/builtin/add.c b/builtin/add.c
index 5d5773d..bf01d89 100644
--- a/builtin/add.c
+++ b/builtin/add.c
@@ -26,6 +26,7 @@
};
static int patch_interactive, add_interactive, edit_interactive;
static int take_worktree_changes;
+static int add_renormalize;
struct update_callback_data {
int flags;
@@ -116,11 +117,32 @@
rev.diffopt.output_format = DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = update_callback;
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 */
run_diff_files(&rev, DIFF_RACY_IS_MODIFIED);
+ clear_pathspec(&rev.prune_data);
return !!data.add_errors;
}
+static int renormalize_tracked_files(const struct pathspec *pathspec, int flags)
+{
+ int i, retval = 0;
+
+ for (i = 0; i < active_nr; i++) {
+ struct cache_entry *ce = active_cache[i];
+
+ if (ce_stage(ce))
+ continue; /* do not touch unmerged paths */
+ if (!S_ISREG(ce->ce_mode) && !S_ISLNK(ce->ce_mode))
+ continue; /* do not touch non blobs */
+ if (pathspec && !ce_path_match(ce, pathspec, NULL))
+ continue;
+ retval |= add_file_to_cache(ce->name, flags | HASH_RENORMALIZE);
+ }
+
+ return retval;
+}
+
static char *prune_directory(struct dir_struct *dir, struct pathspec *pathspec, int prefix)
{
char *seen;
@@ -216,7 +238,7 @@
argc = setup_revisions(argc, argv, &rev, NULL);
rev.diffopt.output_format = DIFF_FORMAT_PATCH;
rev.diffopt.use_color = 0;
- DIFF_OPT_SET(&rev.diffopt, IGNORE_DIRTY_SUBMODULES);
+ rev.diffopt.flags.ignore_dirty_submodules = 1;
out = open(file, O_CREAT | O_WRONLY, 0666);
if (out < 0)
die(_("Could not open '%s' for writing."), file);
@@ -274,6 +296,7 @@
OPT_BOOL('e', "edit", &edit_interactive, N_("edit current diff and apply")),
OPT__FORCE(&ignored_too, N_("allow adding otherwise ignored files")),
OPT_BOOL('u', "update", &take_worktree_changes, N_("update tracked files")),
+ OPT_BOOL(0, "renormalize", &add_renormalize, N_("renormalize EOL of tracked files (implies -u)")),
OPT_BOOL('N', "intent-to-add", &intent_to_add, N_("record only the fact that the path will be added later")),
OPT_BOOL('A', "all", &addremove_explicit, N_("add changes from all tracked and untracked files")),
{ OPTION_CALLBACK, 0, "ignore-removal", &addremove_explicit,
@@ -404,7 +427,7 @@
chmod_arg[1] != 'x' || chmod_arg[2]))
die(_("--chmod param '%s' must be either -x or +x"), chmod_arg);
- add_new_files = !take_worktree_changes && !refresh_only;
+ add_new_files = !take_worktree_changes && !refresh_only && !add_renormalize;
require_pathspec = !(take_worktree_changes || (0 < addremove_explicit));
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
@@ -498,7 +521,10 @@
plug_bulk_checkin();
- exit_status |= add_files_to_cache(prefix, &pathspec, flags);
+ if (add_renormalize)
+ exit_status |= renormalize_tracked_files(&pathspec, flags);
+ else
+ exit_status |= add_files_to_cache(prefix, &pathspec, flags);
if (add_new_files)
exit_status |= add_files(&dir, flags);
@@ -513,5 +539,7 @@
die(_("Unable to write new index file"));
}
+ UNLEAK(pathspec);
+ UNLEAK(dir);
return exit_status;
}
diff --git a/builtin/am.c b/builtin/am.c
index 73f542b..acfe9d3 100644
--- a/builtin/am.c
+++ b/builtin/am.c
@@ -31,6 +31,7 @@
#include "mailinfo.h"
#include "apply.h"
#include "string-list.h"
+#include "packfile.h"
/**
* Returns 1 if the file is empty or does not exist, 0 otherwise.
@@ -670,9 +671,7 @@
goto done;
}
- strbuf_reset(&l2);
strbuf_getline(&l2, fp);
- strbuf_reset(&l3);
strbuf_getline(&l3, fp);
/*
@@ -695,6 +694,8 @@
done:
fclose(fp);
strbuf_release(&l1);
+ strbuf_release(&l2);
+ strbuf_release(&l3);
return ret;
}
@@ -707,6 +708,7 @@
{
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf last = STRBUF_INIT;
+ int ret;
cp.git_cmd = 1;
argv_array_push(&cp.args, "mailsplit");
@@ -720,13 +722,16 @@
argv_array_push(&cp.args, "--");
argv_array_pushv(&cp.args, paths);
- if (capture_command(&cp, &last, 8))
- return -1;
+ ret = capture_command(&cp, &last, 8);
+ if (ret)
+ goto exit;
state->cur = 1;
state->last = strtol(last.buf, NULL, 10);
- return 0;
+exit:
+ strbuf_release(&last);
+ return ret ? -1 : 0;
}
/**
@@ -880,6 +885,7 @@
static int hg_patch_to_mail(FILE *out, FILE *in, int keep_cr)
{
struct strbuf sb = STRBUF_INIT;
+ int rc = 0;
while (!strbuf_getline_lf(&sb, in)) {
const char *str;
@@ -893,19 +899,27 @@
errno = 0;
timestamp = parse_timestamp(str, &end, 10);
- if (errno)
- return error(_("invalid timestamp"));
+ if (errno) {
+ rc = error(_("invalid timestamp"));
+ goto exit;
+ }
- if (!skip_prefix(end, " ", &str))
- return error(_("invalid Date line"));
+ if (!skip_prefix(end, " ", &str)) {
+ rc = error(_("invalid Date line"));
+ goto exit;
+ }
errno = 0;
tz = strtol(str, &end, 10);
- if (errno)
- return error(_("invalid timezone offset"));
+ if (errno) {
+ rc = error(_("invalid timezone offset"));
+ goto exit;
+ }
- if (*end)
- return error(_("invalid Date line"));
+ if (*end) {
+ rc = error(_("invalid Date line"));
+ goto exit;
+ }
/*
* mercurial's timezone is in seconds west of UTC,
@@ -930,9 +944,9 @@
fwrite(sb.buf, 1, sb.len, out);
strbuf_reset(&sb);
}
-
+exit:
strbuf_release(&sb);
- return 0;
+ return rc;
}
/**
@@ -1058,8 +1072,8 @@
if (!get_oid("HEAD", &curr_head)) {
write_state_text(state, "abort-safety", oid_to_hex(&curr_head));
if (!state->rebasing)
- update_ref_oid("am", "ORIG_HEAD", &curr_head, NULL, 0,
- UPDATE_REFS_DIE_ON_ERR);
+ update_ref("am", "ORIG_HEAD", &curr_head, NULL, 0,
+ UPDATE_REFS_DIE_ON_ERR);
} else {
write_state_text(state, "abort-safety", "");
if (!state->rebasing)
@@ -1124,52 +1138,15 @@
*/
static void refresh_and_write_cache(void)
{
- struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
+ struct lock_file lock_file = LOCK_INIT;
- hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
refresh_cache(REFRESH_QUIET);
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write index file"));
}
/**
- * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn
- * branch, returns 1 if there are entries in the index, 0 otherwise. If an
- * strbuf is provided, the space-separated list of files that differ will be
- * appended to it.
- */
-static int index_has_changes(struct strbuf *sb)
-{
- struct object_id head;
- int i;
-
- if (!get_sha1_tree("HEAD", head.hash)) {
- struct diff_options opt;
-
- diff_setup(&opt);
- DIFF_OPT_SET(&opt, EXIT_WITH_STATUS);
- if (!sb)
- DIFF_OPT_SET(&opt, QUICK);
- do_diff_cache(&head, &opt);
- diffcore_std(&opt);
- for (i = 0; sb && i < diff_queued_diff.nr; i++) {
- if (i)
- strbuf_addch(sb, ' ');
- strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);
- }
- diff_flush(&opt);
- return DIFF_OPT_TST(&opt, HAS_CHANGES) != 0;
- } else {
- for (i = 0; sb && i < active_nr; i++) {
- if (i)
- strbuf_addch(sb, ' ');
- strbuf_addstr(sb, active_cache[i]->name);
- }
- return !!active_nr;
- }
-}
-
-/**
* Dies with a user-friendly message on how to proceed after resolving the
* problem. This message can be overridden with state->resolvemsg.
*/
@@ -1399,8 +1376,8 @@
rev_info.show_root_diff = 1;
rev_info.diffopt.output_format = DIFF_FORMAT_PATCH;
rev_info.no_commit_id = 1;
- DIFF_OPT_SET(&rev_info.diffopt, BINARY);
- DIFF_OPT_SET(&rev_info.diffopt, FULL_INDEX);
+ rev_info.diffopt.flags.binary = 1;
+ rev_info.diffopt.flags.full_index = 1;
rev_info.diffopt.use_color = 0;
rev_info.diffopt.file = fp;
rev_info.diffopt.close_file = 1;
@@ -1420,10 +1397,10 @@
struct rev_info rev_info;
FILE *fp;
- if (!get_sha1_tree("HEAD", head.hash))
+ if (!get_oid_tree("HEAD", &head))
tree = lookup_tree(&head);
else
- tree = lookup_tree(&empty_tree_oid);
+ tree = lookup_tree(the_hash_algo->empty_tree);
fp = xfopen(am_path(state, "patch"), "w");
init_revisions(&rev_info, NULL);
@@ -1478,11 +1455,10 @@
struct argv_array apply_opts = ARGV_ARRAY_INIT;
struct apply_state apply_state;
int res, opts_left;
- static struct lock_file lock_file;
int force_apply = 0;
int options = 0;
- if (init_apply_state(&apply_state, NULL, &lock_file))
+ if (init_apply_state(&apply_state, NULL))
die("BUG: init_apply_state() failed");
argv_array_push(&apply_opts, "apply");
@@ -1649,7 +1625,7 @@
if (write_cache_as_tree(tree.hash, 0, NULL))
die(_("git write-tree failed to write a tree"));
- if (!get_sha1_commit("HEAD", parent.hash)) {
+ if (!get_oid_commit("HEAD", &parent)) {
old_oid = &parent;
commit_list_insert(lookup_commit(&parent), &parents);
} else {
@@ -1676,8 +1652,8 @@
strbuf_addf(&sb, "%s: %.*s", reflog_msg, linelen(state->msg),
state->msg);
- update_ref_oid(sb.buf, "HEAD", &commit, old_oid, 0,
- UPDATE_REFS_DIE_ON_ERR);
+ update_ref(sb.buf, "HEAD", &commit, old_oid, 0,
+ UPDATE_REFS_DIE_ON_ERR);
if (state->rebasing) {
FILE *fp = xfopen(am_path(state, "rewritten"), "a");
@@ -1936,15 +1912,14 @@
*/
static int fast_forward_to(struct tree *head, struct tree *remote, int reset)
{
- struct lock_file *lock_file;
+ struct lock_file lock_file = LOCK_INIT;
struct unpack_trees_options opts;
struct tree_desc t[2];
if (parse_tree(head) || parse_tree(remote))
return -1;
- lock_file = xcalloc(1, sizeof(struct lock_file));
- hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
refresh_cache(REFRESH_QUIET);
@@ -1960,11 +1935,11 @@
init_tree_desc(&t[1], remote->buffer, remote->size);
if (unpack_trees(2, t, &opts)) {
- rollback_lock_file(lock_file);
+ rollback_lock_file(&lock_file);
return -1;
}
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
return 0;
@@ -1976,15 +1951,14 @@
*/
static int merge_tree(struct tree *tree)
{
- struct lock_file *lock_file;
+ struct lock_file lock_file = LOCK_INIT;
struct unpack_trees_options opts;
struct tree_desc t[1];
if (parse_tree(tree))
return -1;
- lock_file = xcalloc(1, sizeof(struct lock_file));
- hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
memset(&opts, 0, sizeof(opts));
opts.head_idx = 1;
@@ -1995,11 +1969,11 @@
init_tree_desc(&t[0], tree->buffer, tree->size);
if (unpack_trees(1, t, &opts)) {
- rollback_lock_file(lock_file);
+ rollback_lock_file(&lock_file);
return -1;
}
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
return 0;
@@ -2095,6 +2069,7 @@
die(_("could not parse %s"), am_path(state, "abort-safety"));
} else
oidclr(&abort_safety);
+ strbuf_release(&sb);
if (get_oid("HEAD", &head))
oidclr(&head);
@@ -2124,7 +2099,7 @@
am_rerere_clear();
- curr_branch = resolve_refdup("HEAD", 0, curr_head.hash, NULL);
+ curr_branch = resolve_refdup("HEAD", 0, &curr_head, NULL);
has_curr_head = curr_branch && !is_null_oid(&curr_head);
if (!has_curr_head)
hashcpy(curr_head.hash, EMPTY_TREE_SHA1_BIN);
@@ -2136,11 +2111,11 @@
clean_index(&curr_head, &orig_head);
if (has_orig_head)
- update_ref_oid("am --abort", "HEAD", &orig_head,
- has_curr_head ? &curr_head : NULL, 0,
- UPDATE_REFS_DIE_ON_ERR);
+ update_ref("am --abort", "HEAD", &orig_head,
+ has_curr_head ? &curr_head : NULL, 0,
+ UPDATE_REFS_DIE_ON_ERR);
else if (curr_branch)
- delete_ref(NULL, curr_branch, NULL, REF_NODEREF);
+ delete_ref(NULL, curr_branch, NULL, REF_NO_DEREF);
free(curr_branch);
am_destroy(state);
diff --git a/builtin/apply.c b/builtin/apply.c
index 81b9a61..48d3989 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -9,8 +9,6 @@
NULL
};
-static struct lock_file lock_file;
-
int cmd_apply(int argc, const char **argv, const char *prefix)
{
int force_apply = 0;
@@ -18,7 +16,7 @@
int ret;
struct apply_state state;
- if (init_apply_state(&state, prefix, &lock_file))
+ if (init_apply_state(&state, prefix))
exit(128);
argc = apply_parse_options(argc, argv,
diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c
index 33242290..4b5fadc 100644
--- a/builtin/bisect--helper.c
+++ b/builtin/bisect--helper.c
@@ -2,19 +2,128 @@
#include "cache.h"
#include "parse-options.h"
#include "bisect.h"
+#include "refs.h"
+
+static GIT_PATH_FUNC(git_path_bisect_terms, "BISECT_TERMS")
+static GIT_PATH_FUNC(git_path_bisect_expected_rev, "BISECT_EXPECTED_REV")
+static GIT_PATH_FUNC(git_path_bisect_ancestors_ok, "BISECT_ANCESTORS_OK")
static const char * const git_bisect_helper_usage[] = {
N_("git bisect--helper --next-all [--no-checkout]"),
+ N_("git bisect--helper --write-terms <bad_term> <good_term>"),
+ N_("git bisect--helper --bisect-clean-state"),
NULL
};
+/*
+ * Check whether the string `term` belongs to the set of strings
+ * included in the variable arguments.
+ */
+LAST_ARG_MUST_BE_NULL
+static int one_of(const char *term, ...)
+{
+ int res = 0;
+ va_list matches;
+ const char *match;
+
+ va_start(matches, term);
+ while (!res && (match = va_arg(matches, const char *)))
+ res = !strcmp(term, match);
+ va_end(matches);
+
+ return res;
+}
+
+static int check_term_format(const char *term, const char *orig_term)
+{
+ int res;
+ char *new_term = xstrfmt("refs/bisect/%s", term);
+
+ res = check_refname_format(new_term, 0);
+ free(new_term);
+
+ if (res)
+ return error(_("'%s' is not a valid term"), term);
+
+ if (one_of(term, "help", "start", "skip", "next", "reset",
+ "visualize", "view", "replay", "log", "run", "terms", NULL))
+ return error(_("can't use the builtin command '%s' as a term"), term);
+
+ /*
+ * In theory, nothing prevents swapping completely good and bad,
+ * but this situation could be confusing and hasn't been tested
+ * enough. Forbid it for now.
+ */
+
+ if ((strcmp(orig_term, "bad") && one_of(term, "bad", "new", NULL)) ||
+ (strcmp(orig_term, "good") && one_of(term, "good", "old", NULL)))
+ return error(_("can't change the meaning of the term '%s'"), term);
+
+ return 0;
+}
+
+static int write_terms(const char *bad, const char *good)
+{
+ FILE *fp = NULL;
+ int res;
+
+ if (!strcmp(bad, good))
+ return error(_("please use two different terms"));
+
+ if (check_term_format(bad, "bad") || check_term_format(good, "good"))
+ return -1;
+
+ fp = fopen(git_path_bisect_terms(), "w");
+ if (!fp)
+ return error_errno(_("could not open the file BISECT_TERMS"));
+
+ res = fprintf(fp, "%s\n%s\n", bad, good);
+ res |= fclose(fp);
+ return (res < 0) ? -1 : 0;
+}
+
+static int is_expected_rev(const char *expected_hex)
+{
+ struct strbuf actual_hex = STRBUF_INIT;
+ int res = 0;
+ if (strbuf_read_file(&actual_hex, git_path_bisect_expected_rev(), 0) >= 40) {
+ strbuf_trim(&actual_hex);
+ res = !strcmp(actual_hex.buf, expected_hex);
+ }
+ strbuf_release(&actual_hex);
+ return res;
+}
+
+static void check_expected_revs(const char **revs, int rev_nr)
+{
+ int i;
+
+ for (i = 0; i < rev_nr; i++) {
+ if (!is_expected_rev(revs[i])) {
+ unlink_or_warn(git_path_bisect_ancestors_ok());
+ unlink_or_warn(git_path_bisect_expected_rev());
+ }
+ }
+}
+
int cmd_bisect__helper(int argc, const char **argv, const char *prefix)
{
- int next_all = 0;
+ enum {
+ NEXT_ALL = 1,
+ WRITE_TERMS,
+ BISECT_CLEAN_STATE,
+ CHECK_EXPECTED_REVS
+ } cmdmode = 0;
int no_checkout = 0;
struct option options[] = {
- OPT_BOOL(0, "next-all", &next_all,
- N_("perform 'git bisect next'")),
+ OPT_CMDMODE(0, "next-all", &cmdmode,
+ N_("perform 'git bisect next'"), NEXT_ALL),
+ OPT_CMDMODE(0, "write-terms", &cmdmode,
+ N_("write the terms to .git/BISECT_TERMS"), WRITE_TERMS),
+ OPT_CMDMODE(0, "bisect-clean-state", &cmdmode,
+ N_("cleanup the bisection state"), BISECT_CLEAN_STATE),
+ OPT_CMDMODE(0, "check-expected-revs", &cmdmode,
+ N_("check for expected revs"), CHECK_EXPECTED_REVS),
OPT_BOOL(0, "no-checkout", &no_checkout,
N_("update BISECT_HEAD instead of checking out the current commit")),
OPT_END()
@@ -23,9 +132,25 @@
argc = parse_options(argc, argv, prefix, options,
git_bisect_helper_usage, 0);
- if (!next_all)
+ if (!cmdmode)
usage_with_options(git_bisect_helper_usage, options);
- /* next-all */
- return bisect_next_all(prefix, no_checkout);
+ switch (cmdmode) {
+ case NEXT_ALL:
+ return bisect_next_all(prefix, no_checkout);
+ case WRITE_TERMS:
+ if (argc != 2)
+ return error(_("--write-terms requires two arguments"));
+ return write_terms(argv[0], argv[1]);
+ case BISECT_CLEAN_STATE:
+ if (argc != 0)
+ return error(_("--bisect-clean-state requires no arguments"));
+ return bisect_clean_state();
+ case CHECK_EXPECTED_REVS:
+ check_expected_revs(argv, argc);
+ return 0;
+ default:
+ return error("BUG: unknown subcommand '%d'", cmdmode);
+ }
+ return 0;
}
diff --git a/builtin/blame.c b/builtin/blame.c
index bda1a78..005f55a 100644
--- a/builtin/blame.c
+++ b/builtin/blame.c
@@ -488,7 +488,7 @@
return -1;
while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
- struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
+ struct commit_graft *graft = read_graft_line(&buf);
if (graft)
register_commit_graft(graft, 0);
}
@@ -708,8 +708,8 @@
git_config(git_blame_config, &output_option);
init_revisions(&revs, NULL);
revs.date_mode = blame_date_mode;
- DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV);
- DIFF_OPT_SET(&revs.diffopt, FOLLOW_RENAMES);
+ revs.diffopt.flags.allow_textconv = 1;
+ revs.diffopt.flags.follow_renames = 1;
save_commit_buffer = 0;
dashdash_pos = 0;
@@ -734,9 +734,9 @@
parse_revision_opt(&revs, &ctx, options, blame_opt_usage);
}
parse_done:
- no_whole_file_rename = !DIFF_OPT_TST(&revs.diffopt, FOLLOW_RENAMES);
+ no_whole_file_rename = !revs.diffopt.flags.follow_renames;
xdl_opts |= revs.diffopt.xdl_opts & XDF_INDENT_HEURISTIC;
- DIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES);
+ revs.diffopt.flags.follow_renames = 0;
argc = parse_options_end(&ctx);
if (incremental || (output_option & OUTPUT_PORCELAIN)) {
@@ -803,7 +803,7 @@
}
blame_date_width -= 1; /* strip the null */
- if (DIFF_OPT_TST(&revs.diffopt, FIND_COPIES_HARDER))
+ if (revs.diffopt.flags.find_copies_harder)
opt |= (PICKAXE_BLAME_COPY | PICKAXE_BLAME_MOVE |
PICKAXE_BLAME_COPY_HARDER);
@@ -925,8 +925,7 @@
sb.found_guilty_entry = &found_guilty_entry;
sb.found_guilty_entry_data = π
if (show_progress)
- pi.progress = start_progress_delay(_("Blaming lines"),
- sb.num_lines, 50, 1);
+ pi.progress = start_delayed_progress(_("Blaming lines"), sb.num_lines);
assign_blame(&sb, opt);
diff --git a/builtin/branch.c b/builtin/branch.c
index 8f779b0..8dcc2ed 100644
--- a/builtin/branch.c
+++ b/builtin/branch.c
@@ -28,6 +28,7 @@
N_("git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"),
N_("git branch [<options>] [-r] (-d | -D) <branch-name>..."),
N_("git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"),
+ N_("git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"),
N_("git branch [<options>] [-r | -a] [--points-at]"),
N_("git branch [<options>] [-r | -a] [--format]"),
NULL
@@ -124,7 +125,7 @@
if (upstream &&
(reference_name = reference_name_to_free =
resolve_refdup(upstream, RESOLVE_REF_READING,
- oid.hash, NULL)) != NULL)
+ &oid, NULL)) != NULL)
reference_rev = lookup_commit_reference(&oid);
}
if (!reference_rev)
@@ -240,7 +241,7 @@
RESOLVE_REF_READING
| RESOLVE_REF_NO_RECURSE
| RESOLVE_REF_ALLOW_BAD_NAME,
- oid.hash, &flags);
+ &oid, &flags);
if (!target) {
error(remote_branch
? _("remote-tracking branch '%s' not found.")
@@ -256,8 +257,8 @@
goto next;
}
- if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : oid.hash,
- REF_NODEREF)) {
+ if (delete_ref(NULL, name, is_null_oid(&oid) ? NULL : &oid,
+ REF_NO_DEREF)) {
error(remote_branch
? _("Error deleting remote-tracking branch '%s'")
: _("Error deleting branch '%s'"),
@@ -353,7 +354,7 @@
strbuf_addf(&obname, "%%(objectname:short=%d)", filter->abbrev);
strbuf_addf(&local, "%%(align:%d,left)%%(refname:lstrip=2)%%(end)", maxwidth);
- strbuf_addf(&local, "%s", branch_get_color(BRANCH_COLOR_RESET));
+ strbuf_addstr(&local, branch_get_color(BRANCH_COLOR_RESET));
strbuf_addf(&local, " %s ", obname.buf);
if (filter->verbose > 1)
@@ -457,15 +458,20 @@
free_worktrees(worktrees);
}
-static void rename_branch(const char *oldname, const char *newname, int force)
+static void copy_or_rename_branch(const char *oldname, const char *newname, int copy, int force)
{
struct strbuf oldref = STRBUF_INIT, newref = STRBUF_INIT, logmsg = STRBUF_INIT;
struct strbuf oldsection = STRBUF_INIT, newsection = STRBUF_INIT;
+ const char *interpreted_oldname = NULL;
+ const char *interpreted_newname = NULL;
int recovery = 0;
- int clobber_head_ok;
- if (!oldname)
- die(_("cannot rename the current branch while not on any."));
+ if (!oldname) {
+ if (copy)
+ die(_("cannot copy the current branch while not on any."));
+ else
+ die(_("cannot rename the current branch while not on any."));
+ }
if (strbuf_check_branch_ref(&oldref, oldname)) {
/*
@@ -482,32 +488,53 @@
* A command like "git branch -M currentbranch currentbranch" cannot
* cause the worktree to become inconsistent with HEAD, so allow it.
*/
- clobber_head_ok = !strcmp(oldname, newname);
-
- validate_new_branchname(newname, &newref, force, clobber_head_ok);
+ if (!strcmp(oldname, newname))
+ validate_branchname(newname, &newref);
+ else
+ validate_new_branchname(newname, &newref, force);
reject_rebase_or_bisect_branch(oldref.buf);
- strbuf_addf(&logmsg, "Branch: renamed %s to %s",
- oldref.buf, newref.buf);
+ if (!skip_prefix(oldref.buf, "refs/heads/", &interpreted_oldname) ||
+ !skip_prefix(newref.buf, "refs/heads/", &interpreted_newname)) {
+ die("BUG: expected prefix missing for refs");
+ }
- if (rename_ref(oldref.buf, newref.buf, logmsg.buf))
+ if (copy)
+ strbuf_addf(&logmsg, "Branch: copied %s to %s",
+ oldref.buf, newref.buf);
+ else
+ strbuf_addf(&logmsg, "Branch: renamed %s to %s",
+ oldref.buf, newref.buf);
+
+ if (!copy && rename_ref(oldref.buf, newref.buf, logmsg.buf))
die(_("Branch rename failed"));
+ if (copy && copy_existing_ref(oldref.buf, newref.buf, logmsg.buf))
+ die(_("Branch copy failed"));
- if (recovery)
- warning(_("Renamed a misnamed branch '%s' away"), oldref.buf + 11);
+ if (recovery) {
+ if (copy)
+ warning(_("Created a copy of a misnamed branch '%s'"),
+ interpreted_oldname);
+ else
+ warning(_("Renamed a misnamed branch '%s' away"),
+ interpreted_oldname);
+ }
- if (replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
+ if (!copy &&
+ replace_each_worktree_head_symref(oldref.buf, newref.buf, logmsg.buf))
die(_("Branch renamed to %s, but HEAD is not updated!"), newname);
strbuf_release(&logmsg);
- strbuf_addf(&oldsection, "branch.%s", oldref.buf + 11);
+ strbuf_addf(&oldsection, "branch.%s", interpreted_oldname);
strbuf_release(&oldref);
- strbuf_addf(&newsection, "branch.%s", newref.buf + 11);
+ strbuf_addf(&newsection, "branch.%s", interpreted_newname);
strbuf_release(&newref);
- if (git_config_rename_section(oldsection.buf, newsection.buf) < 0)
+ if (!copy && git_config_rename_section(oldsection.buf, newsection.buf) < 0)
die(_("Branch is renamed, but update of config-file failed"));
+ if (copy && strcmp(oldname, newname) && git_config_copy_section(oldsection.buf, newsection.buf) < 0)
+ die(_("Branch is copied, but update of config-file failed"));
strbuf_release(&oldsection);
strbuf_release(&newsection);
}
@@ -545,7 +572,7 @@
int cmd_branch(int argc, const char **argv, const char *prefix)
{
- int delete = 0, rename = 0, force = 0, list = 0;
+ int delete = 0, rename = 0, copy = 0, force = 0, list = 0;
int reflog = 0, edit_description = 0;
int quiet = 0, unset_upstream = 0;
const char *new_upstream = NULL;
@@ -562,8 +589,8 @@
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_SET_INT( 0, "set-upstream", &track, N_("change upstream info"),
- BRANCH_TRACK_OVERRIDE),
+ { OPTION_SET_INT, 0, "set-upstream", &track, NULL, N_("do not use"),
+ PARSE_OPT_NOARG | PARSE_OPT_HIDDEN, NULL, BRANCH_TRACK_OVERRIDE },
OPT_STRING('u', "set-upstream-to", &new_upstream, N_("upstream"), N_("change the upstream info")),
OPT_BOOL(0, "unset-upstream", &unset_upstream, N_("Unset the upstream info")),
OPT__COLOR(&branch_use_color, N_("use colored output")),
@@ -582,6 +609,8 @@
OPT_BIT('D', NULL, &delete, N_("delete branch (even if not merged)"), 2),
OPT_BIT('m', "move", &rename, N_("move/rename a branch and its reflog"), 1),
OPT_BIT('M', NULL, &rename, N_("move/rename a branch, even if target exists"), 2),
+ OPT_BIT('c', "copy", ©, N_("copy a branch and its reflog"), 1),
+ OPT_BIT('C', NULL, ©, N_("copy a branch, even if target exists"), 2),
OPT_BOOL(0, "list", &list, N_("list branch names")),
OPT_BOOL('l', "create-reflog", &reflog, N_("create the branch's reflog")),
OPT_BOOL(0, "edit-description", &edit_description,
@@ -614,7 +643,7 @@
track = git_branch_track;
- head = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
+ head = resolve_refdup("HEAD", 0, &head_oid, NULL);
if (!head)
die(_("Failed to resolve HEAD as a valid ref."));
if (!strcmp(head, "HEAD"))
@@ -625,14 +654,14 @@
argc = parse_options(argc, argv, prefix, options, builtin_branch_usage,
0);
- if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0)
+ if (!delete && !rename && !copy && !edit_description && !new_upstream && !unset_upstream && argc == 0)
list = 1;
if (filter.with_commit || filter.merge != REF_FILTER_MERGED_NONE || filter.points_at.nr ||
filter.no_commit)
list = 1;
- if (!!delete + !!rename + !!new_upstream +
+ if (!!delete + !!rename + !!copy + !!new_upstream +
list + unset_upstream > 1)
usage_with_options(builtin_branch_usage, options);
@@ -650,8 +679,12 @@
if (force) {
delete *= 2;
rename *= 2;
+ copy *= 2;
}
+ if (list)
+ setup_auto_pager("branch", 1);
+
if (delete) {
if (!argc)
die(_("branch name required"));
@@ -704,20 +737,29 @@
if (edit_branch_description(branch_name))
return 1;
+ } else if (copy) {
+ if (!argc)
+ die(_("branch name required"));
+ else if (argc == 1)
+ copy_or_rename_branch(head, argv[0], 1, copy > 1);
+ else if (argc == 2)
+ copy_or_rename_branch(argv[0], argv[1], 1, copy > 1);
+ else
+ die(_("too many branches for a copy operation"));
} else if (rename) {
if (!argc)
die(_("branch name required"));
else if (argc == 1)
- rename_branch(head, argv[0], rename > 1);
+ copy_or_rename_branch(head, argv[0], 0, rename > 1);
else if (argc == 2)
- rename_branch(argv[0], argv[1], rename > 1);
+ copy_or_rename_branch(argv[0], argv[1], 0, rename > 1);
else
- die(_("too many branches for a rename operation"));
+ die(_("too many arguments for a rename operation"));
} else if (new_upstream) {
struct branch *branch = branch_get(argv[0]);
if (argc > 1)
- die(_("too many branches to set new upstream"));
+ die(_("too many arguments to set new upstream"));
if (!branch) {
if (!argc || !strcmp(argv[0], "HEAD"))
@@ -740,7 +782,7 @@
struct strbuf buf = STRBUF_INIT;
if (argc > 1)
- die(_("too many branches to unset upstream"));
+ die(_("too many arguments to unset upstream"));
if (!branch) {
if (!argc || !strcmp(argv[0], "HEAD"))
@@ -760,11 +802,6 @@
strbuf_release(&buf);
} else if (argc > 0 && argc <= 2) {
struct branch *branch = branch_get(argv[0]);
- int branch_existed = 0, remote_tracking = 0;
- struct strbuf buf = STRBUF_INIT;
-
- if (!strcmp(argv[0], "HEAD"))
- die(_("it does not make sense to create 'HEAD' manually"));
if (!branch)
die(_("no such branch '%s'"), argv[0]);
@@ -773,27 +810,10 @@
die(_("-a and -r options to 'git branch' do not make sense with a branch name"));
if (track == BRANCH_TRACK_OVERRIDE)
- fprintf(stderr, _("The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to\n"));
+ die(_("the '--set-upstream' option is no longer supported. Please use '--track' or '--set-upstream-to' instead."));
- strbuf_addf(&buf, "refs/remotes/%s", branch->name);
- remote_tracking = ref_exists(buf.buf);
- strbuf_release(&buf);
-
- branch_existed = ref_exists(branch->refname);
create_branch(argv[0], (argc == 2) ? argv[1] : head,
- force, reflog, 0, quiet, track);
-
- /*
- * We only show the instructions if the user gave us
- * one branch which doesn't exist locally, but is the
- * name of a remote-tracking branch.
- */
- if (argc == 1 && track == BRANCH_TRACK_OVERRIDE &&
- !branch_existed && remote_tracking) {
- fprintf(stderr, _("\nIf you wanted to make '%s' track '%s', do this:\n\n"), head, branch->name);
- fprintf(stderr, " git branch -d %s\n", branch->name);
- fprintf(stderr, " git branch --set-upstream-to %s\n", branch->name);
- }
+ force, 0, reflog, quiet, track);
} else
usage_with_options(builtin_branch_usage, options);
diff --git a/builtin/cat-file.c b/builtin/cat-file.c
index 188ddc3..f5fa4fd 100644
--- a/builtin/cat-file.c
+++ b/builtin/cat-file.c
@@ -12,6 +12,7 @@
#include "streaming.h"
#include "tree-walk.h"
#include "sha1-array.h"
+#include "packfile.h"
struct batch_options {
int enabled;
@@ -63,8 +64,8 @@
if (unknown_type)
flags |= OBJECT_INFO_ALLOW_UNKNOWN_TYPE;
- if (get_sha1_with_context(obj_name, GET_SHA1_RECORD_PATH,
- oid.hash, &obj_context))
+ if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
+ &oid, &obj_context))
die("Not a valid object name %s", obj_name);
if (!path)
@@ -112,6 +113,7 @@
if (textconv_object(path, obj_context.mode, &oid, 1, &buf, &size))
break;
+ /* else fallthrough */
case 'p':
type = sha1_object_info(oid.hash, NULL);
@@ -361,10 +363,10 @@
struct expand_data *data)
{
struct object_context ctx;
- int flags = opt->follow_symlinks ? GET_SHA1_FOLLOW_SYMLINKS : 0;
+ int flags = opt->follow_symlinks ? GET_OID_FOLLOW_SYMLINKS : 0;
enum follow_symlinks_result result;
- result = get_sha1_with_context(obj_name, flags, data->oid.hash, &ctx);
+ result = get_oid_with_context(obj_name, flags, &data->oid, &ctx);
if (result != FOUND) {
switch (result) {
case MISSING_OBJECT:
diff --git a/builtin/check-ref-format.c b/builtin/check-ref-format.c
index eac4994..bc67d3f 100644
--- a/builtin/check-ref-format.c
+++ b/builtin/check-ref-format.c
@@ -39,12 +39,15 @@
static int check_ref_format_branch(const char *arg)
{
struct strbuf sb = STRBUF_INIT;
+ const char *name;
int nongit;
setup_git_directory_gently(&nongit);
- if (strbuf_check_branch_ref(&sb, arg))
+ if (strbuf_check_branch_ref(&sb, arg) ||
+ !skip_prefix(sb.buf, "refs/heads/", &name))
die("'%s' is not a valid branch name", arg);
- printf("%s\n", sb.buf + 11);
+ printf("%s\n", name);
+ strbuf_release(&sb);
return 0;
}
diff --git a/builtin/checkout-index.c b/builtin/checkout-index.c
index 39c8be0..b0e78b8 100644
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@ -129,8 +129,6 @@
NULL
};
-static struct lock_file lock_file;
-
static int option_parse_stage(const struct option *opt,
const char *arg, int unset)
{
@@ -150,7 +148,7 @@
int cmd_checkout_index(int argc, const char **argv, const char *prefix)
{
int i;
- int newfd = -1;
+ struct lock_file lock_file = LOCK_INIT;
int all = 0;
int read_from_stdin = 0;
int prefix_length;
@@ -206,7 +204,7 @@
if (index_opt && !state.base_dir_len && !to_tempfile) {
state.refresh_cache = 1;
state.istate = &the_index;
- newfd = hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
}
/* Check out named files first */
@@ -251,7 +249,7 @@
if (all)
checkout_all(prefix, prefix_length);
- if (0 <= newfd &&
+ if (is_lock_file_locked(&lock_file) &&
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die("Unable to write new index file");
return 0;
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 2d75ac6..c54c78d 100644
--- a/builtin/checkout.c
+++ b/builtin/checkout.c
@@ -1,5 +1,6 @@
#include "builtin.h"
#include "config.h"
+#include "checkout.h"
#include "lockfile.h"
#include "parse-options.h"
#include "refs.h"
@@ -247,7 +248,7 @@
struct object_id rev;
struct commit *head;
int errs = 0;
- struct lock_file *lock_file;
+ struct lock_file lock_file = LOCK_INIT;
if (opts->track != BRANCH_TRACK_UNSPECIFIED)
die(_("'%s' cannot be used with updating paths"), "--track");
@@ -275,9 +276,7 @@
return run_add_interactive(revision, "--patch=checkout",
&opts->pathspec);
- lock_file = xcalloc(1, sizeof(struct lock_file));
-
- hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
if (read_cache_preload(&opts->pathspec) < 0)
return error(_("index file corrupt"));
@@ -376,10 +375,10 @@
}
errs |= finish_delayed_checkout(&state);
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
- read_ref_full("HEAD", 0, rev.hash, NULL);
+ read_ref_full("HEAD", 0, &rev, NULL);
head = lookup_commit_reference_gently(&rev, 1);
errs |= post_checkout_hook(head, head, 0);
@@ -402,10 +401,16 @@
static void describe_detached_head(const char *msg, struct commit *commit)
{
struct strbuf sb = STRBUF_INIT;
+
if (!parse_commit(commit))
pp_commit_easy(CMIT_FMT_ONELINE, commit, &sb);
- fprintf(stderr, "%s %s... %s\n", msg,
- find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+ if (print_sha1_ellipsis()) {
+ fprintf(stderr, "%s %s... %s\n", msg,
+ find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+ } else {
+ fprintf(stderr, "%s %s %s\n", msg,
+ find_unique_abbrev(commit->object.oid.hash, DEFAULT_ABBREV), sb.buf);
+ }
strbuf_release(&sb);
}
@@ -436,6 +441,7 @@
* update paths in the work tree, and we cannot revert
* them.
*/
+ /* fallthrough */
case 0:
return 0;
default:
@@ -471,9 +477,9 @@
int *writeout_error)
{
int ret;
- struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
+ struct lock_file lock_file = LOCK_INIT;
- hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
if (read_cache_preload(NULL) < 0)
return error(_("index file corrupt"));
@@ -515,7 +521,7 @@
}
tree = parse_tree_indirect(old->commit ?
&old->commit->object.oid :
- &empty_tree_oid);
+ the_hash_algo->empty_tree);
init_tree_desc(&trees[0], tree->buffer, tree->size);
tree = parse_tree_indirect(&new->commit->object.oid);
init_tree_desc(&trees[1], tree->buffer, tree->size);
@@ -590,7 +596,7 @@
if (!cache_tree_fully_valid(active_cache_tree))
cache_tree_update(&the_index, WRITE_TREE_SILENT | WRITE_TREE_REPAIR);
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
if (!opts->force && !opts->quiet)
@@ -641,8 +647,8 @@
else
create_branch(opts->new_branch, new->name,
opts->new_branch_force ? 1 : 0,
- opts->new_branch_log,
opts->new_branch_force ? 1 : 0,
+ opts->new_branch_log,
opts->quiet,
opts->track);
new->name = opts->new_branch;
@@ -663,8 +669,8 @@
if (!strcmp(new->name, "HEAD") && !new->path && !opts->force_detach) {
/* Nothing to do. */
} else if (opts->force_detach || !new->path) { /* No longer on any branch. */
- update_ref(msg.buf, "HEAD", new->commit->object.oid.hash, NULL,
- REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
+ update_ref(msg.buf, "HEAD", &new->commit->object.oid, NULL,
+ REF_NO_DEREF, UPDATE_REFS_DIE_ON_ERR);
if (!opts->quiet) {
if (old->path &&
advice_detached_head && !opts->force_detach)
@@ -785,7 +791,6 @@
{
struct rev_info revs;
struct object *object = &old->object;
- struct object_array refs;
init_revisions(&revs, NULL);
setup_revisions(0, NULL, &revs, NULL);
@@ -796,9 +801,6 @@
for_each_ref(add_pending_uninteresting_ref, &revs);
add_pending_oid(&revs, "HEAD", &new->object.oid, UNINTERESTING);
- refs = revs.pending;
- revs.leak_pending = 1;
-
if (prepare_revision_walk(&revs))
die(_("internal error in revision walk"));
if (!(old->object.flags & UNINTERESTING))
@@ -806,8 +808,8 @@
else
describe_detached_head(_("Previous HEAD position was"), old);
- clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
- free(refs.objects);
+ /* Clean up objects used, as they will be reused. */
+ clear_commit_marks_all(ALL_REV_FLAGS);
}
static int switch_branches(const struct checkout_opts *opts,
@@ -819,7 +821,7 @@
struct object_id rev;
int flag, writeout_error = 0;
memset(&old, 0, sizeof(old));
- old.path = path_to_free = resolve_refdup("HEAD", 0, rev.hash, &flag);
+ old.path = path_to_free = resolve_refdup("HEAD", 0, &rev, &flag);
if (old.path)
old.commit = lookup_commit_reference_gently(&rev, 1);
if (!(flag & REF_ISSYMREF))
@@ -861,51 +863,11 @@
}
if (starts_with(var, "submodule."))
- return submodule_config(var, value, NULL);
+ return git_default_submodule_config(var, value, NULL);
return git_xmerge_config(var, value, NULL);
}
-struct tracking_name_data {
- /* const */ char *src_ref;
- char *dst_ref;
- struct object_id *dst_oid;
- int unique;
-};
-
-static int check_tracking_name(struct remote *remote, void *cb_data)
-{
- struct tracking_name_data *cb = cb_data;
- struct refspec query;
- memset(&query, 0, sizeof(struct refspec));
- query.src = cb->src_ref;
- if (remote_find_tracking(remote, &query) ||
- get_oid(query.dst, cb->dst_oid)) {
- free(query.dst);
- return 0;
- }
- if (cb->dst_ref) {
- free(query.dst);
- cb->unique = 0;
- return 0;
- }
- cb->dst_ref = query.dst;
- return 0;
-}
-
-static const char *unique_tracking_name(const char *name, struct object_id *oid)
-{
- struct tracking_name_data cb_data = { NULL, NULL, NULL, 1 };
- cb_data.src_ref = xstrfmt("refs/heads/%s", name);
- cb_data.dst_oid = oid;
- for_each_remote(check_tracking_name, &cb_data);
- free(cb_data.src_ref);
- if (cb_data.unique)
- return cb_data.dst_ref;
- free(cb_data.dst_ref);
- return NULL;
-}
-
static int parse_branchname_arg(int argc, const char **argv,
int dwim_new_local_branch_ok,
struct branch_info *new,
@@ -1030,7 +992,7 @@
setup_branch_path(new);
if (!check_refname_format(new->path, 0) &&
- !read_ref(new->path, branch_rev.hash))
+ !read_ref(new->path, &branch_rev))
oidcpy(rev, &branch_rev);
else
new->path = NULL; /* not an existing branch */
@@ -1116,9 +1078,8 @@
if (new->path && !opts->force_detach && !opts->new_branch &&
!opts->ignore_other_worktrees) {
- struct object_id oid;
int flag;
- char *head_ref = resolve_refdup("HEAD", 0, oid.hash, &flag);
+ char *head_ref = resolve_refdup("HEAD", 0, NULL, &flag);
if (head_ref &&
(!(flag & REF_ISSYMREF) || strcmp(head_ref, new->path)))
die_if_checked_out(new->path, 1);
@@ -1129,7 +1090,7 @@
struct object_id rev;
int flag;
- if (!read_ref_full("HEAD", 0, rev.hash, &flag) &&
+ if (!read_ref_full("HEAD", 0, &rev, &flag) &&
(flag & REF_ISSYMREF) && is_null_oid(&rev))
return switch_unborn_to_new_branch(opts);
}
@@ -1182,7 +1143,6 @@
opts.prefix = prefix;
opts.show_progress = -1;
- gitmodules_config();
git_config(git_checkout_config, &opts);
opts.track = BRANCH_TRACK_UNSPECIFIED;
@@ -1283,14 +1243,15 @@
if (opts.new_branch) {
struct strbuf buf = STRBUF_INIT;
- opts.branch_exists =
- validate_new_branchname(opts.new_branch, &buf,
- !!opts.new_branch_force,
- !!opts.new_branch_force);
-
+ if (opts.new_branch_force)
+ opts.branch_exists = validate_branchname(opts.new_branch, &buf);
+ else
+ opts.branch_exists =
+ validate_new_branchname(opts.new_branch, &buf, 0);
strbuf_release(&buf);
}
+ UNLEAK(opts);
if (opts.patch_mode || opts.pathspec.nr)
return checkout_paths(&opts, new.name);
else
diff --git a/builtin/clean.c b/builtin/clean.c
index 057fc97..189e206 100644
--- a/builtin/clean.c
+++ b/builtin/clean.c
@@ -33,15 +33,6 @@
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 int clean_use_color = -1;
-static char clean_colors[][COLOR_MAXLEN] = {
- GIT_COLOR_RESET,
- GIT_COLOR_NORMAL, /* PLAIN */
- GIT_COLOR_BOLD_BLUE, /* PROMPT */
- GIT_COLOR_BOLD, /* HEADER */
- GIT_COLOR_BOLD_RED, /* HELP */
- GIT_COLOR_BOLD_RED, /* ERROR */
-};
enum color_clean {
CLEAN_COLOR_RESET = 0,
CLEAN_COLOR_PLAIN = 1,
@@ -51,6 +42,16 @@
CLEAN_COLOR_ERROR = 5
};
+static int clean_use_color = -1;
+static char clean_colors[][COLOR_MAXLEN] = {
+ [CLEAN_COLOR_ERROR] = GIT_COLOR_BOLD_RED,
+ [CLEAN_COLOR_HEADER] = GIT_COLOR_BOLD,
+ [CLEAN_COLOR_HELP] = GIT_COLOR_BOLD_RED,
+ [CLEAN_COLOR_PLAIN] = GIT_COLOR_NORMAL,
+ [CLEAN_COLOR_PROMPT] = GIT_COLOR_BOLD_BLUE,
+ [CLEAN_COLOR_RESET] = GIT_COLOR_RESET,
+};
+
#define MENU_OPTS_SINGLETON 01
#define MENU_OPTS_IMMEDIATE 02
#define MENU_OPTS_LIST_ONLY 04
@@ -167,7 +168,7 @@
}
*dir_gone = 0;
- return 0;
+ goto out;
}
dir = opendir(path->buf);
@@ -181,7 +182,8 @@
warning_errno(_(msg_warn_remove_failed), quoted.buf);
*dir_gone = 0;
}
- return res;
+ ret = res;
+ goto out;
}
strbuf_complete(path, '/');
@@ -249,6 +251,8 @@
for (i = 0; i < dels.nr; i++)
printf(dry_run ? _(msg_would_remove) : _(msg_remove), dels.items[i].string);
}
+out:
+ strbuf_release("ed);
string_list_clear(&dels, 0);
return ret;
}
diff --git a/builtin/clone.c b/builtin/clone.c
index f7e17d2..2846517 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c
@@ -25,6 +25,7 @@
#include "remote.h"
#include "run-command.h"
#include "connected.h"
+#include "packfile.h"
/*
* Overall FIXMEs:
@@ -451,7 +452,8 @@
{
if (option_shared) {
struct strbuf alt = STRBUF_INIT;
- strbuf_addf(&alt, "%s/objects", src_repo);
+ get_common_dir(&alt, src_repo);
+ strbuf_addstr(&alt, "/objects");
add_to_alternates_file(alt.buf);
strbuf_release(&alt);
} else {
@@ -471,7 +473,9 @@
}
static const char *junk_work_tree;
+static int junk_work_tree_flags;
static const char *junk_git_dir;
+static int junk_git_dir_flags;
static enum {
JUNK_LEAVE_NONE,
JUNK_LEAVE_REPO,
@@ -500,14 +504,14 @@
if (junk_git_dir) {
strbuf_addstr(&sb, junk_git_dir);
- remove_dir_recursively(&sb, 0);
+ remove_dir_recursively(&sb, junk_git_dir_flags);
strbuf_reset(&sb);
}
if (junk_work_tree) {
strbuf_addstr(&sb, junk_work_tree);
- remove_dir_recursively(&sb, 0);
- strbuf_reset(&sb);
+ remove_dir_recursively(&sb, junk_work_tree_flags);
}
+ strbuf_release(&sb);
}
static void remove_junk_on_signal(int signo)
@@ -587,7 +591,7 @@
for (r = local_refs; r; r = r->next) {
if (!r->peer_ref)
continue;
- if (ref_transaction_create(t, r->peer_ref->name, r->old_oid.hash,
+ if (ref_transaction_create(t, r->peer_ref->name, &r->old_oid,
0, NULL, &err))
die("%s", err.buf);
}
@@ -609,12 +613,12 @@
continue;
if (!has_object_file(&ref->old_oid))
continue;
- update_ref(msg, ref->name, ref->old_oid.hash,
- NULL, 0, UPDATE_REFS_DIE_ON_ERR);
+ update_ref(msg, ref->name, &ref->old_oid, NULL, 0,
+ UPDATE_REFS_DIE_ON_ERR);
}
}
-static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
+static int iterate_ref_map(void *cb_data, struct object_id *oid)
{
struct ref **rm = cb_data;
struct ref *ref = *rm;
@@ -629,7 +633,7 @@
if (!ref)
return -1;
- hashcpy(sha1, ref->old_oid.hash);
+ oidcpy(oid, &ref->old_oid);
*rm = ref->next;
return 0;
}
@@ -681,23 +685,23 @@
if (create_symref("HEAD", our->name, NULL) < 0)
die(_("unable to update HEAD"));
if (!option_bare) {
- update_ref(msg, "HEAD", our->old_oid.hash, NULL, 0,
+ update_ref(msg, "HEAD", &our->old_oid, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
install_branch_config(0, head, option_origin, our->name);
}
} else if (our) {
struct commit *c = lookup_commit_reference(&our->old_oid);
/* --branch specifies a non-branch (i.e. tags), detach HEAD */
- update_ref(msg, "HEAD", c->object.oid.hash,
- NULL, REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
+ update_ref(msg, "HEAD", &c->object.oid, NULL, REF_NO_DEREF,
+ UPDATE_REFS_DIE_ON_ERR);
} else if (remote) {
/*
* We know remote HEAD points to a non-branch, or
* HEAD points to a branch but we don't know which one.
* Detach HEAD in all these cases.
*/
- update_ref(msg, "HEAD", remote->old_oid.hash,
- NULL, REF_NODEREF, UPDATE_REFS_DIE_ON_ERR);
+ update_ref(msg, "HEAD", &remote->old_oid, NULL, REF_NO_DEREF,
+ UPDATE_REFS_DIE_ON_ERR);
}
}
@@ -705,7 +709,7 @@
{
struct object_id oid;
char *head;
- struct lock_file *lock_file;
+ struct lock_file lock_file = LOCK_INIT;
struct unpack_trees_options opts;
struct tree *tree;
struct tree_desc t;
@@ -714,7 +718,7 @@
if (option_no_checkout)
return 0;
- head = resolve_refdup("HEAD", RESOLVE_REF_READING, oid.hash, NULL);
+ head = resolve_refdup("HEAD", RESOLVE_REF_READING, &oid, NULL);
if (!head) {
warning(_("remote HEAD refers to nonexistent ref, "
"unable to checkout.\n"));
@@ -732,8 +736,7 @@
/* We need to be in the new work tree for the checkout */
setup_work_tree();
- lock_file = xcalloc(1, sizeof(struct lock_file));
- hold_locked_index(lock_file, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
memset(&opts, 0, sizeof opts);
opts.update = 1;
@@ -749,7 +752,7 @@
if (unpack_trees(1, &t, &opts) < 0)
die(_("unable to checkout working tree"));
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die(_("unable to write new index file"));
err |= run_hook_le(NULL, "post-checkout", sha1_to_hex(null_sha1),
@@ -862,10 +865,15 @@
free(alternates);
}
+static int dir_exists(const char *path)
+{
+ struct stat sb;
+ return !stat(path, &sb);
+}
+
int cmd_clone(int argc, const char **argv, const char *prefix)
{
int is_bundle = 0, is_local;
- struct stat buf;
const char *repo_name, *repo, *work_tree, *git_dir;
char *path, *dir;
int dest_exists;
@@ -937,7 +945,7 @@
dir = guess_dir_name(repo_name, is_bundle, option_bare);
strip_trailing_slashes(dir);
- dest_exists = !stat(dir, &buf);
+ dest_exists = dir_exists(dir);
if (dest_exists && !is_empty_dir(dir))
die(_("destination path '%s' already exists and is not "
"an empty directory."), dir);
@@ -948,7 +956,7 @@
work_tree = NULL;
else {
work_tree = getenv("GIT_WORK_TREE");
- if (work_tree && !stat(work_tree, &buf))
+ if (work_tree && dir_exists(work_tree))
die(_("working tree '%s' already exists."), work_tree);
}
@@ -966,14 +974,24 @@
if (safe_create_leading_directories_const(work_tree) < 0)
die_errno(_("could not create leading directories of '%s'"),
work_tree);
- if (!dest_exists && mkdir(work_tree, 0777))
+ if (dest_exists)
+ junk_work_tree_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
+ else if (mkdir(work_tree, 0777))
die_errno(_("could not create work tree dir '%s'"),
work_tree);
junk_work_tree = work_tree;
set_git_work_tree(work_tree);
}
- junk_git_dir = real_git_dir ? real_git_dir : git_dir;
+ if (real_git_dir) {
+ if (dir_exists(real_git_dir))
+ junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
+ junk_git_dir = real_git_dir;
+ } else {
+ if (dest_exists)
+ junk_git_dir_flags |= REMOVE_DIR_KEEP_TOPLEVEL;
+ junk_git_dir = git_dir;
+ }
if (safe_create_leading_directories_const(git_dir) < 0)
die(_("could not create leading directories of '%s'"), git_dir);
@@ -1082,9 +1100,6 @@
warning(_("--local is ignored"));
transport->cloning = 1;
- if (!transport->get_refs_list || (!is_local && !transport->fetch))
- die(_("Don't know how to clone %s"), transport->url);
-
transport_set_option(transport, TRANS_OPT_KEEP, "yes");
if (option_depth)
diff --git a/builtin/commit-tree.c b/builtin/commit-tree.c
index c1de41c..2177251 100644
--- a/builtin/commit-tree.c
+++ b/builtin/commit-tree.c
@@ -56,7 +56,7 @@
struct object_id oid;
if (argc <= ++i)
usage(commit_tree_usage);
- if (get_sha1_commit(argv[i], oid.hash))
+ if (get_oid_commit(argv[i], &oid))
die("Not a valid object name %s", argv[i]);
assert_sha1_type(oid.hash, OBJ_COMMIT);
new_parent(lookup_commit(&oid), &parents);
@@ -105,7 +105,7 @@
continue;
}
- if (get_sha1_tree(arg, tree_oid.hash))
+ if (get_oid_tree(arg, &tree_oid))
die("Not a valid object name %s", arg);
if (got_tree)
die("Cannot give more than one trees");
diff --git a/builtin/commit.c b/builtin/commit.c
index 1a0da71..4610e3d 100644
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -118,7 +118,7 @@
static int quiet, verbose, no_verify, allow_empty, dry_run, renew_authorship;
static int config_commit_verbose = -1; /* unspecified */
static int no_post_rewrite, allow_empty_message;
-static char *untracked_files_arg, *force_date, *ignore_submodule_arg;
+static char *untracked_files_arg, *force_date, *ignore_submodule_arg, *ignored_arg;
static char *sign_commit;
/*
@@ -139,7 +139,7 @@
static enum commit_whence whence;
static int sequencer_in_use;
static int use_editor = 1, include_status = 1;
-static int show_ignored_in_status, have_option_m;
+static int have_option_m;
static struct strbuf message = STRBUF_INIT;
static enum wt_status_format status_format = STATUS_FORMAT_UNSPECIFIED;
@@ -195,7 +195,6 @@
static void status_init_config(struct wt_status *s, config_fn_t fn)
{
wt_status_prepare(s);
- gitmodules_config();
git_config(fn, s);
determine_whence(s);
init_diff_ui_defaults();
@@ -336,7 +335,7 @@
static const char *prepare_index(int argc, const char **argv, const char *prefix,
const struct commit *current_head, int is_status)
{
- struct string_list partial;
+ struct string_list partial = STRING_LIST_INIT_DUP;
struct pathspec pathspec;
int refresh_flags = REFRESH_QUIET;
const char *ret;
@@ -356,7 +355,7 @@
refresh_cache_or_die(refresh_flags);
- if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
+ if (write_locked_index(&the_index, &index_lock, 0))
die(_("unable to create temporary index"));
old_index_env = getenv(INDEX_ENVIRONMENT);
@@ -375,13 +374,14 @@
if (update_main_cache_tree(WRITE_TREE_SILENT) == 0) {
if (reopen_lock_file(&index_lock) < 0)
die(_("unable to write index file"));
- if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
+ if (write_locked_index(&the_index, &index_lock, 0))
die(_("unable to update temporary index"));
} else
warning(_("Failed to update main cache tree"));
commit_style = COMMIT_NORMAL;
- return get_lock_file_path(&index_lock);
+ ret = get_lock_file_path(&index_lock);
+ goto out;
}
/*
@@ -401,10 +401,11 @@
add_files_to_cache(also ? prefix : NULL, &pathspec, 0);
refresh_cache_or_die(refresh_flags);
update_main_cache_tree(WRITE_TREE_SILENT);
- if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
+ if (write_locked_index(&the_index, &index_lock, 0))
die(_("unable to write new_index file"));
commit_style = COMMIT_NORMAL;
- return get_lock_file_path(&index_lock);
+ ret = get_lock_file_path(&index_lock);
+ goto out;
}
/*
@@ -430,7 +431,8 @@
rollback_lock_file(&index_lock);
}
commit_style = COMMIT_AS_IS;
- return get_index_file();
+ ret = get_index_file();
+ goto out;
}
/*
@@ -461,7 +463,6 @@
die(_("cannot do a partial commit during a cherry-pick."));
}
- string_list_init(&partial, 1);
if (list_paths(&partial, !current_head ? NULL : "HEAD", prefix, &pathspec))
exit(1);
@@ -473,7 +474,7 @@
add_remove_files(&partial);
refresh_cache(REFRESH_QUIET);
update_main_cache_tree(WRITE_TREE_SILENT);
- if (write_locked_index(&the_index, &index_lock, CLOSE_LOCK))
+ if (write_locked_index(&the_index, &index_lock, 0))
die(_("unable to write new_index file"));
hold_lock_file_for_update(&false_lock,
@@ -485,12 +486,15 @@
add_remove_files(&partial);
refresh_cache(REFRESH_QUIET);
- if (write_locked_index(&the_index, &false_lock, CLOSE_LOCK))
+ if (write_locked_index(&the_index, &false_lock, 0))
die(_("unable to write temporary index file"));
discard_cache();
ret = get_lock_file_path(&false_lock);
read_cache_from(ret);
+out:
+ string_list_clear(&partial, 0);
+ clear_pathspec(&pathspec);
return ret;
}
@@ -510,7 +514,7 @@
s->index_file = index_file;
s->fp = fp;
s->nowarn = nowarn;
- s->is_initial = get_sha1(s->reference, oid.hash) ? 1 : 0;
+ s->is_initial = get_oid(s->reference, &oid) ? 1 : 0;
if (!s->is_initial)
hashcpy(s->sha1_commit, oid.hash);
s->status_format = status_format;
@@ -697,7 +701,7 @@
}
}
- if (have_option_m) {
+ if (have_option_m && !fixup_message) {
strbuf_addbuf(&sb, &message);
hook_arg1 = "message";
} else if (logfile && !strcmp(logfile, "-")) {
@@ -727,6 +731,8 @@
ctx.output_encoding = get_commit_output_encoding();
format_commit_message(commit, "fixup! %s\n\n",
&sb, &ctx);
+ if (have_option_m)
+ strbuf_addbuf(&sb, &message);
hook_arg1 = "message";
} else if (!stat(git_path_merge_msg(), &statbuf)) {
/*
@@ -891,7 +897,7 @@
if (amend)
parent = "HEAD^1";
- if (get_sha1(parent, oid.hash)) {
+ if (get_oid(parent, &oid)) {
int i, ita_nr = 0;
for (i = 0; i < active_nr; i++)
@@ -908,11 +914,12 @@
* submodules which were manually staged, which would
* be really confusing.
*/
- int diff_flags = DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG;
+ struct diff_flags flags = DIFF_FLAGS_INIT;
+ flags.override_submodule_config = 1;
if (ignore_submodule_arg &&
!strcmp(ignore_submodule_arg, "all"))
- diff_flags |= DIFF_OPT_IGNORE_SUBMODULES;
- commitable = index_differs_from(parent, diff_flags, 1);
+ flags.ignore_submodules = 1;
+ commitable = index_differs_from(parent, &flags, 1);
}
}
strbuf_release(&committer_ident);
@@ -940,13 +947,16 @@
return 0;
}
- /*
- * 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
- * the editor and after we invoke run_status above.
- */
- discard_cache();
+ if (!no_verify && find_hook("pre-commit")) {
+ /*
+ * 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
+ * the editor and after we invoke run_status above.
+ */
+ discard_cache();
+ }
read_cache_from(index_file);
+
if (update_main_cache_tree(0)) {
error(_("Error building trees"));
return 0;
@@ -1068,6 +1078,19 @@
die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
}
+static void handle_ignored_arg(struct wt_status *s)
+{
+ if (!ignored_arg)
+ ; /* default already initialized */
+ else if (!strcmp(ignored_arg, "traditional"))
+ s->show_ignored_mode = SHOW_TRADITIONAL_IGNORED;
+ else if (!strcmp(ignored_arg, "no"))
+ s->show_ignored_mode = SHOW_NO_IGNORED;
+ else if (!strcmp(ignored_arg, "matching"))
+ s->show_ignored_mode = SHOW_MATCHING_IGNORED;
+ else
+ die(_("Invalid ignored mode '%s'"), ignored_arg);
+}
static void handle_untracked_files_arg(struct wt_status *s)
{
@@ -1176,8 +1199,8 @@
f++;
if (f > 1)
die(_("Only one of -c/-C/-F/--fixup can be used."));
- if (have_option_m && f > 0)
- die((_("Option -m cannot be combined with -c/-C/-F/--fixup.")));
+ if (have_option_m && (edit_message || use_message || logfile))
+ die((_("Option -m cannot be combined with -c/-C/-F.")));
if (f || have_option_m)
template_file = NULL;
if (edit_message)
@@ -1356,8 +1379,10 @@
N_("mode"),
N_("show untracked files, optional modes: all, normal, no. (Default: all)"),
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
- OPT_BOOL(0, "ignored", &show_ignored_in_status,
- N_("show ignored files")),
+ { OPTION_STRING, 0, "ignored", &ignored_arg,
+ N_("mode"),
+ N_("show ignored files, optional modes: traditional, matching, no. (Default: traditional)"),
+ PARSE_OPT_OPTARG, NULL, (intptr_t)"traditional" },
{ OPTION_STRING, 0, "ignore-submodules", &ignore_submodule_arg, N_("when"),
N_("ignore changes to submodules, optional when: all, dirty, untracked. (Default: all)"),
PARSE_OPT_OPTARG, NULL, (intptr_t)"all" },
@@ -1376,8 +1401,12 @@
finalize_deferred_config(&s);
handle_untracked_files_arg(&s);
- if (show_ignored_in_status)
- s.show_ignored_files = 1;
+ handle_ignored_arg(&s);
+
+ if (s.show_ignored_mode == SHOW_MATCHING_IGNORED &&
+ s.show_untracked_files == SHOW_NO_UNTRACKED_FILES)
+ die(_("Unsupported combination of ignored and untracked-files arguments"));
+
parse_pathspec(&s.pathspec, 0,
PATHSPEC_PREFER_FULL,
prefix, argv);
@@ -1385,9 +1414,12 @@
read_cache_preload(&s.pathspec);
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, &s.pathspec, NULL, NULL);
- fd = hold_locked_index(&index_lock, 0);
+ if (use_optional_locks())
+ fd = hold_locked_index(&index_lock, 0);
+ else
+ fd = -1;
- s.is_initial = get_sha1(s.reference, oid.hash) ? 1 : 0;
+ s.is_initial = get_oid(s.reference, &oid) ? 1 : 0;
if (!s.is_initial)
hashcpy(s.sha1_commit, oid.hash);
@@ -1429,7 +1461,6 @@
struct rev_info rev;
struct commit *commit;
struct strbuf format = STRBUF_INIT;
- struct object_id junk_oid;
const char *head;
struct pretty_print_context pctx = {0};
struct strbuf author_ident = STRBUF_INIT;
@@ -1478,11 +1509,13 @@
rev.show_root_diff = 1;
get_commit_format(format.buf, &rev);
rev.always_show_header = 0;
- rev.diffopt.detect_rename = 1;
+ rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
rev.diffopt.break_opt = 0;
diff_setup_done(&rev.diffopt);
- head = resolve_ref_unsafe("HEAD", 0, junk_oid.hash, NULL);
+ head = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
+ if (!head)
+ die_errno(_("unable to resolve HEAD after creating commit"));
if (!strcmp(head, "HEAD"))
head = _("detached HEAD");
else
@@ -1657,7 +1690,7 @@
status_format = STATUS_FORMAT_NONE; /* Ignore status.short */
s.colopts = 0;
- if (get_sha1("HEAD", oid.hash))
+ if (get_oid("HEAD", &oid))
current_head = NULL;
else {
current_head = lookup_commit_or_die(&oid, "HEAD");
@@ -1719,7 +1752,7 @@
allow_fast_forward = 0;
}
if (allow_fast_forward)
- parents = reduce_heads(parents);
+ reduce_heads_replace(&parents);
} else {
if (!reflog_msg)
reflog_msg = (whence == FROM_CHERRY_PICK)
@@ -1779,9 +1812,9 @@
transaction = ref_transaction_begin(&err);
if (!transaction ||
- ref_transaction_update(transaction, "HEAD", oid.hash,
+ ref_transaction_update(transaction, "HEAD", &oid,
current_head
- ? current_head->object.oid.hash : null_sha1,
+ ? ¤t_head->object.oid : &null_oid,
0, sb.buf, &err) ||
ref_transaction_commit(transaction, &err)) {
rollback_index_files();
@@ -1816,6 +1849,7 @@
if (!quiet)
print_summary(prefix, &oid, !current_head);
- strbuf_release(&err);
+ UNLEAK(err);
+ UNLEAK(sb);
return 0;
}
diff --git a/builtin/config.c b/builtin/config.c
index 70ff231..ab5f954 100644
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -52,6 +52,7 @@
#define TYPE_INT (1<<1)
#define TYPE_BOOL_OR_INT (1<<2)
#define TYPE_PATH (1<<3)
+#define TYPE_EXPIRY_DATE (1<<4)
static struct option builtin_config_options[] = {
OPT_GROUP(N_("Config file location")),
@@ -80,6 +81,7 @@
OPT_BIT(0, "int", &types, N_("value is decimal number"), TYPE_INT),
OPT_BIT(0, "bool-or-int", &types, N_("value is --bool or --int"), TYPE_BOOL_OR_INT),
OPT_BIT(0, "path", &types, N_("value is a path (file or directory name)"), TYPE_PATH),
+ OPT_BIT(0, "expiry-date", &types, N_("value is an expiry date"), TYPE_EXPIRY_DATE),
OPT_GROUP(N_("Other")),
OPT_BOOL('z', "null", &end_null, N_("terminate values with NUL byte")),
OPT_BOOL(0, "name-only", &omit_values, N_("show variable names only")),
@@ -159,6 +161,11 @@
return -1;
strbuf_addstr(buf, v);
free((char *)v);
+ } else if (types == TYPE_EXPIRY_DATE) {
+ timestamp_t t;
+ if (git_config_expiry_date(&t, key_, value_) < 0)
+ return -1;
+ strbuf_addf(buf, "%"PRItime, t);
} else if (value_) {
strbuf_addstr(buf, value_);
} else {
@@ -273,12 +280,13 @@
if (!value)
return NULL;
- if (types == 0 || types == TYPE_PATH)
+ if (types == 0 || types == TYPE_PATH || types == TYPE_EXPIRY_DATE)
/*
* We don't do normalization for TYPE_PATH here: If
* the path is like ~/foobar/, we prefer to store
* "~/foobar/" in the config file, and to expand the ~
* when retrieving the value.
+ * Also don't do normalization for expiry dates.
*/
return xstrdup(value);
if (types == TYPE_INT)
@@ -518,10 +526,13 @@
die("$HOME not set");
if (access_or_warn(user_config, R_OK, 0) &&
- xdg_config && !access_or_warn(xdg_config, R_OK, 0))
+ xdg_config && !access_or_warn(xdg_config, R_OK, 0)) {
given_config_source.file = xdg_config;
- else
+ free(user_config);
+ } else {
given_config_source.file = user_config;
+ free(xdg_config);
+ }
}
else if (use_system_config)
given_config_source.file = git_etc_gitconfig();
@@ -628,6 +639,7 @@
check_write();
check_argc(argc, 2, 2);
value = normalize_value(argv[0], argv[1]);
+ UNLEAK(value);
ret = git_config_set_in_file_gently(given_config_source.file, argv[0], value);
if (ret == CONFIG_NOTHING_SET)
error(_("cannot overwrite multiple values with a single value\n"
@@ -638,6 +650,7 @@
check_write();
check_argc(argc, 2, 3);
value = normalize_value(argv[0], argv[1]);
+ UNLEAK(value);
return git_config_set_multivar_in_file_gently(given_config_source.file,
argv[0], value, argv[2], 0);
}
@@ -645,6 +658,7 @@
check_write();
check_argc(argc, 2, 2);
value = normalize_value(argv[0], argv[1]);
+ UNLEAK(value);
return git_config_set_multivar_in_file_gently(given_config_source.file,
argv[0], value,
CONFIG_REGEX_NONE, 0);
@@ -653,6 +667,7 @@
check_write();
check_argc(argc, 2, 3);
value = normalize_value(argv[0], argv[1]);
+ UNLEAK(value);
return git_config_set_multivar_in_file_gently(given_config_source.file,
argv[0], value, argv[2], 1);
}
diff --git a/builtin/count-objects.c b/builtin/count-objects.c
index 1d82e61..3334381 100644
--- a/builtin/count-objects.c
+++ b/builtin/count-objects.c
@@ -10,6 +10,7 @@
#include "builtin.h"
#include "parse-options.h"
#include "quote.h"
+#include "packfile.h"
static unsigned long garbage;
static off_t size_garbage;
diff --git a/builtin/describe.c b/builtin/describe.c
index 94ff2fb..c428984 100644
--- a/builtin/describe.c
+++ b/builtin/describe.c
@@ -3,16 +3,19 @@
#include "lockfile.h"
#include "commit.h"
#include "tag.h"
+#include "blob.h"
#include "refs.h"
#include "builtin.h"
#include "exec_cmd.h"
#include "parse-options.h"
+#include "revision.h"
#include "diff.h"
#include "hashmap.h"
#include "argv-array.h"
#include "run-command.h"
+#include "revision.h"
+#include "list-objects.h"
-#define SEEN (1u << 0)
#define MAX_TAGS (FLAG_BITS - 1)
static const char * const describe_usage[] = {
@@ -55,10 +58,13 @@
};
static int commit_name_cmp(const void *unused_cmp_data,
- const struct commit_name *cn1,
- const struct commit_name *cn2,
+ const void *entry,
+ const void *entry_or_key,
const void *peeled)
{
+ const struct commit_name *cn1 = entry;
+ const struct commit_name *cn2 = entry_or_key;
+
return oidcmp(&cn1->peeled, peeled ? peeled : &cn2->peeled);
}
@@ -126,13 +132,24 @@
static int get_name(const char *path, const struct object_id *oid, int flag, void *cb_data)
{
- int is_tag = starts_with(path, "refs/tags/");
+ int is_tag = 0;
struct object_id peeled;
int is_annotated, prio;
+ const char *path_to_match = NULL;
- /* Reject anything outside refs/tags/ unless --all */
- if (!all && !is_tag)
+ if (skip_prefix(path, "refs/tags/", &path_to_match)) {
+ is_tag = 1;
+ } else if (all) {
+ if ((exclude_patterns.nr || patterns.nr) &&
+ !skip_prefix(path, "refs/heads/", &path_to_match) &&
+ !skip_prefix(path, "refs/remotes/", &path_to_match)) {
+ /* Only accept reference of known type if there are match/exclude patterns */
+ return 0;
+ }
+ } else {
+ /* Reject anything outside refs/tags/ unless --all */
return 0;
+ }
/*
* If we're given exclude patterns, first exclude any tag which match
@@ -141,11 +158,8 @@
if (exclude_patterns.nr) {
struct string_list_item *item;
- if (!is_tag)
- return 0;
-
for_each_string_list_item(item, &exclude_patterns) {
- if (!wildmatch(item->string, path + 10, 0))
+ if (!wildmatch(item->string, path_to_match, 0))
return 0;
}
}
@@ -158,11 +172,8 @@
int found = 0;
struct string_list_item *item;
- if (!is_tag)
- return 0;
-
for_each_string_list_item(item, &patterns) {
- if (!wildmatch(item->string, path + 10, 0)) {
+ if (!wildmatch(item->string, path_to_match, 0)) {
found = 1;
break;
}
@@ -173,7 +184,7 @@
}
/* Is it annotated? */
- if (!peel_ref(path, peeled.hash)) {
+ if (!peel_ref(path, &peeled)) {
is_annotated = !!oidcmp(oid, &peeled);
} else {
oidcpy(&peeled, oid);
@@ -248,7 +259,7 @@
return seen_commits;
}
-static void display_name(struct commit_name *n)
+static void append_name(struct commit_name *n, struct strbuf *dst)
{
if (n->prio == 2 && !n->tag) {
n->tag = lookup_tag(&n->oid);
@@ -263,20 +274,22 @@
n->name_checked = 1;
}
- if (n->tag)
- printf("%s", n->tag->tag);
- else
- printf("%s", n->path);
+ if (n->tag) {
+ if (all)
+ strbuf_addstr(dst, "tags/");
+ strbuf_addstr(dst, n->tag->tag);
+ } else {
+ strbuf_addstr(dst, n->path);
+ }
}
-static void show_suffix(int depth, const struct object_id *oid)
+static void append_suffix(int depth, const struct object_id *oid, struct strbuf *dst)
{
- printf("-%d-g%s", depth, find_unique_abbrev(oid->hash, abbrev));
+ strbuf_addf(dst, "-%d-g%s", depth, find_unique_abbrev(oid->hash, abbrev));
}
-static void describe(const char *arg, int last_one)
+static void describe_commit(struct object_id *oid, struct strbuf *dst)
{
- struct object_id oid;
struct commit *cmit, *gave_up_on = NULL;
struct commit_list *list;
struct commit_name *n;
@@ -285,30 +298,25 @@
unsigned long seen_commits = 0;
unsigned int unannotated_cnt = 0;
- if (get_oid(arg, &oid))
- die(_("Not a valid object name %s"), arg);
- cmit = lookup_commit_reference(&oid);
- if (!cmit)
- die(_("%s is not a valid '%s' object"), arg, commit_type);
+ cmit = lookup_commit_reference(oid);
n = find_commit_name(&cmit->object.oid);
if (n && (tags || all || n->prio == 2)) {
/*
* Exact match to an existing ref.
*/
- display_name(n);
+ append_name(n, dst);
if (longformat)
- show_suffix(0, n->tag ? &n->tag->tagged->oid : &oid);
+ append_suffix(0, n->tag ? &n->tag->tagged->oid : oid, dst);
if (suffix)
- printf("%s", suffix);
- printf("\n");
+ strbuf_addstr(dst, suffix);
return;
}
if (!max_candidates)
die(_("no tag exactly matches '%s'"), oid_to_hex(&cmit->object.oid));
if (debug)
- fprintf(stderr, _("searching to describe %s\n"), arg);
+ fprintf(stderr, _("No exact match on refs or tags, searching to describe\n"));
if (!have_util) {
struct hashmap_iter iter;
@@ -373,22 +381,21 @@
}
if (!match_cnt) {
- struct object_id *oid = &cmit->object.oid;
+ struct object_id *cmit_oid = &cmit->object.oid;
if (always) {
- printf("%s", find_unique_abbrev(oid->hash, abbrev));
+ strbuf_add_unique_abbrev(dst, cmit_oid->hash, abbrev);
if (suffix)
- printf("%s", suffix);
- printf("\n");
+ strbuf_addstr(dst, suffix);
return;
}
if (unannotated_cnt)
die(_("No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."),
- oid_to_hex(oid));
+ oid_to_hex(cmit_oid));
else
die(_("No tags can describe '%s'.\n"
"Try --always, or create some tags."),
- oid_to_hex(oid));
+ oid_to_hex(cmit_oid));
}
QSORT(all_matches, match_cnt, compare_pt);
@@ -426,15 +433,86 @@
}
}
- display_name(all_matches[0].name);
+ append_name(all_matches[0].name, dst);
if (abbrev)
- show_suffix(all_matches[0].depth, &cmit->object.oid);
+ append_suffix(all_matches[0].depth, &cmit->object.oid, dst);
if (suffix)
- printf("%s", suffix);
- printf("\n");
+ strbuf_addstr(dst, suffix);
+}
+
+struct process_commit_data {
+ struct object_id current_commit;
+ struct object_id looking_for;
+ struct strbuf *dst;
+ struct rev_info *revs;
+};
+
+static void process_commit(struct commit *commit, void *data)
+{
+ struct process_commit_data *pcd = data;
+ pcd->current_commit = commit->object.oid;
+}
+
+static void process_object(struct object *obj, const char *path, void *data)
+{
+ struct process_commit_data *pcd = data;
+
+ if (!oidcmp(&pcd->looking_for, &obj->oid) && !pcd->dst->len) {
+ reset_revision_walk();
+ describe_commit(&pcd->current_commit, pcd->dst);
+ strbuf_addf(pcd->dst, ":%s", path);
+ free_commit_list(pcd->revs->commits);
+ pcd->revs->commits = NULL;
+ }
+}
+
+static void describe_blob(struct object_id oid, struct strbuf *dst)
+{
+ struct rev_info revs;
+ struct argv_array args = ARGV_ARRAY_INIT;
+ struct process_commit_data pcd = { null_oid, oid, dst, &revs};
+
+ argv_array_pushl(&args, "internal: The first arg is not parsed",
+ "--objects", "--in-commit-order", "--reverse", "HEAD",
+ NULL);
+
+ init_revisions(&revs, NULL);
+ if (setup_revisions(args.argc, args.argv, &revs, NULL) > 1)
+ BUG("setup_revisions could not handle all args?");
+
+ if (prepare_revision_walk(&revs))
+ die("revision walk setup failed");
+
+ traverse_commit_list(&revs, process_commit, process_object, &pcd);
+ reset_revision_walk();
+}
+
+static void describe(const char *arg, int last_one)
+{
+ struct object_id oid;
+ struct commit *cmit;
+ struct strbuf sb = STRBUF_INIT;
+
+ if (debug)
+ fprintf(stderr, _("describe %s\n"), arg);
+
+ if (get_oid(arg, &oid))
+ die(_("Not a valid object name %s"), arg);
+ cmit = lookup_commit_reference_gently(&oid, 1);
+
+ if (cmit)
+ describe_commit(&oid, &sb);
+ else if (lookup_blob(&oid))
+ describe_blob(oid, &sb);
+ else
+ die(_("%s is neither a commit nor blob"), arg);
+
+ puts(sb.buf);
if (!last_one)
clear_commit_marks(cmit, -1);
+
+ strbuf_release(&sb);
}
int cmd_describe(int argc, const char **argv, const char *prefix)
@@ -506,9 +584,9 @@
return cmd_name_rev(args.argc, args.argv, prefix);
}
- hashmap_init(&names, (hashmap_cmp_fn) commit_name_cmp, NULL, 0);
+ hashmap_init(&names, commit_name_cmp, NULL, 0);
for_each_rawref(get_name, NULL);
- if (!names.size && !always)
+ if (!hashmap_get_size(&names) && !always)
die(_("No names found, cannot describe anything."));
if (argc == 0) {
@@ -535,7 +613,9 @@
}
} else if (dirty) {
static struct lock_file index_lock;
- int fd;
+ struct rev_info revs;
+ struct argv_array args = ARGV_ARRAY_INIT;
+ int fd, result;
read_cache_preload(NULL);
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED,
@@ -544,8 +624,13 @@
if (0 <= fd)
update_index_if_able(&the_index, &index_lock);
- if (!cmd_diff_index(ARRAY_SIZE(diff_index_args) - 1,
- diff_index_args, prefix))
+ init_revisions(&revs, prefix);
+ argv_array_pushv(&args, diff_index_args);
+ if (setup_revisions(args.argc, args.argv, &revs, NULL) != 1)
+ BUG("malformed internal diff-index command line");
+ result = run_diff_index(&revs, 0);
+
+ if (!diff_result_code(&revs.diffopt, result))
suffix = NULL;
else
suffix = dirty;
diff --git a/builtin/diff-files.c b/builtin/diff-files.c
index 17bf84d..e88493f 100644
--- a/builtin/diff-files.c
+++ b/builtin/diff-files.c
@@ -26,7 +26,6 @@
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
init_revisions(&rev, prefix);
- gitmodules_config();
rev.abbrev = 0;
precompose_argv(argc, argv);
diff --git a/builtin/diff-index.c b/builtin/diff-index.c
index 185e6f9..522f4fd 100644
--- a/builtin/diff-index.c
+++ b/builtin/diff-index.c
@@ -23,7 +23,6 @@
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
init_revisions(&rev, prefix);
- gitmodules_config();
rev.abbrev = 0;
precompose_argv(argc, argv);
@@ -57,5 +56,6 @@
return -1;
}
result = run_diff_index(&rev, cached);
+ UNLEAK(rev);
return diff_result_code(&rev.diffopt, result);
}
diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index 31d2cb4..b775a75 100644
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -110,7 +110,8 @@
git_config(git_diff_basic_config, NULL); /* no "diff" UI options */
init_revisions(opt, prefix);
- gitmodules_config();
+ if (read_cache() < 0)
+ die(_("index file corrupt"));
opt->abbrev = 0;
opt->diff = 1;
opt->disable_stdin = 1;
diff --git a/builtin/diff.c b/builtin/diff.c
index 7cde6ab..16bfb22 100644
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -44,7 +44,7 @@
!oidcmp(old_oid, new_oid) && (old_mode == new_mode))
return;
- if (DIFF_OPT_TST(opt, REVERSE_DIFF)) {
+ if (opt->flags.reverse_diff) {
SWAP(old_mode, new_mode);
SWAP(old_oid, new_oid);
SWAP(old_path, new_path);
@@ -203,17 +203,16 @@
static void refresh_index_quietly(void)
{
- struct lock_file *lock_file;
+ struct lock_file lock_file = LOCK_INIT;
int fd;
- lock_file = xcalloc(1, sizeof(struct lock_file));
- fd = hold_locked_index(lock_file, 0);
+ fd = hold_locked_index(&lock_file, 0);
if (fd < 0)
return;
discard_cache();
read_cache();
refresh_cache(REFRESH_QUIET|REFRESH_UNMERGED);
- update_index_if_able(&the_index, lock_file);
+ update_index_if_able(&the_index, &lock_file);
}
static int builtin_diff_files(struct rev_info *revs, int argc, const char **argv)
@@ -315,8 +314,6 @@
no_index = DIFF_NO_INDEX_IMPLICIT;
}
- if (!no_index)
- gitmodules_config();
init_diff_ui_defaults();
git_config(git_diff_ui_config, NULL);
precompose_argv(argc, argv);
@@ -352,8 +349,8 @@
rev.diffopt.stat_graph_width = -1;
/* Default to let external and textconv be used */
- DIFF_OPT_SET(&rev.diffopt, ALLOW_EXTERNAL);
- DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
+ rev.diffopt.flags.allow_external = 1;
+ rev.diffopt.flags.allow_textconv = 1;
if (nongit)
die(_("Not a git repository"));
@@ -363,7 +360,7 @@
diff_setup_done(&rev.diffopt);
}
- DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
+ rev.diffopt.flags.recursive = 1;
setup_diff_pager(&rev.diffopt);
@@ -382,7 +379,7 @@
add_head_to_pending(&rev);
if (!rev.pending.nr) {
struct tree *tree;
- tree = lookup_tree(&empty_tree_oid);
+ tree = lookup_tree(the_hash_algo->empty_tree);
add_pending_object(&rev, &tree->object, "HEAD");
}
break;
@@ -466,5 +463,8 @@
result = diff_result_code(&rev.diffopt, result);
if (1 < rev.diffopt.skip_stat_unmatch)
refresh_index_quietly();
+ UNLEAK(rev);
+ UNLEAK(ent);
+ UNLEAK(blob);
return result;
}
diff --git a/builtin/difftool.c b/builtin/difftool.c
index a1a26ba..bcc79d1 100644
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -111,7 +111,7 @@
int fd = open(buf.buf, O_RDONLY);
if (fd >= 0 &&
- !index_fd(wt_oid.hash, fd, &st, OBJ_BLOB, name, 0)) {
+ !index_fd(&wt_oid, fd, &st, OBJ_BLOB, name, 0)) {
if (is_null_oid(oid)) {
oidcpy(oid, &wt_oid);
use = 1;
@@ -131,10 +131,12 @@
};
static int working_tree_entry_cmp(const void *unused_cmp_data,
- struct working_tree_entry *a,
- struct working_tree_entry *b,
- void *unused_keydata)
+ const void *entry,
+ const void *entry_or_key,
+ const void *unused_keydata)
{
+ const struct working_tree_entry *a = entry;
+ const struct working_tree_entry *b = entry_or_key;
return strcmp(a->path, b->path);
}
@@ -149,9 +151,13 @@
};
static int pair_cmp(const void *unused_cmp_data,
- struct pair_entry *a, struct pair_entry *b,
- void *unused_keydata)
+ const void *entry,
+ const void *entry_or_key,
+ const void *unused_keydata)
{
+ const struct pair_entry *a = entry;
+ const struct pair_entry *b = entry_or_key;
+
return strcmp(a->path, b->path);
}
@@ -179,9 +185,13 @@
};
static int path_entry_cmp(const void *unused_cmp_data,
- struct path_entry *a, struct path_entry *b,
- void *key)
+ const void *entry,
+ const void *entry_or_key,
+ const void *key)
{
+ const struct path_entry *a = entry;
+ const struct path_entry *b = entry_or_key;
+
return strcmp(a->path, key ? key : b->path);
}
@@ -372,10 +382,9 @@
rdir_len = rdir.len;
wtdir_len = wtdir.len;
- hashmap_init(&working_tree_dups,
- (hashmap_cmp_fn)working_tree_entry_cmp, NULL, 0);
- hashmap_init(&submodules, (hashmap_cmp_fn)pair_cmp, NULL, 0);
- hashmap_init(&symlinks2, (hashmap_cmp_fn)pair_cmp, NULL, 0);
+ hashmap_init(&working_tree_dups, working_tree_entry_cmp, NULL, 0);
+ hashmap_init(&submodules, pair_cmp, NULL, 0);
+ hashmap_init(&symlinks2, pair_cmp, NULL, 0);
child.no_stdin = 1;
child.git_cmd = 1;
@@ -585,10 +594,8 @@
* in the common case of --symlinks and the difftool updating
* files through the symlink.
*/
- hashmap_init(&wt_modified, (hashmap_cmp_fn)path_entry_cmp,
- NULL, wtindex.cache_nr);
- hashmap_init(&tmp_modified, (hashmap_cmp_fn)path_entry_cmp,
- NULL, wtindex.cache_nr);
+ hashmap_init(&wt_modified, path_entry_cmp, NULL, wtindex.cache_nr);
+ hashmap_init(&tmp_modified, path_entry_cmp, NULL, wtindex.cache_nr);
for (i = 0; i < wtindex.cache_nr; i++) {
struct hashmap_entry dummy;
@@ -609,7 +616,6 @@
if (hold_lock_file_for_update(&lock, buf.buf, 0) < 0 ||
write_locked_index(&wtindex, &lock, COMMIT_LOCK)) {
ret = error("could not write %s", buf.buf);
- rollback_lock_file(&lock);
goto finish;
}
changed_files(&wt_modified, buf.buf, workdir);
diff --git a/builtin/fast-export.c b/builtin/fast-export.c
index da42ee5..796d0cd 100644
--- a/builtin/fast-export.c
+++ b/builtin/fast-export.c
@@ -650,11 +650,10 @@
{
struct commit *commit;
while (commits->nr) {
- commit = (struct commit *)commits->objects[commits->nr - 1].item;
+ commit = (struct commit *)object_array_pop(commits);
if (has_unshown_parent(commit))
return;
handle_commit(commit, revs, paths_of_changed_objects);
- commits->nr--;
}
}
@@ -824,7 +823,7 @@
if (e->flags & UNINTERESTING)
continue;
- if (dwim_ref(e->name, strlen(e->name), oid.hash, &full_name) != 1)
+ if (dwim_ref(e->name, strlen(e->name), &oid, &full_name) != 1)
continue;
if (refspecs) {
@@ -896,7 +895,7 @@
{
unsigned int i;
uint32_t mark;
- struct object_decoration *deco = idnums.hash;
+ struct decoration_entry *deco = idnums.entries;
FILE *f;
int e = 0;
@@ -1067,7 +1066,7 @@
die("revision walk setup failed");
revs.diffopt.format_callback = show_filemodify;
revs.diffopt.format_callback_data = &paths_of_changed_objects;
- DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
+ revs.diffopt.flags.recursive = 1;
while ((commit = get_revision(&revs))) {
if (has_unshown_parent(commit)) {
add_object_array(&commit->object, NULL, &commits);
diff --git a/builtin/fetch.c b/builtin/fetch.c
index c87e59f..7bbcd26 100644
--- a/builtin/fetch.c
+++ b/builtin/fetch.c
@@ -3,6 +3,7 @@
*/
#include "cache.h"
#include "config.h"
+#include "repository.h"
#include "refs.h"
#include "commit.h"
#include "builtin.h"
@@ -17,6 +18,7 @@
#include "connected.h"
#include "argv-array.h"
#include "utf8.h"
+#include "packfile.h"
static const char * const builtin_fetch_usage[] = {
N_("git fetch [<options>] [<repository> [<refspec>...]]"),
@@ -39,7 +41,7 @@
static int all, append, dry_run, force, keep, multiple, update_head_ok, verbosity, deepen_relative;
static int progress = -1;
static int tags = TAGS_DEFAULT, unshallow, update_shallow, deepen;
-static int max_children = -1;
+static int max_children = 1;
static enum transport_family family;
static const char *depth;
static const char *deepen_since;
@@ -68,9 +70,30 @@
recurse_submodules = r;
}
+ if (!strcmp(k, "submodule.fetchjobs")) {
+ max_children = parse_submodule_fetchjobs(k, v);
+ return 0;
+ } else if (!strcmp(k, "fetch.recursesubmodules")) {
+ recurse_submodules = parse_fetch_recurse_submodules_arg(k, v);
+ return 0;
+ }
+
return git_default_config(k, v, cb);
}
+static int gitmodules_fetch_config(const char *var, const char *value, void *cb)
+{
+ if (!strcmp(var, "submodule.fetchjobs")) {
+ max_children = parse_submodule_fetchjobs(var, value);
+ return 0;
+ } else if (!strcmp(var, "fetch.recursesubmodules")) {
+ recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
+ return 0;
+ }
+
+ return 0;
+}
+
static int parse_refmap_arg(const struct option *opt, const char *arg, int unset)
{
ALLOC_GROW(refmap_array, refmap_nr + 1, refmap_alloc);
@@ -435,8 +458,8 @@
transaction = ref_transaction_begin(&err);
if (!transaction ||
ref_transaction_update(transaction, ref->name,
- ref->new_oid.hash,
- check_old ? ref->old_oid.hash : NULL,
+ &ref->new_oid,
+ check_old ? &ref->old_oid : NULL,
0, msg, &err))
goto fail;
@@ -705,7 +728,7 @@
}
}
-static int iterate_ref_map(void *cb_data, unsigned char sha1[20])
+static int iterate_ref_map(void *cb_data, struct object_id *oid)
{
struct ref **rm = cb_data;
struct ref *ref = *rm;
@@ -715,7 +738,7 @@
if (!ref)
return -1; /* end of the list */
*rm = ref->next;
- hashcpy(sha1, ref->old_oid.hash);
+ oidcpy(oid, &ref->old_oid);
return 0;
}
@@ -1072,9 +1095,6 @@
tags = TAGS_UNSET;
}
- if (!transport->get_refs_list || !transport->fetch)
- die(_("Don't know how to fetch from %s"), transport->url);
-
/* if not appending, truncate FETCH_HEAD */
if (!append && !dry_run) {
retcode = truncate_fetch_head();
@@ -1311,6 +1331,7 @@
for (i = 1; i < argc; i++)
strbuf_addf(&default_rla, " %s", argv[i]);
+ config_from_gitmodules(gitmodules_fetch_config, NULL);
git_config(git_fetch_config, NULL);
argc = parse_options(argc, argv, prefix,
@@ -1338,12 +1359,6 @@
if (depth || deepen_since || deepen_not.nr)
deepen = 1;
- if (recurse_submodules != RECURSE_SUBMODULES_OFF) {
- set_config_fetch_recurse_submodules(recurse_submodules_default);
- gitmodules_config();
- git_config(submodule_config, NULL);
- }
-
if (all) {
if (argc == 1)
die(_("fetch --all does not take a repository argument"));
@@ -1380,9 +1395,11 @@
struct argv_array options = ARGV_ARRAY_INIT;
add_options_to_argv(&options);
- result = fetch_populated_submodules(&options,
+ result = fetch_populated_submodules(the_repository,
+ &options,
submodule_prefix,
recurse_submodules,
+ recurse_submodules_default,
verbosity < 0,
max_children);
argv_array_clear(&options);
diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c
index e99b5dd..8e8a15e 100644
--- a/builtin/fmt-merge-msg.c
+++ b/builtin/fmt-merge-msg.c
@@ -377,7 +377,8 @@
string_list_append(&subjects,
oid_to_hex(&commit->object.oid));
else
- string_list_append(&subjects, strbuf_detach(&sb, NULL));
+ string_list_append_nodup(&subjects,
+ strbuf_detach(&sb, NULL));
}
if (opts->credit_people)
@@ -571,7 +572,7 @@
head_commit = lookup_commit(head);
if (head_commit)
commit_list_insert(head_commit, &parents);
- parents = reduce_heads(parents);
+ reduce_heads_replace(&parents);
while (parents) {
struct commit *cmit = pop_commit(&parents);
@@ -603,7 +604,7 @@
/* get current branch */
current_branch = current_branch_to_free =
- resolve_refdup("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL);
+ resolve_refdup("HEAD", RESOLVE_REF_READING, &head_oid, NULL);
if (!current_branch)
die("No current branch");
if (starts_with(current_branch, "refs/heads/"))
diff --git a/builtin/fsck.c b/builtin/fsck.c
index d18244a..92ce775 100644
--- a/builtin/fsck.c
+++ b/builtin/fsck.c
@@ -15,6 +15,7 @@
#include "progress.h"
#include "streaming.h"
#include "decorate.h"
+#include "packfile.h"
#define REACHABLE 0x0001
#define SEEN 0x0002
@@ -170,7 +171,13 @@
static int traverse_one_object(struct object *obj)
{
- return fsck_walk(obj, obj, &fsck_walk_options);
+ int result = fsck_walk(obj, obj, &fsck_walk_options);
+
+ if (obj->type == OBJ_TREE) {
+ struct tree *tree = (struct tree *)obj;
+ free_tree_buffer(tree);
+ }
+ return result;
}
static int traverse_reachable(void)
@@ -179,14 +186,9 @@
unsigned int nr = 0;
int result = 0;
if (show_progress)
- progress = start_progress_delay(_("Checking connectivity"), 0, 0, 2);
+ progress = start_delayed_progress(_("Checking connectivity"), 0);
while (pending.nr) {
- struct object_array_entry *entry;
- struct object *obj;
-
- entry = pending.objects + --pending.nr;
- obj = entry->item;
- result |= traverse_one_object(obj);
+ result |= traverse_one_object(object_array_pop(&pending));
display_progress(progress, ++nr);
}
stop_progress(&progress);
@@ -559,7 +561,7 @@
if (verbose)
fprintf(stderr, "Checking HEAD link\n");
- head_points_at = resolve_ref_unsafe("HEAD", 0, head_oid.hash, NULL);
+ head_points_at = resolve_ref_unsafe("HEAD", 0, &head_oid, NULL);
if (!head_points_at) {
errors_found |= ERROR_REFS;
return error("Invalid HEAD");
@@ -730,12 +732,12 @@
for (i = 0; i < argc; i++) {
const char *arg = argv[i];
- unsigned char sha1[20];
- if (!get_sha1(arg, sha1)) {
- struct object *obj = lookup_object(sha1);
+ struct object_id oid;
+ if (!get_oid(arg, &oid)) {
+ struct object *obj = lookup_object(oid.hash);
if (!obj || !(obj->flags & HAS_OBJ)) {
- error("%s: object missing", sha1_to_hex(sha1));
+ error("%s: object missing", oid_to_hex(&oid));
errors_found |= ERROR_OBJECT;
continue;
}
@@ -763,6 +765,7 @@
if (keep_cache_objects) {
verify_index_checksum = 1;
+ verify_ce_order = 1;
read_cache();
for (i = 0; i < active_nr; i++) {
unsigned int mode;
diff --git a/builtin/gc.c b/builtin/gc.c
index 53c19be..3c5eae0 100644
--- a/builtin/gc.c
+++ b/builtin/gc.c
@@ -19,6 +19,7 @@
#include "sigchain.h"
#include "argv-array.h"
#include "commit.h"
+#include "packfile.h"
#define FAILED_RUN "failed to run %s"
@@ -46,7 +47,7 @@
static struct argv_array prune_worktrees = ARGV_ARRAY_INIT;
static struct argv_array rerere = ARGV_ARRAY_INIT;
-static struct tempfile pidfile;
+static struct tempfile *pidfile;
static struct lock_file log_lock;
static struct string_list pack_garbage = STRING_LIST_INIT_DUP;
@@ -77,7 +78,7 @@
*/
int saved_errno = errno;
fprintf(stderr, _("Failed to fstat %s: %s"),
- get_tempfile_path(&log_lock.tempfile),
+ get_tempfile_path(log_lock.tempfile),
strerror(saved_errno));
fflush(stderr);
commit_lock_file(&log_lock);
@@ -241,7 +242,7 @@
int fd;
char *pidfile_path;
- if (is_tempfile_active(&pidfile))
+ if (is_tempfile_active(pidfile))
/* already locked */
return NULL;
@@ -292,7 +293,7 @@
write_in_full(fd, sb.buf, sb.len);
strbuf_release(&sb);
commit_lock_file(&lock);
- register_tempfile(&pidfile, pidfile_path);
+ pidfile = register_tempfile(pidfile_path);
free(pidfile_path);
return NULL;
}
diff --git a/builtin/get-tar-commit-id.c b/builtin/get-tar-commit-id.c
index 6d9a79f..2706fcf 100644
--- a/builtin/get-tar-commit-id.c
+++ b/builtin/get-tar-commit-id.c
@@ -26,8 +26,10 @@
usage(builtin_get_tar_commit_id_usage);
n = read_in_full(0, buffer, HEADERSIZE);
- if (n < HEADERSIZE)
- die("git get-tar-commit-id: read error");
+ if (n < 0)
+ die_errno("git get-tar-commit-id: read error");
+ if (n != HEADERSIZE)
+ die_errno("git get-tar-commit-id: EOF before reading tar header");
if (header->typeflag[0] != 'g')
return 1;
if (!skip_prefix(content, "52 comment=", &comment))
diff --git a/builtin/grep.c b/builtin/grep.c
index 7e79eb1..3ca4ac8 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -28,13 +28,7 @@
NULL
};
-static const char *super_prefix;
static int recurse_submodules;
-static struct argv_array submodule_options = ARGV_ARRAY_INIT;
-static const char *parent_basename;
-
-static int grep_submodule_launch(struct grep_opt *opt,
- const struct grep_source *gs);
#define GREP_NUM_THREADS_DEFAULT 8
static int num_threads;
@@ -186,10 +180,7 @@
break;
opt->output_priv = w;
- if (w->source.type == GREP_SOURCE_SUBMODULE)
- hit |= grep_submodule_launch(opt, &w->source);
- else
- hit |= grep_source(opt, &w->source);
+ hit |= grep_source(opt, &w->source);
grep_source_clear_data(&w->source);
work_done(w);
}
@@ -327,21 +318,13 @@
{
struct strbuf pathbuf = STRBUF_INIT;
- if (super_prefix) {
- strbuf_add(&pathbuf, filename, tree_name_len);
- strbuf_addstr(&pathbuf, super_prefix);
- strbuf_addstr(&pathbuf, filename + tree_name_len);
+ if (opt->relative && opt->prefix_length) {
+ quote_path_relative(filename + tree_name_len, opt->prefix, &pathbuf);
+ strbuf_insert(&pathbuf, 0, filename, tree_name_len);
} else {
strbuf_addstr(&pathbuf, filename);
}
- if (opt->relative && opt->prefix_length) {
- char *name = strbuf_detach(&pathbuf, NULL);
- quote_path_relative(name + tree_name_len, opt->prefix, &pathbuf);
- strbuf_insert(&pathbuf, 0, name, tree_name_len);
- free(name);
- }
-
#ifndef NO_PTHREADS
if (num_threads) {
add_work(opt, GREP_SOURCE_OID, pathbuf.buf, path, oid);
@@ -366,15 +349,10 @@
{
struct strbuf buf = STRBUF_INIT;
- if (super_prefix)
- strbuf_addstr(&buf, super_prefix);
- strbuf_addstr(&buf, filename);
-
- if (opt->relative && opt->prefix_length) {
- char *name = strbuf_detach(&buf, NULL);
- quote_path_relative(name, opt->prefix, &buf);
- free(name);
- }
+ if (opt->relative && opt->prefix_length)
+ quote_path_relative(filename, opt->prefix, &buf);
+ else
+ strbuf_addstr(&buf, filename);
#ifndef NO_PTHREADS
if (num_threads) {
@@ -421,284 +399,91 @@
exit(status);
}
-static void compile_submodule_options(const struct grep_opt *opt,
- const char **argv,
- int cached, int untracked,
- int opt_exclude, int use_index,
- int pattern_type_arg)
-{
- struct grep_pat *pattern;
+static int grep_cache(struct grep_opt *opt, struct repository *repo,
+ const struct pathspec *pathspec, int cached);
+static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
+ struct tree_desc *tree, struct strbuf *base, int tn_len,
+ int check_attr, struct repository *repo);
- if (recurse_submodules)
- argv_array_push(&submodule_options, "--recurse-submodules");
-
- if (cached)
- argv_array_push(&submodule_options, "--cached");
- if (!use_index)
- argv_array_push(&submodule_options, "--no-index");
- if (untracked)
- argv_array_push(&submodule_options, "--untracked");
- if (opt_exclude > 0)
- argv_array_push(&submodule_options, "--exclude-standard");
-
- if (opt->invert)
- argv_array_push(&submodule_options, "-v");
- if (opt->ignore_case)
- argv_array_push(&submodule_options, "-i");
- if (opt->word_regexp)
- argv_array_push(&submodule_options, "-w");
- switch (opt->binary) {
- case GREP_BINARY_NOMATCH:
- argv_array_push(&submodule_options, "-I");
- break;
- case GREP_BINARY_TEXT:
- argv_array_push(&submodule_options, "-a");
- break;
- default:
- break;
- }
- if (opt->allow_textconv)
- argv_array_push(&submodule_options, "--textconv");
- if (opt->max_depth != -1)
- argv_array_pushf(&submodule_options, "--max-depth=%d",
- opt->max_depth);
- if (opt->linenum)
- argv_array_push(&submodule_options, "-n");
- if (!opt->pathname)
- argv_array_push(&submodule_options, "-h");
- if (!opt->relative)
- argv_array_push(&submodule_options, "--full-name");
- if (opt->name_only)
- argv_array_push(&submodule_options, "-l");
- if (opt->unmatch_name_only)
- argv_array_push(&submodule_options, "-L");
- if (opt->null_following_name)
- argv_array_push(&submodule_options, "-z");
- if (opt->count)
- argv_array_push(&submodule_options, "-c");
- if (opt->file_break)
- argv_array_push(&submodule_options, "--break");
- if (opt->heading)
- argv_array_push(&submodule_options, "--heading");
- if (opt->pre_context)
- argv_array_pushf(&submodule_options, "--before-context=%d",
- opt->pre_context);
- if (opt->post_context)
- argv_array_pushf(&submodule_options, "--after-context=%d",
- opt->post_context);
- if (opt->funcname)
- argv_array_push(&submodule_options, "-p");
- if (opt->funcbody)
- argv_array_push(&submodule_options, "-W");
- if (opt->all_match)
- argv_array_push(&submodule_options, "--all-match");
- if (opt->debug)
- argv_array_push(&submodule_options, "--debug");
- if (opt->status_only)
- argv_array_push(&submodule_options, "-q");
-
- switch (pattern_type_arg) {
- case GREP_PATTERN_TYPE_BRE:
- argv_array_push(&submodule_options, "-G");
- break;
- case GREP_PATTERN_TYPE_ERE:
- argv_array_push(&submodule_options, "-E");
- break;
- case GREP_PATTERN_TYPE_FIXED:
- argv_array_push(&submodule_options, "-F");
- break;
- case GREP_PATTERN_TYPE_PCRE:
- argv_array_push(&submodule_options, "-P");
- break;
- case GREP_PATTERN_TYPE_UNSPECIFIED:
- break;
- default:
- die("BUG: Added a new grep pattern type without updating switch statement");
- }
-
- for (pattern = opt->pattern_list; pattern != NULL;
- pattern = pattern->next) {
- switch (pattern->token) {
- case GREP_PATTERN:
- argv_array_pushf(&submodule_options, "-e%s",
- pattern->pattern);
- break;
- case GREP_AND:
- case GREP_OPEN_PAREN:
- case GREP_CLOSE_PAREN:
- case GREP_NOT:
- case GREP_OR:
- argv_array_push(&submodule_options, pattern->pattern);
- break;
- /* BODY and HEAD are not used by git-grep */
- case GREP_PATTERN_BODY:
- case GREP_PATTERN_HEAD:
- break;
- }
- }
-
- /*
- * Limit number of threads for child process to use.
- * This is to prevent potential fork-bomb behavior of git-grep as each
- * submodule process has its own thread pool.
- */
- argv_array_pushf(&submodule_options, "--threads=%d",
- DIV_ROUND_UP(num_threads, 2));
-
- /* Add Pathspecs */
- argv_array_push(&submodule_options, "--");
- for (; *argv; argv++)
- argv_array_push(&submodule_options, *argv);
-}
-
-/*
- * Launch child process to grep contents of a submodule
- */
-static int grep_submodule_launch(struct grep_opt *opt,
- const struct grep_source *gs)
-{
- struct child_process cp = CHILD_PROCESS_INIT;
- int status, i;
- const char *end_of_base;
- const char *name;
- struct strbuf child_output = STRBUF_INIT;
-
- end_of_base = strchr(gs->name, ':');
- if (gs->identifier && end_of_base)
- name = end_of_base + 1;
- else
- name = gs->name;
-
- prepare_submodule_repo_env(&cp.env_array);
- argv_array_push(&cp.env_array, GIT_DIR_ENVIRONMENT);
-
- if (opt->relative && opt->prefix_length)
- argv_array_pushf(&cp.env_array, "%s=%s",
- GIT_TOPLEVEL_PREFIX_ENVIRONMENT,
- opt->prefix);
-
- /* Add super prefix */
- argv_array_pushf(&cp.args, "--super-prefix=%s%s/",
- super_prefix ? super_prefix : "",
- name);
- argv_array_push(&cp.args, "grep");
-
- /*
- * Add basename of parent project
- * When performing grep on a tree object the filename is prefixed
- * with the object's name: 'tree-name:filename'. In order to
- * provide uniformity of output we want to pass the name of the
- * parent project's object name to the submodule so the submodule can
- * prefix its output with the parent's name and not its own OID.
- */
- if (gs->identifier && end_of_base)
- argv_array_pushf(&cp.args, "--parent-basename=%.*s",
- (int) (end_of_base - gs->name),
- gs->name);
-
- /* Add options */
- for (i = 0; i < submodule_options.argc; i++) {
- /*
- * If there is a tree identifier for the submodule, add the
- * rev after adding the submodule options but before the
- * pathspecs. To do this we listen for the '--' and insert the
- * oid before pushing the '--' onto the child process argv
- * array.
- */
- if (gs->identifier &&
- !strcmp("--", submodule_options.argv[i])) {
- argv_array_push(&cp.args, oid_to_hex(gs->identifier));
- }
-
- argv_array_push(&cp.args, submodule_options.argv[i]);
- }
-
- cp.git_cmd = 1;
- cp.dir = gs->path;
-
- /*
- * Capture output to output buffer and check the return code from the
- * child process. A '0' indicates a hit, a '1' indicates no hit and
- * anything else is an error.
- */
- status = capture_command(&cp, &child_output, 0);
- if (status && (status != 1)) {
- /* flush the buffer */
- write_or_die(1, child_output.buf, child_output.len);
- die("process for submodule '%s' failed with exit code: %d",
- gs->name, status);
- }
-
- opt->output(opt, child_output.buf, child_output.len);
- strbuf_release(&child_output);
- /* invert the return code to make a hit equal to 1 */
- return !status;
-}
-
-/*
- * Prep grep structures for a submodule grep
- * oid: the oid of the submodule or NULL if using the working tree
- * filename: name of the submodule including tree name of parent
- * path: location of the submodule
- */
-static int grep_submodule(struct grep_opt *opt, const struct object_id *oid,
+static int grep_submodule(struct grep_opt *opt, struct repository *superproject,
+ const struct pathspec *pathspec,
+ const struct object_id *oid,
const char *filename, const char *path)
{
- if (!is_submodule_active(the_repository, path))
- return 0;
- if (!is_submodule_populated_gently(path, NULL)) {
- /*
- * If searching history, check for the presence of the
- * submodule's gitdir before skipping the submodule.
- */
- if (oid) {
- const struct submodule *sub =
- submodule_from_path(null_sha1, path);
- if (sub)
- path = git_path("modules/%s", sub->name);
+ struct repository submodule;
+ int hit;
- if (!(is_directory(path) && is_git_directory(path)))
- return 0;
- } else {
- return 0;
- }
+ if (!is_submodule_active(superproject, path))
+ return 0;
+
+ if (repo_submodule_init(&submodule, superproject, path))
+ return 0;
+
+ repo_read_gitmodules(&submodule);
+
+ /*
+ * NEEDSWORK: This adds the submodule's object directory to the list of
+ * alternates for the single in-memory object store. This has some bad
+ * consequences for memory (processed objects will never be freed) and
+ * performance (this increases the number of pack files git has to pay
+ * attention to, to the sum of the number of pack files in all the
+ * repositories processed so far). This can be removed once the object
+ * store is no longer global and instead is a member of the repository
+ * object.
+ */
+ grep_read_lock();
+ add_to_alternates_memory(submodule.objectdir);
+ grep_read_unlock();
+
+ if (oid) {
+ struct object *object;
+ struct tree_desc tree;
+ void *data;
+ unsigned long size;
+ struct strbuf base = STRBUF_INIT;
+
+ object = parse_object_or_die(oid, oid_to_hex(oid));
+
+ grep_read_lock();
+ data = read_object_with_reference(object->oid.hash, tree_type,
+ &size, NULL);
+ grep_read_unlock();
+
+ if (!data)
+ die(_("unable to read tree (%s)"), oid_to_hex(&object->oid));
+
+ strbuf_addstr(&base, filename);
+ strbuf_addch(&base, '/');
+
+ init_tree_desc(&tree, data, size);
+ hit = grep_tree(opt, pathspec, &tree, &base, base.len,
+ object->type == OBJ_COMMIT, &submodule);
+ strbuf_release(&base);
+ free(data);
+ } else {
+ hit = grep_cache(opt, &submodule, pathspec, 1);
}
-#ifndef NO_PTHREADS
- if (num_threads) {
- add_work(opt, GREP_SOURCE_SUBMODULE, filename, path, oid);
- return 0;
- } else
-#endif
- {
- struct grep_source gs;
- int hit;
-
- grep_source_init(&gs, GREP_SOURCE_SUBMODULE,
- filename, path, oid);
- hit = grep_submodule_launch(opt, &gs);
-
- grep_source_clear(&gs);
- return hit;
- }
+ repo_clear(&submodule);
+ return hit;
}
-static int grep_cache(struct grep_opt *opt, const struct pathspec *pathspec,
- int cached)
+static int grep_cache(struct grep_opt *opt, struct repository *repo,
+ const struct pathspec *pathspec, int cached)
{
int hit = 0;
int nr;
struct strbuf name = STRBUF_INIT;
int name_base_len = 0;
- if (super_prefix) {
- name_base_len = strlen(super_prefix);
- strbuf_addstr(&name, super_prefix);
+ if (repo->submodule_prefix) {
+ name_base_len = strlen(repo->submodule_prefix);
+ strbuf_addstr(&name, repo->submodule_prefix);
}
- read_cache();
+ repo_read_index(repo);
- for (nr = 0; nr < active_nr; nr++) {
- const struct cache_entry *ce = active_cache[nr];
+ for (nr = 0; nr < repo->index->cache_nr; nr++) {
+ const struct cache_entry *ce = repo->index->cache[nr];
strbuf_setlen(&name, name_base_len);
strbuf_addstr(&name, ce->name);
@@ -715,14 +500,14 @@
ce_skip_worktree(ce)) {
if (ce_stage(ce) || ce_intent_to_add(ce))
continue;
- hit |= grep_oid(opt, &ce->oid, ce->name,
- 0, ce->name);
+ hit |= grep_oid(opt, &ce->oid, name.buf,
+ 0, name.buf);
} else {
- hit |= grep_file(opt, ce->name);
+ hit |= grep_file(opt, name.buf);
}
} else if (recurse_submodules && S_ISGITLINK(ce->ce_mode) &&
submodule_path_match(pathspec, name.buf, NULL)) {
- hit |= grep_submodule(opt, NULL, ce->name, ce->name);
+ hit |= grep_submodule(opt, repo, pathspec, NULL, ce->name, ce->name);
} else {
continue;
}
@@ -730,8 +515,8 @@
if (ce_stage(ce)) {
do {
nr++;
- } while (nr < active_nr &&
- !strcmp(ce->name, active_cache[nr]->name));
+ } while (nr < repo->index->cache_nr &&
+ !strcmp(ce->name, repo->index->cache[nr]->name));
nr--; /* compensate for loop control */
}
if (hit && opt->status_only)
@@ -744,7 +529,7 @@
static int grep_tree(struct grep_opt *opt, const struct pathspec *pathspec,
struct tree_desc *tree, struct strbuf *base, int tn_len,
- int check_attr)
+ int check_attr, struct repository *repo)
{
int hit = 0;
enum interesting match = entry_not_interesting;
@@ -752,8 +537,8 @@
int old_baselen = base->len;
struct strbuf name = STRBUF_INIT;
int name_base_len = 0;
- if (super_prefix) {
- strbuf_addstr(&name, super_prefix);
+ if (repo->submodule_prefix) {
+ strbuf_addstr(&name, repo->submodule_prefix);
name_base_len = name.len;
}
@@ -791,11 +576,11 @@
strbuf_addch(base, '/');
init_tree_desc(&sub, data, size);
hit |= grep_tree(opt, pathspec, &sub, base, tn_len,
- check_attr);
+ check_attr, repo);
free(data);
} else if (recurse_submodules && S_ISGITLINK(entry.mode)) {
- hit |= grep_submodule(opt, entry.oid, base->buf,
- base->buf + tn_len);
+ hit |= grep_submodule(opt, repo, pathspec, entry.oid,
+ base->buf, base->buf + tn_len);
}
strbuf_setlen(base, old_baselen);
@@ -809,7 +594,8 @@
}
static int grep_object(struct grep_opt *opt, const struct pathspec *pathspec,
- struct object *obj, const char *name, const char *path)
+ struct object *obj, const char *name, const char *path,
+ struct repository *repo)
{
if (obj->type == OBJ_BLOB)
return grep_oid(opt, &obj->oid, name, 0, path);
@@ -828,10 +614,6 @@
if (!data)
die(_("unable to read tree (%s)"), oid_to_hex(&obj->oid));
- /* Use parent's name as base when recursing submodules */
- if (recurse_submodules && parent_basename)
- name = parent_basename;
-
len = name ? strlen(name) : 0;
strbuf_init(&base, PATH_MAX + len + 1);
if (len) {
@@ -840,7 +622,7 @@
}
init_tree_desc(&tree, data, size);
hit = grep_tree(opt, pathspec, &tree, &base, base.len,
- obj->type == OBJ_COMMIT);
+ obj->type == OBJ_COMMIT, repo);
strbuf_release(&base);
free(data);
return hit;
@@ -849,6 +631,7 @@
}
static int grep_objects(struct grep_opt *opt, const struct pathspec *pathspec,
+ struct repository *repo,
const struct object_array *list)
{
unsigned int i;
@@ -862,9 +645,10 @@
/* load the gitmodules file for this rev */
if (recurse_submodules) {
submodule_free();
- gitmodules_config_sha1(real_obj->oid.hash);
+ gitmodules_config_oid(&real_obj->oid);
}
- if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path)) {
+ if (grep_object(opt, pathspec, real_obj, list->objects[i].name, list->objects[i].path,
+ repo)) {
hit = 1;
if (opt->status_only)
break;
@@ -1005,9 +789,6 @@
N_("ignore files specified via '.gitignore'"), 1),
OPT_BOOL(0, "recurse-submodules", &recurse_submodules,
N_("recursively search in each submodule")),
- OPT_STRING(0, "parent-basename", &parent_basename,
- N_("basename"),
- N_("prepend parent project's basename to output")),
OPT_GROUP(""),
OPT_BOOL('v', "invert-match", &opt.invert,
N_("show non-matching lines")),
@@ -1112,7 +893,6 @@
init_grep_defaults();
git_config(grep_cmd_config, NULL);
grep_init(&opt, prefix);
- super_prefix = get_super_prefix();
/*
* If there is no -- then the paths must exist in the working
@@ -1205,8 +985,8 @@
break;
}
- if (get_sha1_with_context(arg, GET_SHA1_RECORD_PATH,
- oid.hash, &oc)) {
+ if (get_oid_with_context(arg, GET_OID_RECORD_PATH,
+ &oid, &oc)) {
if (seen_dashdash)
die(_("unable to resolve revision: %s"), arg);
break;
@@ -1235,6 +1015,7 @@
prefix, argv + i);
pathspec.max_depth = opt.max_depth;
pathspec.recursive = 1;
+ pathspec.recurse_submodules = !!recurse_submodules;
#ifndef NO_PTHREADS
if (list.nr || cached || show_in_pager)
@@ -1270,13 +1051,6 @@
}
#endif
- if (recurse_submodules) {
- gitmodules_config();
- compile_submodule_options(&opt, argv + i, cached, untracked,
- opt_exclude, use_index,
- pattern_type_arg);
- }
-
if (show_in_pager && (cached || list.nr))
die(_("--open-files-in-pager only works on the worktree"));
@@ -1318,11 +1092,12 @@
if (!cached)
setup_work_tree();
- hit = grep_cache(&opt, &pathspec, cached);
+ hit = grep_cache(&opt, the_repository, &pathspec, cached);
} else {
if (cached)
die(_("both --cached and trees are given."));
- hit = grep_objects(&opt, &pathspec, &list);
+
+ hit = grep_objects(&opt, &pathspec, the_repository, &list);
}
if (num_threads)
diff --git a/builtin/hash-object.c b/builtin/hash-object.c
index d04baf9..c532ff9 100644
--- a/builtin/hash-object.c
+++ b/builtin/hash-object.c
@@ -16,7 +16,7 @@
* needs to bypass the data conversion performed by, and the type
* limitation imposed by, index_fd() and its callees.
*/
-static int hash_literally(unsigned char *sha1, int fd, const char *type, unsigned flags)
+static int hash_literally(struct object_id *oid, int fd, const char *type, unsigned flags)
{
struct strbuf buf = STRBUF_INIT;
int ret;
@@ -24,7 +24,7 @@
if (strbuf_read(&buf, fd, 4096) < 0)
ret = -1;
else
- ret = hash_sha1_file_literally(buf.buf, buf.len, type, sha1, flags);
+ ret = hash_sha1_file_literally(buf.buf, buf.len, type, oid, flags);
strbuf_release(&buf);
return ret;
}
@@ -33,16 +33,16 @@
int literally)
{
struct stat st;
- unsigned char sha1[20];
+ struct object_id oid;
if (fstat(fd, &st) < 0 ||
(literally
- ? hash_literally(sha1, fd, type, flags)
- : index_fd(sha1, fd, &st, type_from_string(type), path, flags)))
+ ? hash_literally(&oid, fd, type, flags)
+ : index_fd(&oid, fd, &st, type_from_string(type), path, flags)))
die((flags & HASH_WRITE_OBJECT)
? "Unable to add %s to database"
: "Unable to hash %s", path);
- printf("%s\n", sha1_to_hex(sha1));
+ printf("%s\n", oid_to_hex(&oid));
maybe_flush_or_die(stdout, "hash to stdout");
}
diff --git a/builtin/help.c b/builtin/help.c
index 334a849..d3c8fc4 100644
--- a/builtin/help.c
+++ b/builtin/help.c
@@ -131,6 +131,7 @@
strbuf_addf(&man_page, "(woman \"%s\")", page);
execlp(path, "emacsclient", "-e", man_page.buf, (char *)NULL);
warning_errno(_("failed to exec '%s'"), path);
+ strbuf_release(&man_page);
}
}
@@ -152,6 +153,7 @@
strbuf_addf(&man_page, "man:%s(1)", page);
execlp(path, filename, "newTab", man_page.buf, (char *)NULL);
warning_errno(_("failed to exec '%s'"), path);
+ strbuf_release(&man_page);
}
}
@@ -169,6 +171,7 @@
strbuf_addf(&shell_cmd, "%s %s", cmd, page);
execl(SHELL_PATH, SHELL_PATH, "-c", shell_cmd.buf, (char *)NULL);
warning(_("failed to exec '%s'"), cmd);
+ strbuf_release(&shell_cmd);
}
static void add_man_viewer(const char *name)
@@ -438,7 +441,7 @@
alias = alias_lookup(cmd);
if (alias) {
- printf_ln(_("`git %s' is aliased to `%s'"), cmd, alias);
+ printf_ln(_("'%s' is aliased to '%s'"), cmd, alias);
free(alias);
exit(0);
}
diff --git a/builtin/index-pack.c b/builtin/index-pack.c
index 26828c1..4c51aec 100644
--- a/builtin/index-pack.c
+++ b/builtin/index-pack.c
@@ -12,6 +12,7 @@
#include "exec_cmd.h"
#include "streaming.h"
#include "thread-utils.h"
+#include "packfile.h"
static const char index_pack_usage[] =
"git index-pack [-v] [-o <index-file>] [--keep | --keep=<msg>] [--verify] [--strict] (<pack-file> | --stdin [--fix-thin] [<pack-file>])";
@@ -632,7 +633,7 @@
int first = 0, last = nr_ofs_deltas;
while (first < last) {
- int next = (first + last) / 2;
+ int next = first + (last - first) / 2;
struct ofs_delta_entry *delta = &ofs_deltas[next];
int cmp;
@@ -686,7 +687,7 @@
int first = 0, last = nr_ref_deltas;
while (first < last) {
- int next = (first + last) / 2;
+ int next = first + (last - first) / 2;
struct ref_delta_entry *delta = &ref_deltas[next];
int cmp;
@@ -1659,10 +1660,7 @@
from_stdin = 1;
} else if (!strcmp(arg, "--fix-thin")) {
fix_thin_pack = 1;
- } else if (!strcmp(arg, "--strict")) {
- strict = 1;
- do_fsck_object = 1;
- } else if (skip_prefix(arg, "--strict=", &arg)) {
+ } else if (skip_to_optional_arg(arg, "--strict", &arg)) {
strict = 1;
do_fsck_object = 1;
fsck_set_msg_types(&fsck_options, arg);
@@ -1678,10 +1676,8 @@
verify = 1;
show_stat = 1;
stat_only = 1;
- } else if (!strcmp(arg, "--keep")) {
- keep_msg = "";
- } else if (starts_with(arg, "--keep=")) {
- keep_msg = arg + 7;
+ } else if (skip_to_optional_arg(arg, "--keep", &keep_msg)) {
+ ; /* nothing to do */
} else if (starts_with(arg, "--threads=")) {
char *end;
nr_threads = strtoul(arg+10, &end, 0);
diff --git a/builtin/init-db.c b/builtin/init-db.c
index 47823f9..c9b7946 100644
--- a/builtin/init-db.c
+++ b/builtin/init-db.c
@@ -579,6 +579,8 @@
set_git_work_tree(work_tree);
}
+ UNLEAK(real_git_dir);
+
flags |= INIT_DB_EXIST_OK;
return init_db(git_dir, real_git_dir, template_dir, flags);
}
diff --git a/builtin/interpret-trailers.c b/builtin/interpret-trailers.c
index 175f147..b742539 100644
--- a/builtin/interpret-trailers.c
+++ b/builtin/interpret-trailers.c
@@ -16,34 +16,119 @@
NULL
};
+static enum trailer_where where;
+static enum trailer_if_exists if_exists;
+static enum trailer_if_missing if_missing;
+
+static int option_parse_where(const struct option *opt,
+ const char *arg, int unset)
+{
+ return trailer_set_where(&where, arg);
+}
+
+static int option_parse_if_exists(const struct option *opt,
+ const char *arg, int unset)
+{
+ return trailer_set_if_exists(&if_exists, arg);
+}
+
+static int option_parse_if_missing(const struct option *opt,
+ const char *arg, int unset)
+{
+ return trailer_set_if_missing(&if_missing, arg);
+}
+
+static void new_trailers_clear(struct list_head *trailers)
+{
+ struct list_head *pos, *tmp;
+ struct new_trailer_item *item;
+
+ list_for_each_safe(pos, tmp, trailers) {
+ item = list_entry(pos, struct new_trailer_item, list);
+ list_del(pos);
+ free(item);
+ }
+}
+
+static int option_parse_trailer(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct list_head *trailers = opt->value;
+ struct new_trailer_item *item;
+
+ if (unset) {
+ new_trailers_clear(trailers);
+ return 0;
+ }
+
+ if (!arg)
+ return -1;
+
+ item = xmalloc(sizeof(*item));
+ item->text = arg;
+ item->where = where;
+ item->if_exists = if_exists;
+ item->if_missing = if_missing;
+ list_add_tail(&item->list, trailers);
+ return 0;
+}
+
+static int parse_opt_parse(const struct option *opt, const char *arg,
+ int unset)
+{
+ struct process_trailer_options *v = opt->value;
+ v->only_trailers = 1;
+ v->only_input = 1;
+ v->unfold = 1;
+ return 0;
+}
+
int cmd_interpret_trailers(int argc, const char **argv, const char *prefix)
{
- int in_place = 0;
- int trim_empty = 0;
- struct string_list trailers = STRING_LIST_INIT_NODUP;
+ struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+ LIST_HEAD(trailers);
struct option options[] = {
- OPT_BOOL(0, "in-place", &in_place, N_("edit files in place")),
- OPT_BOOL(0, "trim-empty", &trim_empty, N_("trim empty trailers")),
- OPT_STRING_LIST(0, "trailer", &trailers, N_("trailer"),
- N_("trailer(s) to add")),
+ OPT_BOOL(0, "in-place", &opts.in_place, N_("edit files in place")),
+ OPT_BOOL(0, "trim-empty", &opts.trim_empty, N_("trim empty trailers")),
+
+ OPT_CALLBACK(0, "where", NULL, N_("action"),
+ N_("where to place the new trailer"), option_parse_where),
+ OPT_CALLBACK(0, "if-exists", NULL, N_("action"),
+ N_("action if trailer already exists"), option_parse_if_exists),
+ OPT_CALLBACK(0, "if-missing", NULL, N_("action"),
+ N_("action if trailer is missing"), option_parse_if_missing),
+
+ OPT_BOOL(0, "only-trailers", &opts.only_trailers, N_("output only the trailers")),
+ OPT_BOOL(0, "only-input", &opts.only_input, N_("do not apply config rules")),
+ OPT_BOOL(0, "unfold", &opts.unfold, N_("join whitespace-continued values")),
+ { OPTION_CALLBACK, 0, "parse", &opts, NULL, N_("set parsing options"),
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, parse_opt_parse },
+ OPT_CALLBACK(0, "trailer", &trailers, N_("trailer"),
+ N_("trailer(s) to add"), option_parse_trailer),
OPT_END()
};
argc = parse_options(argc, argv, prefix, options,
git_interpret_trailers_usage, 0);
+ if (opts.only_input && !list_empty(&trailers))
+ usage_msg_opt(
+ _("--trailer with --only-input does not make sense"),
+ git_interpret_trailers_usage,
+ options);
+
if (argc) {
int i;
for (i = 0; i < argc; i++)
- process_trailers(argv[i], in_place, trim_empty, &trailers);
+ process_trailers(argv[i], &opts, &trailers);
} else {
- if (in_place)
+ if (opts.in_place)
die(_("no input file given for in-place editing"));
- process_trailers(NULL, in_place, trim_empty, &trailers);
+ process_trailers(NULL, &opts, &trailers);
}
- string_list_clear(&trailers, 0);
+ new_trailers_clear(&trailers);
return 0;
}
diff --git a/builtin/log.c b/builtin/log.c
index 5ffc380..14fdf39 100644
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -27,6 +27,7 @@
#include "version.h"
#include "mailmap.h"
#include "gpg-interface.h"
+#include "progress.h"
/* Set a default date-time format for git log ("log.date" config variable) */
static const char *default_date_mode = NULL;
@@ -58,9 +59,9 @@
return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
}
-static int parse_decoration_style(const char *var, const char *value)
+static int parse_decoration_style(const char *value)
{
- switch (git_config_maybe_bool(var, value)) {
+ switch (git_parse_maybe_bool(value)) {
case 1:
return DECORATE_SHORT_REFS;
case 0:
@@ -82,7 +83,7 @@
if (unset)
decoration_style = 0;
else if (arg)
- decoration_style = parse_decoration_style("command line", arg);
+ decoration_style = parse_decoration_style(arg);
else
decoration_style = DECORATE_SHORT_REFS;
@@ -120,20 +121,19 @@
if (fmt_pretty)
get_commit_format(fmt_pretty, rev);
if (default_follow)
- DIFF_OPT_SET(&rev->diffopt, DEFAULT_FOLLOW_RENAMES);
+ rev->diffopt.flags.default_follow_renames = 1;
rev->verbose_header = 1;
- DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
+ rev->diffopt.flags.recursive = 1;
rev->diffopt.stat_width = -1; /* use full terminal width */
rev->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
rev->abbrev_commit = default_abbrev_commit;
rev->show_root_diff = default_show_root;
rev->subject_prefix = fmt_patch_subject_prefix;
rev->show_signature = default_show_signature;
- DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
+ rev->diffopt.flags.allow_textconv = 1;
if (default_date_mode)
parse_date_format(default_date_mode, &rev->date_mode);
- rev->diffopt.touched_flags = 0;
}
static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
@@ -142,11 +142,19 @@
struct userformat_want w;
int quiet = 0, source = 0, mailmap = 0;
static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
+ static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
+ static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
+ struct decoration_filter decoration_filter = {&decorate_refs_include,
+ &decorate_refs_exclude};
const struct option builtin_log_options[] = {
OPT__QUIET(&quiet, N_("suppress diff output")),
OPT_BOOL(0, "source", &source, N_("show source")),
OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
+ OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include,
+ N_("pattern"), N_("only decorate refs that match <pattern>")),
+ OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude,
+ N_("pattern"), N_("do not decorate refs that match <pattern>")),
{ OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
PARSE_OPT_OPTARG, decorate_callback},
OPT_CALLBACK('L', NULL, &line_cb, "n,m:file",
@@ -181,7 +189,7 @@
init_display_notes(&rev->notes_opt);
if (rev->diffopt.pickaxe || rev->diffopt.filter ||
- DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES))
+ rev->diffopt.flags.follow_renames)
rev->always_show_header = 0;
if (source)
@@ -205,7 +213,7 @@
if (decoration_style) {
rev->show_decorations = 1;
- load_ref_decorations(decoration_style);
+ load_ref_decorations(&decoration_filter, decoration_style);
}
if (rev->line_level_traverse)
@@ -391,7 +399,7 @@
fclose(rev->diffopt.file);
if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
- DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
+ rev->diffopt.flags.check_failed) {
return 02;
}
return diff_result_code(&rev->diffopt, 0);
@@ -412,7 +420,7 @@
if (!strcmp(var, "log.date"))
return git_config_string(&default_date_mode, var, value);
if (!strcmp(var, "log.decorate")) {
- decoration_style = parse_decoration_style(var, value);
+ decoration_style = parse_decoration_style(value);
if (decoration_style < 0)
decoration_style = 0; /* maybe warn? */
return 0;
@@ -483,12 +491,12 @@
unsigned long size;
fflush(rev->diffopt.file);
- if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) ||
- !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
+ if (!rev->diffopt.flags.textconv_set_via_cmdline ||
+ !rev->diffopt.flags.allow_textconv)
return stream_blob_to_fd(1, oid, NULL, 0);
- if (get_sha1_with_context(obj_name, GET_SHA1_RECORD_PATH,
- oidc.hash, &obj_context))
+ if (get_oid_with_context(obj_name, GET_OID_RECORD_PATH,
+ &oidc, &obj_context))
die(_("Not a valid object name %s"), obj_name);
if (!obj_context.path ||
!textconv_object(obj_context.path, obj_context.mode, &oidc, 1, &buf, &size)) {
@@ -666,9 +674,9 @@
static void log_setup_revisions_tweak(struct rev_info *rev,
struct setup_revision_opt *opt)
{
- if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) &&
+ if (rev->diffopt.flags.default_follow_renames &&
rev->prune_data.nr == 1)
- DIFF_OPT_SET(&rev->diffopt, FOLLOW_RENAMES);
+ rev->diffopt.flags.follow_renames = 1;
/* Turn --cc/-c into -p --cc/-c when -p was not given */
if (!rev->diffopt.output_format && rev->combine_merges)
@@ -824,7 +832,7 @@
return 0;
}
if (!strcmp(var, "format.from")) {
- int b = git_config_maybe_bool(var, value);
+ int b = git_parse_maybe_bool(value);
free(from);
if (b < 0)
from = xstrdup(value);
@@ -974,7 +982,7 @@
return NULL;
ref = rev->cmdline.rev[positive].name;
tip_oid = &rev->cmdline.rev[positive].item->oid;
- if (dwim_ref(ref, strlen(ref), branch_oid.hash, &full_ref) &&
+ if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref) &&
skip_prefix(full_ref, "refs/heads/", &v) &&
!oidcmp(tip_oid, &branch_oid))
branch = xstrdup(v);
@@ -1340,7 +1348,7 @@
return;
diff_setup(&diffopt);
- DIFF_OPT_SET(&diffopt, RECURSIVE);
+ diffopt.flags.recursive = 1;
diff_setup_done(&diffopt);
oidcpy(&bases->base_commit, &base->object.oid);
@@ -1422,6 +1430,8 @@
char *branch_name = NULL;
char *base_commit = NULL;
struct base_tree_info bases;
+ int show_progress = 0;
+ struct progress *progress = NULL;
const struct option builtin_format_patch_options[] = {
{ OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
@@ -1493,6 +1503,8 @@
OPT_FILENAME(0, "signature-file", &signature_file,
N_("add a signature from a file")),
OPT__QUIET(&quiet, N_("don't print the patch filenames")),
+ OPT_BOOL(0, "progress", &show_progress,
+ N_("show progress while generating patches")),
OPT_END()
};
@@ -1507,7 +1519,7 @@
rev.verbose_header = 1;
rev.diff = 1;
rev.max_parents = 1;
- DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
+ rev.diffopt.flags.recursive = 1;
rev.subject_prefix = fmt_patch_subject_prefix;
memset(&s_r_opt, 0, sizeof(s_r_opt));
s_r_opt.def = "HEAD";
@@ -1608,8 +1620,8 @@
rev.zero_commit = zero_commit;
- if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
- DIFF_OPT_SET(&rev.diffopt, BINARY);
+ if (!rev.diffopt.flags.text && !no_binary_diff)
+ rev.diffopt.flags.binary = 1;
if (rev.show_notes)
init_display_notes(&rev.notes_opt);
@@ -1655,10 +1667,9 @@
check_head = 1;
if (check_head) {
- struct object_id oid;
const char *ref, *v;
ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
- oid.hash, NULL);
+ NULL, NULL);
if (ref && skip_prefix(ref, "refs/heads/", &v))
branch_name = xstrdup(v);
else
@@ -1752,8 +1763,12 @@
start_number--;
}
rev.add_signoff = do_signoff;
+
+ if (show_progress)
+ progress = start_delayed_progress(_("Generating patches"), total);
while (0 <= --nr) {
int shown;
+ display_progress(progress, total - nr);
commit = list[nr];
rev.nr = total - nr + (start_number - 1);
/* Make the second and subsequent mails replies to the first */
@@ -1818,6 +1833,7 @@
if (!use_stdout)
fclose(rev.diffopt.file);
}
+ stop_progress(&progress);
free(list);
free(branch_name);
string_list_clear(&extra_to, 0);
diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index c6126ea..2fc836e 100644
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -19,6 +19,7 @@
#include "pathspec.h"
#include "run-command.h"
#include "submodule.h"
+#include "submodule-config.h"
static int abbrev;
static int show_deleted;
@@ -30,6 +31,7 @@
static int show_modified;
static int show_killed;
static int show_valid_bit;
+static int show_fsmonitor_bit;
static int line_terminator = '\n';
static int debug_mode;
static int show_eol;
@@ -85,7 +87,8 @@
{
static char alttag[4];
- if (tag && *tag && show_valid_bit && (ce->ce_flags & CE_VALID)) {
+ if (tag && *tag && ((show_valid_bit && (ce->ce_flags & CE_VALID)) ||
+ (show_fsmonitor_bit && (ce->ce_flags & CE_FSMONITOR_VALID)))) {
memcpy(alttag, tag, 3);
if (isalpha(tag[0])) {
@@ -210,8 +213,6 @@
if (repo_read_index(&submodule) < 0)
die("index file corrupt");
- repo_read_gitmodules(&submodule);
-
show_files(&submodule, dir);
repo_clear(&submodule);
@@ -516,6 +517,8 @@
N_("identify the file status with tags")),
OPT_BOOL('v', NULL, &show_valid_bit,
N_("use lowercase letters for 'assume unchanged' files")),
+ OPT_BOOL('f', NULL, &show_fsmonitor_bit,
+ N_("use lowercase letters for 'fsmonitor clean' files")),
OPT_BOOL('c', "cached", &show_cached,
N_("show cached files in the output (default)")),
OPT_BOOL('d', "deleted", &show_deleted,
@@ -585,7 +588,7 @@
for (i = 0; i < exclude_list.nr; i++) {
add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args);
}
- if (show_tag || show_valid_bit) {
+ if (show_tag || show_valid_bit || show_fsmonitor_bit) {
tag_cached = "H ";
tag_unmerged = "M ";
tag_removed = "R ";
@@ -609,9 +612,6 @@
if (require_work_tree && !is_inside_work_tree())
setup_work_tree();
- if (recurse_submodules)
- repo_read_gitmodules(the_repository);
-
if (recurse_submodules &&
(show_stage || show_deleted || show_others || show_unmerged ||
show_killed || show_modified || show_resolve_undo || with_tree))
@@ -677,5 +677,6 @@
return bad ? 1 : 0;
}
+ UNLEAK(dir);
return 0;
}
diff --git a/builtin/merge-base.c b/builtin/merge-base.c
index 6dbd167..3b76001 100644
--- a/builtin/merge-base.c
+++ b/builtin/merge-base.c
@@ -9,20 +9,20 @@
static int show_merge_base(struct commit **rev, int rev_nr, int show_all)
{
- struct commit_list *result;
+ struct commit_list *result, *r;
result = get_merge_bases_many_dirty(rev[0], rev_nr - 1, rev + 1);
if (!result)
return 1;
- while (result) {
- printf("%s\n", oid_to_hex(&result->item->object.oid));
+ for (r = result; r; r = r->next) {
+ printf("%s\n", oid_to_hex(&r->item->object.oid));
if (!show_all)
- return 0;
- result = result->next;
+ break;
}
+ free_commit_list(result);
return 0;
}
@@ -51,45 +51,47 @@
static int handle_independent(int count, const char **args)
{
- struct commit_list *revs = NULL;
- struct commit_list *result;
+ struct commit_list *revs = NULL, *rev;
int i;
for (i = count - 1; i >= 0; i--)
commit_list_insert(get_commit_reference(args[i]), &revs);
- result = reduce_heads(revs);
- if (!result)
+ reduce_heads_replace(&revs);
+
+ if (!revs)
return 1;
- while (result) {
- printf("%s\n", oid_to_hex(&result->item->object.oid));
- result = result->next;
- }
+ for (rev = revs; rev; rev = rev->next)
+ printf("%s\n", oid_to_hex(&rev->item->object.oid));
+
+ free_commit_list(revs);
return 0;
}
static int handle_octopus(int count, const char **args, int show_all)
{
struct commit_list *revs = NULL;
- struct commit_list *result;
+ struct commit_list *result, *rev;
int i;
for (i = count - 1; i >= 0; i--)
commit_list_insert(get_commit_reference(args[i]), &revs);
- result = reduce_heads(get_octopus_merge_bases(revs));
+ result = get_octopus_merge_bases(revs);
+ free_commit_list(revs);
+ reduce_heads_replace(&result);
if (!result)
return 1;
- while (result) {
- printf("%s\n", oid_to_hex(&result->item->object.oid));
+ for (rev = result; rev; rev = rev->next) {
+ printf("%s\n", oid_to_hex(&rev->item->object.oid));
if (!show_all)
- return 0;
- result = result->next;
+ break;
}
+ free_commit_list(result);
return 0;
}
@@ -156,7 +158,7 @@
struct commit_list *bases;
int i, ret = 0;
- switch (dwim_ref(argv[0], strlen(argv[0]), oid.hash, &refname)) {
+ switch (dwim_ref(argv[0], strlen(argv[0]), &oid, &refname)) {
case 0:
die("No such ref: '%s'", argv[0]);
case 1:
diff --git a/builtin/merge-ours.c b/builtin/merge-ours.c
index 6844116..c84c6e0 100644
--- a/builtin/merge-ours.c
+++ b/builtin/merge-ours.c
@@ -9,26 +9,24 @@
*/
#include "git-compat-util.h"
#include "builtin.h"
+#include "diff.h"
static const char builtin_merge_ours_usage[] =
"git merge-ours <base>... -- HEAD <remote>...";
-static const char *diff_index_args[] = {
- "diff-index", "--quiet", "--cached", "HEAD", "--", NULL
-};
-#define NARGS (ARRAY_SIZE(diff_index_args) - 1)
-
int cmd_merge_ours(int argc, const char **argv, const char *prefix)
{
if (argc == 2 && !strcmp(argv[1], "-h"))
usage(builtin_merge_ours_usage);
/*
- * We need to exit with 2 if the index does not match our HEAD tree,
- * because the current index is what we will be committing as the
- * merge result.
+ * The contents of the current index becomes the tree we
+ * commit. The index must match HEAD, or this merge cannot go
+ * through.
*/
- if (cmd_diff_index(NARGS, diff_index_args, prefix))
+ if (read_cache() < 0)
+ die_errno("read_cache failed");
+ if (index_differs_from("HEAD", NULL, 0))
exit(2);
exit(0);
}
diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index bad6735..d01ddec 100644
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -213,11 +213,11 @@
newbase = traverse_path(info, p);
-#define ENTRY_SHA1(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid->hash : NULL)
- buf0 = fill_tree_descriptor(t+0, ENTRY_SHA1(n + 0));
- buf1 = fill_tree_descriptor(t+1, ENTRY_SHA1(n + 1));
- buf2 = fill_tree_descriptor(t+2, ENTRY_SHA1(n + 2));
-#undef ENTRY_SHA1
+#define ENTRY_OID(e) (((e)->mode && S_ISDIR((e)->mode)) ? (e)->oid : NULL)
+ buf0 = fill_tree_descriptor(t + 0, ENTRY_OID(n + 0));
+ buf1 = fill_tree_descriptor(t + 1, ENTRY_OID(n + 1));
+ buf2 = fill_tree_descriptor(t + 2, ENTRY_OID(n + 2));
+#undef ENTRY_OID
merge_trees(t, newbase);
@@ -347,12 +347,12 @@
static void *get_tree_descriptor(struct tree_desc *desc, const char *rev)
{
- unsigned char sha1[20];
+ struct object_id oid;
void *buf;
- if (get_sha1(rev, sha1))
+ if (get_oid(rev, &oid))
die("unknown rev %s", rev);
- buf = fill_tree_descriptor(desc, sha1);
+ buf = fill_tree_descriptor(desc, &oid);
if (!buf)
die("%s is not a tree", rev);
return buf;
diff --git a/builtin/merge.c b/builtin/merge.c
index 23c53a3..30264cf 100644
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -32,6 +32,7 @@
#include "gpg-interface.h"
#include "sequencer.h"
#include "string-list.h"
+#include "packfile.h"
#define DEFAULT_TWOHEAD (1<<0)
#define DEFAULT_OCTOPUS (1<<1)
@@ -70,7 +71,9 @@
static int allow_unrelated_histories;
static int show_progress = -1;
static int default_to_upstream = 1;
+static int signoff;
static const char *sign_commit;
+static int verify_msg = 1;
static struct strategy all_strategy[] = {
{ "recursive", DEFAULT_TWOHEAD | NO_TRIVIAL },
@@ -233,6 +236,8 @@
{ OPTION_STRING, 'S', "gpg-sign", &sign_commit, N_("key-id"),
N_("GPG sign commit"), PARSE_OPT_OPTARG, NULL, (intptr_t) "" },
OPT_BOOL(0, "overwrite-ignore", &overwrite_ignore, N_("update ignored files (default)")),
+ OPT_BOOL(0, "signoff", &signoff, N_("add Signed-off-by:")),
+ OPT_BOOL(0, "verify", &verify_msg, N_("verify commit-msg hook")),
OPT_END()
};
@@ -250,6 +255,7 @@
struct child_process cp = CHILD_PROCESS_INIT;
struct strbuf buffer = STRBUF_INIT;
const char *argv[] = {"stash", "create", NULL};
+ int rc = -1;
cp.argv = argv;
cp.out = -1;
@@ -263,11 +269,14 @@
if (finish_command(&cp) || len < 0)
die(_("stash failed"));
else if (!len) /* no changes */
- return -1;
+ goto out;
strbuf_setlen(&buffer, buffer.len-1);
if (get_oid(buffer.buf, stash))
die(_("not a valid object: %s"), buffer.buf);
- return 0;
+ rc = 0;
+out:
+ strbuf_release(&buffer);
+ return rc;
}
static void read_empty(unsigned const char *sha1, int verbose)
@@ -396,9 +405,8 @@
printf(_("No merge message -- not updating HEAD\n"));
else {
const char *argv_gc_auto[] = { "gc", "--auto", NULL };
- update_ref(reflog_message.buf, "HEAD",
- new_head->hash, head->hash, 0,
- UPDATE_REFS_DIE_ON_ERR);
+ update_ref(reflog_message.buf, "HEAD", new_head, head,
+ 0, UPDATE_REFS_DIE_ON_ERR);
/*
* We ignore errors in 'gc --auto', since the
* user should see them.
@@ -446,7 +454,7 @@
if (!remote_head)
die(_("'%s' does not point to a commit"), remote);
- if (dwim_ref(remote, strlen(remote), branch_head.hash, &found_ref) > 0) {
+ if (dwim_ref(remote, strlen(remote), &branch_head, &found_ref) > 0) {
if (starts_with(found_ref, "refs/heads/")) {
strbuf_addf(msg, "%s\t\tbranch '%s' of .\n",
oid_to_hex(&branch_head), remote);
@@ -559,6 +567,8 @@
if (!strcmp(k, "merge.diffstat") || !strcmp(k, "merge.stat"))
show_diffstat = git_config_bool(k, v);
+ else if (!strcmp(k, "merge.verifysignatures"))
+ verify_signatures = git_config_bool(k, v);
else if (!strcmp(k, "pull.twohead"))
return git_config_string(&pull_twohead, k, v);
else if (!strcmp(k, "pull.octopus"))
@@ -566,7 +576,7 @@
else if (!strcmp(k, "merge.renormalize"))
option_renormalize = git_config_bool(k, v);
else if (!strcmp(k, "merge.ff")) {
- int boolval = git_config_maybe_bool(k, v);
+ int boolval = git_parse_maybe_bool(v);
if (0 <= boolval) {
fast_forward = boolval ? FF_ALLOW : FF_NO;
} else if (v && !strcmp(v, "only")) {
@@ -766,6 +776,8 @@
BUG("the control must not reach here under --squash");
if (0 < option_edit)
strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char);
+ if (signoff)
+ append_signoff(&msg, ignore_non_trailer(msg.buf, msg.len), 0);
write_merge_heads(remoteheads);
write_file_buf(git_path_merge_msg(), msg.buf, msg.len);
if (run_commit_hook(0 < option_edit, get_index_file(), "prepare-commit-msg",
@@ -775,6 +787,12 @@
if (launch_editor(git_path_merge_msg(), NULL, NULL))
abort_commit(remoteheads, NULL);
}
+
+ if (verify_msg && run_commit_hook(0 < option_edit, get_index_file(),
+ "commit-msg",
+ git_path_merge_msg(), NULL))
+ abort_commit(remoteheads, NULL);
+
read_merge_msg(&msg);
strbuf_stripspace(&msg, 0 < option_edit);
if (!msg.len)
@@ -929,6 +947,7 @@
if (fast_forward == FF_NO)
strbuf_addstr(&buf, "no-ff");
write_file_buf(git_path_merge_mode(), buf.buf, buf.len);
+ strbuf_release(&buf);
}
static void write_merge_state(struct commit_list *remoteheads)
@@ -949,7 +968,7 @@
return 0;
if (e) {
- int v = git_config_maybe_bool(name, e);
+ int v = git_parse_maybe_bool(e);
if (v < 0)
die(_("Bad value '%s' in environment '%s'"), e, name);
return v;
@@ -981,6 +1000,7 @@
/* Find what parents to record by checking independent ones. */
parents = reduce_heads(remoteheads);
+ free_commit_list(remoteheads);
remoteheads = NULL;
remotes = &remoteheads;
@@ -1125,7 +1145,7 @@
* Check if we are _not_ on a detached HEAD, i.e. if there is a
* current branch.
*/
- branch = branch_to_free = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
+ branch = branch_to_free = resolve_refdup("HEAD", 0, &head_oid, NULL);
if (branch)
skip_prefix(branch, "refs/heads/", &branch);
if (!branch || is_null_oid(&head_oid))
@@ -1243,8 +1263,8 @@
die(_("Can merge only exactly one commit into empty head"));
remote_head_oid = &remoteheads->item->object.oid;
read_empty(remote_head_oid->hash, 0);
- update_ref("initial pull", "HEAD", remote_head_oid->hash,
- NULL, 0, UPDATE_REFS_DIE_ON_ERR);
+ update_ref("initial pull", "HEAD", remote_head_oid, NULL, 0,
+ UPDATE_REFS_DIE_ON_ERR);
goto done;
}
@@ -1339,8 +1359,8 @@
free(list);
}
- update_ref("updating ORIG_HEAD", "ORIG_HEAD", head_commit->object.oid.hash,
- NULL, 0, UPDATE_REFS_DIE_ON_ERR);
+ update_ref("updating ORIG_HEAD", "ORIG_HEAD",
+ &head_commit->object.oid, NULL, 0, UPDATE_REFS_DIE_ON_ERR);
if (remoteheads && !common) {
/* No common ancestors found. */
@@ -1354,7 +1374,7 @@
* If head can reach all the merge then we are up to date.
* but first the most common case of merging one remote.
*/
- finish_up_to_date(_("Already up-to-date."));
+ finish_up_to_date(_("Already up to date."));
goto done;
} else if (fast_forward != FF_NO && !remoteheads->next &&
!common->next &&
@@ -1437,7 +1457,7 @@
}
}
if (up_to_date) {
- finish_up_to_date(_("Already up-to-date. Yeeah!"));
+ finish_up_to_date(_("Already up to date. Yeeah!"));
goto done;
}
}
diff --git a/builtin/mv.c b/builtin/mv.c
index 9662804..8ce6a2d 100644
--- a/builtin/mv.c
+++ b/builtin/mv.c
@@ -81,7 +81,7 @@
struct strbuf submodule_dotgit = STRBUF_INIT;
if (!S_ISGITLINK(active_cache[first]->ce_mode))
die(_("Directory %s is in index and no submodule?"), src);
- if (!is_staging_gitmodules_ok())
+ if (!is_staging_gitmodules_ok(&the_index))
die(_("Please stage your changes to .gitmodules or stash them to proceed"));
strbuf_addf(&submodule_dotgit, "%s/.git", src);
*submodule_gitfile = read_gitfile(submodule_dotgit.buf);
@@ -131,7 +131,6 @@
struct stat st;
struct string_list src_for_dst = STRING_LIST_INIT_NODUP;
- gitmodules_config();
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, builtin_mv_options,
@@ -291,7 +290,7 @@
}
if (gitmodules_modified)
- stage_updated_gitmodules();
+ stage_updated_gitmodules(&the_index);
if (active_cache_changed &&
write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 598da6c..9e088eb 100644
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -494,5 +494,6 @@
always, allow_undefined, data.name_only);
}
+ UNLEAK(revs);
return 0;
}
diff --git a/builtin/notes.c b/builtin/notes.c
index 77573cf..7c81761 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -12,7 +12,7 @@
#include "builtin.h"
#include "notes.h"
#include "blob.h"
-#include "commit.h"
+#include "pretty.h"
#include "refs.h"
#include "exec_cmd.h"
#include "run-command.h"
@@ -33,7 +33,7 @@
N_("git notes merge --commit [-v | -q]"),
N_("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>] prune [-n] [-v]"),
N_("git notes [--ref <notes-ref>] get-ref"),
NULL
};
@@ -328,6 +328,7 @@
} else {
finish_copy_notes_for_rewrite(c, msg);
}
+ strbuf_release(&buf);
return ret;
}
@@ -456,7 +457,7 @@
oid_to_hex(&object));
}
- prepare_note_data(&object, &d, note->hash);
+ prepare_note_data(&object, &d, note ? note->hash : NULL);
if (d.buf.len || allow_empty) {
write_note_data(&d, new_note.hash);
if (add_note(t, &object, &new_note, combine_notes_overwrite))
@@ -685,7 +686,7 @@
if (delete_ref(NULL, "NOTES_MERGE_PARTIAL", NULL, 0))
ret += error(_("failed to delete ref NOTES_MERGE_PARTIAL"));
- if (delete_ref(NULL, "NOTES_MERGE_REF", NULL, REF_NODEREF))
+ if (delete_ref(NULL, "NOTES_MERGE_REF", NULL, REF_NO_DEREF))
ret += error(_("failed to delete ref NOTES_MERGE_REF"));
if (notes_merge_abort(o))
ret += error(_("failed to remove 'git notes merge' worktree"));
@@ -723,7 +724,7 @@
init_notes(t, "NOTES_MERGE_PARTIAL", combine_notes_overwrite, 0);
o->local_ref = local_ref_to_free =
- resolve_refdup("NOTES_MERGE_REF", 0, oid.hash, NULL);
+ resolve_refdup("NOTES_MERGE_REF", 0, &oid, NULL);
if (!o->local_ref)
die(_("failed to resolve NOTES_MERGE_REF"));
@@ -735,8 +736,8 @@
format_commit_message(partial, "%s", &msg, &pretty_ctx);
strbuf_trim(&msg);
strbuf_insert(&msg, 0, "notes: ", 7);
- update_ref(msg.buf, o->local_ref, oid.hash,
- is_null_oid(&parent_oid) ? NULL : parent_oid.hash,
+ update_ref(msg.buf, o->local_ref, &oid,
+ is_null_oid(&parent_oid) ? NULL : &parent_oid,
0, UPDATE_REFS_DIE_ON_ERR);
free_notes(t);
@@ -849,12 +850,12 @@
if (result >= 0) /* Merge resulted (trivially) in result_oid */
/* Update default notes ref with new commit */
- update_ref(msg.buf, default_notes_ref(), result_oid.hash, NULL,
- 0, UPDATE_REFS_DIE_ON_ERR);
+ update_ref(msg.buf, default_notes_ref(), &result_oid, NULL, 0,
+ UPDATE_REFS_DIE_ON_ERR);
else { /* Merge has unresolved conflicts */
const struct worktree *wt;
/* Update .git/NOTES_MERGE_PARTIAL with partial merge result */
- update_ref(msg.buf, "NOTES_MERGE_PARTIAL", result_oid.hash, NULL,
+ 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());
@@ -864,10 +865,10 @@
if (create_symref("NOTES_MERGE_REF", default_notes_ref(), NULL))
die(_("failed to store link to current notes ref (%s)"),
default_notes_ref());
- printf(_("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"),
- git_path(NOTES_MERGE_WORKTREE));
+ fprintf(stderr, _("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"),
+ git_path(NOTES_MERGE_WORKTREE));
}
free_notes(t);
diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index 3af63ad..6b9cfc2 100644
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -15,6 +15,8 @@
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
+#include "list-objects-filter.h"
+#include "list-objects-filter-options.h"
#include "pack-objects.h"
#include "progress.h"
#include "refs.h"
@@ -25,6 +27,7 @@
#include "sha1-array.h"
#include "argv-array.h"
#include "mru.h"
+#include "packfile.h"
static const char *pack_usage[] = {
N_("git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"),
@@ -78,6 +81,15 @@
static unsigned long window_memory_limit = 0;
+static struct list_objects_filter_options filter_options;
+
+enum missing_action {
+ MA_ERROR = 0, /* fail if any missing objects are encountered */
+ MA_ALLOW_ANY, /* silently allow ALL missing objects */
+};
+static enum missing_action arg_missing_action;
+static show_object_fn fn_show_object;
+
/*
* stats
*/
@@ -150,7 +162,7 @@
}
static unsigned long write_large_blob_data(struct git_istream *st, struct sha1file *f,
- const unsigned char *sha1)
+ const struct object_id *oid)
{
git_zstream stream;
unsigned char ibuf[1024 * 16];
@@ -164,7 +176,7 @@
int zret = Z_OK;
readlen = read_istream(st, ibuf, sizeof(ibuf));
if (readlen == -1)
- die(_("unable to read %s"), sha1_to_hex(sha1));
+ die(_("unable to read %s"), oid_to_hex(oid));
stream.next_in = ibuf;
stream.avail_in = readlen;
@@ -338,7 +350,7 @@
sha1write(f, header, hdrlen);
}
if (st) {
- datalen = write_large_blob_data(st, f, entry->idx.oid.hash);
+ datalen = write_large_blob_data(st, f, &entry->idx.oid);
close_istream(st);
} else {
sha1write(f, buf, datalen);
@@ -556,13 +568,13 @@
static int mark_tagged(const char *path, const struct object_id *oid, int flag,
void *cb_data)
{
- unsigned char peeled[20];
+ struct object_id peeled;
struct object_entry *entry = packlist_find(&to_pack, oid->hash, NULL);
if (entry)
entry->tagged = 1;
- if (!peel_ref(path, peeled)) {
- entry = packlist_find(&to_pack, peeled, NULL);
+ if (!peel_ref(path, &peeled)) {
+ entry = packlist_find(&to_pack, peeled.hash, NULL);
if (entry)
entry->tagged = 1;
}
@@ -791,7 +803,7 @@
write_order = compute_write_order();
do {
- unsigned char sha1[20];
+ struct object_id oid;
char *pack_tmp_name = NULL;
if (pack_to_stdout)
@@ -822,13 +834,13 @@
* If so, rewrite it like in fast-import
*/
if (pack_to_stdout) {
- sha1close(f, sha1, CSUM_CLOSE);
+ sha1close(f, oid.hash, CSUM_CLOSE);
} else if (nr_written == nr_remaining) {
- sha1close(f, sha1, CSUM_FSYNC);
+ sha1close(f, oid.hash, CSUM_FSYNC);
} else {
- int fd = sha1close(f, sha1, 0);
- fixup_pack_header_footer(fd, sha1, pack_tmp_name,
- nr_written, sha1, offset);
+ int fd = sha1close(f, oid.hash, 0);
+ fixup_pack_header_footer(fd, oid.hash, pack_tmp_name,
+ nr_written, oid.hash, offset);
close(fd);
if (write_bitmap_index) {
warning(_(no_split_warning));
@@ -862,16 +874,16 @@
strbuf_addf(&tmpname, "%s-", base_name);
if (write_bitmap_index) {
- bitmap_writer_set_checksum(sha1);
+ bitmap_writer_set_checksum(oid.hash);
bitmap_writer_build_type_index(written_list, nr_written);
}
finish_tmp_packfile(&tmpname, pack_tmp_name,
written_list, nr_written,
- &pack_idx_opts, sha1);
+ &pack_idx_opts, oid.hash);
if (write_bitmap_index) {
- strbuf_addf(&tmpname, "%s.bitmap", sha1_to_hex(sha1));
+ strbuf_addf(&tmpname, "%s.bitmap", oid_to_hex(&oid));
stop_progress(&progress_state);
@@ -886,7 +898,7 @@
strbuf_release(&tmpname);
free(pack_tmp_name);
- puts(sha1_to_hex(sha1));
+ puts(oid_to_hex(&oid));
}
/* mark written objects as written to previous pack */
@@ -927,13 +939,13 @@
* found the item, since that saves us from having to look it up again a
* few lines later when we want to add the new entry.
*/
-static int have_duplicate_entry(const unsigned char *sha1,
+static int have_duplicate_entry(const struct object_id *oid,
int exclude,
uint32_t *index_pos)
{
struct object_entry *entry;
- entry = packlist_find(&to_pack, sha1, index_pos);
+ entry = packlist_find(&to_pack, oid->hash, index_pos);
if (!entry)
return 0;
@@ -989,7 +1001,7 @@
* function finds if there is any pack that has the object and returns the pack
* and its offset in these variables.
*/
-static int want_object_in_pack(const unsigned char *sha1,
+static int want_object_in_pack(const struct object_id *oid,
int exclude,
struct packed_git **found_pack,
off_t *found_offset)
@@ -997,7 +1009,7 @@
struct mru_entry *entry;
int want;
- if (!exclude && local && has_loose_object_nonlocal(sha1))
+ if (!exclude && local && has_loose_object_nonlocal(oid->hash))
return 0;
/*
@@ -1011,14 +1023,14 @@
return want;
}
- for (entry = packed_git_mru->head; entry; entry = entry->next) {
+ for (entry = packed_git_mru.head; entry; entry = entry->next) {
struct packed_git *p = entry->item;
off_t offset;
if (p == *found_pack)
offset = *found_offset;
else
- offset = find_pack_entry_one(sha1, p);
+ offset = find_pack_entry_one(oid->hash, p);
if (offset) {
if (!*found_pack) {
@@ -1029,7 +1041,7 @@
}
want = want_found_object(exclude, p);
if (!exclude && want > 0)
- mru_mark(packed_git_mru, entry);
+ mru_mark(&packed_git_mru, entry);
if (want != -1)
return want;
}
@@ -1038,7 +1050,7 @@
return 1;
}
-static void create_object_entry(const unsigned char *sha1,
+static void create_object_entry(const struct object_id *oid,
enum object_type type,
uint32_t hash,
int exclude,
@@ -1049,7 +1061,7 @@
{
struct object_entry *entry;
- entry = packlist_alloc(&to_pack, sha1, index_pos);
+ entry = packlist_alloc(&to_pack, oid->hash, index_pos);
entry->hash = hash;
if (type)
entry->type = type;
@@ -1069,17 +1081,17 @@
"disabling bitmap writing, as some objects are not being packed"
);
-static int add_object_entry(const unsigned char *sha1, enum object_type type,
+static int add_object_entry(const struct object_id *oid, enum object_type type,
const char *name, int exclude)
{
struct packed_git *found_pack = NULL;
off_t found_offset = 0;
uint32_t index_pos;
- if (have_duplicate_entry(sha1, exclude, &index_pos))
+ if (have_duplicate_entry(oid, exclude, &index_pos))
return 0;
- if (!want_object_in_pack(sha1, exclude, &found_pack, &found_offset)) {
+ if (!want_object_in_pack(oid, exclude, &found_pack, &found_offset)) {
/* The pack is missing an object, so it will not have closure */
if (write_bitmap_index) {
warning(_(no_closure_warning));
@@ -1088,7 +1100,7 @@
return 0;
}
- create_object_entry(sha1, type, pack_name_hash(name),
+ create_object_entry(oid, type, pack_name_hash(name),
exclude, name && no_try_delta(name),
index_pos, found_pack, found_offset);
@@ -1096,27 +1108,27 @@
return 1;
}
-static int add_object_entry_from_bitmap(const unsigned char *sha1,
+static int add_object_entry_from_bitmap(const struct object_id *oid,
enum object_type type,
int flags, uint32_t name_hash,
struct packed_git *pack, off_t offset)
{
uint32_t index_pos;
- if (have_duplicate_entry(sha1, 0, &index_pos))
+ if (have_duplicate_entry(oid, 0, &index_pos))
return 0;
- if (!want_object_in_pack(sha1, 0, &pack, &offset))
+ if (!want_object_in_pack(oid, 0, &pack, &offset))
return 0;
- create_object_entry(sha1, type, name_hash, 0, 0, index_pos, pack, offset);
+ create_object_entry(oid, type, name_hash, 0, 0, index_pos, pack, offset);
display_progress(progress_state, nr_result);
return 1;
}
struct pbase_tree_cache {
- unsigned char sha1[20];
+ struct object_id oid;
int ref;
int temporary;
void *tree_data;
@@ -1124,9 +1136,9 @@
};
static struct pbase_tree_cache *(pbase_tree_cache[256]);
-static int pbase_tree_cache_ix(const unsigned char *sha1)
+static int pbase_tree_cache_ix(const struct object_id *oid)
{
- return sha1[0] % ARRAY_SIZE(pbase_tree_cache);
+ return oid->hash[0] % ARRAY_SIZE(pbase_tree_cache);
}
static int pbase_tree_cache_ix_incr(int ix)
{
@@ -1143,14 +1155,14 @@
struct pbase_tree_cache pcache;
} *pbase_tree;
-static struct pbase_tree_cache *pbase_tree_get(const unsigned char *sha1)
+static struct pbase_tree_cache *pbase_tree_get(const struct object_id *oid)
{
struct pbase_tree_cache *ent, *nent;
void *data;
unsigned long size;
enum object_type type;
int neigh;
- int my_ix = pbase_tree_cache_ix(sha1);
+ int my_ix = pbase_tree_cache_ix(oid);
int available_ix = -1;
/* pbase-tree-cache acts as a limited hashtable.
@@ -1159,7 +1171,7 @@
*/
for (neigh = 0; neigh < 8; neigh++) {
ent = pbase_tree_cache[my_ix];
- if (ent && !hashcmp(ent->sha1, sha1)) {
+ if (ent && !oidcmp(&ent->oid, oid)) {
ent->ref++;
return ent;
}
@@ -1175,7 +1187,7 @@
/* Did not find one. Either we got a bogus request or
* we need to read and perhaps cache.
*/
- data = read_sha1_file(sha1, &type, &size);
+ data = read_sha1_file(oid->hash, &type, &size);
if (!data)
return NULL;
if (type != OBJ_TREE) {
@@ -1201,7 +1213,7 @@
free(ent->tree_data);
nent = ent;
}
- hashcpy(nent->sha1, sha1);
+ oidcpy(&nent->oid, oid);
nent->tree_data = data;
nent->tree_size = size;
nent->ref = 1;
@@ -1246,7 +1258,7 @@
if (cmp < 0)
return;
if (name[cmplen] != '/') {
- add_object_entry(entry.oid->hash,
+ add_object_entry(entry.oid,
object_type(entry.mode),
fullname, 1);
return;
@@ -1257,7 +1269,7 @@
const char *down = name+cmplen+1;
int downlen = name_cmp_len(down);
- tree = pbase_tree_get(entry.oid->hash);
+ tree = pbase_tree_get(entry.oid);
if (!tree)
return;
init_tree_desc(&sub, tree->tree_data, tree->tree_size);
@@ -1276,7 +1288,7 @@
int lo = 0;
int hi = done_pbase_paths_num;
while (lo < hi) {
- int mi = (hi + lo) / 2;
+ int mi = lo + (hi - lo) / 2;
if (done_pbase_paths[mi] == hash)
return mi;
if (done_pbase_paths[mi] < hash)
@@ -1316,7 +1328,7 @@
cmplen = name_cmp_len(name);
for (it = pbase_tree; it; it = it->next) {
if (cmplen == 0) {
- add_object_entry(it->pcache.sha1, OBJ_TREE, NULL, 1);
+ add_object_entry(&it->pcache.oid, OBJ_TREE, NULL, 1);
}
else {
struct tree_desc tree;
@@ -1326,22 +1338,22 @@
}
}
-static void add_preferred_base(unsigned char *sha1)
+static void add_preferred_base(struct object_id *oid)
{
struct pbase_tree *it;
void *data;
unsigned long size;
- unsigned char tree_sha1[20];
+ struct object_id tree_oid;
if (window <= num_preferred_base++)
return;
- data = read_object_with_reference(sha1, tree_type, &size, tree_sha1);
+ data = read_object_with_reference(oid->hash, tree_type, &size, tree_oid.hash);
if (!data)
return;
for (it = pbase_tree; it; it = it->next) {
- if (!hashcmp(it->pcache.sha1, tree_sha1)) {
+ if (!oidcmp(&it->pcache.oid, &tree_oid)) {
free(data);
return;
}
@@ -1351,7 +1363,7 @@
it->next = pbase_tree;
pbase_tree = it;
- hashcpy(it->pcache.sha1, tree_sha1);
+ oidcpy(&it->pcache.oid, &tree_oid);
it->pcache.tree_data = data;
it->pcache.tree_size = size;
}
@@ -2356,7 +2368,7 @@
die("unable to pack objects reachable from tag %s",
oid_to_hex(oid));
- add_object_entry(tag->object.oid.hash, OBJ_TAG, NULL, 0);
+ add_object_entry(&tag->object.oid, OBJ_TAG, NULL, 0);
if (tag->tagged->type != OBJ_TAG)
return;
@@ -2370,7 +2382,7 @@
struct object_id peeled;
if (starts_with(path, "refs/tags/") && /* is a tag? */
- !peel_ref(path, peeled.hash) && /* peelable? */
+ !peel_ref(path, &peeled) && /* peelable? */
packlist_find(&to_pack, peeled.hash, NULL)) /* object packed? */
add_tag_chain(oid);
return 0;
@@ -2504,8 +2516,9 @@
static void read_object_list_from_stdin(void)
{
- char line[40 + 1 + PATH_MAX + 2];
- unsigned char sha1[20];
+ char line[GIT_MAX_HEXSZ + 1 + PATH_MAX + 2];
+ struct object_id oid;
+ const char *p;
for (;;) {
if (!fgets(line, sizeof(line), stdin)) {
@@ -2519,17 +2532,17 @@
continue;
}
if (line[0] == '-') {
- if (get_sha1_hex(line+1, sha1))
- die("expected edge sha1, got garbage:\n %s",
+ if (get_oid_hex(line+1, &oid))
+ die("expected edge object ID, got garbage:\n %s",
line);
- add_preferred_base(sha1);
+ add_preferred_base(&oid);
continue;
}
- if (get_sha1_hex(line, sha1))
- die("expected sha1, got garbage:\n %s", line);
+ if (parse_oid_hex(line, &oid, &p))
+ die("expected object ID, got garbage:\n %s", line);
- add_preferred_base_object(line+41);
- add_object_entry(sha1, 0, line+41, 0);
+ add_preferred_base_object(p + 1);
+ add_object_entry(&oid, 0, p + 1, 0);
}
}
@@ -2537,7 +2550,7 @@
static void show_commit(struct commit *commit, void *data)
{
- add_object_entry(commit->object.oid.hash, OBJ_COMMIT, NULL, 0);
+ add_object_entry(&commit->object.oid, OBJ_COMMIT, NULL, 0);
commit->object.flags |= OBJECT_ADDED;
if (write_bitmap_index)
@@ -2547,13 +2560,49 @@
static void show_object(struct object *obj, const char *name, void *data)
{
add_preferred_base_object(name);
- add_object_entry(obj->oid.hash, obj->type, name, 0);
+ add_object_entry(&obj->oid, obj->type, name, 0);
obj->flags |= OBJECT_ADDED;
}
+static void show_object__ma_allow_any(struct object *obj, const char *name, void *data)
+{
+ assert(arg_missing_action == MA_ALLOW_ANY);
+
+ /*
+ * Quietly ignore ALL missing objects. This avoids problems with
+ * staging them now and getting an odd error later.
+ */
+ if (!has_object_file(&obj->oid))
+ return;
+
+ show_object(obj, name, data);
+}
+
+static int option_parse_missing_action(const struct option *opt,
+ const char *arg, int unset)
+{
+ assert(arg);
+ assert(!unset);
+
+ if (!strcmp(arg, "error")) {
+ arg_missing_action = MA_ERROR;
+ fn_show_object = show_object;
+ return 0;
+ }
+
+ if (!strcmp(arg, "allow-any")) {
+ arg_missing_action = MA_ALLOW_ANY;
+ fn_show_object = show_object__ma_allow_any;
+ return 0;
+ }
+
+ die(_("invalid value for --missing"));
+ return 0;
+}
+
static void show_edge(struct commit *commit)
{
- add_preferred_base(commit->object.oid.hash);
+ add_preferred_base(&commit->object.oid);
}
struct in_pack_object {
@@ -2600,7 +2649,7 @@
memset(&in_pack, 0, sizeof(in_pack));
for (p = packed_git; p; p = p->next) {
- const unsigned char *sha1;
+ struct object_id oid;
struct object *o;
if (!p->pack_local || p->pack_keep)
@@ -2613,8 +2662,8 @@
in_pack.alloc);
for (i = 0; i < p->num_objects; i++) {
- sha1 = nth_packed_object_sha1(p, i);
- o = lookup_unknown_object(sha1);
+ nth_packed_object_oid(&oid, p, i);
+ o = lookup_unknown_object(oid.hash);
if (!(o->flags & OBJECT_ADDED))
mark_in_pack_object(o, p, &in_pack);
o->flags |= OBJECT_ADDED;
@@ -2625,7 +2674,7 @@
QSORT(in_pack.array, in_pack.nr, ofscmp);
for (i = 0; i < in_pack.nr; i++) {
struct object *o = in_pack.array[i].object;
- add_object_entry(o->oid.hash, o->type, "", 0);
+ add_object_entry(&o->oid, o->type, "", 0);
}
}
free(in_pack.array);
@@ -2641,7 +2690,7 @@
return 0;
}
- add_object_entry(oid->hash, type, "", 0);
+ add_object_entry(oid, type, "", 0);
return 0;
}
@@ -2657,7 +2706,7 @@
NULL, NULL, NULL);
}
-static int has_sha1_pack_kept_or_nonlocal(const unsigned char *sha1)
+static int has_sha1_pack_kept_or_nonlocal(const struct object_id *oid)
{
static struct packed_git *last_found = (void *)1;
struct packed_git *p;
@@ -2666,7 +2715,7 @@
while (p) {
if ((!p->pack_local || p->pack_keep) &&
- find_pack_entry_one(sha1, p)) {
+ find_pack_entry_one(oid->hash, p)) {
last_found = p;
return 1;
}
@@ -2717,7 +2766,7 @@
for (i = 0; i < p->num_objects; i++) {
nth_packed_object_oid(&oid, p, i);
if (!packlist_find(&to_pack, oid.hash, NULL) &&
- !has_sha1_pack_kept_or_nonlocal(oid.hash) &&
+ !has_sha1_pack_kept_or_nonlocal(&oid) &&
!loosened_object_can_be_discarded(&oid, p->mtime))
if (force_object_loose(oid.hash, p->mtime))
die("unable to force loose object");
@@ -2815,7 +2864,12 @@
if (prepare_revision_walk(&revs))
die("revision walk setup failed");
mark_edges_uninteresting(&revs, show_edge);
- traverse_commit_list(&revs, show_commit, show_object, NULL);
+
+ if (!fn_show_object)
+ fn_show_object = show_object;
+ traverse_commit_list_filtered(&filter_options, &revs,
+ show_commit, fn_show_object, NULL,
+ NULL);
if (unpack_unreachable_expiration) {
revs.ignore_missing_links = 1;
@@ -2951,6 +3005,10 @@
N_("use a bitmap index if available to speed up counting objects")),
OPT_BOOL(0, "write-bitmap-index", &write_bitmap_index,
N_("write a bitmap index together with the pack index")),
+ OPT_PARSE_LIST_OBJECTS_FILTER(&filter_options),
+ { OPTION_CALLBACK, 0, "missing", NULL, N_("action"),
+ N_("handling for missing objects"), PARSE_OPT_NONEG,
+ option_parse_missing_action },
OPT_END(),
};
@@ -3027,6 +3085,12 @@
if (!rev_list_all || !rev_list_reflog || !rev_list_index)
unpack_unreachable_expiration = 0;
+ if (filter_options.choice) {
+ if (!pack_to_stdout)
+ die("cannot use --filter without --stdout.");
+ use_bitmap_index = 0;
+ }
+
/*
* "soft" reasons not to use bitmaps - for on-disk repack by default we want
*
diff --git a/builtin/pack-redundant.c b/builtin/pack-redundant.c
index cb1df1c..aaa8136 100644
--- a/builtin/pack-redundant.c
+++ b/builtin/pack-redundant.c
@@ -7,6 +7,7 @@
*/
#include "builtin.h"
+#include "packfile.h"
#define BLKSIZE 512
diff --git a/builtin/prune-packed.c b/builtin/prune-packed.c
index ac978ad..4192381 100644
--- a/builtin/prune-packed.c
+++ b/builtin/prune-packed.c
@@ -2,6 +2,7 @@
#include "cache.h"
#include "progress.h"
#include "parse-options.h"
+#include "packfile.h"
static const char * const prune_packed_usage[] = {
N_("git prune-packed [-n | --dry-run] [-q | --quiet]"),
@@ -37,8 +38,7 @@
void prune_packed_objects(int opts)
{
if (opts & PRUNE_PACKED_VERBOSE)
- progress = start_progress_delay(_("Removing duplicate objects"),
- 256, 95, 2);
+ progress = start_delayed_progress(_("Removing duplicate objects"), 256);
for_each_loose_file_in_objdir(get_object_directory(),
prune_object, NULL, prune_subdir, &opts);
diff --git a/builtin/prune.c b/builtin/prune.c
index c378690..d2fdae6 100644
--- a/builtin/prune.c
+++ b/builtin/prune.c
@@ -8,7 +8,7 @@
#include "progress.h"
static const char * const prune_usage[] = {
- N_("git prune [-n] [-v] [--expire <time>] [--] [<head>...]"),
+ N_("git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"),
NULL
};
static int show_only;
@@ -138,7 +138,7 @@
if (show_progress == -1)
show_progress = isatty(2);
if (show_progress)
- progress = start_progress_delay(_("Checking connectivity"), 0, 0, 2);
+ progress = start_delayed_progress(_("Checking connectivity"), 0);
mark_reachable_objects(&revs, 1, expire, progress);
stop_progress(&progress);
diff --git a/builtin/pull.c b/builtin/pull.c
index 9b86e51..511dbbe 100644
--- a/builtin/pull.c
+++ b/builtin/pull.c
@@ -39,7 +39,7 @@
static enum rebase_type parse_config_rebase(const char *key, const char *value,
int fatal)
{
- int v = git_config_maybe_bool("pull.rebase", value);
+ int v = git_parse_maybe_bool(value);
if (!v)
return REBASE_FALSE;
@@ -86,6 +86,7 @@
static enum rebase_type opt_rebase = -1;
static char *opt_diffstat;
static char *opt_log;
+static char *opt_signoff;
static char *opt_squash;
static char *opt_commit;
static char *opt_edit;
@@ -112,6 +113,8 @@
static char *opt_unshallow;
static char *opt_update_shallow;
static char *opt_refmap;
+static char *opt_ipv4;
+static char *opt_ipv6;
static struct option pull_options[] = {
/* Shared options */
@@ -142,6 +145,9 @@
OPT_PASSTHRU(0, "log", &opt_log, N_("n"),
N_("add (at most <n>) entries from shortlog to merge commit message"),
PARSE_OPT_OPTARG),
+ OPT_PASSTHRU(0, "signoff", &opt_signoff, NULL,
+ N_("add Signed-off-by:"),
+ PARSE_OPT_OPTARG),
OPT_PASSTHRU(0, "squash", &opt_squash, NULL,
N_("create a single commit instead of doing a merge"),
PARSE_OPT_NOARG),
@@ -214,6 +220,12 @@
OPT_PASSTHRU(0, "refmap", &opt_refmap, N_("refmap"),
N_("specify fetch refmap"),
PARSE_OPT_NONEG),
+ OPT_PASSTHRU('4', "ipv4", &opt_ipv4, NULL,
+ N_("use IPv4 addresses only"),
+ PARSE_OPT_NOARG),
+ OPT_PASSTHRU('6', "ipv6", &opt_ipv6, NULL,
+ N_("use IPv6 addresses only"),
+ PARSE_OPT_NOARG),
OPT_END()
};
@@ -274,7 +286,7 @@
if (git_config_get_value("pull.ff", &value))
return NULL;
- switch (git_config_maybe_bool("pull.ff", value)) {
+ switch (git_parse_maybe_bool(value)) {
case 0:
return "--no-ff";
case 1:
@@ -325,6 +337,10 @@
if (!strcmp(var, "rebase.autostash")) {
config_autostash = git_config_bool(var, value);
return 0;
+ } else if (!strcmp(var, "submodule.recurse")) {
+ recurse_submodules = git_config_bool(var, value) ?
+ RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
+ return 0;
}
return git_default_config(var, value, cb);
}
@@ -514,6 +530,10 @@
argv_array_push(&args, opt_update_shallow);
if (opt_refmap)
argv_array_push(&args, opt_refmap);
+ if (opt_ipv4)
+ argv_array_push(&args, opt_ipv4);
+ if (opt_ipv6)
+ argv_array_push(&args, opt_ipv6);
if (repo) {
argv_array_push(&args, repo);
@@ -537,10 +557,10 @@
* index/worktree changes that the user already made on the unborn
* branch.
*/
- if (checkout_fast_forward(&empty_tree_oid, merge_head, 0))
+ if (checkout_fast_forward(the_hash_algo->empty_tree, merge_head, 0))
return 1;
- if (update_ref("initial pull", "HEAD", merge_head->hash, curr_head->hash, 0, UPDATE_REFS_DIE_ON_ERR))
+ if (update_ref("initial pull", "HEAD", merge_head, curr_head, 0, UPDATE_REFS_DIE_ON_ERR))
return 1;
return 0;
@@ -590,6 +610,8 @@
argv_array_push(&args, opt_diffstat);
if (opt_log)
argv_array_push(&args, opt_log);
+ if (opt_signoff)
+ argv_array_push(&args, opt_signoff);
if (opt_squash)
argv_array_push(&args, opt_squash);
if (opt_commit)
@@ -741,12 +763,15 @@
if (!is_null_oid(fork_point))
commit_list_insert(lookup_commit_reference(fork_point), &revs);
- result = reduce_heads(get_octopus_merge_bases(revs));
+ result = get_octopus_merge_bases(revs);
free_commit_list(revs);
+ reduce_heads_replace(&result);
+
if (!result)
return 1;
oidcpy(merge_base, &result->item->object.oid);
+ free_commit_list(result);
return 0;
}
@@ -815,6 +840,8 @@
if (!getenv("GIT_REFLOG_ACTION"))
set_reflog_message(argc, argv);
+ git_config(git_pull_config, NULL);
+
argc = parse_options(argc, argv, prefix, pull_options, pull_usage, 0);
parse_repo_refspecs(argc, argv, &repo, &refspecs);
@@ -825,8 +852,6 @@
if (opt_rebase < 0)
opt_rebase = config_get_rebase();
- git_config(git_pull_config, NULL);
-
if (read_cache_unmerged())
die_resolve_conflict("pull");
diff --git a/builtin/push.c b/builtin/push.c
index 03846e8..1c28427 100644
--- a/builtin/push.c
+++ b/builtin/push.c
@@ -32,6 +32,8 @@
static int refspec_nr;
static int refspec_alloc;
+static struct string_list push_options_config = STRING_LIST_INIT_DUP;
+
static void add_refspec(const char *ref)
{
refspec_nr++;
@@ -481,7 +483,7 @@
} else if (!strcmp(k, "push.gpgsign")) {
const char *value;
if (!git_config_get_value("push.gpgsign", &value)) {
- switch (git_config_maybe_bool("push.gpgsign", value)) {
+ switch (git_parse_maybe_bool(value)) {
case 0:
set_push_cert_flags(flags, SEND_PACK_PUSH_CERT_NEVER);
break;
@@ -503,6 +505,15 @@
int val = git_config_bool(k, v) ?
RECURSE_SUBMODULES_ON_DEMAND : RECURSE_SUBMODULES_OFF;
recurse_submodules = val;
+ } else if (!strcmp(k, "push.pushoption")) {
+ if (!v)
+ return config_error_nonbool(k);
+ else
+ if (!*v)
+ string_list_clear(&push_options_config, 0);
+ else
+ string_list_append(&push_options_config, v);
+ return 0;
}
return git_default_config(k, v, NULL);
@@ -515,7 +526,8 @@
int push_cert = -1;
int rc;
const char *repo = NULL; /* default repository */
- struct string_list push_options = STRING_LIST_INIT_DUP;
+ struct string_list push_options_cmdline = STRING_LIST_INIT_DUP;
+ struct string_list *push_options;
const struct string_list_item *item;
struct option options[] = {
@@ -551,7 +563,7 @@
0, "signed", &push_cert, "yes|no|if-asked", N_("GPG sign the push"),
PARSE_OPT_OPTARG, option_parse_push_signed },
OPT_BIT(0, "atomic", &flags, N_("request atomic transaction on remote side"), TRANSPORT_PUSH_ATOMIC),
- OPT_STRING_LIST('o', "push-option", &push_options, N_("server-specific"), N_("option to transmit")),
+ OPT_STRING_LIST('o', "push-option", &push_options_cmdline, N_("server-specific"), N_("option to transmit")),
OPT_SET_INT('4', "ipv4", &family, N_("use IPv4 addresses only"),
TRANSPORT_FAMILY_IPV4),
OPT_SET_INT('6', "ipv6", &family, N_("use IPv6 addresses only"),
@@ -562,6 +574,9 @@
packet_trace_identity("push");
git_config(git_push_config, &flags);
argc = parse_options(argc, argv, prefix, options, push_usage, 0);
+ push_options = (push_options_cmdline.nr
+ ? &push_options_cmdline
+ : &push_options_config);
set_push_cert_flags(&flags, push_cert);
if (deleterefs && (tags || (flags & (TRANSPORT_PUSH_ALL | TRANSPORT_PUSH_MIRROR))))
@@ -584,12 +599,13 @@
set_refspecs(argv + 1, argc - 1, repo);
}
- for_each_string_list_item(item, &push_options)
+ for_each_string_list_item(item, push_options)
if (strchr(item->string, '\n'))
die(_("push options must not have new line characters"));
- rc = do_push(repo, flags, &push_options);
- string_list_clear(&push_options, 0);
+ rc = do_push(repo, flags, push_options);
+ string_list_clear(&push_options_cmdline, 0);
+ string_list_clear(&push_options_config, 0);
if (rc == -1)
usage_with_options(push_usage, options);
else
diff --git a/builtin/read-tree.c b/builtin/read-tree.c
index d5f618d..bf87a27 100644
--- a/builtin/read-tree.c
+++ b/builtin/read-tree.c
@@ -164,8 +164,6 @@
argc = parse_options(argc, argv, unused_prefix, read_tree_options,
read_tree_usage, 0);
- load_submodule_cache();
-
hold_locked_index(&lock_file, LOCK_DIE_ON_ERROR);
prefix_set = opts.prefix ? 1 : 0;
diff --git a/builtin/rebase--helper.c b/builtin/rebase--helper.c
index c82b4dc..7daee54 100644
--- a/builtin/rebase--helper.c
+++ b/builtin/rebase--helper.c
@@ -12,19 +12,39 @@
int cmd_rebase__helper(int argc, const char **argv, const char *prefix)
{
struct replay_opts opts = REPLAY_OPTS_INIT;
+ unsigned flags = 0, keep_empty = 0;
+ int abbreviate_commands = 0;
enum {
- CONTINUE = 1, ABORT
+ CONTINUE = 1, ABORT, MAKE_SCRIPT, SHORTEN_OIDS, EXPAND_OIDS,
+ CHECK_TODO_LIST, SKIP_UNNECESSARY_PICKS, REARRANGE_SQUASH,
+ ADD_EXEC
} command = 0;
struct option options[] = {
OPT_BOOL(0, "ff", &opts.allow_ff, N_("allow fast-forward")),
+ OPT_BOOL(0, "keep-empty", &keep_empty, N_("keep empty commits")),
OPT_CMDMODE(0, "continue", &command, N_("continue rebase"),
CONTINUE),
OPT_CMDMODE(0, "abort", &command, N_("abort rebase"),
ABORT),
+ OPT_CMDMODE(0, "make-script", &command,
+ N_("make rebase script"), MAKE_SCRIPT),
+ OPT_CMDMODE(0, "shorten-ids", &command,
+ N_("shorten commit ids in the todo list"), SHORTEN_OIDS),
+ OPT_CMDMODE(0, "expand-ids", &command,
+ N_("expand commit ids in the todo list"), EXPAND_OIDS),
+ OPT_CMDMODE(0, "check-todo-list", &command,
+ N_("check the todo list"), CHECK_TODO_LIST),
+ OPT_CMDMODE(0, "skip-unnecessary-picks", &command,
+ N_("skip unnecessary picks"), SKIP_UNNECESSARY_PICKS),
+ OPT_CMDMODE(0, "rearrange-squash", &command,
+ N_("rearrange fixup/squash lines"), REARRANGE_SQUASH),
+ OPT_CMDMODE(0, "add-exec-commands", &command,
+ N_("insert exec commands in todo list"), ADD_EXEC),
OPT_END()
};
git_config(git_default_config, NULL);
+ git_config_get_bool("rebase.abbreviatecommands", &abbreviate_commands);
opts.action = REPLAY_INTERACTIVE_REBASE;
opts.allow_ff = 1;
@@ -33,9 +53,25 @@
argc = parse_options(argc, argv, NULL, options,
builtin_rebase_helper_usage, PARSE_OPT_KEEP_ARGV0);
+ flags |= keep_empty ? TODO_LIST_KEEP_EMPTY : 0;
+ flags |= abbreviate_commands ? TODO_LIST_ABBREVIATE_CMDS : 0;
+ flags |= command == SHORTEN_OIDS ? TODO_LIST_SHORTEN_IDS : 0;
+
if (command == CONTINUE && argc == 1)
return !!sequencer_continue(&opts);
if (command == ABORT && argc == 1)
return !!sequencer_remove_state(&opts);
+ if (command == MAKE_SCRIPT && argc > 1)
+ return !!sequencer_make_script(stdout, argc, argv, flags);
+ if ((command == SHORTEN_OIDS || command == EXPAND_OIDS) && argc == 1)
+ return !!transform_todos(flags);
+ if (command == CHECK_TODO_LIST && argc == 1)
+ return !!check_todo_list();
+ if (command == SKIP_UNNECESSARY_PICKS && argc == 1)
+ return !!skip_unnecessary_picks();
+ if (command == REARRANGE_SQUASH && argc == 1)
+ return !!rearrange_squash();
+ if (command == ADD_EXEC && argc == 2)
+ return !!sequencer_add_exec_commands(argv[1]);
usage_with_options(builtin_rebase_helper_usage, options);
}
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 01dea59..b7ce7c7 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -23,6 +23,8 @@
#include "fsck.h"
#include "tmp-objdir.h"
#include "oidset.h"
+#include "packfile.h"
+#include "protocol.h"
static const char * const receive_pack_usage[] = {
N_("git receive-pack <git-dir>"),
@@ -869,7 +871,7 @@
rp_error("%s", _(refuse_unconfigured_deny_delete_current_msg));
}
-static int command_singleton_iterator(void *cb_data, unsigned char sha1[20]);
+static int command_singleton_iterator(void *cb_data, struct object_id *oid);
static int update_shallow_ref(struct command *cmd, struct shallow_info *si)
{
static struct lock_file shallow_lock;
@@ -919,9 +921,9 @@
*/
static int head_has_history(void)
{
- unsigned char sha1[20];
+ struct object_id oid;
- return !get_sha1("HEAD", sha1);
+ return !get_oid("HEAD", &oid);
}
static const char *push_to_deploy(unsigned char *sha1,
@@ -1138,7 +1140,7 @@
}
if (ref_transaction_delete(transaction,
namespaced_name,
- old_oid->hash,
+ old_oid,
0, "push", &err)) {
rp_error("%s", err.buf);
strbuf_release(&err);
@@ -1155,7 +1157,7 @@
if (ref_transaction_update(transaction,
namespaced_name,
- new_oid->hash, old_oid->hash,
+ new_oid, old_oid,
0, "push",
&err)) {
rp_error("%s", err.buf);
@@ -1206,11 +1208,10 @@
const char *dst_name;
struct string_list_item *item;
struct command *dst_cmd;
- unsigned char sha1[GIT_MAX_RAWSZ];
int flag;
strbuf_addf(&buf, "%s%s", get_git_namespace(), cmd->ref_name);
- dst_name = resolve_ref_unsafe(buf.buf, 0, sha1, &flag);
+ dst_name = resolve_ref_unsafe(buf.buf, 0, NULL, &flag);
strbuf_release(&buf);
if (!(flag & REF_ISSYMREF))
@@ -1270,7 +1271,7 @@
string_list_clear(&ref_list, 0);
}
-static int command_singleton_iterator(void *cb_data, unsigned char sha1[20])
+static int command_singleton_iterator(void *cb_data, struct object_id *oid)
{
struct command **cmd_list = cb_data;
struct command *cmd = *cmd_list;
@@ -1278,7 +1279,7 @@
if (!cmd || is_null_oid(&cmd->new_oid))
return -1; /* end of list */
*cmd_list = NULL; /* this returns only one */
- hashcpy(sha1, cmd->new_oid.hash);
+ oidcpy(oid, &cmd->new_oid);
return 0;
}
@@ -1309,7 +1310,7 @@
struct shallow_info *si;
};
-static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20])
+static int iterate_receive_command_list(void *cb_data, struct object_id *oid)
{
struct iterate_data *data = cb_data;
struct command **cmd_list = &data->cmds;
@@ -1320,7 +1321,7 @@
/* to be checked in update_shallow_ref() */
continue;
if (!is_null_oid(&cmd->new_oid) && !cmd->skip_update) {
- hashcpy(sha1, cmd->new_oid.hash);
+ oidcpy(oid, &cmd->new_oid);
*cmd_list = cmd->next;
return 0;
}
@@ -1458,7 +1459,6 @@
{
struct check_connected_options opt = CHECK_CONNECTED_INIT;
struct command *cmd;
- struct object_id oid;
struct iterate_data data;
struct async muxer;
int err_fd = 0;
@@ -1515,7 +1515,7 @@
check_aliased_updates(commands);
free(head_name_to_free);
- head_name = head_name_to_free = resolve_refdup("HEAD", 0, oid.hash, NULL);
+ head_name = head_name_to_free = resolve_refdup("HEAD", 0, NULL, NULL);
if (use_atomic)
execute_commands_atomic(commands, si);
@@ -1962,6 +1962,22 @@
else if (0 <= receive_unpack_limit)
unpack_limit = receive_unpack_limit;
+ switch (determine_protocol_version_server()) {
+ case protocol_v1:
+ /*
+ * v1 is just the original protocol with a version string,
+ * so just fall through after writing the version string.
+ */
+ if (advertise_refs || !stateless_rpc)
+ packet_write_fmt(1, "version 1\n");
+
+ /* fallthrough */
+ case protocol_v0:
+ break;
+ case protocol_unknown_version:
+ BUG("unknown protocol version");
+ }
+
if (advertise_refs || !stateless_rpc) {
write_head_info();
}
diff --git a/builtin/reflog.c b/builtin/reflog.c
index e237d92..2233725 100644
--- a/builtin/reflog.c
+++ b/builtin/reflog.c
@@ -42,7 +42,7 @@
};
struct collected_reflog {
- unsigned char sha1[20];
+ struct object_id oid;
char reflog[FLEX_ARRAY];
};
@@ -126,7 +126,7 @@
struct commit *c;
struct commit_list *parent;
- c = (struct commit *)study.objects[--study.nr].item;
+ c = (struct commit *)object_array_pop(&study);
if (!c->object.parsed && !parse_object(&c->object.oid))
c->object.flags |= INCOMPLETE;
@@ -182,8 +182,8 @@
found.objects[i].item->flags |= SEEN;
}
/* free object arrays */
- free(study.objects);
- free(found.objects);
+ object_array_clear(&study);
+ object_array_clear(&found);
return !is_incomplete;
}
@@ -385,7 +385,7 @@
struct collect_reflog_cb *cb = cb_data;
FLEX_ALLOC_STR(e, reflog, ref);
- hashcpy(e->sha1, oid->hash);
+ oidcpy(&e->oid, oid);
ALLOC_GROW(cb->e, cb->nr + 1, cb->alloc);
cb->e[cb->nr++] = e;
return 0;
@@ -416,16 +416,6 @@
return ent;
}
-static int parse_expire_cfg_value(const char *var, const char *value, timestamp_t *expire)
-{
- if (!value)
- return config_error_nonbool(var);
- if (parse_expiry_date(value, expire))
- return error(_("'%s' for '%s' is not a valid timestamp"),
- value, var);
- return 0;
-}
-
/* expiry timer slot */
#define EXPIRE_TOTAL 01
#define EXPIRE_UNREACH 02
@@ -443,11 +433,11 @@
if (!strcmp(key, "reflogexpire")) {
slot = EXPIRE_TOTAL;
- if (parse_expire_cfg_value(var, value, &expire))
+ if (git_config_expiry_date(&expire, var, value))
return -1;
} else if (!strcmp(key, "reflogexpireunreachable")) {
slot = EXPIRE_UNREACH;
- if (parse_expire_cfg_value(var, value, &expire))
+ if (git_config_expiry_date(&expire, var, value))
return -1;
} else
return git_default_config(var, value, cb);
@@ -589,7 +579,7 @@
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, e->sha1, flags,
+ status |= reflog_expire(e->reflog, &e->oid, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
@@ -601,13 +591,13 @@
for (; i < argc; i++) {
char *ref;
- unsigned char sha1[20];
- if (!dwim_log(argv[i], strlen(argv[i]), sha1, &ref)) {
+ struct object_id oid;
+ if (!dwim_log(argv[i], strlen(argv[i]), &oid, &ref)) {
status |= error("%s points nowhere!", argv[i]);
continue;
}
set_reflog_expiry_param(&cb.cmd, explicit_expiry, ref);
- status |= reflog_expire(ref, sha1, flags,
+ status |= reflog_expire(ref, &oid, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
@@ -659,7 +649,7 @@
for ( ; i < argc; i++) {
const char *spec = strstr(argv[i], "@{");
- unsigned char sha1[20];
+ struct object_id oid;
char *ep, *ref;
int recno;
@@ -668,7 +658,7 @@
continue;
}
- if (!dwim_log(argv[i], spec - argv[i], sha1, &ref)) {
+ if (!dwim_log(argv[i], spec - argv[i], &oid, &ref)) {
status |= error("no reflog for '%s'", argv[i]);
continue;
}
@@ -683,7 +673,7 @@
cb.cmd.expire_total = 0;
}
- status |= reflog_expire(ref, sha1, flags,
+ status |= reflog_expire(ref, &oid, flags,
reflog_expiry_prepare,
should_expire_reflog_ent,
reflog_expiry_cleanup,
diff --git a/builtin/remote-ext.c b/builtin/remote-ext.c
index bfb21ba..6a9127a 100644
--- a/builtin/remote-ext.c
+++ b/builtin/remote-ext.c
@@ -57,7 +57,7 @@
special = str[rpos];
if (rpos == 1)
break;
- /* Fall-through to error. */
+ /* fallthrough */
default:
die("Bad remote-ext placeholder '%%%c'.",
str[rpos]);
diff --git a/builtin/remote.c b/builtin/remote.c
index 6273c0c..d95bf90 100644
--- a/builtin/remote.c
+++ b/builtin/remote.c
@@ -301,7 +301,7 @@
}
string_list_append(&info->merge, xstrdup(value));
} else {
- int v = git_config_maybe_bool(orig_key, value);
+ int v = git_parse_maybe_bool(value);
if (v >= 0)
info->rebase = v;
else if (!strcmp(value, "preserve"))
@@ -558,19 +558,19 @@
struct strbuf buf = STRBUF_INIT;
struct string_list_item *item;
int flag;
- struct object_id orig_oid;
const char *symref;
strbuf_addf(&buf, "refs/remotes/%s/", rename->old);
if (starts_with(refname, buf.buf)) {
item = string_list_append(rename->remote_branches, xstrdup(refname));
symref = resolve_ref_unsafe(refname, RESOLVE_REF_READING,
- orig_oid.hash, &flag);
- if (flag & REF_ISSYMREF)
+ NULL, &flag);
+ if (symref && (flag & REF_ISSYMREF))
item->util = xstrdup(symref);
else
item->util = NULL;
}
+ strbuf_release(&buf);
return 0;
}
@@ -595,6 +595,7 @@
unlink_or_warn(git_path("remotes/%s", remote->name));
else if (remote->origin == REMOTE_BRANCHES)
unlink_or_warn(git_path("branches/%s", remote->name));
+ strbuf_release(&buf);
return 0;
}
@@ -689,10 +690,10 @@
int flag = 0;
struct object_id oid;
- read_ref_full(item->string, RESOLVE_REF_READING, oid.hash, &flag);
+ read_ref_full(item->string, RESOLVE_REF_READING, &oid, &flag);
if (!(flag & REF_ISSYMREF))
continue;
- if (delete_ref(NULL, item->string, NULL, REF_NODEREF))
+ if (delete_ref(NULL, item->string, NULL, REF_NO_DEREF))
die(_("deleting '%s' failed"), item->string);
}
for (i = 0; i < remote_branches.nr; i++) {
@@ -787,7 +788,7 @@
strbuf_release(&buf);
if (!result)
- result = delete_refs("remote: remove", &branches, REF_NODEREF);
+ result = delete_refs("remote: remove", &branches, REF_NO_DEREF);
string_list_clear(&branches, 0);
if (skipped.nr) {
@@ -1254,7 +1255,7 @@
head_name = xstrdup(states.heads.items[0].string);
free_remote_ref_states(&states);
} else if (opt_d && !opt_a && argc == 1) {
- if (delete_ref(NULL, buf.buf, NULL, REF_NODEREF))
+ if (delete_ref(NULL, buf.buf, NULL, REF_NO_DEREF))
result |= error(_("Could not delete %s"), buf.buf);
} else
usage_with_options(builtin_remote_sethead_usage, options);
@@ -1563,9 +1564,7 @@
"^$", 0);
else
git_config_set(name_buf.buf, newurl);
- strbuf_release(&name_buf);
-
- return 0;
+ goto out;
}
/* Old URL specified. Demand that one matches. */
@@ -1588,6 +1587,8 @@
git_config_set_multivar(name_buf.buf, newurl, oldurl, 0);
else
git_config_set_multivar(name_buf.buf, NULL, oldurl, 1);
+out:
+ strbuf_release(&name_buf);
return 0;
}
diff --git a/builtin/replace.c b/builtin/replace.c
index fba336a..10078ae 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -50,7 +50,7 @@
struct object_id object;
enum object_type obj_type, repl_type;
- if (get_sha1(refname, object.hash))
+ if (get_oid(refname, &object))
return error("Failed to resolve '%s' as a valid ref.", refname);
obj_type = sha1_object_info(object.hash, NULL);
@@ -113,7 +113,7 @@
strbuf_addstr(&ref, oid_to_hex(&oid));
full_hex = ref.buf + base_len;
- if (read_ref(ref.buf, oid.hash)) {
+ if (read_ref(ref.buf, &oid)) {
error("replace ref '%s' not found.", full_hex);
had_error = 1;
continue;
@@ -128,7 +128,7 @@
static int delete_replace_ref(const char *name, const char *ref,
const struct object_id *oid)
{
- if (delete_ref(NULL, ref, oid->hash, 0))
+ if (delete_ref(NULL, ref, oid, 0))
return 1;
printf("Deleted replace ref '%s'\n", name);
return 0;
@@ -144,7 +144,7 @@
if (check_refname_format(ref->buf, 0))
die("'%s' is not a valid ref name.", ref->buf);
- if (read_ref(ref->buf, prev->hash))
+ if (read_ref(ref->buf, prev))
oidclr(prev);
else if (!force)
die("replace ref '%s' already exists", ref->buf);
@@ -175,7 +175,7 @@
transaction = ref_transaction_begin(&err);
if (!transaction ||
- ref_transaction_update(transaction, ref.buf, repl->hash, prev.hash,
+ ref_transaction_update(transaction, ref.buf, repl, &prev,
0, NULL, &err) ||
ref_transaction_commit(transaction, &err))
die("%s", err.buf);
@@ -269,7 +269,7 @@
if (fstat(fd, &st) < 0)
die_errno("unable to fstat %s", filename);
- if (index_fd(oid->hash, fd, &st, type, NULL, flags) < 0)
+ if (index_fd(oid, fd, &st, type, NULL, flags) < 0)
die("unable to write object to database");
/* index_fd close()s fd for us */
}
@@ -365,7 +365,7 @@
/* iterate over new parents */
for (i = 1; i < mergetag_data->argc; i++) {
struct object_id oid;
- if (get_sha1(mergetag_data->argv[i], oid.hash) < 0)
+ if (get_oid(mergetag_data->argv[i], &oid) < 0)
die(_("Not a valid object name: '%s'"), mergetag_data->argv[i]);
if (!oidcmp(&tag->tagged->oid, &oid))
return; /* found */
diff --git a/builtin/reset.c b/builtin/reset.c
index 7aeaea2..e15f595 100644
--- a/builtin/reset.c
+++ b/builtin/reset.c
@@ -12,7 +12,7 @@
#include "lockfile.h"
#include "tag.h"
#include "object.h"
-#include "commit.h"
+#include "pretty.h"
#include "run-command.h"
#include "refs.h"
#include "diff.h"
@@ -44,10 +44,11 @@
static int reset_index(const struct object_id *oid, int reset_type, int quiet)
{
- int nr = 1;
+ int i, nr = 0;
struct tree_desc desc[2];
struct tree *tree;
struct unpack_trees_options opts;
+ int ret = -1;
memset(&opts, 0, sizeof(opts));
opts.head_idx = 1;
@@ -75,23 +76,32 @@
struct object_id head_oid;
if (get_oid("HEAD", &head_oid))
return error(_("You do not have a valid HEAD."));
- if (!fill_tree_descriptor(desc, head_oid.hash))
+ if (!fill_tree_descriptor(desc + nr, &head_oid))
return error(_("Failed to find tree of HEAD."));
nr++;
opts.fn = twoway_merge;
}
- if (!fill_tree_descriptor(desc + nr - 1, oid->hash))
- return error(_("Failed to find tree of %s."), oid_to_hex(oid));
+ if (!fill_tree_descriptor(desc + nr, oid)) {
+ error(_("Failed to find tree of %s."), oid_to_hex(oid));
+ goto out;
+ }
+ nr++;
+
if (unpack_trees(nr, desc, &opts))
- return -1;
+ goto out;
if (reset_type == MIXED || reset_type == HARD) {
tree = parse_tree_indirect(oid);
prime_cache_tree(&the_index, tree);
}
- return 0;
+ ret = 0;
+
+out:
+ for (i = 0; i < nr; i++)
+ free((void *)desc[i].buffer);
+ return ret;
}
static void print_new_head_line(struct commit *commit)
@@ -156,6 +166,7 @@
opt.output_format = DIFF_FORMAT_CALLBACK;
opt.format_callback = update_index_from_diff;
opt.format_callback_data = &intent_to_add;
+ opt.flags.override_submodule_config = 1;
if (do_diff_cache(tree_oid, &opt))
return 1;
@@ -219,8 +230,8 @@
* has to be unambiguous. If there is a single argument, it
* can not be a tree
*/
- else if ((!argv[1] && !get_sha1_committish(argv[0], unused.hash)) ||
- (argv[1] && !get_sha1_treeish(argv[0], unused.hash))) {
+ else if ((!argv[1] && !get_oid_committish(argv[0], &unused)) ||
+ (argv[1] && !get_oid_treeish(argv[0], &unused))) {
/*
* Ok, argv[0] looks like a commit/tree; it should not
* be a filename.
@@ -255,12 +266,12 @@
if (!get_oid("HEAD", &oid_orig)) {
orig = &oid_orig;
set_reflog_message(&msg, "updating ORIG_HEAD", NULL);
- update_ref_oid(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
+ update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0,
UPDATE_REFS_MSG_ON_ERR);
} else if (old_orig)
- delete_ref(NULL, "ORIG_HEAD", old_orig->hash, 0);
+ delete_ref(NULL, "ORIG_HEAD", old_orig, 0);
set_reflog_message(&msg, "updating HEAD", rev);
- update_ref_status = update_ref_oid(msg.buf, "HEAD", oid, orig, 0,
+ update_ref_status = update_ref(msg.buf, "HEAD", oid, orig, 0,
UPDATE_REFS_MSG_ON_ERR);
strbuf_release(&msg);
return update_ref_status;
@@ -308,15 +319,13 @@
PARSE_OPT_KEEP_DASHDASH);
parse_args(&pathspec, argv, prefix, patch_mode, &rev);
- load_submodule_cache();
-
- unborn = !strcmp(rev, "HEAD") && get_sha1("HEAD", oid.hash);
+ unborn = !strcmp(rev, "HEAD") && get_oid("HEAD", &oid);
if (unborn) {
/* reset on unborn branch: treat as reset to empty tree */
hashcpy(oid.hash, EMPTY_TREE_SHA1_BIN);
} else if (!pathspec.nr) {
struct commit *commit;
- if (get_sha1_committish(rev, oid.hash))
+ if (get_oid_committish(rev, &oid))
die(_("Failed to resolve '%s' as a valid revision."), rev);
commit = lookup_commit_reference(&oid);
if (!commit)
@@ -324,7 +333,7 @@
oidcpy(&oid, &commit->object.oid);
} else {
struct tree *tree;
- if (get_sha1_treeish(rev, oid.hash))
+ if (get_oid_treeish(rev, &oid))
die(_("Failed to resolve '%s' as a valid tree."), rev);
tree = parse_tree_indirect(&oid);
if (!tree)
@@ -368,8 +377,8 @@
die_if_unmerged_cache(reset_type);
if (reset_type != SOFT) {
- struct lock_file *lock = xcalloc(1, sizeof(*lock));
- hold_locked_index(lock, LOCK_DIE_ON_ERROR);
+ struct lock_file lock = LOCK_INIT;
+ hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
if (reset_type == MIXED) {
int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN;
if (read_from_tree(&pathspec, &oid, intent_to_add))
@@ -385,7 +394,7 @@
die(_("Could not reset index file to revision '%s'."), rev);
}
- if (write_locked_index(&the_index, lock, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock, COMMIT_LOCK))
die(_("Could not write new index file."));
}
diff --git a/builtin/rev-list.c b/builtin/rev-list.c
index 95b4128..d5345b6 100644
--- a/builtin/rev-list.c
+++ b/builtin/rev-list.c
@@ -4,6 +4,8 @@
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
+#include "list-objects-filter.h"
+#include "list-objects-filter-options.h"
#include "pack.h"
#include "pack-bitmap.h"
#include "builtin.h"
@@ -12,6 +14,7 @@
#include "bisect.h"
#include "progress.h"
#include "reflog-walk.h"
+#include "oidset.h"
static const char rev_list_usage[] =
"git rev-list [OPTION] <commit-id>... [ -- paths... ]\n"
@@ -55,6 +58,20 @@
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 */
+
+static struct oidset missing_objects;
+enum missing_action {
+ MA_ERROR = 0, /* fail if any missing objects are encountered */
+ MA_ALLOW_ANY, /* silently allow ALL missing objects */
+ MA_PRINT, /* print ALL missing objects in special section */
+};
+static enum missing_action arg_missing_action;
+
+#define DEFAULT_OIDSET_SIZE (16*1024)
+
static void finish_commit(struct commit *commit, void *data);
static void show_commit(struct commit *commit, void *data)
{
@@ -178,11 +195,31 @@
free_commit_buffer(commit);
}
+static inline void finish_object__ma(struct object *obj)
+{
+ switch (arg_missing_action) {
+ case MA_ERROR:
+ die("missing blob object '%s'", oid_to_hex(&obj->oid));
+ return;
+
+ case MA_ALLOW_ANY:
+ return;
+
+ case MA_PRINT:
+ oidset_insert(&missing_objects, &obj->oid);
+ return;
+
+ default:
+ BUG("unhandled missing_action");
+ return;
+ }
+}
+
static void finish_object(struct object *obj, const char *name, void *cb_data)
{
struct rev_list_info *info = cb_data;
if (obj->type == OBJ_BLOB && !has_object_file(&obj->oid))
- die("missing blob object '%s'", oid_to_hex(&obj->oid));
+ finish_object__ma(obj);
if (info->revs->verify_objects && !obj->parsed && obj->type != OBJ_COMMIT)
parse_object(&obj->oid);
}
@@ -258,17 +295,37 @@
}
static int show_object_fast(
- const unsigned char *sha1,
+ const struct object_id *oid,
enum object_type type,
int exclude,
uint32_t name_hash,
struct packed_git *found_pack,
off_t found_offset)
{
- fprintf(stdout, "%s\n", sha1_to_hex(sha1));
+ fprintf(stdout, "%s\n", oid_to_hex(oid));
return 1;
}
+static inline int parse_missing_action_value(const char *value)
+{
+ if (!strcmp(value, "error")) {
+ arg_missing_action = MA_ERROR;
+ return 1;
+ }
+
+ if (!strcmp(value, "allow-any")) {
+ arg_missing_action = MA_ALLOW_ANY;
+ return 1;
+ }
+
+ if (!strcmp(value, "print")) {
+ arg_missing_action = MA_PRINT;
+ return 1;
+ }
+
+ return 0;
+}
+
int cmd_rev_list(int argc, const char **argv, const char *prefix)
{
struct rev_info revs;
@@ -294,7 +351,7 @@
if (revs.bisect)
bisect_list = 1;
- if (DIFF_OPT_TST(&revs.diffopt, QUICK))
+ if (revs.diffopt.flags.quick)
info.flags |= REV_LIST_QUIET;
for (i = 1 ; i < argc; i++) {
const char *arg = argv[i];
@@ -335,6 +392,30 @@
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"));
+ if (filter_options.choice == LOFC_SPARSE_OID &&
+ !filter_options.sparse_oid_value)
+ die(_("invalid sparse value '%s'"),
+ filter_options.filter_spec);
+ continue;
+ }
+ if (!strcmp(arg, ("--no-" CL_ARG__FILTER))) {
+ list_objects_filter_release(&filter_options);
+ continue;
+ }
+ if (!strcmp(arg, "--filter-print-omitted")) {
+ arg_print_omitted = 1;
+ continue;
+ }
+
+ if (skip_prefix(arg, "--missing=", &arg) &&
+ parse_missing_action_value(arg))
+ continue;
+
usage(rev_list_usage);
}
@@ -360,6 +441,9 @@
if (revs.show_notes)
die(_("rev-list does not support display of notes"));
+ if (filter_options.choice && use_bitmap_index)
+ die(_("cannot combine --use-bitmap-index with object filtering"));
+
save_commit_buffer = (revs.verbose_header ||
revs.grep_filter.pattern_list ||
revs.grep_filter.header_list);
@@ -367,7 +451,7 @@
revs.limited = 1;
if (show_progress)
- progress = start_progress_delay(show_progress, 0, 0, 2);
+ progress = start_delayed_progress(show_progress, 0);
if (use_bitmap_index && !revs.prune) {
if (revs.count && !revs.left_right && !revs.cherry_mark) {
@@ -397,14 +481,37 @@
if (bisect_list) {
int reaches = reaches, all = all;
- revs.commits = find_bisection(revs.commits, &reaches, &all,
- bisect_find_all);
+ find_bisection(&revs.commits, &reaches, &all, bisect_find_all);
if (bisect_show_vars)
return show_bisect_vars(&info, reaches, all);
}
- traverse_commit_list(&revs, show_commit, show_object, &info);
+ if (arg_print_omitted)
+ oidset_init(&omitted_objects, DEFAULT_OIDSET_SIZE);
+ if (arg_missing_action == MA_PRINT)
+ oidset_init(&missing_objects, DEFAULT_OIDSET_SIZE);
+
+ traverse_commit_list_filtered(
+ &filter_options, &revs, show_commit, show_object, &info,
+ (arg_print_omitted ? &omitted_objects : NULL));
+
+ if (arg_print_omitted) {
+ struct oidset_iter iter;
+ struct object_id *oid;
+ oidset_iter_init(&omitted_objects, &iter);
+ while ((oid = oidset_iter_next(&iter)))
+ printf("~%s\n", oid_to_hex(oid));
+ oidset_clear(&omitted_objects);
+ }
+ if (arg_missing_action == MA_PRINT) {
+ struct oidset_iter iter;
+ struct object_id *oid;
+ oidset_iter_init(&missing_objects, &iter);
+ while ((oid = oidset_iter_next(&iter)))
+ printf("?%s\n", oid_to_hex(oid));
+ oidset_clear(&missing_objects);
+ }
stop_progress(&progress);
diff --git a/builtin/rev-parse.c b/builtin/rev-parse.c
index 7f965fe..74aa644 100644
--- a/builtin/rev-parse.c
+++ b/builtin/rev-parse.c
@@ -133,7 +133,7 @@
struct object_id discard;
char *full;
- switch (dwim_ref(name, strlen(name), discard.hash, &full)) {
+ switch (dwim_ref(name, strlen(name), &discard, &full)) {
case 0:
/*
* Not found -- not a ref. We could
@@ -274,7 +274,7 @@
return 0;
}
- if (!get_sha1_committish(this, oid.hash) && !get_sha1_committish(next, end.hash)) {
+ if (!get_oid_committish(this, &oid) && !get_oid_committish(next, &end)) {
show_rev(NORMAL, &end, next);
show_rev(symmetric ? NORMAL : REVERSED, &oid, this);
if (symmetric) {
@@ -328,7 +328,7 @@
return 0;
*dotdot = 0;
- if (get_sha1_committish(arg, oid.hash)) {
+ if (get_oid_committish(arg, &oid)) {
*dotdot = '^';
return 0;
}
@@ -387,6 +387,14 @@
return s;
}
+static char *findspace(const char *s)
+{
+ for (; *s; s++)
+ if (isspace(*s))
+ return (char*)s;
+ return NULL;
+}
+
static int cmd_parseopt(int argc, const char **argv, const char *prefix)
{
static int keep_dashdash = 0, stop_at_non_option = 0;
@@ -434,7 +442,7 @@
/* parse: (<short>|<short>,<long>|<long>)[*=?!]*<arghint>? SP+ <help> */
while (strbuf_getline(&sb, stdin) != EOF) {
const char *s;
- const char *help;
+ char *help;
struct option *o;
if (!sb.len)
@@ -444,15 +452,17 @@
memset(opts + onb, 0, sizeof(opts[onb]));
o = &opts[onb++];
- help = strchr(sb.buf, ' ');
- if (!help || *sb.buf == ' ') {
+ help = findspace(sb.buf);
+ if (!help || sb.buf == help) {
o->type = OPTION_GROUP;
o->help = xstrdup(skipspaces(sb.buf));
continue;
}
+ *help = '\0';
+
o->type = OPTION_CALLBACK;
- o->help = xstrdup(skipspaces(help));
+ o->help = xstrdup(skipspaces(help+1));
o->value = &parsed;
o->flags = PARSE_OPT_NOARG;
o->callback = &parseopt_dump;
@@ -702,7 +712,7 @@
}
if (!strcmp(arg, "--quiet") || !strcmp(arg, "-q")) {
quiet = 1;
- flags |= GET_SHA1_QUIETLY;
+ flags |= GET_OID_QUIETLY;
continue;
}
if (opt_with_value(arg, "--short", &arg)) {
@@ -868,6 +878,11 @@
: "false");
continue;
}
+ if (!strcmp(arg, "--is-shallow-repository")) {
+ printf("%s\n", is_repository_shallow() ? "true"
+ : "false");
+ continue;
+ }
if (!strcmp(arg, "--shared-index-path")) {
if (read_cache() < 0)
die(_("Could not read the index"));
@@ -911,7 +926,7 @@
name++;
type = REVERSED;
}
- if (!get_sha1_with_context(name, flags, oid.hash, &unused)) {
+ if (!get_oid_with_context(name, flags, &oid, &unused)) {
if (verify)
revs_count++;
else
diff --git a/builtin/rm.c b/builtin/rm.c
index 52826d1..4a2fcca 100644
--- a/builtin/rm.c
+++ b/builtin/rm.c
@@ -255,7 +255,6 @@
struct pathspec pathspec;
char *seen;
- gitmodules_config();
git_config(git_default_config, NULL);
argc = parse_options(argc, argv, prefix, builtin_rm_options,
@@ -286,7 +285,7 @@
list.entry[list.nr].name = xstrdup(ce->name);
list.entry[list.nr].is_submodule = S_ISGITLINK(ce->ce_mode);
if (list.entry[list.nr++].is_submodule &&
- !is_staging_gitmodules_ok())
+ !is_staging_gitmodules_ok(&the_index))
die (_("Please stage your changes to .gitmodules or stash them to proceed"));
}
@@ -383,7 +382,7 @@
}
strbuf_release(&buf);
if (gitmodules_modified)
- stage_updated_gitmodules();
+ stage_updated_gitmodules(&the_index);
}
if (active_cache_changed) {
diff --git a/builtin/send-pack.c b/builtin/send-pack.c
index 633e0c3..fc4f0bb 100644
--- a/builtin/send-pack.c
+++ b/builtin/send-pack.c
@@ -105,7 +105,7 @@
if (!strcmp(k, "push.gpgsign")) {
const char *value;
if (!git_config_get_value("push.gpgsign", &value)) {
- switch (git_config_maybe_bool("push.gpgsign", value)) {
+ switch (git_parse_maybe_bool(value)) {
case 0:
args.push_cert = SEND_PACK_PUSH_CERT_NEVER;
break;
diff --git a/builtin/shortlog.c b/builtin/shortlog.c
index 43c4799..e29875b 100644
--- a/builtin/shortlog.c
+++ b/builtin/shortlog.c
@@ -52,26 +52,8 @@
const char *oneline)
{
struct string_list_item *item;
- const char *mailbuf, *namebuf;
- size_t namelen, maillen;
- struct strbuf namemailbuf = STRBUF_INIT;
- struct ident_split ident;
- if (split_ident_line(&ident, author, strlen(author)))
- return;
-
- namebuf = ident.name_begin;
- mailbuf = ident.mail_begin;
- namelen = ident.name_end - ident.name_begin;
- maillen = ident.mail_end - ident.mail_begin;
-
- map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
- strbuf_add(&namemailbuf, namebuf, namelen);
-
- if (log->email)
- strbuf_addf(&namemailbuf, " <%.*s>", (int)maillen, mailbuf);
-
- item = string_list_insert(&log->list, namemailbuf.buf);
+ item = string_list_insert(&log->list, author);
if (log->summary)
item->util = (void *)(UTIL_TO_INT(item) + 1);
@@ -114,9 +96,33 @@
}
}
+static int parse_stdin_author(struct shortlog *log,
+ struct strbuf *out, const char *in)
+{
+ const char *mailbuf, *namebuf;
+ size_t namelen, maillen;
+ struct ident_split ident;
+
+ if (split_ident_line(&ident, in, strlen(in)))
+ return -1;
+
+ namebuf = ident.name_begin;
+ mailbuf = ident.mail_begin;
+ namelen = ident.name_end - ident.name_begin;
+ maillen = ident.mail_end - ident.mail_begin;
+
+ map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen);
+ strbuf_add(out, namebuf, namelen);
+ if (log->email)
+ strbuf_addf(out, " <%.*s>", (int)maillen, mailbuf);
+
+ return 0;
+}
+
static void read_from_stdin(struct shortlog *log)
{
struct strbuf author = STRBUF_INIT;
+ struct strbuf mapped_author = STRBUF_INIT;
struct strbuf oneline = STRBUF_INIT;
static const char *author_match[2] = { "Author: ", "author " };
static const char *committer_match[2] = { "Commit: ", "committer " };
@@ -134,9 +140,15 @@
while (strbuf_getline_lf(&oneline, stdin) != EOF &&
!oneline.len)
; /* discard blanks */
- insert_one_record(log, v, oneline.buf);
+
+ strbuf_reset(&mapped_author);
+ if (parse_stdin_author(log, &mapped_author, v) < 0)
+ continue;
+
+ insert_one_record(log, mapped_author.buf, oneline.buf);
}
strbuf_release(&author);
+ strbuf_release(&mapped_author);
strbuf_release(&oneline);
}
@@ -153,7 +165,9 @@
ctx.date_mode.type = DATE_NORMAL;
ctx.output_encoding = get_log_output_encoding();
- fmt = log->committer ? "%cn <%ce>" : "%an <%ae>";
+ fmt = log->committer ?
+ (log->email ? "%cN <%cE>" : "%cN") :
+ (log->email ? "%aN <%aE>" : "%aN");
format_commit_message(commit, fmt, &author, &ctx);
if (!log->summary) {
diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 7073a3e..e8a4aa4 100644
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -1,6 +1,6 @@
#include "cache.h"
#include "config.h"
-#include "commit.h"
+#include "pretty.h"
#include "refs.h"
#include "builtin.h"
#include "color.h"
@@ -393,7 +393,7 @@
/* If both heads/foo and tags/foo exists, get_sha1 would
* get confused.
*/
- if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
+ if (get_oid(refname + ofs, &tmp) || oidcmp(&tmp, oid))
ofs = 5;
return append_ref(refname + ofs, oid, 0);
}
@@ -408,7 +408,7 @@
/* If both heads/foo and tags/foo exists, get_sha1 would
* get confused.
*/
- if (get_sha1(refname + ofs, tmp.hash) || oidcmp(&tmp, oid))
+ if (get_oid(refname + ofs, &tmp) || oidcmp(&tmp, oid))
ofs = 5;
return append_ref(refname + ofs, oid, 0);
}
@@ -514,7 +514,7 @@
static void append_one_rev(const char *av)
{
struct object_id revkey;
- if (!get_sha1(av, revkey.hash)) {
+ if (!get_oid(av, &revkey)) {
append_ref(av, &revkey, 0);
return;
}
@@ -705,8 +705,8 @@
static const char *fake_av[2];
fake_av[0] = resolve_refdup("HEAD",
- RESOLVE_REF_READING,
- oid.hash, NULL);
+ RESOLVE_REF_READING, &oid,
+ NULL);
fake_av[1] = NULL;
av = fake_av;
ac = 1;
@@ -720,7 +720,7 @@
die(Q_("only %d entry can be shown at one time.",
"only %d entries can be shown at one time.",
MAX_REVS), MAX_REVS);
- if (!dwim_ref(*av, strlen(*av), oid.hash, &ref))
+ if (!dwim_ref(*av, strlen(*av), &oid, &ref))
die(_("no such ref %s"), *av);
/* Has the base been specified? */
@@ -731,7 +731,7 @@
/* Ah, that is a date spec... */
timestamp_t at;
at = approxidate(reflog_base);
- read_ref_at(ref, flags, at, -1, oid.hash, NULL,
+ read_ref_at(ref, flags, at, -1, &oid, NULL,
NULL, NULL, &base);
}
}
@@ -743,7 +743,7 @@
timestamp_t timestamp;
int tz;
- if (read_ref_at(ref, flags, 0, base+i, oid.hash, &logmsg,
+ if (read_ref_at(ref, flags, 0, base + i, &oid, &logmsg,
×tamp, &tz, NULL)) {
reflog = i;
break;
@@ -775,7 +775,7 @@
}
head = resolve_refdup("HEAD", RESOLVE_REF_READING,
- head_oid.hash, NULL);
+ &head_oid, NULL);
if (with_current_branch && head) {
int has_head = 0;
@@ -808,7 +808,7 @@
die(Q_("cannot handle more than %d rev.",
"cannot handle more than %d revs.",
MAX_REVS), MAX_REVS);
- if (get_sha1(ref_name[num_rev], revkey.hash))
+ if (get_oid(ref_name[num_rev], &revkey))
die(_("'%s' is not a valid ref."), ref_name[num_rev]);
commit = lookup_commit_reference(&revkey);
if (!commit)
diff --git a/builtin/show-ref.c b/builtin/show-ref.c
index 013d241..41e5e71 100644
--- a/builtin/show-ref.c
+++ b/builtin/show-ref.c
@@ -38,7 +38,7 @@
if (!deref_tags)
return;
- if (!peel_ref(refname, peeled.hash)) {
+ if (!peel_ref(refname, &peeled)) {
hex = find_unique_abbrev(peeled.hash, abbrev);
printf("%s %s^{}\n", hex, refname);
}
@@ -197,7 +197,7 @@
struct object_id oid;
if ((starts_with(*pattern, "refs/") || !strcmp(*pattern, "HEAD")) &&
- !read_ref(*pattern, oid.hash)) {
+ !read_ref(*pattern, &oid)) {
show_one(*pattern, &oid);
}
else if (!quiet)
diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
index 895555c..a5c4a8a 100644
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@ -13,13 +13,22 @@
#include "remote.h"
#include "refs.h"
#include "connect.h"
+#include "revision.h"
+#include "diffcore.h"
+#include "diff.h"
+
+#define OPT_QUIET (1 << 0)
+#define OPT_CACHED (1 << 1)
+#define OPT_RECURSIVE (1 << 2)
+
+typedef void (*each_submodule_fn)(const struct cache_entry *list_item,
+ void *cb_data);
static char *get_default_remote(void)
{
char *dest = NULL, *ret;
- unsigned char sha1[20];
struct strbuf sb = STRBUF_INIT;
- const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+ const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
if (!refname)
die(_("No such ref: %s"), "HEAD");
@@ -220,6 +229,64 @@
return 0;
}
+/* 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();
+
+ if (prefix && super_prefix) {
+ BUG("cannot have prefix '%s' and superprefix '%s'",
+ prefix, super_prefix);
+ } else if (prefix) {
+ struct strbuf sb = STRBUF_INIT;
+ char *displaypath = xstrdup(relative_path(path, prefix, &sb));
+ strbuf_release(&sb);
+ return displaypath;
+ } else if (super_prefix) {
+ return xstrfmt("%s%s", super_prefix, path);
+ } else {
+ return xstrdup(path);
+ }
+}
+
+static char *compute_rev_name(const char *sub_path, const char* object_id)
+{
+ struct strbuf sb = STRBUF_INIT;
+ const char ***d;
+
+ static const char *describe_bare[] = { NULL };
+
+ static const char *describe_tags[] = { "--tags", NULL };
+
+ static const char *describe_contains[] = { "--contains", NULL };
+
+ static const char *describe_all_always[] = { "--all", "--always", NULL };
+
+ static const char **describe_argv[] = { describe_bare, describe_tags,
+ describe_contains,
+ describe_all_always, NULL };
+
+ for (d = describe_argv; *d; d++) {
+ struct child_process cp = CHILD_PROCESS_INIT;
+ prepare_submodule_repo_env(&cp.env_array);
+ cp.dir = sub_path;
+ cp.git_cmd = 1;
+ cp.no_stderr = 1;
+
+ argv_array_push(&cp.args, "describe");
+ argv_array_pushv(&cp.args, *d);
+ argv_array_push(&cp.args, object_id);
+
+ if (!capture_command(&cp, &sb, 0)) {
+ strbuf_strip_suffix(&sb, "\n");
+ return strbuf_detach(&sb, NULL);
+ }
+ }
+
+ strbuf_release(&sb);
+ return NULL;
+}
+
struct module_list {
const struct cache_entry **entries;
int alloc, nr;
@@ -275,8 +342,6 @@
int i;
struct module_list active_modules = MODULE_LIST_INIT;
- gitmodules_config();
-
for (i = 0; i < list->nr; i++) {
const struct cache_entry *ce = list->entries[i];
@@ -331,26 +396,31 @@
return 0;
}
-static void init_submodule(const char *path, const char *prefix, int quiet)
+static void for_each_listed_submodule(const struct module_list *list,
+ each_submodule_fn fn, void *cb_data)
+{
+ int i;
+ for (i = 0; i < list->nr; i++)
+ fn(list->entries[i], cb_data);
+}
+
+struct init_cb {
+ const char *prefix;
+ unsigned int flags;
+};
+
+#define INIT_CB_INIT { NULL, 0 }
+
+static void init_submodule(const char *path, const char *prefix,
+ unsigned int flags)
{
const struct submodule *sub;
struct strbuf sb = STRBUF_INIT;
char *upd = NULL, *url = NULL, *displaypath;
- /* Only loads from .gitmodules, no overlay with .git/config */
- gitmodules_config();
+ displaypath = get_submodule_displaypath(path, prefix);
- if (prefix && get_super_prefix())
- die("BUG: cannot have prefix and superprefix");
- else if (prefix)
- displaypath = xstrdup(relative_path(path, prefix, &sb));
- else if (get_super_prefix()) {
- strbuf_addf(&sb, "%s%s", get_super_prefix(), path);
- displaypath = strbuf_detach(&sb, NULL);
- } else
- displaypath = xstrdup(path);
-
- sub = submodule_from_path(null_sha1, path);
+ sub = submodule_from_path(&null_oid, path);
if (!sub)
die(_("No url found for submodule path '%s' in .gitmodules"),
@@ -363,9 +433,9 @@
* Set active flag for the submodule being initialized
*/
if (!is_submodule_active(the_repository, path)) {
- strbuf_reset(&sb);
strbuf_addf(&sb, "submodule.%s.active", sub->name);
git_config_set_gently(sb.buf, "true");
+ strbuf_reset(&sb);
}
/*
@@ -373,7 +443,6 @@
* To look up the url in .git/config, we must not fall back to
* .gitmodules, so look it up directly.
*/
- strbuf_reset(&sb);
strbuf_addf(&sb, "submodule.%s.url", sub->name);
if (git_config_get_string(sb.buf, &url)) {
if (!sub->url)
@@ -405,14 +474,14 @@
if (git_config_set_gently(sb.buf, url))
die(_("Failed to register url for submodule path '%s'"),
displaypath);
- if (!quiet)
+ if (!(flags & OPT_QUIET))
fprintf(stderr,
_("Submodule '%s' (%s) registered for path '%s'\n"),
sub->name, url, displaypath);
}
+ strbuf_reset(&sb);
/* Copy "update" setting when it is not set yet */
- strbuf_reset(&sb);
strbuf_addf(&sb, "submodule.%s.update", sub->name);
if (git_config_get_string(sb.buf, &upd) &&
sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
@@ -432,12 +501,18 @@
free(upd);
}
+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);
+}
+
static int module_init(int argc, const char **argv, const char *prefix)
{
+ struct init_cb info = INIT_CB_INIT;
struct pathspec pathspec;
struct module_list list = MODULE_LIST_INIT;
int quiet = 0;
- int i;
struct option module_init_options[] = {
OPT__QUIET(&quiet, N_("Suppress output for initializing a submodule")),
@@ -462,8 +537,165 @@
if (!argc && git_config_get_value_multi("submodule.active"))
module_list_active(&list);
- for (i = 0; i < list.nr; i++)
- init_submodule(list.entries[i]->name, prefix, quiet);
+ info.prefix = prefix;
+ if (quiet)
+ info.flags |= OPT_QUIET;
+
+ for_each_listed_submodule(&list, init_submodule_cb, &info);
+
+ return 0;
+}
+
+struct status_cb {
+ const char *prefix;
+ unsigned int flags;
+};
+
+#define STATUS_CB_INIT { NULL, 0 }
+
+static void print_status(unsigned int flags, char state, const char *path,
+ const struct object_id *oid, const char *displaypath)
+{
+ if (flags & OPT_QUIET)
+ return;
+
+ printf("%c%s %s", state, oid_to_hex(oid), displaypath);
+
+ if (state == ' ' || state == '+')
+ printf(" (%s)", compute_rev_name(path, oid_to_hex(oid)));
+
+ printf("\n");
+}
+
+static int handle_submodule_head_ref(const char *refname,
+ const struct object_id *oid, int flags,
+ void *cb_data)
+{
+ struct object_id *output = cb_data;
+ if (oid)
+ oidcpy(output, oid);
+
+ return 0;
+}
+
+static void status_submodule(const char *path, const struct object_id *ce_oid,
+ unsigned int ce_flags, const char *prefix,
+ unsigned int flags)
+{
+ char *displaypath;
+ struct argv_array diff_files_args = ARGV_ARRAY_INIT;
+ struct rev_info rev;
+ int diff_files_result;
+
+ if (!submodule_from_path(&null_oid, path))
+ die(_("no submodule mapping found in .gitmodules for path '%s'"),
+ path);
+
+ displaypath = get_submodule_displaypath(path, prefix);
+
+ if ((CE_STAGEMASK & ce_flags) >> CE_STAGESHIFT) {
+ print_status(flags, 'U', path, &null_oid, displaypath);
+ goto cleanup;
+ }
+
+ if (!is_submodule_active(the_repository, path)) {
+ print_status(flags, '-', path, ce_oid, displaypath);
+ goto cleanup;
+ }
+
+ argv_array_pushl(&diff_files_args, "diff-files",
+ "--ignore-submodules=dirty", "--quiet", "--",
+ path, NULL);
+
+ git_config(git_diff_basic_config, NULL);
+ init_revisions(&rev, prefix);
+ rev.abbrev = 0;
+ diff_files_args.argc = setup_revisions(diff_files_args.argc,
+ diff_files_args.argv,
+ &rev, NULL);
+ diff_files_result = run_diff_files(&rev, 0);
+
+ if (!diff_result_code(&rev.diffopt, diff_files_result)) {
+ print_status(flags, ' ', path, ce_oid,
+ displaypath);
+ } else if (!(flags & OPT_CACHED)) {
+ struct object_id oid;
+
+ if (refs_head_ref(get_submodule_ref_store(path),
+ handle_submodule_head_ref, &oid))
+ die(_("could not resolve HEAD ref inside the "
+ "submodule '%s'"), path);
+
+ print_status(flags, '+', path, &oid, displaypath);
+ } else {
+ print_status(flags, '+', path, ce_oid, displaypath);
+ }
+
+ if (flags & OPT_RECURSIVE) {
+ struct child_process cpr = CHILD_PROCESS_INIT;
+
+ cpr.git_cmd = 1;
+ cpr.dir = path;
+ prepare_submodule_repo_env(&cpr.env_array);
+
+ argv_array_push(&cpr.args, "--super-prefix");
+ argv_array_pushf(&cpr.args, "%s/", displaypath);
+ argv_array_pushl(&cpr.args, "submodule--helper", "status",
+ "--recursive", NULL);
+
+ if (flags & OPT_CACHED)
+ argv_array_push(&cpr.args, "--cached");
+
+ if (flags & OPT_QUIET)
+ argv_array_push(&cpr.args, "--quiet");
+
+ if (run_command(&cpr))
+ die(_("failed to recurse into submodule '%s'"), path);
+ }
+
+cleanup:
+ argv_array_clear(&diff_files_args);
+ free(displaypath);
+}
+
+static void status_submodule_cb(const struct cache_entry *list_item,
+ void *cb_data)
+{
+ struct status_cb *info = cb_data;
+ status_submodule(list_item->name, &list_item->oid, list_item->ce_flags,
+ info->prefix, info->flags);
+}
+
+static int module_status(int argc, const char **argv, const char *prefix)
+{
+ struct status_cb info = STATUS_CB_INIT;
+ struct pathspec pathspec;
+ struct module_list list = MODULE_LIST_INIT;
+ int quiet = 0;
+
+ struct option module_status_options[] = {
+ OPT__QUIET(&quiet, N_("Suppress submodule status output")),
+ OPT_BIT(0, "cached", &info.flags, N_("Use commit stored in the index instead of the one stored in the submodule HEAD"), OPT_CACHED),
+ OPT_BIT(0, "recursive", &info.flags, N_("recurse into nested submodules"), OPT_RECURSIVE),
+ OPT_END()
+ };
+
+ const char *const git_submodule_helper_usage[] = {
+ N_("git submodule status [--quiet] [--cached] [--recursive] [<path>...]"),
+ NULL
+ };
+
+ argc = parse_options(argc, argv, prefix, module_status_options,
+ git_submodule_helper_usage, 0);
+
+ if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
+ return 1;
+
+ info.prefix = prefix;
+ if (quiet)
+ info.flags |= OPT_QUIET;
+
+ for_each_listed_submodule(&list, status_submodule_cb, &info);
return 0;
}
@@ -475,8 +707,7 @@
if (argc != 2)
usage(_("git submodule--helper name <path>"));
- gitmodules_config();
- sub = submodule_from_path(null_sha1, argv[1]);
+ sub = submodule_from_path(&null_oid, argv[1]);
if (!sub)
die(_("no submodule mapping found in .gitmodules for path '%s'"),
@@ -780,6 +1011,10 @@
struct strbuf *out)
{
const struct submodule *sub = NULL;
+ const char *url = NULL;
+ const char *update_string;
+ enum submodule_update_type update_type;
+ char *key;
struct strbuf displaypath_sb = STRBUF_INIT;
struct strbuf sb = STRBUF_INIT;
const char *displaypath = NULL;
@@ -795,7 +1030,7 @@
goto cleanup;
}
- sub = submodule_from_path(null_sha1, ce->name);
+ sub = submodule_from_path(&null_oid, ce->name);
if (suc->recursive_prefix)
displaypath = relative_path(suc->recursive_prefix,
@@ -808,9 +1043,17 @@
goto cleanup;
}
+ key = xstrfmt("submodule.%s.update", sub->name);
+ if (!repo_config_get_string_const(the_repository, key, &update_string)) {
+ update_type = parse_submodule_update_type(update_string);
+ } else {
+ update_type = sub->update_strategy.type;
+ }
+ free(key);
+
if (suc->update.type == SM_UPDATE_NONE
|| (suc->update.type == SM_UPDATE_UNSPECIFIED
- && sub->update_strategy.type == SM_UPDATE_NONE)) {
+ && update_type == SM_UPDATE_NONE)) {
strbuf_addf(out, _("Skipping submodule '%s'"), displaypath);
strbuf_addch(out, '\n');
goto cleanup;
@@ -823,6 +1066,11 @@
}
strbuf_reset(&sb);
+ strbuf_addf(&sb, "submodule.%s.url", sub->name);
+ if (repo_config_get_string_const(the_repository, sb.buf, &url))
+ url = sub->url;
+
+ strbuf_reset(&sb);
strbuf_addf(&sb, "%s/.git", ce->name);
needs_cloning = !file_exists(sb.buf);
@@ -851,7 +1099,7 @@
argv_array_push(&child->args, "--depth=1");
argv_array_pushl(&child->args, "--path", sub->path, NULL);
argv_array_pushl(&child->args, "--name", sub->name, NULL);
- argv_array_pushl(&child->args, "--url", sub->url, NULL);
+ argv_array_pushl(&child->args, "--url", url, NULL);
if (suc->references.nr) {
struct string_list_item *item;
for_each_string_list_item(item, &suc->references)
@@ -960,10 +1208,19 @@
return 0;
}
+static int gitmodules_update_clone_config(const char *var, const char *value,
+ void *cb)
+{
+ int *max_jobs = cb;
+ if (!strcmp(var, "submodule.fetchjobs"))
+ *max_jobs = parse_submodule_fetchjobs(var, value);
+ return 0;
+}
+
static int update_clone(int argc, const char **argv, const char *prefix)
{
const char *update = NULL;
- int max_jobs = -1;
+ int max_jobs = 1;
struct string_list_item *item;
struct pathspec pathspec;
struct submodule_update_clone suc = SUBMODULE_UPDATE_CLONE_INIT;
@@ -1000,6 +1257,9 @@
};
suc.prefix = prefix;
+ config_from_gitmodules(gitmodules_update_clone_config, &max_jobs);
+ git_config(gitmodules_update_clone_config, &max_jobs);
+
argc = parse_options(argc, argv, prefix, module_update_clone_options,
git_submodule_helper_usage, 0);
@@ -1013,13 +1273,6 @@
if (pathspec.nr)
suc.warn_if_uninitialized = 1;
- /* Overlay the parsed .gitmodules file with .git/config */
- gitmodules_config();
- git_config(submodule_config, NULL);
-
- if (max_jobs < 0)
- max_jobs = parallel_submodules();
-
run_processes_parallel(max_jobs,
update_clone_get_next_task,
update_clone_start_failure,
@@ -1057,19 +1310,23 @@
static const char *remote_submodule_branch(const char *path)
{
const struct submodule *sub;
- gitmodules_config();
- git_config(submodule_config, NULL);
+ const char *branch = NULL;
+ char *key;
- sub = submodule_from_path(null_sha1, path);
+ sub = submodule_from_path(&null_oid, path);
if (!sub)
return NULL;
- if (!sub->branch)
+ key = xstrfmt("submodule.%s.branch", sub->name);
+ if (repo_config_get_string_const(the_repository, key, &branch))
+ branch = sub->branch;
+ free(key);
+
+ if (!branch)
return "master";
- if (!strcmp(sub->branch, ".")) {
- unsigned char sha1[20];
- const char *refname = resolve_ref_unsafe("HEAD", 0, sha1, NULL);
+ if (!strcmp(branch, ".")) {
+ const char *refname = resolve_ref_unsafe("HEAD", 0, NULL, NULL);
if (!refname)
die(_("No such ref: %s"), "HEAD");
@@ -1085,7 +1342,7 @@
return refname;
}
- return sub->branch;
+ return branch;
}
static int resolve_remote_submodule_branch(int argc, const char **argv,
@@ -1125,7 +1382,7 @@
argv++;
argc--;
/* Get the submodule's head ref and determine if it is detached */
- head = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
+ head = resolve_refdup("HEAD", 0, &head_oid, NULL);
if (!head)
die(_("Failed to resolve HEAD as a valid ref."));
if (!strcmp(head, "HEAD"))
@@ -1168,6 +1425,7 @@
break;
die("HEAD does not match the named branch in the superproject");
}
+ /* fallthrough */
default:
die("src refspec '%s' must name a ref",
rs->src);
@@ -1204,9 +1462,6 @@
argc = parse_options(argc, argv, prefix, embed_gitdir_options,
git_submodule_helper_usage, 0);
- gitmodules_config();
- git_config(submodule_config, NULL);
-
if (module_list_compute(argc, argv, prefix, &pathspec, &list) < 0)
return 1;
@@ -1222,8 +1477,6 @@
if (argc != 2)
die("submodule--helper is-active takes exactly 1 argument");
- gitmodules_config();
-
return !is_submodule_active(the_repository, argv[1]);
}
@@ -1244,6 +1497,7 @@
{"resolve-relative-url", resolve_relative_url, 0},
{"resolve-relative-url-test", resolve_relative_url_test, 0},
{"init", module_init, SUPPORT_SUPER_PREFIX},
+ {"status", module_status, SUPPORT_SUPER_PREFIX},
{"remote-branch", resolve_remote_submodule_branch, 0},
{"push-check", push_check, 0},
{"absorb-git-dirs", absorb_git_dirs, SUPPORT_SUPER_PREFIX},
diff --git a/builtin/symbolic-ref.c b/builtin/symbolic-ref.c
index df75cb9..80237f0 100644
--- a/builtin/symbolic-ref.c
+++ b/builtin/symbolic-ref.c
@@ -12,9 +12,8 @@
static int check_symref(const char *HEAD, int quiet, int shorten, int print)
{
- unsigned char sha1[20];
int flag;
- const char *refname = resolve_ref_unsafe(HEAD, 0, sha1, &flag);
+ const char *refname = resolve_ref_unsafe(HEAD, 0, NULL, &flag);
if (!refname)
die("No such ref: %s", HEAD);
@@ -59,7 +58,7 @@
die("Cannot delete %s, not a symbolic ref", argv[0]);
if (!strcmp(argv[0], "HEAD"))
die("deleting '%s' is not allowed", argv[0]);
- return delete_ref(NULL, argv[0], NULL, REF_NODEREF);
+ return delete_ref(NULL, argv[0], NULL, REF_NO_DEREF);
}
switch (argc) {
diff --git a/builtin/tag.c b/builtin/tag.c
index 00382a5..a7e6a5b 100644
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -82,7 +82,7 @@
for (p = argv; *p; p++) {
strbuf_reset(&ref);
strbuf_addf(&ref, "refs/tags/%s", *p);
- if (read_ref(ref.buf, oid.hash)) {
+ if (read_ref(ref.buf, &oid)) {
error(_("tag '%s' not found."), *p);
had_error = 1;
continue;
@@ -97,7 +97,7 @@
static int delete_tag(const char *name, const char *ref,
const struct object_id *oid, const void *cb_data)
{
- if (delete_ref(NULL, ref, oid->hash, 0))
+ if (delete_ref(NULL, ref, oid, 0))
return 1;
printf(_("Deleted tag '%s' (was %s)\n"), name, find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
return 0;
@@ -113,7 +113,7 @@
if (format->format)
flags = GPG_VERIFY_OMIT_STATUS;
- if (gpg_verify_tag(oid->hash, name, flags))
+ if (gpg_verify_tag(oid, name, flags))
return -1;
if (format->format)
@@ -518,7 +518,7 @@
if (strbuf_check_tag_ref(&ref, tag))
die(_("'%s' is not a valid tag name."), tag);
- if (read_ref(ref.buf, prev.hash))
+ if (read_ref(ref.buf, &prev))
oidclr(&prev);
else if (!force)
die(_("tag '%s' already exists"), tag);
@@ -544,7 +544,7 @@
transaction = ref_transaction_begin(&err);
if (!transaction ||
- ref_transaction_update(transaction, ref.buf, object.hash, prev.hash,
+ ref_transaction_update(transaction, ref.buf, &object, &prev,
create_reflog ? REF_FORCE_CREATE_REFLOG : 0,
reflog_msg.buf, &err) ||
ref_transaction_commit(transaction, &err))
@@ -553,9 +553,10 @@
if (force && !is_null_oid(&prev) && oidcmp(&prev, &object))
printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev.hash, DEFAULT_ABBREV));
- strbuf_release(&err);
- strbuf_release(&buf);
- strbuf_release(&ref);
- strbuf_release(&reflog_msg);
+ UNLEAK(buf);
+ UNLEAK(ref);
+ UNLEAK(reflog_msg);
+ UNLEAK(msg);
+ UNLEAK(err);
return 0;
}
diff --git a/builtin/unpack-file.c b/builtin/unpack-file.c
index 672a54f..32e0155 100644
--- a/builtin/unpack-file.c
+++ b/builtin/unpack-file.c
@@ -1,7 +1,7 @@
#include "builtin.h"
#include "config.h"
-static char *create_temp_file(unsigned char *sha1)
+static char *create_temp_file(struct object_id *oid)
{
static char path[50];
void *buf;
@@ -9,9 +9,9 @@
unsigned long size;
int fd;
- buf = read_sha1_file(sha1, &type, &size);
+ buf = read_sha1_file(oid->hash, &type, &size);
if (!buf || type != OBJ_BLOB)
- die("unable to read blob object %s", sha1_to_hex(sha1));
+ die("unable to read blob object %s", oid_to_hex(oid));
xsnprintf(path, sizeof(path), ".merge_file_XXXXXX");
fd = xmkstemp(path);
@@ -23,15 +23,15 @@
int cmd_unpack_file(int argc, const char **argv, const char *prefix)
{
- unsigned char sha1[20];
+ struct object_id oid;
if (argc != 2 || !strcmp(argv[1], "-h"))
usage("git unpack-file <sha1>");
- if (get_sha1(argv[1], sha1))
+ if (get_oid(argv[1], &oid))
die("Not a valid object name %s", argv[1]);
git_config(git_default_config, NULL);
- puts(create_temp_file(sha1));
+ puts(create_temp_file(&oid));
return 0;
}
diff --git a/builtin/unpack-objects.c b/builtin/unpack-objects.c
index 689a29f..62ea264 100644
--- a/builtin/unpack-objects.c
+++ b/builtin/unpack-objects.c
@@ -394,7 +394,7 @@
lo = 0;
hi = nr;
while (lo < hi) {
- mid = (lo + hi)/2;
+ mid = lo + (hi - lo) / 2;
if (base_offset < obj_list[mid].offset) {
hi = mid;
} else if (base_offset > obj_list[mid].offset) {
diff --git a/builtin/update-index.c b/builtin/update-index.c
index 56721cf..58d1c2d 100644
--- a/builtin/update-index.c
+++ b/builtin/update-index.c
@@ -16,6 +16,7 @@
#include "pathspec.h"
#include "dir.h"
#include "split-index.h"
+#include "fsmonitor.h"
/*
* Default to not allowing changes to the list of files. The
@@ -32,6 +33,7 @@
static int verbose;
static int mark_valid_only;
static int mark_skip_worktree_only;
+static int mark_fsmonitor_only;
#define MARK_FLAG 1
#define UNMARK_FLAG 2
static struct strbuf mtime_dir = STRBUF_INIT;
@@ -228,6 +230,7 @@
int namelen = strlen(path);
int pos = cache_name_pos(path, namelen);
if (0 <= pos) {
+ mark_fsmonitor_invalid(&the_index, active_cache[pos]);
if (mark)
active_cache[pos]->ce_flags |= flag;
else
@@ -280,15 +283,17 @@
fill_stat_cache_info(ce, st);
ce->ce_mode = ce_mode_from_stat(old, st->st_mode);
- if (index_path(ce->oid.hash, path, st,
+ if (index_path(&ce->oid, path, st,
info_only ? 0 : HASH_WRITE_OBJECT)) {
free(ce);
return -1;
}
option = allow_add ? ADD_CACHE_OK_TO_ADD : 0;
option |= allow_replace ? ADD_CACHE_OK_TO_REPLACE : 0;
- if (add_cache_entry(ce, option))
+ if (add_cache_entry(ce, option)) {
+ free(ce);
return error("%s: cannot add to the index - missing --add option?", path);
+ }
return 0;
}
@@ -326,7 +331,7 @@
if (S_ISGITLINK(ce->ce_mode)) {
/* Do nothing to the index if there is no HEAD! */
- if (resolve_gitlink_ref(path, "HEAD", oid.hash) < 0)
+ if (resolve_gitlink_ref(path, "HEAD", &oid) < 0)
return 0;
return add_one_path(ce, path, len, st);
@@ -352,7 +357,7 @@
}
/* No match - should we add it as a gitlink? */
- if (!resolve_gitlink_ref(path, "HEAD", oid.hash))
+ if (!resolve_gitlink_ref(path, "HEAD", &oid))
return add_one_path(NULL, path, len, st);
/* Error out. */
@@ -458,6 +463,11 @@
die("Unable to mark file %s", path);
return;
}
+ if (mark_fsmonitor_only) {
+ if (mark_ce_flags(path, CE_FSMONITOR_VALID, mark_fsmonitor_only == MARK_FLAG))
+ die("Unable to mark file %s", path);
+ return;
+ }
if (force_remove) {
if (remove_file_from_cache(path))
@@ -677,9 +687,9 @@
static void read_head_pointers(void)
{
- if (read_ref("HEAD", head_oid.hash))
+ if (read_ref("HEAD", &head_oid))
die("No HEAD -- no initial commit yet?");
- if (read_ref("MERGE_HEAD", merge_head_oid.hash)) {
+ if (read_ref("MERGE_HEAD", &merge_head_oid)) {
fprintf(stderr, "Not in the middle of a merge.\n");
exit(0);
}
@@ -719,7 +729,7 @@
PATHSPEC_PREFER_CWD,
prefix, av + 1);
- if (read_ref("HEAD", head_oid.hash))
+ if (read_ref("HEAD", &head_oid))
/* If there is no HEAD, that means it is an initial
* commit. Update everything in the index.
*/
@@ -915,7 +925,9 @@
struct refresh_params refresh_args = {0, &has_errors};
int lock_error = 0;
int split_index = -1;
- struct lock_file *lock_file;
+ int force_write = 0;
+ int fsmonitor = -1;
+ struct lock_file lock_file = LOCK_INIT;
struct parse_opt_ctx_t ctx;
strbuf_getline_fn getline_fn;
int parseopt_state = PARSE_OPT_UNKNOWN;
@@ -1006,6 +1018,16 @@
N_("test if the filesystem supports untracked cache"), UC_TEST),
OPT_SET_INT(0, "force-untracked-cache", &untracked_cache,
N_("enable untracked cache without testing the filesystem"), UC_FORCE),
+ OPT_SET_INT(0, "force-write-index", &force_write,
+ N_("write out the index even if is not flagged as changed"), 1),
+ OPT_BOOL(0, "fsmonitor", &fsmonitor,
+ N_("enable or disable file system monitor")),
+ {OPTION_SET_INT, 0, "fsmonitor-valid", &mark_fsmonitor_only, NULL,
+ N_("mark files as fsmonitor valid"),
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, MARK_FLAG},
+ {OPTION_SET_INT, 0, "no-fsmonitor-valid", &mark_fsmonitor_only, NULL,
+ N_("clear fsmonitor valid bit"),
+ PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL, UNMARK_FLAG},
OPT_END()
};
@@ -1014,11 +1036,8 @@
git_config(git_default_config, NULL);
- /* We can't free this memory, it becomes part of a linked list parsed atexit() */
- lock_file = xcalloc(1, sizeof(struct lock_file));
-
/* we will diagnose later if it turns out that we need to update it */
- newfd = hold_locked_index(lock_file, 0);
+ newfd = hold_locked_index(&lock_file, 0);
if (newfd < 0)
lock_error = errno;
@@ -1147,17 +1166,33 @@
die("BUG: bad untracked_cache value: %d", untracked_cache);
}
- if (active_cache_changed) {
+ if (fsmonitor > 0) {
+ if (git_config_get_fsmonitor() == 0)
+ 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)
+ warning(_("core.fsmonitor is set; "
+ "remove it if you really want to "
+ "disable fsmonitor"));
+ remove_fsmonitor(&the_index);
+ report(_("fsmonitor disabled"));
+ }
+
+ if (active_cache_changed || force_write) {
if (newfd < 0) {
if (refresh_args.flags & REFRESH_QUIET)
exit(128);
unable_to_lock_die(get_index_file(), lock_error);
}
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK))
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
die("Unable to write new index file");
}
- rollback_lock_file(lock_file);
+ rollback_lock_file(&lock_file);
return has_errors ? 1 : 0;
}
diff --git a/builtin/update-ref.c b/builtin/update-ref.c
index 40ccfc1..4b4714b 100644
--- a/builtin/update-ref.c
+++ b/builtin/update-ref.c
@@ -94,10 +94,10 @@
* provided but cannot be converted to a SHA-1, die. flags can
* include PARSE_SHA1_OLD and/or PARSE_SHA1_ALLOW_EMPTY.
*/
-static int parse_next_sha1(struct strbuf *input, const char **next,
- unsigned char *sha1,
- const char *command, const char *refname,
- int flags)
+static int parse_next_oid(struct strbuf *input, const char **next,
+ struct object_id *oid,
+ const char *command, const char *refname,
+ int flags)
{
struct strbuf arg = STRBUF_INIT;
int ret = 0;
@@ -115,11 +115,11 @@
(*next)++;
*next = parse_arg(*next, &arg);
if (arg.len) {
- if (get_sha1(arg.buf, sha1))
+ if (get_oid(arg.buf, oid))
goto invalid;
} else {
/* Without -z, an empty value means all zeros: */
- hashclr(sha1);
+ oidclr(oid);
}
} else {
/* With -z, read the next NUL-terminated line */
@@ -133,13 +133,13 @@
*next += arg.len;
if (arg.len) {
- if (get_sha1(arg.buf, sha1))
+ if (get_oid(arg.buf, oid))
goto invalid;
} else if (flags & PARSE_SHA1_ALLOW_EMPTY) {
/* With -z, treat an empty value as all zeros: */
warning("%s %s: missing <newvalue>, treating as zero",
command, refname);
- hashclr(sha1);
+ oidclr(oid);
} else {
/*
* With -z, an empty non-required value means
@@ -182,26 +182,25 @@
{
struct strbuf err = STRBUF_INIT;
char *refname;
- unsigned char new_sha1[20];
- unsigned char old_sha1[20];
+ struct object_id new_oid, old_oid;
int have_old;
refname = parse_refname(input, &next);
if (!refname)
die("update: missing <ref>");
- if (parse_next_sha1(input, &next, new_sha1, "update", refname,
- PARSE_SHA1_ALLOW_EMPTY))
+ if (parse_next_oid(input, &next, &new_oid, "update", refname,
+ PARSE_SHA1_ALLOW_EMPTY))
die("update %s: missing <newvalue>", refname);
- have_old = !parse_next_sha1(input, &next, old_sha1, "update", refname,
- PARSE_SHA1_OLD);
+ have_old = !parse_next_oid(input, &next, &old_oid, "update", refname,
+ PARSE_SHA1_OLD);
if (*next != line_termination)
die("update %s: extra input: %s", refname, next);
if (ref_transaction_update(transaction, refname,
- new_sha1, have_old ? old_sha1 : NULL,
+ &new_oid, have_old ? &old_oid : NULL,
update_flags | create_reflog_flag,
msg, &err))
die("%s", err.buf);
@@ -218,22 +217,22 @@
{
struct strbuf err = STRBUF_INIT;
char *refname;
- unsigned char new_sha1[20];
+ struct object_id new_oid;
refname = parse_refname(input, &next);
if (!refname)
die("create: missing <ref>");
- if (parse_next_sha1(input, &next, new_sha1, "create", refname, 0))
+ if (parse_next_oid(input, &next, &new_oid, "create", refname, 0))
die("create %s: missing <newvalue>", refname);
- if (is_null_sha1(new_sha1))
+ if (is_null_oid(&new_oid))
die("create %s: zero <newvalue>", refname);
if (*next != line_termination)
die("create %s: extra input: %s", refname, next);
- if (ref_transaction_create(transaction, refname, new_sha1,
+ if (ref_transaction_create(transaction, refname, &new_oid,
update_flags | create_reflog_flag,
msg, &err))
die("%s", err.buf);
@@ -250,18 +249,18 @@
{
struct strbuf err = STRBUF_INIT;
char *refname;
- unsigned char old_sha1[20];
+ struct object_id old_oid;
int have_old;
refname = parse_refname(input, &next);
if (!refname)
die("delete: missing <ref>");
- if (parse_next_sha1(input, &next, old_sha1, "delete", refname,
- PARSE_SHA1_OLD)) {
+ if (parse_next_oid(input, &next, &old_oid, "delete", refname,
+ PARSE_SHA1_OLD)) {
have_old = 0;
} else {
- if (is_null_sha1(old_sha1))
+ if (is_null_oid(&old_oid))
die("delete %s: zero <oldvalue>", refname);
have_old = 1;
}
@@ -270,7 +269,7 @@
die("delete %s: extra input: %s", refname, next);
if (ref_transaction_delete(transaction, refname,
- have_old ? old_sha1 : NULL,
+ have_old ? &old_oid : NULL,
update_flags, msg, &err))
die("%s", err.buf);
@@ -286,20 +285,20 @@
{
struct strbuf err = STRBUF_INIT;
char *refname;
- unsigned char old_sha1[20];
+ struct object_id old_oid;
refname = parse_refname(input, &next);
if (!refname)
die("verify: missing <ref>");
- if (parse_next_sha1(input, &next, old_sha1, "verify", refname,
- PARSE_SHA1_OLD))
- hashclr(old_sha1);
+ if (parse_next_oid(input, &next, &old_oid, "verify", refname,
+ PARSE_SHA1_OLD))
+ oidclr(&old_oid);
if (*next != line_termination)
die("verify %s: extra input: %s", refname, next);
- if (ref_transaction_verify(transaction, refname, old_sha1,
+ if (ref_transaction_verify(transaction, refname, &old_oid,
update_flags, &err))
die("%s", err.buf);
@@ -313,7 +312,7 @@
static const char *parse_cmd_option(struct strbuf *input, const char *next)
{
if (!strncmp(next, "no-deref", 8) && next[8] == line_termination)
- update_flags |= REF_NODEREF;
+ update_flags |= REF_NO_DEREF;
else
die("option unknown: %s", next);
return next + 8;
@@ -355,7 +354,7 @@
int cmd_update_ref(int argc, const char **argv, const char *prefix)
{
const char *refname, *oldval;
- unsigned char sha1[20], oldsha1[20];
+ struct object_id oid, oldoid;
int delete = 0, no_deref = 0, read_stdin = 0, end_null = 0;
unsigned int flags = 0;
int create_reflog = 0;
@@ -412,7 +411,7 @@
refname = argv[0];
value = argv[1];
oldval = argv[2];
- if (get_sha1(value, sha1))
+ if (get_oid(value, &oid))
die("%s: not a valid SHA1", value);
}
@@ -422,23 +421,23 @@
* The empty string implies that the reference
* must not already exist:
*/
- hashclr(oldsha1);
- else if (get_sha1(oldval, oldsha1))
+ oidclr(&oldoid);
+ else if (get_oid(oldval, &oldoid))
die("%s: not a valid old SHA1", oldval);
}
if (no_deref)
- flags = REF_NODEREF;
+ flags = REF_NO_DEREF;
if (delete)
/*
* For purposes of backwards compatibility, we treat
* NULL_SHA1 as "don't care" here:
*/
return delete_ref(msg, refname,
- (oldval && !is_null_sha1(oldsha1)) ? oldsha1 : NULL,
+ (oldval && !is_null_oid(&oldoid)) ? &oldoid : NULL,
flags);
else
- return update_ref(msg, refname, sha1, oldval ? oldsha1 : NULL,
+ return update_ref(msg, refname, &oid, oldval ? &oldoid : NULL,
flags | create_reflog_flag,
UPDATE_REFS_DIE_ON_ERR);
}
diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c
index 87d73e8..ad7b79f 100644
--- a/builtin/verify-tag.c
+++ b/builtin/verify-tag.c
@@ -58,20 +58,21 @@
}
while (i < argc) {
- unsigned char sha1[20];
+ struct object_id oid;
const char *name = argv[i++];
- if (get_sha1(name, sha1)) {
+
+ if (get_oid(name, &oid)) {
had_error = !!error("tag '%s' not found.", name);
continue;
}
- if (gpg_verify_tag(sha1, name, flags)) {
+ if (gpg_verify_tag(&oid, name, flags)) {
had_error = 1;
continue;
}
if (format.format)
- pretty_print_ref(name, sha1, &format);
+ pretty_print_ref(name, oid.hash, &format);
}
return had_error;
}
diff --git a/builtin/worktree.c b/builtin/worktree.c
index c98e2ce..9efdc22 100644
--- a/builtin/worktree.c
+++ b/builtin/worktree.c
@@ -1,4 +1,5 @@
#include "cache.h"
+#include "checkout.h"
#include "config.h"
#include "builtin.h"
#include "dir.h"
@@ -13,7 +14,7 @@
#include "worktree.h"
static const char * const worktree_usage[] = {
- N_("git worktree add [<options>] <path> [<branch>]"),
+ N_("git worktree add [<options>] <path> [<commit-ish>]"),
N_("git worktree list [<options>]"),
N_("git worktree lock [<options>] <path>"),
N_("git worktree prune [<options>]"),
@@ -32,13 +33,26 @@
static int show_only;
static int verbose;
+static int guess_remote;
static timestamp_t expire;
+static int git_worktree_config(const char *var, const char *value, void *cb)
+{
+ if (!strcmp(var, "worktree.guessremote")) {
+ guess_remote = git_config_bool(var, value);
+ return 0;
+ }
+
+ return git_default_config(var, value, cb);
+}
+
static int prune_worktree(const char *id, struct strbuf *reason)
{
struct stat st;
char *path;
- int fd, len;
+ int fd;
+ size_t len;
+ ssize_t read_result;
if (!is_directory(git_path("worktrees/%s", id))) {
strbuf_addf(reason, _("Removing worktrees/%s: not a valid directory"), id);
@@ -56,10 +70,26 @@
id, strerror(errno));
return 1;
}
- len = st.st_size;
+ len = xsize_t(st.st_size);
path = xmallocz(len);
- read_in_full(fd, path, len);
+
+ read_result = read_in_full(fd, path, len);
+ if (read_result < 0) {
+ strbuf_addf(reason, _("Removing worktrees/%s: unable to read gitdir file (%s)"),
+ id, strerror(errno));
+ close(fd);
+ free(path);
+ return 1;
+ }
close(fd);
+
+ if (read_result != len) {
+ strbuf_addf(reason,
+ _("Removing worktrees/%s: short read (expected %"PRIuMAX" bytes, read %"PRIuMAX")"),
+ id, (uintmax_t)len, (uintmax_t)read_result);
+ free(path);
+ return 1;
+ }
while (len && (path[len - 1] == '\n' || path[len - 1] == '\r'))
len--;
if (!len) {
@@ -200,20 +230,21 @@
int counter = 0, len, ret;
struct strbuf symref = STRBUF_INIT;
struct commit *commit = NULL;
+ int is_branch = 0;
if (file_exists(path) && !is_empty_dir(path))
die(_("'%s' already exists"), path);
/* is 'refname' a branch or commit? */
if (!opts->detach && !strbuf_check_branch_ref(&symref, refname) &&
- ref_exists(symref.buf)) { /* it's a branch */
+ ref_exists(symref.buf)) {
+ is_branch = 1;
if (!opts->force)
die_if_checked_out(symref.buf, 0);
- } else { /* must be a commit */
- commit = lookup_commit_reference_by_name(refname);
- if (!commit)
- die(_("invalid reference: %s"), refname);
}
+ commit = lookup_commit_reference_by_name(refname);
+ if (!commit)
+ die(_("invalid reference: %s"), refname);
name = worktree_basename(path, &len);
git_path_buf(&sb_repo, "worktrees/%.*s", (int)(path + len - name), name);
@@ -278,7 +309,7 @@
argv_array_pushf(&child_env, "%s=%s", GIT_WORK_TREE_ENVIRONMENT, path);
cp.git_cmd = 1;
- if (commit)
+ if (!is_branch)
argv_array_pushl(&cp.args, "update-ref", "HEAD",
oid_to_hex(&commit->object.oid), NULL);
else
@@ -309,6 +340,15 @@
strbuf_addf(&sb, "%s/locked", sb_repo.buf);
unlink_or_warn(sb.buf);
}
+
+ /*
+ * Hook failure does not warrant worktree deletion, so run hook after
+ * is_junk is cleared, but do return appropriate code when hook fails.
+ */
+ if (!ret && opts->checkout)
+ ret = run_hook_le(NULL, "post-checkout", oid_to_hex(&null_oid),
+ oid_to_hex(&commit->object.oid), "1", NULL);
+
argv_array_clear(&child_env);
strbuf_release(&sb);
strbuf_release(&symref);
@@ -323,6 +363,7 @@
const char *new_branch_force = NULL;
char *path;
const char *branch;
+ const char *opt_track = NULL;
struct option options[] = {
OPT__FORCE(&opts.force, N_("checkout <branch> even if already checked out in other worktree")),
OPT_STRING('b', NULL, &opts.new_branch, N_("branch"),
@@ -332,6 +373,11 @@
OPT_BOOL(0, "detach", &opts.detach, N_("detach HEAD at named commit")),
OPT_BOOL(0, "checkout", &opts.checkout, N_("populate the new working tree")),
OPT_BOOL(0, "lock", &opts.keep_locked, N_("keep the new working tree locked")),
+ OPT_PASSTHRU(0, "track", &opt_track, NULL,
+ N_("set up tracking mode (see git-branch(1))"),
+ PARSE_OPT_NOARG | PARSE_OPT_OPTARG),
+ OPT_BOOL(0, "guess-remote", &guess_remote,
+ N_("try to match the new branch name with a remote-tracking branch")),
OPT_END()
};
@@ -366,6 +412,28 @@
int n;
const char *s = worktree_basename(path, &n);
opts.new_branch = xstrndup(s, n);
+ if (guess_remote) {
+ struct object_id oid;
+ const char *remote =
+ unique_tracking_name(opts.new_branch, &oid);
+ if (remote)
+ branch = remote;
+ }
+ }
+
+ if (ac == 2 && !opts.new_branch && !opts.detach) {
+ struct object_id oid;
+ struct commit *commit;
+ const char *remote;
+
+ commit = lookup_commit_reference_by_name(branch);
+ if (!commit) {
+ remote = unique_tracking_name(branch, &oid);
+ if (remote) {
+ opts.new_branch = branch;
+ branch = remote;
+ }
+ }
}
if (opts.new_branch) {
@@ -376,11 +444,17 @@
argv_array_push(&cp.args, "--force");
argv_array_push(&cp.args, opts.new_branch);
argv_array_push(&cp.args, branch);
+ if (opt_track)
+ argv_array_push(&cp.args, opt_track);
if (run_command(&cp))
return -1;
branch = opts.new_branch;
+ } else if (opt_track) {
+ die(_("--[no-]track can only be used if a new branch is created"));
}
+ UNLEAK(path);
+ UNLEAK(opts);
return add_worktree(path, branch, &opts);
}
@@ -390,7 +464,7 @@
if (wt->is_bare)
printf("bare\n");
else {
- printf("HEAD %s\n", sha1_to_hex(wt->head_sha1));
+ printf("HEAD %s\n", oid_to_hex(&wt->head_oid));
if (wt->is_detached)
printf("detached\n");
else if (wt->head_ref)
@@ -410,7 +484,7 @@
strbuf_addstr(&sb, "(bare)");
else {
strbuf_addf(&sb, "%-*s ", abbrev_len,
- find_unique_abbrev(wt->head_sha1, DEFAULT_ABBREV));
+ find_unique_abbrev(wt->head_oid.hash, DEFAULT_ABBREV));
if (wt->is_detached)
strbuf_addstr(&sb, "(detached HEAD)");
else if (wt->head_ref) {
@@ -435,7 +509,7 @@
if (path_len > *maxlen)
*maxlen = path_len;
- sha1_len = strlen(find_unique_abbrev(wt[i]->head_sha1, *abbrev));
+ sha1_len = strlen(find_unique_abbrev(wt[i]->head_oid.hash, *abbrev));
if (sha1_len > *abbrev)
*abbrev = sha1_len;
}
@@ -537,7 +611,7 @@
OPT_END()
};
- git_config(git_default_config, NULL);
+ git_config(git_worktree_config, NULL);
if (ac < 2)
usage_with_options(worktree_usage, options);
diff --git a/bulk-checkin.c b/bulk-checkin.c
index 5be7ce5..3310fd2 100644
--- a/bulk-checkin.c
+++ b/bulk-checkin.c
@@ -6,6 +6,7 @@
#include "csum-file.h"
#include "pack.h"
#include "strbuf.h"
+#include "packfile.h"
static struct bulk_checkin_state {
unsigned plugged:1;
@@ -114,7 +115,10 @@
if (size && !s.avail_in) {
ssize_t rsize = size < sizeof(ibuf) ? size : sizeof(ibuf);
- if (read_in_full(fd, ibuf, rsize) != rsize)
+ ssize_t read_result = read_in_full(fd, ibuf, rsize);
+ if (read_result < 0)
+ die_errno("failed to read from '%s'", path);
+ if (read_result != rsize)
die("failed to read %d bytes from '%s'",
(int)rsize, path);
offset += rsize;
diff --git a/bundle.c b/bundle.c
index d15db03..efe547e 100644
--- a/bundle.c
+++ b/bundle.c
@@ -134,7 +134,6 @@
struct ref_list *p = &header->prerequisites;
struct rev_info revs;
const char *argv[] = {NULL, "--all", NULL};
- struct object_array refs;
struct commit *commit;
int i, ret = 0, req_nr;
const char *message = _("Repository lacks these prerequisite commits:");
@@ -157,9 +156,6 @@
req_nr = revs.pending.nr;
setup_revisions(2, argv, &revs, NULL);
- refs = revs.pending;
- revs.leak_pending = 1;
-
if (prepare_revision_walk(&revs))
die(_("revision walk setup failed"));
@@ -168,16 +164,24 @@
if (commit->object.flags & PREREQ_MARK)
i--;
- for (i = 0; i < req_nr; i++)
- if (!(refs.objects[i].item->flags & SHOWN)) {
- if (++ret == 1)
- error("%s", message);
- error("%s %s", oid_to_hex(&refs.objects[i].item->oid),
- refs.objects[i].name);
- }
+ for (i = 0; i < p->nr; i++) {
+ struct ref_list_entry *e = p->list + i;
+ struct object *o = parse_object(&e->oid);
+ assert(o); /* otherwise we'd have returned early */
+ if (o->flags & SHOWN)
+ continue;
+ if (++ret == 1)
+ error("%s", message);
+ error("%s %s", oid_to_hex(&e->oid), e->name);
+ }
- clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
- free(refs.objects);
+ /* Clean up objects used, as they will be reused. */
+ for (i = 0; i < p->nr; i++) {
+ struct ref_list_entry *e = p->list + i;
+ commit = lookup_commit_reference_gently(&e->oid, 1);
+ if (commit)
+ clear_commit_marks(commit, ALL_REV_FLAGS);
+ }
if (verbose) {
struct ref_list *r;
@@ -331,9 +335,9 @@
if (e->item->flags & UNINTERESTING)
continue;
- if (dwim_ref(e->name, strlen(e->name), oid.hash, &ref) != 1)
+ if (dwim_ref(e->name, strlen(e->name), &oid, &ref) != 1)
goto skip_write_ref;
- if (read_ref_full(e->name, RESOLVE_REF_READING, oid.hash, &flag))
+ if (read_ref_full(e->name, RESOLVE_REF_READING, &oid, &flag))
flag = 0;
display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
diff --git a/cache-tree.c b/cache-tree.c
index 2440d1d..0dd6292 100644
--- a/cache-tree.c
+++ b/cache-tree.c
@@ -49,7 +49,7 @@
lo = 0;
hi = it->subtree_nr;
while (lo < hi) {
- int mi = (lo + hi) / 2;
+ int mi = lo + (hi - lo) / 2;
struct cache_tree_sub *mdl = down[mi];
int cmp = subtree_name_cmp(path, pathlen,
mdl->name, mdl->namelen);
@@ -602,20 +602,17 @@
int write_index_as_tree(unsigned char *sha1, struct index_state *index_state, const char *index_path, int flags, const char *prefix)
{
- int entries, was_valid, newfd;
- struct lock_file *lock_file;
+ int entries, was_valid;
+ struct lock_file lock_file = LOCK_INIT;
+ int ret = 0;
- /*
- * We can't free this memory, it becomes part of a linked list
- * parsed atexit()
- */
- lock_file = xcalloc(1, sizeof(struct lock_file));
+ hold_lock_file_for_update(&lock_file, index_path, LOCK_DIE_ON_ERROR);
- newfd = hold_lock_file_for_update(lock_file, index_path, LOCK_DIE_ON_ERROR);
-
- entries = read_index_from(index_state, index_path);
- if (entries < 0)
- return WRITE_TREE_UNREADABLE_INDEX;
+ entries = read_index_from(index_state, index_path, get_git_dir());
+ if (entries < 0) {
+ ret = WRITE_TREE_UNREADABLE_INDEX;
+ goto out;
+ }
if (flags & WRITE_TREE_IGNORE_CACHE_TREE)
cache_tree_free(&index_state->cache_tree);
@@ -624,12 +621,11 @@
was_valid = cache_tree_fully_valid(index_state->cache_tree);
if (!was_valid) {
- if (cache_tree_update(index_state, flags) < 0)
- return WRITE_TREE_UNMERGED_INDEX;
- if (0 <= newfd) {
- if (!write_locked_index(index_state, lock_file, COMMIT_LOCK))
- newfd = -1;
+ if (cache_tree_update(index_state, flags) < 0) {
+ ret = WRITE_TREE_UNMERGED_INDEX;
+ goto out;
}
+ write_locked_index(index_state, &lock_file, COMMIT_LOCK);
/* Not being able to write is fine -- we are only interested
* in updating the cache-tree part, and if the next caller
* ends up using the old index with unupdated cache-tree part
@@ -641,17 +637,18 @@
if (prefix) {
struct cache_tree *subtree;
subtree = cache_tree_find(index_state->cache_tree, prefix);
- if (!subtree)
- return WRITE_TREE_PREFIX_ERROR;
+ if (!subtree) {
+ ret = WRITE_TREE_PREFIX_ERROR;
+ goto out;
+ }
hashcpy(sha1, subtree->oid.hash);
}
else
hashcpy(sha1, index_state->cache_tree->oid.hash);
- if (0 <= newfd)
- rollback_lock_file(lock_file);
-
- return 0;
+out:
+ rollback_lock_file(&lock_file);
+ return ret;
}
int write_cache_as_tree(unsigned char *sha1, int flags, const char *prefix)
diff --git a/cache.h b/cache.h
index 5cc116b..fd755c3 100644
--- a/cache.h
+++ b/cache.h
@@ -4,6 +4,7 @@
#include "git-compat-util.h"
#include "strbuf.h"
#include "hashmap.h"
+#include "mru.h"
#include "advice.h"
#include "gettext.h"
#include "convert.h"
@@ -13,6 +14,7 @@
#include "hash.h"
#include "path.h"
#include "sha1-array.h"
+#include "repository.h"
#ifndef platform_SHA_CTX
/*
@@ -76,6 +78,8 @@
unsigned char hash[GIT_MAX_RAWSZ];
};
+#define the_hash_algo the_repository->hash_algo
+
#if defined(DT_UNKNOWN) && !defined(NO_D_TYPE_IN_DIRENT)
#define DTYPE(de) ((de)->d_type)
#else
@@ -203,6 +207,7 @@
#define CE_ADDED (1 << 19)
#define CE_HASHED (1 << 20)
+#define CE_FSMONITOR_VALID (1 << 21)
#define CE_WT_REMOVE (1 << 22) /* remove in work directory */
#define CE_CONFLICTED (1 << 23)
@@ -326,6 +331,7 @@
#define CACHE_TREE_CHANGED (1 << 5)
#define SPLIT_INDEX_ORDERED (1 << 6)
#define UNTRACKED_CHANGED (1 << 7)
+#define FSMONITOR_CHANGED (1 << 8)
struct split_index;
struct untracked_cache;
@@ -339,11 +345,14 @@
struct split_index *split_index;
struct cache_time timestamp;
unsigned name_hash_initialized : 1,
- initialized : 1;
+ initialized : 1,
+ drop_cache_tree : 1;
struct hashmap name_hash;
struct hashmap dir_hash;
unsigned char sha1[20];
struct untracked_cache *untracked;
+ uint64_t fsmonitor_last_update;
+ struct ewah_bitmap *fsmonitor_dirty;
};
extern struct index_state the_index;
@@ -363,7 +372,7 @@
#define active_cache_tree (the_index.cache_tree)
#define read_cache() read_index(&the_index)
-#define read_cache_from(path) read_index_from(&the_index, (path))
+#define read_cache_from(path) read_index_from(&the_index, (path), (get_git_dir()))
#define read_cache_preload(pathspec) read_index_preload(&the_index, (pathspec))
#define is_cache_unborn() is_index_unborn(&the_index)
#define read_cache_unmerged() read_index_unmerged(&the_index)
@@ -417,7 +426,6 @@
#define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE"
#define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX"
#define GIT_SUPER_PREFIX_ENVIRONMENT "GIT_INTERNAL_SUPER_PREFIX"
-#define GIT_TOPLEVEL_PREFIX_ENVIRONMENT "GIT_INTERNAL_TOPLEVEL_PREFIX"
#define DEFAULT_GIT_DIR_ENVIRONMENT ".git"
#define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY"
#define INDEX_ENVIRONMENT "GIT_INDEX_FILE"
@@ -433,6 +441,7 @@
#define GITATTRIBUTES_FILE ".gitattributes"
#define INFOATTRIBUTES_FILE "info/attributes"
#define ATTRIBUTE_MACRO_PREFIX "[attr]"
+#define GITMODULES_FILE ".gitmodules"
#define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF"
#define GIT_NOTES_DEFAULT_REF "refs/notes/commits"
#define GIT_NOTES_DISPLAY_REF_ENVIRONMENT "GIT_NOTES_DISPLAY_REF"
@@ -443,6 +452,17 @@
#define GIT_NOGLOB_PATHSPECS_ENVIRONMENT "GIT_NOGLOB_PATHSPECS"
#define GIT_ICASE_PATHSPECS_ENVIRONMENT "GIT_ICASE_PATHSPECS"
#define GIT_QUARANTINE_ENVIRONMENT "GIT_QUARANTINE_PATH"
+#define GIT_OPTIONAL_LOCKS_ENVIRONMENT "GIT_OPTIONAL_LOCKS"
+
+/*
+ * Environment variable used in handshaking the wire protocol.
+ * Contains a colon ':' separated list of keys with optional values
+ * 'key[=value]'. Presence of unknown keys and values must be
+ * ignored.
+ */
+#define GIT_PROTOCOL_ENVIRONMENT "GIT_PROTOCOL"
+/* HTTP header used to handshake the wire protocol */
+#define GIT_PROTOCOL_HEADER "Git-Protocol"
/*
* This environment variable is expected to contain a boolean indicating
@@ -597,15 +617,44 @@
extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
extern int do_read_index(struct index_state *istate, const char *path,
int must_exist); /* for testting only! */
-extern int read_index_from(struct index_state *, const char *path);
+extern int read_index_from(struct index_state *, const char *path,
+ const char *gitdir);
extern int is_index_unborn(struct index_state *);
extern int read_index_unmerged(struct index_state *);
+
+/* For use with `write_locked_index()`. */
#define COMMIT_LOCK (1 << 0)
-#define CLOSE_LOCK (1 << 1)
+
+/*
+ * Write the index while holding an already-taken lock. Close the lock,
+ * and if `COMMIT_LOCK` is given, commit it.
+ *
+ * Unless a split index is in use, write the index into the lockfile.
+ *
+ * With a split index, write the shared index to a temporary file,
+ * adjust its permissions and rename it into place, then write the
+ * split index to the lockfile. If the temporary file for the shared
+ * index cannot be created, fall back to the behavior described in
+ * the previous paragraph.
+ *
+ * With `COMMIT_LOCK`, the lock is always committed or rolled back.
+ * Without it, the lock is closed, but neither committed nor rolled
+ * back.
+ */
extern int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags);
+
extern int discard_index(struct index_state *);
extern void move_index_extensions(struct index_state *dst, struct index_state *src);
extern int unmerged_index(const struct index_state *);
+
+/**
+ * Returns 1 if the index differs from HEAD, 0 otherwise. When on an unborn
+ * branch, returns 1 if there are entries in the index, 0 otherwise. If an
+ * strbuf is provided, the space-separated list of files that differ will be
+ * appended to it.
+ */
+extern int index_has_changes(struct strbuf *sb);
+
extern int verify_path(const char *path);
extern int strcmp_offset(const char *s1, const char *s2, size_t *first_change);
extern int index_dir_exists(struct index_state *istate, const char *name, int namelen);
@@ -679,13 +728,16 @@
#define CE_MATCH_IGNORE_MISSING 0x08
/* enable stat refresh */
#define CE_MATCH_REFRESH 0x10
-extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
-extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
+/* don't refresh_fsmonitor state or do stat comparison even if CE_FSMONITOR_VALID is true */
+#define CE_MATCH_IGNORE_FSMONITOR 0X20
+extern int ie_match_stat(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
+extern int ie_modified(struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
#define HASH_WRITE_OBJECT 1
#define HASH_FORMAT_CHECK 2
-extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
-extern int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned flags);
+#define HASH_RENORMALIZE 4
+extern int index_fd(struct object_id *oid, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
+extern int index_path(struct object_id *oid, const char *path, struct stat *st, unsigned flags);
/*
* Record to sd the data from st that we use to check whether a file
@@ -714,12 +766,17 @@
extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
extern struct cache_entry *refresh_cache_entry(struct cache_entry *, unsigned int);
+/*
+ * Opportunistically update the index but do not complain if we can't.
+ * The lockfile is always committed or rolled back.
+ */
extern void update_index_if_able(struct index_state *, struct lock_file *);
extern int hold_locked_index(struct lock_file *, int);
extern void set_alternate_index_output(const char *);
extern int verify_index_checksum;
+extern int verify_ce_order;
/* Environment bits from configuration mechanism */
extern int trust_executable_bit;
@@ -773,6 +830,7 @@
extern int precomposed_unicode;
extern int protect_hfs;
extern int protect_ntfs;
+extern const char *core_fsmonitor;
/*
* Include broken refs in all ref iterations, which will
@@ -783,6 +841,11 @@
extern int ref_paranoia;
/*
+ * Returns the boolean value of $GIT_OPTIONAL_LOCKS (or the default value).
+ */
+int use_optional_locks(void);
+
+/*
* The character that begins a commented line in user-editable file
* that is subject to stripspace.
*/
@@ -858,6 +921,7 @@
int version;
int precious_objects;
int is_bare;
+ int hash_algo;
char *work_tree;
struct string_list unknown_extensions;
};
@@ -903,20 +967,6 @@
extern const char *sha1_file_name(const unsigned char *sha1);
/*
- * Return the name of the (local) packfile with the specified sha1 in
- * its name. The return value is a pointer to memory that is
- * overwritten each time this function is called.
- */
-extern char *sha1_pack_name(const unsigned char *sha1);
-
-/*
- * Return the name of the (local) pack index file with the specified
- * sha1 in its name. The return value is a pointer to memory that is
- * overwritten each time this function is called.
- */
-extern char *sha1_pack_index_name(const unsigned char *sha1);
-
-/*
* Return an abbreviated sha1 unique within this repository's object database.
* The result will be at least `len` characters long, and will be NUL
* terminated.
@@ -1004,22 +1054,22 @@
static inline int is_empty_blob_sha1(const unsigned char *sha1)
{
- return !hashcmp(sha1, EMPTY_BLOB_SHA1_BIN);
+ return !hashcmp(sha1, the_hash_algo->empty_blob->hash);
}
static inline int is_empty_blob_oid(const struct object_id *oid)
{
- return !hashcmp(oid->hash, EMPTY_BLOB_SHA1_BIN);
+ return !oidcmp(oid, the_hash_algo->empty_blob);
}
static inline int is_empty_tree_sha1(const unsigned char *sha1)
{
- return !hashcmp(sha1, EMPTY_TREE_SHA1_BIN);
+ return !hashcmp(sha1, the_hash_algo->empty_tree->hash);
}
static inline int is_empty_tree_oid(const struct object_id *oid)
{
- return !hashcmp(oid->hash, EMPTY_TREE_SHA1_BIN);
+ return !oidcmp(oid, the_hash_algo->empty_tree);
}
/* set default permissions by passing mode arguments to open(2) */
@@ -1192,7 +1242,7 @@
extern int sha1_object_info(const unsigned char *, unsigned long *);
extern int hash_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *sha1);
extern int write_sha1_file(const void *buf, unsigned long len, const char *type, unsigned char *return_sha1);
-extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, unsigned char *sha1, unsigned flags);
+extern int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type, struct object_id *oid, unsigned flags);
extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
extern int force_object_loose(const unsigned char *sha1, time_t mtime);
extern int git_open_cloexec(const char *name, int flags);
@@ -1201,15 +1251,10 @@
extern int unpack_sha1_header(git_zstream *stream, unsigned char *map, unsigned long mapsize, void *buffer, unsigned long bufsiz);
extern int parse_sha1_header(const char *hdr, unsigned long *sizep);
-/* global flag to enable extra checks when accessing packed objects */
-extern int do_check_packed_object_crc;
-
extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
extern int finalize_object_file(const char *tmpfile, const char *filename);
-extern int has_sha1_pack(const unsigned char *sha1);
-
/*
* Open the loose object at path, check its sha1, and return the contents,
* type, and size. If the object is a blob, then "contents" may return NULL,
@@ -1245,8 +1290,6 @@
*/
extern int has_loose_object_nonlocal(const unsigned char *sha1);
-extern int has_pack_index(const unsigned char *sha1);
-
extern void assert_sha1_type(const unsigned char *sha1, enum object_type expect);
/* Helper to check and "touch" a file */
@@ -1284,38 +1327,37 @@
*/
struct strbuf symlink_path;
/*
- * If GET_SHA1_RECORD_PATH is set, this will record path (if any)
+ * If GET_OID_RECORD_PATH is set, this will record path (if any)
* found when resolving the name. The caller is responsible for
* releasing the memory.
*/
char *path;
};
-#define GET_SHA1_QUIETLY 01
-#define GET_SHA1_COMMIT 02
-#define GET_SHA1_COMMITTISH 04
-#define GET_SHA1_TREE 010
-#define GET_SHA1_TREEISH 020
-#define GET_SHA1_BLOB 040
-#define GET_SHA1_FOLLOW_SYMLINKS 0100
-#define GET_SHA1_RECORD_PATH 0200
-#define GET_SHA1_ONLY_TO_DIE 04000
+#define GET_OID_QUIETLY 01
+#define GET_OID_COMMIT 02
+#define GET_OID_COMMITTISH 04
+#define GET_OID_TREE 010
+#define GET_OID_TREEISH 020
+#define GET_OID_BLOB 040
+#define GET_OID_FOLLOW_SYMLINKS 0100
+#define GET_OID_RECORD_PATH 0200
+#define GET_OID_ONLY_TO_DIE 04000
-#define GET_SHA1_DISAMBIGUATORS \
- (GET_SHA1_COMMIT | GET_SHA1_COMMITTISH | \
- GET_SHA1_TREE | GET_SHA1_TREEISH | \
- GET_SHA1_BLOB)
-
-extern int get_sha1(const char *str, unsigned char *sha1);
-extern int get_sha1_commit(const char *str, unsigned char *sha1);
-extern int get_sha1_committish(const char *str, unsigned char *sha1);
-extern int get_sha1_tree(const char *str, unsigned char *sha1);
-extern int get_sha1_treeish(const char *str, unsigned char *sha1);
-extern int get_sha1_blob(const char *str, unsigned char *sha1);
-extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
-extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc);
+#define GET_OID_DISAMBIGUATORS \
+ (GET_OID_COMMIT | GET_OID_COMMITTISH | \
+ GET_OID_TREE | GET_OID_TREEISH | \
+ GET_OID_BLOB)
extern int get_oid(const char *str, struct object_id *oid);
+extern int get_oid_commit(const char *str, struct object_id *oid);
+extern int get_oid_committish(const char *str, struct object_id *oid);
+extern int get_oid_tree(const char *str, struct object_id *oid);
+extern int get_oid_treeish(const char *str, struct object_id *oid);
+extern int get_oid_blob(const char *str, struct object_id *oid);
+extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
+extern int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc);
+
typedef int each_abbrev_fn(const struct object_id *oid, void *);
extern int for_each_abbrev(const char *prefix, each_abbrev_fn, void *);
@@ -1333,6 +1375,13 @@
extern int get_oid_hex(const char *hex, struct object_id *sha1);
/*
+ * Read `len` pairs of hexadecimal digits from `hex` and write the
+ * values to `binary` as `len` bytes. Return 0 on success, or -1 if
+ * the input does not consist of hex digits).
+ */
+extern int hex_to_bytes(unsigned char *binary, const char *hex, size_t len);
+
+/*
* Convert a binary sha1 to its hex equivalent. The `_r` variant is reentrant,
* and writes the NUL-terminated output to the buffer `out`, which must be at
* least `GIT_SHA1_HEXSZ + 1` bytes, and returns a pointer to out for
@@ -1453,6 +1502,7 @@
extern const char *ident_default_email(void);
extern const char *git_editor(void);
extern const char *git_pager(int stdout_is_tty);
+extern int is_terminal_dumb(void);
extern int git_ident_config(const char *, const char *, void *);
extern void reset_ident_date(void);
@@ -1611,8 +1661,7 @@
* A most-recently-used ordered version of the packed_git list, which can
* be iterated instead of packed_git (and marked via mru_mark).
*/
-struct mru;
-extern struct mru *packed_git_mru;
+extern struct mru packed_git_mru;
struct pack_entry {
off_t offset;
@@ -1620,29 +1669,6 @@
struct packed_git *p;
};
-extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
-
-/* A hook to report invalid files in pack directory */
-#define PACKDIR_FILE_PACK 1
-#define PACKDIR_FILE_IDX 2
-#define PACKDIR_FILE_GARBAGE 4
-extern void (*report_garbage)(unsigned seen_bits, const char *path);
-
-extern void prepare_packed_git(void);
-extern void reprepare_packed_git(void);
-extern void install_packed_git(struct packed_git *pack);
-
-/*
- * Give a rough count of objects in the repository. This sacrifices accuracy
- * for speed.
- */
-unsigned long approximate_object_count(void);
-
-extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
- struct packed_git *packs);
-
-extern void pack_report(void);
-
/*
* Create a temporary file rooted in the object database directory, or
* die on failure. The filename is taken from "pattern", which should have the
@@ -1652,15 +1678,6 @@
extern int odb_mkstemp(struct strbuf *template, const char *pattern);
/*
- * Generate the filename to be used for a pack file with checksum "sha1" and
- * extension "ext". The result is written into the strbuf "buf", overwriting
- * any existing contents. A pointer to buf->buf is returned as a convenience.
- *
- * Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
- */
-extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
-
-/*
* Create a pack .keep file named "name" (which should generally be the output
* of odb_pack_name). Returns a file descriptor opened for writing, or -1 on
* error.
@@ -1668,67 +1685,6 @@
extern int odb_pack_keep(const char *name);
/*
- * mmap the index file for the specified packfile (if it is not
- * already mmapped). Return 0 on success.
- */
-extern int open_pack_index(struct packed_git *);
-
-/*
- * munmap the index file for the specified packfile (if it is
- * currently mmapped).
- */
-extern void close_pack_index(struct packed_git *);
-
-extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
-extern void close_pack_windows(struct packed_git *);
-extern void close_all_packs(void);
-extern void unuse_pack(struct pack_window **);
-extern void clear_delta_base_cache(void);
-extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
-
-/*
- * Make sure that a pointer access into an mmap'd index file is within bounds,
- * and can provide at least 8 bytes of data.
- *
- * Note that this is only necessary for variable-length segments of the file
- * (like the 64-bit extended offset table), as we compare the size to the
- * fixed-length parts when we open the file.
- */
-extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
-
-/*
- * Return the SHA-1 of the nth object within the specified packfile.
- * Open the index if it is not already open. The return value points
- * at the SHA-1 within the mmapped index. Return NULL if there is an
- * error.
- */
-extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
-/*
- * Like nth_packed_object_sha1, but write the data into the object specified by
- * the the first argument. Returns the first argument on success, and NULL on
- * error.
- */
-extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
-
-/*
- * Return the offset of the nth object within the specified packfile.
- * The index must already be opened.
- */
-extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
-
-/*
- * If the object named sha1 is present in the specified packfile,
- * return its offset within the packfile; otherwise, return 0.
- */
-extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
-
-extern int is_pack_valid(struct packed_git *);
-extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
-extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
-extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
-extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
-
-/*
* Iterate over the files in the loose-object parts of the object
* directory "path", triggering the following callbacks:
*
@@ -1777,17 +1733,12 @@
void *data);
/*
- * Iterate over loose and packed objects in both the local
+ * Iterate over loose objects in both the local
* repository and any alternates repositories (unless the
* LOCAL_ONLY flag is set).
*/
#define FOR_EACH_OBJECT_LOCAL_ONLY 0x1
-typedef int each_packed_object_fn(const struct object_id *oid,
- struct packed_git *pack,
- uint32_t pos,
- void *data);
extern int for_each_loose_object(each_loose_object_fn, void *, unsigned flags);
-extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
struct object_info {
/* Request */
@@ -1837,7 +1788,6 @@
/* Do not retry packed storage after checking packed and loose storage */
#define OBJECT_INFO_QUICK 8
extern int sha1_object_info_extended(const unsigned char *, struct object_info *, unsigned flags);
-extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *);
/* Dumb servers support */
extern int update_server_info(int);
@@ -1956,6 +1906,8 @@
#define WS_TRAILING_SPACE (WS_BLANK_AT_EOL|WS_BLANK_AT_EOF)
#define WS_DEFAULT_RULE (WS_TRAILING_SPACE|WS_SPACE_BEFORE_TAB|8)
#define WS_TAB_WIDTH_MASK 077
+/* All WS_* -- when extended, adapt diff.c emit_symbol */
+#define WS_RULE_MASK 07777
extern unsigned whitespace_rule_cfg;
extern unsigned whitespace_rule(const char *);
extern unsigned parse_whitespace_rule(const char *);
@@ -2032,4 +1984,10 @@
*/
void safe_create_dir(const char *dir, int share);
+/*
+ * Should we print an ellipsis after an abbreviated SHA-1 value
+ * when doing diff-raw output or indicating a detached HEAD?
+ */
+extern int print_sha1_ellipsis(void);
+
#endif /* CACHE_H */
diff --git a/checkout.c b/checkout.c
new file mode 100644
index 0000000..ac42630
--- /dev/null
+++ b/checkout.c
@@ -0,0 +1,43 @@
+#include "cache.h"
+#include "remote.h"
+#include "checkout.h"
+
+struct tracking_name_data {
+ /* const */ char *src_ref;
+ char *dst_ref;
+ struct object_id *dst_oid;
+ int unique;
+};
+
+static int check_tracking_name(struct remote *remote, void *cb_data)
+{
+ struct tracking_name_data *cb = cb_data;
+ struct refspec query;
+ memset(&query, 0, sizeof(struct refspec));
+ query.src = cb->src_ref;
+ if (remote_find_tracking(remote, &query) ||
+ get_oid(query.dst, cb->dst_oid)) {
+ free(query.dst);
+ return 0;
+ }
+ if (cb->dst_ref) {
+ free(query.dst);
+ cb->unique = 0;
+ return 0;
+ }
+ cb->dst_ref = query.dst;
+ return 0;
+}
+
+const char *unique_tracking_name(const char *name, struct object_id *oid)
+{
+ struct tracking_name_data cb_data = { NULL, NULL, NULL, 1 };
+ cb_data.src_ref = xstrfmt("refs/heads/%s", name);
+ cb_data.dst_oid = oid;
+ for_each_remote(check_tracking_name, &cb_data);
+ free(cb_data.src_ref);
+ if (cb_data.unique)
+ return cb_data.dst_ref;
+ free(cb_data.dst_ref);
+ return NULL;
+}
diff --git a/checkout.h b/checkout.h
new file mode 100644
index 0000000..9980711
--- /dev/null
+++ b/checkout.h
@@ -0,0 +1,13 @@
+#ifndef CHECKOUT_H
+#define CHECKOUT_H
+
+#include "cache.h"
+
+/*
+ * Check if the branch name uniquely matches a branch name on a remote
+ * tracking branch. Return the name of the remote if such a branch
+ * exists, NULL otherwise.
+ */
+extern const char *unique_tracking_name(const char *name, struct object_id *oid);
+
+#endif /* CHECKOUT_H */
diff --git a/ci/install-dependencies.sh b/ci/install-dependencies.sh
index a29246a..75a9fd2 100755
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@@ -8,27 +8,23 @@
P4WHENCE=http://filehost.perforce.com/perforce/r$LINUX_P4_VERSION
LFSWHENCE=https://github.com/github/git-lfs/releases/download/v$LINUX_GIT_LFS_VERSION
-case "${TRAVIS_OS_NAME:-linux}" in
-linux)
- export GIT_TEST_HTTPD=YesPlease
-
- mkdir --parents custom/p4
- pushd custom/p4
+case "$jobname" in
+linux-clang|linux-gcc)
+ mkdir --parents "$P4_PATH"
+ pushd "$P4_PATH"
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4d"
wget --quiet "$P4WHENCE/bin.linux26x86_64/p4"
chmod u+x p4d
chmod u+x p4
- export PATH="$(pwd):$PATH"
popd
- mkdir --parents custom/git-lfs
- pushd custom/git-lfs
+ mkdir --parents "$GIT_LFS_PATH"
+ pushd "$GIT_LFS_PATH"
wget --quiet "$LFSWHENCE/git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
tar --extract --gunzip --file "git-lfs-linux-amd64-$LINUX_GIT_LFS_VERSION.tar.gz"
cp git-lfs-$LINUX_GIT_LFS_VERSION/git-lfs .
- export PATH="$(pwd):$PATH"
popd
;;
-osx)
+osx-clang|osx-gcc)
brew update --quiet
# Uncomment this if you want to run perf tests:
# brew install gnu-time
diff --git a/ci/lib-travisci.sh b/ci/lib-travisci.sh
index b3ed0a0..07f27c7 100755
--- a/ci/lib-travisci.sh
+++ b/ci/lib-travisci.sh
@@ -16,13 +16,110 @@
if TAG=$(git describe --exact-match "$TRAVIS_BRANCH" 2>/dev/null) &&
test "$TAG" != "$TRAVIS_BRANCH"
then
- echo "Tip of $TRAVIS_BRANCH is exactly at $TAG"
+ echo "$(tput setaf 2)Tip of $TRAVIS_BRANCH is exactly at $TAG$(tput sgr0)"
exit 0
fi
}
+good_trees_file="$HOME/travis-cache/good-trees"
+
+# Save some info about the current commit's tree, so we can skip the build
+# job if we encounter the same tree again and can provide a useful info
+# message.
+save_good_tree () {
+ echo "$(git rev-parse $TRAVIS_COMMIT^{tree}) $TRAVIS_COMMIT $TRAVIS_JOB_NUMBER $TRAVIS_JOB_ID" >>"$good_trees_file"
+ # limit the file size
+ tail -1000 "$good_trees_file" >"$good_trees_file".tmp
+ mv "$good_trees_file".tmp "$good_trees_file"
+}
+
+# Skip the build job if the same tree has already been built and tested
+# successfully before (e.g. because the branch got rebased, changing only
+# the commit messages).
+skip_good_tree () {
+ if ! good_tree_info="$(grep "^$(git rev-parse $TRAVIS_COMMIT^{tree}) " "$good_trees_file")"
+ then
+ # Haven't seen this tree yet, or no cached good trees file yet.
+ # Continue the build job.
+ return
+ fi
+
+ echo "$good_tree_info" | {
+ read tree prev_good_commit prev_good_job_number prev_good_job_id
+
+ if test "$TRAVIS_JOB_ID" = "$prev_good_job_id"
+ then
+ cat <<-EOF
+ $(tput setaf 2)Skipping build job for commit $TRAVIS_COMMIT.$(tput sgr0)
+ This commit has already been built and tested successfully by this build job.
+ To force a re-build delete the branch's cache and then hit 'Restart job'.
+ EOF
+ else
+ cat <<-EOF
+ $(tput setaf 2)Skipping build job for commit $TRAVIS_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 https://travis-ci.org/$TRAVIS_REPO_SLUG/jobs/$prev_good_job_id
+ To force a re-build delete the branch's cache and then hit 'Restart job'.
+ EOF
+ fi
+ }
+
+ exit 0
+}
+
+check_unignored_build_artifacts ()
+{
+ ! git ls-files --other --exclude-standard --error-unmatch \
+ -- ':/*' 2>/dev/null ||
+ {
+ echo "$(tput setaf 1)error: found unignored build artifacts$(tput sgr0)"
+ false
+ }
+}
+
# Set 'exit on error' for all CI scripts to let the caller know that
-# something went wrong
-set -e
+# something went wrong.
+# Set tracing executed commands, primarily setting environment variables
+# and installing dependencies.
+set -ex
+
+mkdir -p "$HOME/travis-cache"
skip_branch_tip_with_tag
+skip_good_tree
+
+if test -z "$jobname"
+then
+ jobname="$TRAVIS_OS_NAME-$CC"
+fi
+
+export DEVELOPER=1
+export DEFAULT_TEST_TARGET=prove
+export GIT_PROVE_OPTS="--timer --jobs 3 --state=failed,slow,save"
+export GIT_TEST_OPTS="--verbose-log"
+export GIT_TEST_CLONE_2GB=YesPlease
+
+case "$jobname" in
+linux-clang|linux-gcc)
+ export GIT_TEST_HTTPD=YesPlease
+
+ # The Linux build installs the defined dependency versions below.
+ # The OS X build installs the latest available versions. Keep that
+ # in mind when you encounter a broken OS X build!
+ export LINUX_P4_VERSION="16.2"
+ export LINUX_GIT_LFS_VERSION="1.5.2"
+
+ P4_PATH="$HOME/custom/p4"
+ GIT_LFS_PATH="$HOME/custom/git-lfs"
+ export PATH="$GIT_LFS_PATH:$P4_PATH:$PATH"
+ ;;
+osx-clang|osx-gcc)
+ # 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"
+ ;;
+GETTEXT_POISON)
+ export GETTEXT_POISON=YesPlease
+ ;;
+esac
diff --git a/ci/print-test-failures.sh b/ci/print-test-failures.sh
index 8c8973c..4f261dd 100755
--- a/ci/print-test-failures.sh
+++ b/ci/print-test-failures.sh
@@ -5,6 +5,15 @@
. ${0%/*}/lib-travisci.sh
+# Tracing executed commands would produce too much noise in the loop below.
+set +x
+
+if ! ls t/test-results/*.exit >/dev/null 2>/dev/null
+then
+ echo "Build job failed before the tests could have been run"
+ exit
+fi
+
for TEST_EXIT in t/test-results/*.exit
do
if [ "$(cat "$TEST_EXIT")" != "0" ]
diff --git a/ci/run-build-and-tests.sh b/ci/run-build-and-tests.sh
new file mode 100755
index 0000000..3e23e65
--- /dev/null
+++ b/ci/run-build-and-tests.sh
@@ -0,0 +1,19 @@
+#!/bin/sh
+#
+# Build and test Git
+#
+
+. ${0%/*}/lib-travisci.sh
+
+ln -s $HOME/travis-cache/.prove t/.prove
+
+make --jobs=2
+make --quiet test
+if test "$jobname" = "linux-gcc"
+then
+ GIT_TEST_SPLIT_INDEX=YesPlease make --quiet test
+fi
+
+check_unignored_build_artifacts
+
+save_good_tree
diff --git a/ci/run-build.sh b/ci/run-build.sh
deleted file mode 100755
index 4f940d1..0000000
--- a/ci/run-build.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-#
-# Build Git
-#
-
-. ${0%/*}/lib-travisci.sh
-
-make --jobs=2
diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh
index e30fb2c..c19c50c 100755
--- a/ci/run-linux32-build.sh
+++ b/ci/run-linux32-build.sh
@@ -6,6 +6,8 @@
# run-linux32-build.sh [host-user-id]
#
+set -x
+
# Update packages to the latest available versions
linux32 --32bit i386 sh -c '
apt update >/dev/null &&
@@ -25,6 +27,7 @@
# Build and test
linux32 --32bit i386 su -m -l $CI_USER -c '
cd /usr/src/git &&
+ ln -s /tmp/travis-cache/.prove t/.prove &&
make --jobs=2 &&
make --quiet test
'
diff --git a/ci/run-linux32-docker.sh b/ci/run-linux32-docker.sh
index 0edf63a..4f191c5 100755
--- a/ci/run-linux32-docker.sh
+++ b/ci/run-linux32-docker.sh
@@ -19,5 +19,10 @@
--env GIT_TEST_OPTS \
--env GIT_TEST_CLONE_2GB \
--volume "${PWD}:/usr/src/git" \
+ --volume "${HOME}/travis-cache:/tmp/travis-cache" \
daald/ubuntu32:xenial \
/usr/src/git/ci/run-linux32-build.sh $(id -u $USER)
+
+check_unignored_build_artifacts
+
+save_good_tree
diff --git a/ci/run-static-analysis.sh b/ci/run-static-analysis.sh
index 68dd0f0..fe4ee4e 100755
--- a/ci/run-static-analysis.sh
+++ b/ci/run-static-analysis.sh
@@ -6,3 +6,5 @@
. ${0%/*}/lib-travisci.sh
make coccicheck
+
+save_good_tree
diff --git a/ci/run-tests.sh b/ci/run-tests.sh
deleted file mode 100755
index f0c743d..0000000
--- a/ci/run-tests.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-#
-# Test Git
-#
-
-. ${0%/*}/lib-travisci.sh
-
-mkdir -p $HOME/travis-cache
-ln -s $HOME/travis-cache/.prove t/.prove
-make --quiet test
diff --git a/ci/run-windows-build.sh b/ci/run-windows-build.sh
index 8757b3a..d99a180 100755
--- a/ci/run-windows-build.sh
+++ b/ci/run-windows-build.sh
@@ -69,6 +69,10 @@
echo "Visual Studio Team Services Build #${BUILD_ID}"
+# Tracing execued commands would produce too much noise in the waiting
+# loop below.
+set +x
+
# Wait until build job finished
STATUS=
RESULT=
@@ -90,7 +94,10 @@
# Print log
echo ""
echo ""
+set -x
gfwci "action=log&buildId=$BUILD_ID" | cut -c 30-
# Set exit code for TravisCI
test "$RESULT" = "success"
+
+save_good_tree
diff --git a/ci/test-documentation.sh b/ci/test-documentation.sh
index 7a0a848..a20de9c 100755
--- a/ci/test-documentation.sh
+++ b/ci/test-documentation.sh
@@ -18,6 +18,9 @@
test -s Documentation/git.1
grep '<meta name="generator" content="AsciiDoc ' Documentation/git.html
+rm -f stdout.log stderr.log
+check_unignored_build_artifacts
+
# Build docs with AsciiDoctor
make clean
make --jobs=2 USE_ASCIIDOCTOR=1 doc > >(tee stdout.log) 2> >(tee stderr.log >&2)
@@ -25,3 +28,8 @@
! test -s stderr.log
test -s Documentation/git.html
grep '<meta name="generator" content="Asciidoctor ' Documentation/git.html
+
+rm -f stdout.log stderr.log
+check_unignored_build_artifacts
+
+save_good_tree
diff --git a/color.c b/color.c
index 9a9261a..d48dd94 100644
--- a/color.c
+++ b/color.c
@@ -329,8 +329,7 @@
if (color_stdout_is_tty < 0)
color_stdout_is_tty = isatty(1);
if (color_stdout_is_tty || (pager_in_use() && pager_use_color)) {
- char *term = getenv("TERM");
- if (term && strcmp(term, "dumb"))
+ if (!is_terminal_dumb())
return 1;
}
return 0;
diff --git a/color.h b/color.h
index 9062765..fd2b688 100644
--- a/color.h
+++ b/color.h
@@ -42,6 +42,8 @@
#define GIT_COLOR_BG_BLUE "\033[44m"
#define GIT_COLOR_BG_MAGENTA "\033[45m"
#define GIT_COLOR_BG_CYAN "\033[46m"
+#define GIT_COLOR_FAINT "\033[2m"
+#define GIT_COLOR_FAINT_ITALIC "\033[2;3m"
/* A special value meaning "no color selected" */
#define GIT_COLOR_NIL "NIL"
diff --git a/column.c b/column.c
index ff7bdab..49ab85b 100644
--- a/column.c
+++ b/column.c
@@ -224,7 +224,7 @@
if (stdout_is_tty < 0)
stdout_is_tty = isatty(1);
*colopts &= ~COL_ENABLE_MASK;
- if (stdout_is_tty)
+ if (stdout_is_tty || pager_in_use())
*colopts |= COL_ENABLED;
}
return 0;
diff --git a/combine-diff.c b/combine-diff.c
index 9e163d5..2505de1 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -898,7 +898,7 @@
int show_file_header)
{
struct diff_options *opt = &rev->diffopt;
- int abbrev = DIFF_OPT_TST(opt, FULL_INDEX) ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV;
+ int abbrev = opt->flags.full_index ? GIT_SHA1_HEXSZ : DEFAULT_ABBREV;
const char *a_prefix = opt->a_prefix ? opt->a_prefix : "a/";
const char *b_prefix = opt->b_prefix ? opt->b_prefix : "b/";
const char *c_meta = diff_get_color_opt(opt, DIFF_METAINFO);
@@ -987,7 +987,7 @@
userdiff = userdiff_find_by_path(elem->path);
if (!userdiff)
userdiff = userdiff_find_by_name("default");
- if (DIFF_OPT_TST(opt, ALLOW_TEXTCONV))
+ if (opt->flags.allow_textconv)
textconv = userdiff_get_textconv(userdiff);
/* Read the result of merge first */
@@ -1014,7 +1014,7 @@
elem->mode = canon_mode(st.st_mode);
} else if (S_ISDIR(st.st_mode)) {
struct object_id oid;
- if (resolve_gitlink_ref(elem->path, "HEAD", oid.hash) < 0)
+ if (resolve_gitlink_ref(elem->path, "HEAD", &oid) < 0)
result = grab_blob(&elem->oid, elem->mode,
&result_size, NULL, NULL);
else
@@ -1413,8 +1413,8 @@
diffopts = *opt;
copy_pathspec(&diffopts.pathspec, &opt->pathspec);
- DIFF_OPT_SET(&diffopts, RECURSIVE);
- DIFF_OPT_CLR(&diffopts, ALLOW_EXTERNAL);
+ diffopts.flags.recursive = 1;
+ diffopts.flags.allow_external = 0;
/* find set of paths that everybody touches
*
@@ -1435,7 +1435,7 @@
* NOTE please keep this semantically in sync with diffcore_std()
*/
need_generic_pathscan = opt->skip_stat_unmatch ||
- DIFF_OPT_TST(opt, FOLLOW_RENAMES) ||
+ opt->flags.follow_renames ||
opt->break_opt != -1 ||
opt->detect_rename ||
opt->pickaxe ||
diff --git a/commit.c b/commit.c
index d3150d6..ff51c9f 100644
--- a/commit.c
+++ b/commit.c
@@ -59,7 +59,7 @@
struct object_id oid;
struct commit *commit;
- if (get_sha1_committish(name, oid.hash))
+ if (get_oid_committish(name, &oid))
return NULL;
commit = lookup_commit_reference(&oid);
if (parse_commit(commit))
@@ -134,35 +134,41 @@
return 0;
}
-struct commit_graft *read_graft_line(char *buf, int len)
+struct commit_graft *read_graft_line(struct strbuf *line)
{
/* The format is just "Commit Parent1 Parent2 ...\n" */
- int i;
+ int i, phase;
+ const char *tail = NULL;
struct commit_graft *graft = NULL;
- const int entry_size = GIT_SHA1_HEXSZ + 1;
+ struct object_id dummy_oid, *oid;
- while (len && isspace(buf[len-1]))
- buf[--len] = '\0';
- if (buf[0] == '#' || buf[0] == '\0')
+ strbuf_rtrim(line);
+ if (!line->len || line->buf[0] == '#')
return NULL;
- if ((len + 1) % entry_size)
- goto bad_graft_data;
- i = (len + 1) / entry_size - 1;
- graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i)));
- graft->nr_parent = i;
- if (get_oid_hex(buf, &graft->oid))
- goto bad_graft_data;
- for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {
- if (buf[i] != ' ')
+ /*
+ * phase 0 verifies line, counts hashes in line and allocates graft
+ * phase 1 fills graft
+ */
+ for (phase = 0; phase < 2; phase++) {
+ oid = graft ? &graft->oid : &dummy_oid;
+ if (parse_oid_hex(line->buf, oid, &tail))
goto bad_graft_data;
- if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))
- goto bad_graft_data;
+ for (i = 0; *tail != '\0'; i++) {
+ oid = graft ? &graft->parent[i] : &dummy_oid;
+ if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
+ goto bad_graft_data;
+ }
+ if (!graft) {
+ graft = xmalloc(st_add(sizeof(*graft),
+ st_mult(sizeof(struct object_id), i)));
+ graft->nr_parent = i;
+ }
}
return graft;
bad_graft_data:
- error("bad graft data: %s", buf);
- free(graft);
+ error("bad graft data: %s", line->buf);
+ assert(!graft);
return NULL;
}
@@ -174,7 +180,7 @@
return -1;
while (!strbuf_getwholeline(&buf, fp, '\n')) {
/* The format is just "Commit Parent1 Parent2 ...\n" */
- struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
+ struct commit_graft *graft = read_graft_line(&buf);
if (!graft)
continue;
if (register_commit_graft(graft, 1))
@@ -199,11 +205,11 @@
commit_graft_prepared = 1;
}
-struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
+struct commit_graft *lookup_commit_graft(const struct object_id *oid)
{
int pos;
prepare_commit_graft();
- pos = commit_graft_pos(sha1);
+ pos = commit_graft_pos(oid->hash);
if (pos < 0)
return NULL;
return commit_graft[pos];
@@ -334,7 +340,7 @@
bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
pptr = &item->parents;
- graft = lookup_commit_graft(item->object.oid.hash);
+ graft = lookup_commit_graft(&item->object.oid);
while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
struct commit *new_parent;
@@ -541,7 +547,7 @@
struct commit_list *list = NULL;
while (nr--) {
- commit_list_insert(*commit, &list);
+ clear_commit_marks_1(&list, *commit, mark);
commit++;
}
while (list)
@@ -553,20 +559,6 @@
clear_commit_marks_many(1, &commit, mark);
}
-void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
-{
- struct object *object;
- struct commit *commit;
- unsigned int i;
-
- for (i = 0; i < a->nr; i++) {
- object = a->objects[i].item;
- commit = lookup_commit_reference_gently(&object->oid, 1);
- if (commit)
- clear_commit_marks(commit, mark);
- }
-}
-
struct commit *pop_commit(struct commit_list **stack)
{
struct commit_list *top = *stack;
@@ -923,8 +915,7 @@
if (work[j]->object.flags & PARENT1)
redundant[filled_index[j]] = 1;
clear_commit_marks(array[i], all_flags);
- for (j = 0; j < filled; j++)
- clear_commit_marks(work[j], all_flags);
+ clear_commit_marks_many(filled, work, all_flags);
free_commit_list(common);
}
@@ -1080,9 +1071,17 @@
num_head = remove_redundant(array, num_head);
for (i = 0; i < num_head; i++)
tail = &commit_list_insert(array[i], tail)->next;
+ free(array);
return result;
}
+void reduce_heads_replace(struct commit_list **heads)
+{
+ struct commit_list *result = reduce_heads(*heads);
+ free_commit_list(*heads);
+ *heads = result;
+}
+
static const char gpg_sig_header[] = "gpgsig";
static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
@@ -1564,10 +1563,13 @@
if (encoding_is_utf8 && !verify_utf8(&buffer))
fprintf(stderr, _(commit_utf8_warn));
- if (sign_commit && do_sign_commit(&buffer, sign_commit))
- return -1;
+ if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
+ result = -1;
+ goto out;
+ }
result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
+out:
strbuf_release(&buffer);
return result;
}
@@ -1586,7 +1588,7 @@
struct object *obj;
struct commit *commit;
struct object_id oid;
- if (get_sha1(name, oid.hash))
+ if (get_oid(name, &oid))
return NULL;
obj = parse_object(&oid);
commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
diff --git a/commit.h b/commit.h
index f3805fe..425f402 100644
--- a/commit.h
+++ b/commit.h
@@ -7,6 +7,7 @@
#include "decorate.h"
#include "gpg-interface.h"
#include "string-list.h"
+#include "pretty.h"
struct commit_list {
struct commit *item;
@@ -121,93 +122,13 @@
void free_commit_list(struct commit_list *list);
-/* Commit formats */
-enum cmit_fmt {
- CMIT_FMT_RAW,
- CMIT_FMT_MEDIUM,
- CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
- CMIT_FMT_SHORT,
- CMIT_FMT_FULL,
- CMIT_FMT_FULLER,
- CMIT_FMT_ONELINE,
- CMIT_FMT_EMAIL,
- CMIT_FMT_MBOXRD,
- CMIT_FMT_USERFORMAT,
-
- CMIT_FMT_UNSPECIFIED
-};
-
-static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
-{
- return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
-}
-
struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */
-struct pretty_print_context {
- /*
- * Callers should tweak these to change the behavior of pp_* functions.
- */
- enum cmit_fmt fmt;
- int abbrev;
- const char *after_subject;
- int preserve_subject;
- struct date_mode date_mode;
- unsigned date_mode_explicit:1;
- int print_email_subject;
- int expand_tabs_in_log;
- int need_8bit_cte;
- char *notes_message;
- struct reflog_walk_info *reflog_info;
- struct rev_info *rev;
- const char *output_encoding;
- struct string_list *mailmap;
- int color;
- struct ident_split *from_ident;
-
- /*
- * Fields below here are manipulated internally by pp_* functions and
- * should not be counted on by callers.
- */
- struct string_list in_body_headers;
- int graph_width;
-};
-
-struct userformat_want {
- unsigned notes:1;
-};
-
extern int has_non_ascii(const char *text);
extern const char *logmsg_reencode(const struct commit *commit,
char **commit_encoding,
const char *output_encoding);
-extern void get_commit_format(const char *arg, struct rev_info *);
-extern const char *format_subject(struct strbuf *sb, const char *msg,
- const char *line_separator);
-extern void userformat_find_requirements(const char *fmt, struct userformat_want *w);
-extern int commit_format_is_empty(enum cmit_fmt);
extern const char *skip_blank_lines(const char *msg);
-extern void format_commit_message(const struct commit *commit,
- const char *format, struct strbuf *sb,
- const struct pretty_print_context *context);
-extern void pretty_print_commit(struct pretty_print_context *pp,
- const struct commit *commit,
- struct strbuf *sb);
-extern void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
- struct strbuf *sb);
-void pp_user_info(struct pretty_print_context *pp,
- const char *what, struct strbuf *sb,
- const char *line, const char *encoding);
-void pp_title_line(struct pretty_print_context *pp,
- const char **msg_p,
- struct strbuf *sb,
- const char *encoding,
- int need_8bit_cte);
-void pp_remainder(struct pretty_print_context *pp,
- const char **msg_p,
- struct strbuf *sb,
- int indent);
-
/** Removes the first commit from a list sorted by date, and adds all
* of its parents.
@@ -219,7 +140,6 @@
void clear_commit_marks(struct commit *commit, unsigned int mark);
void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
-void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
enum rev_sort_order {
@@ -247,9 +167,9 @@
};
typedef int (*each_commit_graft_fn)(const struct commit_graft *, void *);
-struct commit_graft *read_graft_line(char *buf, int len);
+struct commit_graft *read_graft_line(struct strbuf *line);
int register_commit_graft(struct commit_graft *, int);
-struct commit_graft *lookup_commit_graft(const unsigned char *sha1);
+struct commit_graft *lookup_commit_graft(const struct object_id *oid);
extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *rev2);
extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos);
@@ -313,7 +233,23 @@
extern int run_add_interactive(const char *revision, const char *patch_mode,
const struct pathspec *pathspec);
-struct commit_list *reduce_heads(struct commit_list *heads);
+/*
+ * Takes a list of commits and returns a new list where those
+ * have been removed that can be reached from other commits in
+ * the list. It is useful for, e.g., reducing the commits
+ * randomly thrown at the git-merge command and removing
+ * redundant commits that the user shouldn't have given to it.
+ *
+ * This function destroys the STALE bit of the commit objects'
+ * flags.
+ */
+extern struct commit_list *reduce_heads(struct commit_list *heads);
+
+/*
+ * Like `reduce_heads()`, except it replaces the list. Use this
+ * instead of `foo = reduce_heads(foo);` to avoid memory leaks.
+ */
+extern void reduce_heads_replace(struct commit_list **heads);
struct commit_extra_header {
struct commit_extra_header *next;
diff --git a/compat/bswap.h b/compat/bswap.h
index 7d063e9..5078ce5 100644
--- a/compat/bswap.h
+++ b/compat/bswap.h
@@ -158,7 +158,9 @@
#define get_be16(p) ntohs(*(unsigned short *)(p))
#define get_be32(p) ntohl(*(unsigned int *)(p))
+#define get_be64(p) ntohll(*(uint64_t *)(p))
#define put_be32(p, v) do { *(unsigned int *)(p) = htonl(v); } while (0)
+#define put_be64(p, v) do { *(uint64_t *)(p) = htonll(v); } while (0)
#else
@@ -178,6 +180,13 @@
(uint32_t)p[3] << 0;
}
+static inline uint64_t get_be64(const void *ptr)
+{
+ const unsigned char *p = ptr;
+ return (uint64_t)get_be32(&p[0]) << 32 |
+ (uint64_t)get_be32(&p[4]) << 0;
+}
+
static inline void put_be32(void *ptr, uint32_t value)
{
unsigned char *p = ptr;
@@ -187,4 +196,17 @@
p[3] = value >> 0;
}
+static inline void put_be64(void *ptr, uint64_t value)
+{
+ unsigned char *p = ptr;
+ p[0] = value >> 56;
+ p[1] = value >> 48;
+ p[2] = value >> 40;
+ p[3] = value >> 32;
+ p[4] = value >> 24;
+ p[5] = value >> 16;
+ p[6] = value >> 8;
+ p[7] = value >> 0;
+}
+
#endif
diff --git a/compat/mingw.c b/compat/mingw.c
index 8b6fa0d..2d44d21 100644
--- a/compat/mingw.c
+++ b/compat/mingw.c
@@ -2139,6 +2139,62 @@
return memcpy(malloc_startup(len), buffer, len);
}
+static void maybe_redirect_std_handle(const wchar_t *key, DWORD std_id, int fd,
+ DWORD desired_access, DWORD flags)
+{
+ DWORD create_flag = fd ? OPEN_ALWAYS : OPEN_EXISTING;
+ wchar_t buf[MAX_PATH];
+ DWORD max = ARRAY_SIZE(buf);
+ HANDLE handle;
+ DWORD ret = GetEnvironmentVariableW(key, buf, max);
+
+ if (!ret || ret >= max)
+ return;
+
+ /* make sure this does not leak into child processes */
+ SetEnvironmentVariableW(key, NULL);
+ if (!wcscmp(buf, L"off")) {
+ close(fd);
+ handle = GetStdHandle(std_id);
+ if (handle != INVALID_HANDLE_VALUE)
+ CloseHandle(handle);
+ return;
+ }
+ if (std_id == STD_ERROR_HANDLE && !wcscmp(buf, L"2>&1")) {
+ handle = GetStdHandle(STD_OUTPUT_HANDLE);
+ if (handle == INVALID_HANDLE_VALUE) {
+ close(fd);
+ handle = GetStdHandle(std_id);
+ if (handle != INVALID_HANDLE_VALUE)
+ CloseHandle(handle);
+ } else {
+ int new_fd = _open_osfhandle((intptr_t)handle, O_BINARY);
+ SetStdHandle(std_id, handle);
+ dup2(new_fd, fd);
+ /* do *not* close the new_fd: that would close stdout */
+ }
+ return;
+ }
+ handle = CreateFileW(buf, desired_access, 0, NULL, create_flag,
+ flags, NULL);
+ if (handle != INVALID_HANDLE_VALUE) {
+ int new_fd = _open_osfhandle((intptr_t)handle, O_BINARY);
+ SetStdHandle(std_id, handle);
+ dup2(new_fd, fd);
+ close(new_fd);
+ }
+}
+
+static void maybe_redirect_std_handles(void)
+{
+ maybe_redirect_std_handle(L"GIT_REDIRECT_STDIN", STD_INPUT_HANDLE, 0,
+ GENERIC_READ, FILE_ATTRIBUTE_NORMAL);
+ maybe_redirect_std_handle(L"GIT_REDIRECT_STDOUT", STD_OUTPUT_HANDLE, 1,
+ GENERIC_WRITE, FILE_ATTRIBUTE_NORMAL);
+ maybe_redirect_std_handle(L"GIT_REDIRECT_STDERR", STD_ERROR_HANDLE, 2,
+ GENERIC_WRITE, FILE_FLAG_NO_BUFFERING);
+}
+
void mingw_startup(void)
{
int i, maxlen, argc;
@@ -2146,6 +2202,8 @@
wchar_t **wenv, **wargv;
_startupinfo si;
+ maybe_redirect_std_handles();
+
/* get wide char arguments and environment */
si.newmode = 0;
if (__wgetmainargs(&argc, &wargv, &wenv, _CRT_glob, &si) < 0)
diff --git a/compat/obstack.c b/compat/obstack.c
index e276ccd..4d1d95b 100644
--- a/compat/obstack.c
+++ b/compat/obstack.c
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#include "git-compat-util.h"
#include <gettext.h>
diff --git a/compat/obstack.h b/compat/obstack.h
index ceb4bdb..6bc24b7 100644
--- a/compat/obstack.h
+++ b/compat/obstack.h
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
/* Summary:
diff --git a/compat/poll/poll.c b/compat/poll/poll.c
index ae03b74..7ed3fbb 100644
--- a/compat/poll/poll.c
+++ b/compat/poll/poll.c
@@ -16,8 +16,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Tell gcc not to warn about the (nfd < 0) tests, below. */
#if (__GNUC__ == 4 && 3 <= __GNUC_MINOR__) || 4 < __GNUC__
diff --git a/compat/poll/poll.h b/compat/poll/poll.h
index b7aa59d..cd19952 100644
--- a/compat/poll/poll.h
+++ b/compat/poll/poll.h
@@ -16,8 +16,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ with this program; if not, see <http://www.gnu.org/licenses/>. */
#ifndef _GL_POLL_H
#define _GL_POLL_H
diff --git a/compat/regex/regcomp.c b/compat/regex/regcomp.c
index d8bde06..51cd60b 100644
--- a/compat/regex/regcomp.c
+++ b/compat/regex/regcomp.c
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
static reg_errcode_t re_compile_internal (regex_t *preg, const char * pattern,
size_t length, reg_syntax_t syntax);
diff --git a/compat/regex/regex.c b/compat/regex/regex.c
index 5cb23e5..f3e03a9 100644
--- a/compat/regex/regex.c
+++ b/compat/regex/regex.c
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
#include "config.h"
diff --git a/compat/regex/regex.h b/compat/regex/regex.h
index 61c9683..4d81358 100644
--- a/compat/regex/regex.h
+++ b/compat/regex/regex.h
@@ -18,9 +18,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#ifndef _REGEX_H
#define _REGEX_H 1
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
index d4121f2..59bf151 100644
--- a/compat/regex/regex_internal.c
+++ b/compat/regex/regex_internal.c
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
static void re_string_construct_common (const char *str, int len,
re_string_t *pstr,
@@ -613,7 +612,7 @@
int low = 0, high = pstr->valid_len, mid;
do
{
- mid = (high + low) / 2;
+ mid = low + (high - low) / 2;
if (pstr->offsets[mid] > offset)
high = mid;
else if (pstr->offsets[mid] < offset)
@@ -1394,7 +1393,7 @@
right = set->nelem - 1;
while (idx < right)
{
- mid = (idx + right) / 2;
+ mid = idx + (right - idx) / 2;
if (set->elems[mid] < elem)
idx = mid + 1;
else
diff --git a/compat/regex/regex_internal.h b/compat/regex/regex_internal.h
index 4184d7f..3ee8aae 100644
--- a/compat/regex/regex_internal.h
+++ b/compat/regex/regex_internal.h
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
#ifndef _REGEX_INTERNAL_H
#define _REGEX_INTERNAL_H 1
diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
index 0a745d9..1b5d89f 100644
--- a/compat/regex/regexec.c
+++ b/compat/regex/regexec.c
@@ -14,9 +14,8 @@
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, write to the Free
- Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA. */
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
static reg_errcode_t match_ctx_init (re_match_context_t *cache, int eflags,
int n) internal_function;
@@ -4284,7 +4283,7 @@
last = right = mctx->nbkref_ents;
for (left = 0; left < right;)
{
- mid = (left + right) / 2;
+ mid = left + (right - left) / 2;
if (mctx->bkref_ents[mid].str_idx < str_idx)
left = mid + 1;
else
diff --git a/compat/win32/lazyload.h b/compat/win32/lazyload.h
new file mode 100644
index 0000000..9e631c8
--- /dev/null
+++ b/compat/win32/lazyload.h
@@ -0,0 +1,57 @@
+#ifndef LAZYLOAD_H
+#define LAZYLOAD_H
+
+/*
+ * A pair of macros to simplify loading of DLL functions. Example:
+ *
+ * DECLARE_PROC_ADDR(kernel32.dll, BOOL, CreateHardLinkW,
+ * LPCWSTR, LPCWSTR, LPSECURITY_ATTRIBUTES);
+ *
+ * if (!INIT_PROC_ADDR(CreateHardLinkW))
+ * return error("Could not find CreateHardLinkW() function";
+ *
+ * if (!CreateHardLinkW(source, target, NULL))
+ * return error("could not create hardlink from %S to %S",
+ * source, target);
+ */
+
+struct proc_addr {
+ const char *const dll;
+ const char *const function;
+ FARPROC pfunction;
+ unsigned initialized : 1;
+};
+
+/* Declares a function to be loaded dynamically from a DLL. */
+#define DECLARE_PROC_ADDR(dll, rettype, function, ...) \
+ static struct proc_addr proc_addr_##function = \
+ { #dll, #function, NULL, 0 }; \
+ static rettype (WINAPI *function)(__VA_ARGS__)
+
+/*
+ * Loads a function from a DLL (once-only).
+ * Returns non-NULL function pointer on success.
+ * Returns NULL + errno == ENOSYS on failure.
+ * This function is not thread-safe.
+ */
+#define INIT_PROC_ADDR(function) \
+ (function = get_proc_addr(&proc_addr_##function))
+
+static inline void *get_proc_addr(struct proc_addr *proc)
+{
+ /* only do this once */
+ if (!proc->initialized) {
+ HANDLE hnd;
+ proc->initialized = 1;
+ hnd = LoadLibraryExA(proc->dll, NULL,
+ LOAD_LIBRARY_SEARCH_SYSTEM32);
+ if (hnd)
+ proc->pfunction = GetProcAddress(hnd, proc->function);
+ }
+ /* set ENOSYS if DLL or function was not found */
+ if (!proc->pfunction)
+ errno = ENOSYS;
+ return proc->pfunction;
+}
+
+#endif
diff --git a/config.c b/config.c
index 17e1349..e617c20 100644
--- a/config.c
+++ b/config.c
@@ -928,7 +928,7 @@
return ret;
}
-int git_parse_maybe_bool(const char *value)
+static int git_parse_maybe_bool_text(const char *value)
{
if (!value)
return 1;
@@ -945,9 +945,9 @@
return -1;
}
-int git_config_maybe_bool(const char *name, const char *value)
+int git_parse_maybe_bool(const char *value)
{
- int v = git_parse_maybe_bool(value);
+ int v = git_parse_maybe_bool_text(value);
if (0 <= v)
return v;
if (git_parse_int(value, &v))
@@ -957,7 +957,7 @@
int git_config_bool_or_int(const char *name, const char *value, int *is_bool)
{
- int v = git_parse_maybe_bool(value);
+ int v = git_parse_maybe_bool_text(value);
if (0 <= v) {
*is_bool = 1;
return v;
@@ -990,6 +990,16 @@
return 0;
}
+int git_config_expiry_date(timestamp_t *timestamp, const char *var, const char *value)
+{
+ if (!value)
+ return config_error_nonbool(var);
+ if (parse_expiry_date(value, timestamp))
+ return error(_("'%s' for '%s' is not a valid timestamp"),
+ value, var);
+ return 0;
+}
+
static int git_default_core_config(const char *var, const char *value)
{
/* This needs a better name */
@@ -1460,9 +1470,9 @@
return do_config_from(&top, fn, data);
}
-int git_config_from_blob_sha1(config_fn_t fn,
+int git_config_from_blob_oid(config_fn_t fn,
const char *name,
- const unsigned char *sha1,
+ const struct object_id *oid,
void *data)
{
enum object_type type;
@@ -1470,7 +1480,7 @@
unsigned long size;
int ret;
- buf = read_sha1_file(sha1, &type, &size);
+ buf = read_sha1_file(oid->hash, &type, &size);
if (!buf)
return error("unable to load config blob object '%s'", name);
if (type != OBJ_BLOB) {
@@ -1488,11 +1498,11 @@
const char *name,
void *data)
{
- unsigned char sha1[20];
+ struct object_id oid;
- if (get_sha1(name, sha1) < 0)
+ if (get_oid(name, &oid) < 0)
return error("unable to resolve config blob '%s'", name);
- return git_config_from_blob_sha1(fn, name, sha1, data);
+ return git_config_from_blob_oid(fn, name, &oid, data);
}
const char *git_etc_gitconfig(void)
@@ -1715,17 +1725,19 @@
}
static int config_set_element_cmp(const void *unused_cmp_data,
- const struct config_set_element *e1,
- const struct config_set_element *e2,
+ const void *entry,
+ const void *entry_or_key,
const void *unused_keydata)
{
+ const struct config_set_element *e1 = entry;
+ const struct config_set_element *e2 = entry_or_key;
+
return strcmp(e1->key, e2->key);
}
void git_configset_init(struct config_set *cs)
{
- hashmap_init(&cs->config_hash, (hashmap_cmp_fn)config_set_element_cmp,
- NULL, 0);
+ hashmap_init(&cs->config_hash, config_set_element_cmp, NULL, 0);
cs->hash_initialized = 1;
cs->list.nr = 0;
cs->list.alloc = 0;
@@ -1846,7 +1858,7 @@
{
const char *value;
if (!git_configset_get_value(cs, key, &value)) {
- *dest = git_config_maybe_bool(key, value);
+ *dest = git_parse_maybe_bool(value);
if (*dest == -1)
return -1;
return 0;
@@ -2053,6 +2065,23 @@
return repo_config_get_pathname(the_repository, key, dest);
}
+/*
+ * Note: This function exists solely to maintain backward compatibility with
+ * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
+ * NOT be used anywhere else.
+ *
+ * Runs the provided config function on the '.gitmodules' file found in the
+ * working directory.
+ */
+void config_from_gitmodules(config_fn_t fn, void *data)
+{
+ if (the_repository->worktree) {
+ char *file = repo_worktree_path(the_repository, GITMODULES_FILE);
+ git_config_from_file(fn, file, data);
+ free(file);
+ }
+}
+
int git_config_get_expiry(const char *key, const char **output)
{
int ret = git_config_get_string_const(key, output);
@@ -2066,6 +2095,28 @@
return ret;
}
+int git_config_get_expiry_in_days(const char *key, timestamp_t *expiry, timestamp_t now)
+{
+ char *expiry_string;
+ intmax_t days;
+ timestamp_t when;
+
+ if (git_config_get_string(key, &expiry_string))
+ return 1; /* no such thing */
+
+ if (git_parse_signed(expiry_string, &days, maximum_signed_value_of_type(int))) {
+ const int scale = 86400;
+ *expiry = now - days * scale;
+ return 0;
+ }
+
+ if (!parse_expiry_date(expiry_string, &when)) {
+ *expiry = when;
+ return 0;
+ }
+ return -1; /* thing exists but cannot be parsed */
+}
+
int git_config_get_untracked_cache(void)
{
int val = -1;
@@ -2115,6 +2166,20 @@
return -1; /* default value */
}
+int git_config_get_fsmonitor(void)
+{
+ if (git_config_get_pathname("core.fsmonitor", &core_fsmonitor))
+ core_fsmonitor = getenv("GIT_FSMONITOR_TEST");
+
+ if (core_fsmonitor && !*core_fsmonitor)
+ core_fsmonitor = NULL;
+
+ if (core_fsmonitor)
+ return 1;
+
+ return 0;
+}
+
NORETURN
void git_die_config_linenr(const char *key, const char *filename, int linenr)
{
@@ -2247,11 +2312,10 @@
return 4;
}
-static ssize_t write_section(int fd, const char *key)
+static struct strbuf store_create_section(const char *key)
{
const char *dot;
int i;
- ssize_t ret;
struct strbuf sb = STRBUF_INIT;
dot = memchr(key, '.', store.baselen);
@@ -2267,6 +2331,14 @@
strbuf_addf(&sb, "[%.*s]\n", store.baselen, key);
}
+ return sb;
+}
+
+static ssize_t write_section(int fd, const char *key)
+{
+ struct strbuf sb = store_create_section(key);
+ ssize_t ret;
+
ret = write_in_full(fd, sb.buf, sb.len);
strbuf_release(&sb);
@@ -2310,6 +2382,7 @@
case '"':
case '\\':
strbuf_addch(&sb, '\\');
+ /* fallthrough */
default:
strbuf_addch(&sb, value[i]);
break;
@@ -2402,7 +2475,7 @@
{
int fd = -1, in_fd = -1;
int ret;
- static struct lock_file lock;
+ struct lock_file lock = LOCK_INIT;
char *filename_buf = NULL;
char *contents = NULL;
size_t contents_sz;
@@ -2697,16 +2770,17 @@
}
/* if new_name == NULL, the section is removed instead */
-int git_config_rename_section_in_file(const char *config_filename,
- const char *old_name, const char *new_name)
+static int git_config_copy_or_rename_section_in_file(const char *config_filename,
+ const char *old_name, const char *new_name, int copy)
{
int ret = 0, remove = 0;
char *filename_buf = NULL;
- struct lock_file *lock;
+ struct lock_file lock = LOCK_INIT;
int out_fd;
char buf[1024];
FILE *config_file = NULL;
struct stat st;
+ struct strbuf copystr = STRBUF_INIT;
if (new_name && !section_name_is_ok(new_name)) {
ret = error("invalid section name: %s", new_name);
@@ -2716,8 +2790,7 @@
if (!config_filename)
config_filename = filename_buf = git_pathdup("config");
- lock = xcalloc(1, sizeof(struct lock_file));
- out_fd = hold_lock_file_for_update(lock, config_filename, 0);
+ out_fd = hold_lock_file_for_update(&lock, config_filename, 0);
if (out_fd < 0) {
ret = error("could not lock config file %s", config_filename);
goto out;
@@ -2736,21 +2809,39 @@
goto out;
}
- if (chmod(get_lock_file_path(lock), st.st_mode & 07777) < 0) {
+ if (chmod(get_lock_file_path(&lock), st.st_mode & 07777) < 0) {
ret = error_errno("chmod on %s failed",
- get_lock_file_path(lock));
+ get_lock_file_path(&lock));
goto out;
}
while (fgets(buf, sizeof(buf), config_file)) {
int i;
int length;
+ int is_section = 0;
char *output = buf;
for (i = 0; buf[i] && isspace(buf[i]); i++)
; /* do nothing */
if (buf[i] == '[') {
/* it's a section */
- int offset = section_name_match(&buf[i], old_name);
+ int offset;
+ is_section = 1;
+
+ /*
+ * When encountering a new section under -c we
+ * need to flush out any section we're already
+ * coping and begin anew. There might be
+ * multiple [branch "$name"] sections.
+ */
+ if (copystr.len > 0) {
+ if (write_in_full(out_fd, copystr.buf, copystr.len) < 0) {
+ ret = write_error(get_lock_file_path(&lock));
+ goto out;
+ }
+ strbuf_reset(©str);
+ }
+
+ offset = section_name_match(&buf[i], old_name);
if (offset > 0) {
ret++;
if (new_name == NULL) {
@@ -2758,25 +2849,29 @@
continue;
}
store.baselen = strlen(new_name);
- if (write_section(out_fd, new_name) < 0) {
- ret = write_error(get_lock_file_path(lock));
- goto out;
- }
- /*
- * We wrote out the new section, with
- * a newline, now skip the old
- * section's length
- */
- output += offset + i;
- if (strlen(output) > 0) {
+ if (!copy) {
+ if (write_section(out_fd, new_name) < 0) {
+ ret = write_error(get_lock_file_path(&lock));
+ goto out;
+ }
/*
- * More content means there's
- * a declaration to put on the
- * next line; indent with a
- * tab
+ * We wrote out the new section, with
+ * a newline, now skip the old
+ * section's length
*/
- output -= 1;
- output[0] = '\t';
+ output += offset + i;
+ if (strlen(output) > 0) {
+ /*
+ * More content means there's
+ * a declaration to put on the
+ * next line; indent with a
+ * tab
+ */
+ output -= 1;
+ output[0] = '\t';
+ }
+ } else {
+ copystr = store_create_section(new_name);
}
}
remove = 0;
@@ -2784,31 +2879,69 @@
if (remove)
continue;
length = strlen(output);
+
+ if (!is_section && copystr.len > 0) {
+ strbuf_add(©str, output, length);
+ }
+
if (write_in_full(out_fd, output, length) < 0) {
- ret = write_error(get_lock_file_path(lock));
+ ret = write_error(get_lock_file_path(&lock));
goto out;
}
}
+
+ /*
+ * Copy a trailing section at the end of the config, won't be
+ * flushed by the usual "flush because we have a new section
+ * logic in the loop above.
+ */
+ if (copystr.len > 0) {
+ if (write_in_full(out_fd, copystr.buf, copystr.len) < 0) {
+ ret = write_error(get_lock_file_path(&lock));
+ goto out;
+ }
+ strbuf_reset(©str);
+ }
+
fclose(config_file);
config_file = NULL;
commit_and_out:
- if (commit_lock_file(lock) < 0)
+ if (commit_lock_file(&lock) < 0)
ret = error_errno("could not write config file %s",
config_filename);
out:
if (config_file)
fclose(config_file);
- rollback_lock_file(lock);
+ rollback_lock_file(&lock);
out_no_rollback:
free(filename_buf);
return ret;
}
+int git_config_rename_section_in_file(const char *config_filename,
+ const char *old_name, const char *new_name)
+{
+ return git_config_copy_or_rename_section_in_file(config_filename,
+ old_name, new_name, 0);
+}
+
int git_config_rename_section(const char *old_name, const char *new_name)
{
return git_config_rename_section_in_file(NULL, old_name, new_name);
}
+int git_config_copy_section_in_file(const char *config_filename,
+ const char *old_name, const char *new_name)
+{
+ return git_config_copy_or_rename_section_in_file(config_filename,
+ old_name, new_name, 1);
+}
+
+int git_config_copy_section(const char *old_name, const char *new_name)
+{
+ return git_config_copy_section_in_file(NULL, old_name, new_name);
+}
+
/*
* Call this to report error for your variable that should not
* get a boolean value (i.e. "[my] var" means "true").
diff --git a/config.h b/config.h
index 0352da1..ef70a9c 100644
--- a/config.h
+++ b/config.h
@@ -39,8 +39,8 @@
extern int git_config_from_file(config_fn_t fn, const char *, void *);
extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
const char *name, const char *buf, size_t len, void *data);
-extern int git_config_from_blob_sha1(config_fn_t fn, const char *name,
- const unsigned char *sha1, void *data);
+extern int git_config_from_blob_oid(config_fn_t fn, const char *name,
+ const struct object_id *oid, void *data);
extern void git_config_push_parameter(const char *text);
extern int git_config_from_parameters(config_fn_t fn, void *data);
extern void read_early_config(config_fn_t cb, void *data);
@@ -56,9 +56,9 @@
extern ssize_t git_config_ssize_t(const char *, const char *);
extern int git_config_bool_or_int(const char *, const char *, int *);
extern int git_config_bool(const char *, const char *);
-extern int git_config_maybe_bool(const char *, const char *);
extern int git_config_string(const char **, const char *, const char *);
extern int git_config_pathname(const char **, const char *, const char *);
+extern int git_config_expiry_date(timestamp_t *, const char *, const char *);
extern int git_config_set_in_file_gently(const char *, const char *, const char *);
extern void git_config_set_in_file(const char *, const char *, const char *);
extern int git_config_set_gently(const char *, const char *);
@@ -71,6 +71,8 @@
extern void git_config_set_multivar_in_file(const char *, const char *, const char *, const char *, int);
extern int git_config_rename_section(const char *, const char *);
extern int git_config_rename_section_in_file(const char *, const char *, const char *);
+extern int git_config_copy_section(const char *, const char *);
+extern int git_config_copy_section_in_file(const char *, const char *, const char *);
extern const char *git_etc_gitconfig(void);
extern int git_env_bool(const char *, int);
extern unsigned long git_env_ulong(const char *, unsigned long);
@@ -187,6 +189,16 @@
extern int repo_config_get_pathname(struct repository *repo,
const char *key, const char **dest);
+/*
+ * Note: This function exists solely to maintain backward compatibility with
+ * 'fetch' and 'update_clone' storing configuration in '.gitmodules' and should
+ * NOT be used anywhere else.
+ *
+ * Runs the provided config function on the '.gitmodules' file found in the
+ * working directory.
+ */
+extern void config_from_gitmodules(config_fn_t fn, void *data);
+
extern int git_config_get_value(const char *key, const char **value);
extern const struct string_list *git_config_get_value_multi(const char *key);
extern void git_config_clear(void);
@@ -201,10 +213,14 @@
extern int git_config_get_untracked_cache(void);
extern int git_config_get_split_index(void);
extern int git_config_get_max_percent_split_change(void);
+extern int git_config_get_fsmonitor(void);
/* This dies if the configured or default date is in the future */
extern int git_config_get_expiry(const char *key, const char **output);
+/* parse either "this many days" integer, or "5.days.ago" approxidate */
+extern int git_config_get_expiry_in_days(const char *key, timestamp_t *, timestamp_t now);
+
struct key_value_info {
const char *filename;
int linenr;
diff --git a/config.mak.uname b/config.mak.uname
index 6604b13..6a1d0de 100644
--- a/config.mak.uname
+++ b/config.mak.uname
@@ -182,8 +182,8 @@
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
X = .exe
UNRELIABLE_FSTAT = UnfortunatelyYes
- SPARSE_FLAGS = -isystem /usr/include/w32api -Wno-one-bit-signed-bitfield
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
+ MMAP_PREVENTS_DELETE = UnfortunatelyYes
COMPAT_OBJS += compat/cygwin.o
FREAD_READS_DIRECTORIES = UnfortunatelyYes
endif
@@ -353,6 +353,7 @@
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
NO_NSEC = YesPlease
USE_WIN32_MMAP = YesPlease
+ MMAP_PREVENTS_DELETE = UnfortunatelyYes
# USE_NED_ALLOCATOR = YesPlease
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
@@ -501,6 +502,7 @@
NO_ST_BLOCKS_IN_STRUCT_STAT = YesPlease
NO_NSEC = YesPlease
USE_WIN32_MMAP = YesPlease
+ MMAP_PREVENTS_DELETE = UnfortunatelyYes
USE_NED_ALLOCATOR = YesPlease
UNRELIABLE_FSTAT = UnfortunatelyYes
OBJECT_CREATION_USES_RENAMES = UnfortunatelyNeedsTo
diff --git a/configure.ac b/configure.ac
index 2f55237..7f84151 100644
--- a/configure.ac
+++ b/configure.ac
@@ -241,7 +241,6 @@
# a bundled SHA1 routine optimized for PowerPC.
#
# Define NO_OPENSSL environment variable if you do not have OpenSSL.
-# This also implies BLK_SHA1.
#
# Define OPENSSLDIR=/foo/bar if your openssl header and library files are in
# /foo/bar/include and /foo/bar/lib directories.
diff --git a/connect.c b/connect.c
index 49b28b8..c3a014c 100644
--- a/connect.c
+++ b/connect.c
@@ -11,6 +11,8 @@
#include "string-list.h"
#include "sha1-array.h"
#include "transport.h"
+#include "strbuf.h"
+#include "protocol.h"
static char *server_capabilities;
static const char *parse_feature_value(const char *, const char *, int *);
@@ -108,6 +110,118 @@
}
/*
+ * Read one line of a server's ref advertisement into packet_buffer.
+ */
+static int read_remote_ref(int in, char **src_buf, size_t *src_len,
+ int *responded)
+{
+ int len = packet_read(in, src_buf, src_len,
+ packet_buffer, sizeof(packet_buffer),
+ PACKET_READ_GENTLE_ON_EOF |
+ PACKET_READ_CHOMP_NEWLINE);
+ const char *arg;
+ if (len < 0)
+ die_initial_contact(*responded);
+ if (len > 4 && skip_prefix(packet_buffer, "ERR ", &arg))
+ die("remote error: %s", arg);
+
+ *responded = 1;
+
+ return len;
+}
+
+#define EXPECTING_PROTOCOL_VERSION 0
+#define EXPECTING_FIRST_REF 1
+#define EXPECTING_REF 2
+#define EXPECTING_SHALLOW 3
+
+/* Returns 1 if packet_buffer is a protocol version pkt-line, 0 otherwise. */
+static int process_protocol_version(void)
+{
+ switch (determine_protocol_version_client(packet_buffer)) {
+ case protocol_v1:
+ return 1;
+ case protocol_v0:
+ return 0;
+ default:
+ die("server is speaking an unknown protocol");
+ }
+}
+
+static void process_capabilities(int *len)
+{
+ int nul_location = strlen(packet_buffer);
+ if (nul_location == *len)
+ return;
+ server_capabilities = xstrdup(packet_buffer + nul_location + 1);
+ *len = nul_location;
+}
+
+static int process_dummy_ref(void)
+{
+ struct object_id oid;
+ const char *name;
+
+ if (parse_oid_hex(packet_buffer, &oid, &name))
+ return 0;
+ if (*name != ' ')
+ return 0;
+ name++;
+
+ return !oidcmp(&null_oid, &oid) && !strcmp(name, "capabilities^{}");
+}
+
+static void check_no_capabilities(int len)
+{
+ if (strlen(packet_buffer) != len)
+ warning("Ignoring capabilities after first line '%s'",
+ packet_buffer + strlen(packet_buffer));
+}
+
+static int process_ref(int len, struct ref ***list, unsigned int flags,
+ struct oid_array *extra_have)
+{
+ struct object_id old_oid;
+ const char *name;
+
+ if (parse_oid_hex(packet_buffer, &old_oid, &name))
+ return 0;
+ if (*name != ' ')
+ return 0;
+ name++;
+
+ if (extra_have && !strcmp(name, ".have")) {
+ oid_array_append(extra_have, &old_oid);
+ } else if (!strcmp(name, "capabilities^{}")) {
+ die("protocol error: unexpected capabilities^{}");
+ } else if (check_ref(name, flags)) {
+ struct ref *ref = alloc_ref(name);
+ oidcpy(&ref->old_oid, &old_oid);
+ **list = ref;
+ *list = &ref->next;
+ }
+ check_no_capabilities(len);
+ return 1;
+}
+
+static int process_shallow(int len, struct oid_array *shallow_points)
+{
+ const char *arg;
+ struct object_id old_oid;
+
+ if (!skip_prefix(packet_buffer, "shallow ", &arg))
+ return 0;
+
+ if (get_oid_hex(arg, &old_oid))
+ die("protocol error: expected shallow sha-1, got '%s'", arg);
+ if (!shallow_points)
+ die("repository on the other end cannot be shallow");
+ oid_array_append(shallow_points, &old_oid);
+ check_no_capabilities(len);
+ return 1;
+}
+
+/*
* Read all the refs from the other end
*/
struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
@@ -123,76 +237,41 @@
* willing to talk to us. A hang-up before seeing any
* response does not necessarily mean an ACL problem, though.
*/
- int saw_response;
- int got_dummy_ref_with_capabilities_declaration = 0;
+ int responded = 0;
+ int len;
+ int state = EXPECTING_PROTOCOL_VERSION;
*list = NULL;
- for (saw_response = 0; ; saw_response = 1) {
- struct ref *ref;
- struct object_id old_oid;
- char *name;
- int len, name_len;
- char *buffer = packet_buffer;
- const char *arg;
- len = packet_read(in, &src_buf, &src_len,
- packet_buffer, sizeof(packet_buffer),
- PACKET_READ_GENTLE_ON_EOF |
- PACKET_READ_CHOMP_NEWLINE);
- if (len < 0)
- die_initial_contact(saw_response);
-
- if (!len)
- break;
-
- if (len > 4 && skip_prefix(buffer, "ERR ", &arg))
- die("remote error: %s", arg);
-
- if (len == GIT_SHA1_HEXSZ + strlen("shallow ") &&
- skip_prefix(buffer, "shallow ", &arg)) {
- if (get_oid_hex(arg, &old_oid))
- die("protocol error: expected shallow sha-1, got '%s'", arg);
- if (!shallow_points)
- die("repository on the other end cannot be shallow");
- oid_array_append(shallow_points, &old_oid);
- continue;
+ while ((len = read_remote_ref(in, &src_buf, &src_len, &responded))) {
+ switch (state) {
+ case EXPECTING_PROTOCOL_VERSION:
+ if (process_protocol_version()) {
+ state = EXPECTING_FIRST_REF;
+ break;
+ }
+ state = EXPECTING_FIRST_REF;
+ /* fallthrough */
+ case EXPECTING_FIRST_REF:
+ process_capabilities(&len);
+ if (process_dummy_ref()) {
+ state = EXPECTING_SHALLOW;
+ break;
+ }
+ state = EXPECTING_REF;
+ /* fallthrough */
+ case EXPECTING_REF:
+ if (process_ref(len, &list, flags, extra_have))
+ break;
+ state = EXPECTING_SHALLOW;
+ /* fallthrough */
+ case EXPECTING_SHALLOW:
+ if (process_shallow(len, shallow_points))
+ break;
+ die("protocol error: unexpected '%s'", packet_buffer);
+ default:
+ die("unexpected state %d", state);
}
-
- if (len < GIT_SHA1_HEXSZ + 2 || get_oid_hex(buffer, &old_oid) ||
- buffer[GIT_SHA1_HEXSZ] != ' ')
- die("protocol error: expected sha/ref, got '%s'", buffer);
- name = buffer + GIT_SHA1_HEXSZ + 1;
-
- name_len = strlen(name);
- if (len != name_len + GIT_SHA1_HEXSZ + 1) {
- free(server_capabilities);
- server_capabilities = xstrdup(name + name_len + 1);
- }
-
- if (extra_have && !strcmp(name, ".have")) {
- oid_array_append(extra_have, &old_oid);
- continue;
- }
-
- if (!strcmp(name, "capabilities^{}")) {
- if (saw_response)
- die("protocol error: unexpected capabilities^{}");
- if (got_dummy_ref_with_capabilities_declaration)
- die("protocol error: multiple capabilities^{}");
- got_dummy_ref_with_capabilities_declaration = 1;
- continue;
- }
-
- if (!check_ref(name, flags))
- continue;
-
- if (got_dummy_ref_with_capabilities_declaration)
- die("protocol error: unexpected ref after capabilities^{}");
-
- ref = alloc_ref(buffer + GIT_SHA1_HEXSZ + 1);
- oidcpy(&ref->old_oid, &old_oid);
- *list = ref;
- list = &ref->next;
}
annotate_refs_with_symref_info(*orig_list);
@@ -503,12 +582,25 @@
#endif /* NO_IPV6 */
-static void git_tcp_connect(int fd[2], char *host, int flags)
+/*
+ * Dummy child_process returned by git_connect() if the transport protocol
+ * does not need fork(2).
+ */
+static struct child_process no_fork = CHILD_PROCESS_INIT;
+
+int git_connection_is_socket(struct child_process *conn)
+{
+ return conn == &no_fork;
+}
+
+static struct child_process *git_tcp_connect(int fd[2], char *host, int flags)
{
int sockfd = git_tcp_connect_sock(host, flags);
fd[0] = sockfd;
fd[1] = dup(sockfd);
+
+ return &no_fork;
}
@@ -682,8 +774,6 @@
return protocol;
}
-static struct child_process no_fork = CHILD_PROCESS_INIT;
-
static const char *get_ssh_command(void)
{
const char *ssh;
@@ -697,37 +787,47 @@
return NULL;
}
-static int override_ssh_variant(int *port_option, int *needs_batch)
+enum ssh_variant {
+ VARIANT_AUTO,
+ VARIANT_SIMPLE,
+ VARIANT_SSH,
+ VARIANT_PLINK,
+ VARIANT_PUTTY,
+ VARIANT_TORTOISEPLINK,
+};
+
+static void override_ssh_variant(enum ssh_variant *ssh_variant)
{
- char *variant;
+ const char *variant = getenv("GIT_SSH_VARIANT");
- variant = xstrdup_or_null(getenv("GIT_SSH_VARIANT"));
- if (!variant &&
- git_config_get_string("ssh.variant", &variant))
- return 0;
+ if (!variant && git_config_get_string_const("ssh.variant", &variant))
+ return;
- if (!strcmp(variant, "plink") || !strcmp(variant, "putty")) {
- *port_option = 'P';
- *needs_batch = 0;
- } else if (!strcmp(variant, "tortoiseplink")) {
- *port_option = 'P';
- *needs_batch = 1;
- } else {
- *port_option = 'p';
- *needs_batch = 0;
- }
- free(variant);
- return 1;
+ if (!strcmp(variant, "auto"))
+ *ssh_variant = VARIANT_AUTO;
+ else if (!strcmp(variant, "plink"))
+ *ssh_variant = VARIANT_PLINK;
+ else if (!strcmp(variant, "putty"))
+ *ssh_variant = VARIANT_PUTTY;
+ else if (!strcmp(variant, "tortoiseplink"))
+ *ssh_variant = VARIANT_TORTOISEPLINK;
+ else if (!strcmp(variant, "simple"))
+ *ssh_variant = VARIANT_SIMPLE;
+ else
+ *ssh_variant = VARIANT_SSH;
}
-static void handle_ssh_variant(const char *ssh_command, int is_cmdline,
- int *port_option, int *needs_batch)
+static enum ssh_variant determine_ssh_variant(const char *ssh_command,
+ int is_cmdline)
{
+ enum ssh_variant ssh_variant = VARIANT_AUTO;
const char *variant;
char *p = NULL;
- if (override_ssh_variant(port_option, needs_batch))
- return;
+ override_ssh_variant(&ssh_variant);
+
+ if (ssh_variant != VARIANT_AUTO)
+ return ssh_variant;
if (!is_cmdline) {
p = xstrdup(ssh_command);
@@ -746,27 +846,200 @@
free(ssh_argv);
} else {
free(p);
- return;
+ return ssh_variant;
}
}
- if (!strcasecmp(variant, "plink") ||
- !strcasecmp(variant, "plink.exe"))
- *port_option = 'P';
+ if (!strcasecmp(variant, "ssh") ||
+ !strcasecmp(variant, "ssh.exe"))
+ ssh_variant = VARIANT_SSH;
+ else if (!strcasecmp(variant, "plink") ||
+ !strcasecmp(variant, "plink.exe"))
+ ssh_variant = VARIANT_PLINK;
else if (!strcasecmp(variant, "tortoiseplink") ||
- !strcasecmp(variant, "tortoiseplink.exe")) {
- *port_option = 'P';
- *needs_batch = 1;
- }
+ !strcasecmp(variant, "tortoiseplink.exe"))
+ ssh_variant = VARIANT_TORTOISEPLINK;
+
free(p);
+ return ssh_variant;
}
/*
- * This returns a dummy child_process if the transport protocol does not
- * need fork(2), or a struct child_process object if it does. Once done,
- * finish the connection with finish_connect() with the value returned from
- * this function (it is safe to call finish_connect() with NULL to support
- * the former case).
+ * Open a connection using Git's native protocol.
+ *
+ * The caller is responsible for freeing hostandport, but this function may
+ * modify it (for example, to truncate it to remove the port part).
+ */
+static struct child_process *git_connect_git(int fd[2], char *hostandport,
+ const char *path, const char *prog,
+ int flags)
+{
+ struct child_process *conn;
+ struct strbuf request = STRBUF_INIT;
+ /*
+ * Set up virtual host information based on where we will
+ * connect, unless the user has overridden us in
+ * the environment.
+ */
+ char *target_host = getenv("GIT_OVERRIDE_VIRTUAL_HOST");
+ if (target_host)
+ target_host = xstrdup(target_host);
+ else
+ target_host = xstrdup(hostandport);
+
+ transport_check_allowed("git");
+
+ /*
+ * These underlying connection commands die() if they
+ * cannot connect.
+ */
+ if (git_use_proxy(hostandport))
+ conn = git_proxy_connect(fd, hostandport);
+ else
+ conn = git_tcp_connect(fd, hostandport, flags);
+ /*
+ * Separate original protocol components prog and path
+ * from extended host header with a NUL byte.
+ *
+ * Note: Do not add any other headers here! Doing so
+ * will cause older git-daemon servers to crash.
+ */
+ strbuf_addf(&request,
+ "%s %s%chost=%s%c",
+ prog, path, 0,
+ target_host, 0);
+
+ /* If using a new version put that stuff here after a second null byte */
+ if (get_protocol_version_config() > 0) {
+ strbuf_addch(&request, '\0');
+ strbuf_addf(&request, "version=%d%c",
+ get_protocol_version_config(), '\0');
+ }
+
+ packet_write(fd[1], request.buf, request.len);
+
+ free(target_host);
+ strbuf_release(&request);
+ return conn;
+}
+
+/*
+ * Append the appropriate environment variables to `env` and options to
+ * `args` for running ssh in Git's SSH-tunneled transport.
+ */
+static void push_ssh_options(struct argv_array *args, struct argv_array *env,
+ enum ssh_variant variant, const char *port,
+ int flags)
+{
+ if (variant == VARIANT_SSH &&
+ get_protocol_version_config() > 0) {
+ argv_array_push(args, "-o");
+ argv_array_push(args, "SendEnv=" GIT_PROTOCOL_ENVIRONMENT);
+ argv_array_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
+ get_protocol_version_config());
+ }
+
+ if (flags & CONNECT_IPV4) {
+ switch (variant) {
+ case VARIANT_AUTO:
+ BUG("VARIANT_AUTO passed to push_ssh_options");
+ case VARIANT_SIMPLE:
+ die("ssh variant 'simple' does not support -4");
+ case VARIANT_SSH:
+ case VARIANT_PLINK:
+ case VARIANT_PUTTY:
+ case VARIANT_TORTOISEPLINK:
+ argv_array_push(args, "-4");
+ }
+ } else if (flags & CONNECT_IPV6) {
+ switch (variant) {
+ case VARIANT_AUTO:
+ BUG("VARIANT_AUTO passed to push_ssh_options");
+ case VARIANT_SIMPLE:
+ die("ssh variant 'simple' does not support -6");
+ case VARIANT_SSH:
+ case VARIANT_PLINK:
+ case VARIANT_PUTTY:
+ case VARIANT_TORTOISEPLINK:
+ argv_array_push(args, "-6");
+ }
+ }
+
+ if (variant == VARIANT_TORTOISEPLINK)
+ argv_array_push(args, "-batch");
+
+ if (port) {
+ switch (variant) {
+ case VARIANT_AUTO:
+ BUG("VARIANT_AUTO passed to push_ssh_options");
+ case VARIANT_SIMPLE:
+ die("ssh variant 'simple' does not support setting port");
+ case VARIANT_SSH:
+ argv_array_push(args, "-p");
+ break;
+ case VARIANT_PLINK:
+ case VARIANT_PUTTY:
+ case VARIANT_TORTOISEPLINK:
+ argv_array_push(args, "-P");
+ }
+
+ argv_array_push(args, port);
+ }
+}
+
+/* Prepare a child_process for use by Git's SSH-tunneled transport. */
+static void fill_ssh_args(struct child_process *conn, const char *ssh_host,
+ const char *port, int flags)
+{
+ const char *ssh;
+ enum ssh_variant variant;
+
+ if (looks_like_command_line_option(ssh_host))
+ die("strange hostname '%s' blocked", ssh_host);
+
+ ssh = get_ssh_command();
+ if (ssh) {
+ variant = determine_ssh_variant(ssh, 1);
+ } else {
+ /*
+ * GIT_SSH is the no-shell version of
+ * GIT_SSH_COMMAND (and must remain so for
+ * historical compatibility).
+ */
+ conn->use_shell = 0;
+
+ ssh = getenv("GIT_SSH");
+ if (!ssh)
+ ssh = "ssh";
+ variant = determine_ssh_variant(ssh, 0);
+ }
+
+ if (variant == VARIANT_AUTO) {
+ struct child_process detect = CHILD_PROCESS_INIT;
+
+ detect.use_shell = conn->use_shell;
+ detect.no_stdin = detect.no_stdout = detect.no_stderr = 1;
+
+ argv_array_push(&detect.args, ssh);
+ argv_array_push(&detect.args, "-G");
+ push_ssh_options(&detect.args, &detect.env_array,
+ VARIANT_SSH, port, flags);
+ argv_array_push(&detect.args, ssh_host);
+
+ variant = run_command(&detect) ? VARIANT_SIMPLE : VARIANT_SSH;
+ }
+
+ argv_array_push(&conn->args, ssh);
+ push_ssh_options(&conn->args, &conn->env_array, variant, port, flags);
+ argv_array_push(&conn->args, ssh_host);
+}
+
+/*
+ * This returns the dummy child_process `no_fork` if the transport protocol
+ * does not need fork(2), or a struct child_process object if it does. Once
+ * done, finish the connection with finish_connect() with the value returned
+ * from this function (it is safe to call finish_connect() with NULL to
+ * support the former case).
*
* If it returns, the connect is successful; it just dies on errors (this
* will hopefully be changed in a libification effort, to return NULL when
@@ -776,9 +1049,8 @@
const char *prog, int flags)
{
char *hostandport, *path;
- struct child_process *conn = &no_fork;
+ struct child_process *conn;
enum protocol protocol;
- struct strbuf cmd = STRBUF_INIT;
/* Without this we cannot rely on waitpid() to tell
* what happened to our children.
@@ -793,39 +1065,11 @@
printf("Diag: path=%s\n", path ? path : "NULL");
conn = NULL;
} else if (protocol == PROTO_GIT) {
- /*
- * Set up virtual host information based on where we will
- * connect, unless the user has overridden us in
- * the environment.
- */
- char *target_host = getenv("GIT_OVERRIDE_VIRTUAL_HOST");
- if (target_host)
- target_host = xstrdup(target_host);
- else
- target_host = xstrdup(hostandport);
-
- transport_check_allowed("git");
-
- /* These underlying connection commands die() if they
- * cannot connect.
- */
- if (git_use_proxy(hostandport))
- conn = git_proxy_connect(fd, hostandport);
- else
- git_tcp_connect(fd, hostandport, flags);
- /*
- * Separate original protocol components prog and path
- * from extended host header with a NUL byte.
- *
- * Note: Do not add any other headers here! Doing so
- * will cause older git-daemon servers to crash.
- */
- packet_write_fmt(fd[1],
- "%s %s%chost=%s%c",
- prog, path, 0,
- target_host, 0);
- free(target_host);
+ conn = git_connect_git(fd, hostandport, path, prog, flags);
} else {
+ struct strbuf cmd = STRBUF_INIT;
+ const char *const *var;
+
conn = xmalloc(sizeof(*conn));
child_process_init(conn);
@@ -837,13 +1081,12 @@
sq_quote_buf(&cmd, path);
/* remove repo-local variables from the environment */
- conn->env = local_repo_env;
+ for (var = local_repo_env; *var; var++)
+ argv_array_push(&conn->env_array, *var);
+
conn->use_shell = 1;
conn->in = conn->out = -1;
if (protocol == PROTO_SSH) {
- const char *ssh;
- int needs_batch = 0;
- int port_option = 'p';
char *ssh_host = hostandport;
const char *port = NULL;
transport_check_allowed("ssh");
@@ -862,48 +1105,16 @@
free(hostandport);
free(path);
free(conn);
+ strbuf_release(&cmd);
return NULL;
}
-
- if (looks_like_command_line_option(ssh_host))
- die("strange hostname '%s' blocked", ssh_host);
-
- ssh = get_ssh_command();
- if (ssh)
- handle_ssh_variant(ssh, 1, &port_option,
- &needs_batch);
- else {
- /*
- * GIT_SSH is the no-shell version of
- * GIT_SSH_COMMAND (and must remain so for
- * historical compatibility).
- */
- conn->use_shell = 0;
-
- ssh = getenv("GIT_SSH");
- if (!ssh)
- ssh = "ssh";
- else
- handle_ssh_variant(ssh, 0,
- &port_option,
- &needs_batch);
- }
-
- argv_array_push(&conn->args, ssh);
- if (flags & CONNECT_IPV4)
- argv_array_push(&conn->args, "-4");
- else if (flags & CONNECT_IPV6)
- argv_array_push(&conn->args, "-6");
- if (needs_batch)
- argv_array_push(&conn->args, "-batch");
- if (port) {
- argv_array_pushf(&conn->args,
- "-%c", port_option);
- argv_array_push(&conn->args, port);
- }
- argv_array_push(&conn->args, ssh_host);
+ fill_ssh_args(conn, ssh_host, port, flags);
} else {
transport_check_allowed("file");
+ if (get_protocol_version_config() > 0) {
+ argv_array_pushf(&conn->env_array, GIT_PROTOCOL_ENVIRONMENT "=version=%d",
+ get_protocol_version_config());
+ }
}
argv_array_push(&conn->args, cmd.buf);
@@ -919,11 +1130,6 @@
return conn;
}
-int git_connection_is_socket(struct child_process *conn)
-{
- return conn == &no_fork;
-}
-
int finish_connect(struct child_process *conn)
{
int code;
diff --git a/connected.c b/connected.c
index 136c2ac..4a47f33 100644
--- a/connected.c
+++ b/connected.c
@@ -3,6 +3,7 @@
#include "sigchain.h"
#include "connected.h"
#include "transport.h"
+#include "packfile.h"
/*
* If we feed all the commits we want to verify to this command
@@ -15,13 +16,13 @@
*
* Returns 0 if everything is connected, non-zero otherwise.
*/
-int check_connected(sha1_iterate_fn fn, void *cb_data,
+int check_connected(oid_iterate_fn fn, void *cb_data,
struct check_connected_options *opt)
{
struct child_process rev_list = CHILD_PROCESS_INIT;
struct check_connected_options defaults = CHECK_CONNECTED_INIT;
- char commit[41];
- unsigned char sha1[20];
+ char commit[GIT_MAX_HEXSZ + 1];
+ struct object_id oid;
int err = 0;
struct packed_git *new_pack = NULL;
struct transport *transport;
@@ -31,7 +32,7 @@
opt = &defaults;
transport = opt->transport;
- if (fn(cb_data, sha1)) {
+ if (fn(cb_data, &oid)) {
if (opt->err_fd)
close(opt->err_fd);
return err;
@@ -76,7 +77,7 @@
sigchain_push(SIGPIPE, SIG_IGN);
- commit[40] = '\n';
+ commit[GIT_SHA1_HEXSZ] = '\n';
do {
/*
* If index-pack already checked that:
@@ -86,17 +87,17 @@
* are sure the ref is good and not sending it to
* rev-list for verification.
*/
- if (new_pack && find_pack_entry_one(sha1, new_pack))
+ if (new_pack && find_pack_entry_one(oid.hash, new_pack))
continue;
- memcpy(commit, sha1_to_hex(sha1), 40);
- if (write_in_full(rev_list.in, commit, 41) < 0) {
+ memcpy(commit, oid_to_hex(&oid), GIT_SHA1_HEXSZ);
+ if (write_in_full(rev_list.in, commit, GIT_SHA1_HEXSZ + 1) < 0) {
if (errno != EPIPE && errno != EINVAL)
error_errno(_("failed write to rev-list"));
err = -1;
break;
}
- } while (!fn(cb_data, sha1));
+ } while (!fn(cb_data, &oid));
if (close(rev_list.in))
err = error_errno(_("failed to close rev-list's stdin"));
diff --git a/connected.h b/connected.h
index 4ca325f..a53f03a 100644
--- a/connected.h
+++ b/connected.h
@@ -8,7 +8,7 @@
* When called after returning the name for the last object, return -1
* to signal EOF, otherwise return 0.
*/
-typedef int (*sha1_iterate_fn)(void *, unsigned char [20]);
+typedef int (*oid_iterate_fn)(void *, struct object_id *oid);
/*
* Named-arguments struct for check_connected. All arguments are
@@ -51,7 +51,7 @@
*
* If "opt" is NULL, behaves as if CHECK_CONNECTED_INIT was passed.
*/
-int check_connected(sha1_iterate_fn fn, void *cb_data,
+int check_connected(oid_iterate_fn fn, void *cb_data,
struct check_connected_options *opt);
#endif /* CONNECTED_H */
diff --git a/contrib/coccinelle/strbuf.cocci b/contrib/coccinelle/strbuf.cocci
index 1d580e4..ce2e92c 100644
--- a/contrib/coccinelle/strbuf.cocci
+++ b/contrib/coccinelle/strbuf.cocci
@@ -1,21 +1,6 @@
@ strbuf_addf_with_format_only @
expression E;
-constant fmt;
-@@
- strbuf_addf(E,
-(
- fmt
-|
- _(fmt)
-)
- );
-
-@ script:python @
-fmt << strbuf_addf_with_format_only.fmt;
-@@
-cocci.include_match("%" not in fmt)
-
-@ extends strbuf_addf_with_format_only @
+constant fmt !~ "%";
@@
- strbuf_addf
+ strbuf_addstr
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 0e16f01..88813e9 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -111,8 +111,7 @@
# 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.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# The latest version of this software can be obtained here:
#
@@ -595,7 +594,7 @@
__git_list_merge_strategies ()
{
- git merge -s help 2>&1 |
+ LANG=C LC_ALL=C git merge -s help 2>&1 |
sed -n -e '/[Aa]vailable strategies are: /,/^$/{
s/\.$//
s/.*://
@@ -1205,7 +1204,7 @@
--color --no-color --verbose --abbrev= --no-abbrev
--track --no-track --contains --no-contains --merged --no-merged
--set-upstream-to= --edit-description --list
- --unset-upstream --delete --move --remotes
+ --unset-upstream --delete --move --copy --remotes
--column --no-column --sort= --points-at
"
;;
@@ -1250,7 +1249,8 @@
--*)
__gitcomp "
--quiet --ours --theirs --track --no-track --merge
- --conflict= --orphan --patch
+ --conflict= --orphan --patch --detach --ignore-skip-worktree-bits
+ --recurse-submodules --no-recurse-submodules
"
;;
*)
@@ -1400,7 +1400,7 @@
--patch-with-stat --name-only --name-status --color
--no-color --color-words --no-renames --check
--full-index --binary --abbrev --diff-filter=
- --find-copies-harder
+ --find-copies-harder --ignore-cr-at-eol
--text --ignore-space-at-eol --ignore-space-change
--ignore-all-space --ignore-blank-lines --exit-code
--quiet --ext-diff --no-ext-diff
@@ -1922,6 +1922,7 @@
--*)
__gitcomp "
--rebase --no-rebase
+ --autostash --no-autostash
$__git_merge_options
$__git_fetch_options
"
@@ -2350,6 +2351,7 @@
advice.rmHints
advice.statusHints
advice.statusUoption
+ advice.ignoredHook
alias.
am.keepcr
am.threeWay
@@ -2640,6 +2642,7 @@
sendemail.suppressfrom
sendemail.thread
sendemail.to
+ sendemail.tocmd
sendemail.validate
sendemail.smtpbatchsize
sendemail.smtprelogindelay
diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh
index c6cbef3..983e419 100644
--- a/contrib/completion/git-prompt.sh
+++ b/contrib/completion/git-prompt.sh
@@ -278,11 +278,12 @@
r="$c_clear$r"
}
+# Helper function to read the first line of a file into a variable.
+# __git_eread requires 2 arguments, the file path and the name of the
+# variable, in that order.
__git_eread ()
{
- local f="$1"
- shift
- test -r "$f" && read "$@" <"$f"
+ test -r "$1" && IFS=$'\r\n' read "$2" <"$1"
}
# __git_ps1 accepts 0 or 1 arguments (i.e., format string)
diff --git a/contrib/contacts/git-contacts b/contrib/contacts/git-contacts
index dbe2abf..85ad732 100755
--- a/contrib/contacts/git-contacts
+++ b/contrib/contacts/git-contacts
@@ -11,7 +11,7 @@
my $since = '5-years-ago';
my $min_percent = 10;
-my $labels_rx = qr/Signed-off-by|Reviewed-by|Acked-by|Cc/i;
+my $labels_rx = qr/Signed-off-by|Reviewed-by|Acked-by|Cc|Reported-by/i;
my %seen;
sub format_contact {
diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
index 2a317fc..d389bfa 100644
--- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
+++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c
@@ -13,8 +13,7 @@
* 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*
diff --git a/contrib/credential/libsecret/git-credential-libsecret.c b/contrib/credential/libsecret/git-credential-libsecret.c
index 4c56979..e6598b6 100644
--- a/contrib/credential/libsecret/git-credential-libsecret.c
+++ b/contrib/credential/libsecret/git-credential-libsecret.c
@@ -14,8 +14,7 @@
* 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
/*
@@ -104,7 +103,7 @@
items = secret_service_search_sync(service,
SECRET_SCHEMA_COMPAT_NETWORK,
attributes,
- SECRET_SEARCH_LOAD_SECRETS,
+ SECRET_SEARCH_LOAD_SECRETS | SECRET_SEARCH_UNLOCK,
NULL,
&error);
g_hash_table_unref(attributes);
diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c
index 0061340..86518cd 100644
--- a/contrib/credential/wincred/git-credential-wincred.c
+++ b/contrib/credential/wincred/git-credential-wincred.c
@@ -94,6 +94,12 @@
static void write_item(const char *what, LPCWSTR wbuf, int wlen)
{
char *buf;
+
+ if (!wbuf || !wlen) {
+ printf("%s=\n", what);
+ return;
+ }
+
int len = WideCharToMultiByte(CP_UTF8, 0, wbuf, wlen, NULL, 0, NULL,
FALSE);
buf = xmalloc(len);
@@ -160,7 +166,7 @@
static int match_cred(const CREDENTIALW *cred)
{
LPCWSTR target = cred->TargetName;
- if (wusername && wcscmp(wusername, cred->UserName))
+ if (wusername && wcscmp(wusername, cred->UserName ? cred->UserName : L""))
return 0;
return match_part(&target, L"git", L":") &&
@@ -183,7 +189,7 @@
for (i = 0; i < num_creds; ++i)
if (match_cred(creds[i])) {
write_item("username", creds[i]->UserName,
- wcslen(creds[i]->UserName));
+ creds[i]->UserName ? wcslen(creds[i]->UserName) : 0);
write_item("password",
(LPCWSTR)creds[i]->CredentialBlob,
creds[i]->CredentialBlobSize / sizeof(WCHAR));
diff --git a/contrib/emacs/git-blame.el b/contrib/emacs/git-blame.el
index e671f6c..510e0f7 100644
--- a/contrib/emacs/git-blame.el
+++ b/contrib/emacs/git-blame.el
@@ -25,9 +25,8 @@
;; 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
+;; License along with this program; if not, see
+;; <http://www.gnu.org/licenses/>.
;; http://www.fsf.org/copyleft/gpl.html
diff --git a/contrib/emacs/git.el b/contrib/emacs/git.el
index 5ffc506..97919f2 100644
--- a/contrib/emacs/git.el
+++ b/contrib/emacs/git.el
@@ -15,9 +15,8 @@
;; 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
+;; License along with this program; if not, see
+;; <http://www.gnu.org/licenses/>.
;;; Commentary:
diff --git a/contrib/examples/git-merge.sh b/contrib/examples/git-merge.sh
index ee99f1a..932e78d 100755
--- a/contrib/examples/git-merge.sh
+++ b/contrib/examples/git-merge.sh
@@ -399,7 +399,7 @@
?,1,"$1",*)
# If head can reach all the merge then we are up to date.
# but first the most common case of merging one remote.
- finish_up_to_date "Already up-to-date."
+ finish_up_to_date "Already up to date."
exit 0
;;
t,1,"$head",*)
@@ -459,7 +459,7 @@
done
if test "$up_to_date" = t
then
- finish_up_to_date "Already up-to-date. Yeeah!"
+ finish_up_to_date "Already up to date. Yeeah!"
exit 0
fi
;;
diff --git a/contrib/examples/git-resolve.sh b/contrib/examples/git-resolve.sh
index 70fdc27..3099dc8 100755
--- a/contrib/examples/git-resolve.sh
+++ b/contrib/examples/git-resolve.sh
@@ -41,7 +41,7 @@
case "$common" in
"$merge")
- echo "Already up-to-date. Yeeah!"
+ echo "Already up to date. Yeeah!"
dropheads
exit 0
;;
diff --git a/contrib/fast-import/import-directories.perl b/contrib/fast-import/import-directories.perl
index 4dec1f1..a16f79c 100755
--- a/contrib/fast-import/import-directories.perl
+++ b/contrib/fast-import/import-directories.perl
@@ -14,8 +14,7 @@
# 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., 675 Mass Ave, Cambridge, MA 02139, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
# ------------------------------------------------------------------------
diff --git a/contrib/git-jump/README b/contrib/git-jump/README
index 225e3f0..4484bda 100644
--- a/contrib/git-jump/README
+++ b/contrib/git-jump/README
@@ -63,6 +63,9 @@
# same as above, but case-insensitive; you can give
# arbitrary grep options
git jump grep -i foo_bar
+
+# use the silver searcher for git jump grep
+git config jump.grepCmd "ag --column"
--------------------------------------------------
@@ -92,3 +95,10 @@
The shell snippets to generate the quickfix lines will almost certainly
choke on filenames with exotic characters (like newlines).
+
+Contributing
+------------
+
+Bug fixes, bug reports, and feature requests should be discussed on the
+Git mailing list <git@vger.kernel.org>, and cc'd to the git-jump
+maintainer, Jeff King <peff@peff.net>.
diff --git a/contrib/git-jump/git-jump b/contrib/git-jump/git-jump
index 427f206..80ab059 100755
--- a/contrib/git-jump/git-jump
+++ b/contrib/git-jump/git-jump
@@ -11,7 +11,8 @@
merge: elements are merge conflicts. Arguments are ignored.
-grep: elements are grep hits. Arguments are given to grep.
+grep: elements are grep hits. Arguments are given to git grep or, if
+ configured, to the command in `jump.grepCmd`.
ws: elements are whitespace errors. Arguments are given to diff --check.
EOF
@@ -50,7 +51,9 @@
# but let's clean up extra whitespace, so they look better if the
# editor shows them to us in the status bar.
mode_grep() {
- git grep -n "$@" |
+ cmd=$(git config jump.grepCmd)
+ test -n "$cmd" || cmd="git grep -n"
+ $cmd "$@" |
perl -pe '
s/[ \t]+/ /g;
s/^ *//;
diff --git a/contrib/hg-to-git/hg-to-git.py b/contrib/hg-to-git/hg-to-git.py
index 60dec86..de3f816 100755
--- a/contrib/hg-to-git/hg-to-git.py
+++ b/contrib/hg-to-git/hg-to-git.py
@@ -15,8 +15,7 @@
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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with this program; if not, see <http://www.gnu.org/licenses/>.
"""
import os, os.path, sys
diff --git a/contrib/mw-to-git/Git/Mediawiki.pm b/contrib/mw-to-git/Git/Mediawiki.pm
index d13c4df..917d9e2 100644
--- a/contrib/mw-to-git/Git/Mediawiki.pm
+++ b/contrib/mw-to-git/Git/Mediawiki.pm
@@ -2,6 +2,7 @@
use 5.008;
use strict;
+use POSIX;
use Git;
BEGIN {
@@ -52,7 +53,7 @@
$filename =~ s/ /_/g;
# Decode forbidden characters encoded in clean_filename
$filename =~ s/_%_([0-9a-fA-F][0-9a-fA-F])/sprintf('%c', hex($1))/ge;
- return $filename;
+ return substr($filename, 0, NAME_MAX-length('.mw'));
}
sub connect_maybe {
diff --git a/contrib/mw-to-git/git-remote-mediawiki.perl b/contrib/mw-to-git/git-remote-mediawiki.perl
index e7f857c..af9cbc9 100755
--- a/contrib/mw-to-git/git-remote-mediawiki.perl
+++ b/contrib/mw-to-git/git-remote-mediawiki.perl
@@ -63,6 +63,11 @@
my @tracked_categories = split(/[ \n]/, run_git("config --get-all remote.${remotename}.categories"));
chomp(@tracked_categories);
+# Just like @tracked_categories, but for MediaWiki namespaces.
+my @tracked_namespaces = split(/[ \n]/, run_git("config --get-all remote.${remotename}.namespaces"));
+for (@tracked_namespaces) { s/_/ /g; }
+chomp(@tracked_namespaces);
+
# Import media files on pull
my $import_media = run_git("config --get --bool remote.${remotename}.mediaimport");
chomp($import_media);
@@ -256,6 +261,32 @@
return;
}
+sub get_mw_tracked_namespaces {
+ my $pages = shift;
+ foreach my $local_namespace (sort @tracked_namespaces) {
+ my $namespace_id;
+ if ($local_namespace eq "(Main)") {
+ $namespace_id = 0;
+ } else {
+ $namespace_id = get_mw_namespace_id($local_namespace);
+ }
+ # virtual namespaces don't support allpages
+ next if !defined($namespace_id) || $namespace_id < 0;
+ my $mw_pages = $mediawiki->list( {
+ action => 'query',
+ list => 'allpages',
+ apnamespace => $namespace_id,
+ aplimit => 'max' } )
+ || die $mediawiki->{error}->{code} . ': '
+ . $mediawiki->{error}->{details} . "\n";
+ print {*STDERR} "$#{$mw_pages} found in namespace $local_namespace ($namespace_id)\n";
+ foreach my $page (@{$mw_pages}) {
+ $pages->{$page->{title}} = $page;
+ }
+ }
+ return;
+}
+
sub get_mw_all_pages {
my $pages = shift;
# No user-provided list, get the list of pages from the API.
@@ -319,6 +350,10 @@
$user_defined = 1;
get_mw_tracked_categories(\%pages);
}
+ if (@tracked_namespaces) {
+ $user_defined = 1;
+ get_mw_tracked_namespaces(\%pages);
+ }
if (!$user_defined) {
get_mw_all_pages(\%pages);
}
@@ -1308,7 +1343,8 @@
my $id;
if (!defined $ns) {
- print {*STDERR} "No such namespace ${name} on MediaWiki.\n";
+ my @namespaces = map { s/ /_/g; $_; } sort keys %namespace_id;
+ print {*STDERR} "No such namespace ${name} on MediaWiki, known namespaces: @namespaces\n";
$ns = {is_namespace => 0};
$namespace_id{$name} = $ns;
}
diff --git a/contrib/rerere-train.sh b/contrib/rerere-train.sh
index 52ad9e4..eeee45d 100755
--- a/contrib/rerere-train.sh
+++ b/contrib/rerere-train.sh
@@ -3,10 +3,56 @@
# Prime rerere database from existing merge commits
me=rerere-train
-USAGE="$me rev-list-args"
+USAGE=$(cat <<-EOF
+usage: $me [--overwrite] <rev-list-args>
+
+ -h, --help show the help
+ -o, --overwrite overwrite any existing rerere cache
+EOF
+)
SUBDIRECTORY_OK=Yes
-OPTIONS_SPEC=
+
+overwrite=0
+
+while test $# -gt 0
+do
+ opt="$1"
+ case "$opt" in
+ -h|--help)
+ echo "$USAGE"
+ exit 0
+ ;;
+ -o|--overwrite)
+ overwrite=1
+ shift
+ break
+ ;;
+ --)
+ shift
+ break
+ ;;
+ *)
+ break
+ ;;
+ esac
+done
+
+# Overwrite or help options are not valid except as first arg
+for opt in "$@"
+do
+ case "$opt" in
+ -h|--help)
+ echo "$USAGE"
+ exit 0
+ ;;
+ -o|--overwrite)
+ echo "$USAGE"
+ exit 0
+ ;;
+ esac
+done
+
. "$(git --exec-path)/git-sh-setup"
require_work_tree
cd_to_toplevel
@@ -34,6 +80,10 @@
# Cleanly merges
continue
fi
+ if test $overwrite = 1
+ then
+ git rerere forget .
+ fi
if test -s "$GIT_DIR/MERGE_RR"
then
git show -s --pretty=format:"Learning from %h %s" "$commit"
diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt
index 60d76cd..352deda 100644
--- a/contrib/subtree/git-subtree.txt
+++ b/contrib/subtree/git-subtree.txt
@@ -28,7 +28,7 @@
Subtrees are not to be confused with submodules, which are meant for
the same task. Unlike submodules, subtrees do not need any special
-constructions (like .gitmodule files or gitlinks) be present in
+constructions (like .gitmodules files or gitlinks) be present in
your repository, and do not force end-users of your
repository to do anything special or to understand how subtrees
work. A subtree is just a subdirectory that can be
diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh
index 3c87eba..d05c613 100755
--- a/contrib/subtree/t/t7900-subtree.sh
+++ b/contrib/subtree/t/t7900-subtree.sh
@@ -253,7 +253,7 @@
# this shouldn not actually do anything, since FETCH_HEAD
# is already a parent
result=$(git merge -s ours -m "merge -s -ours" FETCH_HEAD) &&
- check_equal "${result}" "Already up-to-date."
+ check_equal "${result}" "Already up to date."
)
'
diff --git a/convert.c b/convert.c
index d714420..1a41a48 100644
--- a/convert.c
+++ b/convert.c
@@ -220,18 +220,27 @@
}
}
-static int has_cr_in_index(const struct index_state *istate, const char *path)
+static int has_crlf_in_index(const struct index_state *istate, const char *path)
{
unsigned long sz;
void *data;
- int has_cr;
+ const char *crp;
+ int has_crlf = 0;
data = read_blob_data_from_index(istate, path, &sz);
if (!data)
return 0;
- has_cr = memchr(data, '\r', sz) != NULL;
+
+ crp = memchr(data, '\r', sz);
+ if (crp) {
+ unsigned int ret_stats;
+ ret_stats = gather_convert_stats(data, sz);
+ if (!(ret_stats & CONVERT_STAT_BITS_BIN) &&
+ (ret_stats & CONVERT_STAT_BITS_TXT_CRLF))
+ has_crlf = 1;
+ }
free(data);
- return has_cr;
+ return has_crlf;
}
static int will_convert_lf_to_crlf(size_t len, struct text_stat *stats,
@@ -290,7 +299,7 @@
* cherry-pick.
*/
if ((checksafe != SAFE_CRLF_RENORMALIZE) &&
- has_cr_in_index(istate, path))
+ has_crlf_in_index(istate, path))
convert_crlf_into_lf = 0;
}
if ((checksafe == SAFE_CRLF_WARN ||
@@ -423,8 +432,10 @@
child_process.in = -1;
child_process.out = out;
- if (start_command(&child_process))
+ if (start_command(&child_process)) {
+ strbuf_release(&cmd);
return error("cannot fork to run external filter '%s'", params->cmd);
+ }
sigchain_push(SIGPIPE, SIG_IGN);
@@ -564,8 +575,7 @@
if (!subprocess_map_initialized) {
subprocess_map_initialized = 1;
- hashmap_init(&subprocess_map, (hashmap_cmp_fn) cmd2process_cmp,
- NULL, 0);
+ hashmap_init(&subprocess_map, cmd2process_cmp, NULL, 0);
entry = NULL;
} else {
entry = (struct cmd2process *)subprocess_find_entry(&subprocess_map, cmd);
@@ -1544,8 +1554,9 @@
switch (ident->state) {
default:
strbuf_add(&ident->left, head, ident->state);
+ /* fallthrough */
case IDENT_SKIPPING:
- /* fallthru */
+ /* fallthrough */
case IDENT_DRAINING:
ident_drain(ident, &output, osize_p);
}
diff --git a/credential-cache--daemon.c b/credential-cache--daemon.c
index 0d5c625..4dfbc8c 100644
--- a/credential-cache--daemon.c
+++ b/credential-cache--daemon.c
@@ -5,8 +5,6 @@
#include "unix-socket.h"
#include "parse-options.h"
-static struct tempfile socket_file;
-
struct credential_cache_entry {
struct credential item;
timestamp_t expiration;
@@ -260,6 +258,7 @@
int cmd_main(int argc, const char **argv)
{
+ struct tempfile *socket_file;
const char *socket_path;
int ignore_sighup = 0;
static const char *usage[] = {
@@ -285,7 +284,7 @@
die("socket directory must be an absolute path");
init_socket_directory(socket_path);
- register_tempfile(&socket_file, socket_path);
+ socket_file = register_tempfile(socket_path);
if (ignore_sighup)
signal(SIGHUP, SIG_IGN);
diff --git a/csum-file.c b/csum-file.c
index a172199..2adae04 100644
--- a/csum-file.c
+++ b/csum-file.c
@@ -19,7 +19,7 @@
if (ret < 0)
die_errno("%s: sha1 file read error", f->name);
- if (ret < count)
+ if (ret != count)
die("%s: sha1 file truncated", f->name);
if (memcmp(buf, check_buffer, count))
die("sha1 file '%s' validation error", f->name);
diff --git a/daemon.c b/daemon.c
index 3074707..72dfeaf 100644
--- a/daemon.c
+++ b/daemon.c
@@ -282,7 +282,7 @@
return NULL; /* Fallthrough. Deny by default */
}
-typedef int (*daemon_service_fn)(void);
+typedef int (*daemon_service_fn)(const struct argv_array *env);
struct daemon_service {
const char *name;
const char *config_name;
@@ -363,7 +363,7 @@
}
static int run_service(const char *dir, struct daemon_service *service,
- struct hostinfo *hi)
+ struct hostinfo *hi, const struct argv_array *env)
{
const char *path;
int enabled = service->enabled;
@@ -422,7 +422,7 @@
*/
signal(SIGTERM, SIG_IGN);
- return service->fn();
+ return service->fn(env);
}
static void copy_to_log(int fd)
@@ -462,25 +462,34 @@
return finish_command(cld);
}
-static int upload_pack(void)
+static int upload_pack(const struct argv_array *env)
{
struct child_process cld = CHILD_PROCESS_INIT;
argv_array_pushl(&cld.args, "upload-pack", "--strict", NULL);
argv_array_pushf(&cld.args, "--timeout=%u", timeout);
+
+ argv_array_pushv(&cld.env_array, env->argv);
+
return run_service_command(&cld);
}
-static int upload_archive(void)
+static int upload_archive(const struct argv_array *env)
{
struct child_process cld = CHILD_PROCESS_INIT;
argv_array_push(&cld.args, "upload-archive");
+
+ argv_array_pushv(&cld.env_array, env->argv);
+
return run_service_command(&cld);
}
-static int receive_pack(void)
+static int receive_pack(const struct argv_array *env)
{
struct child_process cld = CHILD_PROCESS_INIT;
argv_array_push(&cld.args, "receive-pack");
+
+ argv_array_pushv(&cld.env_array, env->argv);
+
return run_service_command(&cld);
}
@@ -573,8 +582,11 @@
/*
* Read the host as supplied by the client connection.
+ *
+ * Returns a pointer to the character after the NUL byte terminating the host
+ * arguemnt, or 'extra_args' if there is no host arguemnt.
*/
-static void parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen)
+static char *parse_host_arg(struct hostinfo *hi, char *extra_args, int buflen)
{
char *val;
int vallen;
@@ -585,6 +597,7 @@
if (strncasecmp("host=", extra_args, 5) == 0) {
val = extra_args + 5;
vallen = strlen(val) + 1;
+ loginfo("Extended attribute \"host\": %s", val);
if (*val) {
/* Split <host>:<port> at colon. */
char *host;
@@ -602,6 +615,45 @@
if (extra_args < end && *extra_args)
die("Invalid request");
}
+
+ return extra_args;
+}
+
+static void parse_extra_args(struct hostinfo *hi, struct argv_array *env,
+ char *extra_args, int buflen)
+{
+ const char *end = extra_args + buflen;
+ struct strbuf git_protocol = STRBUF_INIT;
+
+ /* First look for the host argument */
+ extra_args = parse_host_arg(hi, extra_args, buflen);
+
+ /* Look for additional arguments places after a second NUL byte */
+ for (; extra_args < end; extra_args += strlen(extra_args) + 1) {
+ const char *arg = extra_args;
+
+ /*
+ * Parse the extra arguments, adding most to 'git_protocol'
+ * which will be used to set the 'GIT_PROTOCOL' envvar in the
+ * service that will be run.
+ *
+ * If there ends up being a particular arg in the future that
+ * git-daemon needs to parse specificly (like the 'host' arg)
+ * then it can be parsed here and not added to 'git_protocol'.
+ */
+ if (*arg) {
+ if (git_protocol.len > 0)
+ strbuf_addch(&git_protocol, ':');
+ strbuf_addstr(&git_protocol, arg);
+ }
+ }
+
+ if (git_protocol.len > 0) {
+ loginfo("Extended attribute \"protocol\": %s", git_protocol.buf);
+ argv_array_pushf(env, GIT_PROTOCOL_ENVIRONMENT "=%s",
+ git_protocol.buf);
+ }
+ strbuf_release(&git_protocol);
}
/*
@@ -695,6 +747,7 @@
int pktlen, len, i;
char *addr = getenv("REMOTE_ADDR"), *port = getenv("REMOTE_PORT");
struct hostinfo hi;
+ struct argv_array env = ARGV_ARRAY_INIT;
hostinfo_init(&hi);
@@ -707,17 +760,12 @@
alarm(0);
len = strlen(line);
- if (pktlen != len)
- loginfo("Extended attributes (%d bytes) exist <%.*s>",
- (int) pktlen - len,
- (int) pktlen - len, line + len + 1);
- if (len && line[len-1] == '\n') {
- line[--len] = 0;
- pktlen--;
- }
+ if (len && line[len-1] == '\n')
+ line[len-1] = 0;
+ /* parse additional args hidden behind a NUL byte */
if (len != pktlen)
- parse_host_arg(&hi, line + len + 1, pktlen - len - 1);
+ parse_extra_args(&hi, &env, line + len + 1, pktlen - len - 1);
for (i = 0; i < ARRAY_SIZE(daemon_service); i++) {
struct daemon_service *s = &(daemon_service[i]);
@@ -730,13 +778,15 @@
* Note: The directory here is probably context sensitive,
* and might depend on the actual service being performed.
*/
- int rc = run_service(arg, s, &hi);
+ int rc = run_service(arg, s, &hi, &env);
hostinfo_clear(&hi);
+ argv_array_clear(&env);
return rc;
}
}
hostinfo_clear(&hi);
+ argv_array_clear(&env);
logerror("Protocol error: '%s'", line);
return -1;
}
diff --git a/decorate.c b/decorate.c
index 270eb25..de31331 100644
--- a/decorate.c
+++ b/decorate.c
@@ -14,20 +14,20 @@
static void *insert_decoration(struct decoration *n, const struct object *base, void *decoration)
{
int size = n->size;
- struct object_decoration *hash = n->hash;
+ struct decoration_entry *entries = n->entries;
unsigned int j = hash_obj(base, size);
- while (hash[j].base) {
- if (hash[j].base == base) {
- void *old = hash[j].decoration;
- hash[j].decoration = decoration;
+ while (entries[j].base) {
+ if (entries[j].base == base) {
+ void *old = entries[j].decoration;
+ entries[j].decoration = decoration;
return old;
}
if (++j >= size)
j = 0;
}
- hash[j].base = base;
- hash[j].decoration = decoration;
+ entries[j].base = base;
+ entries[j].decoration = decoration;
n->nr++;
return NULL;
}
@@ -36,24 +36,23 @@
{
int i;
int old_size = n->size;
- struct object_decoration *old_hash = n->hash;
+ struct decoration_entry *old_entries = n->entries;
n->size = (old_size + 1000) * 3 / 2;
- n->hash = xcalloc(n->size, sizeof(struct object_decoration));
+ n->entries = xcalloc(n->size, sizeof(struct decoration_entry));
n->nr = 0;
for (i = 0; i < old_size; i++) {
- const struct object *base = old_hash[i].base;
- void *decoration = old_hash[i].decoration;
+ const struct object *base = old_entries[i].base;
+ void *decoration = old_entries[i].decoration;
if (!decoration)
continue;
insert_decoration(n, base, decoration);
}
- free(old_hash);
+ free(old_entries);
}
-/* Add a decoration pointer, return any old one */
void *add_decoration(struct decoration *n, const struct object *obj,
void *decoration)
{
@@ -64,7 +63,6 @@
return insert_decoration(n, obj, decoration);
}
-/* Lookup a decoration pointer */
void *lookup_decoration(struct decoration *n, const struct object *obj)
{
unsigned int j;
@@ -74,7 +72,7 @@
return NULL;
j = hash_obj(obj, n->size);
for (;;) {
- struct object_decoration *ref = n->hash + j;
+ struct decoration_entry *ref = n->entries + j;
if (ref->base == obj)
return ref->decoration;
if (!ref->base)
diff --git a/decorate.h b/decorate.h
index e732804..9014c1e 100644
--- a/decorate.h
+++ b/decorate.h
@@ -1,18 +1,61 @@
#ifndef DECORATE_H
#define DECORATE_H
-struct object_decoration {
+/*
+ * A data structure that associates Git objects to void pointers. See
+ * t/helper/test-example-decorate.c for a demonstration of how to use these
+ * functions.
+ */
+
+/*
+ * An entry in the data structure.
+ */
+struct decoration_entry {
const struct object *base;
void *decoration;
};
+/*
+ * The data structure.
+ *
+ * This data structure must be zero-initialized.
+ */
struct decoration {
+ /*
+ * Not used by the decoration mechanism. Clients may use this for
+ * whatever they want.
+ */
const char *name;
- unsigned int size, nr;
- struct object_decoration *hash;
+
+ /*
+ * The capacity of "entries".
+ */
+ unsigned int size;
+
+ /*
+ * The number of real Git objects (that is, entries with non-NULL
+ * "base").
+ */
+ unsigned int nr;
+
+ /*
+ * The entries. This is an array of size "size", containing nr entries
+ * with non-NULL "base" and (size - nr) entries with NULL "base".
+ */
+ struct decoration_entry *entries;
};
+/*
+ * Add an association from the given object to the given pointer (which may be
+ * NULL), returning the previously associated pointer. If there is no previous
+ * association, this function returns NULL.
+ */
extern void *add_decoration(struct decoration *n, const struct object *obj, void *decoration);
+
+/*
+ * Return the pointer associated to the given object. If there is no
+ * association, this function returns NULL.
+ */
extern void *lookup_decoration(struct decoration *n, const struct object *obj);
#endif
diff --git a/diff-delta.c b/diff-delta.c
index 3797ce6..e496433 100644
--- a/diff-delta.c
+++ b/diff-delta.c
@@ -319,7 +319,9 @@
const void *trg_buf, unsigned long trg_size,
unsigned long *delta_size, unsigned long max_size)
{
- unsigned int i, outpos, outsize, moff, msize, val;
+ unsigned int i, val;
+ off_t outpos, moff;
+ size_t l, outsize, msize;
int inscnt;
const unsigned char *ref_data, *ref_top, *data, *top;
unsigned char *out;
@@ -336,20 +338,20 @@
return NULL;
/* store reference buffer size */
- i = index->src_size;
- while (i >= 0x80) {
- out[outpos++] = i | 0x80;
- i >>= 7;
+ l = index->src_size;
+ while (l >= 0x80) {
+ out[outpos++] = l | 0x80;
+ l >>= 7;
}
- out[outpos++] = i;
+ out[outpos++] = l;
/* store target buffer size */
- i = trg_size;
- while (i >= 0x80) {
- out[outpos++] = i | 0x80;
- i >>= 7;
+ l = trg_size;
+ while (l >= 0x80) {
+ out[outpos++] = l | 0x80;
+ l >>= 7;
}
- out[outpos++] = i;
+ out[outpos++] = l;
ref_data = index->src_buf;
ref_top = ref_data + index->src_size;
@@ -452,6 +454,9 @@
moff += msize;
msize = left;
+ if (moff > 0xffffffff)
+ msize = 0;
+
if (msize < 4096) {
int j;
val = 0;
diff --git a/diff-lib.c b/diff-lib.c
index 2a52b07..8104603 100644
--- a/diff-lib.c
+++ b/diff-lib.c
@@ -12,6 +12,7 @@
#include "refs.h"
#include "submodule.h"
#include "dir.h"
+#include "fsmonitor.h"
/*
* diff-files
@@ -36,7 +37,7 @@
if (has_symlink_leading_path(ce->name, ce_namelen(ce)))
return 1;
if (S_ISDIR(st->st_mode)) {
- unsigned char sub[20];
+ struct object_id sub;
/*
* If ce is already a gitlink, we can have a plain
@@ -50,7 +51,7 @@
* a directory --- the blob was removed!
*/
if (!S_ISGITLINK(ce->ce_mode) &&
- resolve_gitlink_ref(ce->name, "HEAD", sub))
+ resolve_gitlink_ref(ce->name, "HEAD", &sub))
return 1;
}
return 0;
@@ -71,14 +72,15 @@
{
int changed = ce_match_stat(ce, st, ce_option);
if (S_ISGITLINK(ce->ce_mode)) {
- unsigned orig_flags = diffopt->flags;
- if (!DIFF_OPT_TST(diffopt, OVERRIDE_SUBMODULE_CONFIG))
+ struct diff_flags orig_flags = diffopt->flags;
+ if (!diffopt->flags.override_submodule_config)
set_diffopt_flags_from_submodule_config(diffopt, ce->name);
- if (DIFF_OPT_TST(diffopt, IGNORE_SUBMODULES))
+ if (diffopt->flags.ignore_submodules)
changed = 0;
- else if (!DIFF_OPT_TST(diffopt, IGNORE_DIRTY_SUBMODULES)
- && (!changed || DIFF_OPT_TST(diffopt, DIRTY_SUBMODULES)))
- *dirty_submodule = is_submodule_modified(ce->name, DIFF_OPT_TST(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES));
+ else if (!diffopt->flags.ignore_dirty_submodules &&
+ (!changed || diffopt->flags.dirty_submodules))
+ *dirty_submodule = is_submodule_modified(ce->name,
+ diffopt->flags.ignore_untracked_in_submodules);
diffopt->flags = orig_flags;
}
return changed;
@@ -216,7 +218,7 @@
} else if (revs->diffopt.ita_invisible_in_index &&
ce_intent_to_add(ce)) {
diff_addremove(&revs->diffopt, '+', ce->ce_mode,
- &empty_tree_oid, 0,
+ the_hash_algo->empty_tree, 0,
ce->name, 0);
continue;
}
@@ -228,7 +230,8 @@
if (!changed && !dirty_submodule) {
ce_mark_uptodate(ce);
- if (!DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
+ mark_fsmonitor_valid(ce);
+ if (!revs->diffopt.flags.find_copies_harder)
continue;
}
oldmode = ce->ce_mode;
@@ -362,7 +365,7 @@
oldmode = old->ce_mode;
if (mode == oldmode && !oidcmp(oid, &old->oid) && !dirty_submodule &&
- !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER))
+ !revs->diffopt.flags.find_copies_harder)
return 0;
diff_change(&revs->diffopt, oldmode, mode,
@@ -493,7 +496,7 @@
opts.head_idx = 1;
opts.index_only = cached;
opts.diff_index_cached = (cached &&
- !DIFF_OPT_TST(&revs->diffopt, FIND_COPIES_HARDER));
+ !revs->diffopt.flags.find_copies_harder);
opts.merge = 1;
opts.fn = oneway_diff;
opts.unpack_data = revs;
@@ -534,7 +537,7 @@
return 0;
}
-int index_differs_from(const char *def, int diff_flags,
+int index_differs_from(const char *def, const struct diff_flags *flags,
int ita_invisible_in_index)
{
struct rev_info rev;
@@ -544,12 +547,12 @@
memset(&opt, 0, sizeof(opt));
opt.def = def;
setup_revisions(0, NULL, &rev, &opt);
- DIFF_OPT_SET(&rev.diffopt, QUICK);
- DIFF_OPT_SET(&rev.diffopt, EXIT_WITH_STATUS);
- rev.diffopt.flags |= diff_flags;
+ rev.diffopt.flags.quick = 1;
+ rev.diffopt.flags.exit_with_status = 1;
+ if (flags)
+ diff_flags_or(&rev.diffopt.flags, flags);
rev.diffopt.ita_invisible_in_index = ita_invisible_in_index;
run_diff_index(&rev, 1);
- if (rev.pending.alloc)
- free(rev.pending.objects);
- return (DIFF_OPT_TST(&rev.diffopt, HAS_CHANGES) != 0);
+ object_array_clear(&rev.pending);
+ return (rev.diffopt.flags.has_changes != 0);
}
diff --git a/diff-no-index.c b/diff-no-index.c
index 80ff17d..0ed5f0f 100644
--- a/diff-no-index.c
+++ b/diff-no-index.c
@@ -184,7 +184,7 @@
} else {
struct diff_filespec *d1, *d2;
- if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
+ if (o->flags.reverse_diff) {
SWAP(mode1, mode2);
SWAP(name1, name2);
}
@@ -276,16 +276,16 @@
if (!revs->diffopt.output_format)
revs->diffopt.output_format = DIFF_FORMAT_PATCH;
- DIFF_OPT_SET(&revs->diffopt, NO_INDEX);
+ revs->diffopt.flags.no_index = 1;
- DIFF_OPT_SET(&revs->diffopt, RELATIVE_NAME);
+ revs->diffopt.flags.relative_name = 1;
revs->diffopt.prefix = prefix;
revs->max_count = -2;
diff_setup_done(&revs->diffopt);
setup_diff_pager(&revs->diffopt);
- DIFF_OPT_SET(&revs->diffopt, EXIT_WITH_STATUS);
+ revs->diffopt.flags.exit_with_status = 1;
if (queue_diff(&revs->diffopt, paths[0], paths[1]))
exit(1);
diff --git a/diff.c b/diff.c
index 8406a83..e9d0e38 100644
--- a/diff.c
+++ b/diff.c
@@ -16,10 +16,12 @@
#include "userdiff.h"
#include "submodule-config.h"
#include "submodule.h"
+#include "hashmap.h"
#include "ll-merge.h"
#include "string-list.h"
#include "argv-array.h"
#include "graph.h"
+#include "packfile.h"
#ifdef NO_FAST_WORKING_DIRECTORY
#define FAST_WORKING_DIRECTORY 0
@@ -32,6 +34,7 @@
static int diff_rename_limit_default = 400;
static int diff_suppress_blank_empty;
static int diff_use_color_default = -1;
+static int diff_color_moved_default;
static int diff_context_default = 3;
static int diff_interhunk_context_default;
static const char *diff_word_regex_cfg;
@@ -56,6 +59,14 @@
GIT_COLOR_YELLOW, /* COMMIT */
GIT_COLOR_BG_RED, /* WHITESPACE */
GIT_COLOR_NORMAL, /* FUNCINFO */
+ GIT_COLOR_BOLD_MAGENTA, /* OLD_MOVED */
+ GIT_COLOR_BOLD_BLUE, /* OLD_MOVED ALTERNATIVE */
+ GIT_COLOR_FAINT, /* OLD_MOVED_DIM */
+ GIT_COLOR_FAINT_ITALIC, /* OLD_MOVED_ALTERNATIVE_DIM */
+ GIT_COLOR_BOLD_CYAN, /* NEW_MOVED */
+ GIT_COLOR_BOLD_YELLOW, /* NEW_MOVED ALTERNATIVE */
+ GIT_COLOR_FAINT, /* NEW_MOVED_DIM */
+ GIT_COLOR_FAINT_ITALIC, /* NEW_MOVED_ALTERNATIVE_DIM */
};
static NORETURN void die_want_option(const char *option_name)
@@ -81,6 +92,22 @@
return DIFF_WHITESPACE;
if (!strcasecmp(var, "func"))
return DIFF_FUNCINFO;
+ if (!strcasecmp(var, "oldmoved"))
+ return DIFF_FILE_OLD_MOVED;
+ if (!strcasecmp(var, "oldmovedalternative"))
+ return DIFF_FILE_OLD_MOVED_ALT;
+ if (!strcasecmp(var, "oldmoveddimmed"))
+ return DIFF_FILE_OLD_MOVED_DIM;
+ if (!strcasecmp(var, "oldmovedalternativedimmed"))
+ return DIFF_FILE_OLD_MOVED_ALT_DIM;
+ if (!strcasecmp(var, "newmoved"))
+ return DIFF_FILE_NEW_MOVED;
+ if (!strcasecmp(var, "newmovedalternative"))
+ return DIFF_FILE_NEW_MOVED_ALT;
+ if (!strcasecmp(var, "newmoveddimmed"))
+ return DIFF_FILE_NEW_MOVED_DIM;
+ if (!strcasecmp(var, "newmovedalternativedimmed"))
+ return DIFF_FILE_NEW_MOVED_ALT_DIM;
return -1;
}
@@ -97,18 +124,18 @@
for (i = 0; i < params.nr; i++) {
const char *p = params.items[i].string;
if (!strcmp(p, "changes")) {
- DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
- DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
+ options->flags.dirstat_by_line = 0;
+ options->flags.dirstat_by_file = 0;
} else if (!strcmp(p, "lines")) {
- DIFF_OPT_SET(options, DIRSTAT_BY_LINE);
- DIFF_OPT_CLR(options, DIRSTAT_BY_FILE);
+ options->flags.dirstat_by_line = 1;
+ options->flags.dirstat_by_file = 0;
} else if (!strcmp(p, "files")) {
- DIFF_OPT_CLR(options, DIRSTAT_BY_LINE);
- DIFF_OPT_SET(options, DIRSTAT_BY_FILE);
+ options->flags.dirstat_by_line = 0;
+ options->flags.dirstat_by_file = 1;
} else if (!strcmp(p, "noncumulative")) {
- DIFF_OPT_CLR(options, DIRSTAT_CUMULATIVE);
+ options->flags.dirstat_cumulative = 0;
} else if (!strcmp(p, "cumulative")) {
- DIFF_OPT_SET(options, DIRSTAT_CUMULATIVE);
+ options->flags.dirstat_cumulative = 1;
} else if (isdigit(*p)) {
char *end;
int permille = strtoul(p, &end, 10) * 10;
@@ -219,7 +246,7 @@
*/
void init_diff_ui_defaults(void)
{
- diff_detect_rename_default = 1;
+ diff_detect_rename_default = DIFF_DETECT_RENAME;
}
int git_diff_heuristic_config(const char *var, const char *value, void *cb)
@@ -229,12 +256,44 @@
return 0;
}
+static int parse_color_moved(const char *arg)
+{
+ switch (git_parse_maybe_bool(arg)) {
+ case 0:
+ return COLOR_MOVED_NO;
+ case 1:
+ return COLOR_MOVED_DEFAULT;
+ default:
+ break;
+ }
+
+ if (!strcmp(arg, "no"))
+ return COLOR_MOVED_NO;
+ else if (!strcmp(arg, "plain"))
+ return COLOR_MOVED_PLAIN;
+ else if (!strcmp(arg, "zebra"))
+ return COLOR_MOVED_ZEBRA;
+ else if (!strcmp(arg, "default"))
+ return COLOR_MOVED_DEFAULT;
+ else if (!strcmp(arg, "dimmed_zebra"))
+ return COLOR_MOVED_ZEBRA_DIM;
+ else
+ return error(_("color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', 'plain'"));
+}
+
int git_diff_ui_config(const char *var, const char *value, void *cb)
{
if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
diff_use_color_default = git_config_colorbool(var, value);
return 0;
}
+ if (!strcmp(var, "diff.colormoved")) {
+ int cm = parse_color_moved(value);
+ if (cm < 0)
+ return -1;
+ diff_color_moved_default = cm;
+ return 0;
+ }
if (!strcmp(var, "diff.context")) {
diff_context_default = git_config_int(var, value);
if (diff_context_default < 0)
@@ -346,9 +405,6 @@
return 0;
}
- if (starts_with(var, "submodule."))
- return parse_submodule_config_option(var, value);
-
if (git_diff_heuristic_config(var, value, cb) < 0)
return -1;
@@ -406,11 +462,9 @@
* If this diff_tempfile instance refers to a temporary file,
* this tempfile object is used to manage its lifetime.
*/
- struct tempfile tempfile;
+ struct tempfile *tempfile;
} diff_temp[2];
-typedef unsigned long (*sane_truncate_fn)(char *line, unsigned long len);
-
struct emit_callback {
int color_diff;
unsigned ws_rule;
@@ -418,7 +472,6 @@
int blank_at_eof_in_postimage;
int lno_in_preimage;
int lno_in_postimage;
- sane_truncate_fn truncate;
const char **label_path;
struct diff_words_data *diff_words;
struct diff_options *opt;
@@ -560,6 +613,632 @@
emit_line_0(o, set, reset, line[0], line+1, len-1);
}
+enum diff_symbol {
+ DIFF_SYMBOL_BINARY_DIFF_HEADER,
+ DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
+ DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
+ DIFF_SYMBOL_BINARY_DIFF_BODY,
+ DIFF_SYMBOL_BINARY_DIFF_FOOTER,
+ DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
+ DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
+ DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
+ DIFF_SYMBOL_STATS_LINE,
+ DIFF_SYMBOL_WORD_DIFF,
+ DIFF_SYMBOL_STAT_SEP,
+ DIFF_SYMBOL_SUMMARY,
+ DIFF_SYMBOL_SUBMODULE_ADD,
+ DIFF_SYMBOL_SUBMODULE_DEL,
+ DIFF_SYMBOL_SUBMODULE_UNTRACKED,
+ DIFF_SYMBOL_SUBMODULE_MODIFIED,
+ DIFF_SYMBOL_SUBMODULE_HEADER,
+ DIFF_SYMBOL_SUBMODULE_ERROR,
+ DIFF_SYMBOL_SUBMODULE_PIPETHROUGH,
+ DIFF_SYMBOL_REWRITE_DIFF,
+ DIFF_SYMBOL_BINARY_FILES,
+ DIFF_SYMBOL_HEADER,
+ DIFF_SYMBOL_FILEPAIR_PLUS,
+ DIFF_SYMBOL_FILEPAIR_MINUS,
+ DIFF_SYMBOL_WORDS_PORCELAIN,
+ DIFF_SYMBOL_WORDS,
+ DIFF_SYMBOL_CONTEXT,
+ DIFF_SYMBOL_CONTEXT_INCOMPLETE,
+ DIFF_SYMBOL_PLUS,
+ DIFF_SYMBOL_MINUS,
+ DIFF_SYMBOL_NO_LF_EOF,
+ DIFF_SYMBOL_CONTEXT_FRAGINFO,
+ DIFF_SYMBOL_CONTEXT_MARKER,
+ DIFF_SYMBOL_SEPARATOR
+};
+/*
+ * Flags for content lines:
+ * 0..12 are whitespace rules
+ * 13-15 are WSEH_NEW | WSEH_OLD | WSEH_CONTEXT
+ * 16 is marking if the line is blank at EOF
+ */
+#define DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF (1<<16)
+#define DIFF_SYMBOL_MOVED_LINE (1<<17)
+#define DIFF_SYMBOL_MOVED_LINE_ALT (1<<18)
+#define DIFF_SYMBOL_MOVED_LINE_UNINTERESTING (1<<19)
+#define DIFF_SYMBOL_CONTENT_WS_MASK (WSEH_NEW | WSEH_OLD | WSEH_CONTEXT | WS_RULE_MASK)
+
+/*
+ * This struct is used when we need to buffer the output of the diff output.
+ *
+ * NEEDSWORK: Instead of storing a copy of the line, add an offset pointer
+ * into the pre/post image file. This pointer could be a union with the
+ * line pointer. By storing an offset into the file instead of the literal line,
+ * we can decrease the memory footprint for the buffered output. At first we
+ * may want to only have indirection for the content lines, but we could also
+ * enhance the state for emitting prefabricated lines, e.g. the similarity
+ * score line or hunk/file headers would only need to store a number or path
+ * and then the output can be constructed later on depending on state.
+ */
+struct emitted_diff_symbol {
+ const char *line;
+ int len;
+ int flags;
+ enum diff_symbol s;
+};
+#define EMITTED_DIFF_SYMBOL_INIT {NULL}
+
+struct emitted_diff_symbols {
+ struct emitted_diff_symbol *buf;
+ int nr, alloc;
+};
+#define EMITTED_DIFF_SYMBOLS_INIT {NULL, 0, 0}
+
+static void append_emitted_diff_symbol(struct diff_options *o,
+ struct emitted_diff_symbol *e)
+{
+ struct emitted_diff_symbol *f;
+
+ ALLOC_GROW(o->emitted_symbols->buf,
+ o->emitted_symbols->nr + 1,
+ o->emitted_symbols->alloc);
+ f = &o->emitted_symbols->buf[o->emitted_symbols->nr++];
+
+ memcpy(f, e, sizeof(struct emitted_diff_symbol));
+ f->line = e->line ? xmemdupz(e->line, e->len) : NULL;
+}
+
+struct moved_entry {
+ struct hashmap_entry ent;
+ const struct emitted_diff_symbol *es;
+ struct moved_entry *next_line;
+};
+
+static int moved_entry_cmp(const struct diff_options *diffopt,
+ const struct moved_entry *a,
+ const struct moved_entry *b,
+ const void *keydata)
+{
+ return !xdiff_compare_lines(a->es->line, a->es->len,
+ b->es->line, b->es->len,
+ diffopt->xdl_opts);
+}
+
+static struct moved_entry *prepare_entry(struct diff_options *o,
+ int line_no)
+{
+ struct moved_entry *ret = xmalloc(sizeof(*ret));
+ struct emitted_diff_symbol *l = &o->emitted_symbols->buf[line_no];
+
+ ret->ent.hash = xdiff_hash_string(l->line, l->len, o->xdl_opts);
+ ret->es = l;
+ ret->next_line = NULL;
+
+ return ret;
+}
+
+static void add_lines_to_move_detection(struct diff_options *o,
+ struct hashmap *add_lines,
+ struct hashmap *del_lines)
+{
+ struct moved_entry *prev_line = NULL;
+
+ 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:
+ prev_line = NULL;
+ continue;
+ }
+
+ key = prepare_entry(o, n);
+ if (prev_line && prev_line->es->s == o->emitted_symbols->buf[n].s)
+ prev_line->next_line = key;
+
+ hashmap_add(hm, key);
+ prev_line = key;
+ }
+}
+
+static int shrink_potential_moved_blocks(struct moved_entry **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])
+ lp++;
+ /* lp points at the first NULL now */
+
+ while (rp > -1 && !pmb[rp])
+ rp--;
+ /* rp points at the last non-NULL */
+
+ if (lp < pmb_nr && rp > -1 && lp < rp) {
+ pmb[lp] = pmb[rp];
+ pmb[rp] = NULL;
+ rp--;
+ lp++;
+ }
+ }
+
+ /* Remember the number of running sets */
+ return rp + 1;
+}
+
+/*
+ * If o->color_moved is COLOR_MOVED_PLAIN, this function does nothing.
+ *
+ * Otherwise, if the last block has fewer alphanumeric characters than
+ * COLOR_MOVED_MIN_ALNUM_COUNT, unset DIFF_SYMBOL_MOVED_LINE on all lines in
+ * that block.
+ *
+ * The last block consists of the (n - block_length)'th line up to but not
+ * including the nth line.
+ *
+ * NEEDSWORK: This uses the same heuristic as blame_entry_score() in blame.c.
+ * Think of a way to unify them.
+ */
+static void adjust_last_block(struct diff_options *o, int n, int block_length)
+{
+ int i, alnum_count = 0;
+ if (o->color_moved == COLOR_MOVED_PLAIN)
+ return;
+ for (i = 1; i < block_length + 1; i++) {
+ const char *c = o->emitted_symbols->buf[n - i].line;
+ for (; *c; c++) {
+ if (!isalnum(*c))
+ continue;
+ alnum_count++;
+ if (alnum_count >= COLOR_MOVED_MIN_ALNUM_COUNT)
+ return;
+ }
+ }
+ for (i = 1; i < block_length + 1; i++)
+ o->emitted_symbols->buf[n - i].flags &= ~DIFF_SYMBOL_MOVED_LINE;
+}
+
+/* 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 **pmb = NULL; /* potentially moved blocks */
+ int pmb_nr = 0, pmb_alloc = 0;
+ int n, flipped_block = 1, block_length = 0;
+
+
+ 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];
+ int i;
+
+ switch (l->s) {
+ case DIFF_SYMBOL_PLUS:
+ hm = del_lines;
+ key = prepare_entry(o, n);
+ match = hashmap_get(hm, key, o);
+ free(key);
+ break;
+ case DIFF_SYMBOL_MINUS:
+ hm = add_lines;
+ key = prepare_entry(o, n);
+ match = hashmap_get(hm, key, o);
+ free(key);
+ break;
+ default:
+ flipped_block = 1;
+ }
+
+ if (!match) {
+ adjust_last_block(o, n, block_length);
+ pmb_nr = 0;
+ block_length = 0;
+ continue;
+ }
+
+ l->flags |= DIFF_SYMBOL_MOVED_LINE;
+
+ if (o->color_moved == COLOR_MOVED_PLAIN)
+ continue;
+
+ /* Check any potential block runs, advance each or nullify */
+ for (i = 0; i < pmb_nr; i++) {
+ struct moved_entry *p = pmb[i];
+ struct moved_entry *pnext = (p && p->next_line) ?
+ p->next_line : NULL;
+ if (pnext && !hm->cmpfn(o, pnext, match, NULL)) {
+ pmb[i] = p->next_line;
+ } else {
+ pmb[i] = NULL;
+ }
+ }
+
+ pmb_nr = shrink_potential_moved_blocks(pmb, pmb_nr);
+
+ if (pmb_nr == 0) {
+ /*
+ * The current line is the start of a new block.
+ * Setup the set of potential blocks.
+ */
+ for (; match; match = hashmap_get_next(hm, match)) {
+ ALLOC_GROW(pmb, pmb_nr + 1, pmb_alloc);
+ pmb[pmb_nr++] = match;
+ }
+
+ flipped_block = (flipped_block + 1) % 2;
+
+ adjust_last_block(o, n, block_length);
+ block_length = 0;
+ }
+
+ block_length++;
+
+ if (flipped_block)
+ l->flags |= DIFF_SYMBOL_MOVED_LINE_ALT;
+ }
+ adjust_last_block(o, n, block_length);
+
+ 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;
+ for (n = 0; n < o->emitted_symbols->nr; n++) {
+ struct emitted_diff_symbol *prev = (n != 0) ?
+ &o->emitted_symbols->buf[n - 1] : NULL;
+ struct emitted_diff_symbol *l = &o->emitted_symbols->buf[n];
+ struct emitted_diff_symbol *next =
+ (n < o->emitted_symbols->nr - 1) ?
+ &o->emitted_symbols->buf[n + 1] : NULL;
+
+ /* Not a plus or minus line? */
+ if (l->s != DIFF_SYMBOL_PLUS && l->s != DIFF_SYMBOL_MINUS)
+ continue;
+
+ /* Not a moved line? */
+ if (!(l->flags & DIFF_SYMBOL_MOVED_LINE))
+ continue;
+
+ /*
+ * If prev or next are not a plus or minus line,
+ * pretend they don't exist
+ */
+ if (prev && prev->s != DIFF_SYMBOL_PLUS &&
+ prev->s != DIFF_SYMBOL_MINUS)
+ prev = NULL;
+ if (next && next->s != DIFF_SYMBOL_PLUS &&
+ next->s != DIFF_SYMBOL_MINUS)
+ next = NULL;
+
+ /* Inside a block? */
+ if ((prev &&
+ (prev->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
+ (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK)) &&
+ (next &&
+ (next->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK) ==
+ (l->flags & DIFF_SYMBOL_MOVED_LINE_ZEBRA_MASK))) {
+ l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
+ continue;
+ }
+
+ /* Check if we are at an interesting bound: */
+ if (prev && (prev->flags & DIFF_SYMBOL_MOVED_LINE) &&
+ (prev->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
+ (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
+ continue;
+ if (next && (next->flags & DIFF_SYMBOL_MOVED_LINE) &&
+ (next->flags & DIFF_SYMBOL_MOVED_LINE_ALT) !=
+ (l->flags & DIFF_SYMBOL_MOVED_LINE_ALT))
+ continue;
+
+ /*
+ * The boundary to prev and next are not interesting,
+ * so this line is not interesting as a whole
+ */
+ l->flags |= DIFF_SYMBOL_MOVED_LINE_UNINTERESTING;
+ }
+}
+
+static void emit_line_ws_markup(struct diff_options *o,
+ const char *set, const char *reset,
+ const char *line, int len, char sign,
+ unsigned ws_rule, int blank_at_eof)
+{
+ const char *ws = NULL;
+
+ if (o->ws_error_highlight & ws_rule) {
+ ws = diff_get_color_opt(o, DIFF_WHITESPACE);
+ if (!*ws)
+ ws = NULL;
+ }
+
+ if (!ws)
+ emit_line_0(o, set, reset, sign, line, len);
+ else if (blank_at_eof)
+ /* Blank line at EOF - paint '+' as well */
+ emit_line_0(o, ws, reset, sign, line, len);
+ else {
+ /* Emit just the prefix, then the rest. */
+ emit_line_0(o, set, reset, sign, "", 0);
+ ws_check_emit(line, len, ws_rule,
+ o->file, set, reset, ws);
+ }
+}
+
+static void emit_diff_symbol_from_struct(struct diff_options *o,
+ struct emitted_diff_symbol *eds)
+{
+ static const char *nneof = " No newline at end of file\n";
+ const char *context, *reset, *set, *meta, *fraginfo;
+ struct strbuf sb = STRBUF_INIT;
+
+ enum diff_symbol s = eds->s;
+ const char *line = eds->line;
+ int len = eds->len;
+ unsigned flags = eds->flags;
+
+ switch (s) {
+ case DIFF_SYMBOL_NO_LF_EOF:
+ context = diff_get_color_opt(o, DIFF_CONTEXT);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ putc('\n', o->file);
+ emit_line_0(o, context, reset, '\\',
+ nneof, strlen(nneof));
+ break;
+ case DIFF_SYMBOL_SUBMODULE_HEADER:
+ case DIFF_SYMBOL_SUBMODULE_ERROR:
+ case DIFF_SYMBOL_SUBMODULE_PIPETHROUGH:
+ case DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES:
+ case DIFF_SYMBOL_SUMMARY:
+ case DIFF_SYMBOL_STATS_LINE:
+ case DIFF_SYMBOL_BINARY_DIFF_BODY:
+ case DIFF_SYMBOL_CONTEXT_FRAGINFO:
+ emit_line(o, "", "", line, len);
+ break;
+ case DIFF_SYMBOL_CONTEXT_INCOMPLETE:
+ case DIFF_SYMBOL_CONTEXT_MARKER:
+ context = diff_get_color_opt(o, DIFF_CONTEXT);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line(o, context, reset, line, len);
+ break;
+ case DIFF_SYMBOL_SEPARATOR:
+ fprintf(o->file, "%s%c",
+ diff_line_prefix(o),
+ o->line_termination);
+ break;
+ case DIFF_SYMBOL_CONTEXT:
+ set = diff_get_color_opt(o, DIFF_CONTEXT);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line_ws_markup(o, set, reset, line, len, ' ',
+ flags & (DIFF_SYMBOL_CONTENT_WS_MASK), 0);
+ break;
+ case DIFF_SYMBOL_PLUS:
+ switch (flags & (DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_ALT |
+ DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
+ case DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_ALT |
+ DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+ set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT_DIM);
+ break;
+ case DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_ALT:
+ set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_ALT);
+ break;
+ case DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+ set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED_DIM);
+ break;
+ case DIFF_SYMBOL_MOVED_LINE:
+ set = diff_get_color_opt(o, DIFF_FILE_NEW_MOVED);
+ break;
+ default:
+ set = diff_get_color_opt(o, DIFF_FILE_NEW);
+ }
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line_ws_markup(o, set, reset, line, len, '+',
+ flags & DIFF_SYMBOL_CONTENT_WS_MASK,
+ flags & DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF);
+ break;
+ case DIFF_SYMBOL_MINUS:
+ switch (flags & (DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_ALT |
+ DIFF_SYMBOL_MOVED_LINE_UNINTERESTING)) {
+ case DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_ALT |
+ DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+ set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT_DIM);
+ break;
+ case DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_ALT:
+ set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_ALT);
+ break;
+ case DIFF_SYMBOL_MOVED_LINE |
+ DIFF_SYMBOL_MOVED_LINE_UNINTERESTING:
+ set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED_DIM);
+ break;
+ case DIFF_SYMBOL_MOVED_LINE:
+ set = diff_get_color_opt(o, DIFF_FILE_OLD_MOVED);
+ break;
+ default:
+ set = diff_get_color_opt(o, DIFF_FILE_OLD);
+ }
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line_ws_markup(o, set, reset, line, len, '-',
+ flags & DIFF_SYMBOL_CONTENT_WS_MASK, 0);
+ break;
+ case DIFF_SYMBOL_WORDS_PORCELAIN:
+ context = diff_get_color_opt(o, DIFF_CONTEXT);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line(o, context, reset, line, len);
+ fputs("~\n", o->file);
+ break;
+ case DIFF_SYMBOL_WORDS:
+ context = diff_get_color_opt(o, DIFF_CONTEXT);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ /*
+ * Skip the prefix character, if any. With
+ * diff_suppress_blank_empty, there may be
+ * none.
+ */
+ if (line[0] != '\n') {
+ line++;
+ len--;
+ }
+ emit_line(o, context, reset, line, len);
+ break;
+ case DIFF_SYMBOL_FILEPAIR_PLUS:
+ meta = diff_get_color_opt(o, DIFF_METAINFO);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ fprintf(o->file, "%s%s+++ %s%s%s\n", diff_line_prefix(o), meta,
+ line, reset,
+ strchr(line, ' ') ? "\t" : "");
+ break;
+ case DIFF_SYMBOL_FILEPAIR_MINUS:
+ meta = diff_get_color_opt(o, DIFF_METAINFO);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ fprintf(o->file, "%s%s--- %s%s%s\n", diff_line_prefix(o), meta,
+ line, reset,
+ strchr(line, ' ') ? "\t" : "");
+ break;
+ case DIFF_SYMBOL_BINARY_FILES:
+ case DIFF_SYMBOL_HEADER:
+ fprintf(o->file, "%s", line);
+ break;
+ case DIFF_SYMBOL_BINARY_DIFF_HEADER:
+ fprintf(o->file, "%sGIT binary patch\n", diff_line_prefix(o));
+ break;
+ case DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA:
+ fprintf(o->file, "%sdelta %s\n", diff_line_prefix(o), line);
+ break;
+ case DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL:
+ fprintf(o->file, "%sliteral %s\n", diff_line_prefix(o), line);
+ break;
+ case DIFF_SYMBOL_BINARY_DIFF_FOOTER:
+ fputs(diff_line_prefix(o), o->file);
+ fputc('\n', o->file);
+ break;
+ case DIFF_SYMBOL_REWRITE_DIFF:
+ fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line(o, fraginfo, reset, line, len);
+ break;
+ case DIFF_SYMBOL_SUBMODULE_ADD:
+ set = diff_get_color_opt(o, DIFF_FILE_NEW);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line(o, set, reset, line, len);
+ break;
+ case DIFF_SYMBOL_SUBMODULE_DEL:
+ set = diff_get_color_opt(o, DIFF_FILE_OLD);
+ reset = diff_get_color_opt(o, DIFF_RESET);
+ emit_line(o, set, reset, line, len);
+ break;
+ case DIFF_SYMBOL_SUBMODULE_UNTRACKED:
+ fprintf(o->file, "%sSubmodule %s contains untracked content\n",
+ diff_line_prefix(o), line);
+ break;
+ case DIFF_SYMBOL_SUBMODULE_MODIFIED:
+ fprintf(o->file, "%sSubmodule %s contains modified content\n",
+ diff_line_prefix(o), line);
+ break;
+ case DIFF_SYMBOL_STATS_SUMMARY_NO_FILES:
+ emit_line(o, "", "", " 0 files changed\n",
+ strlen(" 0 files changed\n"));
+ break;
+ case DIFF_SYMBOL_STATS_SUMMARY_ABBREV:
+ emit_line(o, "", "", " ...\n", strlen(" ...\n"));
+ break;
+ case DIFF_SYMBOL_WORD_DIFF:
+ fprintf(o->file, "%.*s", len, line);
+ break;
+ case DIFF_SYMBOL_STAT_SEP:
+ fputs(o->stat_sep, o->file);
+ break;
+ default:
+ die("BUG: unknown diff symbol");
+ }
+ strbuf_release(&sb);
+}
+
+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, s};
+
+ if (o->emitted_symbols)
+ append_emitted_diff_symbol(o, &e);
+ else
+ emit_diff_symbol_from_struct(o, &e);
+}
+
+void diff_emit_submodule_del(struct diff_options *o, const char *line)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_DEL, line, strlen(line), 0);
+}
+
+void diff_emit_submodule_add(struct diff_options *o, const char *line)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ADD, line, strlen(line), 0);
+}
+
+void diff_emit_submodule_untracked(struct diff_options *o, const char *path)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_UNTRACKED,
+ path, strlen(path), 0);
+}
+
+void diff_emit_submodule_modified(struct diff_options *o, const char *path)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_MODIFIED,
+ path, strlen(path), 0);
+}
+
+void diff_emit_submodule_header(struct diff_options *o, const char *header)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_HEADER,
+ header, strlen(header), 0);
+}
+
+void diff_emit_submodule_error(struct diff_options *o, const char *err)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_ERROR, err, strlen(err), 0);
+}
+
+void diff_emit_submodule_pipethrough(struct diff_options *o,
+ const char *line, int len)
+{
+ emit_diff_symbol(o, DIFF_SYMBOL_SUBMODULE_PIPETHROUGH, line, len, 0);
+}
+
static int new_blank_line_at_eof(struct emit_callback *ecbdata, const char *line, int len)
{
if (!((ecbdata->ws_rule & WS_BLANK_AT_EOF) &&
@@ -571,57 +1250,31 @@
return ws_blank_line(line, len, ecbdata->ws_rule);
}
-static void emit_line_checked(const char *reset,
- struct emit_callback *ecbdata,
- const char *line, int len,
- enum color_diff color,
- unsigned ws_error_highlight,
- char sign)
-{
- const char *set = diff_get_color(ecbdata->color_diff, color);
- const char *ws = NULL;
-
- if (ecbdata->opt->ws_error_highlight & ws_error_highlight) {
- ws = diff_get_color(ecbdata->color_diff, DIFF_WHITESPACE);
- if (!*ws)
- ws = NULL;
- }
-
- if (!ws)
- emit_line_0(ecbdata->opt, set, reset, sign, line, len);
- else if (sign == '+' && new_blank_line_at_eof(ecbdata, line, len))
- /* Blank line at EOF - paint '+' as well */
- emit_line_0(ecbdata->opt, ws, reset, sign, line, len);
- else {
- /* Emit just the prefix, then the rest. */
- emit_line_0(ecbdata->opt, set, reset, sign, "", 0);
- ws_check_emit(line, len, ecbdata->ws_rule,
- ecbdata->opt->file, set, reset, ws);
- }
-}
-
static void emit_add_line(const char *reset,
struct emit_callback *ecbdata,
const char *line, int len)
{
- emit_line_checked(reset, ecbdata, line, len,
- DIFF_FILE_NEW, WSEH_NEW, '+');
+ unsigned flags = WSEH_NEW | ecbdata->ws_rule;
+ if (new_blank_line_at_eof(ecbdata, line, len))
+ flags |= DIFF_SYMBOL_CONTENT_BLANK_LINE_EOF;
+
+ emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_PLUS, line, len, flags);
}
static void emit_del_line(const char *reset,
struct emit_callback *ecbdata,
const char *line, int len)
{
- emit_line_checked(reset, ecbdata, line, len,
- DIFF_FILE_OLD, WSEH_OLD, '-');
+ unsigned flags = WSEH_OLD | ecbdata->ws_rule;
+ emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_MINUS, line, len, flags);
}
static void emit_context_line(const char *reset,
struct emit_callback *ecbdata,
const char *line, int len)
{
- emit_line_checked(reset, ecbdata, line, len,
- DIFF_CONTEXT, WSEH_CONTEXT, ' ');
+ unsigned flags = WSEH_CONTEXT | ecbdata->ws_rule;
+ emit_diff_symbol(ecbdata->opt, DIFF_SYMBOL_CONTEXT, line, len, flags);
}
static void emit_hunk_header(struct emit_callback *ecbdata,
@@ -644,7 +1297,8 @@
if (len < 10 ||
memcmp(line, atat, 2) ||
!(ep = memmem(line + 2, len - 2, atat, 2))) {
- emit_line(ecbdata->opt, context, reset, line, len);
+ emit_diff_symbol(ecbdata->opt,
+ DIFF_SYMBOL_CONTEXT_MARKER, line, len, 0);
return;
}
ep += 2; /* skip over @@ */
@@ -678,7 +1332,9 @@
}
strbuf_add(&msgbuf, line + len, org_len - len);
- emit_line(ecbdata->opt, "", "", msgbuf.buf, msgbuf.len);
+ strbuf_complete_line(&msgbuf);
+ emit_diff_symbol(ecbdata->opt,
+ DIFF_SYMBOL_CONTEXT_FRAGINFO, msgbuf.buf, msgbuf.len, 0);
strbuf_release(&msgbuf);
}
@@ -694,23 +1350,23 @@
{
int i;
for (i = 0; i < ARRAY_SIZE(diff_temp); i++) {
- if (is_tempfile_active(&diff_temp[i].tempfile))
+ if (is_tempfile_active(diff_temp[i].tempfile))
delete_tempfile(&diff_temp[i].tempfile);
diff_temp[i].name = NULL;
}
}
-static void print_line_count(FILE *file, int count)
+static void add_line_count(struct strbuf *out, int count)
{
switch (count) {
case 0:
- fprintf(file, "0,0");
+ strbuf_addstr(out, "0,0");
break;
case 1:
- fprintf(file, "1");
+ strbuf_addstr(out, "1");
break;
default:
- fprintf(file, "1,%d", count);
+ strbuf_addf(out, "1,%d", count);
break;
}
}
@@ -719,7 +1375,6 @@
int prefix, const char *data, int size)
{
const char *endp = NULL;
- static const char *nneof = " No newline at end of file\n";
const char *reset = diff_get_color(ecb->color_diff, DIFF_RESET);
while (0 < size) {
@@ -737,13 +1392,8 @@
size -= len;
data += len;
}
- if (!endp) {
- const char *context = diff_get_color(ecb->color_diff,
- DIFF_CONTEXT);
- putc('\n', ecb->opt->file);
- emit_line_0(ecb->opt, context, reset, '\\',
- nneof, strlen(nneof));
- }
+ if (!endp)
+ emit_diff_symbol(ecb->opt, DIFF_SYMBOL_NO_LF_EOF, NULL, 0, 0);
}
static void emit_rewrite_diff(const char *name_a,
@@ -755,18 +1405,14 @@
struct diff_options *o)
{
int lc_a, lc_b;
- const char *name_a_tab, *name_b_tab;
- const char *metainfo = diff_get_color(o->use_color, DIFF_METAINFO);
- const char *fraginfo = diff_get_color(o->use_color, DIFF_FRAGINFO);
- const char *reset = diff_get_color(o->use_color, DIFF_RESET);
static struct strbuf a_name = STRBUF_INIT, b_name = STRBUF_INIT;
const char *a_prefix, *b_prefix;
char *data_one, *data_two;
size_t size_one, size_two;
struct emit_callback ecbdata;
- const char *line_prefix = diff_line_prefix(o);
+ struct strbuf out = STRBUF_INIT;
- if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) {
+ if (diff_mnemonic_prefix && o->flags.reverse_diff) {
a_prefix = o->b_prefix;
b_prefix = o->a_prefix;
} else {
@@ -776,8 +1422,6 @@
name_a += (*name_a == '/');
name_b += (*name_b == '/');
- name_a_tab = strchr(name_a, ' ') ? "\t" : "";
- name_b_tab = strchr(name_b, ' ') ? "\t" : "";
strbuf_reset(&a_name);
strbuf_reset(&b_name);
@@ -804,18 +1448,23 @@
lc_a = count_lines(data_one, size_one);
lc_b = count_lines(data_two, size_two);
- fprintf(o->file,
- "%s%s--- %s%s%s\n%s%s+++ %s%s%s\n%s%s@@ -",
- line_prefix, metainfo, a_name.buf, name_a_tab, reset,
- line_prefix, metainfo, b_name.buf, name_b_tab, reset,
- line_prefix, fraginfo);
+
+ emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
+ a_name.buf, a_name.len, 0);
+ emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
+ b_name.buf, b_name.len, 0);
+
+ strbuf_addstr(&out, "@@ -");
if (!o->irreversible_delete)
- print_line_count(o->file, lc_a);
+ add_line_count(&out, lc_a);
else
- fprintf(o->file, "?,?");
- fprintf(o->file, " +");
- print_line_count(o->file, lc_b);
- fprintf(o->file, " @@%s\n", reset);
+ strbuf_addstr(&out, "?,?");
+ strbuf_addstr(&out, " +");
+ add_line_count(&out, lc_b);
+ strbuf_addstr(&out, " @@\n");
+ emit_diff_symbol(o, DIFF_SYMBOL_REWRITE_DIFF, out.buf, out.len, 0);
+ strbuf_release(&out);
+
if (lc_a && !o->irreversible_delete)
emit_rewrite_lines(&ecbdata, '-', data_one, size_one);
if (lc_b)
@@ -875,37 +1524,49 @@
struct diff_words_style *style;
};
-static int fn_out_diff_words_write_helper(FILE *fp,
+static int fn_out_diff_words_write_helper(struct diff_options *o,
struct diff_words_style_elem *st_el,
const char *newline,
- size_t count, const char *buf,
- const char *line_prefix)
+ size_t count, const char *buf)
{
int print = 0;
+ struct strbuf sb = STRBUF_INIT;
while (count) {
char *p = memchr(buf, '\n', count);
if (print)
- fputs(line_prefix, fp);
+ strbuf_addstr(&sb, diff_line_prefix(o));
+
if (p != buf) {
- if (st_el->color && fputs(st_el->color, fp) < 0)
- return -1;
- if (fputs(st_el->prefix, fp) < 0 ||
- fwrite(buf, p ? p - buf : count, 1, fp) != 1 ||
- fputs(st_el->suffix, fp) < 0)
- return -1;
- if (st_el->color && *st_el->color
- && fputs(GIT_COLOR_RESET, fp) < 0)
- return -1;
+ const char *reset = st_el->color && *st_el->color ?
+ GIT_COLOR_RESET : NULL;
+ if (st_el->color && *st_el->color)
+ strbuf_addstr(&sb, st_el->color);
+ strbuf_addstr(&sb, st_el->prefix);
+ strbuf_add(&sb, buf, p ? p - buf : count);
+ strbuf_addstr(&sb, st_el->suffix);
+ if (reset)
+ strbuf_addstr(&sb, reset);
}
if (!p)
- return 0;
- if (fputs(newline, fp) < 0)
- return -1;
+ goto out;
+
+ strbuf_addstr(&sb, newline);
count -= p + 1 - buf;
buf = p + 1;
print = 1;
+ if (count) {
+ emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
+ sb.buf, sb.len, 0);
+ strbuf_reset(&sb);
+ }
}
+
+out:
+ if (sb.len)
+ emit_diff_symbol(o, DIFF_SYMBOL_WORD_DIFF,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
return 0;
}
@@ -987,24 +1648,20 @@
fputs(line_prefix, diff_words->opt->file);
}
if (diff_words->current_plus != plus_begin) {
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->ctx, style->newline,
plus_begin - diff_words->current_plus,
- diff_words->current_plus, line_prefix);
- if (*(plus_begin - 1) == '\n')
- fputs(line_prefix, diff_words->opt->file);
+ diff_words->current_plus);
}
if (minus_begin != minus_end) {
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->old, style->newline,
- minus_end - minus_begin, minus_begin,
- line_prefix);
+ minus_end - minus_begin, minus_begin);
}
if (plus_begin != plus_end) {
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->new, style->newline,
- plus_end - plus_begin, plus_begin,
- line_prefix);
+ plus_end - plus_begin, plus_begin);
}
diff_words->current_plus = plus_end;
@@ -1098,11 +1755,12 @@
/* special case: only removal */
if (!diff_words->plus.text.size) {
- fputs(line_prefix, diff_words->opt->file);
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
+ line_prefix, strlen(line_prefix), 0);
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->old, style->newline,
diff_words->minus.text.size,
- diff_words->minus.text.ptr, line_prefix);
+ diff_words->minus.text.ptr);
diff_words->minus.text.size = 0;
return;
}
@@ -1125,12 +1783,12 @@
if (diff_words->current_plus != diff_words->plus.text.ptr +
diff_words->plus.text.size) {
if (color_words_output_graph_prefix(diff_words))
- fputs(line_prefix, diff_words->opt->file);
- fn_out_diff_words_write_helper(diff_words->opt->file,
+ emit_diff_symbol(diff_words->opt, DIFF_SYMBOL_WORD_DIFF,
+ line_prefix, strlen(line_prefix), 0);
+ fn_out_diff_words_write_helper(diff_words->opt,
&style->ctx, style->newline,
diff_words->plus.text.ptr + diff_words->plus.text.size
- - diff_words->current_plus, diff_words->current_plus,
- line_prefix);
+ - diff_words->current_plus, diff_words->current_plus);
}
diff_words->minus.text.size = diff_words->plus.text.size = 0;
}
@@ -1138,9 +1796,29 @@
/* In "color-words" mode, show word-diff of words accumulated in the buffer */
static void diff_words_flush(struct emit_callback *ecbdata)
{
+ struct diff_options *wo = ecbdata->diff_words->opt;
+
if (ecbdata->diff_words->minus.text.size ||
ecbdata->diff_words->plus.text.size)
diff_words_show(ecbdata->diff_words);
+
+ if (wo->emitted_symbols) {
+ struct diff_options *o = ecbdata->opt;
+ struct emitted_diff_symbols *wol = wo->emitted_symbols;
+ int i;
+
+ /*
+ * NEEDSWORK:
+ * Instead of appending each, concat all words to a line?
+ */
+ for (i = 0; i < wol->nr; i++)
+ append_emitted_diff_symbol(o, &wol->buf[i]);
+
+ for (i = 0; i < wol->nr; i++)
+ free((void *)wol->buf[i].line);
+
+ wol->nr = 0;
+ }
}
static void diff_filespec_load_driver(struct diff_filespec *one)
@@ -1176,6 +1854,11 @@
xcalloc(1, sizeof(struct diff_words_data));
ecbdata->diff_words->type = o->word_diff;
ecbdata->diff_words->opt = o;
+
+ if (orig_opts->emitted_symbols)
+ o->emitted_symbols =
+ xcalloc(1, sizeof(struct emitted_diff_symbols));
+
if (!o->word_regex)
o->word_regex = userdiff_word_regex(one);
if (!o->word_regex)
@@ -1210,6 +1893,7 @@
{
if (ecbdata->diff_words) {
diff_words_flush(ecbdata);
+ free (ecbdata->diff_words->opt->emitted_symbols);
free (ecbdata->diff_words->opt);
free (ecbdata->diff_words->minus.text.ptr);
free (ecbdata->diff_words->minus.orig);
@@ -1246,8 +1930,6 @@
unsigned long allot;
size_t l = len;
- if (ecb->truncate)
- return ecb->truncate(line, len);
cp = line;
allot = l;
while (0 < l) {
@@ -1276,30 +1958,25 @@
static void fn_out_consume(void *priv, char *line, unsigned long len)
{
struct emit_callback *ecbdata = priv;
- const char *meta = diff_get_color(ecbdata->color_diff, DIFF_METAINFO);
- const char *context = diff_get_color(ecbdata->color_diff, DIFF_CONTEXT);
const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET);
struct diff_options *o = ecbdata->opt;
- const char *line_prefix = diff_line_prefix(o);
o->found_changes = 1;
if (ecbdata->header) {
- fprintf(o->file, "%s", ecbdata->header->buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+ ecbdata->header->buf, ecbdata->header->len, 0);
strbuf_reset(ecbdata->header);
ecbdata->header = NULL;
}
if (ecbdata->label_path[0]) {
- const char *name_a_tab, *name_b_tab;
-
- name_a_tab = strchr(ecbdata->label_path[0], ' ') ? "\t" : "";
- name_b_tab = strchr(ecbdata->label_path[1], ' ') ? "\t" : "";
-
- fprintf(o->file, "%s%s--- %s%s%s\n",
- line_prefix, meta, ecbdata->label_path[0], reset, name_a_tab);
- fprintf(o->file, "%s%s+++ %s%s%s\n",
- line_prefix, meta, ecbdata->label_path[1], reset, name_b_tab);
+ emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_MINUS,
+ ecbdata->label_path[0],
+ strlen(ecbdata->label_path[0]), 0);
+ emit_diff_symbol(o, DIFF_SYMBOL_FILEPAIR_PLUS,
+ ecbdata->label_path[1],
+ strlen(ecbdata->label_path[1]), 0);
ecbdata->label_path[0] = ecbdata->label_path[1] = NULL;
}
@@ -1315,12 +1992,13 @@
len = sane_truncate_line(ecbdata, line, len);
find_lno(line, ecbdata);
emit_hunk_header(ecbdata, line, len);
- if (line[len-1] != '\n')
- putc('\n', o->file);
return;
}
if (ecbdata->diff_words) {
+ enum diff_symbol s =
+ ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN ?
+ DIFF_SYMBOL_WORDS_PORCELAIN : DIFF_SYMBOL_WORDS;
if (line[0] == '-') {
diff_words_append(line, len,
&ecbdata->diff_words->minus);
@@ -1340,21 +2018,7 @@
return;
}
diff_words_flush(ecbdata);
- if (ecbdata->diff_words->type == DIFF_WORDS_PORCELAIN) {
- emit_line(o, context, reset, line, len);
- fputs("~\n", o->file);
- } else {
- /*
- * Skip the prefix character, if any. With
- * diff_suppress_blank_empty, there may be
- * none.
- */
- if (line[0] != '\n') {
- line++;
- len--;
- }
- emit_line(o, context, reset, line, len);
- }
+ emit_diff_symbol(o, s, line, len, 0);
return;
}
@@ -1375,8 +2039,8 @@
default:
/* incomplete line at the end */
ecbdata->lno_in_preimage++;
- emit_line(o, diff_get_color(ecbdata->color_diff, DIFF_CONTEXT),
- reset, line, len);
+ emit_diff_symbol(o, DIFF_SYMBOL_CONTEXT_INCOMPLETE,
+ line, len, 0);
break;
}
}
@@ -1521,20 +2185,14 @@
return 1 + (it * (width - 1) / max_change);
}
-static void show_name(FILE *file,
- const char *prefix, const char *name, int len)
-{
- fprintf(file, " %s%-*s |", prefix, len, name);
-}
-
-static void show_graph(FILE *file, char ch, int cnt, const char *set, const char *reset)
+static void show_graph(struct strbuf *out, char ch, int cnt,
+ const char *set, const char *reset)
{
if (cnt <= 0)
return;
- fprintf(file, "%s", set);
- while (cnt--)
- putc(ch, file);
- fprintf(file, "%s", reset);
+ strbuf_addstr(out, set);
+ strbuf_addchars(out, ch, cnt);
+ strbuf_addstr(out, reset);
}
static void fill_print_name(struct diffstat_file *file)
@@ -1558,14 +2216,16 @@
file->print_name = pname;
}
-int print_stat_summary(FILE *fp, int files, int insertions, int deletions)
+static void print_stat_summary_inserts_deletes(struct diff_options *options,
+ int files, int insertions, int deletions)
{
struct strbuf sb = STRBUF_INIT;
- int ret;
if (!files) {
assert(insertions == 0 && deletions == 0);
- return fprintf(fp, "%s\n", " 0 files changed");
+ emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_NO_FILES,
+ NULL, 0, 0);
+ return;
}
strbuf_addf(&sb,
@@ -1592,9 +2252,19 @@
deletions);
}
strbuf_addch(&sb, '\n');
- ret = fputs(sb.buf, fp);
+ emit_diff_symbol(options, DIFF_SYMBOL_STATS_SUMMARY_INSERTS_DELETES,
+ sb.buf, sb.len, 0);
strbuf_release(&sb);
- return ret;
+}
+
+void print_stat_summary(FILE *fp, int files,
+ int insertions, int deletions)
+{
+ struct diff_options o;
+ memset(&o, 0, sizeof(o));
+ o.file = fp;
+
+ print_stat_summary_inserts_deletes(&o, files, insertions, deletions);
}
static void show_stats(struct diffstat_t *data, struct diff_options *options)
@@ -1604,13 +2274,13 @@
int total_files = data->nr, count;
int width, name_width, graph_width, number_width = 0, bin_width = 0;
const char *reset, *add_c, *del_c;
- const char *line_prefix = "";
int extra_shown = 0;
+ const char *line_prefix = diff_line_prefix(options);
+ struct strbuf out = STRBUF_INIT;
if (data->nr == 0)
return;
- line_prefix = diff_line_prefix(options);
count = options->stat_count ? options->stat_count : data->nr;
reset = diff_get_color_opt(options, DIFF_RESET);
@@ -1764,26 +2434,32 @@
}
if (file->is_binary) {
- fprintf(options->file, "%s", line_prefix);
- show_name(options->file, prefix, name, len);
- fprintf(options->file, " %*s", number_width, "Bin");
+ strbuf_addf(&out, " %s%-*s |", prefix, len, name);
+ strbuf_addf(&out, " %*s", number_width, "Bin");
if (!added && !deleted) {
- putc('\n', options->file);
+ strbuf_addch(&out, '\n');
+ emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+ out.buf, out.len, 0);
+ strbuf_reset(&out);
continue;
}
- fprintf(options->file, " %s%"PRIuMAX"%s",
+ strbuf_addf(&out, " %s%"PRIuMAX"%s",
del_c, deleted, reset);
- fprintf(options->file, " -> ");
- fprintf(options->file, "%s%"PRIuMAX"%s",
+ strbuf_addstr(&out, " -> ");
+ strbuf_addf(&out, "%s%"PRIuMAX"%s",
add_c, added, reset);
- fprintf(options->file, " bytes");
- fprintf(options->file, "\n");
+ strbuf_addstr(&out, " bytes\n");
+ emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+ out.buf, out.len, 0);
+ strbuf_reset(&out);
continue;
}
else if (file->is_unmerged) {
- fprintf(options->file, "%s", line_prefix);
- show_name(options->file, prefix, name, len);
- fprintf(options->file, " Unmerged\n");
+ strbuf_addf(&out, " %s%-*s |", prefix, len, name);
+ strbuf_addstr(&out, " Unmerged\n");
+ emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+ out.buf, out.len, 0);
+ strbuf_reset(&out);
continue;
}
@@ -1806,14 +2482,16 @@
add = total - del;
}
}
- fprintf(options->file, "%s", line_prefix);
- show_name(options->file, prefix, name, len);
- fprintf(options->file, " %*"PRIuMAX"%s",
+ strbuf_addf(&out, " %s%-*s |", prefix, len, name);
+ strbuf_addf(&out, " %*"PRIuMAX"%s",
number_width, added + deleted,
added + deleted ? " " : "");
- show_graph(options->file, '+', add, add_c, reset);
- show_graph(options->file, '-', del, del_c, reset);
- fprintf(options->file, "\n");
+ show_graph(&out, '+', add, add_c, reset);
+ show_graph(&out, '-', del, del_c, reset);
+ strbuf_addch(&out, '\n');
+ emit_diff_symbol(options, DIFF_SYMBOL_STATS_LINE,
+ out.buf, out.len, 0);
+ strbuf_reset(&out);
}
for (i = 0; i < data->nr; i++) {
@@ -1834,11 +2512,14 @@
if (i < count)
continue;
if (!extra_shown)
- fprintf(options->file, "%s ...\n", line_prefix);
+ emit_diff_symbol(options,
+ DIFF_SYMBOL_STATS_SUMMARY_ABBREV,
+ NULL, 0, 0);
extra_shown = 1;
}
- fprintf(options->file, "%s", line_prefix);
- print_stat_summary(options->file, total_files, adds, dels);
+
+ print_stat_summary_inserts_deletes(options, total_files, adds, dels);
+ strbuf_release(&out);
}
static void show_shortstats(struct diffstat_t *data, struct diff_options *options)
@@ -1850,7 +2531,7 @@
for (i = 0; i < data->nr; i++) {
int added = data->files[i]->added;
- int deleted= data->files[i]->deleted;
+ int deleted = data->files[i]->deleted;
if (data->files[i]->is_unmerged ||
(!data->files[i]->is_interesting && (added + deleted == 0))) {
@@ -1860,8 +2541,7 @@
dels += deleted;
}
}
- fprintf(options->file, "%s", diff_line_prefix(options));
- print_stat_summary(options->file, total_files, adds, dels);
+ print_stat_summary_inserts_deletes(options, total_files, adds, dels);
}
static void show_numstat(struct diffstat_t *data, struct diff_options *options)
@@ -1980,7 +2660,7 @@
dir.alloc = 0;
dir.nr = 0;
dir.permille = options->dirstat_permille;
- dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
+ dir.cumulative = options->flags.dirstat_cumulative;
changed = 0;
for (i = 0; i < q->nr; i++) {
@@ -2006,7 +2686,7 @@
goto found_damage;
}
- if (DIFF_OPT_TST(options, DIRSTAT_BY_FILE)) {
+ if (options->flags.dirstat_by_file) {
/*
* In --dirstat-by-file mode, we don't really need to
* look at the actual file contents at all.
@@ -2081,7 +2761,7 @@
dir.alloc = 0;
dir.nr = 0;
dir.permille = options->dirstat_permille;
- dir.cumulative = DIFF_OPT_TST(options, DIRSTAT_CUMULATIVE);
+ dir.cumulative = options->flags.dirstat_cumulative;
changed = 0;
for (i = 0; i < data->nr; i++) {
@@ -2225,8 +2905,8 @@
return deflated;
}
-static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two,
- const char *prefix)
+static void emit_binary_diff_body(struct diff_options *o,
+ mmfile_t *one, mmfile_t *two)
{
void *cp;
void *delta;
@@ -2255,13 +2935,18 @@
}
if (delta && delta_size < deflate_size) {
- fprintf(file, "%sdelta %lu\n", prefix, orig_size);
+ char *s = xstrfmt("%lu", orig_size);
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_DELTA,
+ s, strlen(s), 0);
+ free(s);
free(deflated);
data = delta;
data_size = delta_size;
- }
- else {
- fprintf(file, "%sliteral %lu\n", prefix, two->size);
+ } else {
+ char *s = xstrfmt("%lu", two->size);
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER_LITERAL,
+ s, strlen(s), 0);
+ free(s);
free(delta);
data = deflated;
data_size = deflate_size;
@@ -2270,8 +2955,9 @@
/* emit data encoded in base85 */
cp = data;
while (data_size) {
+ int len;
int bytes = (52 < data_size) ? 52 : data_size;
- char line[70];
+ char line[71];
data_size -= bytes;
if (bytes <= 26)
line[0] = bytes + 'A' - 1;
@@ -2279,20 +2965,24 @@
line[0] = bytes - 26 + 'a' - 1;
encode_85(line + 1, cp, bytes);
cp = (char *) cp + bytes;
- fprintf(file, "%s", prefix);
- fputs(line, file);
- fputc('\n', file);
+
+ len = strlen(line);
+ line[len++] = '\n';
+ line[len] = '\0';
+
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_BODY,
+ line, len, 0);
}
- fprintf(file, "%s\n", prefix);
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_FOOTER, NULL, 0, 0);
free(data);
}
-static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two,
- const char *prefix)
+static void emit_binary_diff(struct diff_options *o,
+ mmfile_t *one, mmfile_t *two)
{
- fprintf(file, "%sGIT binary patch\n", prefix);
- emit_binary_diff_body(file, one, two, prefix);
- emit_binary_diff_body(file, two, one, prefix);
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_DIFF_HEADER, NULL, 0, 0);
+ emit_binary_diff_body(o, one, two);
+ emit_binary_diff_body(o, two, one);
}
int diff_filespec_is_binary(struct diff_filespec *one)
@@ -2358,7 +3048,7 @@
const char *line_prefix = diff_line_prefix(o);
diff_set_mnemonic_prefix(o, "a/", "b/");
- if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
+ if (o->flags.reverse_diff) {
a_prefix = o->b_prefix;
b_prefix = o->a_prefix;
} else {
@@ -2369,28 +3059,20 @@
if (o->submodule_format == DIFF_SUBMODULE_LOG &&
(!one->mode || S_ISGITLINK(one->mode)) &&
(!two->mode || S_ISGITLINK(two->mode))) {
- const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
- const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
- show_submodule_summary(o->file, one->path ? one->path : two->path,
- line_prefix,
+ show_submodule_summary(o, one->path ? one->path : two->path,
&one->oid, &two->oid,
- two->dirty_submodule,
- meta, del, add, reset);
+ two->dirty_submodule);
return;
} else if (o->submodule_format == DIFF_SUBMODULE_INLINE_DIFF &&
(!one->mode || S_ISGITLINK(one->mode)) &&
(!two->mode || S_ISGITLINK(two->mode))) {
- const char *del = diff_get_color_opt(o, DIFF_FILE_OLD);
- const char *add = diff_get_color_opt(o, DIFF_FILE_NEW);
- show_submodule_inline_diff(o->file, one->path ? one->path : two->path,
- line_prefix,
+ show_submodule_inline_diff(o, one->path ? one->path : two->path,
&one->oid, &two->oid,
- two->dirty_submodule,
- meta, del, add, reset, o);
+ two->dirty_submodule);
return;
}
- if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
+ if (o->flags.allow_textconv) {
textconv_one = get_textconv(one);
textconv_two = get_textconv(two);
}
@@ -2435,7 +3117,8 @@
if (complete_rewrite &&
(textconv_one || !diff_filespec_is_binary(one)) &&
(textconv_two || !diff_filespec_is_binary(two))) {
- fprintf(o->file, "%s", header.buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+ header.buf, header.len, 0);
strbuf_reset(&header);
emit_rewrite_diff(name_a, name_b, one, two,
textconv_one, textconv_two, o);
@@ -2445,23 +3128,31 @@
}
if (o->irreversible_delete && lbl[1][0] == '/') {
- fprintf(o->file, "%s", header.buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf,
+ header.len, 0);
strbuf_reset(&header);
goto free_ab_and_return;
- } else if (!DIFF_OPT_TST(o, TEXT) &&
+ } else if (!o->flags.text &&
( (!textconv_one && diff_filespec_is_binary(one)) ||
(!textconv_two && diff_filespec_is_binary(two)) )) {
+ struct strbuf sb = STRBUF_INIT;
if (!one->data && !two->data &&
S_ISREG(one->mode) && S_ISREG(two->mode) &&
- !DIFF_OPT_TST(o, BINARY)) {
+ !o->flags.binary) {
if (!oidcmp(&one->oid, &two->oid)) {
if (must_show_header)
- fprintf(o->file, "%s", header.buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+ header.buf, header.len,
+ 0);
goto free_ab_and_return;
}
- fprintf(o->file, "%s", header.buf);
- fprintf(o->file, "%sBinary files %s and %s differ\n",
- line_prefix, lbl[0], lbl[1]);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+ header.buf, header.len, 0);
+ strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
+ diff_line_prefix(o), lbl[0], lbl[1]);
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
goto free_ab_and_return;
}
if (fill_mmfile(&mf1, one) < 0 || fill_mmfile(&mf2, two) < 0)
@@ -2470,16 +3161,21 @@
if (mf1.size == mf2.size &&
!memcmp(mf1.ptr, mf2.ptr, mf1.size)) {
if (must_show_header)
- fprintf(o->file, "%s", header.buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+ header.buf, header.len, 0);
goto free_ab_and_return;
}
- fprintf(o->file, "%s", header.buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER, header.buf, header.len, 0);
strbuf_reset(&header);
- if (DIFF_OPT_TST(o, BINARY))
- emit_binary_diff(o->file, &mf1, &mf2, line_prefix);
- else
- fprintf(o->file, "%sBinary files %s and %s differ\n",
- line_prefix, lbl[0], lbl[1]);
+ if (o->flags.binary)
+ emit_binary_diff(o, &mf1, &mf2);
+ else {
+ strbuf_addf(&sb, "%sBinary files %s and %s differ\n",
+ diff_line_prefix(o), lbl[0], lbl[1]);
+ emit_diff_symbol(o, DIFF_SYMBOL_BINARY_FILES,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
+ }
o->found_changes = 1;
} else {
/* Crazy xdl interfaces.. */
@@ -2491,7 +3187,8 @@
const struct userdiff_funcname *pe;
if (must_show_header) {
- fprintf(o->file, "%s", header.buf);
+ emit_diff_symbol(o, DIFF_SYMBOL_HEADER,
+ header.buf, header.len, 0);
strbuf_reset(&header);
}
@@ -2513,10 +3210,12 @@
ecbdata.opt = o;
ecbdata.header = header.len ? &header : NULL;
xpp.flags = o->xdl_opts;
+ xpp.anchors = o->anchors;
+ xpp.anchors_nr = o->anchors_nr;
xecfg.ctxlen = o->context;
xecfg.interhunkctxlen = o->interhunkcontext;
xecfg.flags = XDL_EMIT_FUNCNAMES;
- if (DIFF_OPT_TST(o, FUNCCONTEXT))
+ if (o->flags.funccontext)
xecfg.flags |= XDL_EMIT_FUNCCONTEXT;
if (pe)
xdiff_set_find_func(&xecfg, pe->pattern, pe->cflags);
@@ -2605,6 +3304,8 @@
memset(&xpp, 0, sizeof(xpp));
memset(&xecfg, 0, sizeof(xecfg));
xpp.flags = o->xdl_opts;
+ xpp.anchors = o->anchors;
+ xpp.anchors_nr = o->anchors_nr;
xecfg.ctxlen = o->context;
xecfg.interhunkctxlen = o->interhunkcontext;
if (xdi_diff_outf(&mf1, &mf2, diffstat_consume, diffstat,
@@ -2681,7 +3382,7 @@
diff_free_filespec_data(one);
diff_free_filespec_data(two);
if (data.status)
- DIFF_OPT_SET(o, CHECK_FAILED);
+ o->flags.check_failed = 1;
}
struct diff_filespec *alloc_filespec(const char *path)
@@ -2848,14 +3549,12 @@
int fd;
if (lstat(s->path, &st) < 0) {
- if (errno == ENOENT) {
- err_empty:
- err = -1;
- empty:
- s->data = (char *)"";
- s->size = 0;
- return err;
- }
+ err_empty:
+ err = -1;
+ empty:
+ s->data = (char *)"";
+ s->size = 0;
+ return err;
}
s->size = xsize_t(st.st_size);
if (!s->size)
@@ -2960,7 +3659,6 @@
const struct object_id *oid,
int mode)
{
- int fd;
struct strbuf buf = STRBUF_INIT;
struct strbuf template = STRBUF_INIT;
char *path_dup = xstrdup(path);
@@ -2970,18 +3668,18 @@
strbuf_addstr(&template, "XXXXXX_");
strbuf_addstr(&template, base);
- fd = mks_tempfile_ts(&temp->tempfile, template.buf, strlen(base) + 1);
- if (fd < 0)
+ temp->tempfile = mks_tempfile_ts(template.buf, strlen(base) + 1);
+ if (!temp->tempfile)
die_errno("unable to create temp-file");
if (convert_to_working_tree(path,
(const char *)blob, (size_t)size, &buf)) {
blob = buf.buf;
size = buf.len;
}
- if (write_in_full(fd, blob, size) < 0)
+ if (write_in_full(temp->tempfile->fd, blob, size) < 0 ||
+ close_tempfile_gently(temp->tempfile))
die_errno("unable to write temp-file");
- close_tempfile(&temp->tempfile);
- temp->name = get_tempfile_path(&temp->tempfile);
+ temp->name = get_tempfile_path(temp->tempfile);
oid_to_hex_r(temp->hex, oid);
xsnprintf(temp->mode, sizeof(temp->mode), "%06o", mode);
strbuf_release(&buf);
@@ -3176,9 +3874,9 @@
*must_show_header = 0;
}
if (one && two && oidcmp(&one->oid, &two->oid)) {
- int abbrev = DIFF_OPT_TST(o, FULL_INDEX) ? 40 : DEFAULT_ABBREV;
+ int abbrev = o->flags.full_index ? 40 : DEFAULT_ABBREV;
- if (DIFF_OPT_TST(o, BINARY)) {
+ if (o->flags.binary) {
mmfile_t mf;
if ((!fill_mmfile(&mf, one) && diff_filespec_is_binary(one)) ||
(!fill_mmfile(&mf, two) && diff_filespec_is_binary(two)))
@@ -3208,7 +3906,7 @@
int must_show_header = 0;
- if (DIFF_OPT_TST(o, ALLOW_EXTERNAL)) {
+ if (o->flags.allow_external) {
struct userdiff_driver *drv = userdiff_find_by_path(attr_path);
if (drv && drv->external)
pgm = drv->external;
@@ -3249,7 +3947,7 @@
}
if (lstat(one->path, &st) < 0)
die_errno("stat '%s'", one->path);
- if (index_path(one->oid.hash, one->path, &st, 0))
+ if (index_path(&one->oid, one->path, &st, 0))
die("cannot hash %s", one->path);
}
}
@@ -3282,13 +3980,13 @@
const char *other;
const char *attr_path;
- name = p->one->path;
- other = (strcmp(name, p->two->path) ? p->two->path : NULL);
+ name = one->path;
+ other = (strcmp(name, two->path) ? two->path : NULL);
attr_path = name;
if (o->prefix_length)
strip_prefix(o->prefix_length, &name, &other);
- if (!DIFF_OPT_TST(o, ALLOW_EXTERNAL))
+ if (!o->flags.allow_external)
pgm = NULL;
if (DIFF_PAIR_UNMERGED(p)) {
@@ -3387,7 +4085,7 @@
options->context = diff_context_default;
options->interhunkcontext = diff_interhunk_context_default;
options->ws_error_highlight = ws_error_highlight_default;
- DIFF_OPT_SET(options, RENAME_EMPTY);
+ options->flags.rename_empty = 1;
/* pathchange left =NULL by default */
options->change = diff_change;
@@ -3406,6 +4104,8 @@
options->a_prefix = "a/";
options->b_prefix = "b/";
}
+
+ options->color_moved = diff_color_moved_default;
}
void diff_setup_done(struct diff_options *options)
@@ -3433,17 +4133,15 @@
* inside contents.
*/
- if (DIFF_XDL_TST(options, IGNORE_WHITESPACE) ||
- DIFF_XDL_TST(options, IGNORE_WHITESPACE_CHANGE) ||
- DIFF_XDL_TST(options, IGNORE_WHITESPACE_AT_EOL))
- DIFF_OPT_SET(options, DIFF_FROM_CONTENTS);
+ if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
+ options->flags.diff_from_contents = 1;
else
- DIFF_OPT_CLR(options, DIFF_FROM_CONTENTS);
+ options->flags.diff_from_contents = 0;
- if (DIFF_OPT_TST(options, FIND_COPIES_HARDER))
+ if (options->flags.find_copies_harder)
options->detect_rename = DIFF_DETECT_COPY;
- if (!DIFF_OPT_TST(options, RELATIVE_NAME))
+ if (!options->flags.relative_name)
options->prefix = NULL;
if (options->prefix)
options->prefix_length = strlen(options->prefix);
@@ -3473,18 +4171,18 @@
DIFF_FORMAT_DIRSTAT |
DIFF_FORMAT_SUMMARY |
DIFF_FORMAT_CHECKDIFF))
- DIFF_OPT_SET(options, RECURSIVE);
+ options->flags.recursive = 1;
/*
* Also pickaxe would not work very well if you do not say recursive
*/
if (options->pickaxe)
- DIFF_OPT_SET(options, RECURSIVE);
+ options->flags.recursive = 1;
/*
* When patches are generated, submodules diffed against the work tree
* must be checked for dirtiness too so it can be shown in the output
*/
if (options->output_format & DIFF_FORMAT_PATCH)
- DIFF_OPT_SET(options, DIRTY_SUBMODULES);
+ options->flags.dirty_submodules = 1;
if (options->detect_rename && options->rename_limit < 0)
options->rename_limit = diff_rename_limit_default;
@@ -3506,15 +4204,18 @@
* to have found. It does not make sense not to return with
* exit code in such a case either.
*/
- if (DIFF_OPT_TST(options, QUICK)) {
+ if (options->flags.quick) {
options->output_format = DIFF_FORMAT_NO_OUTPUT;
- DIFF_OPT_SET(options, EXIT_WITH_STATUS);
+ options->flags.exit_with_status = 1;
}
options->diff_path_counter = 0;
- if (DIFF_OPT_TST(options, FOLLOW_RENAMES) && options->pathspec.nr != 1)
+ if (options->flags.follow_renames && options->pathspec.nr != 1)
die(_("--follow requires exactly one pathspec"));
+
+ if (!options->use_color || external_diff())
+ options->color_moved = 0;
}
static int opt_arg(const char *arg, int arg_short, const char *arg_long, int *val)
@@ -3811,17 +4512,12 @@
options->output_format |= DIFF_FORMAT_NUMSTAT;
else if (!strcmp(arg, "--shortstat"))
options->output_format |= DIFF_FORMAT_SHORTSTAT;
- else if (!strcmp(arg, "-X") || !strcmp(arg, "--dirstat"))
- return parse_dirstat_opt(options, "");
- else if (skip_prefix(arg, "-X", &arg))
- return parse_dirstat_opt(options, arg);
- else if (skip_prefix(arg, "--dirstat=", &arg))
+ else if (skip_prefix(arg, "-X", &arg) ||
+ skip_to_optional_arg(arg, "--dirstat", &arg))
return parse_dirstat_opt(options, arg);
else if (!strcmp(arg, "--cumulative"))
return parse_dirstat_opt(options, "cumulative");
- else if (!strcmp(arg, "--dirstat-by-file"))
- return parse_dirstat_opt(options, "files");
- else if (skip_prefix(arg, "--dirstat-by-file=", &arg)) {
+ else if (skip_to_optional_arg(arg, "--dirstat-by-file", &arg)) {
parse_dirstat_opt(options, "files");
return parse_dirstat_opt(options, arg);
}
@@ -3843,13 +4539,13 @@
return stat_opt(options, av);
/* renames options */
- else if (starts_with(arg, "-B") || starts_with(arg, "--break-rewrites=") ||
- !strcmp(arg, "--break-rewrites")) {
+ else if (starts_with(arg, "-B") ||
+ skip_to_optional_arg(arg, "--break-rewrites", NULL)) {
if ((options->break_opt = diff_scoreopt_parse(arg)) == -1)
return error("invalid argument to -B: %s", arg+2);
}
- else if (starts_with(arg, "-M") || starts_with(arg, "--find-renames=") ||
- !strcmp(arg, "--find-renames")) {
+ else if (starts_with(arg, "-M") ||
+ skip_to_optional_arg(arg, "--find-renames", NULL)) {
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
return error("invalid argument to -M: %s", arg+2);
options->detect_rename = DIFF_DETECT_RENAME;
@@ -3857,10 +4553,10 @@
else if (!strcmp(arg, "-D") || !strcmp(arg, "--irreversible-delete")) {
options->irreversible_delete = 1;
}
- else if (starts_with(arg, "-C") || starts_with(arg, "--find-copies=") ||
- !strcmp(arg, "--find-copies")) {
+ else if (starts_with(arg, "-C") ||
+ skip_to_optional_arg(arg, "--find-copies", NULL)) {
if (options->detect_rename == DIFF_DETECT_COPY)
- DIFF_OPT_SET(options, FIND_COPIES_HARDER);
+ options->flags.find_copies_harder = 1;
if ((options->rename_score = diff_scoreopt_parse(arg)) == -1)
return error("invalid argument to -C: %s", arg+2);
options->detect_rename = DIFF_DETECT_COPY;
@@ -3868,14 +4564,13 @@
else if (!strcmp(arg, "--no-renames"))
options->detect_rename = 0;
else if (!strcmp(arg, "--rename-empty"))
- DIFF_OPT_SET(options, RENAME_EMPTY);
+ options->flags.rename_empty = 1;
else if (!strcmp(arg, "--no-rename-empty"))
- DIFF_OPT_CLR(options, RENAME_EMPTY);
- else if (!strcmp(arg, "--relative"))
- DIFF_OPT_SET(options, RELATIVE_NAME);
- else if (skip_prefix(arg, "--relative=", &arg)) {
- DIFF_OPT_SET(options, RELATIVE_NAME);
- options->prefix = arg;
+ options->flags.rename_empty = 0;
+ else if (skip_to_optional_arg_default(arg, "--relative", &arg, NULL)) {
+ options->flags.relative_name = 1;
+ if (arg)
+ options->prefix = arg;
}
/* xdiff options */
@@ -3889,15 +4584,26 @@
DIFF_XDL_SET(options, IGNORE_WHITESPACE_CHANGE);
else if (!strcmp(arg, "--ignore-space-at-eol"))
DIFF_XDL_SET(options, IGNORE_WHITESPACE_AT_EOL);
+ else if (!strcmp(arg, "--ignore-cr-at-eol"))
+ DIFF_XDL_SET(options, IGNORE_CR_AT_EOL);
else if (!strcmp(arg, "--ignore-blank-lines"))
DIFF_XDL_SET(options, IGNORE_BLANK_LINES);
else if (!strcmp(arg, "--indent-heuristic"))
DIFF_XDL_SET(options, INDENT_HEURISTIC);
else if (!strcmp(arg, "--no-indent-heuristic"))
DIFF_XDL_CLR(options, INDENT_HEURISTIC);
- else if (!strcmp(arg, "--patience"))
+ else if (!strcmp(arg, "--patience")) {
+ int i;
options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
- else if (!strcmp(arg, "--histogram"))
+ /*
+ * Both --patience and --anchored use PATIENCE_DIFF
+ * internally, so remove any anchors previously
+ * specified.
+ */
+ for (i = 0; i < options->anchors_nr; i++)
+ free(options->anchors[i]);
+ options->anchors_nr = 0;
+ } else if (!strcmp(arg, "--histogram"))
options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF);
else if ((argcount = parse_long_opt("diff-algorithm", av, &optarg))) {
long value = parse_algorithm_value(optarg);
@@ -3909,29 +4615,32 @@
options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK;
options->xdl_opts |= value;
return argcount;
+ } else if (skip_prefix(arg, "--anchored=", &arg)) {
+ options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF);
+ ALLOC_GROW(options->anchors, options->anchors_nr + 1,
+ options->anchors_alloc);
+ options->anchors[options->anchors_nr++] = xstrdup(arg);
}
/* flags options */
else if (!strcmp(arg, "--binary")) {
enable_patch_output(&options->output_format);
- DIFF_OPT_SET(options, BINARY);
+ options->flags.binary = 1;
}
else if (!strcmp(arg, "--full-index"))
- DIFF_OPT_SET(options, FULL_INDEX);
+ options->flags.full_index = 1;
else if (!strcmp(arg, "-a") || !strcmp(arg, "--text"))
- DIFF_OPT_SET(options, TEXT);
+ options->flags.text = 1;
else if (!strcmp(arg, "-R"))
- DIFF_OPT_SET(options, REVERSE_DIFF);
+ options->flags.reverse_diff = 1;
else if (!strcmp(arg, "--find-copies-harder"))
- DIFF_OPT_SET(options, FIND_COPIES_HARDER);
+ options->flags.find_copies_harder = 1;
else if (!strcmp(arg, "--follow"))
- DIFF_OPT_SET(options, FOLLOW_RENAMES);
+ options->flags.follow_renames = 1;
else if (!strcmp(arg, "--no-follow")) {
- DIFF_OPT_CLR(options, FOLLOW_RENAMES);
- DIFF_OPT_CLR(options, DEFAULT_FOLLOW_RENAMES);
- } else if (!strcmp(arg, "--color"))
- options->use_color = 1;
- else if (skip_prefix(arg, "--color=", &arg)) {
+ options->flags.follow_renames = 0;
+ options->flags.default_follow_renames = 0;
+ } else if (skip_to_optional_arg_default(arg, "--color", &arg, "always")) {
int value = git_config_colorbool(NULL, arg);
if (value < 0)
return error("option `color' expects \"always\", \"auto\", or \"never\"");
@@ -3939,15 +4648,22 @@
}
else if (!strcmp(arg, "--no-color"))
options->use_color = 0;
- else if (!strcmp(arg, "--color-words")) {
+ else if (!strcmp(arg, "--color-moved")) {
+ if (diff_color_moved_default)
+ options->color_moved = diff_color_moved_default;
+ if (options->color_moved == COLOR_MOVED_NO)
+ options->color_moved = COLOR_MOVED_DEFAULT;
+ } else if (!strcmp(arg, "--no-color-moved"))
+ options->color_moved = COLOR_MOVED_NO;
+ else if (skip_prefix(arg, "--color-moved=", &arg)) {
+ int cm = parse_color_moved(arg);
+ if (cm < 0)
+ die("bad --color-moved argument: %s", arg);
+ options->color_moved = cm;
+ } else if (skip_to_optional_arg_default(arg, "--color-words", &options->word_regex, NULL)) {
options->use_color = 1;
options->word_diff = DIFF_WORDS_COLOR;
}
- else if (skip_prefix(arg, "--color-words=", &arg)) {
- options->use_color = 1;
- options->word_diff = DIFF_WORDS_COLOR;
- options->word_regex = arg;
- }
else if (!strcmp(arg, "--word-diff")) {
if (options->word_diff == DIFF_WORDS_NONE)
options->word_diff = DIFF_WORDS_PLAIN;
@@ -3973,26 +4689,22 @@
return argcount;
}
else if (!strcmp(arg, "--exit-code"))
- DIFF_OPT_SET(options, EXIT_WITH_STATUS);
+ options->flags.exit_with_status = 1;
else if (!strcmp(arg, "--quiet"))
- DIFF_OPT_SET(options, QUICK);
+ options->flags.quick = 1;
else if (!strcmp(arg, "--ext-diff"))
- DIFF_OPT_SET(options, ALLOW_EXTERNAL);
+ options->flags.allow_external = 1;
else if (!strcmp(arg, "--no-ext-diff"))
- DIFF_OPT_CLR(options, ALLOW_EXTERNAL);
- else if (!strcmp(arg, "--textconv"))
- DIFF_OPT_SET(options, ALLOW_TEXTCONV);
- else if (!strcmp(arg, "--no-textconv"))
- DIFF_OPT_CLR(options, ALLOW_TEXTCONV);
- else if (!strcmp(arg, "--ignore-submodules")) {
- DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
- handle_ignore_submodules_arg(options, "all");
- } else if (skip_prefix(arg, "--ignore-submodules=", &arg)) {
- DIFF_OPT_SET(options, OVERRIDE_SUBMODULE_CONFIG);
+ options->flags.allow_external = 0;
+ else if (!strcmp(arg, "--textconv")) {
+ options->flags.allow_textconv = 1;
+ options->flags.textconv_set_via_cmdline = 1;
+ } else if (!strcmp(arg, "--no-textconv"))
+ options->flags.allow_textconv = 0;
+ else if (skip_to_optional_arg_default(arg, "--ignore-submodules", &arg, "all")) {
+ options->flags.override_submodule_config = 1;
handle_ignore_submodules_arg(options, arg);
- } else if (!strcmp(arg, "--submodule"))
- options->submodule_format = DIFF_SUBMODULE_LOG;
- else if (skip_prefix(arg, "--submodule=", &arg))
+ } else if (skip_to_optional_arg_default(arg, "--submodule", &arg, "log"))
return parse_submodule_opt(options, arg);
else if (skip_prefix(arg, "--ws-error-highlight=", &arg))
return parse_ws_error_highlight_opt(options, arg);
@@ -4063,11 +4775,11 @@
&options->interhunkcontext))
;
else if (!strcmp(arg, "-W"))
- DIFF_OPT_SET(options, FUNCCONTEXT);
+ options->flags.funccontext = 1;
else if (!strcmp(arg, "--function-context"))
- DIFF_OPT_SET(options, FUNCCONTEXT);
+ options->flags.funccontext = 1;
else if (!strcmp(arg, "--no-function-context"))
- DIFF_OPT_CLR(options, FUNCCONTEXT);
+ options->flags.funccontext = 0;
else if ((argcount = parse_long_opt("output", av, &optarg))) {
char *path = prefix_filename(prefix, optarg);
options->file = xfopen(path, "w");
@@ -4190,14 +4902,20 @@
int abblen;
const char *abbrev;
+ /* Do we want all 40 hex characters? */
if (len == GIT_SHA1_HEXSZ)
return oid_to_hex(oid);
+ /* An abbreviated value is fine, possibly followed by an ellipsis. */
abbrev = diff_abbrev_oid(oid, len);
+
+ if (!print_sha1_ellipsis())
+ return abbrev;
+
abblen = strlen(abbrev);
/*
- * In well-behaved cases, where the abbbreviated result is the
+ * In well-behaved cases, where the abbreviated result is the
* same as the requested length, append three dots after the
* abbreviation (hence the whole logic is limited to the case
* where abblen < 37); when the actual abbreviated result is a
@@ -4469,67 +5187,79 @@
}
}
-static void show_file_mode_name(FILE *file, const char *newdelete, struct diff_filespec *fs)
+static void show_file_mode_name(struct diff_options *opt, const char *newdelete, struct diff_filespec *fs)
{
+ struct strbuf sb = STRBUF_INIT;
if (fs->mode)
- fprintf(file, " %s mode %06o ", newdelete, fs->mode);
+ strbuf_addf(&sb, " %s mode %06o ", newdelete, fs->mode);
else
- fprintf(file, " %s ", newdelete);
- write_name_quoted(fs->path, file, '\n');
+ strbuf_addf(&sb, " %s ", newdelete);
+
+ quote_c_style(fs->path, &sb, NULL, 0);
+ strbuf_addch(&sb, '\n');
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
}
-
-static void show_mode_change(FILE *file, struct diff_filepair *p, int show_name,
- const char *line_prefix)
+static void show_mode_change(struct diff_options *opt, struct diff_filepair *p,
+ int show_name)
{
if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
- fprintf(file, "%s mode change %06o => %06o%c", line_prefix, p->one->mode,
- p->two->mode, show_name ? ' ' : '\n');
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addf(&sb, " mode change %06o => %06o",
+ p->one->mode, p->two->mode);
if (show_name) {
- write_name_quoted(p->two->path, file, '\n');
+ strbuf_addch(&sb, ' ');
+ quote_c_style(p->two->path, &sb, NULL, 0);
}
+ strbuf_addch(&sb, '\n');
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
}
}
-static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_filepair *p,
- const char *line_prefix)
+static void show_rename_copy(struct diff_options *opt, const char *renamecopy,
+ struct diff_filepair *p)
{
+ struct strbuf sb = STRBUF_INIT;
char *names = pprint_rename(p->one->path, p->two->path);
-
- fprintf(file, " %s %s (%d%%)\n", renamecopy, names, similarity_index(p));
+ strbuf_addf(&sb, " %s %s (%d%%)\n",
+ renamecopy, names, similarity_index(p));
free(names);
- show_mode_change(file, p, 0, line_prefix);
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ show_mode_change(opt, p, 0);
+ strbuf_release(&sb);
}
static void diff_summary(struct diff_options *opt, struct diff_filepair *p)
{
- FILE *file = opt->file;
- const char *line_prefix = diff_line_prefix(opt);
-
switch(p->status) {
case DIFF_STATUS_DELETED:
- fputs(line_prefix, file);
- show_file_mode_name(file, "delete", p->one);
+ show_file_mode_name(opt, "delete", p->one);
break;
case DIFF_STATUS_ADDED:
- fputs(line_prefix, file);
- show_file_mode_name(file, "create", p->two);
+ show_file_mode_name(opt, "create", p->two);
break;
case DIFF_STATUS_COPIED:
- fputs(line_prefix, file);
- show_rename_copy(file, "copy", p, line_prefix);
+ show_rename_copy(opt, "copy", p);
break;
case DIFF_STATUS_RENAMED:
- fputs(line_prefix, file);
- show_rename_copy(file, "rename", p, line_prefix);
+ show_rename_copy(opt, "rename", p);
break;
default:
if (p->score) {
- fprintf(file, "%s rewrite ", line_prefix);
- write_name_quoted(p->two->path, file, ' ');
- fprintf(file, "(%d%%)\n", similarity_index(p));
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addstr(&sb, " rewrite ");
+ quote_c_style(p->two->path, &sb, NULL, 0);
+ strbuf_addf(&sb, " (%d%%)\n", similarity_index(p));
+ emit_diff_symbol(opt, DIFF_SYMBOL_SUMMARY,
+ sb.buf, sb.len, 0);
+ strbuf_release(&sb);
}
- show_mode_change(file, p, !p->score, line_prefix);
+ show_mode_change(opt, p, !p->score);
break;
}
}
@@ -4724,16 +5454,62 @@
void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc)
{
+ fflush(stdout);
if (degraded_cc)
warning(_(degrade_cc_to_c_warning));
else if (needed)
warning(_(rename_limit_warning));
else
return;
- if (0 < needed && needed < 32767)
+ if (0 < needed)
warning(_(rename_limit_advice), varname, needed);
}
+static void diff_flush_patch_all_file_pairs(struct diff_options *o)
+{
+ int i;
+ static struct emitted_diff_symbols esm = EMITTED_DIFF_SYMBOLS_INIT;
+ struct diff_queue_struct *q = &diff_queued_diff;
+
+ if (WSEH_NEW & WS_RULE_MASK)
+ die("BUG: WS rules bit mask overlaps with diff symbol flags");
+
+ if (o->color_moved)
+ o->emitted_symbols = &esm;
+
+ for (i = 0; i < q->nr; i++) {
+ struct diff_filepair *p = q->queue[i];
+ if (check_pair_status(p))
+ diff_flush_patch(p, o);
+ }
+
+ if (o->emitted_symbols) {
+ if (o->color_moved) {
+ struct hashmap add_lines, del_lines;
+
+ hashmap_init(&del_lines,
+ (hashmap_cmp_fn)moved_entry_cmp, o, 0);
+ hashmap_init(&add_lines,
+ (hashmap_cmp_fn)moved_entry_cmp, o, 0);
+
+ add_lines_to_move_detection(o, &add_lines, &del_lines);
+ mark_color_as_moved(o, &add_lines, &del_lines);
+ if (o->color_moved == COLOR_MOVED_ZEBRA_DIM)
+ dim_moved_lines(o);
+
+ hashmap_free(&add_lines, 0);
+ hashmap_free(&del_lines, 0);
+ }
+
+ for (i = 0; i < esm.nr; i++)
+ emit_diff_symbol_from_struct(o, &esm.buf[i]);
+
+ for (i = 0; i < esm.nr; i++)
+ free((void *)esm.buf[i].line);
+ }
+ esm.nr = 0;
+}
+
void diff_flush(struct diff_options *options)
{
struct diff_queue_struct *q = &diff_queued_diff;
@@ -4760,7 +5536,7 @@
separator++;
}
- if (output_format & DIFF_FORMAT_DIRSTAT && DIFF_OPT_TST(options, DIRSTAT_BY_LINE))
+ if (output_format & DIFF_FORMAT_DIRSTAT && options->flags.dirstat_by_line)
dirstat_by_line = 1;
if (output_format & (DIFF_FORMAT_DIFFSTAT|DIFF_FORMAT_SHORTSTAT|DIFF_FORMAT_NUMSTAT) ||
@@ -4795,8 +5571,8 @@
}
if (output_format & DIFF_FORMAT_NO_OUTPUT &&
- DIFF_OPT_TST(options, EXIT_WITH_STATUS) &&
- DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
+ options->flags.exit_with_status &&
+ options->flags.diff_from_contents) {
/*
* run diff_flush_patch for the exit status. setting
* options->file to /dev/null should be safe, because we
@@ -4806,6 +5582,7 @@
fclose(options->file);
options->file = xfopen("/dev/null", "w");
options->close_file = 1;
+ options->color_moved = 0;
for (i = 0; i < q->nr; i++) {
struct diff_filepair *p = q->queue[i];
if (check_pair_status(p))
@@ -4817,20 +5594,14 @@
if (output_format & DIFF_FORMAT_PATCH) {
if (separator) {
- fprintf(options->file, "%s%c",
- diff_line_prefix(options),
- options->line_termination);
- if (options->stat_sep) {
+ emit_diff_symbol(options, DIFF_SYMBOL_SEPARATOR, NULL, 0, 0);
+ if (options->stat_sep)
/* attach patch instead of inline */
- fputs(options->stat_sep, options->file);
- }
+ emit_diff_symbol(options, DIFF_SYMBOL_STAT_SEP,
+ NULL, 0, 0);
}
- for (i = 0; i < q->nr; i++) {
- struct diff_filepair *p = q->queue[i];
- if (check_pair_status(p))
- diff_flush_patch(p, options);
- }
+ diff_flush_patch_all_file_pairs(options);
}
if (output_format & DIFF_FORMAT_CALLBACK)
@@ -4849,11 +5620,11 @@
* diff_addremove/diff_change does not set the bit when
* DIFF_FROM_CONTENTS is in effect (e.g. with -w).
*/
- if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS)) {
+ if (options->flags.diff_from_contents) {
if (options->found_changes)
- DIFF_OPT_SET(options, HAS_CHANGES);
+ options->flags.has_changes = 1;
else
- DIFF_OPT_CLR(options, HAS_CHANGES);
+ options->flags.has_changes = 0;
}
}
@@ -4973,7 +5744,7 @@
* to determine how many paths were dirty only
* due to stat info mismatch.
*/
- if (!DIFF_OPT_TST(diffopt, NO_INDEX))
+ if (!diffopt->flags.no_index)
diffopt->skip_stat_unmatch++;
diff_free_filepair(p);
}
@@ -5022,10 +5793,10 @@
diff_resolve_rename_copy();
diffcore_apply_filter(options);
- if (diff_queued_diff.nr && !DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
- DIFF_OPT_SET(options, HAS_CHANGES);
+ if (diff_queued_diff.nr && !options->flags.diff_from_contents)
+ options->flags.has_changes = 1;
else
- DIFF_OPT_CLR(options, HAS_CHANGES);
+ options->flags.has_changes = 0;
options->found_follow = 0;
}
@@ -5037,23 +5808,23 @@
diff_warn_rename_limit("diff.renameLimit",
opt->needed_rename_limit,
opt->degraded_cc_to_c);
- if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
+ if (!opt->flags.exit_with_status &&
!(opt->output_format & DIFF_FORMAT_CHECKDIFF))
return status;
- if (DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
- DIFF_OPT_TST(opt, HAS_CHANGES))
+ if (opt->flags.exit_with_status &&
+ opt->flags.has_changes)
result |= 01;
if ((opt->output_format & DIFF_FORMAT_CHECKDIFF) &&
- DIFF_OPT_TST(opt, CHECK_FAILED))
+ opt->flags.check_failed)
result |= 02;
return result;
}
int diff_can_quit_early(struct diff_options *opt)
{
- return (DIFF_OPT_TST(opt, QUICK) &&
+ return (opt->flags.quick &&
!opt->filter &&
- DIFF_OPT_TST(opt, HAS_CHANGES));
+ opt->flags.has_changes);
}
/*
@@ -5065,10 +5836,10 @@
static int is_submodule_ignored(const char *path, struct diff_options *options)
{
int ignored = 0;
- unsigned orig_flags = options->flags;
- if (!DIFF_OPT_TST(options, OVERRIDE_SUBMODULE_CONFIG))
+ struct diff_flags orig_flags = options->flags;
+ if (!options->flags.override_submodule_config)
set_diffopt_flags_from_submodule_config(options, path);
- if (DIFF_OPT_TST(options, IGNORE_SUBMODULES))
+ if (options->flags.ignore_submodules)
ignored = 1;
options->flags = orig_flags;
return ignored;
@@ -5097,7 +5868,7 @@
* Before the final output happens, they are pruned after
* merged into rename/copy pairs as appropriate.
*/
- if (DIFF_OPT_TST(options, REVERSE_DIFF))
+ if (options->flags.reverse_diff)
addremove = (addremove == '+' ? '-' :
addremove == '-' ? '+' : addremove);
@@ -5116,8 +5887,8 @@
}
diff_queue(&diff_queued_diff, one, two);
- if (!DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
- DIFF_OPT_SET(options, HAS_CHANGES);
+ if (!options->flags.diff_from_contents)
+ options->flags.has_changes = 1;
}
void diff_change(struct diff_options *options,
@@ -5135,7 +5906,7 @@
is_submodule_ignored(concatpath, options))
return;
- if (DIFF_OPT_TST(options, REVERSE_DIFF)) {
+ if (options->flags.reverse_diff) {
SWAP(old_mode, new_mode);
SWAP(old_oid, new_oid);
SWAP(old_oid_valid, new_oid_valid);
@@ -5154,14 +5925,14 @@
two->dirty_submodule = new_dirty_submodule;
p = diff_queue(&diff_queued_diff, one, two);
- if (DIFF_OPT_TST(options, DIFF_FROM_CONTENTS))
+ if (options->flags.diff_from_contents)
return;
- if (DIFF_OPT_TST(options, QUICK) && options->skip_stat_unmatch &&
+ if (options->flags.quick && options->skip_stat_unmatch &&
!diff_filespec_check_stat_unmatch(p))
return;
- DIFF_OPT_SET(options, HAS_CHANGES);
+ options->flags.has_changes = 1;
}
struct diff_filepair *diff_unmerge(struct diff_options *options, const char *path)
@@ -5299,7 +6070,7 @@
* and because it is easy to find people oneline advising "git diff
* --exit-code" in hooks and other scripts, we do not do so.
*/
- if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) &&
+ if (!opt->flags.exit_with_status &&
check_pager_config("diff") != 0)
setup_pager();
}
diff --git a/diff.h b/diff.h
index 2d442e2..7cf276f 100644
--- a/diff.h
+++ b/diff.h
@@ -60,42 +60,52 @@
#define DIFF_FORMAT_CALLBACK 0x1000
-#define DIFF_OPT_RECURSIVE (1 << 0)
-#define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1)
-#define DIFF_OPT_BINARY (1 << 2)
-#define DIFF_OPT_TEXT (1 << 3)
-#define DIFF_OPT_FULL_INDEX (1 << 4)
-#define DIFF_OPT_SILENT_ON_REMOVE (1 << 5)
-#define DIFF_OPT_FIND_COPIES_HARDER (1 << 6)
-#define DIFF_OPT_FOLLOW_RENAMES (1 << 7)
-#define DIFF_OPT_RENAME_EMPTY (1 << 8)
-/* (1 << 9) unused */
-#define DIFF_OPT_HAS_CHANGES (1 << 10)
-#define DIFF_OPT_QUICK (1 << 11)
-#define DIFF_OPT_NO_INDEX (1 << 12)
-#define DIFF_OPT_ALLOW_EXTERNAL (1 << 13)
-#define DIFF_OPT_EXIT_WITH_STATUS (1 << 14)
-#define DIFF_OPT_REVERSE_DIFF (1 << 15)
-#define DIFF_OPT_CHECK_FAILED (1 << 16)
-#define DIFF_OPT_RELATIVE_NAME (1 << 17)
-#define DIFF_OPT_IGNORE_SUBMODULES (1 << 18)
-#define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19)
-#define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20)
-#define DIFF_OPT_ALLOW_TEXTCONV (1 << 21)
-#define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22)
-#define DIFF_OPT_DIRTY_SUBMODULES (1 << 24)
-#define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25)
-#define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26)
-#define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27)
-#define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28)
-#define DIFF_OPT_FUNCCONTEXT (1 << 29)
-#define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30)
-#define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31)
+#define DIFF_FLAGS_INIT { 0 }
+struct diff_flags {
+ unsigned recursive:1;
+ unsigned tree_in_recursive:1;
+ unsigned binary:1;
+ unsigned text:1;
+ unsigned full_index:1;
+ unsigned silent_on_remove:1;
+ unsigned find_copies_harder:1;
+ unsigned follow_renames:1;
+ unsigned rename_empty:1;
+ unsigned has_changes:1;
+ unsigned quick:1;
+ unsigned no_index:1;
+ unsigned allow_external:1;
+ unsigned exit_with_status:1;
+ unsigned reverse_diff:1;
+ unsigned check_failed:1;
+ unsigned relative_name:1;
+ unsigned ignore_submodules:1;
+ unsigned dirstat_cumulative:1;
+ unsigned dirstat_by_file:1;
+ unsigned allow_textconv:1;
+ unsigned textconv_set_via_cmdline:1;
+ unsigned diff_from_contents:1;
+ unsigned dirty_submodules:1;
+ unsigned ignore_untracked_in_submodules:1;
+ unsigned ignore_dirty_submodules:1;
+ unsigned override_submodule_config:1;
+ unsigned dirstat_by_line:1;
+ unsigned funccontext:1;
+ unsigned pickaxe_ignore_case:1;
+ unsigned default_follow_renames:1;
+};
-#define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag)
-#define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag)
-#define DIFF_OPT_SET(opts, flag) (((opts)->flags |= DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
-#define DIFF_OPT_CLR(opts, flag) (((opts)->flags &= ~DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag))
+static inline void diff_flags_or(struct diff_flags *a,
+ const struct diff_flags *b)
+{
+ char *tmp_a = (char *)a;
+ const char *tmp_b = (const char *)b;
+ int i;
+
+ for (i = 0; i < sizeof(struct diff_flags); i++)
+ tmp_a[i] |= tmp_b[i];
+}
+
#define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag)
#define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag)
#define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag)
@@ -122,8 +132,7 @@
const char *a_prefix, *b_prefix;
const char *line_prefix;
size_t line_prefix_length;
- unsigned flags;
- unsigned touched_flags;
+ struct diff_flags flags;
/* diff-filter bits */
unsigned int filter;
@@ -148,15 +157,19 @@
int abbrev;
int ita_invisible_in_index;
/* white-space error highlighting */
-#define WSEH_NEW 1
-#define WSEH_CONTEXT 2
-#define WSEH_OLD 4
+#define WSEH_NEW (1<<12)
+#define WSEH_CONTEXT (1<<13)
+#define WSEH_OLD (1<<14)
unsigned ws_error_highlight;
const char *prefix;
int prefix_length;
const char *stat_sep;
long xdl_opts;
+ /* see Documentation/diff-options.txt */
+ char **anchors;
+ size_t anchors_nr, anchors_alloc;
+
int stat_width;
int stat_name_width;
int stat_graph_width;
@@ -180,14 +193,34 @@
pathchange_fn_t pathchange;
change_fn_t change;
add_remove_fn_t add_remove;
+ void *change_fn_data;
diff_format_fn_t format_callback;
void *format_callback_data;
diff_prefix_fn_t output_prefix;
void *output_prefix_data;
int diff_path_counter;
+
+ struct emitted_diff_symbols *emitted_symbols;
+ enum {
+ COLOR_MOVED_NO = 0,
+ COLOR_MOVED_PLAIN = 1,
+ COLOR_MOVED_ZEBRA = 2,
+ COLOR_MOVED_ZEBRA_DIM = 3,
+ } color_moved;
+ #define COLOR_MOVED_DEFAULT COLOR_MOVED_ZEBRA
+ #define COLOR_MOVED_MIN_ALNUM_COUNT 20
};
+void diff_emit_submodule_del(struct diff_options *o, const char *line);
+void diff_emit_submodule_add(struct diff_options *o, const char *line);
+void diff_emit_submodule_untracked(struct diff_options *o, const char *path);
+void diff_emit_submodule_modified(struct diff_options *o, const char *path);
+void diff_emit_submodule_header(struct diff_options *o, const char *header);
+void diff_emit_submodule_error(struct diff_options *o, const char *err);
+void diff_emit_submodule_pipethrough(struct diff_options *o,
+ const char *line, int len);
+
enum color_diff {
DIFF_RESET = 0,
DIFF_CONTEXT = 1,
@@ -197,7 +230,15 @@
DIFF_FILE_NEW = 5,
DIFF_COMMIT = 6,
DIFF_WHITESPACE = 7,
- DIFF_FUNCINFO = 8
+ DIFF_FUNCINFO = 8,
+ DIFF_FILE_OLD_MOVED = 9,
+ DIFF_FILE_OLD_MOVED_ALT = 10,
+ DIFF_FILE_OLD_MOVED_DIM = 11,
+ DIFF_FILE_OLD_MOVED_ALT_DIM = 12,
+ DIFF_FILE_NEW_MOVED = 13,
+ DIFF_FILE_NEW_MOVED_ALT = 14,
+ DIFF_FILE_NEW_MOVED_DIM = 15,
+ DIFF_FILE_NEW_MOVED_ALT_DIM = 16
};
const char *diff_get_color(int diff_use_color, enum color_diff ix);
#define diff_get_color_opt(o, ix) \
@@ -361,7 +402,8 @@
extern void diff_no_index(struct rev_info *, int, const char **);
-extern int index_differs_from(const char *def, int diff_flags, int ita_invisible_in_index);
+extern int index_differs_from(const char *def, const struct diff_flags *flags,
+ int ita_invisible_in_index);
/*
* Fill the contents of the filespec "df", respecting any textconv defined by
@@ -396,8 +438,8 @@
extern long parse_algorithm_value(const char *value);
-extern int print_stat_summary(FILE *fp, int files,
- int insertions, int deletions);
+extern void print_stat_summary(FILE *fp, int files,
+ int insertions, int deletions);
extern void setup_diff_pager(struct diff_options *);
#endif /* DIFF_H */
diff --git a/diffcore-pickaxe.c b/diffcore-pickaxe.c
index 341529b..9476bd2 100644
--- a/diffcore-pickaxe.c
+++ b/diffcore-pickaxe.c
@@ -131,7 +131,7 @@
if (!DIFF_FILE_VALID(p->one) && !DIFF_FILE_VALID(p->two))
return 0;
- if (DIFF_OPT_TST(o, ALLOW_TEXTCONV)) {
+ if (o->flags.allow_textconv) {
textconv_one = get_textconv(p->one);
textconv_two = get_textconv(p->two);
}
@@ -222,11 +222,11 @@
if (opts & (DIFF_PICKAXE_REGEX | DIFF_PICKAXE_KIND_G)) {
int cflags = REG_EXTENDED | REG_NEWLINE;
- if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE))
+ if (o->flags.pickaxe_ignore_case)
cflags |= REG_ICASE;
regcomp_or_die(®ex, needle, cflags);
regexp = ®ex;
- } else if (DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE) &&
+ } else if (o->flags.pickaxe_ignore_case &&
has_non_ascii(needle)) {
struct strbuf sb = STRBUF_INIT;
int cflags = REG_NEWLINE | REG_ICASE;
@@ -236,7 +236,7 @@
strbuf_release(&sb);
regexp = ®ex;
} else {
- kws = kwsalloc(DIFF_OPT_TST(o, PICKAXE_IGNORE_CASE)
+ kws = kwsalloc(o->flags.pickaxe_ignore_case
? tolower_trans_tbl : NULL);
kwsincr(kws, needle, strlen(needle));
kwsprep(kws);
diff --git a/diffcore-rename.c b/diffcore-rename.c
index 786f389..245e999 100644
--- a/diffcore-rename.c
+++ b/diffcore-rename.c
@@ -391,21 +391,19 @@
* growing larger than a "rename_limit" square matrix, ie:
*
* num_create * num_src > rename_limit * rename_limit
- *
- * but handles the potential overflow case specially (and we
- * assume at least 32-bit integers)
*/
- if (rename_limit <= 0 || rename_limit > 32767)
+ if (rename_limit <= 0)
rename_limit = 32767;
if ((num_create <= rename_limit || num_src <= rename_limit) &&
- (num_create * num_src <= rename_limit * rename_limit))
+ ((uint64_t)num_create * (uint64_t)num_src
+ <= (uint64_t)rename_limit * (uint64_t)rename_limit))
return 0;
options->needed_rename_limit =
num_src > num_create ? num_src : num_create;
/* Are we running under -C -C? */
- if (!DIFF_OPT_TST(options, FIND_COPIES_HARDER))
+ if (!options->flags.find_copies_harder)
return 1;
/* Would we bust the limit if we were running under -C? */
@@ -415,7 +413,8 @@
num_src++;
}
if ((num_create <= rename_limit || num_src <= rename_limit) &&
- (num_create * num_src <= rename_limit * rename_limit))
+ ((uint64_t)num_create * (uint64_t)num_src
+ <= (uint64_t)rename_limit * (uint64_t)rename_limit))
return 2;
return 1;
}
@@ -463,7 +462,7 @@
else if (options->single_follow &&
strcmp(options->single_follow, p->two->path))
continue; /* not interested */
- else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
+ else if (!options->flags.rename_empty &&
is_empty_blob_oid(&p->two->oid))
continue;
else if (add_rename_dst(p->two) < 0) {
@@ -473,7 +472,7 @@
goto cleanup;
}
}
- else if (!DIFF_OPT_TST(options, RENAME_EMPTY) &&
+ else if (!options->flags.rename_empty &&
is_empty_blob_oid(&p->one->oid))
continue;
else if (!DIFF_PAIR_UNMERGED(p) && !DIFF_FILE_VALID(p->two)) {
@@ -532,9 +531,9 @@
}
if (options->show_rename_progress) {
- progress = start_progress_delay(
+ progress = start_delayed_progress(
_("Performing inexact rename detection"),
- rename_dst_nr * rename_src_nr, 50, 1);
+ (uint64_t)rename_dst_nr * (uint64_t)rename_src_nr);
}
mx = xcalloc(st_mult(NUM_CANDIDATE_PER_DST, num_create), sizeof(*mx));
@@ -571,7 +570,7 @@
diff_free_filespec_blob(two);
}
dst_cnt++;
- display_progress(progress, (i+1)*rename_src_nr);
+ display_progress(progress, (uint64_t)(i+1)*(uint64_t)rename_src_nr);
}
stop_progress(&progress);
diff --git a/dir.c b/dir.c
index 1c55dc3..7c4b45e 100644
--- a/dir.c
+++ b/dir.c
@@ -18,6 +18,7 @@
#include "utf8.h"
#include "varint.h"
#include "ewah/ewok.h"
+#include "fsmonitor.h"
/*
* Tells read_directory_recursive how a file or directory should be treated.
@@ -49,7 +50,7 @@
static enum path_treatment read_directory_recursive(struct dir_struct *dir,
struct index_state *istate, const char *path, int len,
struct untracked_cache_dir *untracked,
- int check_only, const struct pathspec *pathspec);
+ int check_only, int stop_at_first_file, const struct pathspec *pathspec);
static int get_dtype(struct dirent *de, struct index_state *istate,
const char *path, int len);
@@ -220,6 +221,57 @@
return 1;
}
+/*
+ * Read the contents of the blob with the given OID into a buffer.
+ * Append a trailing LF to the end if the last line doesn't have one.
+ *
+ * Returns:
+ * -1 when the OID is invalid or unknown or does not refer to a blob.
+ * 0 when the blob is empty.
+ * 1 along with { data, size } of the (possibly augmented) buffer
+ * when successful.
+ *
+ * Optionally updates the given sha1_stat with the given OID (when valid).
+ */
+static int do_read_blob(const struct object_id *oid,
+ struct sha1_stat *sha1_stat,
+ size_t *size_out,
+ char **data_out)
+{
+ enum object_type type;
+ unsigned long sz;
+ char *data;
+
+ *size_out = 0;
+ *data_out = NULL;
+
+ data = read_sha1_file(oid->hash, &type, &sz);
+ if (!data || type != OBJ_BLOB) {
+ free(data);
+ return -1;
+ }
+
+ if (sha1_stat) {
+ memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat));
+ hashcpy(sha1_stat->sha1, oid->hash);
+ }
+
+ if (sz == 0) {
+ free(data);
+ return 0;
+ }
+
+ if (data[sz - 1] != '\n') {
+ data = xrealloc(data, st_add(sz, 1));
+ data[sz++] = '\n';
+ }
+
+ *size_out = xsize_t(sz);
+ *data_out = data;
+
+ return 1;
+}
+
#define DO_MATCH_EXCLUDE (1<<0)
#define DO_MATCH_DIRECTORY (1<<1)
#define DO_MATCH_SUBMODULE (1<<2)
@@ -600,32 +652,22 @@
x->el = el;
}
-static void *read_skip_worktree_file_from_index(const struct index_state *istate,
- const char *path, size_t *size,
- struct sha1_stat *sha1_stat)
+static int read_skip_worktree_file_from_index(const struct index_state *istate,
+ const char *path,
+ size_t *size_out,
+ char **data_out,
+ struct sha1_stat *sha1_stat)
{
int pos, len;
- unsigned long sz;
- enum object_type type;
- void *data;
len = strlen(path);
pos = index_name_pos(istate, path, len);
if (pos < 0)
- return NULL;
+ return -1;
if (!ce_skip_worktree(istate->cache[pos]))
- return NULL;
- data = read_sha1_file(istate->cache[pos]->oid.hash, &type, &sz);
- if (!data || type != OBJ_BLOB) {
- free(data);
- return NULL;
- }
- *size = xsize_t(sz);
- if (sha1_stat) {
- memset(&sha1_stat->stat, 0, sizeof(sha1_stat->stat));
- hashcpy(sha1_stat->sha1, istate->cache[pos]->oid.hash);
- }
- return data;
+ return -1;
+
+ return do_read_blob(&istate->cache[pos]->oid, sha1_stat, size_out, data_out);
}
/*
@@ -739,6 +781,10 @@
dir->dirs[i]->recurse = 0;
}
+static int add_excludes_from_buffer(char *buf, size_t size,
+ const char *base, int baselen,
+ struct exclude_list *el);
+
/*
* Given a file with name "fname", read it (either from disk, or from
* an index if 'istate' is non-null), parse it and store the
@@ -754,9 +800,10 @@
struct sha1_stat *sha1_stat)
{
struct stat st;
- int fd, i, lineno = 1;
+ int r;
+ int fd;
size_t size = 0;
- char *buf, *entry;
+ char *buf;
fd = open(fname, O_RDONLY);
if (fd < 0 || fstat(fd, &st) < 0) {
@@ -764,17 +811,13 @@
warn_on_fopen_errors(fname);
else
close(fd);
- if (!istate ||
- (buf = read_skip_worktree_file_from_index(istate, fname, &size, sha1_stat)) == NULL)
+ if (!istate)
return -1;
- if (size == 0) {
- free(buf);
- return 0;
- }
- if (buf[size-1] != '\n') {
- buf = xrealloc(buf, st_add(size, 1));
- buf[size++] = '\n';
- }
+ r = read_skip_worktree_file_from_index(istate, fname,
+ &size, &buf,
+ sha1_stat);
+ if (r != 1)
+ return r;
} else {
size = xsize_t(st.st_size);
if (size == 0) {
@@ -813,6 +856,17 @@
}
}
+ add_excludes_from_buffer(buf, size, base, baselen, el);
+ return 0;
+}
+
+static int add_excludes_from_buffer(char *buf, size_t size,
+ const char *base, int baselen,
+ struct exclude_list *el)
+{
+ int i, lineno = 1;
+ char *entry;
+
el->filebuf = buf;
if (skip_utf8_bom(&buf, size))
@@ -841,6 +895,23 @@
return add_excludes(fname, base, baselen, el, istate, NULL);
}
+int add_excludes_from_blob_to_list(
+ struct object_id *oid,
+ const char *base, int baselen,
+ struct exclude_list *el)
+{
+ char *buf;
+ size_t size;
+ int r;
+
+ r = do_read_blob(oid, NULL, &size, &buf);
+ if (r != 1)
+ return r;
+
+ add_excludes_from_buffer(buf, size, base, baselen, el);
+ return 0;
+}
+
struct exclude_list *add_exclude_list(struct dir_struct *dir,
int group_type, const char *src)
{
@@ -1389,10 +1460,34 @@
case index_nonexistent:
if (dir->flags & DIR_SHOW_OTHER_DIRECTORIES)
break;
+ if (exclude &&
+ (dir->flags & DIR_SHOW_IGNORED_TOO) &&
+ (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING)) {
+
+ /*
+ * This is an excluded directory and we are
+ * showing ignored paths that match an exclude
+ * pattern. (e.g. show directory as ignored
+ * only if it matches an exclude pattern).
+ * This path will either be 'path_excluded`
+ * (if we are showing empty directories or if
+ * the directory is not empty), or will be
+ * 'path_none' (empty directory, and we are
+ * not showing empty directories).
+ */
+ if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES))
+ return path_excluded;
+
+ if (read_directory_recursive(dir, istate, dirname, len,
+ untracked, 1, 1, pathspec) == path_excluded)
+ return path_excluded;
+
+ return path_none;
+ }
if (!(dir->flags & DIR_NO_GITLINKS)) {
- unsigned char sha1[20];
- if (resolve_gitlink_ref(dirname, "HEAD", sha1) == 0)
- return path_untracked;
+ struct object_id oid;
+ if (resolve_gitlink_ref(dirname, "HEAD", &oid) == 0)
+ return exclude ? path_excluded : path_untracked;
}
return path_recurse;
}
@@ -1404,8 +1499,13 @@
untracked = lookup_untracked(dir->untracked, untracked,
dirname + baselen, len - baselen);
+
+ /*
+ * If this is an excluded directory, then we only need to check if
+ * the directory contains any files.
+ */
return read_directory_recursive(dir, istate, dirname, len,
- untracked, 1, pathspec);
+ untracked, 1, exclude, pathspec);
}
/*
@@ -1556,6 +1656,7 @@
{
int exclude;
int has_path_in_index = !!index_file_exists(istate, path->buf, path->len, ignore_case);
+ enum path_treatment path_treatment;
if (dtype == DT_UNKNOWN)
dtype = get_dtype(de, istate, path->buf, path->len);
@@ -1602,8 +1703,23 @@
return path_none;
case DT_DIR:
strbuf_addch(path, '/');
- return treat_directory(dir, istate, untracked, path->buf, path->len,
- baselen, exclude, pathspec);
+ path_treatment = treat_directory(dir, istate, untracked,
+ path->buf, path->len,
+ baselen, exclude, pathspec);
+ /*
+ * If 1) we only want to return directories that
+ * match an exclude pattern and 2) this directory does
+ * not match an exclude pattern but all of its
+ * contents are excluded, then indicate that we should
+ * recurse into this directory (instead of marking the
+ * directory itself as an ignored path).
+ */
+ if (!exclude &&
+ path_treatment == path_excluded &&
+ (dir->flags & DIR_SHOW_IGNORED_TOO) &&
+ (dir->flags & DIR_SHOW_IGNORED_TOO_MODE_MATCHING))
+ return path_recurse;
+ return path_treatment;
case DT_REG:
case DT_LNK:
return exclude ? path_excluded : path_untracked;
@@ -1633,7 +1749,7 @@
* with check_only set.
*/
return read_directory_recursive(dir, istate, path->buf, path->len,
- cdir->ucd, 1, pathspec);
+ cdir->ucd, 1, 0, pathspec);
/*
* We get path_recurse in the first run when
* directory_exists_in_index() returns index_nonexistent. We
@@ -1688,17 +1804,23 @@
if (!untracked)
return 0;
- if (stat(path->len ? path->buf : ".", &st)) {
- invalidate_directory(dir->untracked, untracked);
- memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
- return 0;
- }
- if (!untracked->valid ||
- match_stat_data_racy(istate, &untracked->stat_data, &st)) {
- if (untracked->valid)
+ /*
+ * With fsmonitor, we can trust the untracked cache's valid field.
+ */
+ refresh_fsmonitor(istate);
+ if (!(dir->untracked->use_fsmonitor && untracked->valid)) {
+ if (stat(path->len ? path->buf : ".", &st)) {
invalidate_directory(dir->untracked, untracked);
- fill_stat_data(&untracked->stat_data, &st);
- return 0;
+ memset(&untracked->stat_data, 0, sizeof(untracked->stat_data));
+ return 0;
+ }
+ if (!untracked->valid ||
+ match_stat_data_racy(istate, &untracked->stat_data, &st)) {
+ if (untracked->valid)
+ invalidate_directory(dir->untracked, untracked);
+ fill_stat_data(&untracked->stat_data, &st);
+ return 0;
+ }
}
if (untracked->check_only != !!check_only) {
@@ -1793,12 +1915,20 @@
* Also, we ignore the name ".git" (even if it is not a directory).
* That likely will not change.
*
+ * If 'stop_at_first_file' is specified, 'path_excluded' is returned
+ * to signal that a file was found. This is the least significant value that
+ * indicates that a file was encountered that does not depend on the order of
+ * whether an untracked or exluded path was encountered first.
+ *
* Returns the most significant path_treatment value encountered in the scan.
+ * If 'stop_at_first_file' is specified, `path_excluded` is the most
+ * significant path_treatment value that will be returned.
*/
+
static enum path_treatment read_directory_recursive(struct dir_struct *dir,
struct index_state *istate, const char *base, int baselen,
struct untracked_cache_dir *untracked, int check_only,
- const struct pathspec *pathspec)
+ int stop_at_first_file, const struct pathspec *pathspec)
{
struct cached_dir cdir;
enum path_treatment state, subdir_state, dir_state = path_none;
@@ -1832,12 +1962,34 @@
subdir_state =
read_directory_recursive(dir, istate, path.buf,
path.len, ud,
- check_only, pathspec);
+ check_only, stop_at_first_file, pathspec);
if (subdir_state > dir_state)
dir_state = subdir_state;
}
if (check_only) {
+ if (stop_at_first_file) {
+ /*
+ * If stopping at first file, then
+ * signal that a file was found by
+ * returning `path_excluded`. This is
+ * to return a consistent value
+ * regardless of whether an ignored or
+ * excluded file happened to be
+ * encountered 1st.
+ *
+ * In current usage, the
+ * `stop_at_first_file` is passed when
+ * an ancestor directory has matched
+ * an exclude pattern, so any found
+ * files will be excluded.
+ */
+ if (dir_state >= path_excluded) {
+ dir_state = path_excluded;
+ break;
+ }
+ }
+
/* abort early if maximum state has been reached */
if (dir_state == path_untracked) {
if (cdir.fdir)
@@ -2108,7 +2260,7 @@
*/
dir->untracked = NULL;
if (!len || treat_leading_path(dir, istate, path, len, pathspec))
- read_directory_recursive(dir, istate, path, len, untracked, 0, pathspec);
+ read_directory_recursive(dir, istate, path, len, untracked, 0, 0, pathspec);
QSORT(dir->entries, dir->nr, cmp_dir_entry);
QSORT(dir->ignored, dir->ignored_nr, cmp_dir_entry);
@@ -2244,10 +2396,10 @@
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);
- unsigned char submodule_head[20];
+ struct object_id submodule_head;
if ((flag & REMOVE_DIR_KEEP_NESTED_GIT) &&
- !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) {
+ !resolve_gitlink_ref(path->buf, "HEAD", &submodule_head)) {
/* Do not descend and nuke a nested git work tree. */
if (kept_up)
*kept_up = 1;
diff --git a/dir.h b/dir.h
index e371705..11a047b 100644
--- a/dir.h
+++ b/dir.h
@@ -139,6 +139,8 @@
int gitignore_invalidated;
int dir_invalidated;
int dir_opened;
+ /* fsmonitor invalidation data */
+ unsigned int use_fsmonitor : 1;
};
struct dir_struct {
@@ -152,7 +154,8 @@
DIR_COLLECT_IGNORED = 1<<4,
DIR_SHOW_IGNORED_TOO = 1<<5,
DIR_COLLECT_KILLED_ONLY = 1<<6,
- DIR_KEEP_UNTRACKED_CONTENTS = 1<<7
+ DIR_KEEP_UNTRACKED_CONTENTS = 1<<7,
+ DIR_SHOW_IGNORED_TOO_MODE_MATCHING = 1<<8
} flags;
struct dir_entry **entries;
struct dir_entry **ignored;
@@ -256,6 +259,9 @@
extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen,
struct exclude_list *el, struct index_state *istate);
extern void add_excludes_from_file(struct dir_struct *, const char *fname);
+extern int add_excludes_from_blob_to_list(struct object_id *oid,
+ const char *base, int baselen,
+ struct exclude_list *el);
extern void parse_exclude_pattern(const char **string, int *patternlen, unsigned *flags, int *nowildcardlen);
extern void add_exclude(const char *string, const char *base,
int baselen, struct exclude_list *el, int srcpos);
diff --git a/editor.c b/editor.c
index 7519ede..9a9b4e1 100644
--- a/editor.c
+++ b/editor.c
@@ -7,11 +7,16 @@
#define DEFAULT_EDITOR "vi"
#endif
+int is_terminal_dumb(void)
+{
+ const char *terminal = getenv("TERM");
+ return !terminal || !strcmp(terminal, "dumb");
+}
+
const char *git_editor(void)
{
const char *editor = getenv("GIT_EDITOR");
- const char *terminal = getenv("TERM");
- int terminal_is_dumb = !terminal || !strcmp(terminal, "dumb");
+ int terminal_is_dumb = is_terminal_dumb();
if (!editor && editor_program)
editor = editor_program;
@@ -40,6 +45,23 @@
const char *args[] = { editor, real_path(path), NULL };
struct child_process p = CHILD_PROCESS_INIT;
int ret, sig;
+ int print_waiting_for_editor = advice_waiting_for_editor && isatty(2);
+
+ if (print_waiting_for_editor) {
+ /*
+ * A dumb terminal cannot erase the line later on. Add a
+ * newline to separate the hint from subsequent output.
+ *
+ * Make sure that our message is separated with a whitespace
+ * from further cruft that may be written by the editor.
+ */
+ const char term = is_terminal_dumb() ? '\n' : ' ';
+
+ fprintf(stderr,
+ _("hint: Waiting for your editor to close the file...%c"),
+ term);
+ fflush(stderr);
+ }
p.argv = args;
p.env = env;
@@ -58,6 +80,13 @@
if (ret)
return error("There was a problem with the editor '%s'.",
editor);
+
+ if (print_waiting_for_editor && !is_terminal_dumb())
+ /*
+ * Go back to the beginning and erase the entire line to
+ * avoid wasting the vertical space.
+ */
+ fputs("\r\033[K", stderr);
}
if (!buffer)
diff --git a/entry.c b/entry.c
index 3c1818f..3021144 100644
--- a/entry.c
+++ b/entry.c
@@ -3,6 +3,8 @@
#include "dir.h"
#include "streaming.h"
#include "submodule.h"
+#include "progress.h"
+#include "fsmonitor.h"
static void create_directories(const char *path, int path_len,
const struct checkout *state)
@@ -161,16 +163,22 @@
int finish_delayed_checkout(struct checkout *state)
{
int errs = 0;
+ unsigned delayed_object_count;
+ off_t filtered_bytes = 0;
struct string_list_item *filter, *path;
+ struct progress *progress;
struct delayed_checkout *dco = state->delayed_checkout;
if (!state->delayed_checkout)
return errs;
dco->state = CE_RETRY;
+ delayed_object_count = dco->paths.nr;
+ progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
while (dco->filters.nr > 0) {
for_each_string_list_item(filter, &dco->filters) {
struct string_list available_paths = STRING_LIST_INIT_NODUP;
+ display_progress(progress, delayed_object_count - dco->paths.nr);
if (!async_query_available_blobs(filter->string, &available_paths)) {
/* Filter reported an error */
@@ -216,11 +224,17 @@
}
ce = index_file_exists(state->istate, path->string,
strlen(path->string), 0);
- errs |= (ce ? checkout_entry(ce, state, NULL) : 1);
+ if (ce) {
+ errs |= checkout_entry(ce, state, NULL);
+ filtered_bytes += ce->ce_stat_data.sd_size;
+ display_throughput(progress, filtered_bytes);
+ } else
+ errs = 1;
}
}
string_list_remove_empty_items(&dco->filters, 0);
}
+ stop_progress(&progress);
string_list_clear(&dco->filters, 0);
/* At this point we should not have any delayed paths anymore. */
@@ -240,6 +254,7 @@
char *path, const struct checkout *state, int to_tempfile)
{
unsigned int ce_mode_s_ifmt = ce->ce_mode & S_IFMT;
+ struct delayed_checkout *dco = state->delayed_checkout;
int fd, ret, fstat_done = 0;
char *new;
struct strbuf buf = STRBUF_INIT;
@@ -260,55 +275,65 @@
}
switch (ce_mode_s_ifmt) {
- case S_IFREG:
case S_IFLNK:
new = read_blob_entry(ce, &size);
if (!new)
return error("unable to read sha1 file of %s (%s)",
- path, oid_to_hex(&ce->oid));
+ path, oid_to_hex(&ce->oid));
- if (ce_mode_s_ifmt == S_IFLNK && has_symlinks && !to_tempfile) {
- ret = symlink(new, path);
- free(new);
- if (ret)
- return error_errno("unable to create symlink %s",
- path);
- break;
+ /*
+ * We can't make a real symlink; write out a regular file entry
+ * with the symlink destination as its contents.
+ */
+ if (!has_symlinks || to_tempfile)
+ goto write_file_entry;
+
+ ret = symlink(new, path);
+ free(new);
+ if (ret)
+ return error_errno("unable to create symlink %s", path);
+ break;
+
+ case S_IFREG:
+ /*
+ * We do not send the blob in case of a retry, so do not
+ * bother reading it at all.
+ */
+ if (dco && dco->state == CE_RETRY) {
+ new = NULL;
+ size = 0;
+ } else {
+ new = read_blob_entry(ce, &size);
+ if (!new)
+ return error("unable to read sha1 file of %s (%s)",
+ path, oid_to_hex(&ce->oid));
}
/*
* Convert from git internal format to working tree format
*/
- if (ce_mode_s_ifmt == S_IFREG) {
- struct delayed_checkout *dco = state->delayed_checkout;
- if (dco && dco->state != CE_NO_DELAY) {
- /* Do not send the blob in case of a retry. */
- if (dco->state == CE_RETRY) {
- new = NULL;
- size = 0;
- }
- ret = async_convert_to_working_tree(
- ce->name, new, size, &buf, dco);
- if (ret && string_list_has_string(&dco->paths, ce->name)) {
- free(new);
- goto finish;
- }
- } else
- ret = convert_to_working_tree(
- ce->name, new, size, &buf);
-
- if (ret) {
+ if (dco && dco->state != CE_NO_DELAY) {
+ ret = async_convert_to_working_tree(ce->name, new,
+ size, &buf, dco);
+ if (ret && string_list_has_string(&dco->paths, ce->name)) {
free(new);
- new = strbuf_detach(&buf, &newsize);
- size = newsize;
+ goto delayed;
}
- /*
- * No "else" here as errors from convert are OK at this
- * point. If the error would have been fatal (e.g.
- * filter is required), then we would have died already.
- */
- }
+ } else
+ ret = convert_to_working_tree(ce->name, new, size, &buf);
+ if (ret) {
+ free(new);
+ new = strbuf_detach(&buf, &newsize);
+ size = newsize;
+ }
+ /*
+ * No "else" here as errors from convert are OK at this
+ * point. If the error would have been fatal (e.g.
+ * filter is required), then we would have died already.
+ */
+
+ write_file_entry:
fd = open_output_fd(path, ce, to_tempfile);
if (fd < 0) {
free(new);
@@ -323,6 +348,7 @@
if (wrote < 0)
return error("unable to write file %s", path);
break;
+
case S_IFGITLINK:
if (to_tempfile)
return error("cannot create temporary submodule %s", path);
@@ -334,6 +360,7 @@
NULL, oid_to_hex(&ce->oid),
state->force ? SUBMODULE_MOVE_HEAD_FORCE : 0);
break;
+
default:
return error("unknown file mode for %s in index", path);
}
@@ -342,11 +369,15 @@
if (state->refresh_cache) {
assert(state->istate);
if (!fstat_done)
- lstat(ce->name, &st);
+ if (lstat(ce->name, &st) < 0)
+ return error_errno("unable to stat just-written file %s",
+ ce->name);
fill_stat_cache_info(ce, &st);
ce->ce_flags |= CE_UPDATE_IN_BASE;
+ mark_fsmonitor_invalid(state->istate, ce);
state->istate->cache_changed |= CE_ENTRY_CHANGED;
}
+delayed:
return 0;
}
diff --git a/environment.c b/environment.c
index 3fd4b10..63ac38a 100644
--- a/environment.c
+++ b/environment.c
@@ -76,6 +76,7 @@
#define PROTECT_NTFS_DEFAULT 0
#endif
int protect_ntfs = PROTECT_NTFS_DEFAULT;
+const char *core_fsmonitor;
/*
* The character that begins a commented line in user-editable file
@@ -97,7 +98,7 @@
/* This is set by setup_git_dir_gently() and/or git_default_config() */
char *git_work_tree_cfg;
-static const char *namespace;
+static char *namespace;
static const char *super_prefix;
@@ -152,8 +153,10 @@
if (getenv(NO_REPLACE_OBJECTS_ENVIRONMENT))
check_replace_refs = 0;
replace_ref_base = getenv(GIT_REPLACE_REF_BASE_ENVIRONMENT);
+ free(git_replace_ref_base);
git_replace_ref_base = xstrdup(replace_ref_base ? replace_ref_base
: "refs/replace/");
+ free(namespace);
namespace = expand_namespace(getenv(GIT_NAMESPACE_ENVIRONMENT));
shallow_file = getenv(GIT_SHALLOW_FILE_ENVIRONMENT);
if (shallow_file)
@@ -336,3 +339,23 @@
{
need_shared_repository_from_config = 1;
}
+
+int use_optional_locks(void)
+{
+ return git_env_bool(GIT_OPTIONAL_LOCKS_ENVIRONMENT, 1);
+}
+
+int print_sha1_ellipsis(void)
+{
+ /*
+ * Determine if the calling environment contains the variable
+ * GIT_PRINT_SHA1_ELLIPSIS set to "yes".
+ */
+ static int cached_result = -1; /* unknown */
+
+ if (cached_result < 0) {
+ const char *v = getenv("GIT_PRINT_SHA1_ELLIPSIS");
+ cached_result = (v && !strcasecmp(v, "yes"));
+ }
+ return cached_result;
+}
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 7103cee..756bdd0 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -14,8 +14,7 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cache.h"
#include "ewok.h"
diff --git a/ewah/ewah_bitmap.c b/ewah/ewah_bitmap.c
index 06c479f..b9fdda1 100644
--- a/ewah/ewah_bitmap.c
+++ b/ewah/ewah_bitmap.c
@@ -14,8 +14,7 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "git-compat-util.h"
#include "ewok.h"
diff --git a/ewah/ewah_io.c b/ewah/ewah_io.c
index f732109..bed1994 100644
--- a/ewah/ewah_io.c
+++ b/ewah/ewah_io.c
@@ -14,8 +14,7 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "git-compat-util.h"
#include "ewok.h"
diff --git a/ewah/ewah_rlw.c b/ewah/ewah_rlw.c
index c723f1a..b9643b7 100644
--- a/ewah/ewah_rlw.c
+++ b/ewah/ewah_rlw.c
@@ -14,8 +14,7 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "git-compat-util.h"
#include "ewok.h"
diff --git a/ewah/ewok.h b/ewah/ewok.h
index 269a1a8..dc43d05 100644
--- a/ewah/ewok.h
+++ b/ewah/ewok.h
@@ -14,8 +14,7 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EWOK_BITMAP_H__
#define __EWOK_BITMAP_H__
diff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h
index 63efdf9..bb3c6ff 100644
--- a/ewah/ewok_rlw.h
+++ b/ewah/ewok_rlw.h
@@ -14,8 +14,7 @@
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __EWOK_RLW_H__
#define __EWOK_RLW_H__
diff --git a/fast-import.c b/fast-import.c
index 32ac532..b70ac02 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -167,6 +167,7 @@
#include "quote.h"
#include "dir.h"
#include "run-command.h"
+#include "packfile.h"
#define PACK_ID_BITS 16
#define MAX_PACK_ID ((1<<PACK_ID_BITS)-1)
@@ -1757,7 +1758,7 @@
delete_ref(NULL, b->name, NULL, 0);
return 0;
}
- if (read_ref(b->name, old_oid.hash))
+ if (read_ref(b->name, &old_oid))
oidclr(&old_oid);
if (!force_update && !is_null_oid(&old_oid)) {
struct commit *old_cmit, *new_cmit;
@@ -1777,7 +1778,7 @@
}
transaction = ref_transaction_begin(&err);
if (!transaction ||
- ref_transaction_update(transaction, b->name, b->oid.hash, old_oid.hash,
+ ref_transaction_update(transaction, b->name, &b->oid, &old_oid,
0, msg, &err) ||
ref_transaction_commit(transaction, &err)) {
ref_transaction_free(transaction);
@@ -1819,7 +1820,7 @@
strbuf_addf(&ref_name, "refs/tags/%s", t->name);
if (ref_transaction_update(transaction, ref_name.buf,
- t->oid.hash, NULL, 0, msg, &err)) {
+ &t->oid, NULL, 0, msg, &err)) {
failure |= error("%s", err.buf);
goto cleanup;
}
diff --git a/fetch-pack.c b/fetch-pack.c
index fbbc99c..9f6b07a 100644
--- a/fetch-pack.c
+++ b/fetch-pack.c
@@ -17,6 +17,7 @@
#include "prio-queue.h"
#include "sha1-array.h"
#include "oidset.h"
+#include "packfile.h"
static int transfer_unpack_limit = -1;
static int fetch_unpack_limit = -1;
@@ -610,7 +611,7 @@
* add to "newlist" between calls, the additions will always be for
* oids that are already in the set.
*/
- if (!tip_oids->map.tablesize) {
+ if (!tip_oids->map.map.tablesize) {
add_refs_to_oidset(tip_oids, unmatched);
add_refs_to_oidset(tip_oids, newlist);
}
@@ -715,7 +716,8 @@
for (ref = *refs; ref; ref = ref->next) {
struct object *o;
- if (!has_object_file(&ref->old_oid))
+ if (!has_object_file_with_flags(&ref->old_oid,
+ OBJECT_INFO_QUICK))
continue;
o = parse_object(&ref->old_oid);
diff --git a/fsck.c b/fsck.c
index b1579c7..032699e 100644
--- a/fsck.c
+++ b/fsck.c
@@ -588,6 +588,7 @@
case S_IFREG | 0664:
if (!options->strict)
break;
+ /* fallthrough */
default:
has_bad_modes = 1;
}
@@ -736,7 +737,7 @@
buffer += 41;
parent_line_count++;
}
- graft = lookup_commit_graft(commit->object.oid.hash);
+ graft = lookup_commit_graft(&commit->object.oid);
parent_count = commit_list_count(commit->parents);
if (graft) {
if (graft->nr_parent == -1 && !parent_count)
diff --git a/fsmonitor.c b/fsmonitor.c
new file mode 100644
index 0000000..0af7c4e
--- /dev/null
+++ b/fsmonitor.c
@@ -0,0 +1,266 @@
+#include "cache.h"
+#include "config.h"
+#include "dir.h"
+#include "ewah/ewok.h"
+#include "fsmonitor.h"
+#include "run-command.h"
+#include "strbuf.h"
+
+#define INDEX_EXTENSION_VERSION (1)
+#define HOOK_INTERFACE_VERSION (1)
+
+struct trace_key trace_fsmonitor = TRACE_KEY_INIT(FSMONITOR);
+
+static void fsmonitor_ewah_callback(size_t pos, void *is)
+{
+ struct index_state *istate = (struct index_state *)is;
+ struct cache_entry *ce = istate->cache[pos];
+
+ ce->ce_flags &= ~CE_FSMONITOR_VALID;
+}
+
+int read_fsmonitor_extension(struct index_state *istate, const void *data,
+ unsigned long sz)
+{
+ const char *index = data;
+ uint32_t hdr_version;
+ uint32_t ewah_size;
+ struct ewah_bitmap *fsmonitor_dirty;
+ int ret;
+
+ if (sz < sizeof(uint32_t) + sizeof(uint64_t) + sizeof(uint32_t))
+ return error("corrupt fsmonitor extension (too short)");
+
+ hdr_version = get_be32(index);
+ index += sizeof(uint32_t);
+ if (hdr_version != INDEX_EXTENSION_VERSION)
+ return error("bad fsmonitor version %d", hdr_version);
+
+ istate->fsmonitor_last_update = get_be64(index);
+ index += sizeof(uint64_t);
+
+ ewah_size = get_be32(index);
+ index += sizeof(uint32_t);
+
+ fsmonitor_dirty = ewah_new();
+ ret = ewah_read_mmap(fsmonitor_dirty, index, ewah_size);
+ if (ret != ewah_size) {
+ ewah_free(fsmonitor_dirty);
+ return error("failed to parse ewah bitmap reading fsmonitor index extension");
+ }
+ istate->fsmonitor_dirty = fsmonitor_dirty;
+
+ trace_printf_key(&trace_fsmonitor, "read fsmonitor extension successful");
+ return 0;
+}
+
+void fill_fsmonitor_bitmap(struct index_state *istate)
+{
+ int i;
+ istate->fsmonitor_dirty = ewah_new();
+ for (i = 0; i < istate->cache_nr; i++)
+ if (!(istate->cache[i]->ce_flags & CE_FSMONITOR_VALID))
+ ewah_set(istate->fsmonitor_dirty, i);
+}
+
+void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate)
+{
+ uint32_t hdr_version;
+ uint64_t tm;
+ uint32_t ewah_start;
+ uint32_t ewah_size = 0;
+ int fixup = 0;
+
+ put_be32(&hdr_version, INDEX_EXTENSION_VERSION);
+ strbuf_add(sb, &hdr_version, sizeof(uint32_t));
+
+ put_be64(&tm, istate->fsmonitor_last_update);
+ strbuf_add(sb, &tm, sizeof(uint64_t));
+ fixup = sb->len;
+ strbuf_add(sb, &ewah_size, sizeof(uint32_t)); /* we'll fix this up later */
+
+ ewah_start = sb->len;
+ ewah_serialize_strbuf(istate->fsmonitor_dirty, sb);
+ ewah_free(istate->fsmonitor_dirty);
+ istate->fsmonitor_dirty = NULL;
+
+ /* fix up size field */
+ put_be32(&ewah_size, sb->len - ewah_start);
+ memcpy(sb->buf + fixup, &ewah_size, sizeof(uint32_t));
+
+ trace_printf_key(&trace_fsmonitor, "write fsmonitor extension successful");
+}
+
+/*
+ * Call the query-fsmonitor hook passing the time of the last saved results.
+ */
+static int query_fsmonitor(int version, uint64_t last_update, struct strbuf *query_result)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ char ver[64];
+ char date[64];
+ const char *argv[4];
+
+ if (!(argv[0] = core_fsmonitor))
+ return -1;
+
+ snprintf(ver, sizeof(version), "%d", version);
+ snprintf(date, sizeof(date), "%" PRIuMAX, (uintmax_t)last_update);
+ argv[1] = ver;
+ argv[2] = date;
+ argv[3] = NULL;
+ cp.argv = argv;
+ cp.use_shell = 1;
+ cp.dir = get_git_work_tree();
+
+ return capture_command(&cp, query_result, 1024);
+}
+
+static void fsmonitor_refresh_callback(struct index_state *istate, const char *name)
+{
+ int pos = index_name_pos(istate, name, strlen(name));
+
+ if (pos >= 0) {
+ struct cache_entry *ce = istate->cache[pos];
+ ce->ce_flags &= ~CE_FSMONITOR_VALID;
+ }
+
+ /*
+ * Mark the untracked cache dirty even if it wasn't found in the index
+ * as it could be a new untracked file.
+ */
+ trace_printf_key(&trace_fsmonitor, "fsmonitor_refresh_callback '%s'", name);
+ untracked_cache_invalidate_path(istate, name);
+}
+
+void refresh_fsmonitor(struct index_state *istate)
+{
+ static int has_run_once = 0;
+ struct strbuf query_result = STRBUF_INIT;
+ int query_success = 0;
+ size_t bol; /* beginning of line */
+ uint64_t last_update;
+ char *buf;
+ int i;
+
+ if (!core_fsmonitor || has_run_once)
+ return;
+ has_run_once = 1;
+
+ trace_printf_key(&trace_fsmonitor, "refresh fsmonitor");
+ /*
+ * This could be racy so save the date/time now and query_fsmonitor
+ * should be inclusive to ensure we don't miss potential changes.
+ */
+ last_update = getnanotime();
+
+ /*
+ * If we have a last update time, call query_fsmonitor for the set of
+ * changes since that time, else assume everything is possibly dirty
+ * and check it all.
+ */
+ if (istate->fsmonitor_last_update) {
+ query_success = !query_fsmonitor(HOOK_INTERFACE_VERSION,
+ istate->fsmonitor_last_update, &query_result);
+ trace_performance_since(last_update, "fsmonitor process '%s'", core_fsmonitor);
+ trace_printf_key(&trace_fsmonitor, "fsmonitor process '%s' returned %s",
+ core_fsmonitor, query_success ? "success" : "failure");
+ }
+
+ /* a fsmonitor process can return '/' to indicate all entries are invalid */
+ if (query_success && query_result.buf[0] != '/') {
+ /* Mark all entries returned by the monitor as dirty */
+ buf = query_result.buf;
+ bol = 0;
+ for (i = 0; i < query_result.len; i++) {
+ if (buf[i] != '\0')
+ continue;
+ fsmonitor_refresh_callback(istate, buf + bol);
+ bol = i + 1;
+ }
+ if (bol < query_result.len)
+ fsmonitor_refresh_callback(istate, buf + bol);
+ } else {
+ /* Mark all entries invalid */
+ for (i = 0; i < istate->cache_nr; i++)
+ istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+
+ if (istate->untracked)
+ istate->untracked->use_fsmonitor = 0;
+ }
+ strbuf_release(&query_result);
+
+ /* Now that we've updated istate, save the last_update time */
+ istate->fsmonitor_last_update = last_update;
+}
+
+void add_fsmonitor(struct index_state *istate)
+{
+ int i;
+
+ if (!istate->fsmonitor_last_update) {
+ trace_printf_key(&trace_fsmonitor, "add fsmonitor");
+ istate->cache_changed |= FSMONITOR_CHANGED;
+ istate->fsmonitor_last_update = getnanotime();
+
+ /* reset the fsmonitor state */
+ for (i = 0; i < istate->cache_nr; i++)
+ istate->cache[i]->ce_flags &= ~CE_FSMONITOR_VALID;
+
+ /* reset the untracked cache */
+ if (istate->untracked) {
+ add_untracked_cache(istate);
+ istate->untracked->use_fsmonitor = 1;
+ }
+
+ /* Update the fsmonitor state */
+ refresh_fsmonitor(istate);
+ }
+}
+
+void remove_fsmonitor(struct index_state *istate)
+{
+ if (istate->fsmonitor_last_update) {
+ trace_printf_key(&trace_fsmonitor, "remove fsmonitor");
+ istate->cache_changed |= FSMONITOR_CHANGED;
+ istate->fsmonitor_last_update = 0;
+ }
+}
+
+void tweak_fsmonitor(struct index_state *istate)
+{
+ int i;
+ int fsmonitor_enabled = git_config_get_fsmonitor();
+
+ if (istate->fsmonitor_dirty) {
+ if (fsmonitor_enabled) {
+ /* Mark all entries valid */
+ for (i = 0; i < istate->cache_nr; i++) {
+ istate->cache[i]->ce_flags |= CE_FSMONITOR_VALID;
+ }
+
+ /* Mark all previously saved entries as dirty */
+ ewah_each_bit(istate->fsmonitor_dirty, fsmonitor_ewah_callback, istate);
+
+ /* Now mark the untracked cache for fsmonitor usage */
+ if (istate->untracked)
+ istate->untracked->use_fsmonitor = 1;
+ }
+
+ ewah_free(istate->fsmonitor_dirty);
+ istate->fsmonitor_dirty = NULL;
+ }
+
+ switch (fsmonitor_enabled) {
+ case -1: /* keep: do nothing */
+ break;
+ case 0: /* false */
+ remove_fsmonitor(istate);
+ break;
+ case 1: /* true */
+ add_fsmonitor(istate);
+ break;
+ default: /* unknown value: do nothing */
+ break;
+ }
+}
diff --git a/fsmonitor.h b/fsmonitor.h
new file mode 100644
index 0000000..cd3cc0c
--- /dev/null
+++ b/fsmonitor.h
@@ -0,0 +1,73 @@
+#ifndef FSMONITOR_H
+#define FSMONITOR_H
+
+extern struct trace_key trace_fsmonitor;
+
+/*
+ * Read the fsmonitor index extension and (if configured) restore the
+ * CE_FSMONITOR_VALID state.
+ */
+extern int read_fsmonitor_extension(struct index_state *istate, const void *data, unsigned long sz);
+
+/*
+ * Fill the fsmonitor_dirty ewah bits with their state from the index,
+ * before it is split during writing.
+ */
+extern void fill_fsmonitor_bitmap(struct index_state *istate);
+
+/*
+ * Write the CE_FSMONITOR_VALID state into the fsmonitor index
+ * extension. Reads from the fsmonitor_dirty ewah in the index.
+ */
+extern void write_fsmonitor_extension(struct strbuf *sb, struct index_state *istate);
+
+/*
+ * Add/remove the fsmonitor index extension
+ */
+extern void add_fsmonitor(struct index_state *istate);
+extern void remove_fsmonitor(struct index_state *istate);
+
+/*
+ * Add/remove the fsmonitor index extension as necessary based on the current
+ * core.fsmonitor setting.
+ */
+extern void tweak_fsmonitor(struct index_state *istate);
+
+/*
+ * Run the configured fsmonitor integration script and clear the
+ * CE_FSMONITOR_VALID bit for any files returned as dirty. Also invalidate
+ * any corresponding untracked cache directory structures. Optimized to only
+ * run the first time it is called.
+ */
+extern void refresh_fsmonitor(struct index_state *istate);
+
+/*
+ * Set the given cache entries CE_FSMONITOR_VALID bit. This should be
+ * called any time the cache entry has been updated to reflect the
+ * current state of the file on disk.
+ */
+static inline void mark_fsmonitor_valid(struct cache_entry *ce)
+{
+ if (core_fsmonitor) {
+ ce->ce_flags |= CE_FSMONITOR_VALID;
+ trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
+ }
+}
+
+/*
+ * Clear the given cache entry's CE_FSMONITOR_VALID bit and invalidate
+ * any corresponding untracked cache directory structures. This should
+ * be called any time git creates or modifies a file that should
+ * trigger an lstat() or invalidate the untracked cache for the
+ * corresponding directory
+ */
+static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
+{
+ if (core_fsmonitor) {
+ ce->ce_flags &= ~CE_FSMONITOR_VALID;
+ untracked_cache_invalidate_path(istate, ce->name);
+ trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
+ }
+}
+
+#endif
diff --git a/generate-cmdlist.sh b/generate-cmdlist.sh
index ab0d1b0..eeea4b6 100755
--- a/generate-cmdlist.sh
+++ b/generate-cmdlist.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-echo "/* Automatically generated by $0 */
+echo "/* Automatically generated by generate-cmdlist.sh */
struct cmdname_help {
char name[16];
char help[80];
diff --git a/git-add--interactive.perl b/git-add--interactive.perl
index 28b325d..964c3a7 100755
--- a/git-add--interactive.perl
+++ b/git-add--interactive.perl
@@ -262,7 +262,7 @@
}
}
- for (run_cmd_pipe(qw(git diff-files --numstat --summary --raw --), @ARGV)) {
+ for (run_cmd_pipe(qw(git diff-files --ignore-submodules=dirty --numstat --summary --raw --), @ARGV)) {
if (($add, $del, $file) =
/^([-\d]+) ([-\d]+) (.*)/) {
$file = unquote_path($file);
diff --git a/git-bisect.sh b/git-bisect.sh
index ae3cb01..54cbfec 100755
--- a/git-bisect.sh
+++ b/git-bisect.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|replay|log|run]'
+USAGE='[help|start|bad|good|new|old|terms|skip|next|reset|visualize|view|replay|log|run]'
LONG_USAGE='git bisect help
print this long help message.
git bisect start [--term-{old,good}=<term> --term-{new,bad}=<term>]
@@ -20,7 +20,7 @@
find next bisection to test and check it out.
git bisect reset [<commit>]
finish bisection search and go back to commit.
-git bisect visualize
+git bisect (visualize|view)
show bisect status in gitk.
git bisect replay <logfile>
replay bisection log.
@@ -186,7 +186,7 @@
#
# Get rid of any old bisect state.
#
- bisect_clean_state || exit
+ git bisect--helper --bisect-clean-state || exit
#
# Change state.
@@ -195,7 +195,7 @@
# We have to trap this to be able to clean up using
# "bisect_clean_state".
#
- trap 'bisect_clean_state' 0
+ trap 'git bisect--helper --bisect-clean-state' 0
trap 'exit 255' 1 2 3 15
#
@@ -209,7 +209,7 @@
eval "$eval true" &&
if test $must_write_terms -eq 1
then
- write_terms "$TERM_BAD" "$TERM_GOOD"
+ git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit
fi &&
echo "git bisect start$orig_args" >>"$GIT_DIR/BISECT_LOG" || exit
#
@@ -237,22 +237,6 @@
test -n "$nolog" || echo "git bisect $state $rev" >>"$GIT_DIR/BISECT_LOG"
}
-is_expected_rev() {
- test -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
- test "$1" = $(cat "$GIT_DIR/BISECT_EXPECTED_REV")
-}
-
-check_expected_revs() {
- for _rev in "$@"; do
- if ! is_expected_rev "$_rev"
- then
- rm -f "$GIT_DIR/BISECT_ANCESTORS_OK"
- rm -f "$GIT_DIR/BISECT_EXPECTED_REV"
- return
- fi
- done
-}
-
bisect_skip() {
all=''
for arg in "$@"
@@ -280,7 +264,7 @@
rev=$(git rev-parse --verify "$bisected_head") ||
die "$(eval_gettext "Bad rev input: \$bisected_head")"
bisect_write "$state" "$rev"
- check_expected_revs "$rev" ;;
+ git bisect--helper --check-expected-revs "$rev" ;;
2,"$TERM_BAD"|*,"$TERM_GOOD"|*,skip)
shift
hash_list=''
@@ -294,7 +278,7 @@
do
bisect_write "$state" "$rev"
done
- check_expected_revs $hash_list ;;
+ git bisect--helper --check-expected-revs $hash_list ;;
*,"$TERM_BAD")
die "$(eval_gettext "'git bisect \$TERM_BAD' can take only one argument.")" ;;
*)
@@ -430,27 +414,7 @@
die "$(eval_gettext "Could not check out original HEAD '\$branch'.
Try 'git bisect reset <commit>'.")"
fi
- bisect_clean_state
-}
-
-bisect_clean_state() {
- # There may be some refs packed during bisection.
- git for-each-ref --format='%(refname) %(objectname)' refs/bisect/\* |
- while read ref hash
- do
- git update-ref -d $ref $hash || exit
- done
- rm -f "$GIT_DIR/BISECT_EXPECTED_REV" &&
- rm -f "$GIT_DIR/BISECT_ANCESTORS_OK" &&
- rm -f "$GIT_DIR/BISECT_LOG" &&
- rm -f "$GIT_DIR/BISECT_NAMES" &&
- rm -f "$GIT_DIR/BISECT_RUN" &&
- rm -f "$GIT_DIR/BISECT_TERMS" &&
- # Cleanup head-name if it got left by an old version of git-bisect
- rm -f "$GIT_DIR/head-name" &&
- git update-ref -d --no-deref BISECT_HEAD &&
- # clean up BISECT_START last
- rm -f "$GIT_DIR/BISECT_START"
+ git bisect--helper --bisect-clean-state || exit
}
bisect_replay () {
@@ -486,6 +450,8 @@
bisect_run () {
bisect_next_check fail
+ test -n "$*" || die "$(gettext "bisect run failed: no command provided.")"
+
while true
do
command="$@"
@@ -557,45 +523,6 @@
fi
}
-write_terms () {
- TERM_BAD=$1
- TERM_GOOD=$2
- if test "$TERM_BAD" = "$TERM_GOOD"
- then
- die "$(gettext "please use two different terms")"
- fi
- check_term_format "$TERM_BAD" bad
- check_term_format "$TERM_GOOD" good
- printf '%s\n%s\n' "$TERM_BAD" "$TERM_GOOD" >"$GIT_DIR/BISECT_TERMS"
-}
-
-check_term_format () {
- term=$1
- git check-ref-format refs/bisect/"$term" ||
- die "$(eval_gettext "'\$term' is not a valid term")"
- case "$term" in
- help|start|terms|skip|next|reset|visualize|replay|log|run)
- die "$(eval_gettext "can't use the builtin command '\$term' as a term")"
- ;;
- bad|new)
- if test "$2" != bad
- then
- # In theory, nothing prevents swapping
- # completely good and bad, but this situation
- # could be confusing and hasn't been tested
- # enough. Forbid it for now.
- die "$(eval_gettext "can't change the meaning of term '\$term'")"
- fi
- ;;
- good|old)
- if test "$2" != good
- then
- die "$(eval_gettext "can't change the meaning of term '\$term'")"
- fi
- ;;
- esac
-}
-
check_and_set_terms () {
cmd="$1"
case "$cmd" in
@@ -609,13 +536,17 @@
bad|good)
if ! test -s "$GIT_DIR/BISECT_TERMS"
then
- write_terms bad good
+ TERM_BAD=bad
+ TERM_GOOD=good
+ git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit
fi
;;
new|old)
if ! test -s "$GIT_DIR/BISECT_TERMS"
then
- write_terms new old
+ TERM_BAD=new
+ TERM_GOOD=old
+ git bisect--helper --write-terms "$TERM_BAD" "$TERM_GOOD" || exit
fi
;;
esac ;;
diff --git a/git-compat-util.h b/git-compat-util.h
index bf4869d..68b2ad5 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -485,6 +485,29 @@
}
/*
+ * If the string "str" is the same as the string in "prefix", then the "arg"
+ * parameter is set to the "def" parameter and 1 is returned.
+ * If the string "str" begins with the string found in "prefix" and then a
+ * "=" sign, then the "arg" parameter is set to "str + strlen(prefix) + 1"
+ * (i.e., to the point in the string right after the prefix and the "=" sign),
+ * and 1 is returned.
+ *
+ * Otherwise, return 0 and leave "arg" untouched.
+ *
+ * When we accept both a "--key" and a "--key=<val>" option, this function
+ * can be used instead of !strcmp(arg, "--key") and then
+ * skip_prefix(arg, "--key=", &arg) to parse such an option.
+ */
+int skip_to_optional_arg_default(const char *str, const char *prefix,
+ const char **arg, const char *def);
+
+static inline int skip_to_optional_arg(const char *str, const char *prefix,
+ const char **arg)
+{
+ return skip_to_optional_arg_default(str, prefix, arg, "");
+}
+
+/*
* Like skip_prefix, but promises never to read past "len" bytes of the input
* buffer, and returns the remaining number of bytes in "out" via "outlen".
*/
@@ -749,8 +772,6 @@
extern int git_atexit(void (*handler)(void));
#endif
-extern void release_pack_memory(size_t);
-
typedef void (*try_to_free_t)(size_t);
extern try_to_free_t set_try_to_free_routine(try_to_free_t);
@@ -1173,4 +1194,24 @@
extern int cmd_main(int, const char **);
+/*
+ * You can mark a stack variable with UNLEAK(var) to avoid it being
+ * reported as a leak by tools like LSAN or valgrind. The argument
+ * should generally be the variable itself (not its address and not what
+ * it points to). It's safe to use this on pointers which may already
+ * have been freed, or on pointers which may still be in use.
+ *
+ * Use this _only_ for a variable that leaks by going out of scope at
+ * program exit (so only from cmd_* functions or their direct helpers).
+ * Normal functions, especially those which may be called multiple
+ * times, should actually free their memory. This is only meant as
+ * an annotation, and does nothing in non-leak-checking builds.
+ */
+#ifdef SUPPRESS_ANNOTATED_LEAKS
+extern void unleak_memory(const void *ptr, size_t len);
+#define UNLEAK(var) unleak_memory(&(var), sizeof(var))
+#else
+#define UNLEAK(var) do {} while (0)
+#endif
+
#endif
diff --git a/git-cvsimport.perl b/git-cvsimport.perl
index 3692992..2d8df83 100755
--- a/git-cvsimport.perl
+++ b/git-cvsimport.perl
@@ -642,7 +642,7 @@
sub get_headref ($) {
my $name = shift;
- $name =~ s/'/'\\''/;
+ $name =~ s/'/'\\''/g;
my $r = `git rev-parse --verify '$name' 2>/dev/null`;
return undef unless $? == 0;
chomp $r;
diff --git a/git-filter-branch.sh b/git-filter-branch.sh
index 3a74602..1b7e4b2 100755
--- a/git-filter-branch.sh
+++ b/git-filter-branch.sh
@@ -81,12 +81,12 @@
finish_ident COMMITTER
}
-USAGE="[--setup <command>] [--env-filter <command>]
+USAGE="[--setup <command>] [--subdirectory-filter <directory>] [--env-filter <command>]
[--tree-filter <command>] [--index-filter <command>]
[--parent-filter <command>] [--msg-filter <command>]
[--commit-filter <command>] [--tag-name-filter <command>]
- [--subdirectory-filter <directory>] [--original <namespace>]
- [-d <directory>] [-f | --force]
+ [--original <namespace>]
+ [-d <directory>] [-f | --force] [--state-branch <branch>]
[--] [<rev-list options>...]"
OPTIONS_SPEC=
@@ -106,6 +106,7 @@
filter_commit=
filter_tag_name=
filter_subdir=
+state_branch=
orig_namespace=refs/original/
force=
prune_empty=
@@ -153,6 +154,10 @@
--setup)
filter_setup="$OPTARG"
;;
+ --subdirectory-filter)
+ filter_subdir="$OPTARG"
+ remap_to_ancestor=t
+ ;;
--env-filter)
filter_env="$OPTARG"
;;
@@ -174,13 +179,12 @@
--tag-name-filter)
filter_tag_name="$OPTARG"
;;
- --subdirectory-filter)
- filter_subdir="$OPTARG"
- remap_to_ancestor=t
- ;;
--original)
orig_namespace=$(expr "$OPTARG/" : '\(.*[^/]\)/*$')/
;;
+ --state-branch)
+ state_branch="$OPTARG"
+ ;;
*)
usage
;;
@@ -219,6 +223,13 @@
ORIG_GIT_DIR="$GIT_DIR"
ORIG_GIT_WORK_TREE="$GIT_WORK_TREE"
ORIG_GIT_INDEX_FILE="$GIT_INDEX_FILE"
+ORIG_GIT_AUTHOR_NAME="$GIT_AUTHOR_NAME"
+ORIG_GIT_AUTHOR_EMAIL="$GIT_AUTHOR_EMAIL"
+ORIG_GIT_AUTHOR_DATE="$GIT_AUTHOR_DATE"
+ORIG_GIT_COMMITTER_NAME="$GIT_COMMITTER_NAME"
+ORIG_GIT_COMMITTER_EMAIL="$GIT_COMMITTER_EMAIL"
+ORIG_GIT_COMMITTER_DATE="$GIT_COMMITTER_DATE"
+
GIT_WORK_TREE=.
export GIT_DIR GIT_WORK_TREE
@@ -252,6 +263,26 @@
# map old->new commit ids for rewriting parents
mkdir ../map || die "Could not create map/ directory"
+if test -n "$state_branch"
+then
+ state_commit=$(git rev-parse --no-flags --revs-only "$state_branch")
+ if test -n "$state_commit"
+ then
+ echo "Populating map from $state_branch ($state_commit)" 1>&2
+ perl -e'open(MAP, "-|", "git show $ARGV[0]:filter.map") or die;
+ while (<MAP>) {
+ m/(.*):(.*)/ or die;
+ open F, ">../map/$1" or die;
+ print F "$2" or die;
+ close(F) or die;
+ }
+ close(MAP) or die;' "$state_commit" \
+ || die "Unable to load state from $state_branch:filter.map"
+ else
+ echo "Branch $state_branch does not exist. Will create" 1>&2
+ fi
+fi
+
# we need "--" only if there are no path arguments in $@
nonrevs=$(git rev-parse --no-revs "$@") || exit
if test -z "$nonrevs"
@@ -530,7 +561,7 @@
}' \
-e '/^-----BEGIN PGP SIGNATURE-----/q' \
-e 'p' ) |
- git mktag) ||
+ 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
@@ -544,12 +575,9 @@
done
fi
-cd "$orig_dir"
-rm -rf "$tempdir"
-
-trap - 0
-
unset GIT_DIR GIT_WORK_TREE GIT_INDEX_FILE
+unset GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
+unset GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE
test -z "$ORIG_GIT_DIR" || {
GIT_DIR="$ORIG_GIT_DIR" && export GIT_DIR
}
@@ -561,6 +589,58 @@
GIT_INDEX_FILE="$ORIG_GIT_INDEX_FILE" &&
export GIT_INDEX_FILE
}
+test -z "$ORIG_GIT_AUTHOR_NAME" || {
+ GIT_AUTHOR_NAME="$ORIG_GIT_AUTHOR_NAME" &&
+ export GIT_AUTHOR_NAME
+}
+test -z "$ORIG_GIT_AUTHOR_EMAIL" || {
+ GIT_AUTHOR_EMAIL="$ORIG_GIT_AUTHOR_EMAIL" &&
+ export GIT_AUTHOR_EMAIL
+}
+test -z "$ORIG_GIT_AUTHOR_DATE" || {
+ GIT_AUTHOR_DATE="$ORIG_GIT_AUTHOR_DATE" &&
+ export GIT_AUTHOR_DATE
+}
+test -z "$ORIG_GIT_COMMITTER_NAME" || {
+ GIT_COMMITTER_NAME="$ORIG_GIT_COMMITTER_NAME" &&
+ export GIT_COMMITTER_NAME
+}
+test -z "$ORIG_GIT_COMMITTER_EMAIL" || {
+ GIT_COMMITTER_EMAIL="$ORIG_GIT_COMMITTER_EMAIL" &&
+ export GIT_COMMITTER_EMAIL
+}
+test -z "$ORIG_GIT_COMMITTER_DATE" || {
+ GIT_COMMITTER_DATE="$ORIG_GIT_COMMITTER_DATE" &&
+ export GIT_COMMITTER_DATE
+}
+
+if test -n "$state_branch"
+then
+ echo "Saving rewrite state to $state_branch" 1>&2
+ state_blob=$(
+ perl -e'opendir D, "../map" or die;
+ open H, "|-", "git hash-object -w --stdin" or die;
+ foreach (sort readdir(D)) {
+ next if m/^\.\.?$/;
+ open F, "<../map/$_" or die;
+ chomp($f = <F>);
+ print H "$_:$f\n" or die;
+ }
+ close(H) or die;' || die "Unable to save state")
+ state_tree=$(/bin/echo -e "100644 blob $state_blob\tfilter.map" | git mktree)
+ if test -n "$state_commit"
+ then
+ state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" -p "$state_commit")
+ else
+ state_commit=$(/bin/echo "Sync" | git commit-tree "$state_tree" )
+ fi
+ git update-ref "$state_branch" "$state_commit"
+fi
+
+cd "$orig_dir"
+rm -rf "$tempdir"
+
+trap - 0
if [ "$(is_bare_repository)" = false ]; then
git read-tree -u -m HEAD || exit
diff --git a/git-gui/Makefile b/git-gui/Makefile
index 918a8de..f10caed 100644
--- a/git-gui/Makefile
+++ b/git-gui/Makefile
@@ -254,7 +254,7 @@
lib/tclIndex: $(ALL_LIBFILES) GIT-GUI-VARS
$(QUIET_INDEX)if echo \
$(foreach p,$(PRELOAD_FILES),source $p\;) \
- auto_mkindex lib '*.tcl' \
+ auto_mkindex lib $(patsubst lib/%,%,$(sort $(ALL_LIBFILES))) \
| $(TCL_PATH) $(QUIET_2DEVNULL); then : ok; \
else \
echo >&2 " * $(TCL_PATH) failed; using unoptimized loading"; \
diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 5bc21b8..91c00e6 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -24,8 +24,7 @@
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}]
+along with this program; if not, see <http://www.gnu.org/licenses/>.}]
######################################################################
##
@@ -2502,9 +2501,28 @@
set pos [split [$w index @$x,$y] .]
foreach {lno col} $pos break
} else {
+ if {$mode eq "toggle"} {
+ if {$w eq $ui_workdir} {
+ do_add_selection
+ set last_clicked {}
+ return
+ }
+ if {$w eq $ui_index} {
+ do_unstage_selection
+ set last_clicked {}
+ return
+ }
+ }
+
if {$last_clicked ne {}} {
set lno [lindex $last_clicked 1]
} else {
+ if {![info exists file_lists]
+ || ![info exists file_lists($w)]
+ || [llength $file_lists($w)] == 0} {
+ set last_clicked {}
+ return
+ }
set lno [expr {int([lindex [$w tag ranges in_diff] 0])}]
}
if {$mode eq "toggle"} {
@@ -2515,7 +2533,13 @@
}
}
- set path [lindex $file_lists($w) [expr {$lno - 1}]]
+ if {![info exists file_lists]
+ || ![info exists file_lists($w)]
+ || [llength $file_lists($w)] < $lno - 1} {
+ set path {}
+ } else {
+ set path [lindex $file_lists($w) [expr {$lno - 1}]]
+ }
if {$path eq {}} {
set last_clicked {}
return
diff --git a/git-gui/lib/commit.tcl b/git-gui/lib/commit.tcl
index 83620b7..75ea965 100644
--- a/git-gui/lib/commit.tcl
+++ b/git-gui/lib/commit.tcl
@@ -25,6 +25,8 @@
set msg {}
set parents [list]
if {[catch {
+ set name ""
+ set email ""
set fd [git_read cat-file commit $curHEAD]
fconfigure $fd -encoding binary -translation lf
# By default commits are assumed to be in utf-8
@@ -34,9 +36,7 @@
lappend parents [string range $line 7 end]
} elseif {[string match {encoding *} $line]} {
set enc [string tolower [string range $line 9 end]]
- } elseif {[regexp "author (.*)\\s<(.*)>\\s(\\d.*$)" $line all name email time]} {
- set commit_author [list name $name email $email date $time]
- }
+ } elseif {[regexp "author (.*)\\s<(.*)>\\s(\\d.*$)" $line all name email time]} { }
}
set msg [read $fd]
close $fd
@@ -44,7 +44,13 @@
set enc [tcl_encoding $enc]
if {$enc ne {}} {
set msg [encoding convertfrom $enc $msg]
+ set name [encoding convertfrom $enc $name]
+ set email [encoding convertfrom $enc $email]
}
+ if {$name ne {} && $email ne {}} {
+ set commit_author [list name $name email $email date $time]
+ }
+
set msg [string trim $msg]
} err]} {
error_popup [strcat [mc "Error loading commit data for amend:"] "\n\n$err"]
diff --git a/git-gui/lib/diff.tcl b/git-gui/lib/diff.tcl
index 4cae10a..68c4a6c 100644
--- a/git-gui/lib/diff.tcl
+++ b/git-gui/lib/diff.tcl
@@ -698,6 +698,7 @@
set hh [$ui_diff get $i_l "$i_l + 1 lines"]
set hh [lindex [split $hh ,] 0]
set hln [lindex [split $hh -] 1]
+ set hln [lindex [split $hln " "] 0]
# There is a special situation to take care of. Consider this
# hunk:
diff --git a/git-gui/po/README b/git-gui/po/README
index 0f5837d..2514bc2 100644
--- a/git-gui/po/README
+++ b/git-gui/po/README
@@ -165,7 +165,7 @@
the translation of existing messages, or because the git-gui software
itself was updated and there are new messages that need translation.
-In any case, make sure you are up-to-date before starting your work:
+In any case, make sure you are up to date before starting your work:
$ git checkout master
$ git pull
diff --git a/git-merge-octopus.sh b/git-merge-octopus.sh
index 6c390d6..7d19d37 100755
--- a/git-merge-octopus.sh
+++ b/git-merge-octopus.sh
@@ -74,7 +74,7 @@
case "$LF$common$LF" in
*"$LF$SHA1$LF"*)
- eval_gettextln "Already up-to-date with \$pretty_name"
+ eval_gettextln "Already up to date with \$pretty_name"
continue
;;
esac
diff --git a/git-p4.py b/git-p4.py
index 2fa5817..7bb9cad 100755
--- a/git-p4.py
+++ b/git-p4.py
@@ -1178,6 +1178,12 @@
self.needsGit = True
self.verbose = False
+ # This is required for the "append" cloneExclude action
+ def ensure_value(self, attr, value):
+ if not hasattr(self, attr) or getattr(self, attr) is None:
+ setattr(self, attr, value)
+ return getattr(self, attr)
+
class P4UserMap:
def __init__(self):
self.userMapFromPerforceServer = False
@@ -1343,9 +1349,10 @@
optparse.make_option("--shelve", dest="shelve", action="store_true",
help="Shelve instead of submit. Shelved files are reverted, "
"restoring the workspace to the state before the shelve"),
- optparse.make_option("--update-shelve", dest="update_shelve", action="store", type="int",
+ optparse.make_option("--update-shelve", dest="update_shelve", action="append", type="int",
metavar="CHANGELIST",
- help="update an existing shelved changelist, implies --shelve")
+ help="update an existing shelved changelist, implies --shelve, "
+ "repeat in-order for multiple shelved changelists")
]
self.description = "Submit changes from git to the perforce depot."
self.usage += " [name of git branch to submit into perforce depot]"
@@ -1354,7 +1361,7 @@
self.preserveUser = gitConfigBool("git-p4.preserveUser")
self.dry_run = False
self.shelve = False
- self.update_shelve = None
+ self.update_shelve = list()
self.prepare_p4_only = False
self.conflict_behavior = None
self.isWindows = (platform.system() == "Windows")
@@ -1809,9 +1816,10 @@
mode = filesToChangeExecBit[f]
setP4ExecBit(f, mode)
- if self.update_shelve:
- print("all_files = %s" % str(all_files))
- p4_reopen_in_change(self.update_shelve, all_files)
+ update_shelve = 0
+ if len(self.update_shelve) > 0:
+ update_shelve = self.update_shelve.pop(0)
+ p4_reopen_in_change(update_shelve, all_files)
#
# Build p4 change description, starting with the contents
@@ -1821,7 +1829,7 @@
logMessage = logMessage.strip()
(logMessage, jobs) = self.separate_jobs_from_description(logMessage)
- template = self.prepareSubmitTemplate(self.update_shelve)
+ template = self.prepareSubmitTemplate(update_shelve)
submitTemplate = self.prepareLogMessage(template, logMessage, jobs)
if self.preserveUser:
@@ -1894,7 +1902,7 @@
message = message.replace("\r\n", "\n")
submitTemplate = message[:message.index(separatorLine)]
- if self.update_shelve:
+ if update_shelve:
p4_write_pipe(['shelve', '-r', '-i'], submitTemplate)
elif self.shelve:
p4_write_pipe(['shelve', '-i'], submitTemplate)
@@ -2012,6 +2020,10 @@
else:
return False
+ for i in self.update_shelve:
+ if i <= 0:
+ sys.exit("invalid changelist %d" % i)
+
if self.master:
allowSubmit = gitConfig("git-p4.allowSubmit")
if len(allowSubmit) > 0 and not self.master in allowSubmit.split(","):
@@ -2022,7 +2034,7 @@
if len(self.origin) == 0:
self.origin = upstream
- if self.update_shelve:
+ if len(self.update_shelve) > 0:
self.shelve = True
if self.preserveUser:
@@ -2134,6 +2146,11 @@
if gitConfigBool("git-p4.detectCopiesHarder"):
self.diffOpts += " --find-copies-harder"
+ num_shelves = len(self.update_shelve)
+ if num_shelves > 0 and num_shelves != len(commits):
+ sys.exit("number of commits (%d) must match number of shelved changelist (%d)" %
+ (len(commits), num_shelves))
+
#
# Apply the commits, one at a time. On failure, ask if should
# continue to try the rest of the patches, or quit.
@@ -2404,12 +2421,6 @@
if gitConfig("git-p4.syncFromOrigin") == "false":
self.syncWithOrigin = False
- # This is required for the "append" cloneExclude action
- def ensure_value(self, attr, value):
- if not hasattr(self, attr) or getattr(self, attr) is None:
- setattr(self, attr, value)
- return getattr(self, attr)
-
# Force a checkpoint in fast-import and wait for it to finish
def checkpoint(self):
self.gitStream.write("checkpoint\n\n")
@@ -3614,7 +3625,7 @@
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.");
+ 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.");
diff --git a/git-rebase--am.sh b/git-rebase--am.sh
index 319933e..14c5078 100644
--- a/git-rebase--am.sh
+++ b/git-rebase--am.sh
@@ -53,6 +53,8 @@
git format-patch -k --stdout --full-index --cherry-pick --right-only \
--src-prefix=a/ --dst-prefix=b/ --no-renames --no-cover-letter \
+ --pretty=mboxrd \
+ $git_format_patch_opt \
"$revisions" ${restrict_revision+^$restrict_revision} \
>"$GIT_DIR/rebased-patches"
ret=$?
@@ -82,6 +84,7 @@
fi
git am $git_am_opt --rebasing --resolvemsg="$resolvemsg" \
+ --patch-format=mboxrd \
$allow_rerere_autoupdate \
${gpg_sign_opt:+"$gpg_sign_opt"} <"$GIT_DIR/rebased-patches"
ret=$?
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 29b7e88..d47bd29 100644
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -155,13 +155,13 @@
append_todo_help () {
gettext "
Commands:
- p, pick = use commit
- r, reword = use commit, but edit the commit message
- e, edit = use commit, but stop for amending
- s, squash = use commit, but meld into previous commit
- f, fixup = like \"squash\", but discard this commit's log message
- x, exec = run command (the rest of the line) using shell
- d, drop = remove commit
+p, pick = use commit
+r, reword = use commit, but edit the commit message
+e, edit = use commit, but stop for amending
+s, squash = use commit, but meld into previous commit
+f, fixup = like \"squash\", but discard this commit's log message
+x, exec = run command (the rest of the line) using shell
+d, drop = remove commit
These lines can be re-ordered; they are executed from top to bottom.
" | git stripspace --comment-lines >>"$todo"
@@ -392,9 +392,12 @@
new_parents=${new_parents# $first_parent}
merge_args="--no-log --no-ff"
if ! do_with_author output eval \
- 'git merge ${gpg_sign_opt:+"$gpg_sign_opt"} \
- $allow_rerere_autoupdate $merge_args \
- $strategy_args -m "$msg_content" $new_parents'
+ 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")"
@@ -714,265 +717,12 @@
done
}
-# skip picking commits whose parents are unchanged
-skip_unnecessary_picks () {
- fd=3
- while read -r command rest
- do
- # fd=3 means we skip the command
- case "$fd,$command" in
- 3,pick|3,p)
- # pick a commit whose parent is current $onto -> skip
- sha1=${rest%% *}
- case "$(git rev-parse --verify --quiet "$sha1"^)" in
- "$onto"*)
- onto=$sha1
- ;;
- *)
- fd=1
- ;;
- esac
- ;;
- 3,"$comment_char"*|3,)
- # copy comments
- ;;
- *)
- fd=1
- ;;
- esac
- printf '%s\n' "$command${rest:+ }$rest" >&$fd
- done <"$todo" >"$todo.new" 3>>"$done" &&
- mv -f "$todo".new "$todo" &&
- case "$(peek_next_command)" in
- squash|s|fixup|f)
- record_in_rewritten "$onto"
- ;;
- esac ||
- die "$(gettext "Could not skip unnecessary pick commands")"
-}
-
-transform_todo_ids () {
- while read -r command rest
- do
- case "$command" in
- "$comment_char"* | exec)
- # Be careful for oddball commands like 'exec'
- # that do not have a SHA-1 at the beginning of $rest.
- ;;
- *)
- sha1=$(git rev-parse --verify --quiet "$@" ${rest%%[ ]*}) &&
- rest="$sha1 ${rest#*[ ]}"
- ;;
- esac
- printf '%s\n' "$command${rest:+ }$rest"
- done <"$todo" >"$todo.new" &&
- mv -f "$todo.new" "$todo"
-}
-
expand_todo_ids() {
- transform_todo_ids
+ git rebase--helper --expand-ids
}
collapse_todo_ids() {
- transform_todo_ids --short
-}
-
-# Rearrange the todo list that has both "pick sha1 msg" and
-# "pick sha1 fixup!/squash! msg" appears in it so that the latter
-# comes immediately after the former, and change "pick" to
-# "fixup"/"squash".
-#
-# Note that if the config has specified a custom instruction format
-# each log message will be re-retrieved in order to normalize the
-# autosquash arrangement
-rearrange_squash () {
- # extract fixup!/squash! lines and resolve any referenced sha1's
- while read -r pick sha1 message
- do
- test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
- case "$message" in
- "squash! "*|"fixup! "*)
- action="${message%%!*}"
- rest=$message
- prefix=
- # skip all squash! or fixup! (but save for later)
- while :
- do
- case "$rest" in
- "squash! "*|"fixup! "*)
- prefix="$prefix${rest%%!*},"
- rest="${rest#*! }"
- ;;
- *)
- break
- ;;
- esac
- done
- printf '%s %s %s %s\n' "$sha1" "$action" "$prefix" "$rest"
- # if it's a single word, try to resolve to a full sha1 and
- # emit a second copy. This allows us to match on both message
- # and on sha1 prefix
- if test "${rest#* }" = "$rest"; then
- fullsha="$(git rev-parse -q --verify "$rest" 2>/dev/null)"
- if test -n "$fullsha"; then
- # prefix the action to uniquely identify this line as
- # intended for full sha1 match
- echo "$sha1 +$action $prefix $fullsha"
- fi
- fi
- esac
- done >"$1.sq" <"$1"
- test -s "$1.sq" || return
-
- used=
- while read -r pick sha1 message
- do
- case " $used" in
- *" $sha1 "*) continue ;;
- esac
- printf '%s\n' "$pick $sha1 $message"
- test -z "${format}" || message=$(git log -n 1 --format="%s" ${sha1})
- used="$used$sha1 "
- while read -r squash action msg_prefix msg_content
- do
- case " $used" in
- *" $squash "*) continue ;;
- esac
- emit=0
- case "$action" in
- +*)
- action="${action#+}"
- # full sha1 prefix test
- case "$msg_content" in "$sha1"*) emit=1;; esac ;;
- *)
- # message prefix test
- case "$message" in "$msg_content"*) emit=1;; esac ;;
- esac
- if test $emit = 1; then
- if test -n "${format}"
- then
- msg_content=$(git log -n 1 --format="${format}" ${squash})
- else
- msg_content="$(echo "$msg_prefix" | sed "s/,/! /g")$msg_content"
- fi
- printf '%s\n' "$action $squash $msg_content"
- used="$used$squash "
- fi
- done <"$1.sq"
- done >"$1.rearranged" <"$1"
- cat "$1.rearranged" >"$1"
- rm -f "$1.sq" "$1.rearranged"
-}
-
-# Add commands after a pick or after a squash/fixup serie
-# in the todo list.
-add_exec_commands () {
- {
- first=t
- while read -r insn rest
- do
- case $insn in
- pick)
- test -n "$first" ||
- printf "%s" "$cmd"
- ;;
- esac
- printf "%s %s\n" "$insn" "$rest"
- first=
- done
- printf "%s" "$cmd"
- } <"$1" >"$1.new" &&
- mv "$1.new" "$1"
-}
-
-# Check if the SHA-1 passed as an argument is a
-# correct one, if not then print $2 in "$todo".badsha
-# $1: the SHA-1 to test
-# $2: the line number of the input
-# $3: the input filename
-check_commit_sha () {
- badsha=0
- if test -z "$1"
- then
- badsha=1
- else
- sha1_verif="$(git rev-parse --verify --quiet $1^{commit})"
- if test -z "$sha1_verif"
- then
- badsha=1
- fi
- fi
-
- if test $badsha -ne 0
- then
- line="$(sed -n -e "${2}p" "$3")"
- warn "$(eval_gettext "\
-Warning: the SHA-1 is missing or isn't a commit in the following line:
- - \$line")"
- warn
- fi
-
- return $badsha
-}
-
-# prints the bad commits and bad commands
-# from the todolist in stdin
-check_bad_cmd_and_sha () {
- retval=0
- lineno=0
- while read -r command rest
- do
- lineno=$(( $lineno + 1 ))
- case $command in
- "$comment_char"*|''|noop|x|exec)
- # Doesn't expect a SHA-1
- ;;
- "$cr")
- # Work around CR left by "read" (e.g. with Git for
- # Windows' Bash).
- ;;
- pick|p|drop|d|reword|r|edit|e|squash|s|fixup|f)
- if ! check_commit_sha "${rest%%[ ]*}" "$lineno" "$1"
- then
- retval=1
- fi
- ;;
- *)
- line="$(sed -n -e "${lineno}p" "$1")"
- warn "$(eval_gettext "\
-Warning: the command isn't recognized in the following line:
- - \$line")"
- warn
- retval=1
- ;;
- esac
- done <"$1"
- return $retval
-}
-
-# Print the list of the SHA-1 of the commits
-# from stdin to stdout
-todo_list_to_sha_list () {
- git stripspace --strip-comments |
- while read -r command sha1 rest
- do
- case $command in
- "$comment_char"*|''|noop|x|"exec")
- ;;
- *)
- long_sha=$(git rev-list --no-walk "$sha1" 2>/dev/null)
- printf "%s\n" "$long_sha"
- ;;
- esac
- done
-}
-
-# Use warn for each line in stdin
-warn_lines () {
- while read -r line
- do
- warn " - $line"
- done
+ git rebase--helper --shorten-ids
}
# Switch to the branch in $into and notify it in the reflog
@@ -989,74 +739,6 @@
printf '%s' "$check_level" | tr 'A-Z' 'a-z'
}
-# Check if the user dropped some commits by mistake
-# Behaviour determined by rebase.missingCommitsCheck.
-# Check if there is an unrecognized command or a
-# bad SHA-1 in a command.
-check_todo_list () {
- raise_error=f
-
- check_level=$(get_missing_commit_check_level)
-
- case "$check_level" in
- warn|error)
- # Get the SHA-1 of the commits
- todo_list_to_sha_list <"$todo".backup >"$todo".oldsha1
- todo_list_to_sha_list <"$todo" >"$todo".newsha1
-
- # Sort the SHA-1 and compare them
- sort -u "$todo".oldsha1 >"$todo".oldsha1+
- mv "$todo".oldsha1+ "$todo".oldsha1
- sort -u "$todo".newsha1 >"$todo".newsha1+
- mv "$todo".newsha1+ "$todo".newsha1
- comm -2 -3 "$todo".oldsha1 "$todo".newsha1 >"$todo".miss
-
- # Warn about missing commits
- if test -s "$todo".miss
- then
- test "$check_level" = error && raise_error=t
-
- warn "$(gettext "\
-Warning: some commits may have been dropped accidentally.
-Dropped commits (newer to older):")"
-
- # Make the list user-friendly and display
- opt="--no-walk=sorted --format=oneline --abbrev-commit --stdin"
- git rev-list $opt <"$todo".miss | warn_lines
-
- warn "$(gettext "\
-To avoid this message, use \"drop\" to explicitly remove a commit.
-
-Use 'git config rebase.missingCommitsCheck' to change the level of warnings.
-The possible behaviours are: ignore, warn, error.")"
- warn
- fi
- ;;
- ignore)
- ;;
- *)
- warn "$(eval_gettext "Unrecognized setting \$check_level for option rebase.missingCommitsCheck. Ignoring.")"
- ;;
- esac
-
- if ! check_bad_cmd_and_sha "$todo"
- then
- raise_error=t
- fi
-
- if test $raise_error = t
- then
- # Checkout before the first commit of the
- # rebase: this way git rebase --continue
- # will work correctly as it expects HEAD to be
- # placed before the commit of the next action
- checkout_onto
-
- warn "$(gettext "You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.")"
- die "$(gettext "Or you can abort the rebase with 'git rebase --abort'.")"
- fi
-}
-
# The whole contents of this file is run by dot-sourcing it from
# inside a shell function. It used to be that "return"s we see
# below were not inside any function, and expected to return
@@ -1211,26 +893,28 @@
revisions=$onto...$orig_head
shortrevisions=$shorthead
fi
-format=$(git config --get rebase.instructionFormat)
-# the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
-git rev-list $merges_option --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 t != "$preserve_merges"
+then
+ git rebase--helper --make-script ${keep_empty:+--keep-empty} \
+ $revisions ${restrict_revision+^$restrict_revision} >"$todo" ||
+ die "$(gettext "Could not generate todo list")"
+else
+ format=$(git config --get rebase.instructionFormat)
+ # the 'rev-list .. | sed' requires %m to parse; the instruction requires %H to parse
+ git rev-list $merges_option --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 "$keep_empty" && is_empty_commit $sha1 && ! is_merge_commit $sha1
+ then
+ comment_out="$comment_char "
+ else
+ comment_out=
+ fi
- if test t != "$preserve_merges"
- then
- printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
- else
if test -z "$rebase_root"
then
preserve=t
@@ -1249,8 +933,8 @@
touch "$rewritten"/$sha1
printf '%s\n' "${comment_out}pick $sha1 $rest" >>"$todo"
fi
- fi
-done
+ done
+fi
# Watch for commits that been dropped by --cherry-pick
if test t = "$preserve_merges"
@@ -1280,8 +964,8 @@
fi
test -s "$todo" || echo noop >> "$todo"
-test -n "$autosquash" && rearrange_squash "$todo"
-test -n "$cmd" && add_exec_commands "$todo"
+test -z "$autosquash" || git rebase--helper --rearrange-squash || exit
+test -n "$cmd" && git rebase--helper --add-exec-commands "$cmd"
todocount=$(git stripspace --strip-comments <"$todo" | wc -l)
todocount=${todocount##* }
@@ -1316,11 +1000,17 @@
has_action "$todo" ||
return 2
-check_todo_list
+git rebase--helper --check-todo-list || {
+ ret=$?
+ checkout_onto
+ exit $ret
+}
expand_todo_ids
-test -d "$rewritten" || test -n "$force_rebase" || skip_unnecessary_picks
+test -d "$rewritten" || test -n "$force_rebase" ||
+onto="$(git rebase--helper --skip-unnecessary-picks)" ||
+die "Could not skip unnecessary pick commands"
checkout_onto
if test -z "$rebase_root" && test ! -d "$rewritten"
diff --git a/git-rebase.sh b/git-rebase.sh
index 2cf73b8..fd72a35 100755
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -9,7 +9,7 @@
OPTIONS_SPEC="\
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] [<upstream>] [<branch>]
git rebase [-i] [options] [--exec <cmd>] [--onto <newbase>] --root [<branch>]
-git-rebase --continue | --abort | --skip | --edit-todo
+git rebase --continue | --abort | --skip | --edit-todo
--
Available options are
v,verbose! display a diffstat of what changed upstream
@@ -55,9 +55,10 @@
'
ok_to_skip_pre_rebase=
resolvemsg="
-$(gettext 'When you have resolved this problem, run "git rebase --continue".
-If you prefer to skip this patch, run "git rebase --skip" instead.
-To check out the original branch and stop rebasing, run "git rebase --abort".')
+$(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".')
"
unset onto
unset restrict_revision
@@ -73,6 +74,7 @@
autostash="$(git config --bool rebase.autostash || echo false)"
fork_point=auto
git_am_opt=
+git_format_patch_opt=
rebase_root=
force_rebase=
allow_rerere_autoupdate=
@@ -164,7 +166,7 @@
if test -f "$state_dir/autostash"
then
stash_sha1=$(cat "$state_dir/autostash")
- if git stash apply $stash_sha1 2>&1 >/dev/null
+ if git stash apply $stash_sha1 >/dev/null 2>&1
then
echo "$(gettext 'Applied autostash.')" >&2
else
@@ -214,7 +216,7 @@
}
test -f "$apply_dir"/applying &&
- die "$(gettext "It looks like git-am is in progress. Cannot rebase.")"
+ die "$(gettext "It looks like 'git am' is in progress. Cannot rebase.")"
if test -d "$apply_dir"
then
@@ -348,6 +350,9 @@
shift
break
;;
+ *)
+ usage
+ ;;
esac
shift
done
@@ -444,6 +449,11 @@
state_dir="$apply_dir"
fi
+if test -t 2 && test -z "$GIT_QUIET"
+then
+ git_format_patch_opt="$git_format_patch_opt --progress"
+fi
+
if test -z "$rebase_root"
then
case "$#" in
@@ -467,7 +477,7 @@
;;
esac
upstream=$(peel_committish "${upstream_name}") ||
- die "$(eval_gettext "invalid upstream \$upstream_name")"
+ die "$(eval_gettext "invalid upstream '\$upstream_name'")"
upstream_arg="$upstream_name"
else
if test -z "$onto"
@@ -508,7 +518,7 @@
esac
# If the branch to rebase is given, that is the branch we will rebase
-# $branch_name -- branch being rebased, or HEAD (already detached)
+# $branch_name -- branch/commit being rebased, or HEAD (already detached)
# $orig_head -- commit object name of tip of the branch before rebasing
# $head_name -- refs/heads/<that-branch> or "detached HEAD"
switch_to=
@@ -518,15 +528,18 @@
branch_name="$1"
switch_to="$1"
- if git show-ref --verify --quiet -- "refs/heads/$1" &&
- orig_head=$(git rev-parse -q --verify "refs/heads/$1")
+ # Is it a local branch?
+ if git show-ref --verify --quiet -- "refs/heads/$branch_name" &&
+ orig_head=$(git rev-parse -q --verify "refs/heads/$branch_name")
then
- head_name="refs/heads/$1"
- elif orig_head=$(git rev-parse -q --verify "$1")
+ head_name="refs/heads/$branch_name"
+ # If not is it a valid ref (branch or commit)?
+ elif orig_head=$(git rev-parse -q --verify "$branch_name")
then
head_name="detached HEAD"
+
else
- die "$(eval_gettext "fatal: no such branch: \$branch_name")"
+ die "$(eval_gettext "fatal: no such branch/commit '\$branch_name'")"
fi
;;
0)
@@ -537,7 +550,7 @@
branch_name=$(expr "z$branch_name" : 'zrefs/heads/\(.*\)')
else
head_name="detached HEAD"
- branch_name=HEAD ;# detached
+ branch_name=HEAD
fi
orig_head=$(git rev-parse --verify HEAD) || exit
;;
@@ -588,11 +601,23 @@
test -z "$switch_to" ||
GIT_REFLOG_ACTION="$GIT_REFLOG_ACTION: checkout $switch_to" \
git checkout -q "$switch_to" --
- say "$(eval_gettext "Current branch \$branch_name is up to date.")"
+ if test "$branch_name" = "HEAD" &&
+ ! git symbolic-ref -q HEAD
+ then
+ say "$(eval_gettext "HEAD is up to date.")"
+ else
+ say "$(eval_gettext "Current branch \$branch_name is up to date.")"
+ fi
finish_rebase
exit 0
else
- say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"
+ if test "$branch_name" = "HEAD" &&
+ ! git symbolic-ref -q HEAD
+ then
+ say "$(eval_gettext "HEAD is up to date, rebase forced.")"
+ else
+ say "$(eval_gettext "Current branch \$branch_name is up to date, rebase forced.")"
+ fi
fi
fi
diff --git a/git-send-email.perl b/git-send-email.perl
index 2208dcc..edcc6d3 100755
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -885,7 +885,9 @@
}
if (!defined $smtp_server) {
- foreach (qw( /usr/sbin/sendmail /usr/lib/sendmail )) {
+ my @sendmail_paths = qw( /usr/sbin/sendmail /usr/lib/sendmail );
+ push @sendmail_paths, map {"$_/sendmail"} split /:/, $ENV{PATH};
+ foreach (@sendmail_paths) {
if (-x $_) {
$smtp_server = $_;
last;
diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
index 1ef1889..9d065fb 100644
--- a/git-sh-i18n.sh
+++ b/git-sh-i18n.sh
@@ -17,15 +17,15 @@
# First decide what scheme to use...
GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
-if test -n "@@USE_GETTEXT_SCHEME@@"
+if test -n "$GIT_GETTEXT_POISON"
+then
+ GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+elif test -n "@@USE_GETTEXT_SCHEME@@"
then
GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
then
: no probing necessary
-elif test -n "$GIT_GETTEXT_POISON"
-then
- GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
elif type gettext.sh >/dev/null 2>&1
then
# GNU libintl's gettext.sh
diff --git a/git-stash.sh b/git-stash.sh
index 328cd80..fc8f8ae 100755
--- a/git-stash.sh
+++ b/git-stash.sh
@@ -76,6 +76,12 @@
shift
stash_msg=${1?"BUG: create_stash () -m requires an argument"}
;;
+ -m*)
+ stash_msg=${1#-m}
+ ;;
+ --message=*)
+ stash_msg=${1#--message=}
+ ;;
-u|--include-untracked)
shift
untracked=${1?"BUG: create_stash () -u requires an argument"}
@@ -193,6 +199,12 @@
shift
stash_msg="$1"
;;
+ -m*)
+ stash_msg=${1#-m}
+ ;;
+ --message=*)
+ stash_msg=${1#--message=}
+ ;;
-q|--quiet)
quiet=t
;;
@@ -251,6 +263,12 @@
test -z ${1+x} && usage
stash_msg=$1
;;
+ -m*)
+ stash_msg=${1#-m}
+ ;;
+ --message=*)
+ stash_msg=${1#--message=}
+ ;;
--help)
show_help
;;
@@ -260,18 +278,7 @@
;;
-*)
option="$1"
- # TRANSLATORS: $option is an invalid option, like
- # `--blah-blah'. The 7 spaces at the beginning of the
- # second line correspond to "error: ". So you should line
- # up the second line with however many characters the
- # translation of "error: " takes in your language. E.g. in
- # English this is:
- #
- # $ git stash save --blah-blah 2>&1 | head -n 2
- # error: unknown option for 'stash save': --blah-blah
- # To provide a message, use git stash save -- '--blah-blah'
- eval_gettextln "error: unknown option for 'stash save': \$option
- To provide a message, use git stash save -- '\$option'"
+ eval_gettextln "error: unknown option for 'stash push': \$option"
usage
;;
*)
@@ -307,21 +314,21 @@
if test -z "$patch_mode"
then
- if test $# != 0
- then
- git reset -q -- "$@"
- git ls-files -z --modified -- "$@" |
- git checkout-index -z --force --stdin
- git clean --force -q -d -- "$@"
- else
- git reset --hard -q
- fi
test "$untracked" = "all" && CLEAN_X_OPTION=-x || CLEAN_X_OPTION=
if test -n "$untracked"
then
git clean --force --quiet -d $CLEAN_X_OPTION -- "$@"
fi
+ if test $# != 0
+ then
+ git add -u -- "$@" |
+ git checkout-index -z --force --stdin
+ git diff-index -p --cached --binary HEAD -- "$@" | git apply --index -R
+ else
+ git reset --hard -q
+ fi
+
if test "$keep_index" = "t" && test -n "$i_tree"
then
git read-tree --reset $i_tree
diff --git a/git-submodule.sh b/git-submodule.sh
index 66d1ae8..156255a 100755
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -758,18 +758,6 @@
}
}
-set_name_rev () {
- revname=$( (
- sanitize_submodule_env
- cd "$1" && {
- git describe "$2" 2>/dev/null ||
- git describe --tags "$2" 2>/dev/null ||
- git describe --contains "$2" 2>/dev/null ||
- git describe --all --always "$2"
- }
- ) )
- test -z "$revname" || revname=" ($revname)"
-}
#
# Show commit summary for submodules in index or working tree
#
@@ -1016,54 +1004,7 @@
shift
done
- {
- git submodule--helper list --prefix "$wt_prefix" "$@" ||
- echo "#unmatched" $?
- } |
- while read -r mode sha1 stage sm_path
- do
- die_if_unmatched "$mode" "$sha1"
- name=$(git submodule--helper name "$sm_path") || exit
- displaypath=$(git submodule--helper relative-path "$prefix$sm_path" "$wt_prefix")
- if test "$stage" = U
- then
- say "U$sha1 $displaypath"
- continue
- fi
- if ! git submodule--helper is-active "$sm_path" ||
- {
- ! test -d "$sm_path"/.git &&
- ! test -f "$sm_path"/.git
- }
- then
- say "-$sha1 $displaypath"
- continue;
- fi
- if git diff-files --ignore-submodules=dirty --quiet -- "$sm_path"
- then
- set_name_rev "$sm_path" "$sha1"
- say " $sha1 $displaypath$revname"
- else
- if test -z "$cached"
- then
- sha1=$(sanitize_submodule_env; cd "$sm_path" && git rev-parse --verify HEAD)
- fi
- set_name_rev "$sm_path" "$sha1"
- say "+$sha1 $displaypath$revname"
- fi
-
- if test -n "$recursive"
- then
- (
- prefix="$displaypath/"
- sanitize_submodule_env
- wt_prefix=
- cd "$sm_path" &&
- eval cmd_status
- ) ||
- die "$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")"
- fi
- done
+ git ${wt_prefix:+-C "$wt_prefix"} ${prefix:+--super-prefix "$prefix"} submodule--helper status ${GIT_QUIET:+--quiet} ${cached:+--cached} ${recursive:+--recursive} "$@"
}
#
# Sync remote urls for submodules
diff --git a/git-svn.perl b/git-svn.perl
index d240418..a6b6c3e 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -931,6 +931,7 @@
# information from different SVN repos, and paths
# which are not underneath this repository root.
my $rooturl = $gs->repos_root;
+ Git::SVN::remove_username($rooturl);
foreach my $d (@$linear_refs) {
my %parentshash;
read_commit_parents(\%parentshash, $d);
@@ -1199,6 +1200,11 @@
$ctx->copy($src, $rev, $dst)
unless $_dry_run;
+ # Release resources held by ctx before creating another SVN::Ra
+ # so destruction is orderly. This seems necessary with SVN 1.9.5
+ # to avoid segfaults.
+ $ctx = undef;
+
$gs->fetch_all;
}
@@ -1865,6 +1871,7 @@
}
}
$msgbuf =~ s/\s+$//s;
+ $msgbuf =~ s/\r\n/\n/sg; # SVN 1.6+ disallows CRLF
if ($Git::SVN::_add_author_from && defined($author)
&& !$saw_from) {
$msgbuf .= "\n\nFrom: $author";
diff --git a/git.c b/git.c
index 6b6d9f6..c870b97 100644
--- a/git.c
+++ b/git.c
@@ -182,6 +182,10 @@
setenv(GIT_ICASE_PATHSPECS_ENVIRONMENT, "1", 1);
if (envchanged)
*envchanged = 1;
+ } else if (!strcmp(cmd, "--no-optional-locks")) {
+ setenv(GIT_OPTIONAL_LOCKS_ENVIRONMENT, "0", 1);
+ if (envchanged)
+ *envchanged = 1;
} else if (!strcmp(cmd, "--shallow-file")) {
(*argv)++;
(*argc)--;
@@ -368,7 +372,7 @@
{ "archive", cmd_archive, RUN_SETUP_GENTLY },
{ "bisect--helper", cmd_bisect__helper, RUN_SETUP },
{ "blame", cmd_blame, RUN_SETUP },
- { "branch", cmd_branch, RUN_SETUP },
+ { "branch", cmd_branch, RUN_SETUP | DELAY_PAGER_CONFIG },
{ "bundle", cmd_bundle, RUN_SETUP_GENTLY },
{ "cat-file", cmd_cat_file, RUN_SETUP },
{ "check-attr", cmd_check_attr, RUN_SETUP },
@@ -404,7 +408,7 @@
{ "fsck-objects", cmd_fsck, RUN_SETUP },
{ "gc", cmd_gc, RUN_SETUP },
{ "get-tar-commit-id", cmd_get_tar_commit_id },
- { "grep", cmd_grep, RUN_SETUP_GENTLY | SUPPORT_SUPER_PREFIX },
+ { "grep", cmd_grep, RUN_SETUP_GENTLY },
{ "hash-object", cmd_hash_object },
{ "help", cmd_help },
{ "index-pack", cmd_index_pack, RUN_SETUP_GENTLY },
diff --git a/git.rc b/git.rc
index 33aafb7..49002e0 100644
--- a/git.rc
+++ b/git.rc
@@ -1,6 +1,6 @@
1 VERSIONINFO
-FILEVERSION MAJOR,MINOR,0,0
-PRODUCTVERSION MAJOR,MINOR,0,0
+FILEVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
+PRODUCTVERSION MAJOR,MINOR,MICRO,PATCHLEVEL
BEGIN
BLOCK "StringFileInfo"
BEGIN
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 9208f42..2417057 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -10,6 +10,8 @@
use 5.008;
use strict;
use warnings;
+# handle ACL in file access tests
+use filetest 'access';
use CGI qw(:standard :escapeHTML -nosticky);
use CGI::Util qw(unescape);
use CGI::Carp qw(fatalsToBrowser set_message);
@@ -5967,6 +5969,9 @@
$cgi->a({-href => href(action=>"commitdiff", hash=>$commit)}, "commitdiff");
if ($ftype eq 'blob') {
+ print " | " .
+ $cgi->a({-href => href(action=>"blob_plain", hash_base=>$commit, file_name=>$file_name)}, "raw");
+
my $blob_current = $file_hash;
my $blob_parent = git_get_hash_by_path($commit, $file_name);
if (defined $blob_current && defined $blob_parent &&
diff --git a/gpg-interface.c b/gpg-interface.c
index d936f3a..4feacf1 100644
--- a/gpg-interface.c
+++ b/gpg-interface.c
@@ -202,26 +202,26 @@
struct strbuf *gpg_output, struct strbuf *gpg_status)
{
struct child_process gpg = CHILD_PROCESS_INIT;
- static struct tempfile temp;
- int fd, ret;
+ struct tempfile *temp;
+ int ret;
struct strbuf buf = STRBUF_INIT;
- fd = mks_tempfile_t(&temp, ".git_vtag_tmpXXXXXX");
- if (fd < 0)
+ temp = mks_tempfile_t(".git_vtag_tmpXXXXXX");
+ if (!temp)
return error_errno(_("could not create temporary file"));
- if (write_in_full(fd, signature, signature_size) < 0) {
+ if (write_in_full(temp->fd, signature, signature_size) < 0 ||
+ close_tempfile_gently(temp) < 0) {
error_errno(_("failed writing detached signature to '%s'"),
- temp.filename.buf);
+ temp->filename.buf);
delete_tempfile(&temp);
return -1;
}
- close(fd);
argv_array_pushl(&gpg.args,
gpg_program,
"--status-fd=1",
"--keyid-format=long",
- "--verify", temp.filename.buf, "-",
+ "--verify", temp->filename.buf, "-",
NULL);
if (!gpg_status)
diff --git a/graph.c b/graph.c
index e7e2065..e1f6d3b 100644
--- a/graph.c
+++ b/graph.c
@@ -696,12 +696,8 @@
* This way, fields printed to the right of the graph will remain
* aligned for the entire commit.
*/
- int extra;
- if (chars_written >= graph->width)
- return;
-
- extra = graph->width - chars_written;
- strbuf_addf(sb, "%*s", (int) extra, "");
+ if (chars_written < graph->width)
+ strbuf_addchars(sb, ' ', graph->width - chars_written);
}
static void graph_output_padding_line(struct git_graph *graph,
@@ -787,7 +783,7 @@
if (col->commit == graph->commit) {
seen_this = 1;
strbuf_write_column(sb, col, '|');
- strbuf_addf(sb, "%*s", graph->expansion_row, "");
+ strbuf_addchars(sb, ' ', graph->expansion_row);
chars_written += 1 + graph->expansion_row;
} else if (seen_this && (graph->expansion_row == 0)) {
/*
diff --git a/grep.c b/grep.c
index c9e7cc7..3d7cd0e 100644
--- a/grep.c
+++ b/grep.c
@@ -387,7 +387,7 @@
if (!p->pcre1_regexp)
compile_regexp_failed(p, error);
- p->pcre1_extra_info = pcre_study(p->pcre1_regexp, PCRE_STUDY_JIT_COMPILE, &error);
+ p->pcre1_extra_info = pcre_study(p->pcre1_regexp, GIT_PCRE_STUDY_JIT_COMPILE, &error);
if (!p->pcre1_extra_info && error)
die("%s", error);
@@ -477,6 +477,8 @@
int options = PCRE2_MULTILINE;
const uint8_t *character_tables = NULL;
int jitret;
+ int patinforet;
+ size_t jitsizearg;
assert(opt->pcre2);
@@ -511,6 +513,30 @@
jitret = pcre2_jit_compile(p->pcre2_pattern, PCRE2_JIT_COMPLETE);
if (jitret)
die("Couldn't JIT the PCRE2 pattern '%s', got '%d'\n", p->pattern, jitret);
+
+ /*
+ * The pcre2_config(PCRE2_CONFIG_JIT, ...) call just
+ * tells us whether the library itself supports JIT,
+ * but to see whether we're going to be actually using
+ * JIT we need to extract PCRE2_INFO_JITSIZE from the
+ * pattern *after* we do pcre2_jit_compile() above.
+ *
+ * This is because if the pattern contains the
+ * (*NO_JIT) verb (see pcre2syntax(3))
+ * pcre2_jit_compile() will exit early with 0. If we
+ * then proceed to call pcre2_jit_match() further down
+ * the line instead of pcre2_match() we'll either
+ * segfault (pre PCRE 10.31) or run into a fatal error
+ * (post PCRE2 10.31)
+ */
+ patinforet = pcre2_pattern_info(p->pcre2_pattern, PCRE2_INFO_JITSIZE, &jitsizearg);
+ if (patinforet)
+ BUG("pcre2_pattern_info() failed: %d", patinforet);
+ if (jitsizearg == 0) {
+ p->pcre2_jit_on = 0;
+ return;
+ }
+
p->pcre2_jit_stack = pcre2_jit_stack_create(1, 1024 * 1024, NULL);
if (!p->pcre2_jit_stack)
die("Couldn't allocate PCRE2 JIT stack");
@@ -1476,31 +1502,52 @@
}
}
+static int is_empty_line(const char *bol, const char *eol);
+
static void show_pre_context(struct grep_opt *opt, struct grep_source *gs,
char *bol, char *end, unsigned lno)
{
- unsigned cur = lno, from = 1, funcname_lno = 0;
- int funcname_needed = !!opt->funcname;
-
- if (opt->funcbody && !match_funcname(opt, gs, bol, end))
- funcname_needed = 2;
+ unsigned cur = lno, from = 1, funcname_lno = 0, orig_from;
+ int funcname_needed = !!opt->funcname, comment_needed = 0;
if (opt->pre_context < lno)
from = lno - opt->pre_context;
if (from <= opt->last_shown)
from = opt->last_shown + 1;
+ orig_from = from;
+ if (opt->funcbody) {
+ if (match_funcname(opt, gs, bol, end))
+ comment_needed = 1;
+ else
+ funcname_needed = 1;
+ from = opt->last_shown + 1;
+ }
/* Rewind. */
- while (bol > gs->buf &&
- cur > (funcname_needed == 2 ? opt->last_shown + 1 : from)) {
+ while (bol > gs->buf && cur > from) {
+ char *next_bol = bol;
char *eol = --bol;
while (bol > gs->buf && bol[-1] != '\n')
bol--;
cur--;
+ if (comment_needed && (is_empty_line(bol, eol) ||
+ match_funcname(opt, gs, bol, eol))) {
+ comment_needed = 0;
+ from = orig_from;
+ if (cur < from) {
+ cur++;
+ bol = next_bol;
+ break;
+ }
+ }
if (funcname_needed && match_funcname(opt, gs, bol, eol)) {
funcname_lno = cur;
funcname_needed = 0;
+ if (opt->funcbody)
+ comment_needed = 1;
+ else
+ from = orig_from;
}
}
@@ -1927,16 +1974,6 @@
case GREP_SOURCE_FILE:
gs->identifier = xstrdup(identifier);
break;
- case GREP_SOURCE_SUBMODULE:
- if (!identifier) {
- gs->identifier = NULL;
- break;
- }
- /*
- * FALL THROUGH
- * If the identifier is non-NULL (in the submodule case) it
- * will be a SHA1 that needs to be copied.
- */
case GREP_SOURCE_OID:
gs->identifier = oiddup(identifier);
break;
@@ -1959,7 +1996,6 @@
switch (gs->type) {
case GREP_SOURCE_FILE:
case GREP_SOURCE_OID:
- case GREP_SOURCE_SUBMODULE:
FREE_AND_NULL(gs->buf);
gs->size = 0;
break;
@@ -2030,8 +2066,6 @@
return grep_source_load_oid(gs);
case GREP_SOURCE_BUF:
return gs->buf ? 0 : -1;
- case GREP_SOURCE_SUBMODULE:
- break;
}
die("BUG: invalid grep_source type to load");
}
diff --git a/grep.h b/grep.h
index 0c091e5..399381c 100644
--- a/grep.h
+++ b/grep.h
@@ -7,11 +7,12 @@
#if PCRE_MAJOR >= 8 && PCRE_MINOR >= 32
#ifndef NO_LIBPCRE1_JIT
#define GIT_PCRE1_USE_JIT
+#define GIT_PCRE_STUDY_JIT_COMPILE PCRE_STUDY_JIT_COMPILE
#endif
#endif
#endif
-#ifndef PCRE_STUDY_JIT_COMPILE
-#define PCRE_STUDY_JIT_COMPILE 0
+#ifndef GIT_PCRE_STUDY_JIT_COMPILE
+#define GIT_PCRE_STUDY_JIT_COMPILE 0
#endif
#if PCRE_MAJOR <= 8 && PCRE_MINOR < 20
typedef int pcre_jit_stack;
@@ -193,7 +194,6 @@
GREP_SOURCE_OID,
GREP_SOURCE_FILE,
GREP_SOURCE_BUF,
- GREP_SOURCE_SUBMODULE,
} type;
void *identifier;
diff --git a/hash.h b/hash.h
index bef3e63..7d7a864 100644
--- a/hash.h
+++ b/hash.h
@@ -1,6 +1,8 @@
#ifndef HASH_H
#define HASH_H
+#include "git-compat-util.h"
+
#if defined(SHA1_PPC)
#include "ppc/sha1.h"
#elif defined(SHA1_APPLE)
@@ -8,13 +10,64 @@
#elif defined(SHA1_OPENSSL)
#include <openssl/sha.h>
#elif defined(SHA1_DC)
-#ifdef DC_SHA1_SUBMODULE
-#include "sha1collisiondetection/lib/sha1.h"
-#else
-#include "sha1dc/sha1.h"
-#endif
+#include "sha1dc_git.h"
#else /* SHA1_BLK */
#include "block-sha1/sha1.h"
#endif
+/*
+ * Note that these constants are suitable for indexing the hash_algos array and
+ * comparing against each other, but are otherwise arbitrary, so they should not
+ * be exposed to the user or serialized to disk. To know whether a
+ * git_hash_algo struct points to some usable hash function, test the format_id
+ * field for being non-zero. Use the name field for user-visible situations and
+ * the format_id field for fixed-length fields on disk.
+ */
+/* An unknown hash function. */
+#define GIT_HASH_UNKNOWN 0
+/* SHA-1 */
+#define GIT_HASH_SHA1 1
+/* Number of algorithms supported (including unknown). */
+#define GIT_HASH_NALGOS (GIT_HASH_SHA1 + 1)
+
+typedef void (*git_hash_init_fn)(void *ctx);
+typedef void (*git_hash_update_fn)(void *ctx, const void *in, size_t len);
+typedef void (*git_hash_final_fn)(unsigned char *hash, void *ctx);
+
+struct git_hash_algo {
+ /*
+ * The name of the algorithm, as appears in the config file and in
+ * messages.
+ */
+ const char *name;
+
+ /* A four-byte version identifier, used in pack indices. */
+ uint32_t format_id;
+
+ /* The size of a hash context (e.g. git_SHA_CTX). */
+ size_t ctxsz;
+
+ /* The length of the hash in binary. */
+ size_t rawsz;
+
+ /* The length of the hash in hex characters. */
+ size_t hexsz;
+
+ /* The hash initialization function. */
+ git_hash_init_fn init_fn;
+
+ /* The hash update function. */
+ git_hash_update_fn update_fn;
+
+ /* The hash finalization function. */
+ git_hash_final_fn final_fn;
+
+ /* The OID of the empty tree. */
+ const struct object_id *empty_tree;
+
+ /* The OID of the empty blob. */
+ const struct object_id *empty_blob;
+};
+extern const struct git_hash_algo hash_algos[GIT_HASH_NALGOS];
+
#endif
diff --git a/hashmap.c b/hashmap.c
index 9b6a128..d42f01f 100644
--- a/hashmap.c
+++ b/hashmap.c
@@ -116,9 +116,6 @@
unsigned int i, oldsize = map->tablesize;
struct hashmap_entry **oldtable = map->table;
- if (map->disallow_rehash)
- return;
-
alloc_table(map, newsize);
for (i = 0; i < oldsize; i++) {
struct hashmap_entry *e = oldtable[i];
@@ -166,6 +163,12 @@
while (initial_size > size)
size <<= HASHMAP_RESIZE_BITS;
alloc_table(map, size);
+
+ /*
+ * Keep track of the number of items in the map and
+ * allow the map to automatically grow as necessary.
+ */
+ map->do_count_items = 1;
}
void hashmap_free(struct hashmap *map, int free_entries)
@@ -206,9 +209,11 @@
map->table[b] = entry;
/* fix size and rehash if appropriate */
- map->size++;
- if (map->size > map->grow_at)
- rehash(map, map->tablesize << HASHMAP_RESIZE_BITS);
+ if (map->do_count_items) {
+ map->private_size++;
+ if (map->private_size > map->grow_at)
+ rehash(map, map->tablesize << HASHMAP_RESIZE_BITS);
+ }
}
void *hashmap_remove(struct hashmap *map, const void *key, const void *keydata)
@@ -224,9 +229,12 @@
old->next = NULL;
/* fix size and rehash if appropriate */
- map->size--;
- if (map->size < map->shrink_at)
- rehash(map, map->tablesize >> HASHMAP_RESIZE_BITS);
+ if (map->do_count_items) {
+ map->private_size--;
+ if (map->private_size < map->shrink_at)
+ rehash(map, map->tablesize >> HASHMAP_RESIZE_BITS);
+ }
+
return old;
}
diff --git a/hashmap.h b/hashmap.h
index 7a8fa7f..d375d9c 100644
--- a/hashmap.h
+++ b/hashmap.h
@@ -18,75 +18,71 @@
*
* #define COMPARE_VALUE 1
*
- * static int long2string_cmp(const struct long2string *e1,
+ * static int long2string_cmp(const void *hashmap_cmp_fn_data,
+ * const struct long2string *e1,
* const struct long2string *e2,
- * const void *keydata, const void *userdata)
+ * const void *keydata)
* {
- * char *string = keydata;
- * unsigned *flags = (unsigned*)userdata;
+ * const char *string = keydata;
+ * unsigned flags = *(unsigned *)hashmap_cmp_fn_data;
*
* if (flags & COMPARE_VALUE)
- * return !(e1->key == e2->key) || (keydata ?
- * strcmp(e1->value, keydata) : strcmp(e1->value, e2->value));
+ * return e1->key != e2->key ||
+ * strcmp(e1->value, string ? string : e2->value);
* else
- * return !(e1->key == e2->key);
+ * return e1->key != e2->key;
* }
*
* int main(int argc, char **argv)
* {
* long key;
- * char *value, *action;
- *
- * unsigned flags = ALLOW_DUPLICATE_KEYS;
+ * char value[255], action[32];
+ * unsigned flags = 0;
*
* hashmap_init(&map, (hashmap_cmp_fn) long2string_cmp, &flags, 0);
*
- * while (scanf("%s %l %s", action, key, value)) {
+ * while (scanf("%s %ld %s", action, &key, value)) {
*
* if (!strcmp("add", action)) {
* struct long2string *e;
- * e = malloc(sizeof(struct long2string) + strlen(value));
+ * FLEX_ALLOC_STR(e, value, value);
* hashmap_entry_init(e, memhash(&key, sizeof(long)));
* e->key = key;
- * memcpy(e->value, value, strlen(value));
* hashmap_add(&map, e);
* }
*
* if (!strcmp("print_all_by_key", action)) {
- * flags &= ~COMPARE_VALUE;
- *
- * struct long2string k;
+ * struct long2string k, *e;
* hashmap_entry_init(&k, memhash(&key, sizeof(long)));
* k.key = key;
*
- * struct long2string *e = hashmap_get(&map, &k, NULL);
+ * flags &= ~COMPARE_VALUE;
+ * e = hashmap_get(&map, &k, NULL);
* if (e) {
- * printf("first: %l %s\n", e->key, e->value);
- * while (e = hashmap_get_next(&map, e))
- * printf("found more: %l %s\n", e->key, e->value);
+ * printf("first: %ld %s\n", e->key, e->value);
+ * while ((e = hashmap_get_next(&map, e)))
+ * printf("found more: %ld %s\n", e->key, e->value);
* }
* }
*
* if (!strcmp("has_exact_match", action)) {
- * flags |= COMPARE_VALUE;
- *
* struct long2string *e;
- * e = malloc(sizeof(struct long2string) + strlen(value));
+ * FLEX_ALLOC_STR(e, value, value);
* hashmap_entry_init(e, memhash(&key, sizeof(long)));
* e->key = key;
- * memcpy(e->value, value, strlen(value));
*
- * printf("%s found\n", hashmap_get(&map, e, NULL) ? "" : "not");
+ * flags |= COMPARE_VALUE;
+ * printf("%sfound\n", hashmap_get(&map, e, NULL) ? "" : "not ");
+ * free(e);
* }
*
* if (!strcmp("has_exact_match_no_heap_alloc", action)) {
+ * struct long2string k;
+ * hashmap_entry_init(&k, memhash(&key, sizeof(long)));
+ * k.key = key;
+ *
* flags |= COMPARE_VALUE;
- *
- * struct long2string e;
- * hashmap_entry_init(e, memhash(&key, sizeof(long)));
- * e.key = key;
- *
- * printf("%s found\n", hashmap_get(&map, e, value) ? "" : "not");
+ * printf("%sfound\n", hashmap_get(&map, &k, value) ? "" : "not ");
* }
*
* if (!strcmp("end", action)) {
@@ -94,6 +90,8 @@
* break;
* }
* }
+ *
+ * return 0;
* }
*/
@@ -183,7 +181,7 @@
const void *cmpfn_data;
/* total number of entries (0 means the hashmap is empty) */
- unsigned int size;
+ unsigned int private_size; /* use hashmap_get_size() */
/*
* tablesize is the allocated size of the hash table. A non-0 value
@@ -196,8 +194,7 @@
unsigned int grow_at;
unsigned int shrink_at;
- /* See `hashmap_disallow_rehash`. */
- unsigned disallow_rehash : 1;
+ unsigned int do_count_items : 1;
};
/* hashmap functions */
@@ -253,6 +250,18 @@
}
/*
+ * Return the number of items in the map.
+ */
+static inline unsigned int hashmap_get_size(struct hashmap *map)
+{
+ if (map->do_count_items)
+ return map->private_size;
+
+ BUG("hashmap_get_size: size not set");
+ return 0;
+}
+
+/*
* Returns the hashmap entry for the specified key, or NULL if not found.
*
* `map` is the hashmap structure.
@@ -345,24 +354,6 @@
int hashmap_bucket(const struct hashmap *map, unsigned int hash);
/*
- * Disallow/allow rehashing of the hashmap.
- * This is useful if the caller knows that the hashmap needs multi-threaded
- * access. The caller is still required to guard/lock searches and inserts
- * in a manner appropriate to their usage. This simply prevents the table
- * from being unexpectedly re-mapped.
- *
- * It is up to the caller to ensure that the hashmap is initialized to a
- * reasonable size to prevent poor performance.
- *
- * A call to allow rehashing does not force a rehash; that might happen
- * with the next insert or delete.
- */
-static inline void hashmap_disallow_rehash(struct hashmap *map, unsigned value)
-{
- map->disallow_rehash = value;
-}
-
-/*
* Used to iterate over all entries of a hashmap. Note that it is
* not safe to add or remove entries to the hashmap while
* iterating.
@@ -387,6 +378,42 @@
return hashmap_iter_next(iter);
}
+/*
+ * Disable item counting and automatic rehashing when adding/removing items.
+ *
+ * Normally, the hashmap keeps track of the number of items in the map
+ * and uses it to dynamically resize it. This (both the counting and
+ * the resizing) can cause problems when the map is being used by
+ * threaded callers (because the hashmap code does not know about the
+ * locking strategy used by the threaded callers and therefore, does
+ * not know how to protect the "private_size" counter).
+ */
+static inline void hashmap_disable_item_counting(struct hashmap *map)
+{
+ map->do_count_items = 0;
+}
+
+/*
+ * Re-enable item couting when adding/removing items.
+ * If counting is currently disabled, it will force count them.
+ * It WILL NOT automatically rehash them.
+ */
+static inline void hashmap_enable_item_counting(struct hashmap *map)
+{
+ unsigned int n = 0;
+ struct hashmap_iter iter;
+
+ if (map->do_count_items)
+ return;
+
+ hashmap_iter_init(map, &iter);
+ while (hashmap_iter_next(&iter))
+ n++;
+
+ map->do_count_items = 1;
+ map->private_size = n;
+}
+
/* String interning */
/*
diff --git a/help.c b/help.c
index 88a3aea..60071a9 100644
--- a/help.c
+++ b/help.c
@@ -412,6 +412,12 @@
printf("git version %s\n", git_version_string);
if (build_options) {
+ printf("cpu: %s\n", GIT_HOST_CPU);
+ if (git_built_from_commit_string[0])
+ printf("built from commit: %s\n",
+ git_built_from_commit_string);
+ else
+ printf("no commit associated with this build\n");
printf("sizeof-long: %d\n", (int)sizeof(long));
/* NEEDSWORK: also save and output GIT-BUILD_OPTIONS? */
}
diff --git a/hex.c b/hex.c
index 28b4411..8df2d63 100644
--- a/hex.c
+++ b/hex.c
@@ -35,6 +35,18 @@
-1, -1, -1, -1, -1, -1, -1, -1, /* f8-ff */
};
+int hex_to_bytes(unsigned char *binary, const char *hex, size_t len)
+{
+ for (; len; len--, hex += 2) {
+ unsigned int val = (hexval(hex[0]) << 4) | hexval(hex[1]);
+
+ if (val & ~0xff)
+ return -1;
+ *binary++ = val;
+ }
+ return 0;
+}
+
int get_sha1_hex(const char *hex, unsigned char *sha1)
{
int i;
diff --git a/http-backend.c b/http-backend.c
index 5daff8c..f3dc218 100644
--- a/http-backend.c
+++ b/http-backend.c
@@ -9,6 +9,7 @@
#include "string-list.h"
#include "url.h"
#include "argv-array.h"
+#include "packfile.h"
static const char content_type[] = "Content-Type";
static const char content_length[] = "Content-Length";
@@ -485,10 +486,9 @@
struct strbuf *buf = cb_data;
if (flag & REF_ISSYMREF) {
- struct object_id unused;
const char *target = resolve_ref_unsafe(refname,
RESOLVE_REF_READING,
- unused.hash, NULL);
+ NULL, NULL);
if (target)
strbuf_addf(buf, "ref: %s\n", strip_namespace(target));
diff --git a/http-push.c b/http-push.c
index df96960..14435ab 100644
--- a/http-push.c
+++ b/http-push.c
@@ -11,6 +11,7 @@
#include "list-objects.h"
#include "sigchain.h"
#include "argv-array.h"
+#include "packfile.h"
#ifdef EXPAT_NEEDS_XMLPARSE_H
#include <xmlparse.h>
@@ -1006,20 +1007,18 @@
void (*userFunc)(struct remote_ls_ctx *ls),
void *userData);
-/* extract hex from sharded "xx/x{40}" filename */
+/* extract hex from sharded "xx/x{38}" filename */
static int get_oid_hex_from_objpath(const char *path, struct object_id *oid)
{
- char hex[GIT_MAX_HEXSZ];
-
if (strlen(path) != GIT_SHA1_HEXSZ + 1)
return -1;
- memcpy(hex, path, 2);
+ if (hex_to_bytes(oid->hash, path, 1))
+ return -1;
path += 2;
path++; /* skip '/' */
- memcpy(hex + 2, path, GIT_SHA1_HEXSZ - 2);
- return get_oid_hex(hex, oid);
+ return hex_to_bytes(oid->hash + 1, path, GIT_SHA1_RAWSZ - 1);
}
static void process_ls_object(struct remote_ls_ctx *ls)
@@ -1522,6 +1521,7 @@
break;
case HTTP_ERROR:
error("unable to access '%s': %s", url, curl_errorstr);
+ /* fallthrough */
default:
ret = -1;
}
diff --git a/http-walker.c b/http-walker.c
index ee049cb..1ae8363 100644
--- a/http-walker.c
+++ b/http-walker.c
@@ -4,6 +4,7 @@
#include "http.h"
#include "list.h"
#include "transport.h"
+#include "packfile.h"
struct alt_base {
char *base;
diff --git a/http.c b/http.c
index 76ff63c..32a8238 100644
--- a/http.c
+++ b/http.c
@@ -11,8 +11,13 @@
#include "pkt-line.h"
#include "gettext.h"
#include "transport.h"
+#include "packfile.h"
+#include "protocol.h"
+#include "string-list.h"
static struct trace_key trace_curl = TRACE_KEY_INIT(CURL);
+static int trace_curl_data = 1;
+static struct string_list cookies_to_redact = STRING_LIST_INIT_DUP;
#if LIBCURL_VERSION_NUM >= 0x070a08
long int git_curl_ipresolve = CURL_IPRESOLVE_WHATEVER;
#else
@@ -91,7 +96,7 @@
* here, too
*/
};
-#if LIBCURL_VERSION_NUM >= 0x071600
+#ifdef CURLGSSAPI_DELEGATION_FLAG
static const char *curl_deleg;
static struct {
const char *name;
@@ -352,7 +357,7 @@
}
if (!strcmp("http.delegation", var)) {
-#if LIBCURL_VERSION_NUM >= 0x071600
+#ifdef CURLGSSAPI_DELEGATION_FLAG
return git_config_string(&curl_deleg, var, value);
#else
warning(_("Delegation control is not supported with cURL < 7.22.0"));
@@ -573,6 +578,54 @@
/* Everything else is opaque and possibly sensitive */
strbuf_setlen(header, sensitive_header - header->buf);
strbuf_addstr(header, " <redacted>");
+ } else if (cookies_to_redact.nr &&
+ skip_prefix(header->buf, "Cookie:", &sensitive_header)) {
+ struct strbuf redacted_header = STRBUF_INIT;
+ char *cookie;
+
+ while (isspace(*sensitive_header))
+ sensitive_header++;
+
+ /*
+ * The contents of header starting from sensitive_header will
+ * subsequently be overridden, so it is fine to mutate this
+ * string (hence the assignment to "char *").
+ */
+ cookie = (char *) sensitive_header;
+
+ while (cookie) {
+ char *equals;
+ char *semicolon = strstr(cookie, "; ");
+ if (semicolon)
+ *semicolon = 0;
+ equals = strchrnul(cookie, '=');
+ if (!equals) {
+ /* invalid cookie, just append and continue */
+ strbuf_addstr(&redacted_header, cookie);
+ continue;
+ }
+ *equals = 0; /* temporarily set to NUL for lookup */
+ if (string_list_lookup(&cookies_to_redact, cookie)) {
+ strbuf_addstr(&redacted_header, cookie);
+ strbuf_addstr(&redacted_header, "=<redacted>");
+ } else {
+ *equals = '=';
+ strbuf_addstr(&redacted_header, cookie);
+ }
+ if (semicolon) {
+ /*
+ * There are more cookies. (Or, for some
+ * reason, the input string ends in "; ".)
+ */
+ strbuf_addstr(&redacted_header, "; ");
+ cookie = semicolon + strlen("; ");
+ } else {
+ cookie = NULL;
+ }
+ }
+
+ strbuf_setlen(header, sensitive_header - header->buf);
+ strbuf_addbuf(header, &redacted_header);
}
}
@@ -637,33 +690,42 @@
switch (type) {
case CURLINFO_TEXT:
trace_printf_key(&trace_curl, "== Info: %s", data);
- default: /* we ignore unknown types by default */
- return 0;
-
+ break;
case CURLINFO_HEADER_OUT:
text = "=> Send header";
curl_dump_header(text, (unsigned char *)data, size, DO_FILTER);
break;
case CURLINFO_DATA_OUT:
- text = "=> Send data";
- curl_dump_data(text, (unsigned char *)data, size);
+ if (trace_curl_data) {
+ text = "=> Send data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ }
break;
case CURLINFO_SSL_DATA_OUT:
- text = "=> Send SSL data";
- curl_dump_data(text, (unsigned char *)data, size);
+ if (trace_curl_data) {
+ text = "=> Send SSL data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ }
break;
case CURLINFO_HEADER_IN:
text = "<= Recv header";
curl_dump_header(text, (unsigned char *)data, size, NO_FILTER);
break;
case CURLINFO_DATA_IN:
- text = "<= Recv data";
- curl_dump_data(text, (unsigned char *)data, size);
+ if (trace_curl_data) {
+ text = "<= Recv data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ }
break;
case CURLINFO_SSL_DATA_IN:
- text = "<= Recv SSL data";
- curl_dump_data(text, (unsigned char *)data, size);
+ if (trace_curl_data) {
+ text = "<= Recv SSL data";
+ curl_dump_data(text, (unsigned char *)data, size);
+ }
break;
+
+ default: /* we ignore unknown types by default */
+ return 0;
}
return 0;
}
@@ -677,6 +739,7 @@
curl_easy_setopt(handle, CURLOPT_DEBUGDATA, NULL);
}
+#ifdef CURLPROTO_HTTP
static long get_curl_allowed_protocols(int from_user)
{
long allowed_protocols = 0;
@@ -692,6 +755,7 @@
return allowed_protocols;
}
+#endif
static CURL *get_curl_handle(void)
{
@@ -717,7 +781,7 @@
curl_easy_setopt(result, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
#endif
-#if LIBCURL_VERSION_NUM >= 0x071600
+#ifdef CURLGSSAPI_DELEGATION_FLAG
if (curl_deleg) {
int i;
for (i = 0; i < ARRAY_SIZE(curl_deleg_levels); i++) {
@@ -790,7 +854,7 @@
#elif LIBCURL_VERSION_NUM >= 0x071101
curl_easy_setopt(result, CURLOPT_POST301, 1);
#endif
-#if LIBCURL_VERSION_NUM >= 0x071304
+#ifdef CURLPROTO_HTTP
curl_easy_setopt(result, CURLOPT_REDIR_PROTOCOLS,
get_curl_allowed_protocols(0));
curl_easy_setopt(result, CURLOPT_PROTOCOLS,
@@ -802,6 +866,13 @@
if (getenv("GIT_CURL_VERBOSE"))
curl_easy_setopt(result, CURLOPT_VERBOSE, 1L);
setup_curl_trace(result);
+ if (getenv("GIT_TRACE_CURL_NO_DATA"))
+ trace_curl_data = 0;
+ if (getenv("GIT_REDACT_COOKIES")) {
+ string_list_split(&cookies_to_redact,
+ getenv("GIT_REDACT_COOKIES"), ',', -1);
+ string_list_sort(&cookies_to_redact);
+ }
curl_easy_setopt(result, CURLOPT_USERAGENT,
user_agent ? user_agent : git_user_agent());
@@ -861,6 +932,11 @@
curl_easy_setopt(result,
CURLOPT_PROXYTYPE, CURLPROXY_SOCKS4);
#endif
+#if LIBCURL_VERSION_NUM >= 0x073400
+ else if (starts_with(curl_http_proxy, "https"))
+ curl_easy_setopt(result,
+ CURLOPT_PROXYTYPE, CURLPROXY_HTTPS);
+#endif
if (strstr(curl_http_proxy, "://"))
credential_from_url(&proxy_auth, curl_http_proxy);
else {
@@ -894,6 +970,21 @@
*var = val;
}
+static void protocol_http_header(void)
+{
+ if (get_protocol_version_config() > 0) {
+ struct strbuf protocol_header = STRBUF_INIT;
+
+ strbuf_addf(&protocol_header, GIT_PROTOCOL_HEADER ": version=%d",
+ get_protocol_version_config());
+
+
+ extra_http_headers = curl_slist_append(extra_http_headers,
+ protocol_header.buf);
+ strbuf_release(&protocol_header);
+ }
+}
+
void http_init(struct remote *remote, const char *url, int proactive_auth)
{
char *low_speed_limit;
@@ -924,6 +1015,8 @@
if (remote)
var_override(&http_proxy_authmethod, remote->http_proxy_authmethod);
+ protocol_http_header();
+
pragma_header = curl_slist_append(http_copy_default_headers(),
"Pragma: no-cache");
no_pragma_header = curl_slist_append(http_copy_default_headers(),
@@ -2003,7 +2096,6 @@
char *tmp_idx;
size_t len;
struct child_process ip = CHILD_PROCESS_INIT;
- const char *ip_argv[8];
close_pack_index(p);
@@ -2019,13 +2111,9 @@
die("BUG: pack tmpfile does not end in .pack.temp?");
tmp_idx = xstrfmt("%.*s.idx.temp", (int)len, preq->tmpfile);
- ip_argv[0] = "index-pack";
- ip_argv[1] = "-o";
- ip_argv[2] = tmp_idx;
- ip_argv[3] = preq->tmpfile;
- ip_argv[4] = NULL;
-
- ip.argv = ip_argv;
+ argv_array_push(&ip.args, "index-pack");
+ argv_array_pushl(&ip.args, "-o", tmp_idx, NULL);
+ argv_array_push(&ip.args, preq->tmpfile);
ip.git_cmd = 1;
ip.no_stdin = 1;
ip.no_stdout = 1;
diff --git a/imap-send.c b/imap-send.c
index b2d0b84..36c7c1b 100644
--- a/imap-send.c
+++ b/imap-send.c
@@ -18,8 +18,7 @@
* 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cache.h"
@@ -35,11 +34,11 @@
#include "http.h"
#endif
-#if defined(USE_CURL_FOR_IMAP_SEND) && defined(NO_OPENSSL)
-/* only available option */
+#if defined(USE_CURL_FOR_IMAP_SEND)
+/* Always default to curl if it's available. */
#define USE_CURL_DEFAULT 1
#else
-/* strictly opt in */
+/* We don't have curl, so continue to use the historical implementation */
#define USE_CURL_DEFAULT 0
#endif
@@ -684,7 +683,7 @@
struct imap *imap = ctx->imap;
char *arg, *p;
- if (*s != '[')
+ if (!s || *s != '[')
return RESP_OK; /* no response code */
s++;
if (!(p = strchr(s, ']'))) {
@@ -693,6 +692,10 @@
}
*p++ = 0;
arg = next_arg(&s);
+ if (!arg) {
+ fprintf(stderr, "IMAP error: empty response code\n");
+ return RESP_BAD;
+ }
if (!strcmp("UIDVALIDITY", arg)) {
if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg))) {
fprintf(stderr, "IMAP error: malformed UIDVALIDITY status\n");
@@ -725,7 +728,8 @@
{
struct imap *imap = ctx->imap;
struct imap_cmd *cmdp, **pcmdp;
- char *cmd, *arg, *arg1;
+ char *cmd;
+ const char *arg, *arg1;
int n, resp, resp2, tag;
for (;;) {
@@ -733,6 +737,10 @@
return RESP_BAD;
arg = next_arg(&cmd);
+ if (!arg) {
+ fprintf(stderr, "IMAP error: empty response\n");
+ return RESP_BAD;
+ }
if (*arg == '*') {
arg = next_arg(&cmd);
if (!arg) {
@@ -807,6 +815,8 @@
if (cmdp->cb.cont || cmdp->cb.data)
imap->literal_pending = 0;
arg = next_arg(&cmd);
+ if (!arg)
+ arg = "";
if (!strcmp("OK", arg))
resp = DRV_OK;
else {
@@ -926,6 +936,25 @@
return 0;
}
+static void server_fill_credential(struct imap_server_conf *srvc, struct credential *cred)
+{
+ if (srvc->user && srvc->pass)
+ return;
+
+ cred->protocol = xstrdup(srvc->use_ssl ? "imaps" : "imap");
+ cred->host = xstrdup(srvc->host);
+
+ cred->username = xstrdup_or_null(srvc->user);
+ cred->password = xstrdup_or_null(srvc->pass);
+
+ credential_fill(cred);
+
+ if (!srvc->user)
+ srvc->user = xstrdup(cred->username);
+ if (!srvc->pass)
+ srvc->pass = xstrdup(cred->password);
+}
+
static struct imap_store *imap_open_store(struct imap_server_conf *srvc, char *folder)
{
struct credential cred = CREDENTIAL_INIT;
@@ -1078,20 +1107,7 @@
}
#endif
imap_info("Logging in...\n");
- if (!srvc->user || !srvc->pass) {
- cred.protocol = xstrdup(srvc->use_ssl ? "imaps" : "imap");
- cred.host = xstrdup(srvc->host);
-
- cred.username = xstrdup_or_null(srvc->user);
- cred.password = xstrdup_or_null(srvc->pass);
-
- credential_fill(&cred);
-
- if (!srvc->user)
- srvc->user = xstrdup(cred.username);
- if (!srvc->pass)
- srvc->pass = xstrdup(cred.password);
- }
+ server_fill_credential(srvc, &cred);
if (srvc->auth_method) {
struct imap_cmd_cb cb;
@@ -1392,10 +1408,11 @@
}
#ifdef USE_CURL_FOR_IMAP_SEND
-static CURL *setup_curl(struct imap_server_conf *srvc)
+static CURL *setup_curl(struct imap_server_conf *srvc, struct credential *cred)
{
CURL *curl;
struct strbuf path = STRBUF_INIT;
+ char *uri_encoded_folder;
if (curl_global_init(CURL_GLOBAL_ALL) != CURLE_OK)
die("curl_global_init failed");
@@ -1405,6 +1422,7 @@
if (!curl)
die("curl_easy_init failed");
+ server_fill_credential(&server, cred);
curl_easy_setopt(curl, CURLOPT_USERNAME, server.user);
curl_easy_setopt(curl, CURLOPT_PASSWORD, server.pass);
@@ -1412,7 +1430,12 @@
strbuf_addstr(&path, server.host);
if (!path.len || path.buf[path.len - 1] != '/')
strbuf_addch(&path, '/');
- strbuf_addstr(&path, server.folder);
+
+ uri_encoded_folder = curl_easy_escape(curl, server.folder, 0);
+ if (!uri_encoded_folder)
+ die("failed to encode server folder");
+ strbuf_addstr(&path, uri_encoded_folder);
+ curl_free(uri_encoded_folder);
curl_easy_setopt(curl, CURLOPT_URL, path.buf);
strbuf_release(&path);
@@ -1454,8 +1477,9 @@
struct buffer msgbuf = { STRBUF_INIT, 0 };
CURL *curl;
CURLcode res = CURLE_OK;
+ struct credential cred = CREDENTIAL_INIT;
- curl = setup_curl(server);
+ curl = setup_curl(server, &cred);
curl_easy_setopt(curl, CURLOPT_READDATA, &msgbuf);
fprintf(stderr, "sending %d message%s\n", total, (total != 1) ? "s" : "");
@@ -1490,7 +1514,20 @@
curl_easy_cleanup(curl);
curl_global_cleanup();
- return 0;
+ if (cred.username) {
+ if (res == CURLE_OK)
+ credential_approve(&cred);
+#if LIBCURL_VERSION_NUM >= 0x070d01
+ else if (res == CURLE_LOGIN_DENIED)
+#else
+ else
+#endif
+ credential_reject(&cred);
+ }
+
+ credential_clear(&cred);
+
+ return res != CURLE_OK;
}
#endif
diff --git a/kwset.c b/kwset.c
index e6236a0..4fb6455 100644
--- a/kwset.c
+++ b/kwset.c
@@ -18,9 +18,7 @@
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., 51 Franklin Street - Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Written August 1989 by Mike Haertel.
The author may be reached (Email) at the address mike@ai.mit.edu,
diff --git a/kwset.h b/kwset.h
index 61a134f..583f626 100644
--- a/kwset.h
+++ b/kwset.h
@@ -17,9 +17,7 @@
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., 51 Franklin Street - Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* Written August 1989 by Mike Haertel.
The author may be reached (Email) at the address mike@ai.mit.edu,
diff --git a/list-objects-filter-options.c b/list-objects-filter-options.c
new file mode 100644
index 0000000..4c5b34e
--- /dev/null
+++ b/list-objects-filter-options.c
@@ -0,0 +1,92 @@
+#include "cache.h"
+#include "commit.h"
+#include "config.h"
+#include "revision.h"
+#include "argv-array.h"
+#include "list-objects.h"
+#include "list-objects-filter.h"
+#include "list-objects-filter-options.h"
+
+/*
+ * 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. We also "intern" the arg for
+ * the convenience of the current command.
+ */
+int parse_list_objects_filter(struct list_objects_filter_options *filter_options,
+ const char *arg)
+{
+ const char *v0;
+
+ if (filter_options->choice)
+ die(_("multiple object filter types cannot be combined"));
+
+ filter_options->filter_spec = strdup(arg);
+
+ if (!strcmp(arg, "blob:none")) {
+ filter_options->choice = LOFC_BLOB_NONE;
+ return 0;
+ }
+
+ if (skip_prefix(arg, "blob:limit=", &v0)) {
+ if (!git_parse_ulong(v0, &filter_options->blob_limit_value))
+ die(_("invalid filter-spec expression '%s'"), arg);
+ filter_options->choice = LOFC_BLOB_LIMIT;
+ return 0;
+ }
+
+ if (skip_prefix(arg, "sparse:oid=", &v0)) {
+ struct object_context oc;
+ struct object_id sparse_oid;
+
+ /*
+ * Try to parse <oid-expression> into an OID for the current
+ * command, but DO NOT complain if we don't have the blob or
+ * ref locally.
+ */
+ if (!get_oid_with_context(v0, GET_OID_BLOB,
+ &sparse_oid, &oc))
+ filter_options->sparse_oid_value = oiddup(&sparse_oid);
+ filter_options->choice = LOFC_SPARSE_OID;
+ return 0;
+ }
+
+ if (skip_prefix(arg, "sparse:path=", &v0)) {
+ filter_options->choice = LOFC_SPARSE_PATH;
+ filter_options->sparse_path_value = strdup(v0);
+ return 0;
+ }
+
+ die(_("invalid filter-spec expression '%s'"), arg);
+ return 0;
+}
+
+int opt_parse_list_objects_filter(const struct option *opt,
+ const char *arg, int unset)
+{
+ struct list_objects_filter_options *filter_options = opt->value;
+
+ if (unset || !arg) {
+ list_objects_filter_release(filter_options);
+ return 0;
+ }
+
+ return parse_list_objects_filter(filter_options, arg);
+}
+
+void list_objects_filter_release(
+ struct list_objects_filter_options *filter_options)
+{
+ free(filter_options->filter_spec);
+ free(filter_options->sparse_oid_value);
+ free(filter_options->sparse_path_value);
+ memset(filter_options, 0, sizeof(*filter_options));
+}
diff --git a/list-objects-filter-options.h b/list-objects-filter-options.h
new file mode 100644
index 0000000..eea44a1
--- /dev/null
+++ b/list-objects-filter-options.h
@@ -0,0 +1,61 @@
+#ifndef LIST_OBJECTS_FILTER_OPTIONS_H
+#define LIST_OBJECTS_FILTER_OPTIONS_H
+
+#include "parse-options.h"
+
+/*
+ * The list of defined filters for list-objects.
+ */
+enum list_objects_filter_choice {
+ LOFC_DISABLED = 0,
+ LOFC_BLOB_NONE,
+ LOFC_BLOB_LIMIT,
+ LOFC_SPARSE_OID,
+ LOFC_SPARSE_PATH,
+ LOFC__COUNT /* must be last */
+};
+
+struct list_objects_filter_options {
+ /*
+ * 'filter_spec' is the raw argument value given on the command line
+ * or protocol request. (The part after the "--keyword=".) For
+ * commands that launch filtering sub-processes, this value should be
+ * passed to them as received by the current process.
+ */
+ char *filter_spec;
+
+ /*
+ * 'choice' is determined by parsing the filter-spec. This indicates
+ * the filtering algorithm to use.
+ */
+ enum list_objects_filter_choice choice;
+
+ /*
+ * Parsed values (fields) from within the filter-spec. These are
+ * choice-specific; not all values will be defined for any given
+ * choice.
+ */
+ struct object_id *sparse_oid_value;
+ char *sparse_path_value;
+ unsigned long blob_limit_value;
+};
+
+/* Normalized command line arguments */
+#define CL_ARG__FILTER "filter"
+
+int parse_list_objects_filter(
+ struct list_objects_filter_options *filter_options,
+ const char *arg);
+
+int opt_parse_list_objects_filter(const struct option *opt,
+ const char *arg, int unset);
+
+#define OPT_PARSE_LIST_OBJECTS_FILTER(fo) \
+ { OPTION_CALLBACK, 0, CL_ARG__FILTER, fo, N_("args"), \
+ N_("object filtering"), 0, \
+ opt_parse_list_objects_filter }
+
+void list_objects_filter_release(
+ struct list_objects_filter_options *filter_options);
+
+#endif /* LIST_OBJECTS_FILTER_OPTIONS_H */
diff --git a/list-objects-filter.c b/list-objects-filter.c
new file mode 100644
index 0000000..4356c45
--- /dev/null
+++ b/list-objects-filter.c
@@ -0,0 +1,401 @@
+#include "cache.h"
+#include "dir.h"
+#include "tag.h"
+#include "commit.h"
+#include "tree.h"
+#include "blob.h"
+#include "diff.h"
+#include "tree-walk.h"
+#include "revision.h"
+#include "list-objects.h"
+#include "list-objects-filter.h"
+#include "list-objects-filter-options.h"
+#include "oidset.h"
+
+/* Remember to update object flag allocation in object.h */
+/*
+ * FILTER_SHOWN_BUT_REVISIT -- we set this bit on tree objects
+ * that have been shown, but should be revisited if they appear
+ * in the traversal (until we mark it SEEN). This is a way to
+ * let us silently de-dup calls to show() in the caller. This
+ * is subtly different from the "revision.h:SHOWN" and the
+ * "sha1_name.c:ONELINE_SEEN" bits. And also different from
+ * the non-de-dup usage in pack-bitmap.c
+ */
+#define FILTER_SHOWN_BUT_REVISIT (1<<21)
+
+/*
+ * A filter for list-objects to omit ALL blobs from the traversal.
+ * And to OPTIONALLY collect a list of the omitted OIDs.
+ */
+struct filter_blobs_none_data {
+ struct oidset *omits;
+};
+
+static enum list_objects_filter_result filter_blobs_none(
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ void *filter_data_)
+{
+ struct filter_blobs_none_data *filter_data = filter_data_;
+
+ switch (filter_situation) {
+ default:
+ die("unknown filter_situation");
+ return LOFR_ZERO;
+
+ case LOFS_BEGIN_TREE:
+ assert(obj->type == OBJ_TREE);
+ /* always include all tree objects */
+ return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+ case LOFS_END_TREE:
+ assert(obj->type == OBJ_TREE);
+ return LOFR_ZERO;
+
+ case LOFS_BLOB:
+ assert(obj->type == OBJ_BLOB);
+ assert((obj->flags & SEEN) == 0);
+
+ if (filter_data->omits)
+ oidset_insert(filter_data->omits, &obj->oid);
+ return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
+ }
+}
+
+static void *filter_blobs_none__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn)
+{
+ struct filter_blobs_none_data *d = xcalloc(1, sizeof(*d));
+ d->omits = omitted;
+
+ *filter_fn = filter_blobs_none;
+ *filter_free_fn = free;
+ return d;
+}
+
+/*
+ * A filter for list-objects to omit large blobs.
+ * And to OPTIONALLY collect a list of the omitted OIDs.
+ */
+struct filter_blobs_limit_data {
+ struct oidset *omits;
+ unsigned long max_bytes;
+};
+
+static enum list_objects_filter_result filter_blobs_limit(
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ void *filter_data_)
+{
+ struct filter_blobs_limit_data *filter_data = filter_data_;
+ unsigned long object_length;
+ enum object_type t;
+
+ switch (filter_situation) {
+ default:
+ die("unknown filter_situation");
+ return LOFR_ZERO;
+
+ case LOFS_BEGIN_TREE:
+ assert(obj->type == OBJ_TREE);
+ /* always include all tree objects */
+ return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+
+ case LOFS_END_TREE:
+ assert(obj->type == OBJ_TREE);
+ return LOFR_ZERO;
+
+ case LOFS_BLOB:
+ assert(obj->type == OBJ_BLOB);
+ assert((obj->flags & SEEN) == 0);
+
+ t = sha1_object_info(obj->oid.hash, &object_length);
+ if (t != OBJ_BLOB) { /* probably OBJ_NONE */
+ /*
+ * We DO NOT have the blob locally, so we cannot
+ * apply the size filter criteria. Be conservative
+ * and force show it (and let the caller deal with
+ * the ambiguity).
+ */
+ goto include_it;
+ }
+
+ if (object_length < filter_data->max_bytes)
+ goto include_it;
+
+ if (filter_data->omits)
+ oidset_insert(filter_data->omits, &obj->oid);
+ return LOFR_MARK_SEEN; /* but not LOFR_DO_SHOW (hard omit) */
+ }
+
+include_it:
+ if (filter_data->omits)
+ oidset_remove(filter_data->omits, &obj->oid);
+ return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+}
+
+static void *filter_blobs_limit__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn)
+{
+ struct filter_blobs_limit_data *d = xcalloc(1, sizeof(*d));
+ d->omits = omitted;
+ d->max_bytes = filter_options->blob_limit_value;
+
+ *filter_fn = filter_blobs_limit;
+ *filter_free_fn = free;
+ return d;
+}
+
+/*
+ * A filter driven by a sparse-checkout specification to only
+ * include blobs that a sparse checkout would populate.
+ *
+ * The sparse-checkout spec can be loaded from a blob with the
+ * given OID or from a local pathname. We allow an OID because
+ * the repo may be bare or we may be doing the filtering on the
+ * server.
+ */
+struct frame {
+ /*
+ * defval is the usual default include/exclude value that
+ * should be inherited as we recurse into directories based
+ * upon pattern matching of the directory itself or of a
+ * containing directory.
+ */
+ int defval;
+
+ /*
+ * 1 if the directory (recursively) contains any provisionally
+ * omitted objects.
+ *
+ * 0 if everything (recursively) contained in this directory
+ * has been explicitly included (SHOWN) in the result and
+ * the directory may be short-cut later in the traversal.
+ */
+ unsigned child_prov_omit : 1;
+};
+
+struct filter_sparse_data {
+ struct oidset *omits;
+ struct exclude_list el;
+
+ size_t nr, alloc;
+ struct frame *array_frame;
+};
+
+static enum list_objects_filter_result filter_sparse(
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ void *filter_data_)
+{
+ struct filter_sparse_data *filter_data = filter_data_;
+ int val, dtype;
+ struct frame *frame;
+
+ switch (filter_situation) {
+ default:
+ die("unknown filter_situation");
+ return LOFR_ZERO;
+
+ case LOFS_BEGIN_TREE:
+ assert(obj->type == OBJ_TREE);
+ dtype = DT_DIR;
+ val = is_excluded_from_list(pathname, strlen(pathname),
+ filename, &dtype, &filter_data->el,
+ &the_index);
+ if (val < 0)
+ val = filter_data->array_frame[filter_data->nr].defval;
+
+ ALLOC_GROW(filter_data->array_frame, filter_data->nr + 1,
+ filter_data->alloc);
+ filter_data->nr++;
+ filter_data->array_frame[filter_data->nr].defval = val;
+ filter_data->array_frame[filter_data->nr].child_prov_omit = 0;
+
+ /*
+ * A directory with this tree OID may appear in multiple
+ * places in the tree. (Think of a directory move or copy,
+ * with no other changes, so the OID is the same, but the
+ * full pathnames of objects within this directory are new
+ * and may match is_excluded() patterns differently.)
+ * So we cannot mark this directory as SEEN (yet), since
+ * that will prevent process_tree() from revisiting this
+ * tree object with other pathname prefixes.
+ *
+ * Only _DO_SHOW the tree object the first time we visit
+ * this tree object.
+ *
+ * We always show all tree objects. A future optimization
+ * may want to attempt to narrow this.
+ */
+ if (obj->flags & FILTER_SHOWN_BUT_REVISIT)
+ return LOFR_ZERO;
+ obj->flags |= FILTER_SHOWN_BUT_REVISIT;
+ return LOFR_DO_SHOW;
+
+ case LOFS_END_TREE:
+ assert(obj->type == OBJ_TREE);
+ assert(filter_data->nr > 0);
+
+ frame = &filter_data->array_frame[filter_data->nr];
+ filter_data->nr--;
+
+ /*
+ * Tell our parent directory if any of our children were
+ * provisionally omitted.
+ */
+ filter_data->array_frame[filter_data->nr].child_prov_omit |=
+ frame->child_prov_omit;
+
+ /*
+ * If there are NO provisionally omitted child objects (ALL child
+ * objects in this folder were INCLUDED), then we can mark the
+ * folder as SEEN (so we will not have to revisit it again).
+ */
+ if (!frame->child_prov_omit)
+ return LOFR_MARK_SEEN;
+ return LOFR_ZERO;
+
+ case LOFS_BLOB:
+ assert(obj->type == OBJ_BLOB);
+ assert((obj->flags & SEEN) == 0);
+
+ frame = &filter_data->array_frame[filter_data->nr];
+
+ dtype = DT_REG;
+ val = is_excluded_from_list(pathname, strlen(pathname),
+ filename, &dtype, &filter_data->el,
+ &the_index);
+ if (val < 0)
+ val = frame->defval;
+ if (val > 0) {
+ if (filter_data->omits)
+ oidset_remove(filter_data->omits, &obj->oid);
+ return LOFR_MARK_SEEN | LOFR_DO_SHOW;
+ }
+
+ /*
+ * Provisionally omit it. We've already established that
+ * this pathname is not in the sparse-checkout specification
+ * with the CURRENT pathname, so we *WANT* to omit this blob.
+ *
+ * However, a pathname elsewhere in the tree may also
+ * reference this same blob, so we cannot reject it yet.
+ * Leave the LOFR_ bits unset so that if the blob appears
+ * again in the traversal, we will be asked again.
+ */
+ if (filter_data->omits)
+ oidset_insert(filter_data->omits, &obj->oid);
+
+ /*
+ * Remember that at least 1 blob in this tree was
+ * provisionally omitted. This prevents us from short
+ * cutting the tree in future iterations.
+ */
+ frame->child_prov_omit = 1;
+ return LOFR_ZERO;
+ }
+}
+
+
+static void filter_sparse_free(void *filter_data)
+{
+ struct filter_sparse_data *d = filter_data;
+ /* TODO free contents of 'd' */
+ free(d);
+}
+
+static void *filter_sparse_oid__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn)
+{
+ struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
+ d->omits = omitted;
+ if (add_excludes_from_blob_to_list(filter_options->sparse_oid_value,
+ NULL, 0, &d->el) < 0)
+ die("could not load filter specification");
+
+ ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
+ d->array_frame[d->nr].defval = 0; /* default to include */
+ d->array_frame[d->nr].child_prov_omit = 0;
+
+ *filter_fn = filter_sparse;
+ *filter_free_fn = filter_sparse_free;
+ return d;
+}
+
+static void *filter_sparse_path__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn)
+{
+ struct filter_sparse_data *d = xcalloc(1, sizeof(*d));
+ d->omits = omitted;
+ if (add_excludes_from_file_to_list(filter_options->sparse_path_value,
+ NULL, 0, &d->el, NULL) < 0)
+ die("could not load filter specification");
+
+ ALLOC_GROW(d->array_frame, d->nr + 1, d->alloc);
+ d->array_frame[d->nr].defval = 0; /* default to include */
+ d->array_frame[d->nr].child_prov_omit = 0;
+
+ *filter_fn = filter_sparse;
+ *filter_free_fn = filter_sparse_free;
+ return d;
+}
+
+typedef void *(*filter_init_fn)(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn);
+
+/*
+ * Must match "enum list_objects_filter_choice".
+ */
+static filter_init_fn s_filters[] = {
+ NULL,
+ filter_blobs_none__init,
+ filter_blobs_limit__init,
+ filter_sparse_oid__init,
+ filter_sparse_path__init,
+};
+
+void *list_objects_filter__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn)
+{
+ filter_init_fn init_fn;
+
+ assert((sizeof(s_filters) / sizeof(s_filters[0])) == LOFC__COUNT);
+
+ if (filter_options->choice >= LOFC__COUNT)
+ die("invalid list-objects filter choice: %d",
+ filter_options->choice);
+
+ init_fn = s_filters[filter_options->choice];
+ if (init_fn)
+ return init_fn(omitted, filter_options,
+ filter_fn, filter_free_fn);
+ *filter_fn = NULL;
+ *filter_free_fn = NULL;
+ return NULL;
+}
diff --git a/list-objects-filter.h b/list-objects-filter.h
new file mode 100644
index 0000000..a963d02
--- /dev/null
+++ b/list-objects-filter.h
@@ -0,0 +1,77 @@
+#ifndef LIST_OBJECTS_FILTER_H
+#define LIST_OBJECTS_FILTER_H
+
+/*
+ * During list-object traversal we allow certain objects to be
+ * filtered (omitted) from the result. The active filter uses
+ * these result values to guide list-objects.
+ *
+ * _ZERO : Do nothing with the object at this time. It may
+ * be revisited if it appears in another place in
+ * the tree or in another commit during the overall
+ * traversal.
+ *
+ * _MARK_SEEN : Mark this object as "SEEN" in the object flags.
+ * This will prevent it from being revisited during
+ * the remainder of the traversal. This DOES NOT
+ * imply that it will be included in the results.
+ *
+ * _DO_SHOW : Show this object in the results (call show() on it).
+ * In general, objects should only be shown once, but
+ * this result DOES NOT imply that we mark it SEEN.
+ *
+ * Most of the time, you want the combination (_MARK_SEEN | _DO_SHOW)
+ * but they can be used independently, such as when sparse-checkout
+ * pattern matching is being applied.
+ *
+ * A _MARK_SEEN without _DO_SHOW can be called a hard-omit -- the
+ * object is not shown and will never be reconsidered (unless a
+ * previous iteration has already shown it).
+ *
+ * A _DO_SHOW without _MARK_SEEN can be used, for example, to
+ * include a directory, but then revisit it to selectively include
+ * or omit objects within it.
+ *
+ * A _ZERO can be called a provisional-omit -- the object is NOT shown,
+ * but *may* be revisited (if the object appears again in the traversal).
+ * Therefore, it will be omitted from the results *unless* a later
+ * iteration causes it to be shown.
+ */
+enum list_objects_filter_result {
+ LOFR_ZERO = 0,
+ LOFR_MARK_SEEN = 1<<0,
+ LOFR_DO_SHOW = 1<<1,
+};
+
+enum list_objects_filter_situation {
+ LOFS_BEGIN_TREE,
+ LOFS_END_TREE,
+ LOFS_BLOB
+};
+
+typedef enum list_objects_filter_result (*filter_object_fn)(
+ enum list_objects_filter_situation filter_situation,
+ struct object *obj,
+ const char *pathname,
+ const char *filename,
+ void *filter_data);
+
+typedef void (*filter_free_fn)(void *filter_data);
+
+/*
+ * Constructor for the set of defined list-objects filters.
+ * Returns a generic "void *filter_data".
+ *
+ * The returned "filter_fn" will be used by traverse_commit_list()
+ * to filter the results.
+ *
+ * The returned "filter_free_fn" is a destructor for the
+ * filter_data.
+ */
+void *list_objects_filter__init(
+ struct oidset *omitted,
+ struct list_objects_filter_options *filter_options,
+ filter_object_fn *filter_fn,
+ filter_free_fn *filter_free_fn);
+
+#endif /* LIST_OBJECTS_FILTER_H */
diff --git a/list-objects.c b/list-objects.c
index b3931fa..0966cdc 100644
--- a/list-objects.c
+++ b/list-objects.c
@@ -7,16 +7,21 @@
#include "tree-walk.h"
#include "revision.h"
#include "list-objects.h"
+#include "list-objects-filter.h"
+#include "list-objects-filter-options.h"
static void process_blob(struct rev_info *revs,
struct blob *blob,
show_object_fn show,
struct strbuf *path,
const char *name,
- void *cb_data)
+ void *cb_data,
+ filter_object_fn filter_fn,
+ void *filter_data)
{
struct object *obj = &blob->object;
size_t pathlen;
+ enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
if (!revs->blob_objects)
return;
@@ -24,11 +29,17 @@
die("bad blob object");
if (obj->flags & (UNINTERESTING | SEEN))
return;
- obj->flags |= SEEN;
pathlen = path->len;
strbuf_addstr(path, name);
- show(obj, path->buf, cb_data);
+ if (filter_fn)
+ r = filter_fn(LOFS_BLOB, obj,
+ path->buf, &path->buf[pathlen],
+ filter_data);
+ if (r & LOFR_MARK_SEEN)
+ obj->flags |= SEEN;
+ if (r & LOFR_DO_SHOW)
+ show(obj, path->buf, cb_data);
strbuf_setlen(path, pathlen);
}
@@ -69,7 +80,9 @@
show_object_fn show,
struct strbuf *base,
const char *name,
- void *cb_data)
+ void *cb_data,
+ filter_object_fn filter_fn,
+ void *filter_data)
{
struct object *obj = &tree->object;
struct tree_desc desc;
@@ -77,6 +90,7 @@
enum interesting match = revs->diffopt.pathspec.nr == 0 ?
all_entries_interesting: entry_not_interesting;
int baselen = base->len;
+ enum list_objects_filter_result r = LOFR_MARK_SEEN | LOFR_DO_SHOW;
if (!revs->tree_objects)
return;
@@ -90,9 +104,15 @@
die("bad tree object %s", oid_to_hex(&obj->oid));
}
- obj->flags |= SEEN;
strbuf_addstr(base, name);
- show(obj, base->buf, cb_data);
+ if (filter_fn)
+ r = filter_fn(LOFS_BEGIN_TREE, obj,
+ base->buf, &base->buf[baselen],
+ filter_data);
+ if (r & LOFR_MARK_SEEN)
+ obj->flags |= SEEN;
+ if (r & LOFR_DO_SHOW)
+ show(obj, base->buf, cb_data);
if (base->len)
strbuf_addch(base, '/');
@@ -112,7 +132,7 @@
process_tree(revs,
lookup_tree(entry.oid),
show, base, entry.path,
- cb_data);
+ cb_data, filter_fn, filter_data);
else if (S_ISGITLINK(entry.mode))
process_gitlink(revs, entry.oid->hash,
show, base, entry.path,
@@ -121,8 +141,19 @@
process_blob(revs,
lookup_blob(entry.oid),
show, base, entry.path,
- cb_data);
+ cb_data, filter_fn, filter_data);
}
+
+ if (filter_fn) {
+ r = filter_fn(LOFS_END_TREE, obj,
+ base->buf, &base->buf[baselen],
+ filter_data);
+ if (r & LOFR_MARK_SEEN)
+ obj->flags |= SEEN;
+ if (r & LOFR_DO_SHOW)
+ show(obj, base->buf, cb_data);
+ }
+
strbuf_setlen(base, baselen);
free_tree_buffer(tree);
}
@@ -183,25 +214,17 @@
add_pending_object(revs, &tree->object, "");
}
-void traverse_commit_list(struct rev_info *revs,
- show_commit_fn show_commit,
- show_object_fn show_object,
- void *data)
+static void traverse_trees_and_blobs(struct rev_info *revs,
+ struct strbuf *base,
+ show_object_fn show_object,
+ void *show_data,
+ filter_object_fn filter_fn,
+ void *filter_data)
{
int i;
- struct commit *commit;
- struct strbuf base;
- strbuf_init(&base, PATH_MAX);
- while ((commit = get_revision(revs)) != NULL) {
- /*
- * an uninteresting boundary commit may not have its tree
- * parsed yet, but we are not going to show them anyway
- */
- if (commit->tree)
- add_pending_tree(revs, commit->tree);
- show_commit(commit, data);
- }
+ assert(base->len == 0);
+
for (i = 0; i < revs->pending.nr; i++) {
struct object_array_entry *pending = revs->pending.objects + i;
struct object *obj = pending->item;
@@ -211,24 +234,89 @@
continue;
if (obj->type == OBJ_TAG) {
obj->flags |= SEEN;
- show_object(obj, name, data);
+ show_object(obj, name, show_data);
continue;
}
if (!path)
path = "";
if (obj->type == OBJ_TREE) {
process_tree(revs, (struct tree *)obj, show_object,
- &base, path, data);
+ base, path, show_data,
+ filter_fn, filter_data);
continue;
}
if (obj->type == OBJ_BLOB) {
process_blob(revs, (struct blob *)obj, show_object,
- &base, path, data);
+ base, path, show_data,
+ filter_fn, filter_data);
continue;
}
die("unknown pending object %s (%s)",
oid_to_hex(&obj->oid), name);
}
object_array_clear(&revs->pending);
- strbuf_release(&base);
+}
+
+static void do_traverse(struct rev_info *revs,
+ show_commit_fn show_commit,
+ show_object_fn show_object,
+ void *show_data,
+ filter_object_fn filter_fn,
+ void *filter_data)
+{
+ struct commit *commit;
+ struct strbuf csp; /* callee's scratch pad */
+ strbuf_init(&csp, PATH_MAX);
+
+ while ((commit = get_revision(revs)) != NULL) {
+ /*
+ * an uninteresting boundary commit may not have its tree
+ * parsed yet, but we are not going to show them anyway
+ */
+ if (commit->tree)
+ add_pending_tree(revs, commit->tree);
+ show_commit(commit, show_data);
+
+ if (revs->tree_blobs_in_commit_order)
+ /*
+ * NEEDSWORK: Adding the tree and then flushing it here
+ * needs a reallocation for each commit. Can we pass the
+ * tree directory without allocation churn?
+ */
+ traverse_trees_and_blobs(revs, &csp,
+ show_object, show_data,
+ filter_fn, filter_data);
+ }
+ traverse_trees_and_blobs(revs, &csp,
+ show_object, show_data,
+ filter_fn, filter_data);
+ strbuf_release(&csp);
+}
+
+void traverse_commit_list(struct rev_info *revs,
+ show_commit_fn show_commit,
+ show_object_fn show_object,
+ void *show_data)
+{
+ do_traverse(revs, show_commit, show_object, show_data, NULL, NULL);
+}
+
+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)
+{
+ filter_object_fn filter_fn = NULL;
+ filter_free_fn filter_free_fn = NULL;
+ void *filter_data = NULL;
+
+ filter_data = list_objects_filter__init(omitted, filter_options,
+ &filter_fn, &filter_free_fn);
+ do_traverse(revs, show_commit, show_object, show_data,
+ filter_fn, filter_data);
+ if (filter_data && filter_free_fn)
+ filter_free_fn(filter_data);
}
diff --git a/list-objects.h b/list-objects.h
index 0cebf85..aa618d7 100644
--- a/list-objects.h
+++ b/list-objects.h
@@ -8,4 +8,15 @@
typedef void (*show_edge_fn)(struct commit *);
void mark_edges_uninteresting(struct rev_info *, show_edge_fn);
-#endif
+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);
+
+#endif /* LIST_OBJECTS_H */
diff --git a/list.h b/list.h
index a226a87..eb60119 100644
--- a/list.h
+++ b/list.h
@@ -163,4 +163,42 @@
INIT_LIST_HEAD(old);
}
+/*
+ * This is exactly the same as a normal list_head, except that it can be
+ * declared volatile (e.g., if you have a list that may be accessed from signal
+ * handlers).
+ */
+struct volatile_list_head {
+ volatile struct volatile_list_head *next, *prev;
+};
+
+#define VOLATILE_LIST_HEAD(name) \
+ volatile struct volatile_list_head name = { &(name), &(name) }
+
+static inline void __volatile_list_del(volatile struct volatile_list_head *prev,
+ volatile struct volatile_list_head *next)
+{
+ next->prev = prev;
+ prev->next = next;
+}
+
+static inline void volatile_list_del(volatile struct volatile_list_head *elem)
+{
+ __volatile_list_del(elem->prev, elem->next);
+}
+
+static inline int volatile_list_empty(volatile struct volatile_list_head *head)
+{
+ return head == head->next;
+}
+
+static inline void volatile_list_add(volatile struct volatile_list_head *newp,
+ volatile struct volatile_list_head *head)
+{
+ head->next->prev = newp;
+ newp->next = head->next;
+ newp->prev = head;
+ head->next = newp;
+}
+
#endif /* LIST_H */
diff --git a/lockfile.c b/lockfile.c
index aa69210..efcb7d7 100644
--- a/lockfile.c
+++ b/lockfile.c
@@ -72,7 +72,6 @@
/* Make sure errno contains a meaningful value on error */
static int lock_file(struct lock_file *lk, const char *path, int flags)
{
- int fd;
struct strbuf filename = STRBUF_INIT;
strbuf_addstr(&filename, path);
@@ -80,9 +79,9 @@
resolve_symlink(&filename);
strbuf_addstr(&filename, LOCK_SUFFIX);
- fd = create_tempfile(&lk->tempfile, filename.buf);
+ lk->tempfile = create_tempfile(filename.buf);
strbuf_release(&filename);
- return fd;
+ return lk->tempfile ? lk->tempfile->fd : -1;
}
/*
@@ -191,7 +190,7 @@
{
struct strbuf ret = STRBUF_INIT;
- strbuf_addstr(&ret, get_tempfile_path(&lk->tempfile));
+ strbuf_addstr(&ret, get_tempfile_path(lk->tempfile));
if (ret.len <= LOCK_SUFFIX_LEN ||
strcmp(ret.buf + ret.len - LOCK_SUFFIX_LEN, LOCK_SUFFIX))
die("BUG: get_locked_file_path() called for malformed lock object");
diff --git a/lockfile.h b/lockfile.h
index 5720649..f401c97 100644
--- a/lockfile.h
+++ b/lockfile.h
@@ -37,12 +37,12 @@
*
* The caller:
*
- * * Allocates a `struct lock_file` either as a static variable or on
- * the heap, initialized to zeros. Once you use the structure to
- * call the `hold_lock_file_for_*()` family of functions, it belongs
- * to the lockfile subsystem and its storage must remain valid
- * throughout the life of the program (i.e. you cannot use an
- * on-stack variable to hold this structure).
+ * * Allocates a `struct lock_file` with whatever storage duration you
+ * desire. The struct does not have to be initialized before being
+ * used, but it is good practice to do so using by setting it to
+ * all-zeros (or using the LOCK_INIT macro). This puts the object in a
+ * consistent state that allows you to call rollback_lock_file() even
+ * if the lock was never taken (in which case it is a noop).
*
* * Attempts to create a lockfile by calling `hold_lock_file_for_update()`.
*
@@ -69,14 +69,12 @@
* `rollback_lock_file()`.
*
* * Close the file descriptor without removing or renaming the
- * lockfile by calling `close_lock_file()`, and later call
+ * lockfile by calling `close_lock_file_gently()`, and later call
* `commit_lock_file()`, `commit_lock_file_to()`,
* `rollback_lock_file()`, or `reopen_lock_file()`.
*
- * Even after the lockfile is committed or rolled back, the
- * `lock_file` object must not be freed or altered by the caller.
- * However, it may be reused; just pass it to another call of
- * `hold_lock_file_for_update()`.
+ * After the lockfile is committed or rolled back, the `lock_file`
+ * object can be discarded or reused.
*
* If the program exits before `commit_lock_file()`,
* `commit_lock_file_to()`, or `rollback_lock_file()` is called, the
@@ -85,7 +83,7 @@
*
* If you need to close the file descriptor you obtained from a
* `hold_lock_file_for_*()` function yourself, do so by calling
- * `close_lock_file()`. See "tempfile.h" for more information.
+ * `close_lock_file_gently()`. See "tempfile.h" for more information.
*
*
* Under the covers, a lockfile is just a tempfile with a few helper
@@ -104,16 +102,18 @@
*
* Similarly, `commit_lock_file`, `commit_lock_file_to`, and
* `close_lock_file` return 0 on success. On failure they set `errno`
- * appropriately, do their best to roll back the lockfile, and return
- * -1.
+ * appropriately and return -1. The `commit` variants (but not `close`)
+ * do their best to delete the temporary file before returning.
*/
#include "tempfile.h"
struct lock_file {
- struct tempfile tempfile;
+ struct tempfile *tempfile;
};
+#define LOCK_INIT { NULL }
+
/* String appended to a filename to derive the lockfile name: */
#define LOCK_SUFFIX ".lock"
#define LOCK_SUFFIX_LEN 5
@@ -180,7 +180,7 @@
*/
static inline int is_lock_file_locked(struct lock_file *lk)
{
- return is_tempfile_active(&lk->tempfile);
+ return is_tempfile_active(lk->tempfile);
}
/*
@@ -202,12 +202,13 @@
/*
* Associate a stdio stream with the lockfile (which must still be
* open). Return `NULL` (*without* rolling back the lockfile) on
- * error. The stream is closed automatically when `close_lock_file()`
- * is called or when the file is committed or rolled back.
+ * error. The stream is closed automatically when
+ * `close_lock_file_gently()` is called or when the file is committed or
+ * rolled back.
*/
static inline FILE *fdopen_lock_file(struct lock_file *lk, const char *mode)
{
- return fdopen_tempfile(&lk->tempfile, mode);
+ return fdopen_tempfile(lk->tempfile, mode);
}
/*
@@ -216,17 +217,17 @@
*/
static inline const char *get_lock_file_path(struct lock_file *lk)
{
- return get_tempfile_path(&lk->tempfile);
+ return get_tempfile_path(lk->tempfile);
}
static inline int get_lock_file_fd(struct lock_file *lk)
{
- return get_tempfile_fd(&lk->tempfile);
+ return get_tempfile_fd(lk->tempfile);
}
static inline FILE *get_lock_file_fp(struct lock_file *lk)
{
- return get_tempfile_fp(&lk->tempfile);
+ return get_tempfile_fp(lk->tempfile);
}
/*
@@ -239,24 +240,23 @@
* If the lockfile is still open, close it (and the file pointer if it
* has been opened using `fdopen_lock_file()`) without renaming the
* lockfile over the file being locked. Return 0 upon success. On
- * failure to `close(2)`, return a negative value and roll back the
- * lock file. Usually `commit_lock_file()`, `commit_lock_file_to()`,
- * or `rollback_lock_file()` should eventually be called if
- * `close_lock_file()` succeeds.
+ * failure to `close(2)`, return a negative value (the lockfile is not
+ * rolled back). Usually `commit_lock_file()`, `commit_lock_file_to()`,
+ * or `rollback_lock_file()` should eventually be called.
*/
-static inline int close_lock_file(struct lock_file *lk)
+static inline int close_lock_file_gently(struct lock_file *lk)
{
- return close_tempfile(&lk->tempfile);
+ return close_tempfile_gently(lk->tempfile);
}
/*
- * Re-open a lockfile that has been closed using `close_lock_file()`
+ * Re-open a lockfile that has been closed using `close_lock_file_gently()`
* but not yet committed or rolled back. This can be used to implement
* a sequence of operations like the following:
*
* * Lock file.
*
- * * Write new contents to lockfile, then `close_lock_file()` to
+ * * Write new contents to lockfile, then `close_lock_file_gently()` to
* cause the contents to be written to disk.
*
* * Pass the name of the lockfile to another program to allow it (and
@@ -270,7 +270,7 @@
*/
static inline int reopen_lock_file(struct lock_file *lk)
{
- return reopen_tempfile(&lk->tempfile);
+ return reopen_tempfile(lk->tempfile);
}
/*
diff --git a/log-tree.c b/log-tree.c
index 410ab4f..fca29d4 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -94,8 +94,12 @@
{
struct object *obj;
enum decoration_type type = DECORATION_NONE;
+ struct decoration_filter *filter = (struct decoration_filter *)cb_data;
- assert(cb_data == NULL);
+ if (filter && !ref_filter_match(refname,
+ filter->include_ref_pattern,
+ filter->exclude_ref_pattern))
+ return 0;
if (starts_with(refname, git_replace_ref_base)) {
struct object_id original_oid;
@@ -148,15 +152,23 @@
return 0;
}
-void load_ref_decorations(int flags)
+void load_ref_decorations(struct decoration_filter *filter, int flags)
{
if (!decoration_loaded) {
-
+ if (filter) {
+ struct string_list_item *item;
+ for_each_string_list_item(item, filter->exclude_ref_pattern) {
+ normalize_glob_ref(item, NULL, item->string);
+ }
+ for_each_string_list_item(item, filter->include_ref_pattern) {
+ normalize_glob_ref(item, NULL, item->string);
+ }
+ }
decoration_loaded = 1;
decoration_flags = flags;
- for_each_ref(add_ref_decoration, NULL);
- head_ref(add_ref_decoration, NULL);
- for_each_commit_graft(add_graft_decoration, NULL);
+ for_each_ref(add_ref_decoration, filter);
+ head_ref(add_ref_decoration, filter);
+ for_each_commit_graft(add_graft_decoration, filter);
}
}
@@ -185,7 +197,6 @@
{
const struct name_decoration *list, *head = NULL;
const char *branch_name = NULL;
- struct object_id unused;
int rru_flags;
/* First find HEAD */
@@ -198,8 +209,8 @@
return NULL;
/* Now resolve and find the matching current branch */
- branch_name = resolve_ref_unsafe("HEAD", 0, unused.hash, &rru_flags);
- if (!(rru_flags & REF_ISSYMREF))
+ branch_name = resolve_ref_unsafe("HEAD", 0, NULL, &rru_flags);
+ if (!branch_name || !(rru_flags & REF_ISSYMREF))
return NULL;
if (!starts_with(branch_name, "refs/"))
@@ -794,7 +805,7 @@
struct commit_list *parents;
struct object_id *oid;
- if (!opt->diff && !DIFF_OPT_TST(&opt->diffopt, EXIT_WITH_STATUS))
+ if (!opt->diff && !opt->diffopt.flags.exit_with_status)
return 0;
parse_commit_or_die(commit);
diff --git a/log-tree.h b/log-tree.h
index 48f11fb..deba035 100644
--- a/log-tree.h
+++ b/log-tree.h
@@ -7,6 +7,10 @@
struct commit *commit, *parent;
};
+struct decoration_filter {
+ struct string_list *include_ref_pattern, *exclude_ref_pattern;
+};
+
int parse_decorate_color_config(const char *var, const char *slot_name, const char *value);
void init_log_tree_opt(struct rev_info *);
int log_tree_diff_flush(struct rev_info *);
@@ -24,7 +28,7 @@
void log_write_email_headers(struct rev_info *opt, struct commit *commit,
const char **extra_headers_p,
int *need_8bit_cte_p);
-void load_ref_decorations(int flags);
+void load_ref_decorations(struct decoration_filter *filter, int flags);
#define FORMAT_PATCH_NAME_MAX 64
void fmt_output_commit(struct strbuf *, struct commit *, struct rev_info *);
diff --git a/mailinfo.c b/mailinfo.c
index 70187e3..d04142c 100644
--- a/mailinfo.c
+++ b/mailinfo.c
@@ -149,16 +149,14 @@
at = strchr(f.buf, '@');
if (!at) {
parse_bogus_from(mi, from);
- return;
+ goto out;
}
/*
* If we already have one email, don't take any confusing lines
*/
- if (mi->email.len && strchr(at + 1, '@')) {
- strbuf_release(&f);
- return;
- }
+ if (mi->email.len && strchr(at + 1, '@'))
+ goto out;
/* Pick up the string around '@', possibly delimited with <>
* pair; that is the email part.
@@ -198,6 +196,7 @@
}
get_sane_name(&mi->name, &f, &mi->email);
+out:
strbuf_release(&f);
}
@@ -828,6 +827,7 @@
if (!handle_commit_msg(mi, line))
break;
mi->filter_stage++;
+ /* fallthrough */
case 1:
handle_patch(mi, line);
break;
@@ -934,6 +934,7 @@
error("Detected mismatched boundaries, can't recover");
mi->input_error = -1;
mi->content_top = mi->content;
+ strbuf_release(&newline);
return 0;
}
handle_filter(mi, &newline);
@@ -1166,11 +1167,13 @@
strbuf_release(&mi->inbody_header_accum);
free(mi->message_id);
- for (i = 0; mi->p_hdr_data[i]; i++)
- strbuf_release(mi->p_hdr_data[i]);
+ if (mi->p_hdr_data)
+ for (i = 0; mi->p_hdr_data[i]; i++)
+ strbuf_release(mi->p_hdr_data[i]);
free(mi->p_hdr_data);
- for (i = 0; mi->s_hdr_data[i]; i++)
- strbuf_release(mi->s_hdr_data[i]);
+ if (mi->s_hdr_data)
+ for (i = 0; mi->s_hdr_data[i]; i++)
+ strbuf_release(mi->s_hdr_data[i]);
free(mi->s_hdr_data);
while (mi->content < mi->content_top) {
diff --git a/mailmap.c b/mailmap.c
index c1a79c1..cb921b4 100644
--- a/mailmap.c
+++ b/mailmap.c
@@ -214,17 +214,17 @@
const char *name,
char **repo_abbrev)
{
- unsigned char sha1[20];
+ struct object_id oid;
char *buf;
unsigned long size;
enum object_type type;
if (!name)
return 0;
- if (get_sha1(name, sha1) < 0)
+ if (get_oid(name, &oid) < 0)
return 0;
- buf = read_sha1_file(sha1, &type, &size);
+ buf = read_sha1_file(oid.hash, &type, &size);
if (!buf)
return error("unable to read mailmap object at %s", name);
if (type != OBJ_BLOB)
diff --git a/merge-recursive.c b/merge-recursive.c
index 1494ffd..cc5fa0a 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -24,6 +24,31 @@
#include "dir.h"
#include "submodule.h"
+struct path_hashmap_entry {
+ struct hashmap_entry e;
+ char path[FLEX_ARRAY];
+};
+
+static int path_hashmap_cmp(const void *cmp_data,
+ const void *entry,
+ const void *entry_or_key,
+ const void *keydata)
+{
+ const struct path_hashmap_entry *a = entry;
+ const struct path_hashmap_entry *b = entry_or_key;
+ const char *key = keydata;
+
+ if (ignore_case)
+ return strcasecmp(a->path, key ? key : b->path);
+ else
+ return strcmp(a->path, key ? key : b->path);
+}
+
+static unsigned int path_hash(const char *path)
+{
+ return ignore_case ? strihash(path) : strhash(path);
+}
+
static void flush_output(struct merge_options *o)
{
if (o->buffer_output < 2 && o->obuf.len) {
@@ -314,29 +339,25 @@
struct strbuf *base, const char *path,
unsigned int mode, int stage, void *context)
{
+ struct path_hashmap_entry *entry;
int baselen = base->len;
struct merge_options *o = context;
strbuf_addstr(base, path);
- if (S_ISDIR(mode))
- string_list_insert(&o->current_directory_set, base->buf);
- else
- string_list_insert(&o->current_file_set, base->buf);
+ FLEX_ALLOC_MEM(entry, path, base->buf, base->len);
+ hashmap_entry_init(entry, path_hash(entry->path));
+ hashmap_add(&o->current_file_dir_set, entry);
strbuf_setlen(base, baselen);
return (S_ISDIR(mode) ? READ_TREE_RECURSIVE : 0);
}
-static int get_files_dirs(struct merge_options *o, struct tree *tree)
+static void get_files_dirs(struct merge_options *o, struct tree *tree)
{
- int n;
struct pathspec match_all;
memset(&match_all, 0, sizeof(match_all));
- if (read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o))
- return 0;
- n = o->current_file_set.nr + o->current_directory_set.nr;
- return n;
+ read_tree_recursive(tree, "", 0, 0, &match_all, save_files_dirs, o);
}
/*
@@ -519,8 +540,8 @@
return renames;
diff_setup(&opts);
- DIFF_OPT_SET(&opts, RECURSIVE);
- DIFF_OPT_CLR(&opts, RENAME_EMPTY);
+ opts.flags.recursive = 1;
+ opts.flags.rename_empty = 0;
opts.detect_rename = DIFF_DETECT_RENAME;
opts.rename_limit = o->merge_rename_limit >= 0 ? o->merge_rename_limit :
o->diff_rename_limit >= 0 ? o->diff_rename_limit :
@@ -625,7 +646,7 @@
if (ignore_case) {
struct cache_entry *ce;
ce = cache_file_exists(path, strlen(path), ignore_case);
- if (ce && ce_stage(ce) == 0)
+ if (ce && ce_stage(ce) == 0 && strcmp(path, ce->name))
return 0;
}
if (remove_path(path))
@@ -646,6 +667,7 @@
static char *unique_path(struct merge_options *o, const char *path, const char *branch)
{
+ struct path_hashmap_entry *entry;
struct strbuf newpath = STRBUF_INIT;
int suffix = 0;
size_t base_len;
@@ -654,14 +676,16 @@
add_flattened_path(&newpath, branch);
base_len = newpath.len;
- while (string_list_has_string(&o->current_file_set, newpath.buf) ||
- string_list_has_string(&o->current_directory_set, newpath.buf) ||
+ while (hashmap_get_from_hash(&o->current_file_dir_set,
+ path_hash(newpath.buf), newpath.buf) ||
(!o->call_depth && file_exists(newpath.buf))) {
strbuf_setlen(&newpath, base_len);
strbuf_addf(&newpath, "_%d", suffix++);
}
- string_list_insert(&o->current_file_set, newpath.buf);
+ FLEX_ALLOC_MEM(entry, path, newpath.buf, newpath.len);
+ hashmap_entry_init(entry, path_hash(entry->path));
+ hashmap_add(&o->current_file_dir_set, entry);
return strbuf_detach(&newpath, NULL);
}
@@ -1002,10 +1026,19 @@
&b->oid,
!o->call_depth);
} else if (S_ISLNK(a->mode)) {
- oidcpy(&result->oid, &a->oid);
-
- if (!oid_eq(&a->oid, &b->oid))
- result->clean = 0;
+ switch (o->recursive_variant) {
+ case MERGE_RECURSIVE_NORMAL:
+ oidcpy(&result->oid, &a->oid);
+ if (!oid_eq(&a->oid, &b->oid))
+ result->clean = 0;
+ break;
+ case MERGE_RECURSIVE_OURS:
+ oidcpy(&result->oid, &a->oid);
+ break;
+ case MERGE_RECURSIVE_THEIRS:
+ oidcpy(&result->oid, &b->oid);
+ break;
+ }
} else
die("BUG: unsupported object type in the tree");
}
@@ -1877,8 +1910,9 @@
oid = b_oid;
conf = _("directory/file");
}
- if (dir_in_way(path, !o->call_depth,
- S_ISGITLINK(a_mode))) {
+ if (dir_in_way(path,
+ !o->call_depth && !S_ISGITLINK(a_mode),
+ 0)) {
char *new_path = unique_path(o, path, add_branch);
clean_merge = 0;
output(o, 1, _("CONFLICT (%s): There is a directory with name %s in %s. "
@@ -1927,7 +1961,14 @@
}
if (oid_eq(&common->object.oid, &merge->object.oid)) {
- output(o, 0, _("Already up-to-date!"));
+ struct strbuf sb = STRBUF_INIT;
+
+ if (!o->call_depth && index_has_changes(&sb)) {
+ err(o, _("Dirty index: cannot merge (dirty: %s)"),
+ sb.buf);
+ return 0;
+ }
+ output(o, 0, _("Already up to date!"));
*result = head;
return 1;
}
@@ -1945,8 +1986,14 @@
if (unmerged_cache()) {
struct string_list *entries, *re_head, *re_merge;
int i;
- string_list_clear(&o->current_file_set, 1);
- string_list_clear(&o->current_directory_set, 1);
+ /*
+ * Only need the hashmap while processing entries, so
+ * initialize it here and free it when we are done running
+ * through the entries. Keeping it in the merge_options as
+ * opposed to decaring a local hashmap is for convenience
+ * so that we don't have to pass it to around.
+ */
+ hashmap_init(&o->current_file_dir_set, path_hashmap_cmp, NULL, 512);
get_files_dirs(o, head);
get_files_dirs(o, merge);
@@ -1956,7 +2003,7 @@
re_merge = get_renames(o, merge, common, head, merge, entries);
clean = process_renames(o, re_head, re_merge);
if (clean < 0)
- return clean;
+ goto cleanup;
for (i = entries->nr-1; 0 <= i; i--) {
const char *path = entries->items[i].string;
struct stage_data *e = entries->items[i].util;
@@ -1964,8 +2011,10 @@
int ret = process_entry(o, path, e);
if (!ret)
clean = 0;
- else if (ret < 0)
- return ret;
+ else if (ret < 0) {
+ clean = ret;
+ goto cleanup;
+ }
}
}
for (i = 0; i < entries->nr; i++) {
@@ -1975,13 +2024,19 @@
entries->items[i].string);
}
+cleanup:
string_list_clear(re_merge, 0);
string_list_clear(re_head, 0);
string_list_clear(entries, 1);
+ hashmap_free(&o->current_file_dir_set, 1);
+
free(re_merge);
free(re_head);
free(entries);
+
+ if (clean < 0)
+ return clean;
}
else
clean = 1;
@@ -2043,7 +2098,7 @@
/* if there is no common ancestor, use an empty tree */
struct tree *tree;
- tree = lookup_tree(&empty_tree_oid);
+ tree = lookup_tree(the_hash_algo->empty_tree);
merged_common_ancestors = make_virtual_commit(tree, "ancestor");
}
@@ -2124,7 +2179,7 @@
struct commit **result)
{
int clean;
- struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
+ struct lock_file lock = LOCK_INIT;
struct commit *head_commit = get_ref(head, o->branch1);
struct commit *next_commit = get_ref(merge, o->branch2);
struct commit_list *ca = NULL;
@@ -2140,14 +2195,14 @@
}
}
- hold_locked_index(lock, LOCK_DIE_ON_ERROR);
+ hold_locked_index(&lock, LOCK_DIE_ON_ERROR);
clean = merge_recursive(o, head_commit, next_commit, ca,
result);
if (clean < 0)
return clean;
if (active_cache_changed &&
- write_locked_index(&the_index, lock, COMMIT_LOCK))
+ write_locked_index(&the_index, &lock, COMMIT_LOCK))
return err(o, _("Unable to write index."));
return clean ? 0 : 1;
@@ -2163,6 +2218,7 @@
void init_merge_options(struct merge_options *o)
{
+ const char *merge_verbosity;
memset(o, 0, sizeof(struct merge_options));
o->verbosity = 2;
o->buffer_output = 1;
@@ -2171,14 +2227,12 @@
o->renormalize = 0;
o->detect_rename = 1;
merge_recursive_config(o);
- if (getenv("GIT_MERGE_VERBOSITY"))
- o->verbosity =
- strtol(getenv("GIT_MERGE_VERBOSITY"), NULL, 10);
+ merge_verbosity = getenv("GIT_MERGE_VERBOSITY");
+ if (merge_verbosity)
+ o->verbosity = strtol(merge_verbosity, NULL, 10);
if (o->verbosity >= 5)
o->buffer_output = 0;
strbuf_init(&o->obuf, 0);
- string_list_init(&o->current_file_set, 1);
- string_list_init(&o->current_directory_set, 1);
string_list_init(&o->df_conflict_file_set, 1);
}
@@ -2215,6 +2269,8 @@
DIFF_XDL_SET(o, IGNORE_WHITESPACE);
else if (!strcmp(s, "ignore-space-at-eol"))
DIFF_XDL_SET(o, IGNORE_WHITESPACE_AT_EOL);
+ else if (!strcmp(s, "ignore-cr-at-eol"))
+ DIFF_XDL_SET(o, IGNORE_CR_AT_EOL);
else if (!strcmp(s, "renormalize"))
o->renormalize = 1;
else if (!strcmp(s, "no-renormalize"))
diff --git a/merge-recursive.h b/merge-recursive.h
index 735343b..80d69d1 100644
--- a/merge-recursive.h
+++ b/merge-recursive.h
@@ -25,8 +25,7 @@
int show_rename_progress;
int call_depth;
struct strbuf obuf;
- struct string_list current_file_set;
- struct string_list current_directory_set;
+ struct hashmap current_file_dir_set;
struct string_list df_conflict_file_set;
};
diff --git a/merge.c b/merge.c
index 1d441ad..195b578 100644
--- a/merge.c
+++ b/merge.c
@@ -1,4 +1,6 @@
#include "cache.h"
+#include "diff.h"
+#include "diffcore.h"
#include "lockfile.h"
#include "commit.h"
#include "run-command.h"
@@ -15,6 +17,37 @@
return EMPTY_TREE_SHA1_HEX;
}
+int index_has_changes(struct strbuf *sb)
+{
+ struct object_id head;
+ int i;
+
+ if (!get_oid_tree("HEAD", &head)) {
+ struct diff_options opt;
+
+ diff_setup(&opt);
+ opt.flags.exit_with_status = 1;
+ if (!sb)
+ opt.flags.quick = 1;
+ do_diff_cache(&head, &opt);
+ diffcore_std(&opt);
+ for (i = 0; sb && i < diff_queued_diff.nr; i++) {
+ if (i)
+ strbuf_addch(sb, ' ');
+ strbuf_addstr(sb, diff_queued_diff.queue[i]->two->path);
+ }
+ diff_flush(&opt);
+ return opt.flags.has_changes != 0;
+ } else {
+ for (i = 0; sb && i < active_nr; i++) {
+ if (i)
+ strbuf_addch(sb, ' ');
+ strbuf_addstr(sb, active_cache[i]->name);
+ }
+ return !!active_nr;
+ }
+}
+
int try_merge_command(const char *strategy, size_t xopts_nr,
const char **xopts, struct commit_list *common,
const char *head_arg, struct commit_list *remotes)
@@ -53,11 +86,11 @@
struct tree_desc t[MAX_UNPACK_TREES];
int i, nr_trees = 0;
struct dir_struct dir;
- struct lock_file *lock_file = xcalloc(1, sizeof(struct lock_file));
+ struct lock_file lock_file = LOCK_INIT;
refresh_cache(REFRESH_QUIET);
- if (hold_locked_index(lock_file, LOCK_REPORT_ON_ERROR) < 0)
+ if (hold_locked_index(&lock_file, LOCK_REPORT_ON_ERROR) < 0)
return -1;
memset(&trees, 0, sizeof(trees));
@@ -91,9 +124,7 @@
}
if (unpack_trees(nr_trees, t, &opts))
return -1;
- if (write_locked_index(&the_index, lock_file, COMMIT_LOCK)) {
- rollback_lock_file(lock_file);
+ if (write_locked_index(&the_index, &lock_file, COMMIT_LOCK))
return error(_("unable to write new index file"));
- }
return 0;
}
diff --git a/name-hash.c b/name-hash.c
index 0e10f3e..45c98db 100644
--- a/name-hash.c
+++ b/name-hash.c
@@ -17,10 +17,14 @@
};
static int dir_entry_cmp(const void *unused_cmp_data,
- const struct dir_entry *e1,
- const struct dir_entry *e2,
- const char *name)
+ const void *entry,
+ const void *entry_or_key,
+ const void *keydata)
{
+ const struct dir_entry *e1 = entry;
+ const struct dir_entry *e2 = entry_or_key;
+ const char *name = keydata;
+
return e1->namelen != e2->namelen || strncasecmp(e1->name,
name ? name : e2->name, e1->namelen);
}
@@ -110,10 +114,12 @@
}
static int cache_entry_cmp(const void *unused_cmp_data,
- const struct cache_entry *ce1,
- const struct cache_entry *ce2,
+ const void *entry,
+ const void *entry_or_key,
const void *remove)
{
+ const struct cache_entry *ce1 = entry;
+ const struct cache_entry *ce2 = entry_or_key;
/*
* For remove_name_hash, find the exact entry (pointer equality); for
* index_file_exists, find all entries with matching hash code and
@@ -574,15 +580,19 @@
{
if (istate->name_hash_initialized)
return;
- hashmap_init(&istate->name_hash, (hashmap_cmp_fn) cache_entry_cmp,
- NULL, istate->cache_nr);
- hashmap_init(&istate->dir_hash, (hashmap_cmp_fn) dir_entry_cmp,
- NULL, istate->cache_nr);
+ hashmap_init(&istate->name_hash, cache_entry_cmp, NULL, istate->cache_nr);
+ hashmap_init(&istate->dir_hash, dir_entry_cmp, NULL, istate->cache_nr);
if (lookup_lazy_params(istate)) {
- hashmap_disallow_rehash(&istate->dir_hash, 1);
+ /*
+ * Disable item counting and automatic rehashing because
+ * we do per-chain (mod n) locking rather than whole hashmap
+ * locking and we need to prevent the table-size from changing
+ * and bucket items from being redistributed.
+ */
+ hashmap_disable_item_counting(&istate->dir_hash);
threaded_lazy_init_name_hash(istate);
- hashmap_disallow_rehash(&istate->dir_hash, 0);
+ hashmap_enable_item_counting(&istate->dir_hash);
} else {
int nr;
for (nr = 0; nr < istate->cache_nr; nr++)
diff --git a/notes-cache.c b/notes-cache.c
index 29b4ced..17ee860 100644
--- a/notes-cache.c
+++ b/notes-cache.c
@@ -11,7 +11,7 @@
struct strbuf msg = STRBUF_INIT;
int ret;
- if (read_ref(ref, oid.hash) < 0)
+ if (read_ref(ref, &oid) < 0)
return 0;
commit = lookup_commit_reference_gently(&oid, 1);
@@ -59,7 +59,7 @@
if (commit_tree(c->validity, strlen(c->validity), tree_oid.hash, NULL,
commit_oid.hash, NULL, NULL) < 0)
return -1;
- if (update_ref("update notes cache", c->tree.update_ref, commit_oid.hash,
+ if (update_ref("update notes cache", c->tree.update_ref, &commit_oid,
NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
return -1;
diff --git a/notes-merge.c b/notes-merge.c
index 01cecbd..0f6573c 100644
--- a/notes-merge.c
+++ b/notes-merge.c
@@ -125,7 +125,7 @@
oid_to_hex(base), oid_to_hex(remote));
diff_setup(&opt);
- DIFF_OPT_SET(&opt, RECURSIVE);
+ opt.flags.recursive = 1;
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_setup_done(&opt);
diff_tree_oid(base, remote, "", &opt);
@@ -188,7 +188,7 @@
len, oid_to_hex(base), oid_to_hex(local));
diff_setup(&opt);
- DIFF_OPT_SET(&opt, RECURSIVE);
+ opt.flags.recursive = 1;
opt.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_setup_done(&opt);
diff_tree_oid(base, local, "", &opt);
@@ -308,8 +308,6 @@
if (errno == EPIPE)
break;
die_errno("notes-merge");
- } else if (!ret) {
- die("notes-merge: disk full?");
}
size -= ret;
buf += ret;
@@ -549,7 +547,7 @@
o->local_ref, o->remote_ref);
/* Dereference o->local_ref into local_sha1 */
- if (read_ref_full(o->local_ref, 0, local_oid.hash, NULL))
+ if (read_ref_full(o->local_ref, 0, &local_oid, NULL))
die("Failed to resolve local notes ref '%s'", o->local_ref);
else if (!check_refname_format(o->local_ref, 0) &&
is_null_oid(&local_oid))
@@ -597,7 +595,7 @@
bases = get_merge_bases(local, remote);
if (!bases) {
base_oid = &null_oid;
- base_tree_oid = &empty_tree_oid;
+ base_tree_oid = the_hash_algo->empty_tree;
if (o->verbosity >= 4)
printf("No merge base found; doing history-less merge\n");
} else if (!bases->next) {
@@ -624,7 +622,7 @@
if (!oidcmp(&remote->object.oid, base_oid)) {
/* Already merged; result == local commit */
if (o->verbosity >= 2)
- printf("Already up-to-date!\n");
+ printf("Already up to date!\n");
oidcpy(result_oid, &local->object.oid);
goto found_result;
}
@@ -709,7 +707,7 @@
/* write file as blob, and add to partial_tree */
if (stat(path.buf, &st))
die_errno("Failed to stat '%s'", path.buf);
- if (index_path(blob_oid.hash, path.buf, &st, HASH_WRITE_OBJECT))
+ if (index_path(&blob_oid, path.buf, &st, HASH_WRITE_OBJECT))
die("Failed to write blob object from '%s'", path.buf);
if (add_note(partial_tree, &obj_oid, &blob_oid, NULL))
die("Failed to add resolved note '%s' to notes tree",
diff --git a/notes-utils.c b/notes-utils.c
index 9765deb..5c8e70c 100644
--- a/notes-utils.c
+++ b/notes-utils.c
@@ -18,7 +18,7 @@
if (!parents) {
/* Deduce parent commit from t->ref */
struct object_id parent_oid;
- if (!read_ref(t->ref, parent_oid.hash)) {
+ if (!read_ref(t->ref, &parent_oid)) {
struct commit *parent = lookup_commit(&parent_oid);
if (parse_commit(parent))
die("Failed to find/parse commit %s", t->ref);
@@ -49,7 +49,7 @@
create_notes_commit(t, NULL, buf.buf, buf.len, commit_oid.hash);
strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
- update_ref(buf.buf, t->update_ref, commit_oid.hash, NULL, 0,
+ update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
UPDATE_REFS_DIE_ON_ERR);
strbuf_release(&buf);
diff --git a/notes.c b/notes.c
index 8f47c20..c7f21fa 100644
--- a/notes.c
+++ b/notes.c
@@ -64,7 +64,7 @@
#define CLR_PTR_TYPE(ptr) ((void *) ((uintptr_t) (ptr) & ~3))
#define SET_PTR_TYPE(ptr, type) ((void *) ((uintptr_t) (ptr) | (type)))
-#define GET_NIBBLE(n, sha1) (((sha1[(n) >> 1]) >> ((~(n) & 0x01) << 2)) & 0x0f)
+#define GET_NIBBLE(n, sha1) ((((sha1)[(n) >> 1]) >> ((~(n) & 0x01) << 2)) & 0x0f)
#define KEY_INDEX (GIT_SHA1_RAWSZ - 1)
#define FANOUT_PATH_SEPARATORS ((GIT_SHA1_HEXSZ / 2) - 1)
@@ -334,34 +334,6 @@
}
}
-/*
- * Convert a partial SHA1 hex string to the corresponding partial SHA1 value.
- * - hex - Partial SHA1 segment in ASCII hex format
- * - hex_len - Length of above segment. Must be multiple of 2 between 0 and 40
- * - sha1 - Partial SHA1 value is written here
- * - sha1_len - Max #bytes to store in sha1, Must be >= hex_len / 2, and < 20
- * Returns -1 on error (invalid arguments or invalid SHA1 (not in hex format)).
- * Otherwise, returns number of bytes written to sha1 (i.e. hex_len / 2).
- * Pads sha1 with NULs up to sha1_len (not included in returned length).
- */
-static int get_oid_hex_segment(const char *hex, unsigned int hex_len,
- unsigned char *oid, unsigned int oid_len)
-{
- unsigned int i, len = hex_len >> 1;
- if (hex_len % 2 != 0 || len > oid_len)
- return -1;
- for (i = 0; i < len; i++) {
- unsigned int val = (hexval(hex[0]) << 4) | hexval(hex[1]);
- if (val & ~0xff)
- return -1;
- *oid++ = val;
- hex += 2;
- }
- for (; i < oid_len; i++)
- *oid++ = 0;
- return len;
-}
-
static int non_note_cmp(const struct non_note *a, const struct non_note *b)
{
return strcmp(a->path, b->path);
@@ -417,80 +389,90 @@
struct int_node *node, unsigned int n)
{
struct object_id object_oid;
- unsigned int prefix_len;
+ size_t prefix_len;
void *buf;
struct tree_desc desc;
struct name_entry entry;
- int len, path_len;
- unsigned char type;
- struct leaf_node *l;
- buf = fill_tree_descriptor(&desc, subtree->val_oid.hash);
+ buf = fill_tree_descriptor(&desc, &subtree->val_oid);
if (!buf)
die("Could not read %s for notes-index",
oid_to_hex(&subtree->val_oid));
prefix_len = subtree->key_oid.hash[KEY_INDEX];
- assert(prefix_len * 2 >= n);
+ if (prefix_len >= GIT_SHA1_RAWSZ)
+ BUG("prefix_len (%"PRIuMAX") is out of range", (uintmax_t)prefix_len);
+ if (prefix_len * 2 < n)
+ BUG("prefix_len (%"PRIuMAX") is too small", (uintmax_t)prefix_len);
memcpy(object_oid.hash, subtree->key_oid.hash, prefix_len);
while (tree_entry(&desc, &entry)) {
- path_len = strlen(entry.path);
- len = get_oid_hex_segment(entry.path, path_len,
- object_oid.hash + prefix_len, GIT_SHA1_RAWSZ - prefix_len);
- if (len < 0)
- goto handle_non_note; /* entry.path is not a SHA1 */
- len += prefix_len;
+ unsigned char type;
+ struct leaf_node *l;
+ size_t path_len = strlen(entry.path);
- /*
- * If object SHA1 is complete (len == 20), assume note object
- * If object SHA1 is incomplete (len < 20), and current
- * component consists of 2 hex chars, assume note subtree
- */
- if (len <= GIT_SHA1_RAWSZ) {
+ if (path_len == 2 * (GIT_SHA1_RAWSZ - prefix_len)) {
+ /* This is potentially the remainder of the SHA-1 */
+
+ if (!S_ISREG(entry.mode))
+ /* notes must be blobs */
+ goto handle_non_note;
+
+ if (hex_to_bytes(object_oid.hash + prefix_len, entry.path,
+ GIT_SHA1_RAWSZ - prefix_len))
+ goto handle_non_note; /* entry.path is not a SHA1 */
+
type = PTR_TYPE_NOTE;
- l = (struct leaf_node *)
- xcalloc(1, sizeof(struct leaf_node));
- oidcpy(&l->key_oid, &object_oid);
- oidcpy(&l->val_oid, entry.oid);
- if (len < GIT_SHA1_RAWSZ) {
- if (!S_ISDIR(entry.mode) || path_len != 2)
- goto handle_non_note; /* not subtree */
- l->key_oid.hash[KEY_INDEX] = (unsigned char) len;
- type = PTR_TYPE_SUBTREE;
- }
- if (note_tree_insert(t, node, n, l, type,
- combine_notes_concatenate))
- die("Failed to load %s %s into notes tree "
- "from %s",
- type == PTR_TYPE_NOTE ? "note" : "subtree",
- oid_to_hex(&l->key_oid), t->ref);
+ } else if (path_len == 2) {
+ /* This is potentially an internal node */
+ size_t len = prefix_len;
+
+ if (!S_ISDIR(entry.mode))
+ /* internal nodes must be trees */
+ goto handle_non_note;
+
+ if (hex_to_bytes(object_oid.hash + len++, entry.path, 1))
+ goto handle_non_note; /* entry.path is not a SHA1 */
+
+ /*
+ * Pad the rest of the SHA-1 with zeros,
+ * except for the last byte, where we write
+ * the length:
+ */
+ memset(object_oid.hash + len, 0, GIT_SHA1_RAWSZ - len - 1);
+ object_oid.hash[KEY_INDEX] = (unsigned char)len;
+
+ type = PTR_TYPE_SUBTREE;
+ } else {
+ /* This can't be part of a note */
+ goto handle_non_note;
}
+
+ l = xcalloc(1, sizeof(*l));
+ oidcpy(&l->key_oid, &object_oid);
+ oidcpy(&l->val_oid, entry.oid);
+ if (note_tree_insert(t, node, n, l, type,
+ combine_notes_concatenate))
+ die("Failed to load %s %s into notes tree "
+ "from %s",
+ type == PTR_TYPE_NOTE ? "note" : "subtree",
+ oid_to_hex(&l->key_oid), t->ref);
+
continue;
handle_non_note:
/*
- * Determine full path for this non-note entry:
- * The filename is already found in entry.path, but the
- * directory part of the path must be deduced from the subtree
- * containing this entry. We assume here that the overall notes
- * tree follows a strict byte-based progressive fanout
- * structure (i.e. using 2/38, 2/2/36, etc. fanouts, and not
- * e.g. 4/36 fanout). This means that if a non-note is found at
- * path "dead/beef", the following code will register it as
- * being found on "de/ad/beef".
- * On the other hand, if you use such non-obvious non-note
- * paths in the middle of a notes tree, you deserve what's
- * coming to you ;). Note that for non-notes that are not
- * SHA1-like at the top level, there will be no problems.
- *
- * To conclude, it is strongly advised to make sure non-notes
- * have at least one non-hex character in the top-level path
- * component.
+ * Determine full path for this non-note entry. The
+ * filename is already found in entry.path, but the
+ * directory part of the path must be deduced from the
+ * subtree containing this entry based on our
+ * knowledge that the overall notes tree follows a
+ * strict byte-based progressive fanout structure
+ * (i.e. using 2/38, 2/2/36, etc. fanouts).
*/
{
struct strbuf non_note_path = STRBUF_INIT;
const char *q = oid_to_hex(&subtree->key_oid);
- int i;
+ size_t i;
for (i = 0; i < prefix_len; i++) {
strbuf_addch(&non_note_path, *q++);
strbuf_addch(&non_note_path, *q++);
@@ -1026,9 +1008,9 @@
t->dirty = 0;
if (flags & NOTES_INIT_EMPTY || !notes_ref ||
- get_sha1_treeish(notes_ref, object_oid.hash))
+ get_oid_treeish(notes_ref, &object_oid))
return;
- if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, object_oid.hash))
+ if (flags & NOTES_INIT_WRITABLE && read_ref(notes_ref, &object_oid))
die("Cannot use notes ref %s", notes_ref);
if (get_tree_entry(object_oid.hash, "", oid.hash, &mode))
die("Failed to read notes tree referenced by %s (%s)",
diff --git a/object.c b/object.c
index 321d7e9..0afdfd1 100644
--- a/object.c
+++ b/object.c
@@ -353,6 +353,19 @@
free(ent->path);
}
+struct object *object_array_pop(struct object_array *array)
+{
+ struct object *ret;
+
+ if (!array->nr)
+ return NULL;
+
+ ret = array->objects[array->nr - 1].item;
+ object_array_release_entry(&array->objects[array->nr - 1]);
+ array->nr--;
+ return ret;
+}
+
void object_array_filter(struct object_array *array,
object_array_each_func_t want, void *cb_data)
{
@@ -421,3 +434,14 @@
obj->flags &= ~flags;
}
}
+
+void clear_commit_marks_all(unsigned int flags)
+{
+ int i;
+
+ for (i = 0; i < obj_hash_size; i++) {
+ struct object *obj = obj_hash[i];
+ if (obj && obj->type == OBJ_COMMIT)
+ obj->flags &= ~flags;
+ }
+}
diff --git a/object.h b/object.h
index 0a419ba..87563d9 100644
--- a/object.h
+++ b/object.h
@@ -38,6 +38,7 @@
* http-push.c: 16-----19
* commit.c: 16-----19
* sha1_name.c: 20
+ * list-objects-filter.c: 21
* builtin/fsck.c: 0--3
*/
#define FLAG_BITS 27
@@ -116,6 +117,14 @@
void add_object_array(struct object *obj, const char *name, struct object_array *array);
void add_object_array_with_path(struct object *obj, const char *name, struct object_array *array, unsigned mode, const char *path);
+/*
+ * Returns NULL if the array is empty. Otherwise, returns the last object
+ * after removing its entry from the array. Other resources associated
+ * with that object are left in an unspecified state and should not be
+ * examined.
+ */
+struct object *object_array_pop(struct object_array *array);
+
typedef int (*object_array_each_func_t)(struct object_array_entry *, void *);
/*
@@ -140,4 +149,9 @@
void clear_object_flags(unsigned flags);
+/*
+ * Clear the specified object flags from all in-core commit objects.
+ */
+extern void clear_commit_marks_all(unsigned int flags);
+
#endif /* OBJECT_H */
diff --git a/oidmap.c b/oidmap.c
new file mode 100644
index 0000000..d9fb19b
--- /dev/null
+++ b/oidmap.c
@@ -0,0 +1,62 @@
+#include "cache.h"
+#include "oidmap.h"
+
+static int cmpfn(const void *hashmap_cmp_fn_data,
+ const void *entry, const void *entry_or_key,
+ const void *keydata)
+{
+ const struct oidmap_entry *entry_ = entry;
+ if (keydata)
+ return oidcmp(&entry_->oid, (const struct object_id *) keydata);
+ return oidcmp(&entry_->oid,
+ &((const struct oidmap_entry *) entry_or_key)->oid);
+}
+
+static int hash(const struct object_id *oid)
+{
+ int hash;
+ memcpy(&hash, oid->hash, sizeof(hash));
+ return hash;
+}
+
+void oidmap_init(struct oidmap *map, size_t initial_size)
+{
+ hashmap_init(&map->map, cmpfn, NULL, initial_size);
+}
+
+void oidmap_free(struct oidmap *map, int free_entries)
+{
+ if (!map)
+ return;
+ hashmap_free(&map->map, free_entries);
+}
+
+void *oidmap_get(const struct oidmap *map, const struct object_id *key)
+{
+ if (!map->map.cmpfn)
+ return NULL;
+
+ return hashmap_get_from_hash(&map->map, hash(key), key);
+}
+
+void *oidmap_remove(struct oidmap *map, const struct object_id *key)
+{
+ struct hashmap_entry entry;
+
+ if (!map->map.cmpfn)
+ oidmap_init(map, 0);
+
+ hashmap_entry_init(&entry, hash(key));
+ return hashmap_remove(&map->map, &entry, key);
+}
+
+void *oidmap_put(struct oidmap *map, void *entry)
+{
+ struct oidmap_entry *to_put = entry;
+
+ if (!map->map.cmpfn)
+ oidmap_init(map, 0);
+
+ hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
+ return hashmap_put(&map->map, to_put);
+}
diff --git a/oidmap.h b/oidmap.h
new file mode 100644
index 0000000..d3cd2bb
--- /dev/null
+++ b/oidmap.h
@@ -0,0 +1,90 @@
+#ifndef OIDMAP_H
+#define OIDMAP_H
+
+#include "hashmap.h"
+
+/*
+ * struct oidmap_entry is a structure representing an entry in the hash table,
+ * which must be used as first member of user data structures.
+ *
+ * Users should set the oid field. oidmap_put() will populate the
+ * internal_entry field.
+ */
+struct oidmap_entry {
+ /* For internal use only */
+ struct hashmap_entry internal_entry;
+
+ struct object_id oid;
+};
+
+struct oidmap {
+ struct hashmap map;
+};
+
+#define OIDMAP_INIT { { NULL } }
+
+/*
+ * Initializes an oidmap structure.
+ *
+ * `map` is the oidmap to initialize.
+ *
+ * If the total number of entries is known in advance, the `initial_size`
+ * parameter may be used to preallocate a sufficiently large table and thus
+ * prevent expensive resizing. If 0, the table is dynamically resized.
+ */
+extern void oidmap_init(struct oidmap *map, size_t initial_size);
+
+/*
+ * Frees an oidmap structure and allocated memory.
+ *
+ * If `free_entries` is true, each oidmap_entry in the map is freed as well
+ * using stdlibs free().
+ */
+extern void oidmap_free(struct oidmap *map, int free_entries);
+
+/*
+ * Returns the oidmap entry for the specified oid, or NULL if not found.
+ */
+extern void *oidmap_get(const struct oidmap *map,
+ const struct object_id *key);
+
+/*
+ * Adds or replaces an oidmap entry.
+ *
+ * ((struct oidmap_entry *) entry)->internal_entry will be populated by this
+ * function.
+ *
+ * Returns the replaced entry, or NULL if not found (i.e. the entry was added).
+ */
+extern void *oidmap_put(struct oidmap *map, void *entry);
+
+/*
+ * Removes an oidmap entry matching the specified oid.
+ *
+ * Returns the removed entry, or NULL if not found.
+ */
+extern void *oidmap_remove(struct oidmap *map, const struct object_id *key);
+
+
+struct oidmap_iter {
+ struct hashmap_iter h_iter;
+};
+
+static inline void oidmap_iter_init(struct oidmap *map, struct oidmap_iter *iter)
+{
+ hashmap_iter_init(&map->map, &iter->h_iter);
+}
+
+static inline void *oidmap_iter_next(struct oidmap_iter *iter)
+{
+ return hashmap_iter_next(&iter->h_iter);
+}
+
+static inline void *oidmap_iter_first(struct oidmap *map,
+ struct oidmap_iter *iter)
+{
+ oidmap_iter_init(map, iter);
+ return oidmap_iter_next(iter);
+}
+
+#endif
diff --git a/oidset.c b/oidset.c
index a6a08ba..454c54f 100644
--- a/oidset.c
+++ b/oidset.c
@@ -1,50 +1,40 @@
#include "cache.h"
#include "oidset.h"
-struct oidset_entry {
- struct hashmap_entry hash;
- struct object_id oid;
-};
-
-static int oidset_hashcmp(const void *unused_cmp_data,
- const void *va, const void *vb,
- const void *vkey)
-{
- const struct oidset_entry *a = va, *b = vb;
- const struct object_id *key = vkey;
- return oidcmp(&a->oid, key ? key : &b->oid);
-}
-
int oidset_contains(const struct oidset *set, const struct object_id *oid)
{
- struct hashmap_entry key;
-
- if (!set->map.cmpfn)
+ if (!set->map.map.tablesize)
return 0;
-
- hashmap_entry_init(&key, sha1hash(oid->hash));
- return !!hashmap_get(&set->map, &key, oid);
+ return !!oidmap_get(&set->map, oid);
}
int oidset_insert(struct oidset *set, const struct object_id *oid)
{
- struct oidset_entry *entry;
+ struct oidmap_entry *entry;
- if (!set->map.cmpfn)
- hashmap_init(&set->map, oidset_hashcmp, NULL, 0);
-
- if (oidset_contains(set, oid))
+ if (!set->map.map.tablesize)
+ oidmap_init(&set->map, 0);
+ else if (oidset_contains(set, oid))
return 1;
entry = xmalloc(sizeof(*entry));
- hashmap_entry_init(&entry->hash, sha1hash(oid->hash));
oidcpy(&entry->oid, oid);
- hashmap_add(&set->map, entry);
+ oidmap_put(&set->map, entry);
return 0;
}
+int oidset_remove(struct oidset *set, const struct object_id *oid)
+{
+ struct oidmap_entry *entry;
+
+ entry = oidmap_remove(&set->map, oid);
+ free(entry);
+
+ return (entry != NULL);
+}
+
void oidset_clear(struct oidset *set)
{
- hashmap_free(&set->map, 1);
+ oidmap_free(&set->map, 1);
}
diff --git a/oidset.h b/oidset.h
index b7eaab5..40ec5f8 100644
--- a/oidset.h
+++ b/oidset.h
@@ -1,6 +1,8 @@
#ifndef OIDSET_H
#define OIDSET_H
+#include "oidmap.h"
+
/**
* This API is similar to sha1-array, in that it maintains a set of object ids
* in a memory-efficient way. The major differences are:
@@ -17,10 +19,16 @@
* A single oidset; should be zero-initialized (or use OIDSET_INIT).
*/
struct oidset {
- struct hashmap map;
+ struct oidmap map;
};
-#define OIDSET_INIT { { NULL } }
+#define OIDSET_INIT { OIDMAP_INIT }
+
+
+static inline void oidset_init(struct oidset *set, size_t initial_size)
+{
+ oidmap_init(&set->map, initial_size);
+}
/**
* Returns true iff `set` contains `oid`.
@@ -37,9 +45,39 @@
int oidset_insert(struct oidset *set, const struct object_id *oid);
/**
+ * Remove the oid from the set.
+ *
+ * Returns 1 if the oid was present in the set, 0 otherwise.
+ */
+int oidset_remove(struct oidset *set, const struct object_id *oid);
+
+/**
* Remove all entries from the oidset, freeing any resources associated with
* it.
*/
void oidset_clear(struct oidset *set);
+struct oidset_iter {
+ struct oidmap_iter m_iter;
+};
+
+static inline void oidset_iter_init(struct oidset *set,
+ struct oidset_iter *iter)
+{
+ oidmap_iter_init(&set->map, &iter->m_iter);
+}
+
+static inline struct object_id *oidset_iter_next(struct oidset_iter *iter)
+{
+ struct oidmap_entry *e = oidmap_iter_next(&iter->m_iter);
+ return e ? &e->oid : NULL;
+}
+
+static inline struct object_id *oidset_iter_first(struct oidset *set,
+ struct oidset_iter *iter)
+{
+ oidset_iter_init(set, iter);
+ return oidset_iter_next(iter);
+}
+
#endif /* OIDSET_H */
diff --git a/pack-bitmap-write.c b/pack-bitmap-write.c
index 8e47a96..a8df5ce 100644
--- a/pack-bitmap-write.c
+++ b/pack-bitmap-write.c
@@ -297,9 +297,7 @@
traverse_commit_list(&revs, show_commit, show_object, base);
- revs.pending.nr = 0;
- revs.pending.alloc = 0;
- revs.pending.objects = NULL;
+ object_array_clear(&revs.pending);
stored->bitmap = bitmap_to_ewah(base);
need_reset = 0;
diff --git a/pack-bitmap.c b/pack-bitmap.c
index 327634c..9270983 100644
--- a/pack-bitmap.c
+++ b/pack-bitmap.c
@@ -9,6 +9,7 @@
#include "pack-bitmap.h"
#include "pack-revindex.h"
#include "pack-objects.h"
+#include "packfile.h"
/*
* An entry on the bitmap index, representing the bitmap for a given
@@ -586,7 +587,7 @@
continue;
obj = eindex->objects[i];
- show_reach(obj->oid.hash, obj->type, 0, eindex->hashes[i], NULL, 0);
+ show_reach(&obj->oid, obj->type, 0, eindex->hashes[i], NULL, 0);
}
}
@@ -611,7 +612,7 @@
eword_t word = objects->words[i] & filter;
for (offset = 0; offset < BITS_IN_EWORD; ++offset) {
- const unsigned char *sha1;
+ struct object_id oid;
struct revindex_entry *entry;
uint32_t hash = 0;
@@ -624,12 +625,12 @@
continue;
entry = &bitmap_git.pack->revindex[pos + offset];
- sha1 = nth_packed_object_sha1(bitmap_git.pack, entry->nr);
+ nth_packed_object_oid(&oid, bitmap_git.pack, entry->nr);
if (bitmap_git.hashes)
hash = get_be32(bitmap_git.hashes + entry->nr);
- show_reach(sha1, object_type, 0, hash, bitmap_git.pack, entry->offset);
+ show_reach(&oid, object_type, 0, hash, bitmap_git.pack, entry->offset);
}
pos += BITS_IN_EWORD;
@@ -653,8 +654,6 @@
int prepare_bitmap_walk(struct rev_info *revs)
{
unsigned int i;
- unsigned int pending_nr = revs->pending.nr;
- struct object_array_entry *pending_e = revs->pending.objects;
struct object_list *wants = NULL;
struct object_list *haves = NULL;
@@ -669,8 +668,8 @@
return -1;
}
- for (i = 0; i < pending_nr; ++i) {
- struct object *object = pending_e[i].item;
+ for (i = 0; i < revs->pending.nr; ++i) {
+ struct object *object = revs->pending.objects[i].item;
if (object->type == OBJ_NONE)
parse_object_or_die(&object->oid, NULL);
@@ -714,9 +713,7 @@
if (!bitmap_git.loaded && load_pack_bitmap() < 0)
return -1;
- revs->pending.nr = 0;
- revs->pending.alloc = 0;
- revs->pending.objects = NULL;
+ object_array_clear(&revs->pending);
if (haves) {
revs->ignore_missing_links = 1;
diff --git a/pack-bitmap.h b/pack-bitmap.h
index 0adcef7..3742a00 100644
--- a/pack-bitmap.h
+++ b/pack-bitmap.h
@@ -27,7 +27,7 @@
};
typedef int (*show_reachable_fn)(
- const unsigned char *sha1,
+ const struct object_id *oid,
enum object_type type,
int flags,
uint32_t hash,
diff --git a/pack-check.c b/pack-check.c
index e1fcb22..073c1fb 100644
--- a/pack-check.c
+++ b/pack-check.c
@@ -2,6 +2,7 @@
#include "pack.h"
#include "pack-revindex.h"
#include "progress.h"
+#include "packfile.h"
struct idx_entry {
off_t offset;
diff --git a/pack-write.c b/pack-write.c
index a333ec6..fea6284 100644
--- a/pack-write.c
+++ b/pack-write.c
@@ -213,14 +213,19 @@
git_SHA_CTX old_sha1_ctx, new_sha1_ctx;
struct pack_header hdr;
char *buf;
+ ssize_t read_result;
git_SHA1_Init(&old_sha1_ctx);
git_SHA1_Init(&new_sha1_ctx);
if (lseek(pack_fd, 0, SEEK_SET) != 0)
die_errno("Failed seeking to start of '%s'", pack_name);
- if (read_in_full(pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
+ read_result = read_in_full(pack_fd, &hdr, sizeof(hdr));
+ if (read_result < 0)
die_errno("Unable to reread header of '%s'", pack_name);
+ else if (read_result != sizeof(hdr))
+ die_errno("Unexpected short read for header of '%s'",
+ pack_name);
if (lseek(pack_fd, 0, SEEK_SET) != 0)
die_errno("Failed seeking to start of '%s'", pack_name);
git_SHA1_Update(&old_sha1_ctx, &hdr, sizeof(hdr));
diff --git a/packfile.c b/packfile.c
new file mode 100644
index 0000000..4a5fe7a
--- /dev/null
+++ b/packfile.c
@@ -0,0 +1,1901 @@
+#include "cache.h"
+#include "mru.h"
+#include "pack.h"
+#include "dir.h"
+#include "mergesort.h"
+#include "packfile.h"
+#include "delta.h"
+#include "list.h"
+#include "streaming.h"
+#include "sha1-lookup.h"
+
+char *odb_pack_name(struct strbuf *buf,
+ const unsigned char *sha1,
+ const char *ext)
+{
+ strbuf_reset(buf);
+ strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(),
+ sha1_to_hex(sha1), ext);
+ return buf->buf;
+}
+
+char *sha1_pack_name(const unsigned char *sha1)
+{
+ static struct strbuf buf = STRBUF_INIT;
+ return odb_pack_name(&buf, sha1, "pack");
+}
+
+char *sha1_pack_index_name(const unsigned char *sha1)
+{
+ static struct strbuf buf = STRBUF_INIT;
+ return odb_pack_name(&buf, sha1, "idx");
+}
+
+static unsigned int pack_used_ctr;
+static unsigned int pack_mmap_calls;
+static unsigned int peak_pack_open_windows;
+static unsigned int pack_open_windows;
+static unsigned int pack_open_fds;
+static unsigned int pack_max_fds;
+static size_t peak_pack_mapped;
+static size_t pack_mapped;
+struct packed_git *packed_git;
+struct mru packed_git_mru;
+
+#define SZ_FMT PRIuMAX
+static inline uintmax_t sz_fmt(size_t s) { return s; }
+
+void pack_report(void)
+{
+ fprintf(stderr,
+ "pack_report: getpagesize() = %10" SZ_FMT "\n"
+ "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
+ "pack_report: core.packedGitLimit = %10" SZ_FMT "\n",
+ sz_fmt(getpagesize()),
+ sz_fmt(packed_git_window_size),
+ sz_fmt(packed_git_limit));
+ fprintf(stderr,
+ "pack_report: pack_used_ctr = %10u\n"
+ "pack_report: pack_mmap_calls = %10u\n"
+ "pack_report: pack_open_windows = %10u / %10u\n"
+ "pack_report: pack_mapped = "
+ "%10" SZ_FMT " / %10" SZ_FMT "\n",
+ pack_used_ctr,
+ pack_mmap_calls,
+ pack_open_windows, peak_pack_open_windows,
+ sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped));
+}
+
+/*
+ * Open and mmap the index file at path, perform a couple of
+ * consistency checks, then record its information to p. Return 0 on
+ * success.
+ */
+static int check_packed_git_idx(const char *path, struct packed_git *p)
+{
+ void *idx_map;
+ struct pack_idx_header *hdr;
+ size_t idx_size;
+ uint32_t version, nr, i, *index;
+ int fd = git_open(path);
+ struct stat st;
+
+ if (fd < 0)
+ return -1;
+ if (fstat(fd, &st)) {
+ close(fd);
+ return -1;
+ }
+ idx_size = xsize_t(st.st_size);
+ if (idx_size < 4 * 256 + 20 + 20) {
+ close(fd);
+ return error("index file %s is too small", path);
+ }
+ idx_map = xmmap(NULL, idx_size, PROT_READ, MAP_PRIVATE, fd, 0);
+ close(fd);
+
+ hdr = idx_map;
+ if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) {
+ version = ntohl(hdr->idx_version);
+ if (version < 2 || version > 2) {
+ munmap(idx_map, idx_size);
+ return error("index file %s is version %"PRIu32
+ " and is not supported by this binary"
+ " (try upgrading GIT to a newer version)",
+ path, version);
+ }
+ } else
+ version = 1;
+
+ nr = 0;
+ index = idx_map;
+ if (version > 1)
+ index += 2; /* skip index header */
+ for (i = 0; i < 256; i++) {
+ uint32_t n = ntohl(index[i]);
+ if (n < nr) {
+ munmap(idx_map, idx_size);
+ return error("non-monotonic index %s", path);
+ }
+ nr = n;
+ }
+
+ if (version == 1) {
+ /*
+ * Total size:
+ * - 256 index entries 4 bytes each
+ * - 24-byte entries * nr (20-byte sha1 + 4-byte offset)
+ * - 20-byte SHA1 of the packfile
+ * - 20-byte SHA1 file checksum
+ */
+ if (idx_size != 4*256 + nr * 24 + 20 + 20) {
+ munmap(idx_map, idx_size);
+ return error("wrong index v1 file size in %s", path);
+ }
+ } else if (version == 2) {
+ /*
+ * Minimum size:
+ * - 8 bytes of header
+ * - 256 index entries 4 bytes each
+ * - 20-byte sha1 entry * nr
+ * - 4-byte crc entry * nr
+ * - 4-byte offset entry * nr
+ * - 20-byte SHA1 of the packfile
+ * - 20-byte SHA1 file checksum
+ * And after the 4-byte offset table might be a
+ * variable sized table containing 8-byte entries
+ * for offsets larger than 2^31.
+ */
+ unsigned long min_size = 8 + 4*256 + nr*(20 + 4 + 4) + 20 + 20;
+ unsigned long max_size = min_size;
+ if (nr)
+ max_size += (nr - 1)*8;
+ if (idx_size < min_size || idx_size > max_size) {
+ munmap(idx_map, idx_size);
+ return error("wrong index v2 file size in %s", path);
+ }
+ if (idx_size != min_size &&
+ /*
+ * make sure we can deal with large pack offsets.
+ * 31-bit signed offset won't be enough, neither
+ * 32-bit unsigned one will be.
+ */
+ (sizeof(off_t) <= 4)) {
+ munmap(idx_map, idx_size);
+ return error("pack too large for current definition of off_t in %s", path);
+ }
+ }
+
+ p->index_version = version;
+ p->index_data = idx_map;
+ p->index_size = idx_size;
+ p->num_objects = nr;
+ return 0;
+}
+
+int open_pack_index(struct packed_git *p)
+{
+ char *idx_name;
+ size_t len;
+ int ret;
+
+ if (p->index_data)
+ return 0;
+
+ if (!strip_suffix(p->pack_name, ".pack", &len))
+ die("BUG: pack_name does not end in .pack");
+ idx_name = xstrfmt("%.*s.idx", (int)len, p->pack_name);
+ ret = check_packed_git_idx(idx_name, p);
+ free(idx_name);
+ return ret;
+}
+
+static struct packed_git *alloc_packed_git(int extra)
+{
+ struct packed_git *p = xmalloc(st_add(sizeof(*p), extra));
+ memset(p, 0, sizeof(*p));
+ p->pack_fd = -1;
+ return p;
+}
+
+struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path)
+{
+ const char *path = sha1_pack_name(sha1);
+ size_t alloc = st_add(strlen(path), 1);
+ struct packed_git *p = alloc_packed_git(alloc);
+
+ memcpy(p->pack_name, path, alloc); /* includes NUL */
+ hashcpy(p->sha1, sha1);
+ if (check_packed_git_idx(idx_path, p)) {
+ free(p);
+ return NULL;
+ }
+
+ return p;
+}
+
+static void scan_windows(struct packed_git *p,
+ struct packed_git **lru_p,
+ struct pack_window **lru_w,
+ struct pack_window **lru_l)
+{
+ struct pack_window *w, *w_l;
+
+ for (w_l = NULL, w = p->windows; w; w = w->next) {
+ if (!w->inuse_cnt) {
+ if (!*lru_w || w->last_used < (*lru_w)->last_used) {
+ *lru_p = p;
+ *lru_w = w;
+ *lru_l = w_l;
+ }
+ }
+ w_l = w;
+ }
+}
+
+static int unuse_one_window(struct packed_git *current)
+{
+ struct packed_git *p, *lru_p = NULL;
+ struct pack_window *lru_w = NULL, *lru_l = NULL;
+
+ if (current)
+ scan_windows(current, &lru_p, &lru_w, &lru_l);
+ for (p = packed_git; p; p = p->next)
+ scan_windows(p, &lru_p, &lru_w, &lru_l);
+ if (lru_p) {
+ munmap(lru_w->base, lru_w->len);
+ pack_mapped -= lru_w->len;
+ if (lru_l)
+ lru_l->next = lru_w->next;
+ else
+ lru_p->windows = lru_w->next;
+ free(lru_w);
+ pack_open_windows--;
+ return 1;
+ }
+ return 0;
+}
+
+void release_pack_memory(size_t need)
+{
+ size_t cur = pack_mapped;
+ while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
+ ; /* nothing */
+}
+
+void close_pack_windows(struct packed_git *p)
+{
+ while (p->windows) {
+ struct pack_window *w = p->windows;
+
+ if (w->inuse_cnt)
+ die("pack '%s' still has open windows to it",
+ p->pack_name);
+ munmap(w->base, w->len);
+ pack_mapped -= w->len;
+ pack_open_windows--;
+ p->windows = w->next;
+ free(w);
+ }
+}
+
+static int close_pack_fd(struct packed_git *p)
+{
+ if (p->pack_fd < 0)
+ return 0;
+
+ close(p->pack_fd);
+ pack_open_fds--;
+ p->pack_fd = -1;
+
+ return 1;
+}
+
+void close_pack_index(struct packed_git *p)
+{
+ if (p->index_data) {
+ munmap((void *)p->index_data, p->index_size);
+ p->index_data = NULL;
+ }
+}
+
+static void close_pack(struct packed_git *p)
+{
+ close_pack_windows(p);
+ close_pack_fd(p);
+ close_pack_index(p);
+}
+
+void close_all_packs(void)
+{
+ struct packed_git *p;
+
+ for (p = packed_git; p; p = p->next)
+ if (p->do_not_close)
+ die("BUG: want to close pack marked 'do-not-close'");
+ else
+ close_pack(p);
+}
+
+/*
+ * The LRU pack is the one with the oldest MRU window, preferring packs
+ * with no used windows, or the oldest mtime if it has no windows allocated.
+ */
+static void find_lru_pack(struct packed_git *p, struct packed_git **lru_p, struct pack_window **mru_w, int *accept_windows_inuse)
+{
+ struct pack_window *w, *this_mru_w;
+ int has_windows_inuse = 0;
+
+ /*
+ * Reject this pack if it has windows and the previously selected
+ * one does not. If this pack does not have windows, reject
+ * it if the pack file is newer than the previously selected one.
+ */
+ if (*lru_p && !*mru_w && (p->windows || p->mtime > (*lru_p)->mtime))
+ return;
+
+ for (w = this_mru_w = p->windows; w; w = w->next) {
+ /*
+ * Reject this pack if any of its windows are in use,
+ * but the previously selected pack did not have any
+ * inuse windows. Otherwise, record that this pack
+ * has windows in use.
+ */
+ if (w->inuse_cnt) {
+ if (*accept_windows_inuse)
+ has_windows_inuse = 1;
+ else
+ return;
+ }
+
+ if (w->last_used > this_mru_w->last_used)
+ this_mru_w = w;
+
+ /*
+ * Reject this pack if it has windows that have been
+ * used more recently than the previously selected pack.
+ * If the previously selected pack had windows inuse and
+ * we have not encountered a window in this pack that is
+ * inuse, skip this check since we prefer a pack with no
+ * inuse windows to one that has inuse windows.
+ */
+ if (*mru_w && *accept_windows_inuse == has_windows_inuse &&
+ this_mru_w->last_used > (*mru_w)->last_used)
+ return;
+ }
+
+ /*
+ * Select this pack.
+ */
+ *mru_w = this_mru_w;
+ *lru_p = p;
+ *accept_windows_inuse = has_windows_inuse;
+}
+
+static int close_one_pack(void)
+{
+ struct packed_git *p, *lru_p = NULL;
+ struct pack_window *mru_w = NULL;
+ int accept_windows_inuse = 1;
+
+ for (p = packed_git; p; p = p->next) {
+ if (p->pack_fd == -1)
+ continue;
+ find_lru_pack(p, &lru_p, &mru_w, &accept_windows_inuse);
+ }
+
+ if (lru_p)
+ return close_pack_fd(lru_p);
+
+ return 0;
+}
+
+static unsigned int get_max_fd_limit(void)
+{
+#ifdef RLIMIT_NOFILE
+ {
+ struct rlimit lim;
+
+ if (!getrlimit(RLIMIT_NOFILE, &lim))
+ return lim.rlim_cur;
+ }
+#endif
+
+#ifdef _SC_OPEN_MAX
+ {
+ long open_max = sysconf(_SC_OPEN_MAX);
+ if (0 < open_max)
+ return open_max;
+ /*
+ * Otherwise, we got -1 for one of the two
+ * reasons:
+ *
+ * (1) sysconf() did not understand _SC_OPEN_MAX
+ * and signaled an error with -1; or
+ * (2) sysconf() said there is no limit.
+ *
+ * We _could_ clear errno before calling sysconf() to
+ * tell these two cases apart and return a huge number
+ * in the latter case to let the caller cap it to a
+ * value that is not so selfish, but letting the
+ * fallback OPEN_MAX codepath take care of these cases
+ * is a lot simpler.
+ */
+ }
+#endif
+
+#ifdef OPEN_MAX
+ return OPEN_MAX;
+#else
+ return 1; /* see the caller ;-) */
+#endif
+}
+
+/*
+ * Do not call this directly as this leaks p->pack_fd on error return;
+ * call open_packed_git() instead.
+ */
+static int open_packed_git_1(struct packed_git *p)
+{
+ struct stat st;
+ struct pack_header hdr;
+ unsigned char sha1[20];
+ unsigned char *idx_sha1;
+ long fd_flag;
+ ssize_t read_result;
+
+ if (!p->index_data && open_pack_index(p))
+ return error("packfile %s index unavailable", p->pack_name);
+
+ if (!pack_max_fds) {
+ unsigned int max_fds = get_max_fd_limit();
+
+ /* Save 3 for stdin/stdout/stderr, 22 for work */
+ if (25 < max_fds)
+ pack_max_fds = max_fds - 25;
+ else
+ pack_max_fds = 1;
+ }
+
+ while (pack_max_fds <= pack_open_fds && close_one_pack())
+ ; /* nothing */
+
+ p->pack_fd = git_open(p->pack_name);
+ if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
+ return -1;
+ pack_open_fds++;
+
+ /* If we created the struct before we had the pack we lack size. */
+ if (!p->pack_size) {
+ if (!S_ISREG(st.st_mode))
+ return error("packfile %s not a regular file", p->pack_name);
+ p->pack_size = st.st_size;
+ } else if (p->pack_size != st.st_size)
+ return error("packfile %s size changed", p->pack_name);
+
+ /* We leave these file descriptors open with sliding mmap;
+ * there is no point keeping them open across exec(), though.
+ */
+ fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
+ if (fd_flag < 0)
+ return error("cannot determine file descriptor flags");
+ fd_flag |= FD_CLOEXEC;
+ if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
+ return error("cannot set FD_CLOEXEC");
+
+ /* Verify we recognize this pack file format. */
+ read_result = read_in_full(p->pack_fd, &hdr, sizeof(hdr));
+ if (read_result < 0)
+ return error_errno("error reading from %s", p->pack_name);
+ if (read_result != sizeof(hdr))
+ return error("file %s is far too short to be a packfile", p->pack_name);
+ if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
+ return error("file %s is not a GIT packfile", p->pack_name);
+ if (!pack_version_ok(hdr.hdr_version))
+ return error("packfile %s is version %"PRIu32" and not"
+ " supported (try upgrading GIT to a newer version)",
+ p->pack_name, ntohl(hdr.hdr_version));
+
+ /* Verify the pack matches its index. */
+ if (p->num_objects != ntohl(hdr.hdr_entries))
+ return error("packfile %s claims to have %"PRIu32" objects"
+ " while index indicates %"PRIu32" objects",
+ p->pack_name, ntohl(hdr.hdr_entries),
+ p->num_objects);
+ if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
+ return error("end of packfile %s is unavailable", p->pack_name);
+ read_result = read_in_full(p->pack_fd, sha1, sizeof(sha1));
+ if (read_result < 0)
+ return error_errno("error reading from %s", p->pack_name);
+ if (read_result != sizeof(sha1))
+ return error("packfile %s signature is unavailable", p->pack_name);
+ idx_sha1 = ((unsigned char *)p->index_data) + p->index_size - 40;
+ if (hashcmp(sha1, idx_sha1))
+ return error("packfile %s does not match index", p->pack_name);
+ return 0;
+}
+
+static int open_packed_git(struct packed_git *p)
+{
+ if (!open_packed_git_1(p))
+ return 0;
+ close_pack_fd(p);
+ return -1;
+}
+
+static int in_window(struct pack_window *win, off_t offset)
+{
+ /* We must promise at least 20 bytes (one hash) after the
+ * offset is available from this window, otherwise the offset
+ * is not actually in this window and a different window (which
+ * has that one hash excess) must be used. This is to support
+ * the object header and delta base parsing routines below.
+ */
+ off_t win_off = win->offset;
+ return win_off <= offset
+ && (offset + 20) <= (win_off + win->len);
+}
+
+unsigned char *use_pack(struct packed_git *p,
+ struct pack_window **w_cursor,
+ off_t offset,
+ unsigned long *left)
+{
+ struct pack_window *win = *w_cursor;
+
+ /* Since packfiles end in a hash of their content and it's
+ * pointless to ask for an offset into the middle of that
+ * hash, and the in_window function above wouldn't match
+ * don't allow an offset too close to the end of the file.
+ */
+ if (!p->pack_size && p->pack_fd == -1 && open_packed_git(p))
+ die("packfile %s cannot be accessed", p->pack_name);
+ if (offset > (p->pack_size - 20))
+ die("offset beyond end of packfile (truncated pack?)");
+ if (offset < 0)
+ die(_("offset before end of packfile (broken .idx?)"));
+
+ if (!win || !in_window(win, offset)) {
+ if (win)
+ win->inuse_cnt--;
+ for (win = p->windows; win; win = win->next) {
+ if (in_window(win, offset))
+ break;
+ }
+ if (!win) {
+ size_t window_align = packed_git_window_size / 2;
+ off_t len;
+
+ if (p->pack_fd == -1 && open_packed_git(p))
+ die("packfile %s cannot be accessed", p->pack_name);
+
+ win = xcalloc(1, sizeof(*win));
+ win->offset = (offset / window_align) * window_align;
+ len = p->pack_size - win->offset;
+ if (len > packed_git_window_size)
+ len = packed_git_window_size;
+ win->len = (size_t)len;
+ pack_mapped += win->len;
+ while (packed_git_limit < pack_mapped
+ && unuse_one_window(p))
+ ; /* nothing */
+ win->base = xmmap(NULL, win->len,
+ PROT_READ, MAP_PRIVATE,
+ p->pack_fd, win->offset);
+ if (win->base == MAP_FAILED)
+ die_errno("packfile %s cannot be mapped",
+ p->pack_name);
+ if (!win->offset && win->len == p->pack_size
+ && !p->do_not_close)
+ close_pack_fd(p);
+ pack_mmap_calls++;
+ pack_open_windows++;
+ if (pack_mapped > peak_pack_mapped)
+ peak_pack_mapped = pack_mapped;
+ if (pack_open_windows > peak_pack_open_windows)
+ peak_pack_open_windows = pack_open_windows;
+ win->next = p->windows;
+ p->windows = win;
+ }
+ }
+ if (win != *w_cursor) {
+ win->last_used = pack_used_ctr++;
+ win->inuse_cnt++;
+ *w_cursor = win;
+ }
+ offset -= win->offset;
+ if (left)
+ *left = win->len - xsize_t(offset);
+ return win->base + offset;
+}
+
+void unuse_pack(struct pack_window **w_cursor)
+{
+ struct pack_window *w = *w_cursor;
+ if (w) {
+ w->inuse_cnt--;
+ *w_cursor = NULL;
+ }
+}
+
+static void try_to_free_pack_memory(size_t size)
+{
+ release_pack_memory(size);
+}
+
+struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
+{
+ static int have_set_try_to_free_routine;
+ struct stat st;
+ size_t alloc;
+ struct packed_git *p;
+
+ if (!have_set_try_to_free_routine) {
+ have_set_try_to_free_routine = 1;
+ set_try_to_free_routine(try_to_free_pack_memory);
+ }
+
+ /*
+ * Make sure a corresponding .pack file exists and that
+ * the index looks sane.
+ */
+ if (!strip_suffix_mem(path, &path_len, ".idx"))
+ return NULL;
+
+ /*
+ * ".pack" is long enough to hold any suffix we're adding (and
+ * the use xsnprintf double-checks that)
+ */
+ alloc = st_add3(path_len, strlen(".pack"), 1);
+ p = alloc_packed_git(alloc);
+ memcpy(p->pack_name, path, path_len);
+
+ xsnprintf(p->pack_name + path_len, alloc - path_len, ".keep");
+ if (!access(p->pack_name, F_OK))
+ p->pack_keep = 1;
+
+ xsnprintf(p->pack_name + path_len, alloc - path_len, ".pack");
+ if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
+ free(p);
+ return NULL;
+ }
+
+ /* ok, it looks sane as far as we can check without
+ * actually mapping the pack file.
+ */
+ p->pack_size = st.st_size;
+ p->pack_local = local;
+ p->mtime = st.st_mtime;
+ if (path_len < 40 || get_sha1_hex(path + path_len - 40, p->sha1))
+ hashclr(p->sha1);
+ return p;
+}
+
+void install_packed_git(struct packed_git *pack)
+{
+ if (pack->pack_fd != -1)
+ pack_open_fds++;
+
+ pack->next = packed_git;
+ packed_git = pack;
+}
+
+void (*report_garbage)(unsigned seen_bits, const char *path);
+
+static void report_helper(const struct string_list *list,
+ int seen_bits, int first, int last)
+{
+ if (seen_bits == (PACKDIR_FILE_PACK|PACKDIR_FILE_IDX))
+ return;
+
+ for (; first < last; first++)
+ report_garbage(seen_bits, list->items[first].string);
+}
+
+static void report_pack_garbage(struct string_list *list)
+{
+ int i, baselen = -1, first = 0, seen_bits = 0;
+
+ if (!report_garbage)
+ return;
+
+ string_list_sort(list);
+
+ for (i = 0; i < list->nr; i++) {
+ const char *path = list->items[i].string;
+ if (baselen != -1 &&
+ strncmp(path, list->items[first].string, baselen)) {
+ report_helper(list, seen_bits, first, i);
+ baselen = -1;
+ seen_bits = 0;
+ }
+ if (baselen == -1) {
+ const char *dot = strrchr(path, '.');
+ if (!dot) {
+ report_garbage(PACKDIR_FILE_GARBAGE, path);
+ continue;
+ }
+ baselen = dot - path + 1;
+ first = i;
+ }
+ if (!strcmp(path + baselen, "pack"))
+ seen_bits |= 1;
+ else if (!strcmp(path + baselen, "idx"))
+ seen_bits |= 2;
+ }
+ report_helper(list, seen_bits, first, list->nr);
+}
+
+static void prepare_packed_git_one(char *objdir, int local)
+{
+ struct strbuf path = STRBUF_INIT;
+ size_t dirnamelen;
+ DIR *dir;
+ struct dirent *de;
+ struct string_list garbage = STRING_LIST_INIT_DUP;
+
+ strbuf_addstr(&path, objdir);
+ strbuf_addstr(&path, "/pack");
+ dir = opendir(path.buf);
+ if (!dir) {
+ if (errno != ENOENT)
+ error_errno("unable to open object pack directory: %s",
+ path.buf);
+ strbuf_release(&path);
+ return;
+ }
+ strbuf_addch(&path, '/');
+ dirnamelen = path.len;
+ while ((de = readdir(dir)) != NULL) {
+ struct packed_git *p;
+ size_t base_len;
+
+ if (is_dot_or_dotdot(de->d_name))
+ continue;
+
+ strbuf_setlen(&path, dirnamelen);
+ strbuf_addstr(&path, de->d_name);
+
+ base_len = path.len;
+ if (strip_suffix_mem(path.buf, &base_len, ".idx")) {
+ /* Don't reopen a pack we already have. */
+ for (p = packed_git; p; p = p->next) {
+ size_t len;
+ if (strip_suffix(p->pack_name, ".pack", &len) &&
+ len == base_len &&
+ !memcmp(p->pack_name, path.buf, len))
+ break;
+ }
+ if (p == NULL &&
+ /*
+ * See if it really is a valid .idx file with
+ * corresponding .pack file that we can map.
+ */
+ (p = add_packed_git(path.buf, path.len, local)) != NULL)
+ install_packed_git(p);
+ }
+
+ if (!report_garbage)
+ continue;
+
+ if (ends_with(de->d_name, ".idx") ||
+ ends_with(de->d_name, ".pack") ||
+ ends_with(de->d_name, ".bitmap") ||
+ ends_with(de->d_name, ".keep"))
+ string_list_append(&garbage, path.buf);
+ else
+ report_garbage(PACKDIR_FILE_GARBAGE, path.buf);
+ }
+ closedir(dir);
+ report_pack_garbage(&garbage);
+ string_list_clear(&garbage, 0);
+ strbuf_release(&path);
+}
+
+static int approximate_object_count_valid;
+
+/*
+ * Give a fast, rough count of the number of objects in the repository. This
+ * ignores loose objects completely. If you have a lot of them, then either
+ * you should repack because your performance will be awful, or they are
+ * all unreachable objects about to be pruned, in which case they're not really
+ * interesting as a measure of repo size in the first place.
+ */
+unsigned long approximate_object_count(void)
+{
+ static unsigned long count;
+ if (!approximate_object_count_valid) {
+ struct packed_git *p;
+
+ prepare_packed_git();
+ count = 0;
+ for (p = packed_git; p; p = p->next) {
+ if (open_pack_index(p))
+ continue;
+ count += p->num_objects;
+ }
+ }
+ return count;
+}
+
+static void *get_next_packed_git(const void *p)
+{
+ return ((const struct packed_git *)p)->next;
+}
+
+static void set_next_packed_git(void *p, void *next)
+{
+ ((struct packed_git *)p)->next = next;
+}
+
+static int sort_pack(const void *a_, const void *b_)
+{
+ const struct packed_git *a = a_;
+ const struct packed_git *b = b_;
+ int st;
+
+ /*
+ * Local packs tend to contain objects specific to our
+ * variant of the project than remote ones. In addition,
+ * remote ones could be on a network mounted filesystem.
+ * Favor local ones for these reasons.
+ */
+ st = a->pack_local - b->pack_local;
+ if (st)
+ return -st;
+
+ /*
+ * Younger packs tend to contain more recent objects,
+ * and more recent objects tend to get accessed more
+ * often.
+ */
+ if (a->mtime < b->mtime)
+ return 1;
+ else if (a->mtime == b->mtime)
+ return 0;
+ return -1;
+}
+
+static void rearrange_packed_git(void)
+{
+ packed_git = llist_mergesort(packed_git, get_next_packed_git,
+ set_next_packed_git, sort_pack);
+}
+
+static void prepare_packed_git_mru(void)
+{
+ struct packed_git *p;
+
+ mru_clear(&packed_git_mru);
+ for (p = packed_git; p; p = p->next)
+ mru_append(&packed_git_mru, p);
+}
+
+static int prepare_packed_git_run_once = 0;
+void prepare_packed_git(void)
+{
+ struct alternate_object_database *alt;
+
+ if (prepare_packed_git_run_once)
+ return;
+ prepare_packed_git_one(get_object_directory(), 1);
+ prepare_alt_odb();
+ for (alt = alt_odb_list; alt; alt = alt->next)
+ prepare_packed_git_one(alt->path, 0);
+ rearrange_packed_git();
+ prepare_packed_git_mru();
+ prepare_packed_git_run_once = 1;
+}
+
+void reprepare_packed_git(void)
+{
+ approximate_object_count_valid = 0;
+ prepare_packed_git_run_once = 0;
+ prepare_packed_git();
+}
+
+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;
+ unsigned long used = 0;
+
+ c = buf[used++];
+ *type = (c >> 4) & 7;
+ size = c & 15;
+ shift = 4;
+ while (c & 0x80) {
+ if (len <= used || bitsizeof(long) <= shift) {
+ error("bad object header");
+ size = used = 0;
+ break;
+ }
+ c = buf[used++];
+ size += (c & 0x7f) << shift;
+ shift += 7;
+ }
+ *sizep = size;
+ return used;
+}
+
+unsigned long get_size_from_delta(struct packed_git *p,
+ struct pack_window **w_curs,
+ off_t curpos)
+{
+ const unsigned char *data;
+ unsigned char delta_head[20], *in;
+ git_zstream stream;
+ int st;
+
+ memset(&stream, 0, sizeof(stream));
+ stream.next_out = delta_head;
+ stream.avail_out = sizeof(delta_head);
+
+ git_inflate_init(&stream);
+ do {
+ in = use_pack(p, w_curs, curpos, &stream.avail_in);
+ stream.next_in = in;
+ st = git_inflate(&stream, Z_FINISH);
+ curpos += stream.next_in - in;
+ } while ((st == Z_OK || st == Z_BUF_ERROR) &&
+ stream.total_out < sizeof(delta_head));
+ git_inflate_end(&stream);
+ if ((st != Z_STREAM_END) && stream.total_out != sizeof(delta_head)) {
+ error("delta data unpack-initial failed");
+ return 0;
+ }
+
+ /* Examine the initial part of the delta to figure out
+ * the result size.
+ */
+ data = delta_head;
+
+ /* ignore base size */
+ get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
+
+ /* Read the result size */
+ return get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
+}
+
+int unpack_object_header(struct packed_git *p,
+ struct pack_window **w_curs,
+ off_t *curpos,
+ unsigned long *sizep)
+{
+ unsigned char *base;
+ unsigned long left;
+ unsigned long used;
+ enum object_type type;
+
+ /* use_pack() assures us we have [base, base + 20) available
+ * as a range that we can look at. (Its actually the hash
+ * size that is assured.) With our object header encoding
+ * the maximum deflated object size is 2^137, which is just
+ * insane, so we know won't exceed what we have been given.
+ */
+ base = use_pack(p, w_curs, *curpos, &left);
+ used = unpack_object_header_buffer(base, left, &type, sizep);
+ if (!used) {
+ type = OBJ_BAD;
+ } else
+ *curpos += used;
+
+ return type;
+}
+
+void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1)
+{
+ unsigned i;
+ for (i = 0; i < p->num_bad_objects; i++)
+ if (!hashcmp(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))
+ return;
+ p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
+ st_mult(GIT_MAX_RAWSZ,
+ st_add(p->num_bad_objects, 1)));
+ hashcpy(p->bad_object_sha1 + GIT_SHA1_RAWSZ * p->num_bad_objects, sha1);
+ p->num_bad_objects++;
+}
+
+const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
+{
+ struct packed_git *p;
+ unsigned i;
+
+ for (p = packed_git; p; p = p->next)
+ for (i = 0; i < p->num_bad_objects; i++)
+ if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
+ return p;
+ return NULL;
+}
+
+static off_t get_delta_base(struct packed_git *p,
+ struct pack_window **w_curs,
+ off_t *curpos,
+ enum object_type type,
+ off_t delta_obj_offset)
+{
+ unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
+ off_t base_offset;
+
+ /* use_pack() assured us we have [base_info, base_info + 20)
+ * as a range that we can look at without walking off the
+ * end of the mapped window. Its actually the hash size
+ * that is assured. An OFS_DELTA longer than the hash size
+ * is stupid, as then a REF_DELTA would be smaller to store.
+ */
+ if (type == OBJ_OFS_DELTA) {
+ unsigned used = 0;
+ unsigned char c = base_info[used++];
+ base_offset = c & 127;
+ while (c & 128) {
+ base_offset += 1;
+ if (!base_offset || MSB(base_offset, 7))
+ return 0; /* overflow */
+ c = base_info[used++];
+ base_offset = (base_offset << 7) + (c & 127);
+ }
+ base_offset = delta_obj_offset - base_offset;
+ if (base_offset <= 0 || base_offset >= delta_obj_offset)
+ return 0; /* out of bound */
+ *curpos += used;
+ } else if (type == OBJ_REF_DELTA) {
+ /* The base entry _must_ be in the same pack */
+ base_offset = find_pack_entry_one(base_info, p);
+ *curpos += 20;
+ } else
+ die("I am totally screwed");
+ return base_offset;
+}
+
+/*
+ * Like get_delta_base above, but we return the sha1 instead of the pack
+ * offset. This means it is cheaper for REF deltas (we do not have to do
+ * the final object lookup), but more expensive for OFS deltas (we
+ * have to load the revidx to convert the offset back into a sha1).
+ */
+static const unsigned char *get_delta_base_sha1(struct packed_git *p,
+ struct pack_window **w_curs,
+ off_t curpos,
+ enum object_type type,
+ off_t delta_obj_offset)
+{
+ if (type == OBJ_REF_DELTA) {
+ unsigned char *base = use_pack(p, w_curs, curpos, NULL);
+ return base;
+ } else if (type == OBJ_OFS_DELTA) {
+ struct revindex_entry *revidx;
+ off_t base_offset = get_delta_base(p, w_curs, &curpos,
+ type, delta_obj_offset);
+
+ if (!base_offset)
+ return NULL;
+
+ revidx = find_pack_revindex(p, base_offset);
+ if (!revidx)
+ return NULL;
+
+ return nth_packed_object_sha1(p, revidx->nr);
+ } else
+ return NULL;
+}
+
+static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
+{
+ int type;
+ struct revindex_entry *revidx;
+ const unsigned char *sha1;
+ revidx = find_pack_revindex(p, obj_offset);
+ if (!revidx)
+ return OBJ_BAD;
+ sha1 = nth_packed_object_sha1(p, revidx->nr);
+ mark_bad_packed_object(p, sha1);
+ type = sha1_object_info(sha1, NULL);
+ if (type <= OBJ_NONE)
+ return OBJ_BAD;
+ return type;
+}
+
+#define POI_STACK_PREALLOC 64
+
+static enum object_type packed_to_object_type(struct packed_git *p,
+ off_t obj_offset,
+ enum object_type type,
+ struct pack_window **w_curs,
+ off_t curpos)
+{
+ off_t small_poi_stack[POI_STACK_PREALLOC];
+ off_t *poi_stack = small_poi_stack;
+ int poi_stack_nr = 0, poi_stack_alloc = POI_STACK_PREALLOC;
+
+ while (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
+ off_t base_offset;
+ unsigned long size;
+ /* Push the object we're going to leave behind */
+ if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) {
+ poi_stack_alloc = alloc_nr(poi_stack_nr);
+ ALLOC_ARRAY(poi_stack, poi_stack_alloc);
+ memcpy(poi_stack, small_poi_stack, sizeof(off_t)*poi_stack_nr);
+ } else {
+ ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc);
+ }
+ poi_stack[poi_stack_nr++] = obj_offset;
+ /* If parsing the base offset fails, just unwind */
+ base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset);
+ if (!base_offset)
+ goto unwind;
+ curpos = obj_offset = base_offset;
+ type = unpack_object_header(p, w_curs, &curpos, &size);
+ if (type <= OBJ_NONE) {
+ /* If getting the base itself fails, we first
+ * retry the base, otherwise unwind */
+ type = retry_bad_packed_offset(p, base_offset);
+ if (type > OBJ_NONE)
+ goto out;
+ goto unwind;
+ }
+ }
+
+ switch (type) {
+ case OBJ_BAD:
+ case OBJ_COMMIT:
+ case OBJ_TREE:
+ case OBJ_BLOB:
+ case OBJ_TAG:
+ break;
+ default:
+ error("unknown object type %i at offset %"PRIuMAX" in %s",
+ type, (uintmax_t)obj_offset, p->pack_name);
+ type = OBJ_BAD;
+ }
+
+out:
+ if (poi_stack != small_poi_stack)
+ free(poi_stack);
+ return type;
+
+unwind:
+ while (poi_stack_nr) {
+ obj_offset = poi_stack[--poi_stack_nr];
+ type = retry_bad_packed_offset(p, obj_offset);
+ if (type > OBJ_NONE)
+ goto out;
+ }
+ type = OBJ_BAD;
+ goto out;
+}
+
+static struct hashmap delta_base_cache;
+static size_t delta_base_cached;
+
+static LIST_HEAD(delta_base_cache_lru);
+
+struct delta_base_cache_key {
+ struct packed_git *p;
+ off_t base_offset;
+};
+
+struct delta_base_cache_entry {
+ struct hashmap hash;
+ struct delta_base_cache_key key;
+ struct list_head lru;
+ void *data;
+ unsigned long size;
+ enum object_type type;
+};
+
+static unsigned int pack_entry_hash(struct packed_git *p, off_t base_offset)
+{
+ unsigned int hash;
+
+ hash = (unsigned int)(intptr_t)p + (unsigned int)base_offset;
+ hash += (hash >> 8) + (hash >> 16);
+ return hash;
+}
+
+static struct delta_base_cache_entry *
+get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
+{
+ struct hashmap_entry entry;
+ struct delta_base_cache_key key;
+
+ if (!delta_base_cache.cmpfn)
+ return NULL;
+
+ hashmap_entry_init(&entry, pack_entry_hash(p, base_offset));
+ key.p = p;
+ key.base_offset = base_offset;
+ return hashmap_get(&delta_base_cache, &entry, &key);
+}
+
+static int delta_base_cache_key_eq(const struct delta_base_cache_key *a,
+ const struct delta_base_cache_key *b)
+{
+ return a->p == b->p && a->base_offset == b->base_offset;
+}
+
+static int delta_base_cache_hash_cmp(const void *unused_cmp_data,
+ const void *va, const void *vb,
+ const void *vkey)
+{
+ const struct delta_base_cache_entry *a = va, *b = vb;
+ const struct delta_base_cache_key *key = vkey;
+ if (key)
+ return !delta_base_cache_key_eq(&a->key, key);
+ else
+ return !delta_base_cache_key_eq(&a->key, &b->key);
+}
+
+static int in_delta_base_cache(struct packed_git *p, off_t base_offset)
+{
+ return !!get_delta_base_cache_entry(p, base_offset);
+}
+
+/*
+ * Remove the entry from the cache, but do _not_ free the associated
+ * entry data. The caller takes ownership of the "data" buffer, and
+ * should copy out any fields it wants before detaching.
+ */
+static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent)
+{
+ hashmap_remove(&delta_base_cache, ent, &ent->key);
+ list_del(&ent->lru);
+ delta_base_cached -= ent->size;
+ free(ent);
+}
+
+static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset,
+ unsigned long *base_size, enum object_type *type)
+{
+ struct delta_base_cache_entry *ent;
+
+ ent = get_delta_base_cache_entry(p, base_offset);
+ if (!ent)
+ return unpack_entry(p, base_offset, type, base_size);
+
+ if (type)
+ *type = ent->type;
+ if (base_size)
+ *base_size = ent->size;
+ return xmemdupz(ent->data, ent->size);
+}
+
+static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
+{
+ free(ent->data);
+ detach_delta_base_cache_entry(ent);
+}
+
+void clear_delta_base_cache(void)
+{
+ struct list_head *lru, *tmp;
+ list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
+ struct delta_base_cache_entry *entry =
+ list_entry(lru, struct delta_base_cache_entry, lru);
+ release_delta_base_cache(entry);
+ }
+}
+
+static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
+ void *base, unsigned long base_size, enum object_type type)
+{
+ struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
+ struct list_head *lru, *tmp;
+
+ delta_base_cached += base_size;
+
+ list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
+ struct delta_base_cache_entry *f =
+ list_entry(lru, struct delta_base_cache_entry, lru);
+ if (delta_base_cached <= delta_base_cache_limit)
+ break;
+ release_delta_base_cache(f);
+ }
+
+ ent->key.p = p;
+ ent->key.base_offset = base_offset;
+ ent->type = type;
+ ent->data = base;
+ ent->size = base_size;
+ list_add_tail(&ent->lru, &delta_base_cache_lru);
+
+ if (!delta_base_cache.cmpfn)
+ hashmap_init(&delta_base_cache, delta_base_cache_hash_cmp, NULL, 0);
+ hashmap_entry_init(ent, pack_entry_hash(p, base_offset));
+ hashmap_add(&delta_base_cache, ent);
+}
+
+int packed_object_info(struct packed_git *p, off_t obj_offset,
+ struct object_info *oi)
+{
+ struct pack_window *w_curs = NULL;
+ unsigned long size;
+ off_t curpos = obj_offset;
+ enum object_type type;
+
+ /*
+ * We always get the representation type, but only convert it to
+ * a "real" type later if the caller is interested.
+ */
+ if (oi->contentp) {
+ *oi->contentp = cache_or_unpack_entry(p, obj_offset, oi->sizep,
+ &type);
+ if (!*oi->contentp)
+ type = OBJ_BAD;
+ } else {
+ type = unpack_object_header(p, &w_curs, &curpos, &size);
+ }
+
+ if (!oi->contentp && oi->sizep) {
+ if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
+ off_t tmp_pos = curpos;
+ off_t base_offset = get_delta_base(p, &w_curs, &tmp_pos,
+ type, obj_offset);
+ if (!base_offset) {
+ type = OBJ_BAD;
+ goto out;
+ }
+ *oi->sizep = get_size_from_delta(p, &w_curs, tmp_pos);
+ if (*oi->sizep == 0) {
+ type = OBJ_BAD;
+ goto out;
+ }
+ } else {
+ *oi->sizep = size;
+ }
+ }
+
+ if (oi->disk_sizep) {
+ struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
+ *oi->disk_sizep = revidx[1].offset - obj_offset;
+ }
+
+ if (oi->typep || oi->typename) {
+ enum object_type ptot;
+ ptot = packed_to_object_type(p, obj_offset, type, &w_curs,
+ curpos);
+ if (oi->typep)
+ *oi->typep = ptot;
+ if (oi->typename) {
+ const char *tn = typename(ptot);
+ if (tn)
+ strbuf_addstr(oi->typename, tn);
+ }
+ if (ptot < 0) {
+ type = OBJ_BAD;
+ goto out;
+ }
+ }
+
+ if (oi->delta_base_sha1) {
+ if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
+ const unsigned char *base;
+
+ base = get_delta_base_sha1(p, &w_curs, curpos,
+ type, obj_offset);
+ if (!base) {
+ type = OBJ_BAD;
+ goto out;
+ }
+
+ hashcpy(oi->delta_base_sha1, base);
+ } else
+ hashclr(oi->delta_base_sha1);
+ }
+
+ oi->whence = in_delta_base_cache(p, obj_offset) ? OI_DBCACHED :
+ OI_PACKED;
+
+out:
+ unuse_pack(&w_curs);
+ return type;
+}
+
+static void *unpack_compressed_entry(struct packed_git *p,
+ struct pack_window **w_curs,
+ off_t curpos,
+ unsigned long size)
+{
+ int st;
+ git_zstream stream;
+ unsigned char *buffer, *in;
+
+ buffer = xmallocz_gently(size);
+ if (!buffer)
+ return NULL;
+ memset(&stream, 0, sizeof(stream));
+ stream.next_out = buffer;
+ stream.avail_out = size + 1;
+
+ git_inflate_init(&stream);
+ do {
+ in = use_pack(p, w_curs, curpos, &stream.avail_in);
+ stream.next_in = in;
+ st = git_inflate(&stream, Z_FINISH);
+ if (!stream.avail_out)
+ break; /* the payload is larger than it should be */
+ curpos += stream.next_in - in;
+ } while (st == Z_OK || st == Z_BUF_ERROR);
+ git_inflate_end(&stream);
+ if ((st != Z_STREAM_END) || stream.total_out != size) {
+ free(buffer);
+ return NULL;
+ }
+
+ return buffer;
+}
+
+static void write_pack_access_log(struct packed_git *p, off_t obj_offset)
+{
+ static struct trace_key pack_access = TRACE_KEY_INIT(PACK_ACCESS);
+ trace_printf_key(&pack_access, "%s %"PRIuMAX"\n",
+ p->pack_name, (uintmax_t)obj_offset);
+}
+
+int do_check_packed_object_crc;
+
+#define UNPACK_ENTRY_STACK_PREALLOC 64
+struct unpack_entry_stack_ent {
+ off_t obj_offset;
+ off_t curpos;
+ unsigned long size;
+};
+
+static void *read_object(const unsigned char *sha1, enum object_type *type,
+ unsigned long *size)
+{
+ struct object_info oi = OBJECT_INFO_INIT;
+ void *content;
+ oi.typep = type;
+ oi.sizep = size;
+ oi.contentp = &content;
+
+ if (sha1_object_info_extended(sha1, &oi, 0) < 0)
+ return NULL;
+ return content;
+}
+
+void *unpack_entry(struct packed_git *p, off_t obj_offset,
+ enum object_type *final_type, unsigned long *final_size)
+{
+ struct pack_window *w_curs = NULL;
+ off_t curpos = obj_offset;
+ void *data = NULL;
+ unsigned long size;
+ enum object_type type;
+ struct unpack_entry_stack_ent small_delta_stack[UNPACK_ENTRY_STACK_PREALLOC];
+ struct unpack_entry_stack_ent *delta_stack = small_delta_stack;
+ int delta_stack_nr = 0, delta_stack_alloc = UNPACK_ENTRY_STACK_PREALLOC;
+ int base_from_cache = 0;
+
+ write_pack_access_log(p, obj_offset);
+
+ /* PHASE 1: drill down to the innermost base object */
+ for (;;) {
+ off_t base_offset;
+ int i;
+ struct delta_base_cache_entry *ent;
+
+ ent = get_delta_base_cache_entry(p, curpos);
+ if (ent) {
+ type = ent->type;
+ data = ent->data;
+ size = ent->size;
+ detach_delta_base_cache_entry(ent);
+ base_from_cache = 1;
+ break;
+ }
+
+ if (do_check_packed_object_crc && p->index_version > 1) {
+ struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
+ off_t len = revidx[1].offset - obj_offset;
+ if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
+ const unsigned char *sha1 =
+ nth_packed_object_sha1(p, revidx->nr);
+ error("bad packed object CRC for %s",
+ sha1_to_hex(sha1));
+ mark_bad_packed_object(p, sha1);
+ data = NULL;
+ goto out;
+ }
+ }
+
+ type = unpack_object_header(p, &w_curs, &curpos, &size);
+ if (type != OBJ_OFS_DELTA && type != OBJ_REF_DELTA)
+ break;
+
+ base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
+ if (!base_offset) {
+ error("failed to validate delta base reference "
+ "at offset %"PRIuMAX" from %s",
+ (uintmax_t)curpos, p->pack_name);
+ /* bail to phase 2, in hopes of recovery */
+ data = NULL;
+ break;
+ }
+
+ /* push object, proceed to base */
+ if (delta_stack_nr >= delta_stack_alloc
+ && delta_stack == small_delta_stack) {
+ delta_stack_alloc = alloc_nr(delta_stack_nr);
+ ALLOC_ARRAY(delta_stack, delta_stack_alloc);
+ memcpy(delta_stack, small_delta_stack,
+ sizeof(*delta_stack)*delta_stack_nr);
+ } else {
+ ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc);
+ }
+ i = delta_stack_nr++;
+ delta_stack[i].obj_offset = obj_offset;
+ delta_stack[i].curpos = curpos;
+ delta_stack[i].size = size;
+
+ curpos = obj_offset = base_offset;
+ }
+
+ /* PHASE 2: handle the base */
+ switch (type) {
+ case OBJ_OFS_DELTA:
+ case OBJ_REF_DELTA:
+ if (data)
+ die("BUG: unpack_entry: left loop at a valid delta");
+ break;
+ case OBJ_COMMIT:
+ case OBJ_TREE:
+ case OBJ_BLOB:
+ case OBJ_TAG:
+ if (!base_from_cache)
+ data = unpack_compressed_entry(p, &w_curs, curpos, size);
+ break;
+ default:
+ data = NULL;
+ error("unknown object type %i at offset %"PRIuMAX" in %s",
+ type, (uintmax_t)obj_offset, p->pack_name);
+ }
+
+ /* PHASE 3: apply deltas in order */
+
+ /* invariants:
+ * 'data' holds the base data, or NULL if there was corruption
+ */
+ while (delta_stack_nr) {
+ void *delta_data;
+ void *base = data;
+ void *external_base = NULL;
+ unsigned long delta_size, base_size = size;
+ int i;
+
+ data = NULL;
+
+ if (base)
+ add_delta_base_cache(p, obj_offset, base, base_size, type);
+
+ if (!base) {
+ /*
+ * We're probably in deep shit, but let's try to fetch
+ * the required base anyway from another pack or loose.
+ * This is costly but should happen only in the presence
+ * of a corrupted pack, and is better than failing outright.
+ */
+ struct revindex_entry *revidx;
+ const unsigned char *base_sha1;
+ revidx = find_pack_revindex(p, obj_offset);
+ if (revidx) {
+ base_sha1 = nth_packed_object_sha1(p, revidx->nr);
+ error("failed to read delta base object %s"
+ " at offset %"PRIuMAX" from %s",
+ sha1_to_hex(base_sha1), (uintmax_t)obj_offset,
+ p->pack_name);
+ mark_bad_packed_object(p, base_sha1);
+ base = read_object(base_sha1, &type, &base_size);
+ external_base = base;
+ }
+ }
+
+ i = --delta_stack_nr;
+ obj_offset = delta_stack[i].obj_offset;
+ curpos = delta_stack[i].curpos;
+ delta_size = delta_stack[i].size;
+
+ if (!base)
+ continue;
+
+ delta_data = unpack_compressed_entry(p, &w_curs, curpos, delta_size);
+
+ if (!delta_data) {
+ error("failed to unpack compressed delta "
+ "at offset %"PRIuMAX" from %s",
+ (uintmax_t)curpos, p->pack_name);
+ data = NULL;
+ free(external_base);
+ continue;
+ }
+
+ data = patch_delta(base, base_size,
+ delta_data, delta_size,
+ &size);
+
+ /*
+ * We could not apply the delta; warn the user, but keep going.
+ * Our failure will be noticed either in the next iteration of
+ * the loop, or if this is the final delta, in the caller when
+ * we return NULL. Those code paths will take care of making
+ * a more explicit warning and retrying with another copy of
+ * the object.
+ */
+ if (!data)
+ error("failed to apply delta");
+
+ free(delta_data);
+ free(external_base);
+ }
+
+ if (final_type)
+ *final_type = type;
+ if (final_size)
+ *final_size = size;
+
+out:
+ unuse_pack(&w_curs);
+
+ if (delta_stack != small_delta_stack)
+ free(delta_stack);
+
+ return data;
+}
+
+const unsigned char *nth_packed_object_sha1(struct packed_git *p,
+ uint32_t n)
+{
+ const unsigned char *index = p->index_data;
+ if (!index) {
+ if (open_pack_index(p))
+ return NULL;
+ index = p->index_data;
+ }
+ if (n >= p->num_objects)
+ return NULL;
+ index += 4 * 256;
+ if (p->index_version == 1) {
+ return index + 24 * n + 4;
+ } else {
+ index += 8;
+ return index + 20 * n;
+ }
+}
+
+const struct object_id *nth_packed_object_oid(struct object_id *oid,
+ struct packed_git *p,
+ uint32_t n)
+{
+ const unsigned char *hash = nth_packed_object_sha1(p, n);
+ if (!hash)
+ return NULL;
+ hashcpy(oid->hash, hash);
+ return oid;
+}
+
+void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
+{
+ const unsigned char *ptr = vptr;
+ const unsigned char *start = p->index_data;
+ const unsigned char *end = start + p->index_size;
+ if (ptr < start)
+ die(_("offset before start of pack index for %s (corrupt index?)"),
+ p->pack_name);
+ /* No need to check for underflow; .idx files must be at least 8 bytes */
+ if (ptr >= end - 8)
+ die(_("offset beyond end of pack index for %s (truncated index?)"),
+ p->pack_name);
+}
+
+off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n)
+{
+ const unsigned char *index = p->index_data;
+ index += 4 * 256;
+ if (p->index_version == 1) {
+ return ntohl(*((uint32_t *)(index + 24 * n)));
+ } else {
+ uint32_t off;
+ index += 8 + p->num_objects * (20 + 4);
+ off = ntohl(*((uint32_t *)(index + 4 * n)));
+ if (!(off & 0x80000000))
+ return off;
+ index += p->num_objects * 4 + (off & 0x7fffffff) * 8;
+ check_pack_index_ptr(p, index);
+ return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) |
+ ntohl(*((uint32_t *)(index + 4)));
+ }
+}
+
+off_t find_pack_entry_one(const unsigned char *sha1,
+ struct packed_git *p)
+{
+ const uint32_t *level1_ofs = p->index_data;
+ const unsigned char *index = p->index_data;
+ unsigned hi, lo, stride;
+ static int debug_lookup = -1;
+
+ if (debug_lookup < 0)
+ debug_lookup = !!getenv("GIT_DEBUG_LOOKUP");
+
+ if (!index) {
+ if (open_pack_index(p))
+ return 0;
+ level1_ofs = p->index_data;
+ index = p->index_data;
+ }
+ if (p->index_version > 1) {
+ level1_ofs += 2;
+ index += 8;
+ }
+ index += 4 * 256;
+ hi = ntohl(level1_ofs[*sha1]);
+ lo = ((*sha1 == 0x0) ? 0 : ntohl(level1_ofs[*sha1 - 1]));
+ if (p->index_version > 1) {
+ stride = 20;
+ } else {
+ stride = 24;
+ index += 4;
+ }
+
+ if (debug_lookup)
+ printf("%02x%02x%02x... lo %u hi %u nr %"PRIu32"\n",
+ sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
+
+ while (lo < hi) {
+ unsigned mi = lo + (hi - lo) / 2;
+ int cmp = hashcmp(index + mi * stride, sha1);
+
+ if (debug_lookup)
+ printf("lo %u hi %u rg %u mi %u\n",
+ lo, hi, hi - lo, mi);
+ if (!cmp)
+ return nth_packed_object_offset(p, mi);
+ if (cmp > 0)
+ hi = mi;
+ else
+ lo = mi+1;
+ }
+ return 0;
+}
+
+int is_pack_valid(struct packed_git *p)
+{
+ /* An already open pack is known to be valid. */
+ if (p->pack_fd != -1)
+ return 1;
+
+ /* If the pack has one window completely covering the
+ * file size, the pack is known to be valid even if
+ * the descriptor is not currently open.
+ */
+ if (p->windows) {
+ struct pack_window *w = p->windows;
+
+ if (!w->offset && w->len == p->pack_size)
+ return 1;
+ }
+
+ /* Force the pack to open to prove its valid. */
+ return !open_packed_git(p);
+}
+
+struct packed_git *find_sha1_pack(const unsigned char *sha1,
+ struct packed_git *packs)
+{
+ struct packed_git *p;
+
+ for (p = packs; p; p = p->next) {
+ if (find_pack_entry_one(sha1, p))
+ return p;
+ }
+ return NULL;
+
+}
+
+static int fill_pack_entry(const unsigned char *sha1,
+ struct pack_entry *e,
+ struct packed_git *p)
+{
+ off_t offset;
+
+ if (p->num_bad_objects) {
+ unsigned i;
+ for (i = 0; i < p->num_bad_objects; i++)
+ if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
+ return 0;
+ }
+
+ offset = find_pack_entry_one(sha1, p);
+ if (!offset)
+ return 0;
+
+ /*
+ * We are about to tell the caller where they can locate the
+ * requested object. We better make sure the packfile is
+ * still here and can be accessed before supplying that
+ * answer, as it may have been deleted since the index was
+ * loaded!
+ */
+ if (!is_pack_valid(p))
+ return 0;
+ e->offset = offset;
+ e->p = p;
+ hashcpy(e->sha1, sha1);
+ return 1;
+}
+
+/*
+ * Iff a pack file contains the object named by sha1, return true and
+ * store its location to e.
+ */
+int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
+{
+ struct mru_entry *p;
+
+ prepare_packed_git();
+ if (!packed_git)
+ return 0;
+
+ for (p = packed_git_mru.head; p; p = p->next) {
+ if (fill_pack_entry(sha1, e, p->item)) {
+ mru_mark(&packed_git_mru, p);
+ return 1;
+ }
+ }
+ return 0;
+}
+
+int has_sha1_pack(const unsigned char *sha1)
+{
+ struct pack_entry e;
+ return find_pack_entry(sha1, &e);
+}
+
+int has_pack_index(const unsigned char *sha1)
+{
+ struct stat st;
+ if (stat(sha1_pack_index_name(sha1), &st))
+ return 0;
+ return 1;
+}
+
+static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void *data)
+{
+ uint32_t i;
+ int r = 0;
+
+ for (i = 0; i < p->num_objects; i++) {
+ struct object_id oid;
+
+ if (!nth_packed_object_oid(&oid, p, i))
+ return error("unable to get sha1 of object %u in %s",
+ i, p->pack_name);
+
+ r = cb(&oid, p, i, data);
+ if (r)
+ break;
+ }
+ return r;
+}
+
+int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
+{
+ struct packed_git *p;
+ int r = 0;
+ int pack_errors = 0;
+
+ prepare_packed_git();
+ for (p = packed_git; p; p = p->next) {
+ if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
+ continue;
+ if (open_pack_index(p)) {
+ pack_errors = 1;
+ continue;
+ }
+ r = for_each_object_in_pack(p, cb, data);
+ if (r)
+ break;
+ }
+ return r ? r : pack_errors;
+}
diff --git a/packfile.h b/packfile.h
new file mode 100644
index 0000000..0cdeb54
--- /dev/null
+++ b/packfile.h
@@ -0,0 +1,138 @@
+#ifndef PACKFILE_H
+#define PACKFILE_H
+
+/*
+ * Generate the filename to be used for a pack file with checksum "sha1" and
+ * extension "ext". The result is written into the strbuf "buf", overwriting
+ * any existing contents. A pointer to buf->buf is returned as a convenience.
+ *
+ * Example: odb_pack_name(out, sha1, "idx") => ".git/objects/pack/pack-1234..idx"
+ */
+extern char *odb_pack_name(struct strbuf *buf, const unsigned char *sha1, const char *ext);
+
+/*
+ * Return the name of the (local) packfile with the specified sha1 in
+ * its name. The return value is a pointer to memory that is
+ * overwritten each time this function is called.
+ */
+extern char *sha1_pack_name(const unsigned char *sha1);
+
+/*
+ * Return the name of the (local) pack index file with the specified
+ * sha1 in its name. The return value is a pointer to memory that is
+ * overwritten each time this function is called.
+ */
+extern char *sha1_pack_index_name(const unsigned char *sha1);
+
+extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
+
+/* A hook to report invalid files in pack directory */
+#define PACKDIR_FILE_PACK 1
+#define PACKDIR_FILE_IDX 2
+#define PACKDIR_FILE_GARBAGE 4
+extern void (*report_garbage)(unsigned seen_bits, const char *path);
+
+extern void prepare_packed_git(void);
+extern void reprepare_packed_git(void);
+extern void install_packed_git(struct packed_git *pack);
+
+/*
+ * Give a rough count of objects in the repository. This sacrifices accuracy
+ * for speed.
+ */
+unsigned long approximate_object_count(void);
+
+extern struct packed_git *find_sha1_pack(const unsigned char *sha1,
+ struct packed_git *packs);
+
+extern void pack_report(void);
+
+/*
+ * mmap the index file for the specified packfile (if it is not
+ * already mmapped). Return 0 on success.
+ */
+extern int open_pack_index(struct packed_git *);
+
+/*
+ * munmap the index file for the specified packfile (if it is
+ * currently mmapped).
+ */
+extern void close_pack_index(struct packed_git *);
+
+extern unsigned char *use_pack(struct packed_git *, struct pack_window **, off_t, unsigned long *);
+extern void close_pack_windows(struct packed_git *);
+extern void close_all_packs(void);
+extern void unuse_pack(struct pack_window **);
+extern void clear_delta_base_cache(void);
+extern struct packed_git *add_packed_git(const char *path, size_t path_len, int local);
+
+/*
+ * Make sure that a pointer access into an mmap'd index file is within bounds,
+ * and can provide at least 8 bytes of data.
+ *
+ * Note that this is only necessary for variable-length segments of the file
+ * (like the 64-bit extended offset table), as we compare the size to the
+ * fixed-length parts when we open the file.
+ */
+extern void check_pack_index_ptr(const struct packed_git *p, const void *ptr);
+
+/*
+ * Return the SHA-1 of the nth object within the specified packfile.
+ * Open the index if it is not already open. The return value points
+ * at the SHA-1 within the mmapped index. Return NULL if there is an
+ * error.
+ */
+extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t n);
+/*
+ * Like nth_packed_object_sha1, but write the data into the object specified by
+ * the the first argument. Returns the first argument on success, and NULL on
+ * error.
+ */
+extern const struct object_id *nth_packed_object_oid(struct object_id *, struct packed_git *, uint32_t n);
+
+/*
+ * Return the offset of the nth object within the specified packfile.
+ * The index must already be opened.
+ */
+extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t n);
+
+/*
+ * If the object named sha1 is present in the specified packfile,
+ * return its offset within the packfile; otherwise, return 0.
+ */
+extern off_t find_pack_entry_one(const unsigned char *sha1, struct packed_git *);
+
+extern int is_pack_valid(struct packed_git *);
+extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
+extern unsigned long unpack_object_header_buffer(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
+extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
+extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
+
+extern void release_pack_memory(size_t);
+
+/* global flag to enable extra checks when accessing packed objects */
+extern int do_check_packed_object_crc;
+
+extern int packed_object_info(struct packed_git *pack, off_t offset, struct object_info *);
+
+extern void mark_bad_packed_object(struct packed_git *p, const unsigned char *sha1);
+extern const struct packed_git *has_packed_and_bad(const unsigned char *sha1);
+
+extern int find_pack_entry(const unsigned char *sha1, struct pack_entry *e);
+
+extern int has_sha1_pack(const unsigned char *sha1);
+
+extern int has_pack_index(const unsigned char *sha1);
+
+/*
+ * Iterate over packed objects in both the local
+ * repository and any alternates repositories (unless the
+ * FOR_EACH_OBJECT_LOCAL_ONLY flag, defined in cache.h, is set).
+ */
+typedef int each_packed_object_fn(const struct object_id *oid,
+ struct packed_git *pack,
+ uint32_t pos,
+ void *data);
+extern int for_each_packed_object(each_packed_object_fn, void *, unsigned flags);
+
+#endif
diff --git a/pager.c b/pager.c
index 4dd9e1b..92b23e6 100644
--- a/pager.c
+++ b/pager.c
@@ -194,7 +194,7 @@
const char *cmd;
if (skip_prefix(var, "pager.", &cmd) && !strcmp(cmd, data->cmd)) {
- int b = git_config_maybe_bool(var, value);
+ int b = git_parse_maybe_bool(value);
if (b >= 0)
data->want = b;
else {
diff --git a/parse-options.c b/parse-options.c
index 0dd9fc6..fca7159 100644
--- a/parse-options.c
+++ b/parse-options.c
@@ -581,6 +581,7 @@
const struct option *opts, int full, int err)
{
FILE *outfile = err ? stderr : stdout;
+ int need_newline;
if (!usagestr)
return PARSE_OPT_HELP;
@@ -599,12 +600,11 @@
if (**usagestr)
fprintf_ln(outfile, _(" %s"), _(*usagestr));
else
- putchar('\n');
+ fputc('\n', outfile);
usagestr++;
}
- if (opts->type != OPTION_GROUP)
- fputc('\n', outfile);
+ need_newline = 1;
for (; opts->type != OPTION_END; opts++) {
size_t pos;
@@ -612,6 +612,7 @@
if (opts->type == OPTION_GROUP) {
fputc('\n', outfile);
+ need_newline = 0;
if (*opts->help)
fprintf(outfile, "%s\n", _(opts->help));
continue;
@@ -619,6 +620,11 @@
if (!full && (opts->flags & PARSE_OPT_HIDDEN))
continue;
+ if (need_newline) {
+ fputc('\n', outfile);
+ need_newline = 0;
+ }
+
pos = fprintf(outfile, " ");
if (opts->short_name) {
if (opts->flags & PARSE_OPT_NODASH)
diff --git a/patch-ids.c b/patch-ids.c
index b4166b0..8f7c25d 100644
--- a/patch-ids.c
+++ b/patch-ids.c
@@ -35,11 +35,16 @@
* the side of safety. The actual value being negative does not have
* any significance; only that it is non-zero matters.
*/
-static int patch_id_cmp(struct diff_options *opt,
- struct patch_id *a,
- struct patch_id *b,
+static int patch_id_cmp(const void *cmpfn_data,
+ const void *entry,
+ const void *entry_or_key,
const void *unused_keydata)
{
+ /* NEEDSWORK: const correctness? */
+ struct diff_options *opt = (void *)cmpfn_data;
+ struct patch_id *a = (void *)entry;
+ struct patch_id *b = (void *)entry_or_key;
+
if (is_null_oid(&a->patch_id) &&
commit_patch_id(a->commit, opt, &a->patch_id, 0))
return error("Could not get patch ID for %s",
@@ -56,10 +61,9 @@
memset(ids, 0, sizeof(*ids));
diff_setup(&ids->diffopts);
ids->diffopts.detect_rename = 0;
- DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
+ ids->diffopts.flags.recursive = 1;
diff_setup_done(&ids->diffopts);
- hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp,
- &ids->diffopts, 256);
+ hashmap_init(&ids->patches, patch_id_cmp, &ids->diffopts, 256);
return 0;
}
diff --git a/path.c b/path.c
index 335d4dd..da8b655 100644
--- a/path.c
+++ b/path.c
@@ -9,6 +9,7 @@
#include "worktree.h"
#include "submodule-config.h"
#include "path.h"
+#include "packfile.h"
static int get_st_mode_bits(const char *path, int *mode)
{
@@ -191,7 +192,7 @@
* Split this node: child will contain this node's
* existing children.
*/
- child = malloc(sizeof(*child));
+ child = xmalloc(sizeof(*child));
memcpy(child->children, root->children, sizeof(root->children));
child->len = root->len - i - 1;
@@ -716,7 +717,7 @@
if (!home)
goto return_null;
if (real_home)
- strbuf_addstr(&user_path, real_path(home));
+ strbuf_add_real_path(&user_path, home);
else
strbuf_addstr(&user_path, home);
#ifdef GIT_WINDOWS_NATIVE
diff --git a/path.h b/path.h
index 9541620..1ccd037 100644
--- a/path.h
+++ b/path.h
@@ -4,53 +4,144 @@
struct repository;
/*
- * Return a statically allocated filename, either generically (mkpath), in
- * the repository directory (git_path), or in a submodule's repository
- * directory (git_path_submodule). In all cases, note that the result
- * may be overwritten by another call to _any_ of the functions. Consider
- * using the safer "dup" or "strbuf" formats below (in some cases, the
- * unsafe versions have already been removed).
+ * The result to all functions which return statically allocated memory may be
+ * overwritten by another call to _any_ one of these functions. Consider using
+ * the safer variants which operate on strbufs or return allocated memory.
*/
-extern const char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
-extern const char *git_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
-extern const char *git_common_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
+/*
+ * Return a statically allocated path.
+ */
+extern const char *mkpath(const char *fmt, ...)
+ __attribute__((format (printf, 1, 2)));
+
+/*
+ * Return a path.
+ */
+extern char *mkpathdup(const char *fmt, ...)
+ __attribute__((format (printf, 1, 2)));
+
+/*
+ * Construct a path and place the result in the provided buffer `buf`.
+ */
extern char *mksnpath(char *buf, size_t n, const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
-extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
- __attribute__((format (printf, 2, 3)));
+
+/*
+ * The `git_common_path` family of functions will construct a path into a
+ * repository's common git directory, which is shared by all worktrees.
+ */
+
+/*
+ * Constructs a path into the common git directory of repository `repo` and
+ * append it in the provided buffer `sb`.
+ */
extern void strbuf_git_common_path(struct strbuf *sb,
const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
-extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
- __attribute__((format (printf, 2, 3)));
-extern int strbuf_git_path_submodule(struct strbuf *sb, const char *path,
- const char *fmt, ...)
- __attribute__((format (printf, 3, 4)));
-extern char *git_pathdup(const char *fmt, ...)
- __attribute__((format (printf, 1, 2)));
-extern char *mkpathdup(const char *fmt, ...)
- __attribute__((format (printf, 1, 2)));
-extern char *git_pathdup_submodule(const char *path, const char *fmt, ...)
- __attribute__((format (printf, 2, 3)));
+/*
+ * Return a statically allocated path into the main repository's
+ * (the_repository) common git directory.
+ */
+extern const char *git_common_path(const char *fmt, ...)
+ __attribute__((format (printf, 1, 2)));
+
+
+/*
+ * The `git_path` family of functions will construct a path into a repository's
+ * git directory.
+ *
+ * These functions will perform adjustments to the resultant path to account
+ * for special paths which are either considered common among worktrees (e.g.
+ * paths into the object directory) or have been explicitly set via an
+ * environment variable or config (e.g. path to the index file).
+ *
+ * For an exhaustive list of the adjustments made look at `common_list` and
+ * `adjust_git_path` in path.c.
+ */
+
+/*
+ * Return a path into the git directory of repository `repo`.
+ */
extern char *repo_git_path(const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
+
+/*
+ * Construct a path into the git directory of repository `repo` and append it
+ * to the provided buffer `sb`.
+ */
extern void strbuf_repo_git_path(struct strbuf *sb,
const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
+/*
+ * Return a statically allocated path into the main repository's
+ * (the_repository) git directory.
+ */
+extern const char *git_path(const char *fmt, ...)
+ __attribute__((format (printf, 1, 2)));
+
+/*
+ * Return a path into the main repository's (the_repository) git directory.
+ */
+extern char *git_pathdup(const char *fmt, ...)
+ __attribute__((format (printf, 1, 2)));
+
+/*
+ * Construct a path into the main repository's (the_repository) git directory
+ * and place it in the provided buffer `buf`, the contents of the buffer will
+ * be overridden.
+ */
+extern char *git_path_buf(struct strbuf *buf, const char *fmt, ...)
+ __attribute__((format (printf, 2, 3)));
+
+/*
+ * Construct a path into the main repository's (the_repository) git directory
+ * and append it to the provided buffer `sb`.
+ */
+extern void strbuf_git_path(struct strbuf *sb, const char *fmt, ...)
+ __attribute__((format (printf, 2, 3)));
+
+/*
+ * Return a path into the worktree of repository `repo`.
+ *
+ * If the repository doesn't have a worktree NULL is returned.
+ */
extern char *repo_worktree_path(const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 2, 3)));
+
+/*
+ * Construct a path into the worktree of repository `repo` and append it
+ * to the provided buffer `sb`.
+ *
+ * If the repository doesn't have a worktree nothing will be appended to `sb`.
+ */
extern void strbuf_repo_worktree_path(struct strbuf *sb,
const struct repository *repo,
const char *fmt, ...)
__attribute__((format (printf, 3, 4)));
+/*
+ * Return a path into a submodule's git directory located at `path`. `path`
+ * must only reference a submodule of the main repository (the_repository).
+ */
+extern char *git_pathdup_submodule(const char *path, const char *fmt, ...)
+ __attribute__((format (printf, 2, 3)));
+
+/*
+ * Construct a path into a submodule's git directory located at `path` and
+ * append it to the provided buffer `sb`. `path` must only reference a
+ * submodule of the main repository (the_repository).
+ */
+extern int strbuf_git_path_submodule(struct strbuf *sb, const char *path,
+ const char *fmt, ...)
+ __attribute__((format (printf, 3, 4)));
+
extern void report_linked_checkout_garbage(void);
/*
diff --git a/pathspec.c b/pathspec.c
index e2a23eb..82eb39c 100644
--- a/pathspec.c
+++ b/pathspec.c
@@ -526,17 +526,13 @@
pattern, sb.buf);
}
-/*
- * Given command line arguments and a prefix, convert the input to
- * pathspec. die() if any magic in magic_mask is used.
- */
void parse_pathspec(struct pathspec *pathspec,
unsigned magic_mask, unsigned flags,
const char *prefix, const char **argv)
{
struct pathspec_item *item;
const char *entry = argv ? *argv : NULL;
- int i, n, prefixlen, warn_empty_string, nr_exclude = 0;
+ int i, n, prefixlen, nr_exclude = 0;
memset(pathspec, 0, sizeof(*pathspec));
@@ -569,13 +565,10 @@
}
n = 0;
- warn_empty_string = 1;
while (argv[n]) {
- if (*argv[n] == '\0' && warn_empty_string) {
- warning(_("empty strings as pathspecs will be made invalid in upcoming releases. "
- "please use . instead if you meant to match all paths"));
- warn_empty_string = 0;
- }
+ if (*argv[n] == '\0')
+ die("empty string is not a valid pathspec. "
+ "please use . instead if you meant to match all paths");
n++;
}
diff --git a/pathspec.h b/pathspec.h
index 60e6500..099a170 100644
--- a/pathspec.h
+++ b/pathspec.h
@@ -24,6 +24,7 @@
int nr;
unsigned int has_wildcard:1;
unsigned int recursive:1;
+ unsigned int recurse_submodules:1;
unsigned magic;
int max_depth;
struct pathspec_item {
@@ -70,6 +71,13 @@
*/
#define PATHSPEC_LITERAL_PATH (1<<6)
+/*
+ * Given command line arguments and a prefix, convert the input to
+ * pathspec. die() if any magic in magic_mask is used.
+ *
+ * Any arguments used are copied. It is safe for the caller to modify
+ * or free 'prefix' and 'args' after calling this function.
+ */
extern void parse_pathspec(struct pathspec *pathspec,
unsigned magic_mask,
unsigned flags,
diff --git a/perl/Git/Packet.pm b/perl/Git/Packet.pm
new file mode 100644
index 0000000..b75738b
--- /dev/null
+++ b/perl/Git/Packet.pm
@@ -0,0 +1,173 @@
+package Git::Packet;
+use 5.008;
+use strict;
+use warnings;
+BEGIN {
+ require Exporter;
+ if ($] < 5.008003) {
+ *import = \&Exporter::import;
+ } else {
+ # Exporter 5.57 which supports this invocation was
+ # released with perl 5.8.3
+ Exporter->import('import');
+ }
+}
+
+our @EXPORT = qw(
+ packet_compare_lists
+ packet_bin_read
+ packet_txt_read
+ packet_key_val_read
+ packet_bin_write
+ packet_txt_write
+ packet_flush
+ packet_initialize
+ packet_read_capabilities
+ packet_read_and_check_capabilities
+ packet_check_and_write_capabilities
+ );
+our @EXPORT_OK = @EXPORT;
+
+sub packet_compare_lists {
+ my ($expect, @result) = @_;
+ my $ix;
+ if (scalar @$expect != scalar @result) {
+ return undef;
+ }
+ for ($ix = 0; $ix < $#result; $ix++) {
+ if ($expect->[$ix] ne $result[$ix]) {
+ return undef;
+ }
+ }
+ return 1;
+}
+
+sub packet_bin_read {
+ my $buffer;
+ my $bytes_read = read STDIN, $buffer, 4;
+ if ( $bytes_read == 0 ) {
+ # EOF - Git stopped talking to us!
+ return ( -1, "" );
+ } elsif ( $bytes_read != 4 ) {
+ die "invalid packet: '$buffer'";
+ }
+ my $pkt_size = hex($buffer);
+ if ( $pkt_size == 0 ) {
+ return ( 1, "" );
+ } elsif ( $pkt_size > 4 ) {
+ my $content_size = $pkt_size - 4;
+ $bytes_read = read STDIN, $buffer, $content_size;
+ if ( $bytes_read != $content_size ) {
+ die "invalid packet ($content_size bytes expected; $bytes_read bytes read)";
+ }
+ return ( 0, $buffer );
+ } else {
+ die "invalid packet size: $pkt_size";
+ }
+}
+
+sub remove_final_lf_or_die {
+ my $buf = shift;
+ if ( $buf =~ s/\n$// ) {
+ return $buf;
+ }
+ die "A non-binary line MUST be terminated by an LF.\n"
+ . "Received: '$buf'";
+}
+
+sub packet_txt_read {
+ my ( $res, $buf ) = packet_bin_read();
+ if ( $res != -1 and $buf ne '' ) {
+ $buf = remove_final_lf_or_die($buf);
+ }
+ return ( $res, $buf );
+}
+
+# Read a text packet, expecting that it is in the form "key=value" for
+# the given $key. An EOF does not trigger any error and is reported
+# back to the caller (like packet_txt_read() does). Die if the "key"
+# part of "key=value" does not match the given $key, or the value part
+# is empty.
+sub packet_key_val_read {
+ my ( $key ) = @_;
+ my ( $res, $buf ) = packet_txt_read();
+ if ( $res == -1 or ( $buf =~ s/^$key=// and $buf ne '' ) ) {
+ return ( $res, $buf );
+ }
+ die "bad $key: '$buf'";
+}
+
+sub packet_bin_write {
+ my $buf = shift;
+ print STDOUT sprintf( "%04x", length($buf) + 4 );
+ print STDOUT $buf;
+ STDOUT->flush();
+}
+
+sub packet_txt_write {
+ packet_bin_write( $_[0] . "\n" );
+}
+
+sub packet_flush {
+ print STDOUT sprintf( "%04x", 0 );
+ STDOUT->flush();
+}
+
+sub packet_initialize {
+ my ($name, $version) = @_;
+
+ packet_compare_lists([0, $name . "-client"], packet_txt_read()) ||
+ die "bad initialize";
+ packet_compare_lists([0, "version=" . $version], packet_txt_read()) ||
+ die "bad version";
+ packet_compare_lists([1, ""], packet_bin_read()) ||
+ die "bad version end";
+
+ packet_txt_write( $name . "-server" );
+ packet_txt_write( "version=" . $version );
+ packet_flush();
+}
+
+sub packet_read_capabilities {
+ my @cap;
+ while (1) {
+ my ( $res, $buf ) = packet_bin_read();
+ if ( $res == -1 ) {
+ die "unexpected EOF when reading capabilities";
+ }
+ return ( $res, @cap ) if ( $res != 0 );
+ $buf = remove_final_lf_or_die($buf);
+ unless ( $buf =~ s/capability=// ) {
+ die "bad capability buf: '$buf'";
+ }
+ push @cap, $buf;
+ }
+}
+
+# Read remote capabilities and check them against capabilities we require
+sub packet_read_and_check_capabilities {
+ my @required_caps = @_;
+ my ($res, @remote_caps) = packet_read_capabilities();
+ my %remote_caps = map { $_ => 1 } @remote_caps;
+ foreach (@required_caps) {
+ unless (exists($remote_caps{$_})) {
+ die "required '$_' capability not available from remote" ;
+ }
+ }
+ return %remote_caps;
+}
+
+# Check our capabilities we want to advertise against the remote ones
+# and then advertise our capabilities
+sub packet_check_and_write_capabilities {
+ my ($remote_caps, @our_caps) = @_;
+ foreach (@our_caps) {
+ unless (exists($remote_caps->{$_})) {
+ die "our capability '$_' is not available from remote"
+ }
+ packet_txt_write( "capability=" . $_ );
+ }
+ packet_flush();
+}
+
+1;
diff --git a/perl/Makefile b/perl/Makefile
index 15d96fc..f657de2 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -30,6 +30,7 @@
modules += Git
modules += Git/I18N
modules += Git/IndexInfo
+modules += Git/Packet
modules += Git/SVN
modules += Git/SVN/Memoize/YAML
modules += Git/SVN/Fetcher
diff --git a/pkt-line.c b/pkt-line.c
index 647bbd3..2827ca7 100644
--- a/pkt-line.c
+++ b/pkt-line.c
@@ -188,6 +188,12 @@
return 0;
}
+void packet_write(int fd_out, const char *buf, size_t size)
+{
+ if (packet_write_gently(fd_out, buf, size))
+ die_errno("packet write failed");
+}
+
void packet_buf_write(struct strbuf *buf, const char *fmt, ...)
{
va_list args;
@@ -258,7 +264,7 @@
}
/* And complain if we didn't get enough bytes to satisfy the read. */
- if (ret < size) {
+ if (ret != size) {
if (options & PACKET_READ_GENTLE_ON_EOF)
return -1;
diff --git a/pkt-line.h b/pkt-line.h
index 66ef610..3dad583 100644
--- a/pkt-line.h
+++ b/pkt-line.h
@@ -22,6 +22,7 @@
void packet_flush(int fd);
void packet_write_fmt(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
void packet_buf_flush(struct strbuf *buf);
+void packet_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)));
int packet_flush_gently(int fd);
int packet_write_fmt_gently(int fd, const char *fmt, ...) __attribute__((format (printf, 2, 3)));
diff --git a/po/TEAMS b/po/TEAMS
index b3184cb..065771c 100644
--- a/po/TEAMS
+++ b/po/TEAMS
@@ -20,6 +20,10 @@
Matthias Rüster <matthias.ruester@gmail.com>
Magnus Görlitz <magnus.goerlitz@googlemail.com>
+Language: es (Spanish)
+Repository: https://github.com/ChrisADR/git-po
+Leader: Christopher Díaz <christopher.diaz.riv@gmail.com>
+
Language: fr (French)
Repository: https://github.com/jnavila/git
Leader: Jean-Noël Avila <jn.avila@free.fr>
@@ -34,8 +38,10 @@
Members: Stefano Lattarini <stefano.lattarini AT gmail.com>
Language: ko (Korean)
-Repository: https://github.com/changwoo/git-l10n-ko/
+Repository: https://github.com/git-l10n-ko/git-l10n-ko/
Leader: Changwoo Ryu <cwryu@debian.org>
+Members: Gwan-gyeong Mun <elongbug@gmail.com>
+ Sihyeon Jang <uneedsihyeon@gmail.com>
Language: pt_PT (Portuguese - Portugal)
Repository: https://github.com/vascool/git-po-pt/
@@ -61,3 +67,4 @@
Leader: Jiang Xin <worldhello.net AT gmail.com>
Members: Ray Chen <oldsharp AT gmail.com>
依云 <lilydjwg AT gmail.com>
+ Fangyi Zhou <fangyi.zhou AT yuriko.moe>
diff --git a/po/bg.po b/po/bg.po
index 19be171..a37d5df 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 Alexander Shopov <ash@kambanaria.org>.
+# Copyright (C) 2014, 2015, 2016, 2017, 2018 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.
+# Alexander Shopov <ash@kambanaria.org>, 2014, 2015, 2016, 2017, 2018.
#
# ========================
# DICTIONARY TO MERGE IN GIT GUI
@@ -78,10 +78,16 @@
# hunk парче
# binary patch двоична кръпка
# reverse-apply прилагам в обратна посока
-# todo file команден файл
+# todo file файл с команди
# alternate алтернативен източник
# superproject обхващащ проект
# split index разделяне на индекса
+# truncate отрязвам
+# format string форматиращ низ
+# hook кука
+# ignored (file) игнориран, понякога - пропуснат
+# manual, man page ръководство
+# guide въведение
# ------------------------
# „$var“ - може да не сработва за shell има gettext и eval_gettext - проверка - намират се лесно по „$
# ------------------------
@@ -94,8 +100,8 @@
msgstr ""
"Project-Id-Version: git master\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-24 17:26+0200\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-11 22:01+0100\n"
"Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
"Language-Team: Bulgarian <dict@fsa-bg.org>\n"
"Language: bg\n"
@@ -104,61 +110,61 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "Подсказка: %.*s\n"
-#: advice.c:86
+#: advice.c:90
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Отбирането на подавания е блокирано от неслети файлове."
-#: advice.c:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr "Подаването е блокирано от неслети файлове."
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr "Сливането е блокирано от неслети файлове."
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr "Издърпването е блокирано от неслети файлове."
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr "Отмяната е блокирана от неслети файлове."
-#: advice.c:96
+#: advice.c:100
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Действието „%s“ е блокирано от неслети файлове."
-#: advice.c:104
+#: advice.c:108
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr ""
-"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“\n"
+"Редактирайте ги в работното дърво, и тогава ползвайте „git add/rm ФАЙЛ“,\n"
"за да отбележите коригирането им. След това извършете подаването."
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "Изход от програмата заради некоригиран конфликт."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува)."
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "Промените трябва да се подадат преди сливане."
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "Изход от програмата заради незавършено сливане."
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -182,7 +188,7 @@
"\n"
"Ако искате да създадете нов клон, за да запазите подаванията си, можете да\n"
"направите това като зададете име на клон към опцията „-b“ на командата\n"
-"„commit“. Например:\n"
+"„commit“. Например:\n"
"\n"
" git checkout -b ИМЕ_НА_НОВ_КЛОН\n"
"\n"
@@ -197,90 +203,90 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "непозната опция за игнориране на знаците за интервали „%s“"
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "опциите „--reject“ и „--3way“ са несъвместими"
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "опциите „--cached“ и „--3way“ са несъвместими"
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "като „--3way“, но извън хранилище"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "като „--index“, но извън хранилище"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "като „--cached“, но извън хранилище"
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Регулярният израз за времето „%s“ не може за бъде компилиран"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Регулярният израз върна %d при подадена последователност „%s“ на входа"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Липсва име на файл на ред %d от кръпката"
-#: apply.c:967
+#: apply.c:942
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %2$d се очакваше „/dev/"
"null“, а бе получен „%1$s“"
-#: apply.c:973
+#: apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на нов файл"
-#: apply.c:974
+#: apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d бе получено "
"неправилно име на стар файл"
-#: apply.c:979
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
"git apply: лош изход от командата „git-diff“ — на ред %d се очакваше „/dev/"
"null“"
-#: apply.c:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "грешен режим на ред №%d: %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "несъвместими заглавни части на редове №%d и №%d"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "при повторното преброяване бе получен неочакван ред: „%.*s“"
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "част от кръпка без заглавна част на ред %d: %.*s"
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -295,71 +301,71 @@
"След съкращаването на първите %d части от компонентите на пътя, в заглавната "
"част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: apply.c:1600
+#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
"в заглавната част на „git diff“ липсва информация за име на файл (ред: %d)"
-#: apply.c:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "новият файл зависи от старото съдържание на файла"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "изтритият файл не е празен"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "грешка в кръпката на ред %d"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "новият файл „%s“ зависи от старото съдържание на файла"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "изтритият файл „%s“ не е празен"
-#: apply.c:1848
+#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "● предупреждение: файлът „%s“ вече е празен, но не е изтрит"
-#: apply.c:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "грешка в двоичната кръпка на ред %d: %.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неразпозната двоичната кръпка на ред %d"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "кръпката е с изцяло повредени данни на ред %d"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправилно начало на ред: „%c“"
-#: apply.c:3052
+#: apply.c:3055
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -368,13 +374,13 @@
msgstr[1] ""
"%d-то парче код бе успешно приложено на ред %d (отместване от %d реда)."
-#: apply.c:3064
+#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
"Контекстът е намален на (%ld/%ld) за прилагането на парчето код на ред %d"
-#: apply.c:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -383,316 +389,316 @@
"при търсене за:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "липсват данните за двоичната кръпка за „%s“"
-#: apply.c:3100
+#: apply.c:3103
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"двоичната кръпка не може да се приложи в обратна посока, когато обратното "
"парче за „%s“ липсва"
-#: apply.c:3146
+#: apply.c:3149
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "към „%s“ не може да се приложи двоична кръпка без пълен индекс"
-#: apply.c:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "кръпката съответства на „%s“ (%s), който не съвпада по съдържание."
-#: apply.c:3164
+#: apply.c:3167
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "кръпката съответства на „%s“, който трябва да е празен, но не е"
-#: apply.c:3182
+#: apply.c:3185
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
"необходимият резултат след операцията — „%s“ за „%s“ не може да бъде "
"прочетен"
-#: apply.c:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "двоичната кръпка не може да бъде приложена върху „%s“"
-#: apply.c:3201
+#: apply.c:3204
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"двоичната кръпка за „%s“ води до неправилни резултати (очакваше се: „%s“, а "
"бе получено: „%s“)"
-#: apply.c:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "неуспешно прилагане на кръпка: „%s:%ld“"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "„%s“ не може да се изтегли"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "изчитане на „%s“ след проследяване на символна връзка"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "обектът с път „%s“ е преименуван или изтрит"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "„%s“ не съществува в индекса"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "„%s“ не съответства на индекса"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"в хранилището липсват необходимите обекти BLOB, за да се премине към тройно "
"сливане."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Преминаване към тройно сливане…\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "текущото съдържание на „%s“ не може да бъде прочетено"
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Неуспешно преминаване към тройно сливане…\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Конфликти при прилагането на кръпката към „%s“.\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Кръпката бе приложена чисто към „%s“.\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "изтриващата кръпка оставя файла непразен"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "„%s“: неправилен вид"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "„%s“ е от вид „%o“, а се очакваше „%o“"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "неправилен път: „%s“"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "„%s“: вече съществува в индекса"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "„%s“: вече съществува в работното дърво"
-#: apply.c:3941
+#: apply.c:3945
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новите права за достъп (%o) на „%s“ не съвпадат със старите (%o)"
-#: apply.c:3946
+#: apply.c:3950
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
"новите права за достъп (%o) на „%s“ не съвпадат със старите (%o) на „%s“"
-#: apply.c:3966
+#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "засегнатият файл „%s“ е след символна връзка"
-#: apply.c:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "Проверяване на кръпката „%s“…"
-#: apply.c:4076
+#: apply.c:4080
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
"информацията за сумата по SHA1 за подмодула липсва или не е достатъчна (%s)."
-#: apply.c:4083
+#: apply.c:4087
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "смяна на режима на достъпа на „%s“, който не е в текущия връх „HEAD“"
-#: apply.c:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информацията за сумата по SHA1 липсва или не е достатъчна (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "неуспешно създаване на запис в кеша чрез „make_cache_entry“ за „%s“"
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "„%s“ не може да се добави към временния индекс"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "временният индекс не може да се запази в „%s“"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "„%s“ не може да се извади от индекса"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "повредена кръпка за модула „%s“"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
"не може да се получи информация чрез „stat“ за новосъздадения файл „%s“"
-#: apply.c:4292
+#: apply.c:4296
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"не може да се за създаде мястото за съхранение на новосъздадения файл „%s“"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не може да се добави запис в кеша за „%s“"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "затваряне на файла „%s“"
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "файлът „%s“ не може да се запише с режим на достъп „%o“"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Кръпката „%s“ бе приложена чисто."
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "вътрешна грешка"
-#: apply.c:4522
+#: apply.c:4526
#, 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:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "съкращаване на името на файла с отхвърлените парчета на „ %.*s.rej“"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "„%s“ не може да бъде отворен"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "%d-то парче бе успешно приложено."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "%d-то парче бе отхвърлено."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "Пропусната кръпка: „%s“"
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "непознат вход"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "индексът не може да бъде записан"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "кръпката „%s“ не може да бъде отворена: %s"
-#: apply.c:4860
+#: apply.c:4864
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "пренебрегната е %d грешка в знаците за интервали"
msgstr[1] "пренебрегнати са %d грешки в знаците за интервали"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d ред добавя грешки в знаците за интервали."
msgstr[1] "%d реда добавят грешки в знаците за интервали."
-#: apply.c:4874
+#: apply.c:4878
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -701,15 +707,15 @@
msgstr[1] ""
"Добавени са %d реда след корекцията на грешките в знаците за интервали."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Новият индекс не може да бъде записан"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "път"
@@ -722,7 +728,7 @@
msgid "apply changes matching the given path"
msgstr "прилагане на промените напасващи на дадения път"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "БРОЙ"
@@ -777,7 +783,7 @@
msgstr ""
"създаване на временен индекс на база на включената информация за индекса"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "разделяне на пътищата с нулевия знак „NUL“"
@@ -785,7 +791,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "да се осигури контекст от поне такъв БРОЙ съвпадащи редове"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "действие"
@@ -814,9 +822,9 @@
msgid "allow overlapping hunks"
msgstr "позволяване на застъпващи се парчета"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "повече подробности"
@@ -828,7 +836,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "без доверяване на номерата на редовете в заглавните части на парчетата"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "НАЧАЛНА_ДИРЕКТОРИЯ"
@@ -855,108 +863,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote ХРАНИЛИЩЕ [--exec КОМАНДА] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "пътят „%s“ не съвпада с никой файл"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "ФОРМАТ"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "ФОРМАТ на архива"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "ПРЕФИКС"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "добавяне на този ПРЕФИКС към всеки път в архива"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "ФАЙЛ"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "запазване на архива в този ФАЙЛ"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "изчитане на „.gitattributes“ в работната директория"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "извеждане на архивираните файлове на стандартната грешка"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "само съхранение без компресиране"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "бързо компресиране"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "добро компресиране"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "извеждане на списъка с поддържаните формати"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "хранилище"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "изтегляне на архива от отдалеченото ХРАНИЛИЩЕ"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "команда"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "път към отдалечената команда „git-upload-archive“"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Неочаквана опция „--remote“"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "Опцията „--exec“ изисква „--remote“"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Неочаквана опция „--output“"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Непознат формат на архив: „%s“"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргументът не се поддържа за форма̀та „%s“: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "„%.*s“ е неправилно име за атрибут"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -964,22 +972,22 @@
"Отрицателните шаблони се игнорират в атрибутите на git.\n"
"Ако ви трябва начална удивителна, ползвайте „\\!“."
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Неправилно цитирано съдържание във файла „%s“: %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Повече не може да се търси двоично!\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "Неправилно име на подаване „%s“"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -988,7 +996,7 @@
"Неправилна база за сливане: %s.\n"
"Следователно грешката е коригирана между „%s“ и [%s].\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -997,7 +1005,7 @@
"Нова база за сливане: %s.\n"
"Свойството е променено между „%s“ и [%s].\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1006,7 +1014,7 @@
"Базата за сливане „%s“ е %s.\n"
"Следователно първото %s подаване е между „%s“ и [%s].\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1017,7 +1025,7 @@
"Двоичното търсене с git bisect няма да работи правилно.\n"
"Дали не сте объркали указателите „%s“ и „%s“?\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1028,36 +1036,36 @@
"Не може да сме сигурни, че първото %s подаване е между „%s“ и „%s“.\n"
"Двоичното търсене продължава."
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Двоично търсене: трябва да се провери база за сливане\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "необходима е версия „%s“"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "файлът „%s“ не може да бъде създаден"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "неуспешно прочитане на указателите за двоично търсене"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "„%s“ e както „%s“, така и „%s“\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1066,7 +1074,7 @@
"Липсва подходящо за тестване подаване.\n"
"Проверете параметрите за пътищата.\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1076,7 +1084,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -1097,10 +1105,10 @@
"Едновременното задаване на опциите „--reverse“ и „--first-parent“ изисква "
"указването на крайно подаване"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "неуспешно настройване на обхождането на версиите"
@@ -1142,45 +1150,44 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-"Клонът „%s“ ще следи клона „%s“ от отдалеченото хранилище „%s“ чрез "
+"Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“ чрез "
"пребазиране."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Клонът „%s“ ще следи клона „%s“ от отдалеченото хранилище „%s“."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Клонът „%s“ ще следи отдалечения клон „%s“ от хранилището „%s“."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr ""
-"Клонът „%s“ ще следи клона „%s“ от локалното хранилище чрез пребазиране."
+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 "Branch '%s' set up to track local branch '%s'."
+msgstr "Клонът „%s“ ще следи локалния клон „%s“."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr "Клонът „%s“ ще следи отдалечения указател „%s“ чрез пребазиране."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
msgstr "Клонът „%s“ ще следи отдалечения указател „%s“."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+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."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr "Клонът „%s“ ще следи локалния указател „%s“."
#: branch.c:119
@@ -1192,31 +1199,31 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Няма следене: информацията за указателя „%s“ не е еднозначна"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "„%s“ не е позволено име за клон."
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Вече съществува клон с име „%s“."
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Текущият клон не може да бъде принудително обновен."
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Зададените настройки за следенето са грешни — началото „%s“ не е клон."
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "заявеният отдалечен клон „%s“ не съществува"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1235,27 +1242,27 @@
"може да използвате „git push -u“, за да настроите към кой клон да се "
"изтласква."
-#: branch.c:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Неправилно име на обект: „%s“"
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Името на обект не е еднозначно: „%s“"
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Неправилно място за начало на клон: „%s“"
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "„%s“ вече е изтеглен в „%s“"
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "Указателят „HEAD“ на работното дърво „%s“ не е обновен"
@@ -1270,7 +1277,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "непозната заглавна част: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "„%s“ не може да се отвори"
@@ -1279,57 +1287,57 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "В хранилището липсват следните необходими подавания:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Пратката съдържа следния указател:"
msgstr[1] "Пратката съдържа следните %d указатели:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Пратката съдържа пълна история."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Пратката изисква следния указател:"
msgstr[1] "Пратката изисква следните %d указатели:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Командата „git pack-objects“ не може да бъде стартирана"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "Командата „git pack-objects“ не завърши успешно"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "Командата „git rev-list“ не завърши успешно"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
"указателят „%s“ не е бил включен поради опциите зададени на „git rev-list“"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "непознат аргумент: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Създаването на празна пратка е невъзможно."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "Файлът „%s“ не може да бъде създаден"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "Командата „git index-pack“ не завърши успешно"
@@ -1338,8 +1346,8 @@
msgid "invalid color value: %.*s"
msgstr "неправилна стойност за цвят: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "„%s“ не може да се анализира"
@@ -1349,7 +1357,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s не е подаване!"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1359,7 +1367,7 @@
"Може да поправите подаването заедно със съобщението или може да\n"
"зададете ползваното кодиране в настройката „i18n.commitencoding“.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "паметта свърши"
@@ -1445,83 +1453,88 @@
msgid "failed to expand user dir in: '%s'"
msgstr "домашната папка на потребителя не може да бъде открита: „%s“"
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "„%s“ не е правилна стойност за време за „%s“"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправилно ниво на компресиране: %d"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "неправилен режим за създаването на обекти: %s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "неправилно ниво на компресиране при пакетиране: %d"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr "неправилни настройки от командния ред"
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr "неочаквана грешка при изчитането на конфигурационните файлове"
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Неправилен %s: „%s“"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва "
+"непозната стойност „%s“ за настройката „core.untrackedCache“. Ще се ползва "
"стандартната стойност „keep“ (запазване)"
-#: config.c:2111
+#: config.c:2162
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
"стойността на „splitIndex.maxPercentChange“ трябва да е между 1 и 100, а не "
"%d"
-#: config.c:2122
+#: config.c:2187
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "неразпозната стойност „%s“ от командния ред"
-#: config.c:2124
+#: config.c:2189
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправилна настройка „%s“ във файла „%s“ на ред №%d"
-#: config.c:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "зададени са няколко стойности за „%s“"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "неуспешно изпълнение на „fstat“ върху „%s“"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "„%s“ не може да се зададе да е „%s“"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "„%s“ не може да се премахне"
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "Отдалеченото хранилище прекъсна връзката веднага след отварянето ѝ"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1533,19 +1546,19 @@
"Проверете дали то съществува и дали имате права\n"
"за достъп."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Проверка на връзката"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Командата „git rev-list“ не може да бъде изпълнена."
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "неуспешен запис на списъка с версиите"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "стандартният вход на списъка с версиите не може да бъде затворен"
@@ -1654,33 +1667,42 @@
msgid "failed to read orderfile '%s'"
msgstr "файлът с подредбата на съответствията „%s“ не може да бъде прочетен"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "Търсене на преименувания на обекти съчетани с промени"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "опцията „%s“ изисква стойност"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Неуспешно разпознаване на „%s“ като процент-праг за статистиката по "
"директории\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Непознат параметър „%s“ за статистиката по директории'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"настройката за цвят за преместване трябва да е една от: „no“ (без), "
+"„default“ (стандартно), „zebra“ (райе), „dimmed_zebra“ (притъмнено райе), "
+"„plain“ (обикновено)"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Непозната стойност „%s“ за настройката „diff.submodule“"
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1689,23 +1711,23 @@
"Грешки в настройката „diff.dirstat“:\n"
"%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
"външната програма за разлики завърши неуспешно. Спиране на работата при „%s“"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"Опциите „--name-only“, „--name-status“, „--check“ и „-s“ са несъвместими "
"една с друга"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "Опцията „--follow“ изисква точно един път"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1714,230 +1736,239 @@
"Неразпознат параметър към опцията „--dirstat/-X“:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Неразпознат параметър към опцията „--submodule“: „%s“"
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"търсенето на преименувания на обекти съчетани с промени се прескача поради "
"многото файлове."
-#: diff.c:4719
+#: diff.c:5449
msgid "only found copies from modified paths due to too many files."
msgstr ""
"установени са точните копия на променените пътища поради многото файлове."
-#: diff.c:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "задайте променливата „%s“ да е поне %d и отново изпълнете командата."
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "името и версията на ядрото не бяха получени"
-#: dir.c:2067
+#: dir.c:2219
msgid "Untracked cache is disabled on this system or location."
msgstr ""
"Кеша за неследените файлове е изключен на тази система или местоположение."
-#: dir.c:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "директориите за „%s“ не може да бъдат създадени"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "директорията на git не може да се мигрира от „%s“ до „%s“"
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "Подсказка: чака се редакторът ви да затвори файла …%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Филтриране на съдържанието"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "неуспешно изпълнение на „stat“ върху файла „%s“"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: очаква се плитък списък"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „EOF“"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "отдалечена грешка: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: очакваше се „ACK“/„NAK“, а бе получен „%s“"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "опцията „--stateless-rpc“ изисква „multi_ack_detailed“"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправилен плитък ред: „%s“"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправилен неплитък ред: „%s“"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "обектът „%s“ липсва"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "грешка в обекта: „%s“"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "не е открит плитък обект: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "очаква се плитък или не обект, а бе получено: %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "получено бе %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "неправилно подаване: „%s“"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "преустановяване"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "действието завърши"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "получено бе %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Отбелязване на „%s“ като пълно"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "вече има „%s“ (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не може да се създаде процес за демултиплексора"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "протоколна грешка: неправилна заглавна част на пакет"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не може да се създаде процес за „%s“"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "неуспешно изпълнение на „%s“"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "грешка в демултиплексора"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "Сървърът не поддържа плитки клиенти"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "Сървърът поддържа „multi_ack_detailed“"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "Сървърът поддържа „no-done“"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "Сървърът поддържа „multi_ack“"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "Сървърът поддържа „side-band-64k“"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "Сървърът поддържа „side-band“"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Сървърът поддържа „allow-tip-sha1-in-want“"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Сървърът поддържа „allow-reachable-sha1-in-want“"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "Сървърът поддържа „ofs-delta“"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "Версията на сървъра е: %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "Сървърът не поддържа опцията „--shallow-since“"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Сървърът не поддържа опцията „--shallow-exclude“"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "Сървърът не поддържа опцията „--deepen“"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "няма общи подавания"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: неуспешно доставяне."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "не може да бъде открит подходящ връх от отдалеченото хранилище"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "такъв отдалечен указател няма: %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сървърът не позволява заявка за необявен „%s“"
@@ -1950,7 +1981,7 @@
msgid "could not create temporary file"
msgstr "не може да се създаде временен файл"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Програмата не успя да запише самостоятелния подпис в „%s“"
@@ -1960,20 +1991,20 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "прескачане на неправилния цвят „%.*s“ в „log.graphColors“"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "„%s“: файлът сочен от „%s“ не може да бъде прочетен"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
-msgstr "„%s“: изчитането върна по-малко байтове от заявените"
+msgstr "„%s“: изчитането върна по-малко байтове от очакваното"
#: help.c:179
#, c-format
@@ -2044,12 +2075,12 @@
msgid "git version [<options>]"
msgstr "git version [ОПЦИЯ…]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -2120,12 +2151,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "името съдържа само непозволени знаци: „%s“"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "неправилен формат на дата: %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "не може да комбинирате филтри по различен вид обекти"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "указан е неправилен израз за филтър: „%s“"
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2144,89 +2184,89 @@
"причина е, че някой процес на git в това хранилище е забил. За да\n"
"продължите работа, ще трябва ръчно да изтриете файла:"
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Файлът-ключалка „%s.lock“ не може да бъде създаден: %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "кешът не може да бъде прочетен"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "неуспешно записване на новия индекс"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(лошо подаване)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "неуспешно изпълнение на „addinfo_cache“ за пътя „%s“"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "грешка при изграждане на дърветата"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "грешка при създаването на пътя „%s“%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Изтриване на „%s“, за да се освободи място за поддиректория\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": възможно е да има конфликт директория/файл."
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
"преустановяване на действието, за да не се изтрие неследеният файл „%s“"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "обектът „%s“ (%s) не може да бъде прочетен"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "обектът „%s“ (%s) се очакваше да е BLOB, а не е"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "„%s“ не може да се отвори: %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "неуспешно създаване на символната връзка „%s“: %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
"не е ясно какво да се прави с обекта „%2$s“ (%3$s) с права за достъп „%1$06o“"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Неуспешно вътрешно сливане"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "„%s“ не може да се добави в базата с данни"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2235,7 +2275,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2244,7 +2284,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото."
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2253,7 +2293,7 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ в %s. Версия %s на „%s“ "
"е оставена в дървото: %s."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2262,20 +2302,20 @@
"КОНФЛИКТ (%s/изтриване): „%s“ е изтрит в %s, а „%s“ е преименуван на „%s“ в "
"%s. Версия %s на „%s“ е оставена в дървото: %s."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "преименуване"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "преименуван"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "„%s“ е директория в „%s“, затова се добавя като „%s“"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2284,143 +2324,149 @@
"КОНФЛИКТ (преименуване/преименуване): „%s“ е преименуван на „%s“ в клон "
"„%s“, а „%s“ е преименуван на „%s“ в „%s“/%s."
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (некоригиран конфликт)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Преименуване на „%s“ на „%s“, а „%s“ на „%s“"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"КОНФЛИКТ (преименуване/добавяне): „%s“ е преименуван на „%s“ в клон „%s“, а "
"„%s“ е добавен в „%s“"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Добавяне на слетия „%s“"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Добавяне като „%s“"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "обектът „%s“ не може да се прочете"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "обектът „%s“ не е BLOB"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "промяна"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "променен"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "съдържание"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "добавяне/добавяне"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Прескачане на „%s“ (слетият резултат е идентичен със сегашния)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Автоматично сливане на „%s“"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "ПОДМОДУЛ"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт при сливане на „%s“"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Изтриване на „%s“"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "файл/директория"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "директория/файл"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "Добавяне на „%s“"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr ""
+"Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "Вече е обновено!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "неуспешно сливане на дърветата „%s“ и „%s“"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Сливане:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "открит е %u общ предшественик:"
msgstr[1] "открити са %u общи предшественици:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "сливането не върна подаване"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Неуспешен анализ на обекта „%s“"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Индексът не може да бъде прочетен"
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2437,7 +2483,7 @@
"\n"
" git notes merge --abort"
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
@@ -2468,16 +2514,35 @@
msgid "Bad %s value: '%s'"
msgstr "Зададена е лоша стойност на променливата „%s“: „%s“"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "обектът „%s“ не може да бъде анализиран"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
+"индексът да е повреден)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
+"да е отрязан)"
+
#: parse-options.c:573
msgid "..."
msgstr "…"
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "употреба: %s"
@@ -2485,17 +2550,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-ЧИСЛО"
@@ -2504,7 +2569,7 @@
msgid "malformed object name '%s'"
msgstr "неправилно име на обект „%s“"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не могат да се дадат права за запис в директорията „%s“ на групата"
@@ -2578,25 +2643,16 @@
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магическите пътища не се поддържат от командата „%s“"
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"възможно е празните низове да се окажат неправилни шаблони за пътища в "
-"следващи версии на Git. Ако искате съвпадение с всички пътища, използвайте: "
-"„.“"
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "пътят „%s“ е след символна връзка"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "аргументът към опцията „--pretty“ не може да се анализира"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2605,7 +2661,7 @@
"Зададена е неправилна стойност на настройката „index.version“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2615,51 +2671,52 @@
"„GIT_INDEX_VERSION“.\n"
"Ще се ползва версия %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "„%s“ не може да се затвори"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "неуспешно изпълнение на „stat“ върху „%s“"
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "не може да се отвори директорията на git: %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "неуспешно изтриване на „%s“"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "„%s“ не може да бъде отворен за запис"
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновяванията на указатели са забранени в среди под карантина"
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Указателят „%s“ не може да бъде изтрит: %s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "Указателите не може да бъдат изтрити: %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "Указателят „%s“ не може да бъде изтрит"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "Указателят „%s“ не може да бъде изтрит: %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "Указателите не може да бъдат изтрити: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "изтрит"
@@ -2678,157 +2735,157 @@
msgid "ahead %d, behind %d"
msgstr "напред с %d, назад с %d"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "очакван формат: %%(color:ЦВЯТ)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "непознат цвят: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "очаква се цяло число за „refname:lstrip=%s“"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "очаква се цяло число за „refname:rstrip=%s“"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "непознат аргумент за „%%(%s)“: %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) не приема аргументи"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) не приема аргументи"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) не приема аргументи"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "непознат аргумент „%%(trailers)“: %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "очаква се положителна стойност за „contents:lines=%s“"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "непознат аргумент за %%(contents): %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "очаква се положителна стойност за „objectname:short=%s“"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "непознат аргумент за %%(objectname): %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "очакван формат: %%(align:ШИРОЧИНА,ПОЗИЦИЯ)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "непозната позиция: %s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "непозната широчина: %s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "непознат аргумент за %%(align): %s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "очаква се положителна широчина с лексемата „%%(align)“"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "непознат аргумент за „%%(if)“: %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправилно име на обект: „%.*s“"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "непознато име на обект: „%.*s“"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(if) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(then) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: лексемата %%(then) е използвана повече от един път"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: лексемата %%(then) е използвана след %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(if)"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: лексемата %%(else) е използвана без съответната ѝ %%(then)"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: лексемата %%(else) е използвана повече от един път"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: лексемата %%(end) е използвана без съответната ѝ"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
-msgstr "неправилен низ за форматиране „%s“"
+msgstr "неправилен форматиращ низ „%s“"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(извън клон, пребазиране на „%s“)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(извън клон, двоично търсене от „%s“)"
@@ -2836,7 +2893,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(Указателят „HEAD“ не е свързан и е при „%s“)"
@@ -2844,139 +2901,139 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от „%s“"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(извън клон)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "обектът „%s“ липсва за „%s“"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "неуспешно анализиране чрез „parse_object_buffer“ на „%s“ за „%s“"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "обект със сгрешен формат при „%s“"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнориране на указателя с грешно име „%s“"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнориране на повредения указател „%s“"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "грешка във форма̀та: липсва лексемата %%(end)"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "неправилно име на обект „%s“"
-#: remote.c:747
+#: remote.c:780
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Невъзможно е да се доставят едновременно и „%s“, и „%s“ към „%s“"
-#: remote.c:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "„%s“ обикновено следи „%s“, а не „%s“"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "„%s“ следи както „%s“, така и „%s“"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "Вътрешна грешка"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "Указателят „HEAD“ не сочи към клон"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "няма клон на име „%s“"
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "не е зададен клон-източник за клона „%s“"
-#: remote.c:1698
+#: remote.c:1729
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "клонът-източник „%s“ не е съхранен като следящ клон"
-#: remote.c:1713
+#: remote.c:1744
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
"липсва локален следящ клон за местоположението за изтласкване „%s“ в "
"хранилището „%s“"
-#: remote.c:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "няма информация клонът „%s“ да следи някой друг"
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "указателят за изтласкване на „%s“ не включва „%s“"
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "указателят за изтласкване не включва цел („push.default“ е „nothing“)"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr "простото (simple) изтласкване не съответства на една цел"
-#: remote.c:2076
+#: remote.c:2106
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Този клон следи „%s“, но следеният клон е изтрит.\n"
-#: remote.c:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (за да коригирате това, използвайте „git branch --unset-upstream“)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "Клонът е актуализиран към „%s“.\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (публикувайте локалните си промени чрез „git push“)\n"
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2984,11 +3041,11 @@
msgstr[0] "Клонът ви е с %2$d подаване зад „%1$s“ и може да бъде превъртян.\n"
msgstr[1] "Клонът ви е с %2$d подавания зад „%1$s“ и може да бъде превъртян.\n"
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (обновете локалния си клон чрез „git pull“)\n"
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -3003,47 +3060,57 @@
"Текущият клон се е отделил от „%s“,\n"
"двата имат съответно по %d и %d несъвпадащи подавания.\n"
-#: remote.c:2117
+#: remote.c:2147
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (слейте отдалечения клон в локалния чрез „git pull“)\n"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "Текущият клон е повреден"
-#: revision.c:2190
+#: revision.c:2271
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Текущият клон „%s“ е без подавания "
-#: revision.c:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "опциите „--first-parent“ и „--bisect“ са несъвместими"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "неуспешно отваряне на „/dev/null“"
-#: send-pack.c:151
+#: run-command.c:1188
+#, 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:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
"състоянието от отдалеченото разпакетиране не може да бъде анализирано: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "неуспешно отдалечено разпакетиране: %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "сертификатът за изтласкване не може да бъде подписан"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "отсрещната страна не поддържа изтласкване с опцията „--signed“"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -3051,32 +3118,32 @@
"отсрещната страна не поддържа изтласкване с опцията „--signed“, затова не се "
"използва сертификат"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "получаващата страна не поддържа изтласкване с опцията „--atomic“"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "отсрещната страна не поддържа опции при изтласкване"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "отмяна"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "отбиране"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Неизвестно действие: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -3084,7 +3151,7 @@
"след коригирането на конфликтите, отбележете съответните\n"
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“."
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3094,42 +3161,43 @@
"пътища с „git add ПЪТ…“ или „git rm ПЪТ…“, след което\n"
"подайте резултата с командата „git commit'“."
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "„%s“ не може да се заключи"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "в „%s“ не може да се пише"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "краят на ред не може да се запише в „%s“"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "„%s“ не може да се завърши."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "локалните ви промени ще бъдат презаписани при %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "подайте или скатайте промените, за да продължите"
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: превъртане"
@@ -3137,20 +3205,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: новият индекс не може да бъде запазен"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "подаването сочено от указателя „HEAD“ не може да бъде открито\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "подаването, сочено от указателя „HEAD“, не може да бъде открито"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "дървото на кеша не може да бъде обновено\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "дървото на кеша не може да бъде обновено"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3179,17 +3247,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "подаването „%s“ не може да бъде анализирано\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "родителското подаване „%s“ не може да бъде анализирано\n"
+msgid "could not parse commit %s"
+msgstr "подаването „%s“ не може да бъде анализирано"
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "родителското подаване „%s“ не може да бъде анализирано"
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3200,7 +3268,7 @@
"\n"
" %.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3211,239 +3279,250 @@
"\n"
" %.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "Това е обединение от %d подавания"
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "За смачкване ви трябва указател „HEAD“"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "указателят „HEAD“ не може да се прочете"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr ""
"съобщението за подаване към указателя „HEAD“ не може да бъде прочетено: %s"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "„%s“ не може да се запази"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Това е 1-то съобщение при подаване:"
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "съобщението за подаване към „%s“ не може да бъде прочетено"
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "Това е съобщение при подаване №%d:"
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Съобщение при подаване №%d ще бъде прескочено:"
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "непозната команда: %d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "индексът не е слят."
-#: sequencer.c:973
+#: sequencer.c:986
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "подаването „%s“ е сливане, но не е дадена опцията „-m“"
-#: sequencer.c:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "подаването „%s“ няма родител %d"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "указано е базово подаване, но подаването „%s“ не е сливане."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: неразпозната стойност за родителското подаване „%s“"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "„%s“ не може да се преименува на „%s“"
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "подаването „%s“… не може да бъде отменено: „%s“"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "подаването „%s“… не може да бъде приложено: „%s“"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "зададено е празно множество от подавания"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: неуспешно изчитане на индекса"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: неуспешно обновяване на индекса"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "„%s“ не приема аргументи: „%s“"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "„%s“ изисква аргументи"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправилен ред %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „%s“"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "от „%s“ не може да се чете."
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "коригирайте това чрез „git rebase --edit-todo“."
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "неизползваем файл с описание на предстоящите действия: „%s“"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "никое от подаванията не може да се разпознае."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr ""
"по време на отмяна на подаване не може да се извърши отбиране на подаване."
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "по време на отбиране не може да се извърши отмяна на подаване."
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "неправилен ключ: „%s“"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправилна стойност за „%s“: „%s“"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "неправилен файл с опции: „%s“"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr ""
"в момента вече се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "използвайте „git cherry-pick (--continue | --quit | --abort)“"
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "директорията за секвенсора „%s“ не може да бъде създадена"
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "указателят „HEAD“ не може да се заключи"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr ""
"в момента не се извършва отбиране на подавания или пребазиране на клона"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "Подаването сочено от указателя „HEAD“ не може да бъде открито"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr ""
"действието не може да бъде преустановено, когато сте на клон, който тепърва "
"предстои да бъде създаден"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "„%s“ не може да бъде отворен"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "„%s“ не може да бъде прочетен: %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "неочакван край на файл"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
"запазеният преди започването на отбирането файл за указателя „HEAD“ — „%s“ е "
"повреден"
-#: sequencer.c:1658
+#: sequencer.c:1691
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
"Изглежда указателят „HEAD“ е променен. Проверете към какво сочи.\n"
"Не се правят промени."
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "указателят „HEAD“ не може да бъде прочетен"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "„%s“ не може да се копира като „%s“"
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "индексът не може да бъде прочетен"
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3458,11 +3537,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
msgid "and made changes to the index and/or the working tree\n"
msgstr "и промени индекса и/или работното дърво\n"
-#: sequencer.c:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3479,17 +3558,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Автоматично скатаното е приложено.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "„%s“ не може да бъде запазен"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3500,57 +3579,57 @@
"надеждно скатани. Можете да пробвате да ги приложите чрез „git stash pop“\n"
"или да ги изхвърлите чрез „git stash drop“, когато поискате.\n"
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Спиране при „%s“… %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "непозната команда %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "указателят за „orig-head“ не може да се прочете"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "указателят за „onto“ не може да се прочете"
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "„%s“ не може да се обнови"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "„HEAD“ не може да бъде обновен до „%s“"
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "не може да пребазирате, защото има промени, които не са в индекса."
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "несъществуващо подаване не може да се поправи"
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "неправилен файл: „%s“"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "неправилно съдържание: „%s“"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3560,24 +3639,97 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: sequencer.c:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "промените в индекса не могат да бъдат подадени."
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не може да се отбере „%s“"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: неправилна версия"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "първоначалното подаване не може да бъде отменено"
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: неподдържани опции"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: грешка при подготовката на версии"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "неуспешно изтриване на списъка за изпълнение: „%s“"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Непозната стойност „%s“ за настройката „rebase.missingCommitsCheck“. "
+"Настройката се прескача."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Предупреждение: някои подавания може да са пропуснати.\n"
+"Пропуснати подавания (новите са най-отгоре):\n"
+
+#: sequencer.c:2702
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n"
+"\n"
+"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n"
+"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само "
+"предупреждение)\n"
+"или „error“ (считане за грешка).\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Може да промените това с командите „git rebase --edit-todo“ и „git rebase --"
+"continue“ след това.\n"
+"Може и да преустановите пребазирането с командата „git rebase --abort“.\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "„%s“ не може да бъде отворен за запис"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "подаването „%s“ не може да бъде анализирано"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "скриптът вече е преподреден."
+
#: setup.c:171
#, c-format
msgid ""
@@ -3614,36 +3766,36 @@
"\n"
" git КОМАНДА [ВЕРСИЯ…] -- [ФАЙЛ…]"
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Очаква се версия на хранилището на git <= %d, а не %d"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "открити са непознати разширения в хранилището:"
-#: setup.c:810
+#: setup.c:811
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
"Нито тази, нито която и да е от по-горните директории, не е хранилище на "
"git: %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Процесът не може да се върне към предишната работна директория"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "Текущата работна директория не може да бъде прочетена"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "Не може да се влезе в директорията „%s“"
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3654,7 +3806,7 @@
"Git работи в рамките на една файлова система, защото променливата на средата "
"„GIT_DISCOVERY_ACROSS_FILESYSTEM“ не е зададена."
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3664,60 +3816,41 @@
"(0%.3o).\n"
"Собственикът на файла трябва да има права за писане и четене."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "пътят „%s“ не съществува."
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "все още не се поддържа еталонно хранилище „%s“ като свързано."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "еталонното хранилище „%s“ не е локално"
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "еталонното хранилище „%s“ е плитко"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "еталонното хранилище „%s“ е с присаждане"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-"отместване преди края на пакетния файл (възможно е индексът да е повреден)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-"отместване преди началото на индекса на пакетния файл „%s“ (възможно е "
-"индексът да е повреден)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-"отместване преди края на индекса на пакетния файл „%s“ (възможно е индексът "
-"да е отрязан)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "късият SHA1 „%s“ не е еднозначен"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "Възможностите са:"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3733,74 +3866,79 @@
"шестнадесетични знака, защото стандартно те ще бъдат прескачани.\n"
"Възможно е такива указатели да са създадени случайно. Например:\n"
"\n"
-" git checkout -b $BRANCH $(git rev-parse…)\n"
+" git checkout -b $BRANCH $(git rev-parse…)\n"
"\n"
"където стойността на променливата на средата BRANCH е празна, при което се\n"
-"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете "
+"създава подобен указател. Прегледайте тези указатели и ги изтрийте. Можете "
"да\n"
"спрете това съобщение като изпълните командата:\n"
"„git config advice.objectNameWarning false“"
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Неслетите файлове „.gitmodules“ не могат да бъдат променяни. Първо "
"коригирайте конфликтите"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Във файла „.gitmodules“ липсва раздел за директория „path=%s“"
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде променен"
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Записът „%s“ във файла „.gitmodules“ не може да бъде изтрит"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "неуспешно добавяне на променения файл „.gitmodules“ в индекса"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "Настройката „submodule.fetchJobs“ не приема отрицателни стойности"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "в неподготвения подмодул „%s“"
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Пътят „%s“ е в подмодула „%.*s“"
-#: submodule.c:1337
+#: submodule.c:833
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "записът за подмодула „%s“ (%s) е %s, а не подаване!"
+
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Не може да се открие към какво сочи указателят „HEAD“"
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "„%s“ не е хранилище на git"
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "командата „git status“ не може да се изпълни в подмодула „%s“"
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "индексът на подмодула „%s“ не е чист"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3808,18 +3946,18 @@
"не се поддържа „relocate_gitdir“ за подмодула „%s“, който има повече от едно "
"работно дърво"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "името на подмодула „%s“ не може да бъде намерено"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3830,79 +3968,83 @@
"„%s“ към\n"
"„%s“\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "неуспешна обработка на поддиректориите в подмодула „%s“"
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "„ls-stat“ не може да се стартира в „..“"
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "ГРЕШКА: полученият низ за пътя не съвпада с върнатото от „cwd“"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "„ls-tree“ завърши с неочакван изходен код: %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "настройката „submodule.fetchjobs“ не приема отрицателни стойности"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "Неправилна стойност за „%s“"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "неуспешно изпълнение на завършващата команда „%s“"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "непозната стойност „%s“ за настройката „%s“"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "стойността „%s“ се повтаря в настройките"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "празна завършваща лексема в епилога „%.*s“"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "входният файл „%s“ не може да бъде прочетен"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "от стандартния вход не може да се чете"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "Не може да се получи информация чрез „stat“ за „%s“"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "„%s“ не е обикновен файл"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "„%s“: няма права за записване на файла"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "временният файл не може да се отвори"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "временният файл не може да се преименува на „%s“"
@@ -3917,7 +4059,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: неправилна опция за дълбочина: %s"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3926,7 +4068,7 @@
"Следните пътища за подмодули съдържат промени,\n"
"които липсват от всички отдалечени хранилища:\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3951,11 +4093,11 @@
" git push\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "Преустановяване на действието."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "Указателят „%s“ не може да се прочете."
@@ -3972,11 +4114,11 @@
msgid "empty filename in tree entry"
msgstr "празно име на файл в запис в дърво"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "прекалено кратък файл-дърво"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3985,7 +4127,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да преминете към нов клон."
-#: unpack-trees.c:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3994,7 +4136,7 @@
"Изтеглянето ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4003,7 +4145,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да слеете."
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -4012,7 +4154,7 @@
"Сливането ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -4021,7 +4163,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%sПодайте или скатайте промените, за да извършите „%s“."
-#: unpack-trees.c:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -4030,7 +4172,7 @@
"„%s“ ще презапише локалните промени на тези файлове:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -4039,7 +4181,7 @@
"Обновяването на следните директории ще изтрие неследените файлове в тях:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -4048,7 +4190,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да преминете на друг клон."
-#: unpack-trees.c:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -4057,7 +4199,7 @@
"Изтеглянето ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4066,7 +4208,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4075,7 +4217,7 @@
"Сливането ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4084,7 +4226,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4093,7 +4235,7 @@
"„%s“ ще изтрие тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4103,7 +4245,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да смените клон."
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4113,7 +4255,7 @@
"Изтеглянето ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4122,7 +4264,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да слеете."
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4131,7 +4273,7 @@
"Сливането ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4140,7 +4282,7 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%sПреместете ги или ги изтрийте, за да извършите „%s“."
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4149,22 +4291,22 @@
"„%s“ ще презапише тези неследени файлове в работното дърво:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Записът за „%s“ съвпада с този за „%s“. Не може да се присвои."
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"Частичното изтегляне не може да бъде обновено: следните записи не са "
"актуални:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4175,7 +4317,7 @@
"дърво:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4186,7 +4328,7 @@
"дърво:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4195,17 +4337,12 @@
"Подмодулът не може да бъде обновен:\n"
"„%s“"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "Преустановяване на действието\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "подмодулът „%s“ не поддържа стратегията за обновяване като подмодул"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "Изтегляне на файлове"
@@ -4248,13 +4385,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "„%s“ не може да бъде отворен и за четене, и за запис"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "„%s“ не може да бъде отворен за запис"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "файлът не може да бъде прочетен: „%s“"
@@ -4268,413 +4400,403 @@
msgid "unable to get current working directory"
msgstr "текущата работна директория е недостъпна"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "„%s“ не може да бъде записан"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "„%s“ не може да се затвори"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Неслети пътища:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (използвайте „git reset %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (използвайте „git rm --cached %s ФАЙЛ…“, за да извадите ФАЙЛа от индекса)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git add ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (използвайте „git add/rm ФАЙЛ…“, според решението, което избирате за "
"конфликта)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (използвайте „git rm ФАЙЛ…“, за да укажете разрешаването на конфликта)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "Промени, които ще бъдат подадени:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "Промени, които не са в индекса за подаване:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add ФАЙЛ…“, за да обновите съдържанието за подаване)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (използвайте „git add/rm ФАЙЛ…“, за да обновите съдържанието за подаване)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (използвайте „git checkout -- ФАЙЛ…“, за да отхвърлите промените в "
"работното дърво)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (подайте или отхвърлете неследеното или промененото съдържание в "
"подмодулите)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (използвайте „git %s ФАЙЛ…“, за да определите какво включвате в подаването)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "изтрити в двата случая:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "добавени от вас:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "изтрити от тях:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "добавени от тях:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "изтрити от вас:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "добавени и в двата случая:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "променени и в двата случая:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "нов файл:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "копиран:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "изтрит:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "променен:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "преименуван:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "смяна на вида:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "непозната промяна:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "неслят:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "нови подавания, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "променено съдържание, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "неследено съдържание, "
-#: wt-status.c:821
+#: wt-status.c:824
#, 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:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "Подмодулите са променени, но не са обновени:"
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "Промени в подмодулите за подаване:"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"Не променяйте горния ред.\n"
+"Не променяйте и не изтривайте горния ред.\n"
"Всичко отдолу ще бъде изтрито."
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "Някои пътища не са слети."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (коригирайте конфликтите и изпълнете „git commit“)"
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (използвайте „git merge --abort“, за да преустановите сливането)"
-#: wt-status.c:1059
+#: wt-status.c:1063
msgid "All conflicts fixed but you are still merging."
msgstr "Всички конфликти са решени, но продължавате сливането."
-#: wt-status.c:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " (използвайте „git commit“, за да завършите сливането)"
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr "В момента прилагате поредица от кръпки чрез „git am“."
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "Текущата кръпка е празна."
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git am --continue“)"
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (използвайте „git am --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1083
+#: wt-status.c:1087
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
" (използвайте „git am --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "„git-rebase-todo“ липсва."
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "Не са изпълнени команди."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, 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:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " повече информация има във файла „%s“)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "Не остават повече команди."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, 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:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
" (използвайте „git rebase --edit-todo“, за да разгледате и редактирате)"
-#: wt-status.c:1259
+#: wt-status.c:1264
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "В момента пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "В момента пребазирате."
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (коригирайте конфликтите и използвайте „git rebase --continue“)"
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (използвайте „git rebase --skip“, за да пропуснете тази кръпка)"
-#: wt-status.c:1282
+#: wt-status.c:1287
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
" (използвайте „git rebase --abort“, за да възстановите първоначалния клон)"
-#: wt-status.c:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (всички конфликти са коригирани: изпълнете „git rebase --continue“)"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "В момента разделяте подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1297
+#: wt-status.c:1302
msgid "You are currently splitting a commit during a rebase."
msgstr "В момента разделяте подаване докато пребазирате."
-#: wt-status.c:1300
+#: wt-status.c:1305
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
" (След като работното ви дърво стане чисто, използвайте „git rebase --"
"continue“)"
-#: wt-status.c:1304
+#: wt-status.c:1309
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
"В момента редактирате подаване докато пребазирате клона „%s“ върху „%s“."
-#: wt-status.c:1309
+#: wt-status.c:1314
msgid "You are currently editing a commit during a rebase."
msgstr "В момента редактирате подаване докато пребазирате."
-#: wt-status.c:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (използвайте „git commit --amend“, за да редактирате текущото подаване)"
-#: wt-status.c:1314
+#: wt-status.c:1319
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
" (използвайте „git rebase --continue“, след като завършите промените си)"
-#: wt-status.c:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "В момента отбирате подаването „%s“."
-#: wt-status.c:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (всички конфликти са коригирани, изпълнете „git cherry-pick --continue“)"
-#: wt-status.c:1334
+#: wt-status.c:1339
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
" (използвайте „git cherry-pick --abort“, за да отмените всички действия с "
"отбиране)"
-#: wt-status.c:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "В момента отменяте подаване „%s“."
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (коригирайте конфликтите и изпълнете „git revert --continue“)"
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (всички конфликти са коригирани, изпълнете „git revert --continue“)"
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (използвайте „git revert --abort“, за да преустановите отмяната на "
"подаване)"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "В момента търсите двоично, като сте стартирали от клон „%s“."
-#: wt-status.c:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "В момента търсите двоично."
-#: wt-status.c:1371
+#: wt-status.c:1376
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
" (използвайте „git bisect reset“, за да се върнете към първоначалното "
"състояние и клон)"
-#: wt-status.c:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "На клон "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "извършвате интерактивно пребазиране върху "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "извършвате пребазиране върху "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "Указателят „HEAD“ не е свързан и е при "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "Указателят „HEAD“ не е свързан и е отделѐн от "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "Извън всички клони."
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "Първоначално подаване"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "Все още липсват подавания"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "Неследени файлове"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "Игнорирани файлове"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4686,32 +4808,32 @@
"изпълнението, но не трябва да забравяте ръчно да добавяте новите файлове.\n"
"За повече подробности погледнете „git status help“."
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неследените файлове не са изведени%s"
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr " (използвайте опцията „-u“, за да изведете неследените файлове)"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "Няма промени"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, 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:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "към индекса за подаване не са добавени промени\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4720,67 +4842,67 @@
"към индекса за подаване не са добавени промени, но има нови файлове "
"(използвайте „git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "към индекса за подаване не са добавени промени, но има нови файлове\n"
-#: wt-status.c:1658
+#: wt-status.c:1663
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"липсват каквито и да е промени (създайте или копирайте файлове и използвайте "
"„git add“, за да започне тяхното следене)\n"
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "липсват каквито и да е промени\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"липсват каквито и да е промени (използвайте опцията „-u“, за да се изведат и "
"неследените файлове)\n"
-#: wt-status.c:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "липсват каквито и да е промени, работното дърво е чисто\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "Все още липсват подавания в "
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (извън клон)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "назад с "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "напред с "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не може да извършите „%s“, защото има промени, които не са в индекса."
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "освен това в индекса има неподадени промени."
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не може да извършите „%s“, защото в индекса има неподадени промени."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "неуспешно изтриване на „%s“"
@@ -4789,128 +4911,132 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [ОПЦИЯ…] [--] ПЪТ…"
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "неочакван изходен код при генериране на разлика: %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "неуспешно обновяване на файловете"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "изтриване на „%s“\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr "Промени, които и след обновяването на индекса не са добавени към него:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Файлът „%s“ не може да бъде отворен за запис."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "Кръпката не може да бъде записана"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "неуспешно редактиране на кръпка"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "Не може да се получи информация чрез „stat“ за файла „%s“"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "Празна кръпка, преустановяване на действието."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "Кръпката „%s“ не може да бъде приложена"
-#: builtin/add.c:249
+#: builtin/add.c:271
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Следните пътища ще бъдат игнорирани според някой от файловете „.gitignore“:\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "пробно изпълнение"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "интерактивно отбиране на промени"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "интерактивен избор на парчета код"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "редактиране на текущата разлика и прилагане"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "добавяне и на иначе игнорираните файлове"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "обновяване на следените файлове"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "уеднаквяване на знаците за край на файл (включва опцията „-u“)"
+
+#: builtin/add.c:300
msgid "record only the fact that the path will be added later"
msgstr "отбелязване само на факта, че пътят ще бъде добавен по-късно"
-#: builtin/add.c:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr "добавяне на всички промени в следените и неследените файлове"
-#: builtin/add.c:281
+#: builtin/add.c:304
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
"игнориране на пътищата, които са изтрити от работното дърво (същото като „--"
"no-all“)"
-#: builtin/add.c:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "без добавяне на нови файлове, само обновяване на индекса"
-#: builtin/add.c:284
+#: builtin/add.c:307
msgid "just skip files which cannot be added because of errors"
msgstr ""
"прескачане на файловете, които не могат да бъдат добавени поради грешки"
-#: builtin/add.c:285
+#: builtin/add.c:308
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"проверка, че при пробно изпълнение всички файлове, дори и изтритите, се "
"игнорират"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "изрично задаване на стойността на флага дали файлът е изпълним"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "предупреждаване при добавяне на вградено хранилище"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4929,7 +5055,7 @@
msgstr ""
"Изтеглили сте допълнително хранилище в текущото. Когато клонирате "
"обхващащото\n"
-"хранилище няма да получити вграденото, защото външното хранилище няма "
+"хранилище няма да получите вграденото, защото външното хранилище няма "
"представа\n"
"за вътрешното. За да добавите подмодул, изпълнете:\n"
"\n"
@@ -4941,152 +5067,152 @@
"\n"
"За повече информация погледнете „git help submodule“."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавяне на вградено хранилище: %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Използвайте опцията „-f“, за да ги добавите наистина.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "неуспешно добавяне на файлове"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "опциите „-A“ и „-u“ са несъвместими"
-#: builtin/add.c:401
+#: builtin/add.c:424
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Опцията „--ignore-missing“ е съвместима само с „--dry-run“"
-#: builtin/add.c:405
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметърът към „--chmod“ — „%s“ може да е или „-x“, или „+x“"
-#: builtin/add.c:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Нищо не е зададено и нищо не е добавено.\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Вероятно искахте да използвате „git add .“?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "файлът с индекса е повреден"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "скриптът за автор не може да се анализира"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "„%s“ бе изтрит от куката „applypatch-msg“"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Даденият входен ред е с неправилен формат: „%s“."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Бележката не може да се копира от „%s“ към „%s“"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "неуспешно изпълнение на „fseek“"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "кръпката „%s“ не може да се анализира"
-#: builtin/am.c:842
+#: builtin/am.c:855
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
"Само една серия кръпки от „StGIT“ може да бъде прилагана в даден момент"
-#: builtin/am.c:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "неправилна стойност за време"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "неправилен ред за дата „Date“"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "неправилно отместване на часовия пояс"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "Форматът на кръпката не може да бъде определен."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "Кръпките не могат да бъдат разделени."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "индексът не може да бъде записан"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "След коригирането на този проблем изпълнете „%s --continue“."
-#: builtin/am.c:1172
+#: builtin/am.c:1161
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Ако предпочитате да прескочите тази кръпка, изпълнете „%s --skip“."
-#: builtin/am.c:1173
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "За да се върнете към първоначалното състояние, изпълнете „%s --abort“."
-#: builtin/am.c:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Кръпката е празна."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "грешен ред с идентичност: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "подаването не може да бъде анализирано: %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"В хранилището липсват необходимите обекти BLOB, за да се премине към тройно "
"сливане."
-#: builtin/am.c:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr "Базовото дърво се реконструира от информацията в индекса…"
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -5094,39 +5220,39 @@
"Кръпката не може да се приложи към обектите BLOB в индекса.\n"
"Да не би да сте я редактирали на ръка?"
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "Преминаване към прилагане на кръпка към базата и тройно сливане…"
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Неуспешно сливане на промените."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "Командата „git write-tree“ не успя да запише обект-дърво"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "прилагане върху празна история"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "обектът за подаването не може да бъде записан"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "не може да се продължи — „%s“ не съществува."
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"За интерактивно изпълнение е необходимо стандартният\n"
"вход да е свързан с терминал, а в момента не е."
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "Тялото на кръпката за прилагане е:"
@@ -5134,38 +5260,38 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
"Прилагане? „y“ — да/„n“ — не/„e“ — редактиране/„v“ — преглед/„a“ — приемане "
"на всичко:"
-#: builtin/am.c:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
"Индексът не е чист: кръпките не могат да бъдат приложени (замърсени са: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Прилагане: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "Без промени — кръпката вече е приложена."
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Неуспешно прилагане на кръпка при %s %.*s“"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Дубликат на проблемната кръпка се намира в: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5175,7 +5301,7 @@
"Ако няма друга промяна за включване в индекса, най-вероятно някоя друга\n"
"кръпка е довела до същите промени и в такъв случай просто пропуснете тази."
-#: builtin/am.c:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -5186,17 +5312,17 @@
"След корекция на конфликтите изпълнете „git add“ върху поправените файлове.\n"
"За да приемете „изтрити от тях“, изпълнете „git rm“ върху изтритите файлове."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "„%s“ не е разпознат като обект."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "индексът не може да бъде изчистен"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5207,139 +5333,138 @@
"сочи към\n"
"„ORIG_HEAD“"
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправилна стойност за „--patch-format“: „%s“"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [ОПЦИЯ…] [(ФАЙЛ_С_ПОЩА|ДИРЕКТОРИЯ_С_ПОЩА)…]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [ОПЦИЯ…] (--continue | --quit | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "интерактивна работа"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "изоставена опция, съществува по исторически причини, нищо не прави"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "да се преминава към тройно сливане при нужда."
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "без извеждане на информация"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "добавяне на ред за подпис „Signed-off-by“ в съобщението за подаване"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "прекодиране в UTF-8 (стандартно)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "подаване на опцията „-k“ на командата „git-mailinfo“"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "подаване на опцията „-b“ на командата „git-mailinfo“"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "подаване на опцията „-m“ на командата „git-mailinfo“"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
"подаване на опцията „--keep-cr“ на командата „git-mailsplit“ за формат „mbox“"
-#: builtin/am.c:2241
+#: builtin/am.c:2204
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"без подаване на опцията „--keep-cr“ на командата „git-mailsplit“ независимо "
"от „am.keepcr“"
-#: builtin/am.c:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "пропускане на всичко преди реда за отрязване"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "прекарване през „git-apply“"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "БРОЙ"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "ФОРМАТ"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "формат на кръпките"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "избрано от вас съобщение за грешка при прилагане на кръпки"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "продължаване на прилагането на кръпки след коригирането на конфликт"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "синоними на „--continue“"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "прескачане на текущата кръпка"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr ""
"възстановяване на първоначалното състояние на клона и преустановяване на "
"прилагането на кръпката."
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "дата за подаване различна от първоначалната"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "използване на текущото време като това за автор"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "ИДЕНТИФИКАТОР_НА_КЛЮЧ"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "подписване на подаванията с GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(ползва се вътрешно за „git-rebase“)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5347,18 +5472,18 @@
"Опциите „-b“/„--binary“ отдавна не правят нищо и\n"
"ще бъдат премахнати в бъдеще. Не ги ползвайте."
-#: builtin/am.c:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "неуспешно изчитане на индекса"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
"предишната директория за пребазиране „%s“ все още съществува, а е зададен "
"файл „mbox“."
-#: builtin/am.c:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5367,7 +5492,7 @@
"Открита е излишна директория „%s“.\n"
"Можете да я изтриете с командата „git am --abort“."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "В момента не тече операция по коригиране и няма как да се продължи."
@@ -5405,19 +5530,70 @@
msgid "git archive: expected a flush"
msgstr "git archive: очакваше се изчистване на буферите чрез „flush“"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms ЛОШО ДОБРО"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "„%s“ е неправилна управляваща дума"
+
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "„%s“ е вградена команда и не може да се използва като управляваща дума"
+
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "не може да смените значението на управляващата дума „%s“"
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr "използвайте две различни управляващи думи"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "файлът „BISECT_TERMS“ не може да се отвори"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "извършване на „git bisect next“"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "запазване на управляващите думи в „“.git/BISECT_TERMS„“"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "изчистване на състоянието на двоичното търсене"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "проверка за очакваните версии"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"обновяване на указателя „BISECT_HEAD“ вместо да се използва текущото подаване"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "опцията „--write-terms“ изисква точно два аргумента"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "опцията „--bisect-clean-state“ не приема аргументи"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [ОПЦИЯ…] [ОПЦИЯ_ЗА_ВЕРСИЯТА…] [ВЕРСИЯ] [--] ФАЙЛ"
@@ -5590,14 +5766,18 @@
msgstr "git branch [ОПЦИЯ…] (-m | -M) [СТАР_КЛОН] НОВ_КЛОН"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [ОПЦИЯ…] (-c | -C) [СТАР_КЛОН] НОВ_КЛОН"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [ОПЦИЯ…] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5606,7 +5786,7 @@
"изтриване на клона „%s“, който е слят към „%s“,\n"
" но още не е слят към върха „HEAD“."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5615,12 +5795,12 @@
"отказване на изтриване на клона „%s“, който не е слят към\n"
" „%s“, но е слят към върха „HEAD“."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Обектът-подаване за „%s“ не може да бъде открит"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5629,92 +5809,113 @@
"Клонът „%s“ не е слят напълно. Ако сте сигурни, че искате\n"
"да го изтриете, изпълнете „git branch -D %s“."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Неуспешно обновяване на конфигурационния файл"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "Опцията „-a“ е несъвместима с опцията „-d“"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "Обектът-подаване, сочен от указателя „HEAD“, не може да бъде открит"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Не можете да изтриете клона „%s“, който е изтеглен в пътя „%s“"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "следящият клон „%s“ не може да бъде открит."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "клонът „%s“ не може да бъде открит."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Грешка при изтриването на следящия клон „%s“"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Грешка при изтриването на клона „%s“"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Изтрит следящ клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Изтрит клон „%s“ (той сочеше към „%s“).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "форматиращият низ не може да бъде анализиран: %s"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Клонът „%s“ се пребазира върху „%s“"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Търси се двоично в клона „%s“ при „%s“"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+msgid "cannot copy the current branch while not on any."
+msgstr "не можете да копирате текущия клон, защото сте извън който и да е клон"
+
+#: builtin/branch.c:473
msgid "cannot rename the current branch while not on any."
msgstr ""
"не можете да преименувате текущия клон, защото сте извън който и да е клон"
-#: builtin/branch.c:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Неправилно име на клон: „%s“"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "Неуспешно преименуване на клон"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Неуспешно копиране на клон"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Клонът с неправилно име „%s“ е копиран"
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "На клона с неправилно име „%s“ е дадено служебно име"
+msgstr "Клонът с неправилно име „%s“ е преименуван"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Клонът е преименуван на „%s“, но указателят „HEAD“ не е обновен"
-#: builtin/branch.c:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr "Клонът е преименуван, но конфигурационният файл не е обновен"
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Клонът е копиран, но конфигурационният файл не е обновен"
+
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5722,182 +5923,190 @@
"Lines starting with '%c' will be stripped.\n"
msgstr ""
"Въведете описание на клона.\n"
-" %s\n"
+" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "Общи настройки"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
"извеждане на хеша и темата. Повтарянето на опцията прибавя отдалечените "
"клони"
-#: builtin/branch.c:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "без информационни съобщения"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "задаване на режима на следене (виж git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "смяна на следения клон"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "да не се ползва"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "клон-източник"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "смяна на клона-източник"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "без клон-източник"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "цветен изход"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "действие върху следящите клони"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "извеждане само на клоните, които съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "извеждане само на клоните, които не съдържат това ПОДАВАНЕ"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "Специални действия на „git-branch“:"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "извеждане както на следящите, така и на локалните клони"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "изтриване на клони, които са напълно слети"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "изтриване и на клони, които не са напълно слети"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr ""
"преместване/преименуване на клон и принадлежащият му журнал на указателите"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr "преместване/преименуване на клон, дори ако има вече клон с такова име"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "копиране на клон и принадлежащия му журнал на указателите"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "копиране на клон, дори ако има вече клон с такова име"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "извеждане на имената на клоните"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "създаване на журнала на указателите на клона"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "редактиране на описанието на клона"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "принудително създаване, преместване, преименуване, изтриване"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "извеждане само на слетите клони"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "извеждане само на неслетите клони"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "извеждане по колони"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "КЛЮЧ"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "име на полето, по което да е подредбата"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "ОБЕКТ"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "извеждане само на клоните на ОБЕКТА"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "подредбата и филтрирането третират еднакво малките и главните букви"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "ФОРМАТ за изхода"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Не може да се открие към какво сочи указателят „HEAD“"
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "В директорията „refs/heads“ липсва файл „HEAD“"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "Опциите „--column“ и „--verbose“ са несъвместими"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "Необходимо е име на клон"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "Не може да зададете описание на несвързан „HEAD“"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "Не може да редактирате описанието на повече от един клон едновременно"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "В клона „%s“ все още няма подавания."
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "Липсва клон на име „%s“."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "Прекалено много клони за преименуване"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "прекалено много клони за копиране"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "Зададени са прекалено много клони за следене"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "прекалено много аргументи към командата за преименуване"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "прекалено много аргументи към командата за следене"
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5905,57 +6114,41 @@
"Следеното от „HEAD“ не може да се зададе да е „%s“, защото то не сочи към "
"никой клон."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "Няма клон на име „%s“."
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "Не съществува клон на име „%s“."
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "Прекалено много клони за махане на следене"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "прекалено много аргументи към командата за спиране на следене"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"Следеното от „HEAD“ не може да махне, защото то не сочи към никой клон."
-#: builtin/branch.c:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Няма информация клонът „%s“ да следи някой друг"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "Няма никакъв смисъл ръчно да създавате „HEAD“."
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "Опциите „-a“ и „-r“ на „git branch“ са несъвместими с име на клон"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"Опцията „--set-upstream“ вече е остаряла и предстои да бъде махната. "
-"Използвайте „--track“ или „--set-upstream-to“\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"За да накарате „%s“ да следи „%s“, изпълнете следната команда:\n"
-"\n"
+"Опцията „--set-upstream“ вече не се поддържа. Използвайте „--track“ или „--"
+"set-upstream-to“"
#: builtin/bundle.c:45
#, c-format
@@ -5970,7 +6163,7 @@
msgid "Need a repository to unbundle."
msgstr "За приемането на пратка е необходимо хранилище."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5978,7 +6171,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | ВИД | --textconv --filters) [--path=ПЪТ] ОБЕКТ"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5986,71 +6179,71 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
"ВИДът може да е: „blob“ (обект BLOB), „tree“ (дърво), „commit“ (подаване), "
"„tag“ (етикет)"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "извеждане на вида на обект"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "извеждане на размера на обект"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "изход с 0, когато няма грешка"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "форматирано извеждане на съдържанието на обекта"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr ""
"да се стартира програмата зададена в настройката „textconv“ за преобразуване "
"на съдържанието на обекта BLOB"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr ""
"да се стартират програмите за преобразуване на съдържанието на обектите BLOB"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "обект BLOB"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "опциите „--textconv“/„--filters“ изискват път"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "позволяване на опциите „-s“ и „-t“ да работят с повредени обекти"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "буфериране на изхода от „--batch“"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
"извеждане на информация и съдържание на обектите подадени на стандартния вход"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "извеждане на информация за обектите подадени на стандартния вход"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"следване на символните връзки сочещи в дървото (ползва се с „--batch“ или „--"
"batch-check“)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "извеждане на всички обекти с „--batch“ или „--batch-check“"
@@ -6078,7 +6271,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "разделяне на входните и изходните записи с нулевия знак „NUL“"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "без показване на напредъка"
@@ -6135,161 +6328,161 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr "етапът трябва да е „1“, „2“, „3“ или „all“ (всички)"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "изтегляне на всички файлове в индекса"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "презаписване на файловете, дори и да съществуват"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
msgid "no warning for existing files and files not in index"
msgstr "без предупреждения при липсващи файлове и файлове не в индекса"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "без изтегляне на нови файлове"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "обновяване на информацията получена чрез „stat“ за файловете в индекса"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr "изчитане на пътищата от стандартния вход"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "записване на съдържанието във временни файлове"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "НИЗ"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr "при създаването на нови файлове да се добавя префикса НИЗ"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "копиране на файловете от това състояние на сливане"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [ОПЦИЯ…] КЛОН"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [ОПЦИЯ…] [КЛОН] -- ФАЙЛ…"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "вашата версия липсва в пътя „%s“"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "чуждата версия липсва в пътя „%s“"
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "някоя от необходимите версии липсва в пътя „%s“"
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "пътят „%s“ не може да бъде слян"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Резултатът за „%s“ не може да бъде слян"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "Опцията „%s“ е несъвместима с обновяването на пътища"
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "Опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
"Невъзможно е едновременно да обновявате пътища и да преминете към клона „%s“."
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "пътят „%s“ не е слят"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr "първо трябва да коригирате индекса си"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Журналът на указателите за „%s“ не може да се проследи: %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "Указателят „HEAD“ в момента сочи към"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "Указателят „HEAD“ не може да бъде обновен"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Зануляване на клона „%s“\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "Вече сте на „%s“\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Преминаване към клона „%s“ и зануляване на промените\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Преминахте към новия клон „%s“\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Преминахте към клона „%s“\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr "… и още %d.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6311,7 +6504,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6338,164 +6531,164 @@
" git branch ИМЕ_НА_НОВИЯ_КЛОН %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "вътрешна грешка при обхождането на версиите"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "Преди това „HEAD“ сочеше към"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr "В момента сте на клон, който предстои да бъде създаден"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "очакваше се един указател, а сте подали %d."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "неправилен указател: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "указателят не сочи към обект-дърво: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "задаването на път е несъвместимо с преминаването от един клон към друг"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "опцията „%s“ е несъвместима с преминаването от един клон към друг"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "опцията „%s“ е несъвместима с „%s“"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
"За да преминете към клон, подайте указател, който сочи към подаване. „%s“ "
"не е такъв"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "клон"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "създаване и преминаване към нов клон"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "създаване/зануляване на клон и преминаване към него"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "създаване на журнал на указателите за нов клон"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "отделяне на указателя „HEAD“ към указаното подаване"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "задаване на кой клон бива следен при създаването на новия клон"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "НОВ_КЛОН"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "нов клон без родител"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "изтегляне на вашата версия на неслетите файлове"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "изтегляне на чуждата версия на неслетите файлове"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "принудително изтегляне (вашите промени ще бъдат занулени)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr "извършване на тройно сливане с новия клон"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "обновяване на игнорираните файлове (стандартно)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "СТИЛ"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "действие при конфликт (сливане или тройна разлика)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "без ограничаване на изброените пътища само до частично изтеглените"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
"опит за отгатване на име на клон след неуспешен опит с „git checkout "
"НЕСЪЩЕСТВУВАЩ_КЛОН“"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
msgid "do not check if another worktree is holding the given ref"
msgstr "без проверка дали друго работно дърво държи указателя"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "извеждане на напредъка"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--orphan“ са несъвместими една с друга"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "опцията „--track“ изисква име на клон"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "Липсва име на клон, използвайте опцията „-b“"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "указан е неправилен път"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "„%s“ не е подаване, затова от него не може да се създаде клон „%s“"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: опцията „--detach“ не приема аргумент-път „%s“"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6533,7 +6726,7 @@
msgid "failed to remove %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6546,7 +6739,7 @@
"ПРЕФИКС — избор на единствен обект по този уникален префикс\n"
" — (празно) нищо да не се избира\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6567,39 +6760,39 @@
"* — избиране на всички обекти\n"
" — (празно) завършване на избирането\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Неправилен избор (%s).\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблони за игнорирани елементи≫ "
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Никой обект не напасва на „%s“"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr "Избиране на обекти за изтриване"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Да се изтрие ли „%s“? „y“ — да, „N“ — НЕ"
#
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Изход.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6617,63 +6810,64 @@
"help — този край\n"
"? — подсказка за шаблоните"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "●●● Команди ●●●"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "Избор на следващо действие"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Следният обект ще бъде изтрит:"
msgstr[1] "Следните обекти ще бъдат изтрити:"
-#: builtin/clean.c:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "Файловете за изчистване свършиха. Изход от програмата."
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "без извеждане на имената на файловете, които ще бъдат изтрити"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "принудително изтриване"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "интерактивно изтриване"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "изтриване на цели директории"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "ШАБЛОН"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "добавяне на ШАБЛОН от файлове, които да не се трият"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "изтриване и на игнорираните файлове"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "изтриване само на игнорирани файлове"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "опциите „-x“ и „-X“ са несъвместими"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6681,7 +6875,7 @@
"Настройката „clean.requireForce“ е зададена като истина, което изисква някоя "
"от опциите „-i“, „-n“ или „-f“. Няма да се извърши изчистване"
-#: builtin/clean.c:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6690,146 +6884,148 @@
"което изисква някоя от опциите „-i“, „-n“ или „-f“. Няма да се извърши "
"изчистване"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [ОПЦИЯ…] [--] ХРАНИЛИЩЕ [ДИРЕКТОРИЯ]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "без създаване на работно дърво"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "създаване на голо хранилище"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr ""
"създаване на хранилище-огледало (включва опцията „--bare“ за голо хранилище)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "клониране от локално хранилище"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "без твърди връзки, файловете винаги да се копират"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "настройване за споделено хранилище"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "път"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "инициализиране на подмодулите при това клониране"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "брой подмодули, клонирани паралелно"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "директория с шаблони"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "директория, която съдържа шаблоните, които да се ползват"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "еталонно хранилище"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "опцията „--reference“ може да се използва само при клониране"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "ИМЕ"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "използване на това ИМЕ вместо „origin“ при проследяване на клони"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "изтегляне на този КЛОН, а не соченият от отдалечения указател „HEAD“"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "път към командата „git-upload-pack“ на отдалеченото хранилище"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "ДЪЛБОЧИНА"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "плитко клониране до тази ДЪЛБОЧИНА"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "ВРЕМЕ"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "плитко клониране до момент във времето"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "версия"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr "задълбочаване на историята на плитко хранилище до изключващ указател"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr ""
"клониране само на един клон — или сочения от отдалечения „HEAD“, или изрично "
"зададения с „--branch“"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
"без клониране на етикети, като последващите доставяния няма да ги следят"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "всички клонирани подмодули ще са плитки"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "СЛУЖЕБНА_ДИРЕКТОРИЯ"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "отделна СЛУЖЕБНА_ДИРЕКТОРИЯ за git извън работното дърво"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "КЛЮЧ=СТОЙНОСТ"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "задаване на настройките на новото хранилище"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "само адреси IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "само адреси IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6837,43 +7033,43 @@
"Името на директорията не може да бъде отгатнато.\n"
"Задайте директорията изрично на командния ред"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: не може да се добави алтернативен източник на „%s“: %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "директорията „%s“ не може да бъде отворена"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "„%s“ съществува и не е директория"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "връзката „%s“ не може да бъде създадена"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "файлът не може да бъде копиран като „%s“"
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "действието завърши.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6884,103 +7080,103 @@
"клон в момента са изтеглени с командата „git status“. Можете да\n"
"завършите изтеглянето на клона с командата „git checkout -f HEAD“.\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
"Клонът „%s“ от отдалеченото хранилище, което клонирате,\n"
"и който следва да бъде изтеглен, не съществува."
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "отдалеченото хранилище не изпрати всички необходими обекти."
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "обектът „%s“ не може да бъде обновен"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"указателят „HEAD“ от отдалеченото хранилище сочи към нещо,\n"
"което не съществува. Не може да се изтегли определен клон.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "работното дърво не може да бъде подготвено"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "настройките не могат да бъдат записани в конфигурационния файл"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "не може да се извърши пакетиране за изчистване на файловете"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "временният файл за алтернативни обекти не може да бъде изтрит"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "Прекалено много аргументи."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Трябва да укажете кое хранилище искате да клонирате."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "опциите „--bare“ и „--origin %s“ са несъвместими."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "опциите „--bare“ и „--separate-git-dir“ са несъвместими."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "не съществува хранилище „%s“"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "дълбочината трябва да е положително цяло число, а не „%s“"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевият път „%s“ съществува и не е празна директория."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "в „%s“ вече съществува работно дърво."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "родителските директории на „%s“ не могат да бъдат създадени"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "работното дърво в „%s“ не може да бъде създадено."
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клониране и създаване на голо хранилище в „%s“…\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клониране и създаване на хранилище в „%s“…\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6988,43 +7184,38 @@
"Опцията „--recursive“ е несъвместима с опциите „--reference“ и „--reference-"
"if-able“"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--depth“ се прескача. Ползвайте схемата "
"„file://“."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-since“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"При локално клониране опцията „--shallow-exclude“ се прескача. Ползвайте "
"схемата „file://“."
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "клонираното хранилище е плитко, затова опцията „--local“ се прескача"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "опцията „--local“ се прескача"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Не се поддържа клониране на връзки от вида „%s“ "
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Отдалеченият клон „%s“ липсва в клонираното хранилище „%s“"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "Изглежда клонирахте празно хранилище."
@@ -7083,7 +7274,8 @@
" git commit --amend --reset-author\n"
msgstr ""
"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
-"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n"
+"потребителя и името на машината. Проверете дали са верни. Можете да "
+"спрете\n"
"това съобщение като изрично зададете стойностите. Изпълнете следната "
"команда\n"
"и следвайте инструкциите в текстовия ви редактор, за да редактирате\n"
@@ -7110,7 +7302,8 @@
" git commit --amend --reset-author\n"
msgstr ""
"Името и адресът за е-поща са настроени автоматично на базата на името на\n"
-"потребителя и името на машината. Проверете дали са верни. Можете да спрете\n"
+"потребителя и името на машината. Проверете дали са верни. Можете да "
+"спрете\n"
"това съобщение като изрично зададете стойностите:\n"
"\n"
" git config --global user.name \"Вашето Име\"\n"
@@ -7168,61 +7361,61 @@
"Чрез командата „git cherry-pick --continue“ ще продължите отбирането на\n"
"останалите подавания.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "върховото дърво (HEAD tree object) не може да бъде извадено от пакет"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "временният индекс не може да бъде създаден"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "неуспешно интерактивно добавяне"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "временният индекс не може да бъде обновен"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Дървото на основния кеш не може да бъде обновено"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "новият индекс не може да бъде записан"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "по време на сливане не може да се извърши частично подаване."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "по време на отбиране не може да се извърши частично подаване."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "индексът не може да бъде прочетен"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "временният индекс не може да бъде записан"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "заглавната част за автор в подаването „%s“ липсва"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "заглавната част за автор в подаването „%s“ е неправилна"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "неправилен параметър към опцията „--author“"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -7230,38 +7423,38 @@
"не може да се избере знак за коментар — в текущото съобщение за подаване са "
"използвани всички подобни знаци"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "следното подаване не може да бъде открито: %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(изчитане на съобщението за подаване от стандартния вход)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "съобщението за подаване не бе прочетено стандартния вход"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "файлът със съобщението за подаване „%s“ не може да бъде прочетен"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "съобщението за смачкване SQUASH_MSG не може да бъде прочетено"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "съобщението за сливане MERGE_MSG не може да бъде прочетено"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "шаблонът за подаване не може да бъде запазен"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7276,7 +7469,7 @@
" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7292,7 +7485,7 @@
" %s\n"
"и опитайте отново.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7301,7 +7494,7 @@
"Въведете съобщението за подаване на промените. Редовете, които започват\n"
"с „%c“, ще бъдат пропуснати, а празно съобщение преустановява подаването.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7312,153 +7505,163 @@
"с „%c“, също ще бъдат включени — може да ги изтриете вие. Празно \n"
"съобщение преустановява подаването.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sПодаващ: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Индексът не може да бъде прочетен"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "Грешка при изграждане на дърветата"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Подайте съобщението с някоя от опциите „-m“ или „-F“.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1076
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"Опцията „--author '%s'“ не отговаря на форма̀та „Име <е-поща>“ и не съвпада с "
"никой автор"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Неправилен режим за игнорираните файлове: „%s“"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr "Неправилна стойност за неследените файлове: „%s“"
+msgstr "Неправилен режим за неследените файлове: „%s“"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "Опциите „--long“ и „-z“ са несъвместими."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
msgid "Using both --reset-author and --author does not make sense"
msgstr "Опциите „--reset-author“ и „--author“ са несъвместими."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "Няма какво да бъде поправено."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr "В момента се извършва сливане, не можете да поправяте."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "В момента се извършва отбиране на подаване, не можете да поправяте."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опциите „--squash“ и „--fixup“ са несъвместими."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Опциите „-c“, „-C“, „-F“ и „--fixup““ са несъвместими."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Опцията „-m“ е несъвместима с „-c“, „-C“, „-F“ и „--fixup“."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Опцията „--reset-author“ може да се използва само заедно с „-C“, „-c“ или\n"
"„--amend“."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1226
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"Опциите „--include“, „--only“, „--all“, „--interactive“ и „--patch“ са\n"
"несъвместими."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1228
msgid "No paths with --include/--only does not make sense."
msgstr "Опциите „--include“ и „--only“ изискват аргументи."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Несъществуващ режим на изчистване „%s“"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "Опцията „-a“ е несъвместима със задаването на пътища."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "кратка информация за състоянието"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "информация за клоните"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "информация за скатаното"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "формат на изхода за четене от програма"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "подробна информация за състоянието (стандартно)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "разделяне на елементите с нулевия знак „NUL“"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "РЕЖИМ"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"извеждане на неследените файлове. Възможните РЕЖИМи са „all“ (подробна "
"информация), „normal“ (кратка информация), „no“ (без неследените файлове). "
"Стандартният РЕЖИМ е: „all“."
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "извеждане на игнорираните файлове"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"извеждане на игнорираните файлове. Възможните РЕЖИМи са "
+"„traditional“ (традиционен), „matching“ (напасващи), „no“ (без игнорираните "
+"файлове). Стандартният РЕЖИМ е: „traditional“."
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "КОГА"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7467,205 +7670,216 @@
"една от „all“ (всички), „dirty“ (тези с неподадени промени), "
"„untracked“ (неследени)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "извеждане на неследените файлове в колони"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Неподдържана комбинация от аргументи за игнорирани и неследени файлове"
+
+#: builtin/commit.c:1469
msgid "couldn't look up newly created commit"
msgstr "току що създаденото подаване не може да бъде открито"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr "току що създаденото подаване не може да бъде анализирано"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+"състоянието сочено от указателя „HEAD“ не може да бъде открито след "
+"подаването"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "несвързан връх „HEAD“"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (начално подаване)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "без информация след успешно подаване"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "добавяне на разликата към шаблона за съобщението при подаване"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "Опции за съобщението при подаване"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "взимане на съобщението от ФАЙЛ"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "АВТОР"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "задаване на АВТОР за подаването"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "ДАТА"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "задаване на ДАТА за подаването"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "СЪОБЩЕНИЕ"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "СЪОБЩЕНИЕ при подаване"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "ПОДАВАНЕ"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "преизползване и редактиране на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "преизползване на съобщението от указаното ПОДАВАНЕ"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"използване на автоматичното съобщение при смачкване за вкарване на указаното "
"ПОДАВАНЕ в предното без следа"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"използване на автоматичното съобщение при смачкване за смачкване на "
"указаното ПОДАВАНЕ в предното"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1630
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
"смяна на автора да съвпада с подаващия (използва се с „-C“/„-c“/„--amend“)"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "добавяне на поле за подпис — „Signed-off-by:“"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "използване на указания шаблонен ФАЙЛ"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "редактиране на подаване"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "стандартно"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "кои празни знаци и #коментари да се махат от съобщенията"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "вмъкване на състоянието в шаблона за съобщението при подаване"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "подписване на подаването с GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "Опции за избор на файлове при подаване"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "подаване на всички променени файлове"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "добавяне на указаните файлове към индекса за подаване"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "интерактивно добавяне на файлове"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "интерактивно добавяне на промени"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "подаване само на указаните файлове"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
"без изпълнение на куките преди подаване и при промяна на съобщението за "
"подаване (pre-commit и commit-msg)"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "отпечатване на това, което би било подадено"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "поправяне на предишното подаване"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "без изпълнение на куката след презаписване (post-rewrite)"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "позволяване на празни подавания"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "позволяване на подавания с празни съобщения"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "върховото подаване „HEAD“ не може да бъде прочетено"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Повреден файл за върха за сливането „MERGE_HEAD“ (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "режимът на сливане „MERGE_MODE“ не може да бъде прочетен"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "съобщението за подаване не може да бъде прочетено: %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Неизвършване на подаване поради празно съобщение.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Неизвършване на подаване поради нередактирано съобщение.\n"
+
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7679,146 +7893,150 @@
msgid "git config [<options>]"
msgstr "git config [ОПЦИЯ…]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "Местоположение на конфигурационния файл"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "използване на глобалния конфигурационен файл"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "използване на системния конфигурационен файл"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "използване на конфигурационния файл на хранилището"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "използване на зададения конфигурационен ФАЙЛ"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "ИДЕНТИФИКАТОР"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr ""
"изчитане на конфигурацията от BLOB с този ИДЕНТИФИКАТОР на съдържанието"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "извеждане на стойност: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "извеждане на всички стойности: ключ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
"извеждане на стойностите за РЕГУЛЯРНия_ИЗРАЗ: РЕГУЛЯРЕН_ИЗРАЗ_ЗА_ИМЕТО "
"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "извеждане на стойността за указания адрес: РАЗДЕЛ[.ПРОМЕНЛИВА] АДРЕС"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"замяна на всички съвпадащи променливи: ИМЕ СТОЙНОСТ "
"[РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "добавяне на нова променлива: ИМЕ СТОЙНОСТ"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "изтриване на променлива: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "изтриване на всички съвпадащи: ИМЕ [РЕГУЛЯРЕН_ИЗРАЗ_ЗА_СТОЙНОСТТА]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "преименуване на раздел: СТАРО_ИМЕ НОВО_ИМЕ"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "изтриване на раздел: ИМЕ"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "изброяване на всички"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "отваряне на редактор"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "извеждане на зададения цвят: номер [стандартно]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "извеждане на зададения цвят: номер (стандартният изход е терминал)"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "Вид"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "СТОЙНОСТТА е „true“ (истина) или „false“ (лъжа)"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "СТОЙНОСТТА е цяло, десетично число"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "СТОЙНОСТТА е „--bool“ (булева) или „--int“ (десетично цяло число)"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "СТОЙНОСТТА е път (до файл или директория)"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "стойността е период на валидност/запазване"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "Други"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "разделяне на стойностите с нулевия знак „NUL“"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "извеждане на имената на променливите"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "при търсене да се уважат и директивите за включване"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"извеждане на мястото на задаване на настройката (файл, стандартен вход, "
"обект BLOB, команден ред)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "неразпозната стойност на стандартния цвят"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7833,16 +8051,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "„--local“ може да се използва само в хранилище"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "конфигурационният файл „%s“ не може да бъде създаден"
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7852,75 +8070,65 @@
"За да промените „%s“, ползвайте регулярен израз или опциите „--add“ и „--"
"replace-all“."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "извеждане на размерите на обектите във формат лесно четим от хора"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [ОПЦИЯ…] УКАЗАТЕЛ_КЪМ_ПОДАВАНЕ…"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [ОПЦИЯ…] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "основно"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "кратко"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "анотирано"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "не съществува анотиран етикет „%s“"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "в анотирания етикет „%s“ липсва вградено име"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "етикетът „%s“ тук е всъщност „%s“"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "Неправилно име на обект „%s“"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "„%s“ е неправилен обект „%s“"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "никой етикет не напасва точно „%s“"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "търсене за описание на „%s“\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "Никоя версия и етикет не напасват точно. Търси се по описание\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "търсенето приключи при „%s“\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7929,7 +8137,7 @@
"Никой анотиран етикет не описва „%s“.\n"
"Съществуват и неанотирани етикети. Пробвайте с опцията „--tags“."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7938,12 +8146,12 @@
"Никой етикет не описва „%s“.\n"
"Пробвайте с опцията „--always“ или създайте етикети."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "претърсени са %lu подавания\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7952,78 +8160,93 @@
"открити са над %i етикета, изведени са последните %i,\n"
"търсенето бе прекратено при „%s“.\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "описание на „%s“\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Неправилно име на обект „%s“"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "„%s“ не е нито подаване, нито обект BLOB"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "откриване на етикета, който следва подаване"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr ""
"извеждане на информация за трасиране на стратегията за търсене на "
"стандартната грешка"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "използване на произволен указател"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "използване на всеки етикет — включително и неанотираните"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "винаги да се ползва дългият формат"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "проследяване само на първия родител"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "извеждане само на точните съвпадения"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "да се търси само в този БРОЙ последни етикети (стандартно: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "да се търси само измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "да не се търси измежду етикетите напасващи този ШАБЛОН"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "извеждане на съкратено име на обект като резервен вариант"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "МАРКЕР"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "добавяне на такъв МАРКЕР на работното дърво (стандартно е „-dirty“)"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"добавяне на такъв МАРКЕР на счупеното работно дърво (стандартно е „-broken“)"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "Опциите „--long“ и „--abbrev=0“ са несъвместими"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "Не са открити имена — нищо не може да бъде описано."
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "опцията „--dirty“ е несъвместима с указател към подаване"
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "опцията „--broken“ е несъвместима с указател към подаване"
@@ -8032,26 +8255,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "„%s“: не е нито обикновен файл, нито символна връзка"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "неправилна опция: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "Не е хранилище на Git"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "зададен е неправилен обект „%s“."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "зададени са повече от 2 обекта BLOB: „%s“"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "зададен е неподдържан обект „%s“."
@@ -8060,27 +8283,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [ОПЦИЯ…] [ПОДАВАНЕ [ПОДАВАНЕ]] [[--] ПЪТ…]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "неуспешно действие с изходен код: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "символната връзка „%s“ не може да бъде прочетена"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "файлът, сочен от символната връзка „%s“, не може да бъде прочетен"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "обектът „%s“ за символната връзка „%s“ не може да бъде прочетен"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -8088,55 +8311,55 @@
"комбинираните формати на разликите („-c“ и „--cc“) не се поддържат\n"
"в режима за разлики върху директории („-d“ и „--dir-diff“)."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "и двата файла са променени: „%s“ и „%s“."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "работното дърво е изоставено."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "в „%s“ има временни файлове."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "възможно е да ги изчистите или възстановите"
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "използвайте „diff.guitool“ вместо „diff.tool“"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "разлика по директории"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "стартиране на ПРОГРАМАта за разлики без предупреждение"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "следване на символните връзки при разлика по директории"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "ПРОГРАМА"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "използване на указаната ПРОГРАМА"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"извеждане на списък с всички ПРОГРАМи, които може да се ползват с опцията „--"
"tool“"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -8144,19 +8367,19 @@
"„git-difftool“ да спре работа, когато стартираната ПРОГРАМА завърши с "
"ненулев код"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "КОМАНДА"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "команда за разглеждане на разлики"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "не е зададена програма за „--tool=ПРОГРАМА“"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не е зададена команда за „--extcmd=КОМАНДА“"
@@ -8164,143 +8387,143 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [ОПЦИИ_ЗА_СПИСЪКА_С_ВЕРСИИ]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "Съобщение за напредъка на всеки такъв БРОЙ обекта"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "Как да се обработват подписаните етикети"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "Как да се обработват етикетите на филтрираните обекти"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Запазване на маркерите в този ФАЙЛ"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Внасяне на маркерите от този ФАЙЛ"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "Да се използва изкуствено име на човек при липса на задаващ етикета"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Извеждане на цялото дърво за всяко подаване"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Използване на маркер за завършване на потока"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Без извеждане на съдържанието на обектите BLOB"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "УКАЗАТЕЛ_НА_ВЕРСИЯ"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Прилагане на УКАЗАТЕЛя_НА_ВЕРСИЯ към изнесените указатели"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "анонимизиране на извежданата информация"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ…]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [ОПЦИЯ…] ГРУПА"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [ОПЦИЯ…] [(ХРАНИЛИЩЕ | ГРУПА)…]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [ОПЦИЯ…]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "доставяне от всички отдалечени хранилища"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "добавяне към „.git/FETCH_HEAD“ вместо замяна"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "отдалечен път, където да се качи пакетът"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "принудително презаписване на локалния клон"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "доставяне от множество отдалечени хранилища"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "доставяне на всички етикети и принадлежащи обекти"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "без доставянето на всички етикети „--no-tags“"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "брой подмодули доставени паралелно"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "prune remote-tracking branches no longer on remote"
msgstr "окастряне на клоните следящи вече несъществуващи отдалечени клони"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "ПРИ НУЖДА"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "запазване на изтеглените пакети с обекти"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "позволяване на обновяването на указателя „HEAD“"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "задълбочаване на историята на плитко хранилище"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
msgid "deepen history of shallow repository based on time"
msgstr "задълбочаване на историята на плитко хранилище до определено време"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "превръщане в пълно хранилище"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "директория"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "добавяне на това пред пътя на подмодула"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -8308,91 +8531,91 @@
"стандартно рекурсивно изтегляне на подмодулите (файловете с настройки са с "
"приоритет)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "приемане на указатели, които обновяват „.git/shallow“"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "КАРТА_С_УКАЗАТЕЛИ"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "указване на КАРТАта_С_УКАЗАТЕЛИ за доставяне"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "Указателят „HEAD“ в отдалеченото хранилище не може да бъде открит"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "настройката „fetch.output“ е с неправилна стойност „%s“"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "обектът „%s“ липсва"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[актуализиран]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[отхвърлен]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "в текущия клон не може да се доставя"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[обновяване на етикетите]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "локален указател не може да бъде обновен"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[нов етикет]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[нов клон]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[нов указател]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "принудително обновяване"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "същинско сливане"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "хранилището „%s“ не изпрати всички необходими обекти\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"отхвърляне на върха „%s“, защото плитките хранилища не могат да бъдат "
"обновявани"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "От %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8402,55 +8625,50 @@
"„git remote prune %s“, за да премахнете остарелите клони, които\n"
"предизвикват конфликта"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " (обектът „%s“ ще се окаже извън клон)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (обектът „%s“ вече е извън клон)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[изтрит]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(нищо)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Не може да доставите в текущия клон „%s“ на хранилище, което не е голо"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Стойността „%2$s“ за опцията „%1$s“ не е съвместима с „%3$s“"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Опцията „%s“ се прескача при „%s“\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Не се поддържа доставяне от „%s“"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "Доставяне на „%s“\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "„%s“ не може да се достави"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8458,41 +8676,41 @@
"Не сте указали отдалечено хранилище. Задайте или адрес, или име\n"
"на отдалечено хранилище, откъдето да се доставят новите версии."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "Трябва да укажете име на етикет."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицателна дълбочина като аргумент на „--deepen“ не се поддържа"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "Опциите „--deepen“ и „--depth“ са несъвместими една с друга"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr "опциите „--depth“ и „--unshallow“ са несъвместими"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr "не можете да използвате опцията „--unshallow“ върху пълно хранилище"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "към „git fetch --all“ не можете да добавите аргумент — хранилище"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr ""
"към „git fetch --all“ не можете да добавите аргумент — указател на версия"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Няма нито отдалечено хранилище, нито група от хранилища на име „%s“"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Указването на група и указването на версия са несъвместими"
@@ -8502,25 +8720,25 @@
msgstr ""
"git fmt-merge-msg [-m СЪОБЩЕНИЕ] [--log[=БРОЙ] | --no-log] [--file ФАЙЛ]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
"вмъкване на журнал състоящ се от не повече от БРОЙ записа от съкратения "
"журнал"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "синоним на „--log“ (остаряло)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "ТЕКСТ"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "за начало на съобщението да се ползва ТЕКСТ"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "файл, от който да се чете"
@@ -8560,102 +8778,106 @@
msgid "show only <n> matched refs"
msgstr "извеждане само на този БРОЙ напаснати указатели"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "спазване на цветовете на форма̀та"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "извеждане само на указателите, сочещи към ОБЕКТА"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "извеждане само на слетите указатели"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "извеждане само на неслетите указатели"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "извеждане само на указателите, които съдържат това ПОДАВАНЕ"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "извеждане само на указателите, които не съдържат това ПОДАВАНЕ"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Проверка на директориите с обекти"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [ОПЦИЯ…] [ОБЕКТ…]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "показване на недостижимите обекти"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "показване на обектите извън клоните"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "показване на етикетите"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "показване на кореновите възли"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "задаване на обекти от индекса да са коренови"
# FIXME bad message
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "проследяване на указателите от журнала като глави (стандартно)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "допълнително да се проверяват пакетите и алтернативните обекти"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "проверка само на връзката"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "по-строги проверки"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "запазване на обектите извън клоните в директорията „.git/lost-found“"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "показване на напредъка"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "показване на подробни имена на достижимите обекти"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Проверка на обектите"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [ОПЦИЯ…]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Неуспешно изпълнение на „fstat“ върху „%s“: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "Неуспешно изпълнение на „stat“ върху „%s“"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8672,49 +8894,49 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "окастряне на обектите, към които нищо не сочи"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "изчерпателно търсене на боклука (за сметка на повече време работа)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "включване на автоматичното събиране на боклука (auto-gc)"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr ""
"изрично стартиране на събирането на боклука, дори и ако вече работи друго "
"събиране"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Неразпозната стойност на „gc.logexpiry“: %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"Автоматично пакетиране на заден фон на хранилището за по-добра "
"производителност.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматично пакетиране на хранилището за по-добра производителност.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
"Погледнете ръководството за повече информация как да изпълните „git help "
"gc“.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8723,7 +8945,7 @@
"процеса: %<PRIuMAX> (ако сте сигурни, че това не е вярно, това използвайте\n"
"опцията „--force“)"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8734,12 +8956,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [ОПЦИЯ…] [-e] ШАБЛОН [ВЕРСИЯ…] [[--] ПЪТ…]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: неуспешно създаване на нишка: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "зададен е неправилен брой нишки (%d) за %s"
@@ -8748,263 +8970,255 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "липсва поддръжка за нишки. „%s“ ще се пренебрегне"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "дървото не може да бъде прочетено (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не може да се изпълни „grep“ от обект от вида %s"
-#: builtin/grep.c:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "опцията „%c“ очаква число за аргумент"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr "търсене в индекса, а не в работното дърво"
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "търсене и във файловете, които не са под управлението на git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "търсене и в следените, и в неследените файлове"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "игнориране на файловете указани в „.gitignore“"
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "рекурсивно търсене във всички подмодули"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "ОСНОВНО ИМЕ"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "добавяне на ОСНОВНОто ИМЕ на проекта към изхода"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "извеждане на редовете, които не съвпадат"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "без значение на регистъра на буквите (главни/малки)"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "напасване на шаблоните само по границите на думите"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "обработване на двоичните файлове като текстови"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "прескачане на двоичните файлове"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr ""
"обработване на двоичните файлове чрез филтри за преобразуване към текст"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "навлизане максимално на тази ДЪЛБОЧИНА в дървото"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "разширени регулярни изрази по POSIX"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "основни регулярни изрази по POSIX (стандартно)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "шаблоните са дословни низове"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "регулярни изрази на Perl"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "извеждане на номерата на редовете"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "без извеждане на имената на файловете"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "извеждане на имената на файловете"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr ""
"извеждане на относителните имена на файловете спрямо основната директория на "
"хранилището"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "извеждане само на имената на файловете без напасващите редове"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "синоним на „--files-with-matches“"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr ""
"извеждане само на имената на файловете, които не съдържат ред, напасващ на "
"шаблона"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "извеждане на нулевия знак „NUL“ след всяко име на файл"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr "извеждане на броя на съвпаденията вместо напасващите редове"
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "оцветяване на напасванията"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr "извеждане на празен ред между напасванията от различни файлове"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
msgid "show filename only once above matches from same file"
msgstr ""
"извеждане на името на файла само веднъж за всички напасвания от този файл"
-#: builtin/grep.c:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "извеждане на такъв БРОЙ редове преди и след напасванията"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "извеждане на такъв БРОЙ редове преди напасванията"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "извеждане на такъв БРОЙ редове след напасванията"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "използване на такъв БРОЙ работещи нишки"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "синоним на „-C БРОЙ“"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr "извеждане на ред с името на функцията, в която е напаснат шаблона"
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "извеждане на обхващащата функция"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "изчитане на шаблоните от ФАЙЛ"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "напасване на ШАБЛОН"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "комбиниране на шаблоните указани с опцията „-e“"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr ""
"без извеждане на стандартния изход. Изходният код указва наличието на "
"напасване"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
msgid "show only matches from files that match all patterns"
msgstr ""
"извеждане на редове само от файловете, които напасват на всички шаблони"
-#: builtin/grep.c:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "извеждане на дървото за анализ на регулярния израз"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "програма за преглед по страници"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "извеждане на съвпадащите файлове в програма за преглед по страници"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
"позволяване на стартирането на grep(1) (текущият компилат пренебрегва тази "
"опция)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "липсва шаблон."
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
msgid "--no-index or --untracked cannot be used with revs"
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с версии."
-#: builtin/grep.c:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "версията „%s“ не може бъде открита"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "зададен е неправилен брой нишки: %d"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "липсва поддръжка за нишки. „--threads“ ще се пренебрегне"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"опцията „--open-files-in-pager“ е съвместима само с търсене в работното дърво"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "опцията е несъвместима с „--recurse-submodules“."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "опциите „--cached“ и „--untracked“ са несъвместими с „--no-index“."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"опциите „--(no-)exclude-standard“ са несъвместими с търсене по следени "
"файлове."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "опцията „--cached“ е несъвместима със задаване на дърво."
@@ -9057,11 +9271,11 @@
#: builtin/help.c:44
msgid "exclude guides"
-msgstr "без пътеводетели"
+msgstr "без въведения"
#: builtin/help.c:45
msgid "print list of useful guides"
-msgstr "показване на списък с пътеводители"
+msgstr "показване на списък с въведения"
#: builtin/help.c:46
msgid "show man page"
@@ -9097,12 +9311,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Прекалено стара версия на „emacsclient“ — %d (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "неуспешно изпълнение на „%s“"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -9111,7 +9325,7 @@
"„%s“: път към неподдържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.cmd“."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -9120,366 +9334,366 @@
"„%s“: команда за поддържана програма за преглед на\n"
" ръководството. Вместо нея пробвайте „man.<tool>.path“."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "„%s“: непозната програма за преглед на ръководството."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "никоя програма за преглед на ръководство не успя да обработи заявката"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr ""
"никоя програма за преглед на информационните страници не успя да обработи "
"заявката"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Указване на атрибути към път"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
-msgstr "Ежедневието в Git в рамките на 20-ина команди"
+msgstr "Ежедневието в Git в рамките на двайсетина команди"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Речник с термините на Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указване на неследени файлове, които да бъдат нарочно пренебрегвани"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Дефиниране на свойствата на подмодулите"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Указване на версии и диапазони в Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Въвеждащ урок за Git (версии поне 1.5.1)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Общ преглед на препоръчваните начини за работа с Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
-msgstr "Популярните пътеводители в Git са:\n"
+msgstr "Популярните въведения в Git са:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "„git %s“ е синоним на „%s“"
+msgid "'%s' is aliased to '%s'"
+msgstr "„%s“ е синоним на „%s“"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "употреба: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "обектът „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "неправилен вид на обекта „%s“"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "очакваният обект „%s“ не бе получен"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "неправилен вид на обекта „%s“: очакваше се „%s“, а бе получен „%s“"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "не може да се запълни %d байт"
msgstr[1] "не може да се запълнят %d байта"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "неочакван край на файл"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "грешка при четене на входните данни"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "използвани са повече от наличните байтове"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "пакетният файл е прекалено голям за текущата стойност на типа „off_t“"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "пакетният файл надвишава максималния възможен размер"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "пакетният файл „%s“ не може да бъде създаден"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "пакетният файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "несъответствие в подписа към пакетния файл"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "не се поддържа пакетиране вeрсия „%<PRIu32>“"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "повреден обект в пакетния файл при отместване %<PRIuMAX>: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "декомпресирането с „inflate“ върна %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "стойността на отместването за обекта-разлика води до препълване"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "стойността на отместването за обекта-разлика е извън диапазона"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "непознат вид обект %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "пакетният файл не може да бъде прочетен"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "сериозна грешка при декомпресиране с „inflate“"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
"СЪВПАДЕНИЕ НА СТОЙНОСТИТЕ ЗА СУМИТЕ ЗА SHA1: „%s“ НА ДВА РАЗЛИЧНИ ОБЕКТА!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "обектът „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "съществуващият обект в „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "съществуващият обект „%s“ не може да бъде прочетен"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "неправилен обект BLOB „%s“"
# FIXME perhaps invalid object
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "неправилен обект „%s“"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Грешка в обекта"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Някои обекти, наследници на „%s“, не могат да бъдат достигнати"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "разликата не може да бъде приложена"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Получаване на обекти"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Индексиране на обекти"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакетният файл е повреден (нееднакви суми по SHA1)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "не може да се получи информация за пакетния файл с „fstat“"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "в края на пакетния файл има повредени данни"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
"фатална грешка във функцията „parse_pack_objects“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Откриване на съответните разлики"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "не може да се създаде нишка: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr ""
"фатална грешка във функцията „conclude_pack“. Това е грешка в Git, "
"докладвайте я на разработчиците, като пратите е-писмо на адрес: „git@vger."
"kernel.org“."
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
"Неочаквана последваща сума за грешки за „%s“ (причината може да е грешка в "
"диска)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, 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:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "добавеният обект не може да се компресира с „deflate“: %d"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "локалният обект „%s“ е повреден"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "грешка при затварянето на пакетния файл"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
"грешка при записването на файла „%s“, осигуряващ запазване на директория"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
"грешка при затварянето на записания файл „%s“, осигуряващ запазване на "
"директория"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "пакетният файл не може да бъде запазен"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "файлът за индекса не може да бъде съхранен"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "зададена е неправилна версия пакетиране: „pack.indexversion=%<PRIu32>“"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Съществуващият пакетен файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Съществуващият индекс за пакетния файл „%s“ не може да бъде отворен"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "%d обект не е разлика"
msgstr[1] "%d обекта не са разлика"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, 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:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "името на пакетния файл „%s“ не завършва на „.pack“"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "неправилна стойност „%s“"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "опцията „--fix-thin“ изисква „--stdin“"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "„--stdin“ изисква хранилище на git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "опцията „--verify“ изисква име на пакетен файл"
@@ -9614,136 +9828,176 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"ЛЕКСЕМА[(=|:)СТОЙНОСТ])…] [ФАЙЛ…]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "директно редактиране на файловете"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "изчистване на празните епилози"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "къде да се постави новият епилог"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "действие, ако епилог вече съществува"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "действие при липсващ епилог"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "извеждане само на епилозите"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "без прилагане на правилата за настройките"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "сливане на стойностите последване от знаци за интервали"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "опции при анализ"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "епилог"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
-msgstr "епилог(зи) за добавяне"
+msgstr "епилози за добавяне"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "опцията „--trailer“ е несъвместима с „--name-only“"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "не е зададен входен файл за редактиране на място"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] ПЪТ…]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [ОПЦИЯ…] ОБЕКТ…"
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправилна опция „--decorate“: %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "без извеждане на разликите"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "извеждане на изходния код"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr ""
"Използване на файл за съответствията на имената и адресите на е-поща („."
"mailmap“)"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "специален формат само на указателите напасващи на ШАБЛОНа"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "без специален формат на указателите напасващи на ШАБЛОНа"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "настройки на форма̀та на извежданата информация"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Обработване само на редовете във файла в диапазона от n до m включително. "
"Броенето започва от 1"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "Резултат: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: повреден файл"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "Обектът не може да бъде прочетен: %s"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "Неизвестен вид: %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "не е зададена стойност на „format.headers“"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "прекалено дълго име на директорията за изходната информация"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "Файлът-кръпка „%s“ не може да бъде отворен"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "Трябва да зададете точно един диапазон."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "Не е диапазон."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "Придружаващото писмо трябва да е форматирано като е-писмо"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "неправилен формат на заглавната част за отговор „in-reply-to“: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [ОПЦИЯ…] [ОТ | ДИАПАЗОН_НА_ВЕРСИИТЕ]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "Можете да укажете максимум една директория за изход."
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "Непознато подаване „%s“"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не може да се открие към какво сочи „%s“."
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "Точната база за сливане не може да се открие."
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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"
@@ -9753,226 +10007,234 @@
"зададете, използвайте „git branch --set-upstream-to“.\n"
"Можете ръчно да зададете базово подаване чрез „--base=<base-commit-id>“."
-#: builtin/log.c:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "Точната база при сливане не може да бъде открита"
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr "базовото подаване трябва да е предшественикът на списъка с версиите"
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr "базовото подаване не може да е в списъка с версиите"
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "идентификаторът на кръпката не може да бъде получен"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr "номерация „[PATCH n/m]“ дори и при единствена кръпка"
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "номерация „[PATCH]“ дори и при множество кръпки"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "извеждане на кръпките на стандартния изход"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "създаване на придружаващо писмо"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr "проста числова последователност за имената на файловете-кръпки"
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "ЗНАЦИ"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "използване на тези ЗНАЦИ за суфикс вместо „.patch“"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr "номерирането на кръпките да започва от този БРОЙ, а не с 1"
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "отбелязване, че това е N-тата поредна редакция на поредицата от кръпки"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Използване на „[RFC PATCH]“ вместо „[PATCH]“"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Използване на този „[ПРЕФИКС]“ вместо „[PATCH]“"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "запазване на изходните файлове в тази ДИРЕКТОРИЯ"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "без добавяне/махане на префикса „[PATCH]“"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "без извеждане на разлики между двоични файлове"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "в заглавната част „From:“ (от) хешът да е само от нули"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr "да не се включват кръпки, които присъстват в следения клон"
-#: builtin/log.c:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr ""
"извеждане във формат за кръпки, а на в стандартния (кръпка и статистика)"
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "Опции при изпращане"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "добавяне на тази ЗАГЛАВНА_ЧАСТ"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "Е-ПОЩА"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "добавяне на заглавна част „To:“ (до)"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "добавяне на заглавна част „Cc:“ (и до)"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "ИДЕНТИЧНОСТ"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
"задаване на адреса в заглавната част „From“ (от) да е тази ИДЕНТИЧНОСТ. Ако "
"не е зададена такава, се взима адреса на подаващия"
-#: builtin/log.c:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr ""
"първото съобщение да е в отговор на е-писмото с този "
"ИДЕНТИФИКАТОР_НА_СЪОБЩЕНИЕ"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "граница"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "прикрепяне на кръпката"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "включване на кръпката в текста на писмата"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"използване на нишки за съобщенията. СТИЛът е „shallow“ (плитък) или "
"„deep“ (дълбок)"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "подпис"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "добавяне на поле за подпис"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "БАЗОВО_ПОДАВАНЕ"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "добавяне на необходимото БАЗово дърво към серията кръпки"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "добавяне на подпис от файл"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "без извеждане на имената на кръпките"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "извеждане на напредъка във фазата на създаване на кръпките"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "грешна идентичност: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "опциите „-n“ и „-k“ са несъвместими."
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "опциите „--subject-prefix“/„-rfc“ и „-k“ са несъвместими."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "опцията „--name-only“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "опцията „--name-status“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "опцията „--check“ е несъвместима с генерирането на кръпки"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr ""
"изходът може да или стандартният, или да е в директория, но не и двете."
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "Директорията „%s“ не може да бъде създадена"
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "файлът „%s“ с подпис не може да бъде прочетен"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Създаване на кръпки"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "Изходните файлове не могат да бъдат създадени"
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [ОТДАЛЕЧЕН_КЛОН [ВРЪХ [ПРЕДЕЛ]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9993,92 +10255,96 @@
msgstr "малки букви за файловете, които да се счетат за непроменени"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "малки букви за файловете за командата „fsmonitor clean“"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "извеждане на кешираните файлове (стандартно)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "извеждане на изтритите файлове"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "извеждане на променените файлове"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "извеждане на другите файлове"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "извеждане на игнорираните файлове"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr "извеждане на името на обекта за съдържанието на индекса"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
msgid "show files on the filesystem that need to be removed"
msgstr "извеждане на файловете, които трябва да бъдат изтрити"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "извеждане само на името на другите (неследените) директории"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "извеждане на знаците за край на ред във файловете"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "без извеждане на празните директории"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "извеждане на неслетите файлове"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "извеждане на информацията за отмяна на разрешените подавания"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "прескачане на файловете напасващи ШАБЛОНа"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "шаблоните за игнориране да се прочетат от този ФАЙЛ"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
"изчитане на допълнителните шаблони за игнориране по директория от този ФАЙЛ"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "добавяне на стандартно игнорираните от Git файлове"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr "пътищата да са относителни спрямо основната директория на проекта"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
msgid "if any <file> is not in the index, treat this as an error"
msgstr "грешка, ако някой от тези ФАЙЛове не е в индекса"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "УКАЗАТЕЛ_КЪМ_ДЪРВО"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
"считане, че пътищата изтрити след УКАЗАТЕЛя_КЪМ_ДЪРВО все още съществуват"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "извеждане на информацията за изчистване на грешки"
@@ -10171,181 +10437,186 @@
msgid "empty mbox: '%s'"
msgstr "празна пощенска кутия mbox: „%s“"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [ОПЦИЯ…] [ПОДАВАНЕ…]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "опцията „-m“ изисква стойност"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Няма такава стратегия за сливане: „%s“.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Наличните стратегии са:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Допълнителните стратегии са:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "do not show a diffstat at the end of the merge"
msgstr "без извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "извеждане на статистиката след завършване на сливане"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(синоним на „--stat“)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
"добавяне (на максимум такъв БРОЙ) записи от съкратения журнал в съобщението "
"за подаване"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr "създаване на едно подаване вместо извършване на сливане"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "извършване на подаване при успешно сливане (стандартно действие)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "редактиране на съобщението преди подаване"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "позволяване на превъртане (стандартно действие)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "преустановяване, ако превъртането е невъзможно"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверка, че указаното подаване е с правилен подпис на GPG"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "СТРАТЕГИЯ"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "СТРАТЕГИЯ за сливане, която да се ползва"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "ОПЦИЯ=СТОЙНОСТ"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "ОПЦИЯ за избраната стратегия за сливане"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "СЪОБЩЕНИЕ при подаването със сливане (при същински сливания)"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "преустановяване на текущото сливане"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "продължаване на текущото сливане"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "позволяване на сливане на независими истории"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr ""
+"проверка на куката при промяна на съобщението при подаване (commit-msg)"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "не може да се извърши скатаване"
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "неуспешно скатаване"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "неправилен обект: „%s“"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "неуспешно прочитане на обект-дърво"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (няма какво да се смачка)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Подаване със смачкване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
"Липсва съобщение при подаване — указателят „HEAD“ няма да бъде обновен\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "„%s“ не сочи към подаване"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправилен низ за настройката „branch.%s.mergeoptions“: „%s“"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr "Поддържа се само сливане на точно две истории."
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Непозната опция за рекурсивното сливане „merge-recursive“: „-X%s“"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "„%s“ не може да бъде записан"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "От „%s“ не може да се чете"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"Сливането няма да бъде подадено. За завършването му и подаването му "
"използвайте командата „git commit“.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -10360,72 +10631,72 @@
"Редовете, които започват с „%c“ ще бъдат пропуснати, а празно съобщение\n"
"преустановява подаването.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "Празно съобщение при подаване."
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "Първият етап на сливането завърши.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
"Неуспешно автоматично сливане — коригирайте конфликтите и подайте "
"резултата.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "Няма текущ клон."
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
msgid "No default upstream defined for the current branch."
msgstr "Текущият клон не следи никой клон."
-#: builtin/merge.c:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Никой клон не следи клона „%s“ от хранилището „%s“"
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Неправилна стойност „%s“ в средата „%s“"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не може да се слее в „%s“: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "не може да се слее"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "опцията „--abort“ не приема аргументи"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
"Не може да преустановите сливане, защото в момента не се извършва такова "
"(липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "опцията „--continue“ не приема аргументи"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "В момента не се извършва сливане (липсва указател „MERGE_HEAD“)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10433,7 +10704,7 @@
"Не сте завършили сливане. (Указателят „MERGE_HEAD“ съществува).\n"
"Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10441,121 +10712,121 @@
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува). Подайте промените си, преди да започнете ново сливане."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
"Не сте завършили отбиране на подаване (указателят „CHERRY_PICK_HEAD“\n"
"съществува)."
-#: builtin/merge.c:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "Опцията „--squash“ е несъвместима с „--no-ff“."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
"Не е указано подаване и настройката „merge.defaultToUpstream“ не е зададена."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr "Подаване със смачкване във връх без история все още не се поддържа"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
"Понеже върхът е без история, всички сливания са превъртания, не може да се "
"извърши същинско сливане изисквано от опцията „--no-ff“"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "„%s“ — не е нещо, което може да се слее"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
msgid "Can merge only exactly one commit into empty head"
msgstr "Можете да слеете точно едно подаване във връх без история"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1297
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
"Подаването „%s“ е с недоверен подпис от GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
"Подаването „%s“ е с неправилен подпис от GPG, който твърди, че е на „%s“."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Подаването „%s“ е без подпис от GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Подаването „%s“ е с коректен подпис от GPG на „%s“.\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "независими истории не може да се слеят"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "Вече е обновено."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновяване „%s..%s“\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Проба със сливане в рамките на индекса…\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "Неуспешно сливане.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "Вече е обновено!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "Не може да се извърши превъртане, преустановяване на действието."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Привеждане на дървото към първоначалното…\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Пробване със стратегията за сливане „%s“…\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Никоя стратегия за сливане не може да извърши сливането.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Неуспешно сливане със стратегия „%s“.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
"Ползва се стратегията „%s“, която ще подготви дървото за коригиране на "
"ръка.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10582,24 +10853,24 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point УКАЗАТЕЛ [ПОДАВАНЕ]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "извеждане на всички общи предшественици"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr ""
"откриване на предшествениците за еднократно сливане на множество истории"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "извеждане на недостижимите от другите указатели"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "ПОДАВАНЕ_1 предшественик ли е на ПОДАВАНЕ_2?"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "откриване къде ПОДАВАНЕто се е отклонило от историята на УКАЗАТЕЛя"
@@ -10699,7 +10970,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "Директорията „%s“ е в индекса, но не е подмодул"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"За да продължите, или вкарайте промените по файла „.gitmodules“ в индекса,\n"
@@ -10718,68 +10989,68 @@
msgid "skip move/rename errors"
msgstr "прескачане на грешките при преместване/преименуване"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целта „%s“ съществува и не е директория"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка на преименуването на обект от „%s“ на „%s“\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "неправилен обект"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "директория не може да се премести в себе си"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "директория не може да се премести върху файл"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "първоначалната директория е празна"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "не е под контрола на Git"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "целта съществува"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "презаписване на „%s“"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Презаписването е невъзможно"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "множество източници за една цел"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "целевата директория не съществува"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, обект: „%s“, цел: „%s“"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Преименуване на „%s“ на „%s“\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "неуспешно преименуване на „%s“"
@@ -10883,8 +11154,8 @@
msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] remove [ОБЕКТ…]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref УКАЗАТЕЛ_ЗА_БЕЛЕЖКА] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10973,19 +11244,19 @@
msgid "the note contents have been left in %s"
msgstr "съдържанието на бележката е във файла „%s“"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "файлът „%s“ не може да бъде прочетен"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "файлът „%s“ не може да бъде отворен или прочетен"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не може да се открие към какво сочи „%s“."
@@ -11014,49 +11285,49 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
"няма да се извърши „%s“ върху бележките в „%s“, защото са извън „refs/"
"notes/“."
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "прекалено много параметри"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "няма бележки за обекта „%s“."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "низ, който е съдържанието на бележката"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "ФАЙЛ със съдържанието на бележката"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "преизползване и редактиране на указания ОБЕКТ-бележка"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "преизползване на указания ОБЕКТ-бележка"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "приемане и на празни бележки"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "замяна на съществуващите бележки"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11065,31 +11336,31 @@
"Не може да се добави бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Презаписване на съществуващите бележки за обекта „%s“\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Изтриване на бележката за обекта „%s“\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "изчитане на обектите от стандартния вход"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"зареждане на настройките за КОМАНДАта, която презаписва подавания (включва "
"опцията „--stdin“)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "прекалено малко параметри"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11098,12 +11369,12 @@
"Не може да се копира бележка, защото такава вече съществува за обекта „%s“. "
"Използвайте опцията „-f“, за да презапишете съществуващи бележки."
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "няма бележки за обекта-източник „%s“. Не може да се копира."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11114,52 +11385,52 @@
"Вместо това ги използвайте с подкомандата „add“: „git notes add -f -m/-F/-c/-"
"C“.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде изтрит"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "указателят „NOTES_MERGE_REF“ не може да бъде изтрит"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "работната директория на „git notes merge“ не може да бъде изтрита"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "указателят „NOTES_MERGE_PARTIAL“ не може да бъде прочетен"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се открие."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "подаването от „NOTES_MERGE_PARTIAL“ не може да се анализира."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не може да се открие към какво сочи „NOTES_MERGE_REF“"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "неуспешно сливане на бележките"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "непозната стратегия за сливане на бележки „%s“"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Общи опции"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Опции при сливане"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -11169,46 +11440,46 @@
"„union“ (обединяване), „cat_sort_uniq“ (обединяване, подреждане, уникални "
"резултати)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Подаване на неслети бележки"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "завършване на сливането чрез подаване на неслети бележки"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Преустановяване на корекцията при сливането на бележки"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "преустановяване на сливането на бележки"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "опциите „--commit“, „--abort“ и „-s“/„--strategy“ са несъвместими"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "трябва да укажете указател към бележка за сливане."
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестна стратегия към опцията „-s“/„--strategy“: „%s“"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "в момента се извършва сливане на бележките в „%s“ при „%s“"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не може да се запази връзка към указателя на текущата бележка („%s“)."
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11219,239 +11490,247 @@
"резултата с „git notes merge --commit“ или преустановете сливането с "
"командата „git notes merge --abort“.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "Няма бележки за обекта „%s“\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "опитът за изтриването на несъществуваща бележка не се счита за грешка"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "изчитане на имената на обектите от стандартния вход"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "само извеждане без действително окастряне"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "докладване на окастрените обекти"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "да се използва бележката сочена от този УКАЗАТЕЛ_ЗА_БЕЛЕЖКА"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "непозната подкоманда: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [ОПЦИЯ…] [< СПИСЪК_С_УКАЗАТЕЛИ | < СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [ОПЦИЯ…] ПРЕФИКС_НА_ИМЕТО [< СПИСЪК_С_УКАЗАТЕЛИ | < "
"СПИСЪК_С_ОБЕКТИ]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "грешка при декомпресиране с „deflate“ (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"изключване на записването на битовата маска, пакетите са разделени поради "
"стойността на „pack.packSizeLimit“"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "Записване на обектите"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"изключване на записването на битовата маска, защото някои обекти няма да се "
"пакетират"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "Компресиране на обектите"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "неправилна стойност за „--missing“"
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "неподдържана версия на индекса „%s“"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "неправилна версия на индекса „%s“"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "без извеждане на напредъка"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "извеждане на напредъка"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "извеждане на напредъка във фазата на запазване на обектите"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
"същото действие като опцията „--all-progress“ при извеждането на напредъка"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "ВЕРСИЯ[,ОТМЕСТВАНЕ]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
msgid "write the pack index file in the specified idx format version"
msgstr ""
"запазване на индекса на пакетните файлове във форма̀та с указаната версия"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "максимален размер на всеки пакетен файл"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "игнориране на обектите заети от други хранилища на обекти"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "игнориране на пакетираните обекти"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "ограничаване на прозореца за пакетиране по брой обекти"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"ограничаване на прозореца за пакетиране и по памет освен по брой обекти"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2958
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
"максимална дължина на веригата от разлики, която е позволена в пакетния файл"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "преизползване на съществуващите разлики"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "преизползване на съществуващите обекти"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "използване на обекти „OFS_DELTA“"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
msgid "use threads when searching for best delta matches"
msgstr ""
"стартиране на нишки за претърсване на най-добрите съвпадения на разликите"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "без създаване на празен пакетен файл"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "изчитане на версиите от стандартния вход"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
msgid "limit the objects to those that are not yet packed"
msgstr "ограничаване до все още непакетираните обекти"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr ""
"включване на всички обекти, които могат да се достигнат от произволен "
"указател"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr "включване и на обектите сочени от записите в журнала на указателите"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "включване и на обектите сочени от индекса"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "извеждане на пакета на стандартния изход"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"включване и на обектите-етикети, които сочат към обектите, които ще бъдат "
"пакетирани"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "запазване на недостижимите обекти"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "пакетиране и на недостижимите обекти"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "разпакетиране на недостижимите обекти, които са по-нови от това ВРЕМЕ"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "създаване на съкратени пакети"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr "пакетиране подходящо за плитко доставяне"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "игнориране на пакетите, които са придружени от файл „.keep“"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "ниво на компресиране при пакетиране"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr ""
"извеждане на всички родители — дори и тези, които нормално са скрити при "
"присажданията"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
"използване на съществуващи индекси на база битови маски за ускоряване на "
"преброяването на обектите"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr ""
"запазване и на индекс на база побитова маска, заедно с индекса за пакета"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "как да се обработват липсващите обекти"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "Преброяване на обектите"
@@ -11467,17 +11746,17 @@
msgid "prune loose refs (default)"
msgstr "окастряне на недостижимите указатели (стандартно)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Изтриване на повтарящите се обекти"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire ВРЕМЕ] [--] [ВРЪХ…]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11500,40 +11779,40 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "управление на рекурсивното доставяне на подмодулите"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "Опции при сливане"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr "внасяне на промените чрез пребазиране, а не чрез сливане"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "позволяване на превъртания"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "автоматично скатаване/прилагане на скатаното преди и след пребазиране"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "Опции при доставяне"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "брой подмодули издърпани паралелно"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправилна стойност за „pull.ff“: „%s“"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -11541,14 +11820,14 @@
"Между указателите, които току що доставихте, няма подходящ кандидат, върху "
"който да пребазирате."
-#: builtin/pull.c:401
+#: builtin/pull.c:417
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"Между указателите, които току що доставихте, няма подходящ кандидат, който "
"да слеете."
-#: builtin/pull.c:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11556,7 +11835,7 @@
"Най вероятно сте подали шаблон за указатели, който не е напаснал с нищо в "
"отдалеченото хранилище."
-#: builtin/pull.c:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11567,44 +11846,44 @@
"Понеже това не е хранилището по подразбиране на текущия клон, трябва\n"
"да укажете отдалечения клон на командния ред."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Извън всички клони."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Укажете върху кой клон искате да пребазирате."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Укажете кой клон искате да слеете."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "За повече информация погледнете ръководството „git-pull(1)“"
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "ОТДАЛЕЧЕНО_ХРАНИЛИЩЕ"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "КЛОН"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Текущият клон не следи никой."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Ако искате да зададете информация за следен клон, можете да направите това с "
"командата:"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11613,27 +11892,27 @@
"За сливане е указан отдалеченият указател „%s“,\n"
"но такъв не е доставен."
-#: builtin/pull.c:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "без „--verify-signatures“ при пребазиране"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "опцията „--[no-]autostash“ изисква „--rebase“"
-#: builtin/pull.c:848
+#: builtin/pull.c:873
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновяване на все още несъздаден клон с промените от индекса"
-#: builtin/pull.c:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "издърпване с пребазиране"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "трябва да подадете или скатаете промените."
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11643,7 +11922,7 @@
"доставянето обнови върха на текущия клон. Работното\n"
"ви копие бе превъртяно от подаване „%s“."
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11660,15 +11939,15 @@
" $ git reset --hard\n"
"за връщане към нормално състояние."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "Не може да сливате множество клони в празен върхов указател."
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "Не може да пребазирате върху повече от един клон."
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"пребазирането е невъзможно заради локално записаните промени по подмодулите"
@@ -11677,15 +11956,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [ОПЦИЯ…] [ХРАНИЛИЩЕ [УКАЗАТЕЛ_НА_ВЕРСИЯ…]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "съкращение за етикет без ЕТИКЕТ"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "опцията „--delete“ приема за цел само прости имена на указатели"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11694,7 +11973,7 @@
"За да включите тази опция за постоянно, погледнете документацията за "
"настройката „push.default“ в „git help config“."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11719,7 +11998,7 @@
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11733,7 +12012,7 @@
"\n"
" git push %s HEAD:ИМЕ_НА_ОТДАЛЕЧЕНИЯ_КЛОН\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11747,14 +12026,14 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Текущият клон „%s“ следи няколко отдалечени клона, не можете просто да "
"изтласкате."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11766,14 +12045,14 @@
"Трябва да укажете коя версия да се изтласка, за обновяване на отдалечения "
"клон."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Не сте указали версия за подаване, а настройката „push.default“ е "
"„nothing“ (нищо без изрично указана версия да не се изтласква)"
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11782,12 +12061,12 @@
msgstr ""
"Обновяването е отхвърлено, защото върхът на текущия ви клон е преди върха "
"на\n"
-"отдалечения клон. Внесете отдалечените промени (напр. с командата „git "
+"отдалечения клон. Внесете отдалечените промени (напр. с командата „git "
"pull…“),\n"
"преди отново да изтласкате промените. За повече информация вижте раздела\n"
"„Note about fast-forwards“ в страницата от ръководството „git push --help“."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11795,12 +12074,13 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
"Обновяването е отхвърлено, защото върхът на изтласквания клон е преди върха\n"
-"на отдалечения клон. Проверете клона и внесете отдалечените промени (напр.\n"
+"на отдалечения клон. Преминете към клона и внесете отдалечените промени "
+"(напр.\n"
"с командата „git pull…“), преди отново да изтласкате промените. За повече\n"
"информация погледнете раздела „Note about fast-forwards“ в страницата от\n"
"ръководството „git push --help“."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11819,14 +12099,14 @@
"страницата\n"
"от ръководството „git push --help“."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Изтласкването е отхвърлено, защото в отдалеченото хранилище съществува "
"етикет,\n"
"който ще припокриете с етикет от вашето хранилище."
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11836,22 +12116,22 @@
"указател, който вече сочи към обект, който не е подаване, както и тепърва\n"
"да го промените да сочи към подобен обект.\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "Изтласкване към „%s“\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "част от указателите не бяха изтласкани към „%s“"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "неправилно указано хранилище „%s“"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11873,115 +12153,115 @@
"\n"
" git push ИМЕ\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "опциите „--all“ и „--tags“ са несъвместими"
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr "опцията „--all“ е несъвместима с указването на версия"
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "опциите „--mirror“ и „--tags“ са несъвместими"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr "опцията „--mirror“ е несъвместима с указването на версия"
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "опциите „--all“ и „--mirror“ са несъвместими"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "хранилище"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "изтласкване на всички указатели"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "огледално копие на всички указатели"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "изтриване на указателите"
-#: builtin/push.c:528
+#: builtin/push.c:540
msgid "push tags (can't be used with --all or --mirror)"
msgstr "изтласкване на етикетите (несъвместимо с опциите „--all“ и „--mirror“)"
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "принудително обновяване"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "УКАЗАТЕЛ>:<ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "УКАЗАТЕЛят трябва първоначално да е с тази ОЧАКВАНА_СТОЙНОСТ"
-#: builtin/push.c:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "управление на рекурсивното изтласкване на подмодулите"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "използване на съкратени пакети"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "програма за получаването на пакети"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "задаване на отдалеченото хранилище за командите „git pull/status“"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "окастряне на указателите, които са премахнати от локалното хранилище"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "без изпълнение на куката преди изтласкване (pre-push)"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr ""
"изтласкване на липсващите в отдалеченото хранилище, но свързани с текущото "
"изтласкване, етикети"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "подписване на изтласкването с GPG"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "изискване на атомарни операции от отсрещната страна"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "специфични за сървъра"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "опция за пренос"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
"опцията „--delete“ е несъвместима с опциите „--all“, „--mirror“ и „--tags“"
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "опцията „--delete“ изисква поне един указател на версия"
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr "опциите за изтласкване не трябва да съдържат знак за нов ред"
@@ -12064,19 +12344,53 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [ОПЦИЯ…]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "запазване на празните подавания"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "продължаване на пребазирането"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "преустановяване на пребазирането"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "създаване на скрипт за пребазиране"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "съкратени идентификатори в списъка за изпълнение"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "пълни идентификатори в списъка за изпълнение"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "проверка на списъка за изпълнение"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "прескачане на излишните команди за отбиране"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr ""
+"преподреждане на редовете за сливане на подаванията със и без смени на "
+"съобщението"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "вмъкване на командите за изпълнение в списъка за изпълнение"
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack ДИРЕКТОРИЯ_НА_GIT"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -12109,7 +12423,7 @@
"За да заглушите това съобщение, като запазите стандартното поведение,\n"
"задайте настройката „receive.denyCurrentBranch“ да е „refuse“ (отказ)."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -12138,12 +12452,7 @@
msgid "You must specify a directory."
msgstr "Трябва да укажете директория."
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "„%s“ не е правилна стойност за време за „%s“"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "„%s“ не е правилна стойност за време"
@@ -12289,12 +12598,12 @@
"указването на следени клони е смислено само за отдалечени хранилища, от "
"които се доставя"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "вече съществува отдалечено хранилище с име „%s“."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "„%s“ е неправилно име за отдалечено хранилище"
@@ -12317,17 +12626,17 @@
msgid "(delete)"
msgstr "(за изтриване)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Такова отдалечено хранилище няма: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде преименуван на „%s“"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -12338,17 +12647,17 @@
" %s\n"
" Променете настройките ръчно, ако е необходимо."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "неуспешно изтриване на „%s“"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "неуспешно създаване на „%s“"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -12362,116 +12671,116 @@
"Бележка: Няколко клона извън йерархията „refs/remotes/“ не бяха изтрити.\n"
"Изтрийте ги чрез командата:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Разделът „%s“ в настройките не може да бъде изтрит"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " нов (следващото доставяне ще го разположи в „remotes/%s“)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " следен"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " стар (изтрийте чрез „git remote prune“)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " неясно състояние"
# CHECK
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
"неправилен клон за сливане „%s“. Невъзможно е да пребазирате върху повече "
"от 1 клон"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "интерактивно пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "пребазиране върху отдалечения клон „%s“"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " сливане с отдалечения клон „%s“"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "сливане с отдалечения клон „%s“"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с отдалечения клон „%s“\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "създаден"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "изтрит"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "актуален"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "може да се превърти"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "локалният е изостанал"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s принудително изтласква към %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s изтласква към %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s принудително изтласква към %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s изтласква към %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "без заявки към отдалечените хранилища"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "● отдалечено хранилище „%s“"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " Адрес за доставяне: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(без адрес)"
@@ -12479,25 +12788,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " Адрес за изтласкване: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " клон сочен от HEAD: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(без проверка)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(непознат)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12506,161 +12815,161 @@
"хранилище\n"
" не е еднозначен и е някой от следните):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Отдалечен клон:%s"
msgstr[1] " Отдалечени клони:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (състоянието не бе проверено)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локалните указатели ще бъдат пренесени чрез „ push“"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "задаване на refs/remotes/ИМЕ/HEAD според отдалеченото хранилище"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "изтриване на refs/remotes/ИМЕ/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Не може да се установи отдалеченият връх"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"Множество клони с върхове. Изберете изрично някой от тях чрез командата:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "„%s“ не може да бъде изтрит"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "Неправилен указател: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "„%s“ не може да се настрои"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr "„%s“ ще се превърне в обект извън клоните!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr "„%s“ се превърна в обект извън клоните!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Окастряне на „%s“"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "адрес: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " ● [ще бъде окастрено] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " ● [окастрено] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "окастряне на огледалата на отдалечените хранилища след доставяне"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Няма отдалечено хранилище на име „%s“"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "добавяне на клон"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "не е указано отдалечено хранилище"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "запитване към адресите за изтласкване, а не за доставяне"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "извеждане на всички адреси"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "не е зададен адрес за отдалеченото хранилище „%s“"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "промяна на адресите за изтласкване"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "добавяне на адреси"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "изтриване на адреси"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "опциите „--add“ и „--delete“ са несъвместими"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправилен (стар) формат за адрес: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Такъв адрес не е открит: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Никой от адресите, които не са за изтласкване, няма да се изтрие"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "повече подробности. Поставя се пред подкоманда"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Непозната подкоманда: %s"
@@ -12674,7 +12983,7 @@
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
-"Постепенното препакетиране е несъвместимо с индекси на база битови маски. \n"
+"Постепенното препакетиране е несъвместимо с индекси на база битови маски.\n"
"Ползвайте опцията --no-write-bitmap-index или изключете настройката\n"
"„pack.writebitmaps“."
@@ -12767,7 +13076,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "Опциите „--keep-unreachable“ и „-A“ са несъвместими"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "директорията „%s“ не може да бъде изтрита"
@@ -12900,123 +13209,136 @@
msgid "keep"
msgstr "запазващо (keep)"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "Указателят „HEAD“ е повреден."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Дървото, сочено от указателя „HEAD“, не може да бъде открито."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Дървото, сочено от „%s“, не може да бъде открито."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "Указателят „HEAD“ сочи към „%s“"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Не може да се извърши %s зануляване по време на сливане."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "по-малко подробности, да се извеждат само грешките"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "индекса и указателя „HEAD“, без работното дърво"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "само указателя „HEAD“, без индекса и работното дърво"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "указателя „HEAD“, индекса и работното дърво"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "зануляване на указателя „HEAD“, но запазване на локалните промени"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr ""
"отбелязване само на факта, че изтритите пътища ще бъдат добавени по-късно"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Стойността „%s“ не е разпозната като съществуваща версия."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "„%s“ не е разпознат като дърво."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
"опцията „--patch“ е несъвместима с всяка от опциите „--hard/--mixed/--soft“"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"опцията „--mixed“ не бива да се използва заедно с пътища. Вместо това "
"изпълнете „git reset -- ПЪТ…“."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Не може да извършите %s зануляване, когато сте задали ПЪТ."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "В голо хранилище не може да извършите %s зануляване"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "Опцията „-N“ е съвместима само с „--mixed“"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Промени извън индекса след зануляването:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Индексът не може да бъде занулен към версия „%s“."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "Новият индекс не може да бъде записан."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "филтрирането на обекти изисква опцията „--objects“"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "неправилна частична стойност: %s"
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "командата „rev-list“ не поддържа извеждането на бележки"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "опцията „--use-bitmap-index“ е несъвместима с филтриране на обектите"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [ОПЦИЯ…] -- [АРГУМЕНТ…]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "зададеният низ „--“ да се тълкува като аргумент"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "спиране на анализа след първия аргумент, който не е опция"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "изход в дългия формат"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13108,11 +13430,11 @@
msgid "keep redundant, empty commits"
msgstr "запазване на излишните, празни подавания"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "неуспешна отмяна"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "неуспешно отбиране"
@@ -13187,17 +13509,17 @@
"изходният код да е 0, дори ако никой файл нe e напаснал с шаблона за "
"изтриване"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "без използването на опцията „-r“ „%s“ няма да се изтрие рекурсивно"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: „%s“ не може да се изтрие"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "„%s“ не може да бъде изтрит"
@@ -13233,27 +13555,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [ОПЦИЯ…] [ДИАПАЗОН_НА_ВЕРСИИТЕ] [[--] [ПЪТ…]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Групиране по подаващ, а не по автор"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "подредба на подаванията по броя подавания от автор"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Без описания на подаванията — да се показва само броя подавания"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Извеждане на адреса на е-поща за всеки автор"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "ШИРОЧИНА[,ОТСТЪП_1[,ОТСТЪП_2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr ""
"Пренасяне на редовете до тази обща ШИРОЧИНА (76), с ОТСТЪП_1 (6) за първия "
@@ -13461,35 +13783,35 @@
msgid "prepend comment character and space to each line"
msgstr "добавяне на „# “ в началото на всеки ред"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "Такъв указател няма: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Очаква се пълно име на указател, а не „%s“"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "не може да се махне компонент от адреса „%s“"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "директория за определянето на относителните пътища"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "Във файла „.gitmodules“ не е открит адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13498,81 +13820,111 @@
"настройката „%s“ липсва. Приема се, че това хранилище е правилният източник "
"за себе си."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Неуспешно регистриране на адрес за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:479
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Регистриран е подмодул „%s“ (%s) за пътя към подмодул „%s“\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:489
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: препоръчва се режим на обновяване за подмодула „%s“\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:496
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
"Неуспешно регистриране на режима на обновяване за пътя към подмодул „%s“"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "Без извеждане на информация при инициализирането на подмодул"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper name [ПЪТ]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name ПЪТ"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "Във файла „.gitmodules“ липсва информация за пътя „%s“"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "указателят сочен от „HEAD“ в подмодула „%s“ не може да бъде открит"
+
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "неуспешно рекурсивно обхождане на подмодула „%s“"
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "Заглушаване на изхода за състоянието на подмодула"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Използване на подаването указано в индекса, а не това от указателя „HEAD“ на "
+"подмодула"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "рекурсивно обхождане на подмодулите"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [ПЪТ…]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name ПЪТ"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "към подмодула „%s“ не може да се добави алтернативен източник: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
"Непозната стойност „%s“ за настройката „submodule.alternateErrorStrategy“"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:842
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Непозната стойност „%s“ за настройката „submodule.alternateLocation“"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "къде да се клонира новият подмодул"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "име на новия подмодул"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "адрес, от който да се клонира новият подмодул"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "дълбочина на плитките хранилища"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13580,85 +13932,85 @@
"git submodule--helper clone [--prefix=ПЪТ] [--quiet] [--reference ХРАНИЛИЩЕ] "
"[--name ИМЕ] [--depth ДЪЛБОЧИНА] --url АДРЕС --path ПЪТ…"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Неуспешно клониране на адреса „%s“ в пътя „%s“ като подмодул"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "директорията на подмодула „%s“ не може да бъде получена"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Пътят на подмодула „%s“ не е инициализиран"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "Вероятно искахте да използвате „update --init“?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Прескачане на неслетия подмодул „%s“"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Прескачане на подмодула „%s“"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Неуспешен опит за клониране на „%s“. Насрочен е втори опит"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
"Втори неуспешен опит за клониране на „%s“. Действието се преустановява"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "път към работното дърво"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
msgid "path into the working tree, across nested submodule boundaries"
msgstr "път към работното дърво, през границите на вложените подмодули"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr ""
"„rebase“ (пребазиране), „merge“ (сливане), „checkout“ (изтегляне) или "
"„none“ (нищо да не се прави)"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
msgid "Create a shallow clone truncated to the specified number of revisions"
-msgstr "Плитко клониране, ограничено до указания брой версии"
+msgstr "Плитко клониране, отрязано до указания брой версии"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "брой паралелни процеси"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "дали първоначалното клониране да е плитко, както се препоръчва"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "без извеждане на напредъка на клонирането"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=ПЪТ] [ПЪТ…]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "неправилен параметър към опцията „--update“"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13667,20 +14019,20 @@
"Клонът на подмодула „%s“ е настроен да наследява клона от обхващащия проект, "
"но той не е на никой клон"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "рекурсивно обхождане подмодулите"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper name embed-git-dir [ПЪТ…]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "„%s“ не поддържа опцията „--super-prefix“"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "„%s“ не е подкоманда на „submodule--helper“"
@@ -13693,23 +14045,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] ИМЕ"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "без извеждане на грешка за несвързани (несимволни) указатели"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "изтриване на символен указател"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "кратка информация за указателя"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "причина за обновяването"
@@ -13738,17 +14090,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=ФОРМАТ] ЕТИКЕТ…"
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "етикетът „%s“ не е открит."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Изтрит е етикетът „%s“ (бе „%s“)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13761,7 +14113,7 @@
" %s\n"
"Редовете, които започват с „%c“, ще бъдат пропуснати.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13776,142 +14128,142 @@
"Редовете, които започват с „%c“, също ще бъдат включени — може да ги "
"изтриете вие.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "етикетът не може да бъде подписан"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "файлът за етикета не може да бъде запазен"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "неправилен вид обект."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "липсва съобщение за етикета"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Съобщението за етикета е запазено във файла „%s“\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "извеждане на имената на етикетите"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "извеждане на този БРОЙ редове от всяко съобщение за етикет"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "изтриване на етикети"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "проверка на етикети"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Опции при създаването на етикети"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "анотирането на етикети изисква съобщение"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "СЪОБЩЕНИЕ за етикет"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "анотиран етикет с подпис по GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "използване на друг ключ за подписването на етикет"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "замяна на етикета, ако съществува"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "създаване на журнал на указателите"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Опции за извеждането на етикети"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "извеждане на списъка на етикетите по колони"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "извеждане само на етикетите, които съдържат подаването"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "извеждане само на етикетите, които не съдържат подаването"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "извеждане само на слетите етикети"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "извеждане само на неслетите етикети"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "извеждане само на етикетите на ОБЕКТА"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "Опциите „--column“ и „-n“ са несъвместими"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "Опцията „-n“ изисква режим на списък."
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "Опцията „-contains“ изисква режим на списък."
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "Опцията „-points-at“ изисква режим на списък."
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Опциите „--merged“ и „--no-merged“ изискват режим на списък."
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "Опциите „-F“ и „-m“ са несъвместими."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "Прекалено много аргументи"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "„%s“ е неправилно име за етикет."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "етикетът „%s“ вече съществува"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Обновен етикет „%s“ (бе „%s“)\n"
@@ -13920,207 +14272,223 @@
msgid "Unpacking objects"
msgstr "Разпакетиране на обектите"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "не може да бъде получена информация чрез „stat“ за „%s“"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "файлът „%s“ не може да бъде създаден"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "файлът „%s“ не може да бъде изтрит"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "директорията „%s“ не може да бъде изтрита"
-#: builtin/update-index.c:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка на времето на промяна (mtime) на файла „%s“"
-#: builtin/update-index.c:150
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нов файл"
-#: builtin/update-index.c:163
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"добавянето на нова директория"
-#: builtin/update-index.c:176
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след "
"обновяването на нов файл"
-#: builtin/update-index.c:187
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
"информацията получена чрез „stat“ за директорията се променя след добавянето "
"на файл в поддиректория"
-#: builtin/update-index.c:198
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на файл"
-#: builtin/update-index.c:211
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
"информацията получена чрез „stat“ за директорията не се променя след "
"изтриването на директория"
-#: builtin/update-index.c:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Добре"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [ОПЦИЯ…] [--] [ФАЙЛ…]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr ""
"продължаване с обновяването, дори когато индексът трябва да бъде обновен"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "подмодулите да се игнорират при обновяването"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "новите файлове да не се игнорират"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "файлове да могат да заменят директории и обратно"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "предупреждаване при липсващи в работното дърво файлове"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr "обновяване дори и индексът да съдържа неслети обекти"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "обновяване на информацията от функцията „stat“"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
"като опцията „--refresh“, но да се проверят и обектите, които са били приети "
"за непроменени"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "РЕЖИМ,ОБЕКТ,ПЪТ"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "добавяне на изброените обекти към индекса"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "задаване на флаг, че файлът не се променя"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "изчистване на флага, че файлът не се променя"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "задаване на флаг, че файловете са само за индекса"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "изчистване на флага, че файловете са само за индекса"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
msgid "add to index only; do not add content to object database"
msgstr "добавяне само към индекса без добавяне към базата от данни за обектите"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:983
msgid "remove named paths even if present in worktree"
msgstr "изтриване на указаните пътища, дори и да съществуват в работното дърво"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
"при комбиниране с опцията „--stdin“ — входните редове са разделени с нулевия "
"байт"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
msgid "read list of paths to be updated from standard input"
msgstr "изчитане на списъка с пътища за обновяване от стандартния вход"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr "добавяне на елементите от стандартния вход към индекса"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
"възстановяване на състоянието преди сливане или нужда от обновяване за "
"изброените пътища"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "добавяне само на съдържанието, което се различава от това в „HEAD“"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "игнориране на файловете, които липсват в работното дърво"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "извеждане на действията на стандартния изход"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
"забравяне на записаната информация за неразрешени конфликти — за командите "
"от потребителско ниво"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "записване на индекса в този формат"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "включване или изключване на разделянето на индекса"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "включване/изключване на кеша за неследените файлове"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr "проверка дали файловата система поддържа кеш за неследени файлове"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"включване на кеша за неследените файлове без проверка на файловата система"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+msgid "write out the index even if is not flagged as changed"
+msgstr "запис на индекса, дори да не е отбелязан като променен"
+
+#: builtin/update-index.c:1024
+msgid "enable or disable file system monitor"
+msgstr "включване или изключване на наблюдението на файловата система"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "отбелязване на файловете, че могат да се следят чрез файловата система"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "изчистване на флага за следенето чрез файловата система"
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -14128,7 +14496,7 @@
"Настройката „core.splitIndex“ е зададена на „false“ (лъжа). Сменете я или я "
"изтрийте, за да включите разделянето на индекса"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -14136,7 +14504,7 @@
"Настройката „core.splitIndex“ е зададена на „true“ (истина). Сменете я или "
"я изтрийте, за да изключите разделянето на индекса."
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -14144,11 +14512,11 @@
"Настройката „core.untrackedCache“ е зададена на „true“ (истина). Сменете я "
"или я изтрийте, за да изключите кеша за неследените файлове"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "Кешът за неследените файлове е изключен"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -14156,11 +14524,32 @@
"Настройката „core.untrackedCache“ е зададена на „false“ (лъжа). Сменете я "
"или я изтрийте, за да включите кеша за неследените файлове"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кешът за неследените файлове е включен за „%s“"
+#: builtin/update-index.c:1171
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"Настройката „core.fsmonitor“ не е зададена. Задайте я, за да включите "
+"следенето чрез файловата система."
+
+#: builtin/update-index.c:1175
+msgid "fsmonitor enabled"
+msgstr "следенето чрез файловата система е включено"
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"Настройката „core.fsmonitor“ е зададена. Изтрийте я, за да изключите "
+"следенето чрез файловата система."
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr "следенето чрез файловата система е изключено"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [ОПЦИЯ…] -d ИМЕ_НА_УКАЗАТЕЛ [СТАРА_СТОЙНОСТ]"
@@ -14173,21 +14562,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [ОПЦИЯ…] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "изтриване на указателя"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "обновяване на ИМЕто_НА_УКАЗАТЕЛя, а не това, към което сочи"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr ""
"някои от елементите подадени на стандартния вход завършват с нулевия знак "
"„NUL“"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "изчитане на указателите от стандартния вход"
@@ -14231,125 +14620,146 @@
msgid "print tag contents"
msgstr "извеждане на съдържанието на ЕТИКЕТи"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [ОПЦИЯ…] ПЪТ [КЛОН]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [ОПЦИЯ…]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [ОПЦИЯ…] [ПЪТ]"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [ОПЦИЯ…]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock [ПЪТ]"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Изтриване на „worktrees/%s“: не е правилна поддиректория"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Изтриване на „worktrees/%s“: файлът „gitdir“ не съществува"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ (%s) не може да бъде прочетен"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Изтриване на „worktrees/%s“: изчитането върна по-малко байтове от очакваното "
+"(очаквани: %<PRIuMAX> байта, получени: %<PRIuMAX>)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Изтриване на „worktrees/%s“: неправилен файл „gitdir“"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Изтриване на „worktrees/%s“: файлът „gitdir“ сочи несъществуващо "
"местоположение"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "докладване на окастрените работни дървета"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr "обявяване на работните копия по-стари от това ВРЕМЕ за остарели"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "„%s“ вече съществува"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "директорията „%s“ не може да бъде създадена"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Подготвяне на %s (идентификатор %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "Изтегляне КЛОНа, дори и да е изтеглен в друго работно дърво"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "създаване на нов клон"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "създаване или зануляване на клони"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "подготвяне на новото работно дърво"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "новото работно дърво да остане заключено"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "задаване на режима на следене (виж git-branch(1))"
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "опит за напасване на името на новия клон с това на следящ клон"
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "Опциите „-b“, „-B“ и „--detach“ са несъвместими една с друга"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "„--[no-]track“ може да се използва само при създаването на нов клон"
+
+#: builtin/worktree.c:553
msgid "reason for locking"
msgstr "причина за заключване"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "„%s“ не е работно дърво"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr "Основното дърво не може да се отключи или заключи"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "„%s“ вече е заключено, защото „%s“"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "„%s“ вече е заключено"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "„%s“ не е заключено"
@@ -14370,7 +14780,7 @@
msgid "only useful for debugging"
msgstr "само за изчистване на грешки"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-repack [ОПЦИЯ…] ДИРЕКТОРИЯ"
@@ -14391,7 +14801,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "трансферът да се преустанови след този БРОЙ секунди"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14406,7 +14816,7 @@
"\n"
" chmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "извеждане на съобщенията за трасиране на стандартната грешка"
@@ -14418,28 +14828,28 @@
msgstr ""
"„git help -a“ извежда наличните подкоманди, а „git help -g“ извежда "
"наличните\n"
-"ръководства. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
+"въведения. За помощ за специфична КОМАНДА ползвайте „git help КОМАНДА“, а "
"за\n"
"някое определено ПОНЯТИЕ използвайте „git help ПОНЯТИЕ“.\n"
"\n"
"Български превод на книгата „Pro Git“ от Чакън и Страуб:\n"
"http://i-can.eu/progit2-bg/progit.html"
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d"
+"отрицателна стойност за „http.postbuffer“. Ще се ползва стандартната: %d"
-#: http.c:358
+#: http.c:360
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Управлението на делегирането не се поддържа от cURL < 7.22.0"
-#: http.c:367
+#: http.c:369
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Задаването на постоянен публичен ключ не се поддържа от cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -14455,6 +14865,14 @@
msgid "redirecting to %s"
msgstr "пренасочване към „%s“"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "АРГУМЕНТИ"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "филтриране по вид на обекта"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "създаване на работно дърво (погледнете: „git help tutorial“)"
@@ -14634,27 +15052,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "Неправилен аргумент на функцията „bisect_write“: „${state}“"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Неправилна версия: „${arg}“"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Неправилна версия: „$bisected_head“"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Неправилна версия: „${rev}“"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "Командата „git bisect ${TERM_BAD}“ приема само един аргумент."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "ПРЕДУПРЕЖДЕНИЕ: двоично търсене само по ${TERM_BAD} подаване."
@@ -14662,11 +15080,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "Да се продължи ли? „Y“ — ДА, „n“ — не"
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14677,7 +15095,7 @@
"направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect "
"${good_syn}“.)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14689,16 +15107,16 @@
"направи съответно и чрез командите „git bisect ${bad_syn}“ и „git bisect "
"${good_syn}“.)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "В момента не се извършва двоично търсене."
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "„${invalid}“ е неправилно подаване"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14707,28 +15125,32 @@
"Първоначално указаният клон „${branch}“ в указателя „HEAD“ не може да бъде\n"
"изтеглен. Пробвайте да изпълните командата „git bisect reset ПОДАВАНЕ“."
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "Не е зададен журнален файл"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
"Журналният файл „${file}“ не може да бъде прочетен, за да се изпълнят "
"командите от него наново"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr ""
"Непозната команда. Възможните варианти са: „start“, „good“, „bad“, „skip“"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "неуспешно двоично търсене, не е зададена команда."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "изпълнение на командата „${command}“"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14738,11 +15160,11 @@
"изходният код от командата „${command}“ е ${res} — това е извън интервала "
"[0, 128)"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "двоичното търсене не може да продължи"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14751,42 +15173,22 @@
"неуспешно двоично търсене:\n"
"функцията „bisect_state ${state}“ завърши с код за грешка ${res}"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "успешно двоично търсене"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "използвайте две различни управляващи думи"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "„${term}“ не е правилна управляваща дума"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr ""
-"„${term}“ е вградена команда и не може да се използва като управляваща дума"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "не може да смените значението на управляващата дума „${term}“"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Неправилна команда: в момента се изпълнява двоично търсене по ${TERM_BAD}/"
"${TERM_GOOD}."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "не са указани управляващи думи"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14816,7 +15218,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Вече е обновено до „$pretty_name“"
#: git-merge-octopus.sh:89
@@ -14835,54 +15237,56 @@
#: git-rebase.sh:58
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"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"След коригирането на този проблем изпълнете „git rebase --continue“.\n"
+"След коригирането на конфликтите, отбележете решаването им чрез:\n"
+"„git add/rm ФАЙЛ_С_КОНФЛИКТ…“ и изпълнете „git rebase --continue“.\n"
"Ако предпочитате да прескочите тази кръпка, изпълнете „git rebase --skip“.\n"
"За да откажете пребазирането и да се върнете към първоначалното състояние,\n"
"изпълнете „git rebase --abort“."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Връщането към „${head_name}“ е невъзможно"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Автоматично скатаното е приложено."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "„${stash_sha1}“ не може да бъде запазен"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Куката за изпълнение преди пребазиране отхвърли пребазирането."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
"Изглежда, че сега се прилагат кръпки чрез командата „git-am“. Не може да "
"пребазирате в момента."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Изглежда в момента не тече пребазиране"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
"Опцията „--edit-todo“ е достъпна само по време на интерактивно пребазиране."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Указателят „HEAD“ не може да бъде прочетен"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14890,7 +15294,7 @@
"Трябва да редактирате всички конфликти при сливането. След това\n"
"отбележете коригирането им чрез командата „git add“"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14911,234 +15315,230 @@
"за\n"
"да не загубите случайно промени."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
+msgid "invalid upstream '$upstream_name'"
msgstr "неправилна основа за сравнение „${upstream_name}“"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
"указателят „${onto_name}“ може да сочи към повече от една основа за "
"пребазирането"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "указателят „${onto_name}“ не сочи към никаква основа за пребазирането"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Указателят „${onto_name}“ не сочи към подаване"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
msgstr "ФАТАЛНА ГРЕШКА: не съществува клон „${branch_name}“"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "Не може да се скатае автоматично"
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Автоматично скатано: „${stash_abbrev}“"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "Промените трябва или да се подадат, или да се скатаят."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "Указателят „HEAD“ е напълно актуален"
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Текущият клон „${branch_name}“ е напълно актуален."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "Указателят „HEAD“ е напълно актуален. Пребазирането е принудително."
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Текущият клон „${branch_name}“ е напълно актуален. Пребазирането е "
"принудително."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Промените от „${mb}“ към „${onto}“:"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Първо, указателят „HEAD“ започва да сочи към базата, върху която пребазирате…"
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Превъртане на „${branch_name}“ върху „${onto_name}“."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "Командата „git stash clear“ не поддържа аргументи"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "Все още липсва първоначално подаване"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "Състоянието на текущия индекс не може да бъде запазено"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "Неследените файлове не могат да се запазят"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "Не са избрани никакви промени"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "Временният индекс не може да бъде изтрит"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "Състоянието на работното дърво не може да бъде запазено"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
"Указателят „${ref_stash}“ не може да бъде обновен да сочи към „${w_commit}“"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"грешка: командата „git stash save“ не поддържа опция „${option}“\n"
-" За да зададете съобщение, изпълнете „git stash save -- '${option}'“"
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "ГРЕШКА: командата „stash push“ не приема опцията „$option“"
+
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Опцията „--patch“ е несъвместима с „--include-untracked“ и „--all“"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "Няма никакви локални промени за скатаване"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "Скатаването не може да стартира"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "Текущото състояние не може да бъде запазено"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
"Състоянието на работната директория и индекса са запазени: „$stash_msg“"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "Промените в работното дърво не могат да бъдат занулени"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "непозната опция: ${opt}"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "Не е открито нищо скатано."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Указани са прекалено много версии: „${REV}“"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "Указателят „${reference}“ е грешен"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "„${args}“ не е подаване, приличащо на нещо скатано"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "„${args}“ не е указател към нещо скатано"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "индексът не може да бъде обновен"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "По време на сливане не може да приложите нещо скатано"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr ""
"В индекса има конфликти. Пробвайте да изпълните командата без опцията „--"
"index“."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "Дървото сочено от индекса не може да бъде запазено"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr "Неследени файлове не могат да се възстановят от скатаното"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "Променените файлове не могат да бъдат извадени от индекса"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "Индексът не е скатан."
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
msgstr "Скатаното е запазено в случай, че ви потрябва отново"
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Изтрито е скатаното „${REV}“ ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "Скатаното „${REV}“ не може да бъде изтрито"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "Не е указано име на клон"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(За да ги възстановите, изпълнете командата „git stash apply“)"
@@ -15294,17 +15694,17 @@
"Премахната е регистрацията на подмодул „${name}“, сочещ към адрес „${url}“, "
"за пътя „${displaypath}“"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Текущата версия за подмодула в „${displaypath}“ липсва"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Неуспешно доставяне в пътя към подмодул „${sm_path}“"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15313,12 +15713,12 @@
"Текущата версия „${remote_name}/${branch}“ в пътя към подмодул „${sm_path}“ "
"липсва"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Неуспешно доставяне в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15327,93 +15727,87 @@
"Подмодулът в пътя „$displaypath“ е доставен, но не съдържа обекта със сума\n"
"„$sha1“. Директното доставяне на това подаване е неуспешно."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно изтегляне на версия „${sha1}“ в пътя към подмодул „${displaypath}“'"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Път към подмодул „${displaypath}“: изтеглена е версия „${sha1}“"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно пребазиране на версия „${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Път към подмодул „${displaypath}“: пребазиране върху версия „${sha1}“"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
"Неуспешно сливане на версия „${sha1}“ в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Път към подмодул „${displaypath}“: сливане с версия „${sha1}“"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
"Неуспешно изпълнение на командата „${command} ${sha1}“ в пътя към подмодул "
"„${displaypath}“"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Път към подмодул „${displaypath}“: „${command} ${sha1}“"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"Неуспешна обработка на поддиректориите в пътя към подмодул „${displaypath}“"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "Опциите „--cached“ и „--files“ са несъвместими"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неочакван режим „${mod_dst}“"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_src}“"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа подаването „${sha1_dst}“"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" ПРЕДУПРЕЖДЕНИЕ: „${display_name}“ не съдържа никое от подаванията "
"„${sha1_src}“ и „${sha1_dst}“"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-"Неуспешна обработка на поддиректориите в пътя към подмодул „${sm_path}“"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Синхронизиране на адреса за пътя към подмодул „${displaypath}“"
@@ -15432,13 +15826,13 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -15527,49 +15921,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "Подаването не може да се смачка: „$sha1“"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Грешка при повтарянето на сливането на „$sha1“"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "„$sha1“ не може да се отбере."
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Това е съобщение при подаване №${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Съобщение при подаване №${n} ще бъде прескочено."
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Новото съобщение при подаване „$fixup_msg“ не може да бъде запазено"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Това е обединение от 2 подавания"
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Не може да се подаде $sha1… $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15585,31 +15979,31 @@
"коригирате,\n"
"преди да можете да промените подаването."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Спиране при „$sha1_abbrev…“ $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Без предишно подаване не може да се изпълни „$squash_style“"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "В момента се изпълнява: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "Неуспешно изпълнение: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "и промени индекса и/или работното дърво"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15620,7 +16014,7 @@
" git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15635,99 +16029,29 @@
"\n"
" git rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Непозната команда: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Коригирайте това чрез „git rebase --edit-todo“."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Успешно пребазиране и обновяване на „$head_name“."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Излишните команди да отбиране не могат да бъдат прескочени"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Предупреждение: сумата по SHA1, указана към командата на реда:\n"
-" - $line\n"
-" липсва или не е представлява подаване"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Предупреждение: непозната команда на ред:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "указателят „HEAD“ не може да се отдели"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Предупреждение: някои подавания може да са пропуснати.\n"
-"\n"
-"Пропуснати подавания (новите са най-отгоре):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"За да не получавате това съобщение, изрично ползвайте командата „drop“.\n"
-"\n"
-"Настройката „rebase.missingCommitsCheck“ управлява нивото на предупреждение\n"
-"Възможните стойности са „ignore“ (пренебрегване), „warn“ (само "
-"предупреждение)\n"
-"или „error“ (считане за грешка)."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Непозната стойност „$check_level“ за настройката „rebase."
-"missingCommitsCheck“.\n"
-"Настройката се прескача."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Можете да промените това с командите „git rebase --edit-todo“ и „git rebase "
-"--continue“ след това."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-"Може и да преустановите пребазирането с командата „git rebase --abort“."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Указателят „CHERRY_PICK_HEAD“ не може да бъде изтрит"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15757,11 +16081,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
msgid "Error trying to find the author identity to amend commit"
msgstr "Не може да бъде открит автор за поправянето на подаването"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15769,11 +16093,11 @@
"В работното дърво има неподадени промени. Първо ги подайте, а след това\n"
"отново изпълнете „git rebase --continue“."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "Промените в индекса не могат да бъдат подадени."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15782,38 +16106,43 @@
"\n"
msgstr ""
"\n"
-"В момента редактирате командния файл на текущото интерактивно пребазиране.\n"
+"В момента редактирате файла с командите на текущото интерактивно "
+"пребазиране.\n"
"За да продължите пребазирането след това, изпълнете:\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Текстовият редактор не може да бъде стартиран"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "„$switch_to“ не може да се изтегли"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "Липсва указател „HEAD“"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Временната директория „$state_dir“ не може да бъде създадена"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "Пребазирането не е интерактивно"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "Списъкът с презаписаните подавания не може да бъде създаден"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Файлът с командите не може да се генерира"
+
+#: git-rebase--interactive.sh:973
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -15822,7 +16151,7 @@
msgstr[1] ""
"Пребазиране на $shortrevisions върху $shortonto ($todocount команди)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15832,7 +16161,7 @@
"Ако изтриете всичко, пребазирането ще бъде преустановено.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Празните подавания са коментирани"
@@ -16073,7 +16402,7 @@
msgid ""
"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
msgstr ""
-"Редактираното парче не може да се приложи. Да се продължи ли с "
+"Редактираното парче не може да се приложи. Да се продължи ли с "
"редактирането? (текущите редакции ще се отменят при отказ!): „y“ (да)/ "
"„n“ (не)? "
@@ -16450,64 +16779,64 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "разликата между местния часовия пояс и GMT е 24 часа или повече\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
"текстовият редактор приключи работата с грешка, всичко се преустановява"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "„%s“ съдържа временна версия на подготвяното е-писмо.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "„%s.final“ съдържа подготвеното е-писмо.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "опцията „--dump-aliases“ е несъвместима с другите опции\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Командата „git format-patch“ не може да се изпълни извън хранилище\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Непознато поле за опцията „--suppress-cc“: „%s“\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Непозната стойност за „--confirm“: %s\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: синоними за sendmail съдържащи кавички („\"“) не се "
"поддържат: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: „:include:“ не се поддържа: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
"ПРЕДУПРЕЖДЕНИЕ: пренасочвания „/file“ или „|pipe“ не се поддържат: %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "ПРЕДУПРЕЖДЕНИЕ: редът за „sendmail“ не е разпознат: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -16522,12 +16851,12 @@
" ● укажете „./%s“ за файл;\n"
" ● използвате опцията „--format-patch“ за диапазон.\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Директорията „%s“ не може да се отвори: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -16536,7 +16865,7 @@
"ФАТАЛНА ГРЕШКА: %s: %s\n"
"ПРЕДУПРЕЖДЕНИЕ: не са пратени никакви кръпки\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -16546,17 +16875,17 @@
"Не са указани кръпки!\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "В „%s“ липсва тема"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "„%s“ не може да се отвори за запис: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -16571,32 +16900,32 @@
"\n"
"Изтрийте всичко, ако не искате да изпратите обобщаващо писмо.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "„%s.final“ не може да се отвори: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "„%s“ не може да се отвори: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
-"Полетата „To“/„Cc“/„Bcc“ все още не се интерпретират. Те бяха прескочени\n"
+"Полетата „To“/„Cc“/„Bcc“ все още не се интерпретират. Те бяха прескочени\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "Обобщаващото писмо е празно и се прескача\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Сигурни ли сте, че искате да ползвате „%s“ [y/N]? "
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -16604,11 +16933,11 @@
"Следните файлове са 8 битови, но не са с обявена заглавна част „Content-"
"Transfer-Encoding“.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Кое 8 битово кодиране се ползва [стандартно: UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -16621,22 +16950,22 @@
"все още е с шаблонното заглавие „*** SUBJECT HERE ***“. Ползвайте опцията\n"
"„--force“, ако сте сигурни, че точно това искате да изпратите.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "На кой да се пратят е-писмата (незадължително поле)"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ФАТАЛНА ГРЕШКА: „%s“ е синоним на себе си\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ГРЕШКА: не може да се извлече адрес от „%s“\n"
@@ -16644,18 +16973,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:944
+#: git-send-email.perl:941
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
"Какво да се направи с този адрес? „q“ (спиране), „d“ (изтриване), "
"„e“ (редактиране): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "Пътят към сертификат „%s“ не съществува."
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16683,131 +17012,131 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr ""
"Изпращане на е-писмото? „y“ (да), „n“ (не), „q“ (изход), „a“ (всичко): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "Изискване на отговор към това е-писмо"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr "Сървърът за SMTP не е настроен правилно."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сървърът не поддържа „STARTTLS“! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Неуспешно изпълнение на STARTTLS! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
+"Подсистемата за SMTP не може да се инициализира. Проверете настройките и "
"използвайте опцията: „--smtp-debug“."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "„%s“ не може да бъде изпратен\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Проба за изпращане на „%s“\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "Изпращане на „%s“\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
-msgstr "Успех при пробата. От журнала:\n"
+msgstr "Успех при пробата. От журнала:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
-msgstr "Успех. От журнала:\n"
+msgstr "Успех. От журнала:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "Резултат: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "Резултат: успех\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "файлът „%s“ не може да бъде отворен"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1551
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавяне на „до: %s“ от ред „%s“\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1599
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(не-mbox) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1624
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(тяло) Добавяне на „як: %s“ от ред „%s“\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не може да бъде се изпълни „%s“"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавяне на „%s: %s“ от: „%s“\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) програмният канал не може да се затвори за изпълнението на „%s“"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "съобщението не може да се изпрати чрез 7 битови знаци"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "неправилно кодиране за пренос"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "„%s“ не може да се отвори: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "„%s“: кръпката съдържа ред с над 988 знака"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, 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 a7bc71f..874ad3c 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -11,15 +11,18 @@
# amend | esmenar
# broken | malmès
# delta | diferència
-# dry | simulació
# deprecated | en desús
+# dry | simulació
# fatal | fatal
+# hook | lligam
# hunk | tros
# not supported | no està admès
# repository | dipòsit
+# setting | paràmetre
# skip | ometre
# squelch | silenciar
# token | testimoni
+# unset | desassignar
#
# Alguns termes que són comandes específiques del git i d'àmbit molt tècnic
# hem decidit no traduir-los per facilitar-ne la compressió a l'usuari i perquè
@@ -36,14 +39,16 @@
# cherry pick | «cherry pick»
# rebase | «rebase»
# stage | «stage»
+# stash | «stash»
# squash | «squash»
+# trailer | «trailer»
# unstage | «unstage»
msgid ""
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-18 20:41+0200\n"
+"POT-Creation-Date: 2017-10-17 09:44+0800\n"
+"PO-Revision-Date: 2017-10-15 22:15+0200\n"
"Last-Translator: Jordi Mas <jmas@softcatala.org>\n"
"Language-Team: Catalan\n"
"Language: ca\n"
@@ -51,7 +56,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.0.4\n"
#: advice.c:58
#, c-format
@@ -96,13 +101,13 @@
msgid "Exiting because of an unresolved conflict."
msgstr "S'està sortint a causa d'un conflicte no resolt."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:117 builtin/merge.c:1211
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "No heu conclòs la vostra fusió (MERGE_HEAD existeix)."
#: advice.c:119
msgid "Please, commit your changes before merging."
-msgstr "Si us plau, cometeu els vostres canvis abans de fusionar."
+msgstr "Cometeu els vostres canvis abans de fusionar."
#: advice.c:120
msgid "Exiting because of unfinished merge."
@@ -123,7 +128,7 @@
" git checkout -b <new-branch-name>\n"
"\n"
msgstr ""
-"Avís: s'està agafant '%s'.\n"
+"Avís: s'està agafant «%s».\n"
"\n"
"Esteu en un estat de 'HEAD separat'. Podeu mirar al voltant, fer canvis\n"
"experimentals i cometre-los i podeu descartar qualsevol comissió que feu\n"
@@ -138,92 +143,92 @@
#: apply.c:58
#, c-format
msgid "unrecognized whitespace option '%s'"
-msgstr "opció d'espai en blanc '%s' no reconeguda"
+msgstr "opció d'espai en blanc «%s» no reconeguda"
#: apply.c:74
#, c-format
msgid "unrecognized whitespace ignore option '%s'"
-msgstr "opció d'ignora l'espai en blanc '%s' no reconeguda"
+msgstr "opció ignora l'espai en blanc «%s» no reconeguda"
-#: apply.c:126
+#: apply.c:125
msgid "--reject and --3way cannot be used together."
msgstr "--reject i --3way no es poden usar junts."
-#: apply.c:128
+#: apply.c:127
msgid "--cached and --3way cannot be used together."
msgstr "--cached i --3way no es poden usar junts."
-#: apply.c:131
+#: apply.c:130
msgid "--3way outside a repository"
msgstr "--3way fora d'un dipòsit"
-#: apply.c:142
+#: apply.c:141
msgid "--index outside a repository"
msgstr "--index fora d'un dipòsit"
-#: apply.c:145
+#: apply.c:144
msgid "--cached outside a repository"
msgstr "--cached fora d'un dipòsit"
-#: apply.c:836
+#: apply.c:845
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "No es pot preparar l'expressió regular de marca de temps %s"
-#: apply.c:845
+#: apply.c:854
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec ha retornat %d per l'entrada: %s"
-#: apply.c:929
+#: apply.c:928
#, 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:967
+#: apply.c:966
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-"git apply: git-diff dolent - /dev/null esperat, %s rebut en la línia %d"
+"git apply: git-diff incorrecte - s'esperava /dev/null, s'ha rebut %s en la línia %d"
-#: apply.c:973
+#: apply.c:972
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-"git apply: git-diff dolent - nom de fitxer nou inconsistent en la línia %d"
+"git apply: git-diff incorrecte - nom de fitxer nou inconsistent en la línia %d"
-#: apply.c:974
+#: apply.c:973
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-"git apply: git-diff dolent - nom de fitxer antic inconsistent en la línia %d"
+"git apply: git-diff incorrecte - nom de fitxer antic inconsistent en la línia %d"
-#: apply.c:979
+#: apply.c:978
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
-msgstr "git apply: git-diff dolent - /dev/null esperat en la línia %d"
+msgstr "git apply: git-diff incorrecte - s'esperava /dev/null en la línia %d"
-#: apply.c:1008
-#, fuzzy, c-format
+#: apply.c:1007
+#, c-format
msgid "invalid mode on line %d: %s"
-msgstr "línia d'identitat no vàlida: %s"
+msgstr "mode no vàlid en la línia %d: %s"
-#: apply.c:1326
+#: apply.c:1325
#, c-format
msgid "inconsistent header lines %d and %d"
-msgstr ""
+msgstr "línies de capçalera %d i %d inconsistents"
-#: apply.c:1498
+#: apply.c:1497
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recompte: línia inesperada: %.*s"
-#: apply.c:1567
+#: apply.c:1566
#, 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:1587
+#: apply.c:1586
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -238,83 +243,83 @@
"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:1600
+#: apply.c:1599
#, 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:1770
+#: apply.c:1787
msgid "new file depends on old contents"
msgstr "el fitxer nou depèn dels continguts antics"
-#: apply.c:1772
+#: apply.c:1789
msgid "deleted file still has contents"
msgstr "el fitxer suprimit encara té continguts"
-#: apply.c:1806
+#: apply.c:1823
#, c-format
msgid "corrupt patch at line %d"
msgstr "pedaç malmès a la línia %d"
-#: apply.c:1843
+#: apply.c:1860
#, c-format
msgid "new file %s depends on old contents"
msgstr "el fitxer nou %s depèn dels continguts antics"
-#: apply.c:1845
+#: apply.c:1862
#, c-format
msgid "deleted file %s still has contents"
msgstr "el fitxer suprimit %s encara té continguts"
-#: apply.c:1848
+#: apply.c:1865
#, 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:1995
+#: apply.c:2012
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "pedaç binari malmès a la línia %d: %.*s"
-#: apply.c:2032
+#: apply.c:2049
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "pedaç binari no reconegut a la línia %d"
-#: apply.c:2193
+#: apply.c:2209
#, c-format
msgid "patch with only garbage at line %d"
msgstr "pedaç amb només escombraries a la línia %d"
-#: apply.c:2276
+#: apply.c:2295
#, c-format
msgid "unable to read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: apply.c:2280
+#: apply.c:2299
#, c-format
msgid "unable to open or read %s"
msgstr "no s'ha pogut obrir o llegir %s"
-#: apply.c:2933
+#: apply.c:2958
#, c-format
msgid "invalid start of line: '%c'"
msgstr "inici de línia no vàlid: '%c'"
-#: apply.c:3052
+#: apply.c:3077
#, 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:3064
+#: apply.c:3089
#, 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:3070
+#: apply.c:3095
#, c-format
msgid ""
"while searching for:\n"
@@ -323,311 +328,311 @@
"tot cercant:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3117
#, c-format
msgid "missing binary patch data for '%s'"
-msgstr "manquen les dades de pedaç binari de '%s'"
+msgstr "manquen les dades de pedaç binari de «%s»"
-#: apply.c:3100
+#: apply.c:3125
#, 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'"
+msgstr "no es pot aplicar al revés un pedaç binari sense el tros revés a «%s»"
-#: apply.c:3146
+#: apply.c:3171
#, 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"
+"no es pot aplicar un pedaç binari a «%s» sense la línia d'índex completa"
-#: apply.c:3156
+#: apply.c:3181
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-"el pedaç s'aplica a '%s' (%s), el qual no coincideix amb els continguts "
+"el pedaç s'aplica a «%s» (%s), el qual no coincideix amb els continguts "
"actuals."
-#: apply.c:3164
+#: apply.c:3189
#, 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"
+msgstr "el pedaç s'aplica a un «%s» buit però no és buit"
-#: apply.c:3182
+#: apply.c:3207
#, 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'"
+msgstr "no es pot llegir la postimatge %s necessària per a «%s»"
-#: apply.c:3195
+#: apply.c:3220
#, c-format
msgid "binary patch does not apply to '%s'"
-msgstr "el pedaç binari no s'aplica a '%s'"
+msgstr "el pedaç binari no s'aplica a «%s»"
-#: apply.c:3201
+#: apply.c:3226
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-"el pedaç binari a '%s' crea un resultat incorrecte (esperant %s, %s rebut)"
+"el pedaç binari a «%s» crea un resultat incorrecte (s'esperava %s, s'ha rebut %s)"
-#: apply.c:3222
+#: apply.c:3247
#, c-format
msgid "patch failed: %s:%ld"
msgstr "el pedaç ha fallat: %s:%ld"
-#: apply.c:3344
+#: apply.c:3369
#, c-format
msgid "cannot checkout %s"
msgstr "no es pot agafar %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3418 apply.c:3429 apply.c:3475 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "s'ha produït un error en llegir %s"
-#: apply.c:3400
+#: apply.c:3426
#, c-format
msgid "reading from '%s' beyond a symbolic link"
-msgstr "s'està llegint de '%s' més enllà d'un enllaç simbòlic"
+msgstr "s'està llegint de «%s» més enllà d'un enllaç simbòlic"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3455 apply.c:3695
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "el camí %s s'ha canviat de nom / s'ha suprimit"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3538 apply.c:3709
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: no existeix en l'índex"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3547 apply.c:3717
#, c-format
msgid "%s: does not match index"
msgstr "%s: no coincideix amb l'índex"
-#: apply.c:3556
+#: apply.c:3582
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"al dipòsit li manca el blob necessari per a retrocedir a una fusió de 3 vies."
-#: apply.c:3559
+#: apply.c:3585
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "S'està retrocedint a una fusió de 3 vies...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3601 apply.c:3605
#, c-format
msgid "cannot read the current contents of '%s'"
-msgstr "no es poden llegir els continguts actuals de '%s'"
+msgstr "no es poden llegir els continguts actuals de «%s»"
-#: apply.c:3591
+#: apply.c:3617
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "S'ha produït un error en retrocedir a una fusió de 3 vies...\n"
-#: apply.c:3605
+#: apply.c:3631
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
-msgstr "S'ha aplicat el pedaç a '%s' amb conflictes.\n"
-
-#: apply.c:3610
-#, c-format
-msgid "Applied patch to '%s' cleanly.\n"
-msgstr "S'ha aplicat el pedaç a '%s' netament.\n"
+msgstr "S'ha aplicat el pedaç a «%s» amb conflictes.\n"
#: apply.c:3636
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "S'ha aplicat el pedaç a «%s» netament.\n"
+
+#: apply.c:3662
msgid "removal patch leaves file contents"
msgstr "el pedaç d'eliminació deixa els continguts dels fitxers"
-#: apply.c:3708
+#: apply.c:3734
#, c-format
msgid "%s: wrong type"
msgstr "%s: tipus erroni"
-#: apply.c:3710
+#: apply.c:3736
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s és del tipus %o, s'esperava %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3886 apply.c:3888
#, c-format
msgid "invalid path '%s'"
-msgstr "camí no vàlid: %s"
+msgstr "camí no vàlid: «%s»"
-#: apply.c:3918
+#: apply.c:3944
#, c-format
msgid "%s: already exists in index"
msgstr "%s: ja existeix en l'índex"
-#: apply.c:3921
+#: apply.c:3947
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: ja existeix en el directori de treball"
-#: apply.c:3941
+#: apply.c:3967
#, 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:3946
+#: apply.c:3972
#, 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:3966
+#: apply.c:3992
#, 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"
+msgstr "el fitxer afectat «%s» és més enllà d'un enllaç simbòlic"
-#: apply.c:3970
+#: apply.c:3996
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: el pedaç no s'aplica"
-#: apply.c:3985
+#: apply.c:4011
#, c-format
msgid "Checking patch %s..."
msgstr "S'està comprovant el pedaç %s..."
-#: apply.c:4076
+#: apply.c:4102
#, 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:4083
+#: apply.c:4109
#, 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 el HEAD actual"
-#: apply.c:4086
+#: apply.c:4112
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "falta informació sha1 o és inútil (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4117 builtin/checkout.c:235 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
-msgstr "make_cache_entry ha fallat per al camí '%s'"
+msgstr "make_cache_entry ha fallat per al camí «%s»"
-#: apply.c:4095
+#: apply.c:4121
#, c-format
msgid "could not add %s to temporary index"
msgstr "no s'ha pogut afegir %s a l'índex temporal"
-#: apply.c:4105
+#: apply.c:4131
#, c-format
msgid "could not write temporary index to %s"
msgstr "no s'ha pogut escriure l'índex temporal a %s"
-#: apply.c:4243
+#: apply.c:4269
#, c-format
msgid "unable to remove %s from index"
msgstr "no s'ha pogut eliminar %s de l'índex"
-#: apply.c:4278
+#: apply.c:4304
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "pedaç malmès per al submòdul %s"
-#: apply.c:4284
+#: apply.c:4310
#, c-format
msgid "unable to stat newly created file '%s'"
-msgstr "no s'ha pogut fer stat al fitxer novament creat '%s'"
+msgstr "no s'ha pogut fer stat al fitxer novament creat «%s»"
-#: apply.c:4292
+#: apply.c:4318
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
"no s'ha pogut crear un magatzem de recolzament per al fitxer novament creat "
"%s"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4324 apply.c:4468
#, 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:4339
+#: apply.c:4365
#, c-format
msgid "failed to write to '%s'"
-msgstr "no s'ha pogut escriure a '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
-#: apply.c:4343
+#: apply.c:4369
#, c-format
msgid "closing file '%s'"
-msgstr "s'està tancant el fitxer '%s'"
+msgstr "s'està tancant el fitxer «%s»"
-#: apply.c:4413
+#: apply.c:4439
#, c-format
msgid "unable to write file '%s' mode %o"
-msgstr "no s'ha pogut escriure el fitxer '%s' mode %o"
+msgstr "no s'ha pogut escriure el fitxer «%s» mode %o"
-#: apply.c:4511
+#: apply.c:4537
#, c-format
msgid "Applied patch %s cleanly."
msgstr "El pedaç %s s'ha aplicat netament."
-#: apply.c:4519
+#: apply.c:4545
msgid "internal error"
msgstr "error intern"
-#: apply.c:4522
+#: apply.c:4548
#, 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:4533
+#: apply.c:4559
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "s'està truncant el nom del fitxer .rej a %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4567 builtin/fetch.c:760 builtin/fetch.c:1010
#, c-format
msgid "cannot open %s"
msgstr "no es pot obrir %s"
-#: apply.c:4555
+#: apply.c:4581
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "El tros #%d s'ha aplicat netament."
-#: apply.c:4559
+#: apply.c:4585
#, c-format
msgid "Rejected hunk #%d."
msgstr "S'ha rebutjat el tros #%d."
-#: apply.c:4669
+#: apply.c:4695
#, c-format
msgid "Skipped patch '%s'."
-msgstr "S'ha omès el pedaç '%s'."
+msgstr "S'ha omès el pedaç «%s»."
-#: apply.c:4677
+#: apply.c:4703
msgid "unrecognized input"
msgstr "entrada no reconeguda"
-#: apply.c:4696
+#: apply.c:4722
msgid "unable to read index file"
msgstr "no es pot llegir el fitxer d'índex"
-#: apply.c:4833
+#: apply.c:4859
#, c-format
msgid "can't open patch '%s': %s"
-msgstr "no es pot obrir el pedaç '%s': %s"
+msgstr "no es pot obrir el pedaç «%s»: %s"
-#: apply.c:4860
+#: apply.c:4886
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "s'ha silenciat %d error d'espai en blanc"
msgstr[1] "s'han silenciat %d errors d'espai en blanc"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4892 apply.c:4907
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d línia afegeix errors d'espai en blanc."
msgstr[1] "%d línies afegeixen errors d'espai en blanc."
-#: apply.c:4874
+#: apply.c:4900
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -636,138 +641,139 @@
msgstr[1] ""
"S'han aplicat %d línies després d'arreglar els errors d'espai en blanc."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4916 builtin/add.c:515 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "No s'ha pogut escriure un fitxer d'índex nou"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4947 apply.c:4950 builtin/am.c:2256 builtin/am.c:2259
+#: builtin/clone.c:116 builtin/fetch.c:115 builtin/pull.c:187
+#: builtin/submodule--helper.c:301 builtin/submodule--helper.c:622
+#: builtin/submodule--helper.c:625 builtin/submodule--helper.c:992
+#: builtin/submodule--helper.c:995 builtin/submodule--helper.c:1212
#: git-add--interactive.perl:197
msgid "path"
msgstr "camí"
-#: apply.c:4922
+#: apply.c:4948
msgid "don't apply changes matching the given path"
msgstr "no apliquis els canvis que coincideixin amb el camí donat"
-#: apply.c:4925
+#: apply.c:4951
msgid "apply changes matching the given path"
msgstr "aplica els canvis que coincideixin amb el camí donat"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4953 builtin/am.c:2265
msgid "num"
msgstr "número"
-#: apply.c:4928
+#: apply.c:4954
msgid "remove <num> leading slashes from traditional diff paths"
msgstr ""
"elimina <nombre> barres obliqües inicials dels camins de diferència "
"tradicionals"
-#: apply.c:4931
+#: apply.c:4957
msgid "ignore additions made by the patch"
msgstr "ignora afegiments fets pel pedaç"
-#: apply.c:4933
+#: apply.c:4959
msgid "instead of applying the patch, output diffstat for the input"
msgstr ""
"en lloc d'aplicar el pedaç, emet les estadístiques de diferència de l'entrada"
-#: apply.c:4937
+#: apply.c:4963
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:4939
+#: apply.c:4965
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:4941
+#: apply.c:4967
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:4943
+#: apply.c:4969
msgid "make sure the patch is applicable to the current index"
msgstr "assegura que el pedaç sigui aplicable a l'índex actual"
-#: apply.c:4945
+#: apply.c:4971
msgid "apply a patch without touching the working tree"
msgstr "aplica un pedaç sense tocar l'arbre de treball"
-#: apply.c:4947
+#: apply.c:4973
msgid "accept a patch that touches outside the working area"
msgstr "accepta un pedaç que toqui fora de l'àrea de treball"
-#: apply.c:4949
+#: apply.c:4975
msgid "also apply the patch (use with --stat/--summary/--check)"
msgstr "aplica el pedaç també (useu amb --stat/--summary/--check)"
-#: apply.c:4951
+#: apply.c:4977
msgid "attempt three-way merge if a patch does not apply"
msgstr "intenta una fusió de tres vies si el pedaç no s'aplica"
-#: apply.c:4953
+#: apply.c:4979
msgid "build a temporary index based on embedded index information"
msgstr "construeix un índex temporal basat en la informació d'índex incrustada"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4982 builtin/checkout-index.c:170 builtin/ls-files.c:513
msgid "paths are separated with NUL character"
msgstr "els camins se separen amb el caràcter NUL"
-#: apply.c:4958
+#: apply.c:4984
msgid "ensure at least <n> lines of context match"
msgstr "assegura't que almenys <n> línies de context coincideixin"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4985 builtin/am.c:2244 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
msgid "action"
msgstr "acció"
-#: apply.c:4960
+#: apply.c:4986
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:4963 apply.c:4966
+#: apply.c:4989 apply.c:4992
msgid "ignore changes in whitespace when finding context"
msgstr "ignora els canvis d'espai en blanc en cercar context"
-#: apply.c:4969
+#: apply.c:4995
msgid "apply the patch in reverse"
msgstr "aplica el pedaç al revés"
-#: apply.c:4971
+#: apply.c:4997
msgid "don't expect at least one line of context"
msgstr "no esperis almenys una línia de context"
-#: apply.c:4973
+#: apply.c:4999
msgid "leave the rejected hunks in corresponding *.rej files"
msgstr "deixa els trossos rebutjats en fitxers *.rej corresponents"
-#: apply.c:4975
+#: apply.c:5001
msgid "allow overlapping hunks"
msgstr "permet trossos encavalcants"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:5002 builtin/add.c:272 builtin/check-ignore.c:21
+#: builtin/commit.c:1347 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1889 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "sigues detallat"
-#: apply.c:4978
+#: apply.c:5004
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:4981
+#: apply.c:5007
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:4983 builtin/am.c:2254
+#: apply.c:5009 builtin/am.c:2253
msgid "root"
msgstr "arrel"
-#: apply.c:4984
+#: apply.c:5010
msgid "prepend <root> to all filenames"
msgstr "anteposa <arrel> a tots els noms de fitxer"
@@ -790,108 +796,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dipòsit> [--exec <ordre>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:156 builtin/add.c:494 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
-msgstr "l'especificació de camí '%s' no ha coincidit amb cap fitxer"
+msgstr "l'especificació de camí «%s» no ha coincidit amb cap fitxer"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "format"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "format d'arxiu"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1452
msgid "prefix"
msgstr "prefix"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "anteposa el prefix a cada nom de camí en l'arxiu"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:859
+#: builtin/hash-object.c:102 builtin/ls-files.c:547 builtin/ls-files.c:550
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "fitxer"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "escriu l'arxiu a aquest fitxer"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "llegeix .gitattributes en el directori de treball"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "informa de fitxers arxivats en stderr"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "només emmagatzema"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "comprimeix més ràpidament"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "comprimeix millor"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "llista els formats d'arxiu admesos"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:634 builtin/submodule--helper.c:1001
msgid "repo"
msgstr "dipòsit"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "recupera l'arxiu del dipòsit remot <dipòsit>"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "ordre"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "camí a l'ordre git-upload-archive remota"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Opció inesperada --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
-msgstr "L'opció --exec només es pot usar junt amb --remote"
+msgstr "L'opció --exec només es pot usar juntament amb --remote"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Opció inesperada --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
-msgstr "Format d'arxiu desconegut '%s'"
+msgstr "Format d'arxiu desconegut «%s»"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
-msgstr "Paràmetre no admès per al format '%s': -%d"
+msgstr "Paràmetre no admès per al format «%s»: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s no és un nom d'atribut vàlid"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -902,7 +908,7 @@
#: bisect.c:447
#, c-format
msgid "Badly quoted content in file '%s': %s"
-msgstr "Comentari amb cometes errònies en el fitxer '%s': %s"
+msgstr "Comentari amb cometes errònies en el fitxer «%s»: %s"
#: bisect.c:655
#, c-format
@@ -939,7 +945,7 @@
"This means the first '%s' commit is between %s and [%s].\n"
msgstr ""
"La base de fusió %s és %s.\n"
-"Això vol dir que la primera comissió '%s' és entre %s i [%s].\n"
+"Això vol dir que la primera comissió «%s» és entre %s i [%s].\n"
#: bisect.c:750
#, c-format
@@ -960,7 +966,7 @@
"We continue anyway."
msgstr ""
"s'ha d'ometre la base de fusió entre %s i [%s].\n"
-"Llavors, no podem estar segurs de que la primera comissió %s sigui entre %s "
+"Llavors, no podem estar segurs que la primera comissió %s sigui entre %s "
"i %s.\n"
"Continuem de totes maneres."
@@ -969,40 +975,40 @@
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisecant: s'ha de provar una base de fusió\n"
-#: bisect.c:849
+#: bisect.c:850
#, c-format
msgid "a %s revision is needed"
msgstr "es necessita una revisió %s"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:867 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
-msgstr "no s'ha pogut crear el fitxer '%s'"
+msgstr "no s'ha pogut crear el fitxer «%s»"
-#: bisect.c:917
+#: bisect.c:918
#, c-format
msgid "could not read file '%s'"
-msgstr "no s'ha pogut llegir el fitxer '%s'"
+msgstr "no s'ha pogut llegir el fitxer «%s»"
-#: bisect.c:947
+#: bisect.c:948
msgid "reading bisect refs failed"
msgstr "la lectura de les referències de bisecció ha fallat"
-#: bisect.c:967
+#: bisect.c:968
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s era ambdós %s i %s\n"
-#: bisect.c:975
+#: bisect.c:976
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"No s'ha trobat cap comissió comprovable.\n"
-"Potser heu començat amb paràmetres de camí dolents?\n"
+"Potser heu començat amb paràmetres de camí incorrectes?\n"
-#: bisect.c:994
+#: bisect.c:995
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1012,7 +1018,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1001
#, 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"
@@ -1033,10 +1039,10 @@
"--reverse i --first-parent-together requereixen una última comissió "
"especificada"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1947 sequencer.c:1168
+#: sequencer.c:2351 builtin/commit.c:1065 builtin/log.c:357 builtin/log.c:911
+#: builtin/log.c:1361 builtin/log.c:1690 builtin/log.c:1938 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "la configuració del passeig per revisions ha fallat"
@@ -1077,50 +1083,53 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la branca remota %s de %s fent "
-"«rebase»."
+"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."
+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."
+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»."
+"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."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "La branca «%s» està configurada per a seguir la branca local «%s»."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la referència remota %s fent "
+"La branca «%s» està configurada per a seguir la referència remota «%s» fent "
"«rebase»."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "La branca %s està configurada per a seguir la referència remota %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+"La branca «%s» està configurada per a seguir la referència remota «%s»."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"La branca %s està configurada per a seguir la referència local %s fent "
+"La branca «%s» està configurada per a seguir la referència local «%s» fent "
"«rebase»."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "La branca %s està configurada per a seguir la referència local %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "La branca «%s» està configurada per a seguir la referència local «%s»."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1134,30 +1143,30 @@
#: branch.c:185
#, c-format
msgid "'%s' is not a valid branch name."
-msgstr "'%s' no és un nom de branca vàlid."
+msgstr "«%s» no és un nom de branca vàlid."
#: branch.c:190
#, c-format
msgid "A branch named '%s' already exists."
-msgstr "Una branca amb nom '%s' ja existeix."
+msgstr "Una branca amb nom «%s» ja existeix."
-#: branch.c:198
+#: branch.c:197
msgid "Cannot force update the current branch."
msgstr "No es pot actualitzar la branca actual a la força."
-#: branch.c:218
+#: branch.c:217
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-"No es pot configurar la informació de seguiment; el punt inicial '%s' no és "
+"No es pot configurar la informació de seguiment; el punt inicial «%s» no és "
"una branca."
-#: branch.c:220
+#: branch.c:219
#, c-format
msgid "the requested upstream branch '%s' does not exist"
-msgstr "la branca font demanada '%s' no existeix"
+msgstr "la branca font demanada «%s» no existeix"
-#: branch.c:222
+#: branch.c:221
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1171,107 +1180,109 @@
"\n"
"Si teniu pensat basar el vostre treball en una branca\n"
"font que ja existeix al remot, pot ser que necessiteu\n"
-"executar \"git fetch\" per a obtenir-la.\n"
+"executar «git fetch» per a obtenir-la.\n"
"\n"
"Si teniu pensat pujar una branca local nova que seguirà\n"
"la seva contrapart remota, pot ser que vulgueu usar\n"
-"\"git push -u\" per a establir la configuració font\n"
+"«git push -u» per a establir la configuració font\n"
"mentre pugeu."
-#: branch.c:265
+#: branch.c:264
#, c-format
msgid "Not a valid object name: '%s'."
-msgstr "No és un nom d'objecte vàlid: '%s'."
+msgstr "No és un nom d'objecte vàlid: «%s»."
-#: branch.c:285
+#: branch.c:284
#, c-format
msgid "Ambiguous object name: '%s'."
-msgstr "Nom d'objecte ambigu: '%s'."
+msgstr "Nom d'objecte ambigu: «%s»."
-#: branch.c:290
+#: branch.c:289
#, c-format
msgid "Not a valid branch point: '%s'."
-msgstr "No és un punt de ramificació vàlid: '%s'."
+msgstr "No és un punt de ramificació vàlid: «%s»."
-#: branch.c:344
+#: branch.c:343
#, c-format
msgid "'%s' is already checked out at '%s'"
-msgstr "'%s' ja s'ha agafat a '%s'"
+msgstr "«%s» ja s'ha agafat a «%s»"
#: branch.c:366
#, c-format
msgid "HEAD of working tree %s is not updated"
-msgstr "La HEAD de l'arbre de treball %s no està actualitzat"
+msgstr "HEAD de l'arbre de treball %s no està actualitzat"
#: bundle.c:34
#, c-format
msgid "'%s' does not look like a v2 bundle file"
-msgstr "'%s' no sembla un fitxer de farcell v2"
+msgstr "«%s» no sembla un fitxer de farcell v2"
#: bundle.c:62
#, c-format
msgid "unrecognized header: %s%s (%d)"
msgstr "capçalera no reconeguda: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1346 sequencer.c:1793 sequencer.c:2500
+#: sequencer.c:2583 sequencer.c:2609 sequencer.c:2687 sequencer.c:2807
+#: sequencer.c:2949 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
-msgstr "no s'ha pogut obrir '%s'"
+msgstr "no s'ha pogut obrir «%s»"
#: bundle.c:140
msgid "Repository lacks these prerequisite commits:"
msgstr "Al dipòsit li manquen aquestes comissions prerequisits:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "El farcell conté aquesta referència:"
msgstr[1] "El farcell conté aquestes %d referències:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "El farcell registra una història completa."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "El farcell requereix aquesta referència:"
msgstr[1] "El farcell requereix aquestes %d referències:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "No s'ha pogut executar el pack-objects"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "El pack-objects s'ha mort"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "El rev-list s'ha mort"
-#: bundle.c:356
+#: bundle.c:363
#, 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'"
+msgstr "les opcions de la llista de revisions exclouen la referència «%s»"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:174 builtin/log.c:1597 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "paràmetre no reconegut: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "S'està refusant crear un farcell buit."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
-msgstr "no es pot crear '%s'"
+msgstr "no es pot crear «%s»"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "L'index-pack s'ha mort"
@@ -1280,8 +1291,8 @@
msgid "invalid color value: %.*s"
msgstr "valor de color no vàlid: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1600 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1467 builtin/am.c:2105
#, c-format
msgid "could not parse %s"
msgstr "no s'ha pogut analitzar %s"
@@ -1291,7 +1302,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s no és una comissió!"
-#: commit.c:1511
+#: commit.c:1517
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"
@@ -1306,160 +1317,160 @@
msgid "memory exhausted"
msgstr "memòria esgotada"
-#: config.c:186
+#: config.c:187
msgid "relative config include conditionals must come from files"
-msgstr ""
+msgstr "els condicionals d'inclusió de configuració relatius han de venir de fitxers"
-#: config.c:720
+#: config.c:721
#, c-format
msgid "bad config line %d in blob %s"
msgstr "línia de configuració %d errònia en el blob %s"
-#: config.c:724
+#: config.c:725
#, c-format
msgid "bad config line %d in file %s"
msgstr "línia de configuració %d errònia en el fitxer %s"
-#: config.c:728
+#: config.c:729
#, 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:732
+#: config.c:733
#, 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:736
+#: config.c:737
#, 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:740
+#: config.c:741
#, c-format
msgid "bad config line %d in %s"
msgstr "línia de configuració %d errònia en %s"
-#: config.c:868
+#: config.c:869
msgid "out of range"
msgstr "fora de rang"
-#: config.c:868
+#: config.c:869
msgid "invalid unit"
msgstr "unitat no vàlida"
-#: config.c:874
+#: config.c:875
#, c-format
msgid "bad numeric config value '%s' for '%s': %s"
-msgstr "valor de configuració numèric erroni '%s' per '%s': %s"
+msgstr "valor de configuració numèric erroni «%s» per «%s»: %s"
-#: config.c:879
+#: config.c:880
#, 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"
+msgstr "valor de configuració numèric erroni «%s» per «%s» en el blob %s: %s"
-#: config.c:882
+#: config.c:883
#, 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:885
+#: config.c:886
#, 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:888
+#: config.c:889
#, c-format
msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
msgstr ""
-"valor de configuració numèric '%s' erroni' per '%s' en el blob de submòdul "
+"valor de configuració numèric «%s» erroni' per «%s» en el blob de submòdul "
"%s: %s"
-#: config.c:891
+#: config.c:892
#, 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: "
+"valor de configuració numèric «%s» erroni per «%s» en la línia d'ordres %s: "
"%s"
-#: config.c:894
+#: config.c:895
#, c-format
msgid "bad numeric config value '%s' for '%s' in %s: %s"
-msgstr "valor de configuració numèric dolent '%s' per '%s' en %s: %s"
+msgstr "valor de configuració numèric incorrecte «%s» per «%s» en %s: %s"
-#: config.c:989
+#: config.c:990
#, 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'"
+msgstr "s'ha produït un error en expandir el directori d'usuari en: «%s»"
-#: config.c:1084 config.c:1095
+#: config.c:1085 config.c:1096
#, c-format
msgid "bad zlib compression level %d"
-msgstr "nivell de compressió de zlib dolent %d"
+msgstr "nivell de compressió de zlib incorrecte %d"
-#: config.c:1212
+#: config.c:1213
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode de creació d'objecte no vàlid: %s"
-#: config.c:1368
+#: config.c:1372
#, c-format
msgid "bad pack compression level %d"
msgstr "nivell de compressió de paquet %d Erroni"
-#: config.c:1564
+#: config.c:1568
msgid "unable to parse command-line config"
msgstr "no s'ha pogut analitzar la configuració de la línia d'ordres"
-#: config.c:1894
+#: config.c:1900
msgid "unknown error occurred while reading the configuration files"
msgstr "un error desconegut ha ocorregut en llegir els fitxers de configuració"
-#: config.c:2064
+#: config.c:2087
#, c-format
msgid "Invalid %s: '%s'"
-msgstr "%s no vàlid: %s"
+msgstr "%s no vàlid: «%s»"
-#: config.c:2085
+#: config.c:2130
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
-msgstr ""
+msgstr "valor «%s» a core.untrackedCache desconegut; utilitzant el valor per defecte «keep»"
-#: config.c:2111
+#: config.c:2156
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
-msgstr ""
+msgstr "valor «%d» a splitIndex.maxPercentChange ha d'estar entre 0 i 100"
-#: config.c:2122
+#: config.c:2167
#, 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"
+msgstr "no s'ha pogut analitzar «%s» de la configuració de la línia d'ordres"
-#: config.c:2124
+#: config.c:2169
#, 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"
+msgstr "variable de configuració «%s» errònia en el fitxer «%s» a la línia %d"
-#: config.c:2183
+#: config.c:2228
#, c-format
msgid "%s has multiple values"
msgstr "%s té múltiples valors"
-#: config.c:2517 config.c:2745
+#: config.c:2571 config.c:2789
#, c-format
msgid "fstat on %s failed"
msgstr "ha fallat fstat a %s"
-#: config.c:2635
+#: config.c:2678
#, c-format
msgid "could not set '%s' to '%s'"
-msgstr "no s'ha pogut establir '%s' a '%s'"
+msgstr "no s'ha pogut establir «%s» a «%s»"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2680 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
-msgstr "no s'ha pogut desestablir '%s'"
+msgstr "no s'ha pogut desassignar «%s»"
#: connect.c:50
msgid "The remote end hung up upon initial contact"
@@ -1474,22 +1485,22 @@
msgstr ""
"No s'ha pogut llegir del dipòsit remot.\n"
"\n"
-"Si us plau, assegureu-vos que tingueu els permisos\n"
+"Assegureu-vos que tingueu els permisos\n"
"d'accés correctes i que el dipòsit existeixi."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "S'està comprovant la connectivitat"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "No s'ha pogut executar 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "escriptura fallada al rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "s'ha produït un error en tancar l'stdin del rev-list"
@@ -1594,36 +1605,43 @@
#: 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'"
+msgstr "s'ha produït un error en llegir el fitxer d'ordres «%s»"
#: diffcore-rename.c:536
msgid "Performing inexact rename detection"
msgstr "S'està realitzant una detecció inexacta de canvis de nom"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
-msgstr "l'opció '%s' requereix un valor"
+msgstr "l'opció «%s» requereix un valor"
-#: diff.c:125
+#: diff.c:152
#, 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"
+"«%s»\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
-msgstr " Paràmetre de dirstat desconegut '%s'\n"
+msgstr " Paràmetre de dirstat desconegut «%s»\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"el paràmetre de color en moviment ha de ser «no», «default», «zebra», «dimmed_zebra» o «plain»"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-"Valor desconegut de la variable de configuració de 'diff.submodule': '%s'"
+"Valor desconegut de la variable de configuració de 'diff.submodule': «%s»"
-#: diff.c:342
+#: diff.c:398
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1632,20 +1650,20 @@
"S'han trobat errors en la variable de configuració 'diff.dirstat':\n"
"%s"
-#: diff.c:3101
+#: diff.c:3861
#, c-format
msgid "external diff died, stopping at %s"
msgstr "el diff external s'ha mort, s'està aturant a %s"
-#: diff.c:3427
+#: diff.c:4189
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check i -s són mutualment exclusius"
-#: diff.c:3517
+#: diff.c:4279
msgid "--follow requires exactly one pathspec"
msgstr "--follow requereix exactament una especificació de camí"
-#: diff.c:3680
+#: diff.c:4445
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1654,22 +1672,22 @@
"S'ha produït un error en analitzar el paràmetre d'opció de --dirstat/-X:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4459
#, 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'"
+"S'ha produït un error en analitzar el paràmetre d'opció de --submodule: «%s»"
-#: diff.c:4716
+#: diff.c:5505
msgid "inexact rename detection was skipped due to too many files."
msgstr "s'ha omès la detecció de canvi de nom a causa de massa fitxers."
-#: diff.c:4719
+#: diff.c:5508
msgid "only found copies from modified paths due to too many files."
msgstr ""
"només s'han trobat còpies des de camins modificats a causa de massa fitxers."
-#: diff.c:4722
+#: diff.c:5511
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1677,208 +1695,212 @@
"potser voleu establir la vostra variable %s a almenys %d i tornar a intentar "
"l'ordre."
-#: dir.c:1948
+#: dir.c:1983
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:2067
+#: dir.c:2102
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:2846 dir.c:2851
+#: dir.c:2885 dir.c:2890
#, c-format
msgid "could not create directories for %s"
-msgstr "no s'ha pogut crear directoris per %s"
+msgstr "no s'han pogut crear directoris per %s"
-#: dir.c:2876
+#: dir.c:2915
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
-msgstr "no s'ha pogut migrar el directori de '%s' a '%s'"
+msgstr "no s'ha pogut migrar el directori de «%s» a «%s»"
-#: entry.c:281
+#: entry.c:176
+msgid "Filtering content"
+msgstr "S'està filtrant el contingut"
+
+#: entry.c:433
#, c-format
msgid "could not stat file '%s'"
-msgstr "no s'ha pogut fer «stat» sobre el fitxer '%s'"
+msgstr "no s'ha pogut fer «stat» sobre el fitxer «%s»"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: llista superficial esperada"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
-msgstr "git fetch-pack: ACK/NAK esperat, EOF rebut"
+msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut EOF"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "error remot: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
-msgstr "git fetch-pack: ACK/NAK esperat, '%s' rebut"
+msgstr "git fetch-pack: s'esperava ACK/NAK, s'ha rebut «%s»"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc requereix multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "línia de shallow no vàlida: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "línia d'unshallow no vàlida: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "objecte no trobat: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "error en objecte: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "no s'ha trobat cap shallow: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "s'esperava shallow/unshallow, s'ha rebut %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
-msgstr "%s %d %s rebut"
+msgstr "s'ha rebut %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "comissió no vàlida %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "s'està rendint"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:242
msgid "done"
msgstr "fet"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "s'ha rebut %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "S'està marcant %s com a complet"
-#: fetch-pack.c:775
+#: fetch-pack.c:776
#, c-format
msgid "already have %s (%s)"
msgstr "ja es té %s (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:814
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: no s'ha pogut bifurcar del desmultiplexor de banda lateral"
-#: fetch-pack.c:821
+#: fetch-pack.c:822
msgid "protocol error: bad pack header"
msgstr "error de protocol: capçalera de paquet errònia"
-#: fetch-pack.c:877
+#: fetch-pack.c:878
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: no es pot bifurcar de %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:894
#, c-format
msgid "%s failed"
msgstr "%s ha fallat"
-#: fetch-pack.c:895
+#: fetch-pack.c:896
msgid "error in sideband demultiplexer"
msgstr "error en desmultiplexor de banda lateral"
-#: fetch-pack.c:922
+#: fetch-pack.c:923
msgid "Server does not support shallow clients"
msgstr "El servidor no permet clients superficials"
-#: fetch-pack.c:926
+#: fetch-pack.c:927
msgid "Server supports multi_ack_detailed"
msgstr "El servidor accepta multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:930
msgid "Server supports no-done"
msgstr "El servidor accepta no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:936
msgid "Server supports multi_ack"
msgstr "El servidor accepta multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:940
msgid "Server supports side-band-64k"
msgstr "El servidor accepta side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:944
msgid "Server supports side-band"
msgstr "El servidor accepta banda lateral"
-#: fetch-pack.c:947
+#: fetch-pack.c:948
msgid "Server supports allow-tip-sha1-in-want"
msgstr "El servidor accepta allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:952
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "El servidor accepta allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:962
msgid "Server supports ofs-delta"
msgstr "El servidor accepta ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:969
#, c-format
msgid "Server version is %.*s"
msgstr "La versió del servidor és %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:975
msgid "Server does not support --shallow-since"
msgstr "El servidor no admet --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:979
msgid "Server does not support --shallow-exclude"
msgstr "El servidor no admet --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:981
msgid "Server does not support --deepen"
msgstr "El servidor no admet --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:992
msgid "no common commits"
msgstr "cap comissió en comú"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1004
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: l'obtenció ha fallat."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1166
msgid "no matching remote head"
msgstr "no hi ha cap HEAD remot coincident"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1188
#, c-format
msgid "no such remote ref %s"
msgstr "no existeix la referència remota %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1191
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "El servidor no permet sol·licitar objectes no anunciats %s"
@@ -1891,35 +1913,35 @@
msgid "could not create temporary file"
msgstr "no s'ha pogut crear el fitxer temporal"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, 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 signatura separada a «%s»"
#: graph.c:97
#, c-format
msgid "ignore invalid color '%.*s' in log.graphColors"
-msgstr "ignora el color invàlid '%.*s' en log.graphColors"
+msgstr "ignora el color no vàlid «%.*s» en log.graphColors"
-#: grep.c:1981
+#: grep.c:1970
#, c-format
msgid "'%s': unable to read %s"
-msgstr "'%s': no s'ha pogut llegir %s"
+msgstr "«%s»: no s'ha pogut llegir %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:1987 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
-msgstr "s'ha produït un error en fer stat a '%s'"
+msgstr "s'ha produït un error en fer stat a «%s»"
-#: grep.c:2009
+#: grep.c:1998
#, c-format
msgid "'%s': short read"
-msgstr "'%s': lectura curta"
+msgstr "«%s»: lectura curta"
#: help.c:179
#, c-format
msgid "available git commands in '%s'"
-msgstr "ordres de git disponibles en '%s'"
+msgstr "ordres de git disponibles en «%s»"
#: help.c:186
msgid "git commands available from elsewhere on your $PATH"
@@ -1936,7 +1958,7 @@
"'%s' appears to be a git command, but we were not\n"
"able to execute it. Maybe git-%s is broken?"
msgstr ""
-"'%s' sembla una ordre de git, però no hem pogut\n"
+"«%s» sembla una ordre de git, però no hem pogut\n"
"executar-la. Pot ser que git-%s estigui malmès?"
#: help.c:336
@@ -1944,27 +1966,25 @@
msgstr "Ai. El vostre sistema no informa de cap ordre de Git."
#: help.c:358
-#, fuzzy, c-format
+#, 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.\n"
-"S'està continuant sota l'assumpció que volíeu dir '%s'"
+"ADVERTÈNCIA: Heu invocat una ordre de Git amb nom «%s», la qual no existeix."
#: help.c:363
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr ""
+msgstr "El procés continuarà, pressuposant que volíeu dir «%s»."
#: help.c:368
#, c-format
msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
-msgstr ""
+msgstr "El procés continuarà en %0.1f segons, pressuposant que volíeu dir «%s»."
#: help.c:376
#, 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'."
+msgstr "git: «%s» no és una ordre de git. Vegeu 'git --help'."
#: help.c:380
msgid ""
@@ -1974,7 +1994,11 @@
"\n"
"The most similar commands are"
msgstr[0] ""
+"\n"
+"L'ordre més similar és"
msgstr[1] ""
+"\n"
+"Les ordres més similar són"
#: help.c:395
msgid "git version [<options>]"
@@ -2014,7 +2038,7 @@
"\n"
msgstr ""
"\n"
-"*** Si us plau, digueu-me qui sou.\n"
+"*** Digueu-me qui sou.\n"
"\n"
"Executeu\n"
"\n"
@@ -2034,8 +2058,7 @@
#, c-format
msgid "unable to auto-detect email address (got '%s')"
msgstr ""
-"no s'ha pogut detectar automàticament una adreça de correu vàlida ('%s' "
-"rebut)"
+"no s'ha pogut detectar automàticament una adreça electrònica vàlida (s'ha rebut «%s»)"
#: ident.c:381
msgid "no name was given and auto-detection is disabled"
@@ -2045,24 +2068,24 @@
#: ident.c:387
#, c-format
msgid "unable to auto-detect name (got '%s')"
-msgstr "no s'ha pogut detectar automàticament el nom ('%s' rebut)"
+msgstr "no s'ha pogut detectar automàticament el nom (s'ha rebut «%s»)"
#: ident.c:395
#, c-format
msgid "empty ident name (for <%s>) not allowed"
-msgstr ""
+msgstr "nom d'identitat buit (per <%s>) no és permès"
#: ident.c:401
#, c-format
msgid "name consists only of disallowed characters: %s"
-msgstr ""
+msgstr "el nom conté només caràcters no permesos: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "format de data no vàlid: %s"
-#: lockfile.c:152
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2076,13 +2099,13 @@
"No s'ha pogut crear '%s.lock': %s.\n"
"\n"
"Sembla que un altre procés de git s'està executant en aquest\n"
-"dipòsit, per exemple, un editor obert per 'git commit'. Si us\n"
-"plau, assegureu-vos que tots els processos s'hagin terminat i\n"
+"dipòsit, per exemple, un editor obert per 'git commit'. \n"
+"Assegureu-vos que tots els processos s'hagin terminat i\n"
"llavors proveu de nou. Si encara falla, pot ser que un procés de\n"
-"git ha tingut una pana:\n"
+"git ha tingut un error:\n"
"elimineu el fitxer manualment per a continuar."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "No s'ha pogut crear '%s.lock': %s"
@@ -2091,78 +2114,78 @@
msgid "failed to read the cache"
msgstr "s'ha produït un error en llegir la memòria cau"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:96 builtin/am.c:1978 builtin/am.c:2013 builtin/checkout.c:380
+#: builtin/checkout.c:595 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "no s'ha pogut escriure un fitxer d'índex nou"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(comissió errònia)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
-msgstr "addinfo_cache ha fallat per al camí '%s'"
+msgstr "addinfo_cache ha fallat per al camí «%s»"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "error en construir arbres"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
-msgstr "s'ha produït un error en crear el camí '%s'%s"
+msgstr "s'ha produït un error en crear el camí «%s»%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": potser un conflicte D/F?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
-msgstr "s'està refusant perdre el fitxer no seguit a '%s'"
+msgstr "s'està refusant perdre el fitxer no seguit a «%s»"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
-msgstr "no es pot llegir l'objecte %s '%s'"
-
-#: merge-recursive.c:806
-#, c-format
-msgid "blob expected for %s '%s'"
-msgstr "blob esperat per a %s '%s'"
+msgstr "no es pot llegir l'objecte %s «%s»"
#: merge-recursive.c:830
#, c-format
-msgid "failed to open '%s': %s"
-msgstr "s'ha produït un error en obrir '%s': %s"
+msgid "blob expected for %s '%s'"
+msgstr "blob esperat per a %s «%s»"
-#: merge-recursive.c:841
+#: merge-recursive.c:854
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "s'ha produït un error en obrir «%s»: %s"
+
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
-msgstr "s'ha produït un error en fer l'enllaç simbòlic '%s': %s"
+msgstr "s'ha produït un error en fer l'enllaç simbòlic «%s»: %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
-msgstr "no se sap què fer amb %06o %s '%s'"
+msgstr "no se sap què fer amb %06o %s «%s»"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "S'ha produït un error en executar la fusió interna"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "No s'ha pogut afegir %s a la base de dades"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2171,7 +2194,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:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2180,7 +2203,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:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2189,7 +2212,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:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2198,20 +2221,20 @@
"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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "canvi de nom"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "canviat de nom"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, 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:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2220,143 +2243,143 @@
"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:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (deixat sense resolució)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "S'està canviant el nom de %s a %s i %s a %s en lloc d'això"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLICTE (canvi de nom/afegiment): Canvi de nom %s->%s en %s. %s afegit en "
"%s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "S'està afegint %s fusionat"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "S'està afegint com a %s en lloc d'això"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "no es pot llegir l'objecte %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "l'objecte %s no és un blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "modificació"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "modificat"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "contingut"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "afegiment/afegiment"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, 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:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "S'està autofusionant %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:944
msgid "submodule"
msgstr "submòdul"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLICTE (%s): Conflicte de fusió en %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "S'està eliminant %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "fitxer/directori"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "directori/fitxer"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1908
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
"CONFLICTE (%s): Hi ha un directori amb nom %s en %s. S'està afegint %s com a "
"%s"
-#: merge-recursive.c:1893
+#: merge-recursive.c:1917
#, c-format
msgid "Adding %s"
msgstr "S'està afegint %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1954
+msgid "Already up to date!"
msgstr "Ja està al dia!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1963
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "la fusió dels arbres %s i %s ha fallat"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2060
msgid "Merging:"
-msgstr "Fusionant:"
+msgstr "S'està fusionant:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2073
#, 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:2074
+#: merge-recursive.c:2112
msgid "merge returned no commit"
msgstr "la fusió no ha retornat cap comissió"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2175
#, c-format
msgid "Could not parse object '%s'"
-msgstr "No s'ha pogut analitzar l'objecte '%s'"
+msgstr "No s'ha pogut analitzar l'objecte «%s»"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2189 builtin/merge.c:655 builtin/merge.c:814
msgid "Unable to write index."
msgstr "No s'ha pogut escriure l'índex."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2364,10 +2387,10 @@
"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"
-"Si us plau, useu 'git notes merge --commit' o 'git notes merge --abort' per "
+"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:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "No heu conclòs la vostra fusió de notes (%s existeix)."
@@ -2379,7 +2402,7 @@
#: notes-utils.c:101
#, c-format
msgid "Bad notes.rewriteMode value: '%s'"
-msgstr "Valor de notes.rewriteMode erroni: '%s'"
+msgstr "Valor de notes.rewriteMode erroni: «%s»"
#: notes-utils.c:111
#, c-format
@@ -2393,18 +2416,34 @@
#: notes-utils.c:141
#, c-format
msgid "Bad %s value: '%s'"
-msgstr "Valor erroni de %s: '%s'"
+msgstr "Valor erroni de %s: «%s»"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "no s'ha pogut analitzar l'objecte: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
+
+#: packfile.c:1683
+#, 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:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+"desplaçament més enllà de la fi d'índex de paquet per a %s (índex truncat?)"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "ús: %s"
@@ -2412,26 +2451,26 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " o: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
#: parse-options-cb.c:108
#, c-format
msgid "malformed object name '%s'"
-msgstr "nom d'objecte mal format '%s'"
+msgstr "nom d'objecte mal format «%s»"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "No s'ha pogut fer %s escrivible pel grup"
@@ -2444,7 +2483,7 @@
#: pathspec.c:147
msgid "Only one 'attr:' specification is allowed."
-msgstr "només es permet una especificació 'attr:'."
+msgstr "Només es permet una especificació 'attr:'."
#: pathspec.c:150
msgid "attr spec must not be empty"
@@ -2458,7 +2497,7 @@
#: pathspec.c:258
msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
msgstr ""
-"els ajusts d'especificació de camí 'glob' i 'noglob' globals són "
+"els paràmetres d'especificació de camí 'glob' i 'noglob' globals són "
"incompatibles"
#: pathspec.c:265
@@ -2466,8 +2505,8 @@
"global 'literal' pathspec setting is incompatible with all other global "
"pathspec settings"
msgstr ""
-"l'ajust d'especificació de camí 'literal' global és incompatible amb tots "
-"els altres ajusts d'especificació de camí globals"
+"el paràmetre d'especificació de camí 'literal' global és incompatible amb "
+"tots els altres paràmetres d'especificació de camí globals"
#: pathspec.c:305
msgid "invalid parameter for pathspec magic 'prefix'"
@@ -2476,17 +2515,17 @@
#: pathspec.c:326
#, c-format
msgid "Invalid pathspec magic '%.*s' in '%s'"
-msgstr "Màgia d'especificació de camí no vàlida '%.*s' en '%s'"
+msgstr "Màgia d'especificació de camí no vàlida '%.*s' en «%s»"
#: pathspec.c:331
#, 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'"
+msgstr "')' mancant al final de la màgia d'especificació de camí en «%s»"
#: pathspec.c:369
#, c-format
msgid "Unimplemented pathspec magic '%c' in '%s'"
-msgstr "Màgia d'especificació de camí no implementada '%c' en '%s'"
+msgstr "Màgia d'especificació de camí no implementada '%c' en «%s»"
#: pathspec.c:428
#, c-format
@@ -2496,12 +2535,12 @@
#: pathspec.c:441
#, c-format
msgid "%s: '%s' is outside repository"
-msgstr "%s: '%s' és fora del dipòsit"
+msgstr "%s: «%s» és fora del dipòsit"
#: pathspec.c:515
#, c-format
msgid "'%s' (mnemonic: '%c')"
-msgstr "'%s' (mnemònic: '%c')"
+msgstr "«%s» (mnemònic: '%c')"
#: pathspec.c:525
#, c-format
@@ -2509,21 +2548,21 @@
msgstr ""
"%s: aquesta ordre no està admesa amb la màgia d'especificació de camí: %s"
-#: pathspec.c:575
+#: pathspec.c:571
msgid ""
"empty strings as pathspecs will be made invalid in upcoming releases. please "
"use . instead if you meant to match all paths"
msgstr ""
"es faran no vàlides les cadenes buides com especificacions de camí en "
-"versions futures. Si us plau, useu . en lloc d'això si volíeu coincidir amb "
+"versions futures. Useu . en lloc d'això si volíeu coincidir amb "
"tots els camins"
-#: pathspec.c:599
+#: pathspec.c:595
#, 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"
+msgstr "l'especificació de camí «%s» és més enllà d'un enllaç simbòlic"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "no s'ha pogut analitzar el format --pretty"
@@ -2545,49 +2584,50 @@
"GIT_INDEX_VERSION està establerta, però el valor no és vàlid.\n"
"S'està usant la versió %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2316 builtin/merge.c:1046
#, c-format
msgid "could not close '%s'"
-msgstr "no s'ha pogut tancar '%s'"
+msgstr "no s'ha pogut tancar «%s»"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2394 sequencer.c:1355 sequencer.c:2077
#, c-format
msgid "could not stat '%s'"
-msgstr "no s'ha pogut fer stat a '%s'"
+msgstr "no s'ha pogut fer stat a «%s»"
-#: read-cache.c:2396
+#: read-cache.c:2407
#, c-format
msgid "unable to open git dir: %s"
msgstr "no s'ha pogut obrir el directori git: %s"
-#: read-cache.c:2408
+#: read-cache.c:2419
#, c-format
msgid "unable to unlink: %s"
msgstr "no s'ha pogut desenllaçar: %s"
-#: refs.c:622
+#: refs.c:638
#, c-format
msgid "Could not open '%s' for writing"
-msgstr "No s'ha pogut obrir '%s' per a escriptura"
+msgstr "No s'ha pogut obrir «%s» per a escriptura"
-#: refs.c:1769
+#: refs.c:1792
msgid "ref updates forbidden inside quarantine environment"
-msgstr ""
+msgstr "no està permès actualitzar les referències en un entorn de quarantena"
-#: refs/files-backend.c:1664
+#: refs/files-backend.c:1136
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no s'ha pogut eliminar la referència %s"
+
+#: refs/files-backend.c:1150 refs/packed-backend.c:1430
+#: refs/packed-backend.c:1440
#, c-format
msgid "could not delete reference %s: %s"
msgstr "no s'ha pogut suprimir la referència %s: %s"
-#: refs/files-backend.c:1667
+#: refs/files-backend.c:1153 refs/packed-backend.c:1443
#, c-format
msgid "could not delete references: %s"
-msgstr "no s'ha pogut suprimir les referències: %s"
-
-#: refs/files-backend.c:1676
-#, c-format
-msgid "could not remove reference %s"
-msgstr "no s'ha pogut eliminar la referència %s"
+msgstr "no s'han pogut suprimir les referències: %s"
#: ref-filter.c:35 wt-status.c:1811
msgid "gone"
@@ -2618,147 +2658,147 @@
msgid "unrecognized color: %%(color:%s)"
msgstr "color no reconegut: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:127
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "valor enter esperat pel nom de referència:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:131
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "valor enter esperat pel nom de referència:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:133
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "paràmetre %%(%s) desconegut: %s"
-#: ref-filter.c:167
+#: ref-filter.c:173
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) no accepta paràmetres"
-#: ref-filter.c:174
+#: ref-filter.c:180
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) no accepta paràmetres"
-#: ref-filter.c:181
+#: ref-filter.c:198
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) no accepta paràmetres"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "paràmetre %%(trailers) desconegut: %s"
-#: ref-filter.c:200
+#: ref-filter.c:221
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valor positiu esperat conté:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:223
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "paràmetre %%(contents) no reconegut: %s"
-#: ref-filter.c:215
+#: ref-filter.c:236
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valor positiu esperat nom d'objecte:curt=%s"
-#: ref-filter.c:219
+#: ref-filter.c:240
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "paràmetre %%(objectname) no reconegut: %s"
-#: ref-filter.c:246
+#: ref-filter.c:267
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format esperat: %%(align:<amplada>,<posició>)"
-#: ref-filter.c:258
+#: ref-filter.c:279
#, c-format
msgid "unrecognized position:%s"
msgstr "posició no reconeguda:%s"
-#: ref-filter.c:262
+#: ref-filter.c:283
#, c-format
msgid "unrecognized width:%s"
msgstr "amplada no reconeguda:%s"
-#: ref-filter.c:268
+#: ref-filter.c:289
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "paràmetre %%(align) no reconegut: %s"
-#: ref-filter.c:272
+#: ref-filter.c:293
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "amplada positiva esperada amb l'àtom %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:308
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "paràmetre %%(if) no reconegut: %s"
-#: ref-filter.c:378
+#: ref-filter.c:398
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de camp mal format: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:424
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de camp desconegut: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:536
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: s'ha usat l'àtom %%(if) sense un àtom %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:596
#, 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:570
+#: ref-filter.c:598
#, 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:572
+#: ref-filter.c:600
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: s'ha usat l'àtom %%(then) després de %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:626
#, 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:600
+#: ref-filter.c:628
#, 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:602
+#: ref-filter.c:630
#, 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:615
+#: ref-filter.c:643
#, 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:670
+#: ref-filter.c:698
#, c-format
msgid "malformed format string %s"
msgstr "cadena de format mal format %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1283
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(cap branca, s'està fent «rebase» %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1286
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(cap branca, bisecció començada en %s)"
@@ -2766,7 +2806,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1294
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD separat a %s)"
@@ -2774,116 +2814,116 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1301
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD separat de %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1305
msgid "(no branch)"
msgstr "(cap branca)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1454 ref-filter.c:1485
#, c-format
msgid "missing object %s for %s"
msgstr "manca l'objecte %s per a %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1457 ref-filter.c:1488
#, 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:1760
+#: ref-filter.c:1788
#, c-format
msgid "malformed object at '%s'"
-msgstr "objecte mal format a '%s'"
+msgstr "objecte mal format a «%s»"
-#: ref-filter.c:1827
+#: ref-filter.c:1855
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "s'està ignorant la referència amb nom malmès %s"
-#: ref-filter.c:1832
+#: ref-filter.c:1860
#, c-format
msgid "ignoring broken ref %s"
msgstr "s'està ignorant la referència trencada %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2122
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: manca l'àtom %%(end)"
-#: ref-filter.c:2176
+#: ref-filter.c:2216
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objecte %s mal format"
-#: remote.c:747
+#: remote.c:750
#, 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:751
+#: remote.c:754
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s generalment segueix %s, no %s"
-#: remote.c:755
+#: remote.c:758
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s segueix ambdós %s i %s"
-#: remote.c:763
+#: remote.c:766
msgid "Internal error"
msgstr "Error intern"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1681 remote.c:1783
msgid "HEAD does not point to a branch"
msgstr "HEAD no assenyala cap branca"
-#: remote.c:1689
+#: remote.c:1690
#, c-format
msgid "no such branch: '%s'"
-msgstr "no hi ha tal branca: '%s'"
+msgstr "no hi ha tal branca: «%s»"
-#: remote.c:1692
+#: remote.c:1693
#, c-format
msgid "no upstream configured for branch '%s'"
-msgstr "cap font configurada per a la branca '%s'"
+msgstr "cap font configurada per a la branca «%s»"
-#: remote.c:1698
+#: remote.c:1699
#, 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"
+msgstr "la branca font «%s» no s'emmagatzema com a branca amb seguiment remot"
-#: remote.c:1713
+#: remote.c:1714
#, 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:1725
+#: remote.c:1726
#, c-format
msgid "branch '%s' has no remote for pushing"
-msgstr "la branca '%s' no té cap remot al qual pujar"
+msgstr "la branca «%s» no té cap remot al qual pujar"
-#: remote.c:1736
+#: remote.c:1737
#, 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 «%s» no inclouen «%s»"
-#: remote.c:1749
+#: remote.c:1750
msgid "push has no destination (push.default is 'nothing')"
msgstr "push no té destí (push.default és 'nothing')"
-#: remote.c:1771
+#: remote.c:1772
msgid "cannot resolve 'simple' push to a single destination"
msgstr "no es pot resoldre una pujada 'simple' a un sol destí"
#: remote.c:2076
#, 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"
+msgstr "La vostra branca està basada en «%s», però la font no hi és.\n"
#: remote.c:2080
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
@@ -2891,15 +2931,15 @@
#: remote.c:2083
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "La vostra branca està al dia amb '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "La vostra branca està al dia amb «%s».\n"
#: remote.c:2087
#, 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à davant de '%s' per %d comissió.\n"
-msgstr[1] "La vostra branca està davant de '%s' per %d comissions.\n"
+msgstr[0] "La vostra branca està davant de «%s» per %d comissió.\n"
+msgstr[1] "La vostra branca està davant de «%s» per %d comissions.\n"
#: remote.c:2093
msgid " (use \"git push\" to publish your local commits)\n"
@@ -2911,10 +2951,10 @@
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] ""
-"La vostra branca està darrere de '%s' per %d comissió, i pot avançar-se "
+"La vostra branca està darrere de «%s» per %d comissió, i pot avançar-se "
"ràpidament.\n"
msgstr[1] ""
-"La vostra branca està darrere de '%s' per %d comissions, i pot avançar-se "
+"La vostra branca està darrere de «%s» per %d comissions, i pot avançar-se "
"ràpidament.\n"
#: remote.c:2104
@@ -2930,26 +2970,26 @@
"Your branch and '%s' have diverged,\n"
"and have %d and %d different commits each, respectively.\n"
msgstr[0] ""
-"La vostra branca i '%s' han divergit,\n"
+"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissió distinta cada una, respectivament.\n"
msgstr[1] ""
-"La vostra branca i '%s' han divergit,\n"
+"La vostra branca i «%s» han divergit,\n"
"i tenen %d i %d comissions distintes cada una, respectivament.\n"
#: remote.c:2117
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (useu \"git pull\" per a fusionar la branca remota a la vostra)\n"
-#: revision.c:2187
+#: revision.c:2256
msgid "your current branch appears to be broken"
msgstr "la vostra branca actual sembla malmesa"
-#: revision.c:2190
+#: revision.c:2259
#, c-format
msgid "your current branch '%s' does not have any commits yet"
-msgstr "la vostra branca actual '%s' encara no té cap comissió"
+msgstr "la branca actual «%s» encara no té cap comissió"
-#: revision.c:2384
+#: revision.c:2453
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent és incompatible amb --bisect"
@@ -2991,24 +3031,24 @@
msgid "the receiving end does not support push options"
msgstr "el destí receptor no admet opcions de pujada"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revertir"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Acció desconeguda: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -3016,7 +3056,7 @@
"després de resoldre els conflictes, marqueu els camins\n"
"corregits amb 'git add <camins>' o 'git rm <camins>'"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3026,42 +3066,43 @@
"corregits amb 'git add <camins>' o 'git rm <camins>'\n"
"i cometeu el resultat amb 'git commit'"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1704
#, c-format
msgid "could not lock '%s'"
-msgstr "no s'ha pogut bloquejar '%s'"
+msgstr "no s'ha pogut bloquejar «%s»"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1581 sequencer.c:1709 sequencer.c:1723
+#: sequencer.c:2733 sequencer.c:2749
#, c-format
msgid "could not write to '%s'"
-msgstr "no s'ha pogut escriure a '%s'"
+msgstr "no s'ha pogut escriure a «%s»"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
-msgstr "no s'ha pogut escriure el terminador de línia a '%s'"
+msgstr "no s'ha pogut escriure el terminador de línia a «%s»"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1586 sequencer.c:1711
#, c-format
msgid "failed to finalize '%s'."
-msgstr "s'ha produït un error en finalitzar '%s'."
+msgstr "s'ha produït un error en finalitzar «%s»."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:819 sequencer.c:1607 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1044
#, c-format
msgid "could not read '%s'"
-msgstr "no s'ha pogut llegir '%s'"
+msgstr "no s'ha pogut llegir «%s»"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "els vostres canvis locals se sobreescriurien per %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
-msgstr "cometeu els vostres canvis o emmagatzemeu-los per a procedir."
+msgstr "cometeu els vostres canvis o feu un «stash» per a procedir."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: avanç ràpid"
@@ -3069,20 +3110,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:474
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: No s'ha pogut escriure un fitxer d'índex nou"
-#: sequencer.c:491
+#: sequencer.c:493
msgid "could not resolve HEAD commit\n"
msgstr "no s'ha pogut resoldre la comissió HEAD\n"
-#: sequencer.c:511
+#: sequencer.c:513
msgid "unable to update cache tree\n"
msgstr "no s'ha pogut actualitzar l'arbre cau\n"
-#: sequencer.c:595
+#: sequencer.c:597
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3112,17 +3153,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
+#: sequencer.c:699
#, c-format
msgid "could not parse commit %s\n"
msgstr "no s'ha pogut analitzar la comissió %s\n"
-#: sequencer.c:702
+#: sequencer.c:704
#, c-format
msgid "could not parse parent commit %s\n"
msgstr "no s'ha pogut analitzar la comissió pare %s\n"
-#: sequencer.c:824
+#: sequencer.c:826
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3133,7 +3174,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:832
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3144,230 +3185,231 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:838 sequencer.c:863
#, c-format
msgid "This is a combination of %d commits."
msgstr "Això és una combinació de %d comissions."
-#: sequencer.c:845
+#: sequencer.c:847 sequencer.c:2681
msgid "need a HEAD to fixup"
msgstr "cal un HEAD per reparar-ho"
-#: sequencer.c:847
+#: sequencer.c:849
msgid "could not read HEAD"
msgstr "no s'ha pogut llegir HEAD"
-#: sequencer.c:849
+#: sequencer.c:851
msgid "could not read HEAD's commit message"
msgstr "no s'ha pogut llegir el missatge de comissió de HEAD"
-#: sequencer.c:855
+#: sequencer.c:857
#, c-format
msgid "cannot write '%s'"
-msgstr "no es pot escriure '%s'"
+msgstr "no es pot escriure «%s»"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:866 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Aquest és el 1r missatge de comissió:"
-#: sequencer.c:872
+#: sequencer.c:874
#, c-format
msgid "could not read commit message of %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: sequencer.c:879
+#: sequencer.c:881
#, c-format
msgid "This is the commit message #%d:"
msgstr "Aquest és el missatge de comissió #%d:"
-#: sequencer.c:884
+#: sequencer.c:886
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "El missatge de comissió núm. #%d s'ometrà:"
-#: sequencer.c:889
+#: sequencer.c:891
#, c-format
msgid "unknown command: %d"
msgstr "ordre desconeguda: %d"
-#: sequencer.c:955
+#: sequencer.c:957
msgid "your index file is unmerged."
msgstr "el vostre fitxer d'índex està sense fusionar."
-#: sequencer.c:973
+#: sequencer.c:975
#, 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:981
+#: sequencer.c:983
#, c-format
msgid "commit %s does not have parent %d"
msgstr "la comissió %s no té pare %d"
-#: sequencer.c:985
+#: sequencer.c:987
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"s'ha especificat la línia principal però la comissió %s no és una fusió."
-#: sequencer.c:991
+#: sequencer.c:993
#, 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:1012
+#: sequencer.c:1014
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: no es pot analitzar la comissió pare %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1077 sequencer.c:1853
#, c-format
msgid "could not rename '%s' to '%s'"
-msgstr "no s'ha pogut canviar el nom '%s' a '%s'"
+msgstr "no s'ha pogut canviar el nom «%s» a «%s»"
-#: sequencer.c:1126
+#: sequencer.c:1128
#, c-format
msgid "could not revert %s... %s"
msgstr "no s'ha pogut revertir %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1129
#, c-format
msgid "could not apply %s... %s"
msgstr "no s'ha pogut aplicar %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1171
msgid "empty commit set passed"
msgstr "conjunt de comissions buit passat"
-#: sequencer.c:1179
+#: sequencer.c:1181
#, 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:1186
+#: sequencer.c:1188
#, 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:1306
+#: sequencer.c:1308
#, c-format
msgid "invalid line %d: %.*s"
msgstr "línia no vàlida %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1316
#, c-format
msgid "cannot '%s' without a previous commit"
-msgstr "No es pot '%s' sense una comissió prèvia"
+msgstr "No es pot «%s» sense una comissió prèvia"
-#: sequencer.c:1347
+#: sequencer.c:1349 sequencer.c:2503 sequencer.c:2588 sequencer.c:2614
+#: sequencer.c:2691 sequencer.c:2810 sequencer.c:2951
#, c-format
msgid "could not read '%s'."
-msgstr "no s'ha pogut llegir '%s'."
-
-#: sequencer.c:1359
-msgid "please fix this using 'git rebase --edit-todo'."
-msgstr "si us plau, corregiu-ho això usant 'git rebase --edit-todo'."
+msgstr "no s'ha pogut llegir «%s»."
#: sequencer.c:1361
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "corregiu-ho usant «git rebase --edit-todo»."
+
+#: sequencer.c:1363
#, c-format
msgid "unusable instruction sheet: '%s'"
-msgstr "full d'instruccions inusable: '%s'"
+msgstr "full d'instruccions inusable: «%s»"
-#: sequencer.c:1366
+#: sequencer.c:1368
msgid "no commits parsed."
msgstr "no s'ha analitzat cap comissió."
-#: sequencer.c:1377
+#: sequencer.c:1379
msgid "cannot cherry-pick during a revert."
msgstr "no es pot fer «cherry pick» durant una reversió."
-#: sequencer.c:1379
+#: sequencer.c:1381
msgid "cannot revert during a cherry-pick."
msgstr "no es pot revertir durant un «cherry pick»."
-#: sequencer.c:1442
+#: sequencer.c:1448
#, c-format
msgid "invalid key: %s"
msgstr "clau no vàlida: %s"
-#: sequencer.c:1445
+#: sequencer.c:1451
#, c-format
msgid "invalid value for %s: %s"
msgstr "valor no vàlid per a %s: %s"
-#: sequencer.c:1502
+#: sequencer.c:1517
#, c-format
msgid "malformed options sheet: '%s'"
-msgstr "full d'opcions mal format: '%s'"
+msgstr "full d'opcions mal format: «%s»"
-#: sequencer.c:1540
+#: sequencer.c:1555
msgid "a cherry-pick or revert is already in progress"
msgstr "un «cherry pick» o una reversió ja està en curs"
-#: sequencer.c:1541
+#: sequencer.c:1556
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "intenteu \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1559
#, c-format
msgid "could not create sequencer directory '%s'"
-msgstr "no s'ha pogut crear el directori de seqüenciador '%s'"
+msgstr "no s'ha pogut crear el directori de seqüenciador «%s»"
-#: sequencer.c:1558
+#: sequencer.c:1574
msgid "could not lock HEAD"
msgstr "no s'ha pogut bloquejar HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1632 sequencer.c:2211
msgid "no cherry-pick or revert in progress"
msgstr "ni hi ha cap «cherry pick» ni cap reversió en curs"
-#: sequencer.c:1616
+#: sequencer.c:1634
msgid "cannot resolve HEAD"
msgstr "no es pot resoldre HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1636 sequencer.c:1671
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:1638 builtin/grep.c:929
+#: sequencer.c:1657 builtin/grep.c:711
#, c-format
msgid "cannot open '%s'"
-msgstr "no es pot obrir '%s'"
+msgstr "no es pot obrir «%s»"
-#: sequencer.c:1640
+#: sequencer.c:1659
#, c-format
msgid "cannot read '%s': %s"
-msgstr "no es pot llegir '%s': %s"
+msgstr "no es pot llegir «%s»: %s"
-#: sequencer.c:1641
+#: sequencer.c:1660
msgid "unexpected end of file"
msgstr "final de fitxer inesperat"
-#: sequencer.c:1647
+#: sequencer.c:1666
#, 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"
+msgstr "el fitxer HEAD emmagatzemat abans de fer «cherry pick» «%s» és malmès"
-#: sequencer.c:1658
+#: sequencer.c:1677
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:1795 sequencer.c:2086
+#: sequencer.c:1818 sequencer.c:2109
msgid "cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1858 builtin/difftool.c:640
#, c-format
msgid "could not copy '%s' to '%s'"
-msgstr "no s'ha pogut copiar '%s' a '%s'"
+msgstr "no s'ha pogut copiar «%s» a «%s»"
-#: sequencer.c:1851
+#: sequencer.c:1874
msgid "could not read index"
msgstr "no s'ha pogut llegir l'índex"
-#: sequencer.c:1856
+#: sequencer.c:1879
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3382,11 +3424,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1885
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:1868
+#: sequencer.c:1891
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3396,111 +3438,199 @@
" git rebase --continue\n"
"\n"
msgstr ""
-"L'execució ha tingut èxit: %s\n"
+"l'execució ha tingut èxit: %s\n"
"però ha deixat canvis a l'índex i/o l'arbre de treball\n"
-"Cometeu o emmagatzemeu els vostres canvis, i llavors executeu\n"
+"Cometeu o feu «stash» dels vostres canvis, i llavors executeu\n"
"\n"
" git rebase --continue\n"
-#: sequencer.c:1925
-#, fuzzy, c-format
+#: sequencer.c:1948
+#, c-format
msgid "Applied autostash.\n"
-msgstr "S'ha aplicat el magatzem automàtic."
+msgstr "S'ha aplicat el «stash» automàticament.\n"
-#: sequencer.c:1937
+#: sequencer.c:1960
#, c-format
msgid "cannot store %s"
msgstr "no es pot emmagatzemar %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1963 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
"Your changes are safe in the stash.\n"
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-"L'aplicació del magatzem automàtic ha resultat en conflictes.\n"
-"Els vostres canvis estan segurs en el magatzem.\n"
+"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"
-#: sequencer.c:2022
+#: sequencer.c:2045
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Aturat a %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2087
#, c-format
msgid "unknown command %d"
msgstr "ordre %d desconeguda"
-#: sequencer.c:2094
+#: sequencer.c:2117
msgid "could not read orig-head"
msgstr "No s'ha pogut llegir orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2122 sequencer.c:2678
msgid "could not read 'onto'"
msgstr "no s'ha pogut llegir 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2129
#, c-format
msgid "could not update %s"
-msgstr "no s'ha pogut analitzar %s"
+msgstr "no s'ha pogut actualitzar %s"
-#: sequencer.c:2113
+#: sequencer.c:2136
#, c-format
msgid "could not update HEAD to %s"
msgstr "no s'ha pogut actualitzar HEAD a %s"
-#: sequencer.c:2197
+#: sequencer.c:2220
msgid "cannot rebase: You have unstaged changes."
msgstr "No es pot fer «rebase»: teniu canvis «unstaged»."
-#: sequencer.c:2202
+#: sequencer.c:2225
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2234
msgid "cannot amend non-existing commit"
msgstr "no es pot esmenar una comissió no existent"
-#: sequencer.c:2213
+#: sequencer.c:2236
#, c-format
msgid "invalid file: '%s'"
-msgstr "fitxer no vàlid: '%s'"
+msgstr "fitxer no vàlid: «%s»"
-#: sequencer.c:2215
+#: sequencer.c:2238
#, c-format
msgid "invalid contents: '%s'"
-msgstr "contingut no vàlid: '%s'"
+msgstr "contingut no vàlid: «%s»"
-#: sequencer.c:2218
+#: sequencer.c:2241
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
"\n"
-"Teniu canvis no comesos en el vostre arbre de treball. Si us plau,\n"
-"primer cometeu-los i després executeu 'git rebase --continue' de nou."
+"Teniu canvis no comesos en el vostre arbre de treball. \n"
+"Primer cometeu-los i després executeu 'git rebase --continue' de nou."
-#: sequencer.c:2228
+#: sequencer.c:2251
msgid "could not commit staged changes."
-msgstr "No s'ha pogut cometre els canvis «staged»."
+msgstr "No s'han pogut cometre els canvis «staged»."
-#: sequencer.c:2308
+#: sequencer.c:2331
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: no es pot fer «cherry pick» a %s"
-#: sequencer.c:2312
+#: sequencer.c:2335
#, c-format
msgid "%s: bad revision"
-msgstr "%s: revisió dolenta"
+msgstr "%s: revisió incorrecta"
-#: sequencer.c:2345
+#: sequencer.c:2368
msgid "can't revert as initial commit"
msgstr "no es pot revertir com a comissió inicial"
+#: sequencer.c:2471
+msgid "make_script: unhandled options"
+msgstr "make_script: opcions no gestionades"
+
+#: sequencer.c:2474
+msgid "make_script: error preparing revisions"
+msgstr "make_script: s'ha produït un error en preparar les revisions"
+
+#: sequencer.c:2510
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "llista per a fer inestable: «%s»"
+
+#: sequencer.c:2516
+#, c-format
+msgid "unable to open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: sequencer.c:2561
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"No s'ha reconegut el paràmetre %s per rebase.missingCommitsCheck. "
+"S'està ignorant."
+
+#: sequencer.c:2641
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Advertència: pot ser que algunes comissions s'hagin descartat "
+"accidentalment.\n"
+"Les comissions descartades (més nova a més vella):\n"
+
+#: sequencer.c:2648
+#, 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 ""
+"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"
+"Els comportaments possibles són: ignore, warn, error.\n"
+
+#: sequencer.c:2660
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
+"continue'.\n"
+
+#: sequencer.c:2708
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "no s'ha pogut analitzar la comissió «%s»"
+
+#: sequencer.c:2727 sequencer.c:2742 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:775
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no s'ha pogut obrir «%s» per a escriptura"
+
+#: sequencer.c:2756
+#, c-format
+msgid "could not truncate '%s'"
+msgstr "no s'ha pogut truncar a «%s»"
+
+#: sequencer.c:2848
+msgid "the script was already rearranged."
+msgstr "l'script ja estava endreçat."
+
+#: sequencer.c:2953
+#, c-format
+msgid "could not finish '%s'"
+msgstr "no s'ha pogut finalitzar «%s»"
+
#: setup.c:171
#, c-format
msgid ""
@@ -3518,7 +3648,7 @@
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"paràmetre ambigu '%s': revisió no coneguda o camí no en l'arbre de treball.\n"
+"paràmetre ambigu «%s»: revisió no coneguda o camí no en l'arbre de treball.\n"
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
@@ -3529,38 +3659,38 @@
"Use '--' to separate paths from revisions, like this:\n"
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-"paràmetre ambigu '%s': ambdós una revisió i un nom de fitxer\n"
+"paràmetre ambigu «%s»: ambdós una revisió i un nom de fitxer\n"
"Useu '--' per a separar els camins de les revisions, com això:\n"
"'git <ordre> [<revisió>...] -- [<fitxer>...]'"
-#: setup.c:504
+#: setup.c:499
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "S'esperava una versió de dipòsit de git <= %d, s'ha trobat %d"
-#: setup.c:512
+#: setup.c:507
msgid "unknown repository extensions found:"
msgstr "s'han trobat extensions de dipòsit desconegudes:"
-#: setup.c:810
+#: setup.c:806
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "No és un dipòsit de git (ni cap dels directoris pares): %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:808 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "No es pot tornar al directori de treball actual"
-#: setup.c:1050
+#: setup.c:1046
msgid "Unable to read current working directory"
msgstr "No s'ha pogut llegir el directori de treball actual"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1058 setup.c:1064
#, c-format
msgid "Cannot change to '%s'"
-msgstr "No es pot canviar a '%s'"
+msgstr "No es pot canviar a «%s»"
-#: setup.c:1081
+#: setup.c:1077
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3570,7 +3700,7 @@
"S'atura a la frontera de sistema de fitxers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"no està establert)."
-#: setup.c:1173
+#: setup.c:1159
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3581,58 +3711,42 @@
"El propietari dels fitxers sempre ha de tenir permisos de lectura i "
"escriptura."
-#: sha1_file.c:560
+#: sha1_file.c:528
#, c-format
msgid "path '%s' does not exist"
-msgstr "el camí '%s' no existeix"
+msgstr "el camí «%s» no existeix"
-#: sha1_file.c:586
+#: sha1_file.c:554
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-"Encara no se suporta el dipòsit de referència '%s' com a agafament enllaçat."
+"Encara no se suporta el dipòsit de referència «%s» com a agafament enllaçat."
-#: sha1_file.c:592
+#: sha1_file.c:560
#, c-format
msgid "reference repository '%s' is not a local repository."
-msgstr "el dipòsit de referència '%s' no és un dipòsit local."
+msgstr "el dipòsit de referència «%s» no és un dipòsit local."
-#: sha1_file.c:598
+#: sha1_file.c:566
#, c-format
msgid "reference repository '%s' is shallow"
-msgstr "el dipòsit de referència '%s' és superficial"
+msgstr "el dipòsit de referència «%s» és superficial"
-#: sha1_file.c:606
+#: sha1_file.c:574
#, c-format
msgid "reference repository '%s' is grafted"
-msgstr "el dipòsit de referència '%s' és empeltat"
+msgstr "el dipòsit de referència «%s» és empeltat"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "desplaçament abans de la fi del fitxer de paquet (.idx trencat?)"
-
-#: sha1_file.c:2729
-#, 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?)"
-
-#: sha1_file.c:2733
-#, 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?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:420
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "l'SHA1 %s curt és ambigu"
-#: sha1_name.c:430
+#: sha1_name.c:431
msgid "The candidates are:"
msgstr "Els candidats són:"
-#: sha1_name.c:589
+#: sha1_name.c:590
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"
@@ -3651,188 +3765,197 @@
"\n"
" git checkout -b $br $(git rev-parse ...)\n"
"\n"
-"on \"$br\" és d'alguna manera buida i una referència de 40 caràcters\n"
-"hexadecimals. Si us plau, examineu aquestes referències i potser\n"
+"on «$br» és d'alguna manera buida i una referència de 40 caràcters\n"
+"hexadecimals. Examineu aquestes referències i potser\n"
"suprimiu-les. Desactiveu aquest missatge executant\n"
-"\"git config advice.objectNameWarning false\""
+"«git config advice.objectNameWarning false»"
-#: submodule.c:70 submodule.c:104
+#: submodule.c:93 submodule.c:127
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:74 submodule.c:108
+#: submodule.c:97 submodule.c:131
#, 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:82
+#: submodule.c:105
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "No s'ha pogut actualitzar l'entrada de .gitmodules %s"
-#: submodule.c:115
+#: submodule.c:138
#, 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:126
+#: submodule.c:149
msgid "staging updated .gitmodules failed"
msgstr "l'allistament del .gitmodules actualitzat ha fallat"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "no es permeten els valors negatius a submodule.fetchJobs"
-
-#: submodule.c:376
-#, fuzzy, c-format
+#: submodule.c:309
+#, c-format
msgid "in unpopulated submodule '%s'"
-msgstr "S'està ometent el submòdul '%s'"
+msgstr "al submòdul no populat «%s»"
-#: submodule.c:407
+#: submodule.c:340
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
-msgstr "L'especificació '%s' és en el submòdul '%.*s'"
+msgstr "L'especificació «%s» és en el submòdul «%.*s»"
-#: submodule.c:1337
+#: submodule.c:799
+#, 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:1021 builtin/branch.c:641 builtin/submodule--helper.c:1149
+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:1304
#, c-format
msgid "'%s' not recognized as a git repository"
-msgstr "'%s' no reconegut com un dipòsit git"
+msgstr "«%s» no reconegut com un dipòsit git"
-#: submodule.c:1475
+#: submodule.c:1442
#, c-format
msgid "could not start 'git status' in submodule '%s'"
-msgstr "no s'ha pogut iniciar 'git status' al submòdul '%s'"
+msgstr "no s'ha pogut iniciar «git status» al submòdul «%s»"
-#: submodule.c:1488
+#: submodule.c:1455
#, c-format
msgid "could not run 'git status' in submodule '%s'"
-msgstr "no s'ha pogut executar 'git status' al submòdul '%s'"
+msgstr "no s'ha pogut executar 'git status' al submòdul «%s»"
-#: submodule.c:1581
+#: submodule.c:1548
#, c-format
msgid "submodule '%s' has dirty index"
-msgstr "el submòdul '%s' té l'índex brut"
+msgstr "el submòdul «%s» té l'índex brut"
-#: submodule.c:1845
+#: submodule.c:1809
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-"no està admès relocate_gitdir per al submòdul '%s' amb més d'un arbre de "
+"no està admès relocate_gitdir per al submòdul «%s» amb més d'un arbre de "
"treball"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1821 submodule.c:1877
#, c-format
msgid "could not lookup name for submodule '%s'"
-msgstr "no s'ha trobat el nom pel submòdul '%s'"
+msgstr "no s'ha trobat el nom pel submòdul «%s»"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1825 builtin/submodule--helper.c:671
+#: builtin/submodule--helper.c:681
#, c-format
msgid "could not create directory '%s'"
-msgstr "no s'ha pogut crear el directori '%s'"
+msgstr "no s'ha pogut crear el directori «%s»"
-#: submodule.c:1864
+#: submodule.c:1828
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
"'%s' to\n"
"'%s'\n"
msgstr ""
-"S'està migrant el directori de '%s%s' des de\n"
-"'%s' a\n"
-"'%s'\n"
+"S'està migrant el directori de «%s%s» des de\n"
+"«%s» a\n"
+"«%s»\n"
-#: submodule.c:1948
+#: submodule.c:1912
#, c-format
msgid "could not recurse into submodule '%s'"
-msgstr "s'ha produït un error en cercar recursivament al camí de submòdul '%s'"
+msgstr "s'ha produït un error en cercar recursivament al camí de submòdul «%s»"
-#: submodule.c:1992
+#: submodule.c:1956
msgid "could not start ls-files in .."
msgstr "no s'ha pogut iniciar ls-files a .."
-#: submodule.c:2012
+#: submodule.c:1976
msgid "BUG: returned path string doesn't match cwd?"
msgstr "ERRADA: la cadena del camí retornada no coincideix amb cwd?"
-#: submodule.c:2031
+#: submodule.c:1995
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree ha retornat un codi de retorn %d no esperat"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no es permeten els valors negatius a submodule.fetchjobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "valor no vàlid per a %s"
-#: trailer.c:241
+#: trailer.c:238
#, 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 de remolc «%s» ha fallat"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
-msgstr "valor desconegut '%s' per a la clau '%s'"
+msgstr "valor desconegut «%s» per a la clau «%s»"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "més d'un %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "testimoni de remolc buit en el remolc '%.*s'"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
-msgstr "no s'ha pogut llegir el fitxer d'entrada '%s'"
+msgstr "no s'ha pogut llegir el fitxer d'entrada «%s»"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
-msgstr "no s'ha pogut llegir des d'stdin"
+msgstr "no s'ha pogut llegir des de stdin"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "no s'ha pogut fer stat a %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "el fitxer %s no és un fitxer regular"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "el fitxer %s no és gravable per l'usuari"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "no s'ha pogut obrir el fitxer temporal"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "no s'ha pogut canviar el nom del fitxer temporal a %s"
-#: transport.c:63
+#: transport.c:62
#, c-format
msgid "Would set upstream of '%s' to '%s' of '%s'\n"
-msgstr "Canviaria la font de '%s' a '%s' de '%s'\n"
+msgstr "Canviaria la font de «%s» a «%s» de «%s»\n"
-#: transport.c:152
+#: transport.c:151
#, c-format
msgid "transport: invalid depth option '%s'"
-msgstr "transport: opció de profunditat no vàlida '%s'"
+msgstr "transport: opció de profunditat no vàlida «%s»"
-#: transport.c:890
+#: transport.c:888
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3841,7 +3964,7 @@
"Els camins de submòdul següents contenen canvis que no\n"
"es poden trobar en cap remot:\n"
-#: transport.c:894
+#: transport.c:892
#, c-format
msgid ""
"\n"
@@ -3857,7 +3980,7 @@
"\n"
msgstr ""
"\n"
-"Si us plau, intenteu\n"
+"Intenteu\n"
"\n"
"\tgit push --recurse-submodules=on-demand\n"
"\n"
@@ -3867,7 +3990,7 @@
"\n"
"per a pujar-los a un remot.\n"
-#: transport.c:902
+#: transport.c:900
msgid "Aborting."
msgstr "S'està avortant."
@@ -3888,11 +4011,11 @@
msgid "empty filename in tree entry"
msgstr "nom de fitxer buit en una entrada d'arbre"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "fitxer d'arbre massa curt"
-#: unpack-trees.c:105
+#: unpack-trees.c:106
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3900,10 +4023,10 @@
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"agafar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"canviar de branca."
+"%%sCometeu els vostres canvis o feu «stash» abans de canviar de "
+"branca."
-#: unpack-trees.c:107
+#: unpack-trees.c:108
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3913,7 +4036,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:111
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3921,10 +4044,9 @@
msgstr ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per "
"fusionar:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de "
-"fusionar."
+"%%sCometeu els vostres canvis o feu «stash» abans de fusionar."
-#: unpack-trees.c:112
+#: unpack-trees.c:113
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3934,16 +4056,16 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:116
#, 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 ""
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
-"%%sSi us plau, cometeu els vostres canvis o emmagatzemeu-los abans de %s."
+"%%sCometeu els vostres canvis o feu «stash» abans de %s."
-#: unpack-trees.c:117
+#: unpack-trees.c:118
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3952,7 +4074,7 @@
"Els vostres canvis locals als fitxers següents se sobreescriurien per %s:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:123
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3961,7 +4083,7 @@
"En actualitzar els directoris següents perdria fitxers no seguits en el:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:127
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3969,9 +4091,9 @@
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
"agafar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
+"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:128
+#: unpack-trees.c:129
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3981,7 +4103,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:132
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3989,9 +4111,9 @@
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per "
"fusionar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:133
+#: unpack-trees.c:134
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4001,16 +4123,16 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:137
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de %s."
+"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:139
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4019,7 +4141,7 @@
"Els següents fitxers no seguits en l'arbre de treball s'eliminarien per %s:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:144
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4028,9 +4150,9 @@
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"agafar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de canviar de branca."
+"%%sMoveu-los o elimineu-los abans de canviar de branca."
-#: unpack-trees.c:145
+#: unpack-trees.c:146
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4041,7 +4163,7 @@
"agafar:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:149
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4049,9 +4171,9 @@
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"fusionar:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de fusionar."
+"%%sMoveu-los o elimineu-los abans de fusionar."
-#: unpack-trees.c:150
+#: unpack-trees.c:151
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4061,7 +4183,7 @@
"fusionar:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:154
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4069,9 +4191,9 @@
msgstr ""
"Els següents fitxers no seguits en l'arbre de treball se sobreescriurien per "
"%s:\n"
-"%%sSi us plau, moveu-los o elimineu-los abans de %s."
+"%%sMoveu-los o elimineu-los abans de %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:156
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4081,22 +4203,22 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:163
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
-msgstr "L'entrada '%s' encavalca amb '%s'. No es pot vincular."
+msgstr "L'entrada «%s» encavalca amb «%s». No es pot vincular."
-#: unpack-trees.c:165
+#: unpack-trees.c:166
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"No es pot actualitzar l'agafament parcial: les entrades següents no estan al "
"dia:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:168
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4107,7 +4229,7 @@
"actualitzar l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:170
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4118,7 +4240,7 @@
"l'agafament parcial:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:172
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4127,17 +4249,12 @@
"No es pot actualitzar el submòdul:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:249
#, c-format
msgid "Aborting\n"
msgstr "S'està avortant\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "el submòdul'%s' té una estratègia d'actualització no admesa"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:331
msgid "Checking out files"
msgstr "S'estan agafant fitxers"
@@ -4173,28 +4290,23 @@
#: worktree.c:245
#, c-format
msgid "failed to read '%s'"
-msgstr "s'ha produït un error en llegir '%s'"
+msgstr "s'ha produït un error en llegir «%s»"
#: wrapper.c:223 wrapper.c:393
#, c-format
msgid "could not open '%s' for reading and writing"
-msgstr "no s'ha pogut obrir '%s' per a lectura i escriptura"
+msgstr "no s'ha pogut obrir «%s» per a lectura i escriptura"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "no s'ha pogut obrir '%s' per a escriptura"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:766
+#: builtin/am.c:858 builtin/merge.c:1041
#, c-format
msgid "could not open '%s' for reading"
-msgstr "no s'ha pogut obrir '%s' per a lectura"
+msgstr "no s'ha pogut obrir «%s» per a lectura"
#: wrapper.c:424 wrapper.c:624
#, c-format
msgid "unable to access '%s'"
-msgstr "no s'ha pogut accedir a '%s'"
+msgstr "no s'ha pogut accedir a «%s»"
#: wrapper.c:632
msgid "unable to get current working directory"
@@ -4210,199 +4322,199 @@
msgid "could not close %s"
msgstr "no s'ha pogut tancar %s"
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Camins sense fusionar:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (useu \"git reset %s <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (useu \"git rm --cached <fitxer>...\" per a fer «unstage»)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (useu \"git add <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (useu \"git add/rm <fitxer>...\" segons sigui apropiat per a senyalar "
"resolució)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (useu \"git rm <fitxer>...\" per a senyalar resolució)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:979
msgid "Changes to be committed:"
msgstr "Canvis a cometre:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:988
msgid "Changes not staged for commit:"
msgstr "Canvis no «staged» per a cometre:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (useu \"git add <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (useu \"git add/rm <fitxer>...\" per a actualitzar què es cometrà)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (useu \"git checkout -- <fitxer>...\" per a descartar els canvis en el "
"directori de treball)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (cometeu o descarteu el contingut modificat o no seguit en els submòduls)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (useu \"git %s <fitxer>...\" per a incloure-ho en el qual es cometrà)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "suprimit per ambdós:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "afegit per nosaltres:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "suprimit per ells:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "afegit per ells:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "suprimit per nosaltres:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "afegit per ambdós:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "modificat per ambdós:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "fitxer nou:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "copiat:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "suprimit:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "modificat:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "canviat de nom:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "canviat de tipus:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "desconegut:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "sense fusionar:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "comissions noves, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "contingut modificat, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contingut no seguit, "
-#: wt-status.c:821
-#, fuzzy, c-format
+#: wt-status.c:819
+#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
-msgstr[0] "Actualment esteu fent «rebase»."
-msgstr[1] "Actualment esteu fent «rebase»."
+msgstr[0] "L'«stash» té actualment %d entrada"
+msgstr[1] "L'«stash» té actualment %d entrades"
-#: wt-status.c:853
+#: wt-status.c:851
msgid "Submodules changed but not updated:"
msgstr "Submòduls canviats però no actualitzats:"
-#: wt-status.c:855
+#: wt-status.c:853
msgid "Submodule changes to be committed:"
msgstr "Canvis de submòdul a cometre:"
-#: wt-status.c:937
+#: wt-status.c:935
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"No toqueu la línia a dalt.\n"
-"Tot el que hi ha a sota s'eliminarà."
+"No modifiqueu o suprimiu la línia de dalt.\n"
+"Tot el que hi ha a sota s'ignorarà."
-#: wt-status.c:1049
+#: wt-status.c:1048
msgid "You have unmerged paths."
msgstr "Teniu camins sense fusionar."
-#: wt-status.c:1052
+#: wt-status.c:1051
msgid " (fix conflicts and run \"git commit\")"
msgstr " (arregleu els conflictes i executeu \"git commit\")"
-#: wt-status.c:1054
+#: wt-status.c:1053
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (useu \"git merge --abort\" per a avortar la fusió)"
-#: wt-status.c:1059
+#: wt-status.c:1058
msgid "All conflicts fixed but you are still merging."
msgstr "Tots els conflictes estan arreglats però encara esteu fusionant."
-#: wt-status.c:1062
+#: wt-status.c:1061
msgid " (use \"git commit\" to conclude merge)"
msgstr " (useu \"git commit\" per a concloure la fusió)"
-#: wt-status.c:1072
+#: wt-status.c:1071
msgid "You are in the middle of an am session."
msgstr "Esteu enmig d'una sessió am."
-#: wt-status.c:1075
+#: wt-status.c:1074
msgid "The current patch is empty."
msgstr "El pedaç actual està buit."
-#: wt-status.c:1079
+#: wt-status.c:1078
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (arregleu els conflictes i després executeu \"git am --continue\")"
-#: wt-status.c:1081
+#: wt-status.c:1080
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (useu \"git am --skip\" per a ometre aquest pedaç)"
-#: wt-status.c:1083
+#: wt-status.c:1082
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (useu \"git am --abort\" per a restaurar la branca original)"
@@ -4444,7 +4556,7 @@
#: wt-status.c:1259
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
-msgstr "Actualment esteu fent «rebase» de la branca '%s' en '%s'."
+msgstr "Actualment esteu fent «rebase» de la branca «%s» en «%s»."
#: wt-status.c:1264
msgid "You are currently rebasing."
@@ -4474,7 +4586,7 @@
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
"Actualment esteu dividint una comissió mentre es fa «rebase» de la branca "
-"'%s' en '%s'."
+"«%s» en «%s»."
#: wt-status.c:1297
msgid "You are currently splitting a commit during a rebase."
@@ -4491,7 +4603,7 @@
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'."
+"«%s» en «%s»."
#: wt-status.c:1309
msgid "You are currently editing a commit during a rebase."
@@ -4551,7 +4663,7 @@
#: wt-status.c:1364
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
-msgstr "Actualment esteu bisecant, heu començat des de la branca '%s'."
+msgstr "Actualment esteu bisecant, heu començat des de la branca «%s»."
#: wt-status.c:1368
msgid "You are currently bisecting."
@@ -4567,11 +4679,11 @@
#: wt-status.c:1574
msgid "interactive rebase in progress; onto "
-msgstr "«rebase» interactiu en progrés; sobre "
+msgstr "«rebase» interactiu en curs; sobre "
#: wt-status.c:1576
msgid "rebase in progress; onto "
-msgstr "«rebase» en progrés; sobre "
+msgstr "«rebase» en curs; sobre "
#: wt-status.c:1581
msgid "HEAD detached at "
@@ -4590,9 +4702,8 @@
msgstr "Comissió inicial"
#: wt-status.c:1607
-#, fuzzy
msgid "No commits yet"
-msgstr "no s'ha analitzat cap comissió."
+msgstr "No s'ha fet cap comissió encara."
#: wt-status.c:1621
msgid "Untracked files"
@@ -4644,13 +4755,13 @@
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-"no hi ha res afegit a cometre però existeixen fitxers no seguits (useu \"git "
-"add\" per a seguir-los)\n"
+"no hi ha res afegit a cometre però hi ha fitxers no seguits (useu \"git add"
+"\" per a seguir-los)\n"
#: wt-status.c:1655
#, c-format
msgid "nothing added to commit but untracked files present\n"
-msgstr "no hi ha res afegit a cometre però existeixen fitxer no seguits\n"
+msgstr "no hi ha res afegit a cometre però hi ha fitxers no seguits\n"
#: wt-status.c:1658
#, c-format
@@ -4676,9 +4787,8 @@
msgstr "no hi ha res a cometre, l'arbre de treball està net\n"
#: wt-status.c:1780
-#, fuzzy
msgid "No commits yet on "
-msgstr "No s'ha fet cap ordre."
+msgstr "No s'ha fet cap comissió encara a "
#: wt-status.c:1784
msgid "HEAD (no branch)"
@@ -4707,10 +4817,10 @@
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "no es pot %s: El vostre índex conté canvis sense cometre."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
-msgstr "s'ha produït un error en desenllaçar '%s'"
+msgstr "s'ha produït un error en desenllaçar «%s»"
#: builtin/add.c:24
msgid "git add [<options>] [--] <pathspec>..."
@@ -4721,121 +4831,120 @@
msgid "unexpected diff status %c"
msgstr "estat de diff inesperat %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:87 builtin/commit.c:291
msgid "updating files failed"
msgstr "s'ha produït un error en actualitzar els fitxers"
#: builtin/add.c:97
#, c-format
msgid "remove '%s'\n"
-msgstr "elimina '%s'\n"
+msgstr "elimina «%s»\n"
-#: builtin/add.c:151
+#: builtin/add.c:153
msgid "Unstaged changes after refreshing the index:"
msgstr "Canvis «unstaged» després d'actualitzar l'índex:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:213 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "No s'ha pogut llegir l'índex"
-#: builtin/add.c:222
+#: builtin/add.c:224
#, c-format
msgid "Could not open '%s' for writing."
-msgstr "No s'ha pogut obrir '%s' per a escriptura."
+msgstr "No s'ha pogut obrir «%s» per a escriptura."
-#: builtin/add.c:226
+#: builtin/add.c:228
msgid "Could not write patch"
msgstr "No s'ha pogut escriure el pedaç"
-#: builtin/add.c:229
+#: builtin/add.c:231
msgid "editing patch failed"
msgstr "l'edició del pedaç ha fallat"
-#: builtin/add.c:232
+#: builtin/add.c:234
#, c-format
msgid "Could not stat '%s'"
-msgstr "No s'ha pogut fer stat a '%s'"
+msgstr "No s'ha pogut fer stat a «%s»"
-#: builtin/add.c:234
+#: builtin/add.c:236
msgid "Empty patch. Aborted."
msgstr "El pedaç és buit. S'ha avortat."
-#: builtin/add.c:239
+#: builtin/add.c:241
#, c-format
msgid "Could not apply '%s'"
-msgstr "No s'ha pogut aplicar '%s'"
+msgstr "No s'ha pogut aplicar «%s»"
-#: builtin/add.c:249
+#: builtin/add.c:251
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
"Els camins següents s'ignoren per un dels vostres fitxers .gitignore:\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
+#: builtin/add.c:271 builtin/clean.c:910 builtin/fetch.c:132 builtin/mv.c:124
#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "marxa en sec"
-#: builtin/add.c:272
+#: builtin/add.c:274
msgid "interactive picking"
msgstr "recull interactiu"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:275 builtin/checkout.c:1172 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "selecciona els trossos interactivament"
-#: builtin/add.c:274
+#: builtin/add.c:276
msgid "edit current diff and apply"
msgstr "edita la diferència actual i aplica-la"
-#: builtin/add.c:275
+#: builtin/add.c:277
msgid "allow adding otherwise ignored files"
msgstr "permet afegir fitxers que d'altra manera s'ignoren"
-#: builtin/add.c:276
+#: builtin/add.c:278
msgid "update tracked files"
msgstr "actualitza els fitxers seguits"
-#: builtin/add.c:277
+#: builtin/add.c:279
msgid "record only the fact that the path will be added later"
-msgstr "registra només el fet de que el camí s'afegirà més tard"
+msgstr "registra només el fet que el camí s'afegirà més tard"
-#: builtin/add.c:278
+#: builtin/add.c:280
msgid "add changes from all tracked and untracked files"
msgstr "afegeix els canvis de tots els fitxers seguits i no seguits"
-#: builtin/add.c:281
+#: builtin/add.c:283
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:283
+#: builtin/add.c:285
msgid "don't add, only refresh the index"
msgstr "no afegeixis, només actualitza l'índex"
-#: builtin/add.c:284
+#: builtin/add.c:286
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:285
+#: builtin/add.c:287
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
"comproveu si els fitxers - fins i tot els absents - s'ignoren en marxa en sec"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:288 builtin/update-index.c:954
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:288 builtin/update-index.c:955
msgid "override the executable bit of the listed files"
msgstr "passa per alt el bit executable dels fitxers llistats"
-#: builtin/add.c:288
-#, fuzzy
+#: builtin/add.c:290
msgid "warn when adding an embedded repository"
-msgstr "crea un dipòsit nu"
+msgstr "avisa'm quan s'afegeixi un dipòsit incrustat"
-#: builtin/add.c:303
+#: builtin/add.c:305
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4852,156 +4961,168 @@
"\n"
"See \"git help submodule\" for more information."
msgstr ""
+"Heu afegit un altre dipòsit git dins del dipòsit actual.\n"
+"Els clons de dipòsits externs no contindran els continguts de\n"
+"del dipòsit incrustat i no saben com obtenir-ho.\n"
+"Si volíeu afegir un submòdul, useu:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Si heu afegit aquest camí per error, podeu suprimir-lo de\n"
+" l'índex amb:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Vegeu \"git help submodule\" per a més informació."
-#: builtin/add.c:331
-#, fuzzy, c-format
+#: builtin/add.c:333
+#, c-format
msgid "adding embedded git repository: %s"
-msgstr "--stdin requereix d'un dipòsit git"
+msgstr "s'està afegint un dipòsit incrustat: %s"
-#: builtin/add.c:349
+#: builtin/add.c:351
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Useu -f si realment els voleu afegir.\n"
-#: builtin/add.c:357
+#: builtin/add.c:359
msgid "adding files failed"
msgstr "l'afegiment de fitxers ha fallat"
-#: builtin/add.c:394
+#: builtin/add.c:396
msgid "-A and -u are mutually incompatible"
msgstr "-A i -u són mútuament incompatibles"
-#: builtin/add.c:401
+#: builtin/add.c:403
msgid "Option --ignore-missing can only be used together with --dry-run"
-msgstr "L'opció --ignore-missing només es pot usar junt amb --dry-run"
+msgstr "L'opció --ignore-missing només es pot usar juntament amb --dry-run"
-#: builtin/add.c:405
+#: builtin/add.c:407
#, 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"
+msgstr "el paràmetre --chmod «%s» ha de ser o -x o +x"
-#: builtin/add.c:420
+#: builtin/add.c:422
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "No s'ha especificat res, no s'ha afegit res.\n"
-#: builtin/add.c:421
+#: builtin/add.c:423
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
-msgstr "Potser volíeu dir 'git add .'?\n"
+msgstr "Potser volíeu dir «git add .»?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:428 builtin/check-ignore.c:176 builtin/checkout.c:282
+#: builtin/checkout.c:479 builtin/clean.c:957 builtin/commit.c:350
+#: builtin/mv.c:143 builtin/reset.c:249 builtin/rm.c:271
+#: builtin/submodule--helper.c:243
msgid "index file corrupt"
msgstr "fitxer d'índex malmès"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "no s'ha pogut analitzar l'script d'autor"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "s'ha suprimit '%s' pel ganxo applypatch-msg"
+msgstr "s'ha suprimit «%s» pel lligam applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
-msgstr "Línia d'entrada mal formada: '%s'."
+msgstr "Línia d'entrada mal formada: «%s»."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, 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'"
+msgstr "S'ha produït un error en copiar les notes de «%s» a «%s»"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek ha fallat"
-#: builtin/am.c:777
+#: builtin/am.c:786
#, c-format
msgid "could not parse patch '%s'"
-msgstr "no s'ha pogut analitzar el pedaç '%s'"
+msgstr "no s'ha pogut analitzar el pedaç «%s»"
-#: builtin/am.c:842
+#: builtin/am.c:851
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:889
+#: builtin/am.c:899
msgid "invalid timestamp"
msgstr "marca de temps no vàlida"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:904 builtin/am.c:916
msgid "invalid Date line"
msgstr "línia Date no vàlida"
-#: builtin/am.c:897
+#: builtin/am.c:911
msgid "invalid timezone offset"
msgstr "desplaçament de zona de temps no vàlid"
-#: builtin/am.c:986
+#: builtin/am.c:1004
msgid "Patch format detection failed."
msgstr "La detecció de format de pedaç ha fallat."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1009 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
-msgstr "s'ha produït un error en crear el directori '%s'"
+msgstr "s'ha produït un error en crear el directori «%s»"
-#: builtin/am.c:995
+#: builtin/am.c:1013
msgid "Failed to split patches."
msgstr "S'ha produït un error en dividir els pedaços."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1142 builtin/commit.c:376
msgid "unable to write index file"
msgstr "no s'ha pogut escriure el fitxer d'índex"
-#: builtin/am.c:1171
+#: builtin/am.c:1193
#, 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:1172
+#: builtin/am.c:1194
#, 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:1173
+#: builtin/am.c:1195
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"Per a restaurar la branca original i deixar d'apedaçar, executeu \"%s --abort"
"\"."
-#: builtin/am.c:1304
-#, fuzzy
+#: builtin/am.c:1302
msgid "Patch is empty."
-msgstr "El pedaç actual està buit."
+msgstr "El pedaç està buit."
-#: builtin/am.c:1370
-#, fuzzy, c-format
+#: builtin/am.c:1368
+#, c-format
msgid "invalid ident line: %.*s"
-msgstr "línia d'identitat no vàlida: %s"
+msgstr "línia d'identitat no vàlida: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1390
#, c-format
msgid "unable to parse commit %s"
msgstr "no s'ha pogut analitzar la comissió %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1584
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
"Al dipòsit li manquen els blobs necessaris per a retrocedir a una fusió de 3 "
"vies."
-#: builtin/am.c:1588
+#: builtin/am.c:1586
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:1607
+#: builtin/am.c:1605
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -5009,38 +5130,38 @@
"Heu editat el vostre pedaç a mà?\n"
"No s'aplica als blobs recordats en el seu índex."
-#: builtin/am.c:1613
+#: builtin/am.c:1611
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:1638
+#: builtin/am.c:1636
msgid "Failed to merge in the changes."
msgstr "S'ha produït un error en fusionar els canvis."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1660 builtin/merge.c:641
msgid "git write-tree failed to write a tree"
msgstr "git write-tree ha fallat en escriure un arbre"
-#: builtin/am.c:1669
+#: builtin/am.c:1667
msgid "applying to an empty history"
msgstr "s'està aplicant a una història buida"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1680 builtin/commit.c:1776 builtin/merge.c:824
+#: builtin/merge.c:849
msgid "failed to write commit object"
msgstr "s'ha produït un error en escriure l'objecte de comissió"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1713 builtin/am.c:1717
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "no es pot reprendre: %s no existeix."
-#: builtin/am.c:1735
+#: builtin/am.c:1733
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"no es pot ser interactiu sense que stdin estigui connectada a un terminal."
-#: builtin/am.c:1740
+#: builtin/am.c:1738
msgid "Commit Body is:"
msgstr "El cos de la comissió és:"
@@ -5048,37 +5169,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1748
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:1800
+#: builtin/am.c:1798
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Índex brut: no es poden aplicar pedaços (bruts: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1838 builtin/am.c:1910
#, c-format
msgid "Applying: %.*s"
msgstr "S'està aplicant: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1854
msgid "No changes -- Patch already applied."
msgstr "Sense canvis -- El pedaç ja s'ha aplicat."
-#: builtin/am.c:1864
+#: builtin/am.c:1862
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "El pedaç ha fallat a %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1868
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La còpia del pedaç que ha fallat es troba en: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1913
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5088,25 +5209,29 @@
"Si no hi ha res per fer «stage», probablement alguna altra cosa ja ha\n"
"introduït els mateixos canvis; potser voleu ometre aquest pedaç."
-#: builtin/am.c:1922
+#: builtin/am.c:1920
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 ""
+"Encara teniu camins sense fusionar a l'índex.\n"
+"Heu de fer 'git add' a cada fitxer amb conflictes resolts per marcar-los "
+"com a tal.\n"
+"Podeu executar `git rm` en un fitxer per acceptar \"suprimit per ells\" pel fitxer."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:2029 builtin/am.c:2033 builtin/am.c:2045 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
-msgstr "No s'ha pogut analitzar l'objecte '%s'."
+msgstr "No s'ha pogut analitzar l'objecte «%s»."
-#: builtin/am.c:2083
+#: builtin/am.c:2081
msgid "failed to clean index"
msgstr "s'ha produït un error en netejar l'índex"
-#: builtin/am.c:2117
+#: builtin/am.c:2116
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5114,155 +5239,154 @@
"Sembla que heu mogut HEAD després de l'última fallada de 'am'.\n"
"No s'està rebobinant a ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2179
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valor no vàlid per a --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2212
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<opcions>] [(<bústia> | <directori-de-correu>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2213
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<opcions>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2219
msgid "run interactively"
msgstr "executa interactivament"
-#: builtin/am.c:2222
+#: builtin/am.c:2221
msgid "historical option -- no-op"
msgstr "opció històrica -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2223
msgid "allow fall back on 3way merging if needed"
msgstr "permet retrocedir a una fusió de 3 vies si és necessari"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2224 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "silenciós"
-#: builtin/am.c:2227
+#: builtin/am.c:2226
msgid "add a Signed-off-by line to the commit message"
-msgstr "afegeix una línia Signed-off-by al missatge de comissió"
+msgstr "afegeix una línia «Signed-off-by» al missatge de comissió"
-#: builtin/am.c:2230
+#: builtin/am.c:2229
msgid "recode into utf8 (default)"
msgstr "recodifica en utf8 (per defecte)"
-#: builtin/am.c:2232
+#: builtin/am.c:2231
msgid "pass -k flag to git-mailinfo"
-msgstr "passa la bandera -k al git-mailinfo"
+msgstr "passa l'indicador -k a git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2233
msgid "pass -b flag to git-mailinfo"
-msgstr "passa la bandera -b al git-mailinfo"
+msgstr "passa l'indicador -b a git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2235
msgid "pass -m flag to git-mailinfo"
-msgstr "passa la bandera -m al git-mailinfo"
+msgstr "passa l'indicador -m a git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2237
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
-msgstr "passa la bandera --keep-cr al git-mailsplit per al format mbox"
+msgstr "passa l'indicador --keep-cr a git-mailsplit per al format mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2240
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-"no passis la bandera --keep-cr al git-mailsplit independent de am.keepcr"
+"no passis l'indicador --keep-cr a git-mailsplit independent d'am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2243
msgid "strip everything before a scissors line"
msgstr "elimina tot abans d'una línia de tisores"
-#: 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:2245 builtin/am.c:2248 builtin/am.c:2251 builtin/am.c:2254
+#: builtin/am.c:2257 builtin/am.c:2260 builtin/am.c:2263 builtin/am.c:2266
+#: builtin/am.c:2272
msgid "pass it through git-apply"
-msgstr "passa-ho a través del git-apply"
+msgstr "passa-ho a través de git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2262 builtin/fmt-merge-msg.c:664 builtin/fmt-merge-msg.c:667
+#: builtin/grep.c:843 builtin/merge.c:205 builtin/pull.c:142 builtin/pull.c:197
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2268 builtin/branch.c:622 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2269
msgid "format the patch(es) are in"
msgstr "el format en el qual estan els pedaços"
-#: builtin/am.c:2276
+#: builtin/am.c:2275
msgid "override error message when patch failure occurs"
msgstr ""
-"passa per alt el missatge d'error quan s'ocorre una fallada en apedaçar"
+"passa per alt el missatge d'error si falla l'aplicació del pedaç"
-#: builtin/am.c:2278
+#: builtin/am.c:2277
msgid "continue applying patches after resolving a conflict"
msgstr "segueix aplicant pedaços després de resoldre un conflicte"
-#: builtin/am.c:2281
+#: builtin/am.c:2280
msgid "synonyms for --continue"
msgstr "sinònims de --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2283
msgid "skip the current patch"
msgstr "omet el pedaç actual"
-#: builtin/am.c:2287
+#: builtin/am.c:2286
msgid "restore the original branch and abort the patching operation."
msgstr "restaura la branca original i avorta l'operació d'apedaçament."
-#: builtin/am.c:2291
+#: builtin/am.c:2290
msgid "lie about committer date"
msgstr "menteix sobre la data del comitent"
-#: builtin/am.c:2293
+#: builtin/am.c:2292
msgid "use current timestamp for author date"
msgstr "usa el marc de temps actual per la data d'autor"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2294 builtin/commit.c:1614 builtin/merge.c:236
+#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "ID de clau"
-#: builtin/am.c:2296
+#: builtin/am.c:2295
msgid "GPG-sign commits"
msgstr "signa les comissions amb GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2298
msgid "(internal use for git-rebase)"
-msgstr "(ús intern per al git-rebase)"
+msgstr "(ús intern per a git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2316
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"
-"s'eliminarà. Si us plau, no l'useu més."
+"s'eliminarà. No l'useu més."
-#: builtin/am.c:2324
+#: builtin/am.c:2323
msgid "failed to read the index"
msgstr "S'ha produït un error en llegir l'índex"
-#: builtin/am.c:2339
+#: builtin/am.c:2338
#, 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:2363
+#: builtin/am.c:2362
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5271,7 +5395,7 @@
"S'ha trobat un directori %s extraviat.\n"
"Useu \"git am --abort\" per a eliminar-lo."
-#: builtin/am.c:2369
+#: builtin/am.c:2368
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Una operació de resolució no està en curs; no reprenem."
@@ -5282,7 +5406,7 @@
#: builtin/archive.c:17
#, c-format
msgid "could not create archive file '%s'"
-msgstr "no s'ha pogut crear el fitxer d'arxiu '%s'"
+msgstr "no s'ha pogut crear el fitxer d'arxiu «%s»"
#: builtin/archive.c:20
msgid "could not redirect output"
@@ -5294,7 +5418,7 @@
#: builtin/archive.c:58
msgid "git archive: expected ACK/NAK, got EOF"
-msgstr "git archive: ACK/NAK esperat, EOF rebut"
+msgstr "git archive: s'esperava ACK/NAK, s'ha rebut EOF"
#: builtin/archive.c:61
#, c-format
@@ -5392,7 +5516,7 @@
#: builtin/blame.c:682
msgid "Show author email instead of name (Default: off)"
msgstr ""
-"Mostra l'adreça de correu electrònic de l'autor en lloc del nom (Per "
+"Mostra l'adreça electrònica de l'autor en lloc del nom (Per "
"defecte: desactivat)"
#: builtin/blame.c:683
@@ -5480,372 +5604,395 @@
msgstr "git branch [<opcions>] (-m | -M) [<branca-antiga>] <branca-nova>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opcions>] (-c | -C) [<branca-antiga>] <branca-nova>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<opcions>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<opcions>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-"s'està suprimint la branca '%s' que s'ha\n"
-" fusionat a '%s', però encara no\n"
+"s'està suprimint la branca «%s» que s'ha\n"
+" fusionat a «%s», però encara no\n"
" s'ha fusionat a HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr ""
-"no s'està suprimint la branca '%s' que encara no\n"
-" s'ha fusionat a '%s', encara que està\n"
+"no s'està suprimint la branca «%s» que encara no\n"
+" s'ha fusionat a «%s», encara que està\n"
" fusionada a HEAD."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
-msgstr "No s'ha pogut trobar l'objecte de comissió de '%s'"
+msgstr "No s'ha pogut trobar l'objecte de comissió de «%s»"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, 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 ""
-"La branca '%s' no està totalment fusionada.\n"
+"La branca «%s» no està totalment fusionada.\n"
"Si esteu segur que la voleu suprimir, executeu 'git branch -D %s'."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "L'actualització del fitxer de configuració ha fallat"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "no es pot usar -a amb -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "No s'ha pogut trobar l'objecte de comissió de HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, 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:246
-#, c-format
-msgid "remote-tracking branch '%s' not found."
-msgstr "no s'ha trobat la branca amb seguiment remot '%s'."
+msgstr "No es pot suprimir la branca «%s» agafada a «%s»"
#: builtin/branch.c:247
#, c-format
-msgid "branch '%s' not found."
-msgstr "no s'ha trobat la branca '%s'."
+msgid "remote-tracking branch '%s' not found."
+msgstr "no s'ha trobat la branca amb seguiment remot «%s»."
-#: builtin/branch.c:262
+#: builtin/branch.c:248
#, c-format
-msgid "Error deleting remote-tracking branch '%s'"
-msgstr "Error en suprimir la branca amb seguiment remot '%s'"
+msgid "branch '%s' not found."
+msgstr "no s'ha trobat la branca «%s»."
#: builtin/branch.c:263
#, c-format
-msgid "Error deleting branch '%s'"
-msgstr "Error en suprimir la branca '%s'"
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Error en suprimir la branca amb seguiment remot «%s»"
-#: builtin/branch.c:270
+#: builtin/branch.c:264
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "Error en suprimir la branca «%s»"
+
+#: builtin/branch.c:271
#, 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:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "S'ha suprimit la branca %s (era %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "no s'ha pogut analitzar la cadena de format"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "S'està fent «rebase» en la branca %s a %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branca %s s'està bisecant a %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:470
+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:472
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:474
+#: builtin/branch.c:483
#, c-format
msgid "Invalid branch name: '%s'"
-msgstr "Nom de branca no vàlid: '%s'"
+msgstr "Nom de branca no vàlid: «%s»"
-#: builtin/branch.c:491
+#: builtin/branch.c:504
msgid "Branch rename failed"
msgstr "El canvi de nom de branca ha fallat"
-#: builtin/branch.c:494
+#: builtin/branch.c:506
+msgid "Branch copy failed"
+msgstr "La còpia de la branca ha fallat"
+
+#: builtin/branch.c:510
+#, c-format
+msgid "Copied a misnamed branch '%s' away"
+msgstr "S'ha copiat el nom de la branca mal anomenada «%s»"
+
+#: builtin/branch.c:513
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "S'ha canviat el nom de la branca mal anomenada '%s'"
+msgstr "S'ha canviat el nom de la branca mal anomenada «%s»"
-#: builtin/branch.c:497
+#: builtin/branch.c:519
#, 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:506
+#: builtin/branch.c:528
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:522
+#: builtin/branch.c:530
+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:546
#, c-format
msgid ""
"Please edit the description for the branch\n"
" %s\n"
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-"Si us plau, editeu la descripció de la branca\n"
+"Editeu la descripció de la branca\n"
" %s\n"
"S'eliminaran les línies que comencin amb '%c'.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:579
msgid "Generic options"
msgstr "Opcions genèriques"
-#: builtin/branch.c:557
+#: builtin/branch.c:581
msgid "show hash and subject, give twice for upstream branch"
msgstr "mostra el hash i l'assumpte, doneu dues vegades per la branca font"
-#: builtin/branch.c:558
+#: builtin/branch.c:582
msgid "suppress informational messages"
msgstr "omet els missatges informatius"
-#: builtin/branch.c:559
+#: builtin/branch.c:583
msgid "set up tracking mode (see git-pull(1))"
msgstr "configura el mode de seguiment (vegeu git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "canvia la informació de font"
+#: builtin/branch.c:585
+msgid "do not use"
+msgstr "no usar"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "upstream"
msgstr "font"
-#: builtin/branch.c:563
+#: builtin/branch.c:587
msgid "change the upstream info"
msgstr "canvia la informació de font"
-#: builtin/branch.c:564
+#: builtin/branch.c:588
msgid "Unset the upstream info"
-msgstr "Desestableix la informació de font"
+msgstr "Desassigna la informació de font"
-#: builtin/branch.c:565
+#: builtin/branch.c:589
msgid "use colored output"
msgstr "usa sortida colorada"
-#: builtin/branch.c:566
+#: builtin/branch.c:590
msgid "act on remote-tracking branches"
msgstr "actua en branques amb seguiment remot"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:592 builtin/branch.c:594
msgid "print only branches that contain the commit"
msgstr "imprimeix només les branques que continguin la comissió"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:593 builtin/branch.c:595
msgid "print only branches that don't contain the commit"
msgstr "imprimeix només les branques que no continguin la comissió"
-#: builtin/branch.c:574
+#: builtin/branch.c:598
msgid "Specific git-branch actions:"
msgstr "Accions de git-branch específiques:"
-#: builtin/branch.c:575
+#: builtin/branch.c:599
msgid "list both remote-tracking and local branches"
msgstr "llista les branques amb seguiment remot i les locals"
-#: builtin/branch.c:577
+#: builtin/branch.c:601
msgid "delete fully merged branch"
msgstr "suprimeix la branca si està completament fusionada"
-#: builtin/branch.c:578
+#: builtin/branch.c:602
msgid "delete branch (even if not merged)"
msgstr "suprimeix la branca (encara que no estigui fusionada)"
-#: builtin/branch.c:579
+#: builtin/branch.c:603
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:580
+#: builtin/branch.c:604
msgid "move/rename a branch, even if target exists"
msgstr "mou/canvia de nom una branca, encara que el destí existeixi"
-#: builtin/branch.c:581
+#: builtin/branch.c:605
+msgid "copy a branch and its reflog"
+msgstr "copia una branca i el seu registre de referència"
+
+#: builtin/branch.c:606
+msgid "copy a branch, even if target exists"
+msgstr "copia una branca, encara que el destí existeixi"
+
+#: builtin/branch.c:607
msgid "list branch names"
msgstr "llista els noms de branca"
-#: builtin/branch.c:582
+#: builtin/branch.c:608
msgid "create the branch's reflog"
msgstr "crea el registre de referència de la branca"
-#: builtin/branch.c:584
+#: builtin/branch.c:610
msgid "edit the description for the branch"
msgstr "edita la descripció de la branca"
-#: builtin/branch.c:585
+#: builtin/branch.c:611
msgid "force creation, move/rename, deletion"
msgstr "força creació, moviment/canvi de nom, supressió"
-#: builtin/branch.c:586
+#: builtin/branch.c:612
msgid "print only branches that are merged"
msgstr "imprimeix només les branques que s'han fusionat"
-#: builtin/branch.c:587
+#: builtin/branch.c:613
msgid "print only branches that are not merged"
msgstr "imprimeix només les branques que no s'han fusionat"
-#: builtin/branch.c:588
+#: builtin/branch.c:614
msgid "list branches in columns"
msgstr "llista les branques en columnes"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:615 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "clau"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:616 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "nom del camp en el qual ordenar"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:618 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "objecte"
-#: builtin/branch.c:593
+#: builtin/branch.c:619
msgid "print only branches of the object"
msgstr "imprimeix només les branques de l'objecte"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:621 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "l'ordenació i el filtratge distingeixen entre majúscules i minúscules"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:622 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format a usar en la sortida"
-#: builtin/branch.c:615
-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."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:645 builtin/clone.c:729
msgid "HEAD not found below refs/heads!"
msgstr "HEAD no trobat sota refs/heads!"
-#: builtin/branch.c:642
+#: builtin/branch.c:668
msgid "--column and --verbose are incompatible"
msgstr "--column i --verbose són incompatibles"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:680 builtin/branch.c:732 builtin/branch.c:741
msgid "branch name required"
msgstr "cal el nom de branca"
-#: builtin/branch.c:681
+#: builtin/branch.c:708
msgid "Cannot give description to detached HEAD"
msgstr "No es pot donar descripció a un HEAD separat"
-#: builtin/branch.c:686
+#: builtin/branch.c:713
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:693
+#: builtin/branch.c:720
#, c-format
msgid "No commit on branch '%s' yet."
-msgstr "Encara no hi ha cap comissió en la branca '%s'."
+msgstr "Encara no hi ha cap comissió en la branca «%s»."
-#: builtin/branch.c:696
+#: builtin/branch.c:723
#, c-format
msgid "No branch named '%s'."
-msgstr "No hi ha branca amb nom '%s'."
+msgstr "No hi ha cap branca amb nom «%s»."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "hi ha massa branques per a una operació de canvi de nom"
+#: builtin/branch.c:738
+msgid "too many branches for a copy operation"
+msgstr "hi ha massa branques per a una operació de còpia"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "hi ha massa branques per a establir una nova font"
+#: builtin/branch.c:747
+msgid "too many arguments for a rename operation"
+msgstr "hi ha massa arguments per a una operació remota"
-#: builtin/branch.c:720
+#: builtin/branch.c:752
+msgid "too many arguments to set new upstream"
+msgstr "hi ha massa arguments per a establir una nova font"
+
+#: builtin/branch.c:756
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
"no s'ha pogut establir la font de HEAD com a %s quan no assenyala cap branca."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:759 builtin/branch.c:781 builtin/branch.c:800
#, c-format
msgid "no such branch '%s'"
-msgstr "no hi ha tal branca '%s'"
-
-#: builtin/branch.c:727
-#, c-format
-msgid "branch '%s' does not exist"
-msgstr "la branca '%s' no existeix"
-
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "hi ha massa branques per a desestablir la font"
-
-#: builtin/branch.c:743
-msgid "could not unset upstream of HEAD when it does not point to any branch."
-msgstr ""
-"no s'ha pogut desestablir la font de HEAD perquè no assenyala cap branca."
-
-#: builtin/branch.c:749
-#, c-format
-msgid "Branch '%s' has no upstream information"
-msgstr "La branca '%s' no té informació de font"
+msgstr "no hi ha tal branca «%s»"
#: builtin/branch.c:763
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "la branca «%s» no existeix"
+
+#: builtin/branch.c:775
+msgid "too many arguments to unset upstream"
+msgstr "hi ha massa arguments per a desassignar la font"
+
+#: builtin/branch.c:779
+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:785
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "La branca «%s» no té informació de font"
+
+#: builtin/branch.c:797
msgid "it does not make sense to create 'HEAD' manually"
msgstr "no té sentit crear 'HEAD' manualment"
-#: builtin/branch.c:769
+#: builtin/branch.c:803
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les opcions -a i -r a 'git branch' no tenen sentit amb un nom de branca"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:806
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"La bandera --set-upstream està en desús i s'eliminarà. Considereu usar --"
-"track o --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Si volíeu fer '%s' seguir '%s', feu això:\n"
-"\n"
+"L'opció --set-upstream ja no està suportada. Useu en comptes --track o --set-"
+"upstream-to."
#: builtin/bundle.c:45
#, c-format
@@ -5860,7 +6007,7 @@
msgid "Need a repository to unbundle."
msgstr "Cal un dipòsit per a desfer un farcell."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5868,7 +6015,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <tipus> | --textconv | --filters [--path=<camí>]) <objecte>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5876,66 +6023,66 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<tipus> pot ser un de: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "mostra el tipus de l'objecte"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "mostra la mida de l'objecte"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "surt amb zero quan no hi ha error"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "imprimeix bellament el contingut de l'objecte"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
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:566
+#: builtin/cat-file.c:568
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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:943
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "usa un camí específic per a --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
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:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "posa la sortida de --batch en memòria intermèdia"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
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:576
+#: builtin/cat-file.c:578
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:579
+#: builtin/cat-file.c:581
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:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "mostra tots els objectes amb --batch o --batch-check"
@@ -5957,13 +6104,13 @@
#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
msgid "read file names from stdin"
-msgstr "llegeix els noms de fitxer d'stdin"
+msgstr "llegeix els noms de fitxer de stdin"
#: builtin/check-attr.c:24 builtin/check-ignore.c:26
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:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1153 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "omet els informes de progrés"
@@ -5977,7 +6124,7 @@
#: builtin/check-ignore.c:158
msgid "cannot specify pathnames with --stdin"
-msgstr "no es pot especificar noms de camí amb --stdin"
+msgstr "no es poden especificar noms de camí amb --stdin"
#: builtin/check-ignore.c:161
msgid "-z only makes sense with --stdin"
@@ -5993,7 +6140,7 @@
#: builtin/check-ignore.c:169
msgid "cannot have both --quiet and --verbose"
-msgstr "no es pot tenir ambdós --quiet i --verbose"
+msgstr "no es poden especificar --quiet i --verbose alhora"
#: builtin/check-ignore.c:172
msgid "--non-matching is only valid with --verbose"
@@ -6005,7 +6152,7 @@
#: builtin/check-mailmap.c:14
msgid "also read contacts from stdin"
-msgstr "també llegeix els contactes des d'stdin"
+msgstr "també llegeix els contactes des de stdin"
#: builtin/check-mailmap.c:25
#, c-format
@@ -6054,9 +6201,9 @@
msgstr "escriu el contingut a fitxers temporals"
#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/submodule--helper.c:628 builtin/submodule--helper.c:631
+#: builtin/submodule--helper.c:637 builtin/submodule--helper.c:999
+#: builtin/worktree.c:498
msgid "string"
msgstr "cadena"
@@ -6079,103 +6226,103 @@
#: builtin/checkout.c:135 builtin/checkout.c:168
#, c-format
msgid "path '%s' does not have our version"
-msgstr "el camí '%s' no té la nostra versió"
+msgstr "el camí «%s» no té la nostra versió"
#: builtin/checkout.c:137 builtin/checkout.c:170
#, c-format
msgid "path '%s' does not have their version"
-msgstr "el camí '%s' no té la seva versió"
+msgstr "el camí «%s» no té la seva versió"
#: builtin/checkout.c:153
#, c-format
msgid "path '%s' does not have all necessary versions"
-msgstr "el camí '%s' no té totes les versions necessàries"
+msgstr "el camí «%s» no té totes les versions necessàries"
#: builtin/checkout.c:197
#, c-format
msgid "path '%s' does not have necessary versions"
-msgstr "el camí '%s' no té les versions necessàries"
+msgstr "el camí «%s» no té les versions necessàries"
#: builtin/checkout.c:214
#, c-format
msgid "path '%s': cannot merge"
-msgstr "camí '%s': no es pot fusionar"
+msgstr "camí «%s»: no es pot fusionar"
#: builtin/checkout.c:231
#, c-format
msgid "Unable to add merge result for '%s'"
-msgstr "No s'ha pogut afegir el resultat de fusió per a '%s'"
+msgstr "No s'ha pogut afegir el resultat de fusió per a «%s»"
#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
#: builtin/checkout.c:262
#, c-format
msgid "'%s' cannot be used with updating paths"
-msgstr "'%s' no es pot usar amb actualització de camins"
+msgstr "«%s» no es pot usar amb actualització de camins"
#: builtin/checkout.c:265 builtin/checkout.c:268
#, c-format
msgid "'%s' cannot be used with %s"
-msgstr "'%s' no es pot usar amb %s"
+msgstr "«%s» no es pot usar amb %s"
#: builtin/checkout.c:271
#, 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."
+"No es poden actualitzar els camins i canviar a la branca «%s» a la vegada."
#: builtin/checkout.c:342 builtin/checkout.c:349
#, c-format
msgid "path '%s' is unmerged"
-msgstr "el camí '%s' està sense fusionar"
+msgstr "el camí «%s» està sense fusionar"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:501
msgid "you need to resolve your current index first"
msgstr "heu de primer resoldre el vostre índex actual"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:632
#, c-format
msgid "Can not do reflog for '%s': %s\n"
-msgstr "No es pot fer reflog per a '%s': %s\n"
+msgstr "No es pot fer reflog per a «%s»: %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:673
msgid "HEAD is now at"
msgstr "HEAD ara és a"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:677 builtin/clone.c:683
msgid "unable to update HEAD"
msgstr "no s'ha pogut actualitzar HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:681
#, c-format
msgid "Reset branch '%s'\n"
-msgstr "Restableix la branca '%s'\n"
-
-#: builtin/checkout.c:680
-#, c-format
-msgid "Already on '%s'\n"
-msgstr "Ja en '%s'\n"
+msgstr "Restableix la branca «%s»\n"
#: builtin/checkout.c:684
#, c-format
-msgid "Switched to and reset branch '%s'\n"
-msgstr "S'ha canviat i restablert a la branca '%s'\n"
-
-#: builtin/checkout.c:686 builtin/checkout.c:1075
-#, c-format
-msgid "Switched to a new branch '%s'\n"
-msgstr "S'ha canviat a la branca nova '%s'\n"
+msgid "Already on '%s'\n"
+msgstr "Ja en «%s»\n"
#: builtin/checkout.c:688
#, c-format
-msgid "Switched to branch '%s'\n"
-msgstr "S'ha canviat a la branca '%s'\n"
+msgid "Switched to and reset branch '%s'\n"
+msgstr "S'ha canviat i restablert a la branca «%s»\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:690 builtin/checkout.c:1086
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "S'ha canviat a la branca nova «%s»\n"
+
+#: builtin/checkout.c:692
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "S'ha canviat a la branca «%s»\n"
+
+#: builtin/checkout.c:743
#, c-format
msgid " ... and %d more.\n"
msgstr " ... i %d més.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:749
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6198,7 +6345,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:768
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6213,172 +6360,172 @@
" git branch <new-branch-name> %s\n"
"\n"
msgstr[0] ""
-"Si la voleu retenir creant una branca nova, ara pot ser un bon moment\n"
+"Si la voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
"per a fer-ho amb:\n"
"\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
msgstr[1] ""
-"Si les voleu retenir creant una branca nova, ara pot ser un bon moment\n"
+"Si les voleu mantenir creant una branca nova, ara pot ser un bon moment\n"
"per a fer-ho amb:\n"
"\n"
" git branch <nom-de-branca-nova> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:809
msgid "internal error in revision walk"
msgstr "error intern en el passeig per revisions"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:813
msgid "Previous HEAD position was"
msgstr "La posició de HEAD anterior era"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:843 builtin/checkout.c:1081
msgid "You are on a branch yet to be born"
msgstr "Sou en una branca que encara ha de néixer"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:987
#, c-format
msgid "only one reference expected, %d given."
msgstr "s'esperava només una referència, s'han donat %d."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:1027 builtin/worktree.c:233
#, c-format
msgid "invalid reference: %s"
msgstr "referència no vàlida: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1056
#, c-format
msgid "reference is not a tree: %s"
msgstr "la referència no és un arbre: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1095
msgid "paths cannot be used with switching branches"
msgstr "els camins no es poden usar amb canvi de branca"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1098 builtin/checkout.c:1102
#, c-format
msgid "'%s' cannot be used with switching branches"
-msgstr "'%s' no es pot usar amb canvi de branca"
+msgstr "«%s» no es pot usar amb canvi de branca"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1106 builtin/checkout.c:1109 builtin/checkout.c:1114
+#: builtin/checkout.c:1117
#, c-format
msgid "'%s' cannot be used with '%s'"
-msgstr "'%s' no es pot usar amb '%s'"
+msgstr "«%s» no es pot usar amb «%s»"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1122
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
-msgstr "No es pot canviar la branca a la no comissió '%s'"
+msgstr "No es pot canviar la branca a la no comissió «%s»"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1154 builtin/checkout.c:1156 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:346
+#: builtin/worktree.c:348
msgid "branch"
msgstr "branca"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1155
msgid "create and checkout a new branch"
msgstr "crea i agafa una branca nova"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1157
msgid "create/reset and checkout a branch"
msgstr "crea/restableix i agafa una branca"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1158
msgid "create reflog for new branch"
msgstr "crea un registre de referència per a la branca nova"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1159 builtin/worktree.c:350
msgid "detach HEAD at named commit"
msgstr "separa HEAD a la comissió anomenada"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1160
msgid "set upstream info for new branch"
msgstr "estableix la informació de font de la branca nova"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new-branch"
msgstr "branca-nova"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1162
msgid "new unparented branch"
msgstr "branca òrfena nova"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1163
msgid "checkout our version for unmerged files"
msgstr "agafa la versió nostra dels fitxers sense fusionar"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1165
msgid "checkout their version for unmerged files"
msgstr "agafa la versió seva dels fitxers sense fusionar"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1167
msgid "force checkout (throw away local modifications)"
msgstr "agafa a la força (descarta qualsevol modificació local)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1168
msgid "perform a 3-way merge with the new branch"
msgstr "realitza una fusió de 3 vies amb la branca nova"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1169 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "actualitza els fitxers ignorats (per defecte)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1170 builtin/log.c:1489 parse-options.h:251
msgid "style"
msgstr "estil"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1171
msgid "conflict style (merge or diff3)"
msgstr "estil de conflicte (fusió o diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1174
msgid "do not limit pathspecs to sparse entries only"
msgstr "no limitis les especificacions de camí només a entrades disperses"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1176
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "dubta 'git checkout <cap-branca-així>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1178
msgid "do not check if another worktree is holding the given ref"
msgstr "no comprovis si altre arbre de treball té la referència donada"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1182 builtin/clone.c:81 builtin/fetch.c:136
+#: builtin/merge.c:235 builtin/pull.c:120 builtin/push.c:544
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "força l'informe de progrés"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1212
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B i --orphan són mutualment exclusius"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1229
msgid "--track needs a branch name"
msgstr "--track necessita un nom de branca"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1234
msgid "Missing branch name; try -b"
msgstr "Manca el nom de branca; proveu -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1270
msgid "invalid path specification"
msgstr "especificació de camí no vàlida"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1277
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
-msgstr ""
+msgstr "«%s» no és una comissió i la branca «%s» no es pot crear a partir d'aquesta comissió"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1281
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
-msgstr "git checkout: --detach no accepta un paràmetre de camí '%s'"
+msgstr "git checkout: --detach no accepta un paràmetre de camí «%s»"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1285
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6417,7 +6564,7 @@
msgid "failed to remove %s"
msgstr "s'ha produït un error en eliminar %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:301 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6430,7 +6577,7 @@
"foo - selecciona un ítem basat en un prefix únic\n"
" - (buit) no seleccionis res\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:305 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6451,38 +6598,38 @@
"* - tria tots els ítems\n"
" - (buit) finalitza la selecció\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:521 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Perdó (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:663
#, c-format
msgid "Input ignore patterns>> "
msgstr "Introduïu els patrons a ignorar>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:700
#, 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:718
+#: builtin/clean.c:721
msgid "Select items to delete"
msgstr "Selecciona els ítems a suprimir"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:762
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Voleu eliminar %s [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:787 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
-msgstr "Adéu.\n"
+msgstr "Adeu.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:795
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6500,257 +6647,257 @@
"help - aquesta pantalla\n"
"? - ajuda de selecció de l'avís"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:822 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Ordres ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:823 git-add--interactive.perl:1689
msgid "What now"
msgstr "I ara què"
-#: builtin/clean.c:828
+#: builtin/clean.c:831
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:844
+#: builtin/clean.c:847
msgid "No more files to clean, exiting."
msgstr "No hi ha més fitxers a netejar; s'està sortint."
-#: builtin/clean.c:906
+#: builtin/clean.c:909
msgid "do not print names of files removed"
msgstr "no imprimeixis els noms dels fitxers eliminats"
-#: builtin/clean.c:908
+#: builtin/clean.c:911
msgid "force"
msgstr "força"
-#: builtin/clean.c:909
+#: builtin/clean.c:912
msgid "interactive cleaning"
msgstr "neteja interactiva"
-#: builtin/clean.c:911
+#: builtin/clean.c:914
msgid "remove whole directories"
msgstr "elimina directoris sencers"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
+#: builtin/clean.c:915 builtin/describe.c:463 builtin/describe.c:465
+#: builtin/grep.c:861 builtin/ls-files.c:544 builtin/name-rev.c:397
#: builtin/name-rev.c:399 builtin/show-ref.c:176
msgid "pattern"
msgstr "patró"
-#: builtin/clean.c:913
+#: builtin/clean.c:916
msgid "add <pattern> to ignore rules"
msgstr "afegiu <patró> per a ignorar les regles"
-#: builtin/clean.c:914
+#: builtin/clean.c:917
msgid "remove ignored files, too"
msgstr "elimina els fitxers ignorats, també"
-#: builtin/clean.c:916
+#: builtin/clean.c:919
msgid "remove only ignored files"
msgstr "elimina només els fitxers ignorats"
-#: builtin/clean.c:934
+#: builtin/clean.c:937
msgid "-x and -X cannot be used together"
msgstr "-x i -X no es poden usar junts"
-#: builtin/clean.c:938
+#: builtin/clean.c:941
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-"clean.requireForce està establerta a veritat i ni -i, -n ni -f s'han "
+"clean.requireForce està establerta en cert i ni -i, -n ni -f s'han "
"indicat; refusant netejar"
-#: builtin/clean.c:941
+#: builtin/clean.c:944
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-"clean.requireForce és per defecte veritat i ni -i, -n ni -f s'han indicat; "
+"clean.requireForce és per defecte cert i ni -i, -n ni -f s'han indicat; "
"refusant netejar"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<opcions>] [--] <dipòsit> [<directori>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "no facis cap agafament"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "crea un dipòsit nu"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "crea un dipòsit mirall (implica bare)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "per a clonar des d'un dipòsit local"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "no usis enllaços durs locals, sempre copia"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "configura com a dipòsit compartit"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "especificació de camí"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "inicialitza els submòduls en el clon"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "nombre de submòduls clonats en paral·lel"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "directori-de-plantilla"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "directori des del qual s'usaran les plantilles"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:635
+#: builtin/submodule--helper.c:1002
msgid "reference repository"
msgstr "dipòsit de referència"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "usa --reference només en clonar"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "usa <nom> en lloc de 'origin' per a seguir la font"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "agafa <branca> en lloc del HEAD del remot"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "camí a git-upload-pack en el remot"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
+#: builtin/clone.c:118 builtin/fetch.c:137 builtin/grep.c:804
#: builtin/pull.c:205
msgid "depth"
msgstr "profunditat"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "crea un clon superficial de tal profunditat"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:139 builtin/pack-objects.c:2938
#: parse-options.h:142
msgid "time"
msgstr "hora"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "crea un clon superficial des d'una hora específica"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:141
msgid "revision"
msgstr "revisió"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:142
msgid "deepen history of shallow clone, excluding rev"
msgstr "aprofundeix la història d'un clon superficial, excloent una revisió"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "clona només una branca, HEAD o --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
-msgstr ""
+msgstr "no cloneu cap etiqueta, i feu que els «fetch» següents no els segueixen"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "qualsevol submòdul clonat serà superficial"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "directori de git"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "separa el directori de git de l'arbre de treball"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "clau=valor"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "estableix la configuració dins del dipòsit nou"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:159 builtin/push.c:555
msgid "use IPv4 addresses only"
msgstr "usa només adreces IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:161 builtin/push.c:557
msgid "use IPv6 addresses only"
msgstr "usa només adreces IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
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"
-"Si us plau, especifiqueu un directori en la línia d'ordres"
+"Especifiqueu un directori en la línia d'ordres"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, 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"
+msgstr "info: No s'ha pogut afegir un alternatiu per a «%s»: %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
-msgstr "s'ha produït un error en obrir '%s'"
+msgstr "s'ha produït un error en obrir «%s»"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existeix i no és directori"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "s'ha produït un error en fer stat a '%s'\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
-msgstr "s'ha produït un error en crear l'enllaç '%s'"
+msgstr "s'ha produït un error en crear l'enllaç «%s»"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
-msgstr "s'ha produït un error en copiar el fitxer a '%s'"
+msgstr "s'ha produït un error en copiar el fitxer a «%s»"
-#: builtin/clone.c:470
+#: builtin/clone.c:471
#, c-format
msgid "done.\n"
msgstr "fet.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:483
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6761,101 +6908,101 @@
"'git status' i tornar a intentar l'agafament amb\n"
"'git checkout -f HEAD'\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:560
#, 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:654
+#: builtin/clone.c:655
msgid "remote did not send all necessary objects"
msgstr "el remot no ha enviat tots els objectes necessaris"
-#: builtin/clone.c:670
+#: builtin/clone.c:671
#, c-format
msgid "unable to update %s"
msgstr "no s'ha pogut actualitzar %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:720
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
"el HEAD remot es refereix a una referència que no existeix; no s'ha pogut "
"agafar.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "no s'ha pogut agafar l'arbre de treball"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
-msgstr "no s'ha pogut escriure els paràmetres al fitxer de configuració"
+msgstr "no s'han pogut escriure els paràmetres al fitxer de configuració"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "no es pot reempaquetar per a netejar"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "no es pot desenllaçar el fitxer d'alternatives temporal"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1944
msgid "Too many arguments."
msgstr "Hi ha massa paràmetres."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Heu d'especificar un dipòsit per a clonar."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les opcions --bare i --origin %s són incompatibles."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare i --separate-git-dir són incompatibles."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
-msgstr "el dipòsit '%s' no existeix"
+msgstr "el dipòsit «%s» no existeix"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1360
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profunditat %s no és nombre positiu"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, 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."
+msgstr "el camí destí «%s» ja existeix i no és un directori buit."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
-msgstr "l'arbre de treball '%s' ja existeix."
+msgstr "l'arbre de treball «%s» ja existeix."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:240 builtin/worktree.c:270
#, c-format
msgid "could not create leading directories of '%s'"
-msgstr "no s'han pogut crear els directoris inicials de '%s'"
+msgstr "no s'han pogut crear els directoris inicials de «%s»"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
-msgstr "no s'ha pogut crear el directori d'arbre de treball '%s'"
+msgstr "no s'ha pogut crear el directori d'arbre de treball «%s»"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
-msgstr "S'està clonant al dipòsit nu '%s'...\n"
+msgstr "S'està clonant al dipòsit nu «%s»...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
-msgstr "S'està clonant a '%s'...\n"
+msgstr "S'està clonant a «%s»...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6863,39 +7010,39 @@
"clone --recursive no és compatible amb ambdós --reference i --reference-if-"
"able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
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:1069
+#: builtin/clone.c:1073
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:1071
+#: builtin/clone.c:1075
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:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "el dipòsit font és superficial, s'està ignorant --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local s'ignora"
-#: builtin/clone.c:1083
+#: builtin/clone.c:1087
#, c-format
msgid "Don't know how to clone %s"
msgstr "No se sap com clonar %s"
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1142 builtin/clone.c:1150
#, 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:1149
+#: builtin/clone.c:1153
msgid "You appear to have cloned an empty repository."
msgstr "Sembla que heu clonat un dipòsit buit."
@@ -6953,9 +7100,9 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"S'han configurat el vostre nom i adreça de correu electrònic\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. Si\n"
-"us plau, comproveu que siguin correctes. Podeu suprimir aquest\n"
+"S'han configurat el vostre nom i adreça electrònica\n"
+"automàticament basats 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"
"fitxer de configuració:\n"
@@ -6979,9 +7126,9 @@
"\n"
" git commit --amend --reset-author\n"
msgstr ""
-"S'han configurat el vostre nom i adreça de correu electrònic\n"
-"automàticament basats en el vostre nom d'usuari i nom de màquina. Si\n"
-"us plau, comproveu que siguin correctes. Podeu suprimir aquest\n"
+"S'han configurat el vostre nom i adreça electrònica\n"
+"automàticament basats 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:\n"
"\n"
" git config --global user.name \"El Vostre Nom\"\n"
@@ -7019,7 +7166,7 @@
#: builtin/commit.c:86
msgid "Otherwise, please use 'git reset'\n"
-msgstr "D'altra manera, si us plau, useu 'git reset'\n"
+msgstr "D'altra manera, useu «git reset»\n"
#: builtin/commit.c:89
msgid ""
@@ -7037,61 +7184,61 @@
"Llavors \"git cherry-pick --continue\" reprendrà\n"
"com a «cherry pick» les comissions restants.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
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
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "no s'ha pogut crear un índex temporal"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "l'afegiment interactiu ha fallat"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "no s'ha pogut actualitzar l'índex temporal"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
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:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "no s'ha pogut escriure el fitxer new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "no es pot fer una comissió parcial durant una fusió."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
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:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "no es pot llegir l'índex"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "no s'ha pogut escriure un fitxer d'índex temporal"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
-msgstr "a la comissió '%s' li manca la capçalera d'autor"
+msgstr "a la comissió «%s» li manca la capçalera d'autor"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
-msgstr "la comissió '%s' té una línia d'autor mal formada"
+msgstr "la comissió «%s» té una línia d'autor mal formada"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "paràmetre --author mal format"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -7099,38 +7246,38 @@
"no es pot seleccionar un caràcter de comentari que\n"
"no sigui usat en el missatge de comissió actual"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1100
#, c-format
msgid "could not lookup commit %s"
msgstr "no s'ha pogut trobar la comissió %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, 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:707
+#: builtin/commit.c:711
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:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de registre '%s'"
+msgstr "no s'ha pogut llegir el fitxer de registre «%s»"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "no s'ha pogut llegir SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "no s'ha pogut llegir MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "no s'ha pogut escriure la plantilla de comissió"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7141,11 +7288,11 @@
msgstr ""
"\n"
"Sembla que podeu estar cometent una fusió.\n"
-"Si això no és correcte, si us plau, elimineu el fitxer\n"
+"Si això no és correcte, elimineu el fitxer\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7156,174 +7303,174 @@
msgstr ""
"\n"
"Sembla que podeu estar cometent un «cherry pick».\n"
-"Si això no és correcte, si us plau, elimineu el fitxer\n"
+"Si això no és correcte, elimineu el fitxer\n"
"\t%s\n"
"i intenteu-ho de nou.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, 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 ""
-"Si us plau, introduïu el missatge de comissió dels vostres canvis.\n"
+"Introduïu el missatge de comissió dels vostres canvis.\n"
"S'ignoraran les línies començant amb '%c', i un missatge de\n"
"comissió buit avorta la comissió.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, 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 ""
-"Si us plau, introduïu el missatge de comissió dels vostres canvis.\n"
-"Es retindran les línies començants amb '%c'; podeu eliminar-les vosaltres\n"
+"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:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sData: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sComitent: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "No es pot llegir l'índex"
-#: builtin/commit.c:951
+#: builtin/commit.c:958
msgid "Error building trees"
msgstr "Error en construir arbres"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:972 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
-msgstr "Si us plau, proveïu el missatge usant l'opció -m o l'opció -F.\n"
+msgstr "Especifiqueu el missatge usant l'opció -m o l'opció -F.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1075
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-"--author '%s' no és 'Nom <adreça-de-correu-electrònic>' i no coincideix amb\n"
+"--author «%s» no és «Nom <adreça-electrònica>» i no coincideix amb\n"
"cap autor existent"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090 builtin/commit.c:1335
#, c-format
msgid "Invalid untracked files mode '%s'"
-msgstr "Mode de fitxers no seguits no vàlid '%s'"
+msgstr "Mode de fitxers no seguits no vàlid «%s»"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1128
msgid "--long and -z are incompatible"
msgstr "--long i -z són incompatibles"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1158
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:1160
+#: builtin/commit.c:1167
msgid "You have nothing to amend."
msgstr "No teniu res a esmenar."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1170
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Esteu enmig d'una fusió -- no es pot esmenar."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1172
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:1168
+#: builtin/commit.c:1175
msgid "Options --squash and --fixup cannot be used together"
msgstr "Les opcions --squash i --fixup no es poden usar juntes"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1185
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:1180
+#: builtin/commit.c:1187
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'opció -m no es pot combinar amb -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1195
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:1205
+#: builtin/commit.c:1212
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:1207
+#: builtin/commit.c:1214
msgid "No paths with --include/--only does not make sense."
msgstr "--include/--only no té sentit sense camí."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1226 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de neteja no vàlid %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1231
msgid "Paths with -a does not make sense."
msgstr "-a no té sentit amb camins."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1349 builtin/commit.c:1626
msgid "show status concisely"
msgstr "mostra l'estat concisament"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1351 builtin/commit.c:1628
msgid "show branch information"
msgstr "mostra la informació de branca"
-#: builtin/commit.c:1346
-#, fuzzy
+#: builtin/commit.c:1353
msgid "show stash information"
-msgstr "mostra la informació de branca"
+msgstr "mostra la informació de «stash»"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1355
msgid "version"
msgstr "versió"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1355 builtin/commit.c:1630 builtin/push.c:530
+#: builtin/worktree.c:469
msgid "machine-readable output"
msgstr "sortida llegible per màquina"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1358 builtin/commit.c:1632
msgid "show status in long format (default)"
msgstr "mostra l'estat en format llarg (per defecte)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1361 builtin/commit.c:1635
msgid "terminate entries with NUL"
msgstr "acaba les entrades amb NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1363 builtin/commit.c:1638 builtin/fast-export.c:999
+#: builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1364 builtin/commit.c:1638
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"mostra els fitxers no seguits, modes opcionals: all, normal, no. (Per "
"defecte: all)"
-#: builtin/commit.c:1360
+#: builtin/commit.c:1367
msgid "show ignored files"
msgstr "mostra els fitxers ignorats"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1368 parse-options.h:155
msgid "when"
msgstr "quan"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1369
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7331,202 +7478,203 @@
"ignora els canvis als submòduls, opcional quan: all, dirty, untracked. (Per "
"defecte: all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1371
msgid "list untracked files in columns"
msgstr "mostra els fitxers no seguits en columnes"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1449
msgid "couldn't look up newly created commit"
msgstr "no s'ha pogut trobar la comissió novament creada"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1451
msgid "could not parse newly created commit"
msgstr "no s'ha pogut analitzar la comissió novament creada"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1496
msgid "detached HEAD"
msgstr "HEAD separat"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1499
msgid " (root-commit)"
msgstr " (comissió d'arrel)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1596
msgid "suppress summary after successful commit"
msgstr "omet el resum després d'una comissió reeixida"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1597
msgid "show diff in commit message template"
msgstr "mostra la diferència en la plantilla de missatge de comissió"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1599
msgid "Commit message options"
msgstr "Opcions de missatge de comissió"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1600 builtin/tag.c:388
msgid "read message from file"
msgstr "llegiu el missatge des d'un fitxer"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "author"
msgstr "autor"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1601
msgid "override author for commit"
msgstr "autor corregit de la comissió"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1602 builtin/gc.c:359
msgid "date"
msgstr "data"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1602
msgid "override date for commit"
msgstr "data corregida de la comissió"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1603 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "missatge"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1603
msgid "commit message"
msgstr "missatge de comissió"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1604 builtin/commit.c:1605 builtin/commit.c:1606
+#: builtin/commit.c:1607 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "comissió"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1604
msgid "reuse and edit message from specified commit"
msgstr "reusa i edita el missatge de la comissió especificada"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1605
msgid "reuse message from specified commit"
msgstr "reusa el missatge de la comissió especificada"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1606
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a corregir la comissió "
"especificada"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1607
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"usa el missatge formatat de «squash» automàtic per a «squash» a la comissió "
"especificada"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1608
msgid "the commit is authored by me now (used with -C/-c/--amend)"
-msgstr "l'autor de la comissió ja sóc jo (s'usa amb -C/-c/--amend)"
+msgstr "l'autor de la comissió ja soc jo (s'usa amb -C/-c/--amend)"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1609 builtin/log.c:1436 builtin/merge.c:239
+#: builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "afegeix Signed-off-by:"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1610
msgid "use specified template file"
msgstr "usa el fitxer de plantilla especificat"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1611
msgid "force edit of commit"
msgstr "força l'edició de la comissió"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1612
msgid "default"
msgstr "per defecte"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1612 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "com suprimir els espais i #comentaris del missatge"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1613
msgid "include status in commit message template"
msgstr "inclou l'estat en la plantilla de missatge de comissió"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1615 builtin/merge.c:237 builtin/pull.c:173
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "signa la comissió amb GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1618
msgid "Commit contents options"
msgstr "Opcions dels continguts de les comissions"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1619
msgid "commit all changed files"
msgstr "comet tots els fitxers canviats"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1620
msgid "add specified files to index for commit"
msgstr "afegeix els fitxers especificats a l'índex per a cometre"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1621
msgid "interactively add files"
msgstr "afegeix els fitxers interactivament"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1622
msgid "interactively add changes"
msgstr "afegeix els canvis interactivament"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1623
msgid "commit only specified files"
msgstr "comet només els fitxers especificats"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1624
msgid "bypass pre-commit and commit-msg hooks"
-msgstr "evita els ganxos de precomissió i missatge de comissió"
+msgstr "evita els lligams de precomissió i missatge de comissió"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1625
msgid "show what would be committed"
msgstr "mostra què es cometria"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1636
msgid "amend previous commit"
msgstr "esmena la comissió anterior"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1637
msgid "bypass post-rewrite hook"
-msgstr "evita el ganxo de post escriptura"
+msgstr "evita el lligam de post escriptura"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1642
msgid "ok to record an empty change"
msgstr "està bé registrar un canvi buit"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1644
msgid "ok to record a change with an empty message"
msgstr "està bé registrar un canvi amb missatge buit"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1674
msgid "could not parse HEAD commit"
msgstr "no s'ha pogut analitzar la comissió HEAD"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1719
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fitxer MERGE_HEAD malmès (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1726
msgid "could not read MERGE_MODE"
msgstr "no s'ha pogut llegir MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1745
#, c-format
msgid "could not read commit message: %s"
msgstr "no s'ha pogut llegir el missatge de comissió: %s"
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1756
#, 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:1800
+#: builtin/commit.c:1761
+#, 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:1809
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7535,7 +7683,7 @@
"S'ha actualitzat el dipòsit, però no es pot escriure el\n"
"fitxer new_index. Comproveu que el disc no estigui ple i\n"
"que la quota no estigui excedida, i després\n"
-"\"git reset HEAD\" per a recuperar."
+"«git reset HEAD» per a recuperar."
#: builtin/config.c:10
msgid "git config [<options>]"
@@ -7628,7 +7776,7 @@
#: builtin/config.c:77
msgid "find the color setting: slot [stdout-is-tty]"
-msgstr "troba l'ajust de color: ranura [stdout-és-tty]"
+msgstr "troba el paràmetre de color: ranura [stdout-és-tty]"
#: builtin/config.c:78
msgid "Type"
@@ -7687,34 +7835,33 @@
msgstr ""
"# Això és el fitxer de configuració del Git de l'usuari.\n"
"[user]\n"
-"# Si us plau, adapteu i descomenteu les línies següents:\n"
+"# Adapteu i descomenteu les línies següents:\n"
"#\tname = %s\n"
"#\temail = %s\n"
#: builtin/config.c:499
-#, fuzzy
msgid "--local can only be used inside a git repository"
-msgstr "--cached fora d'un dipòsit"
+msgstr "--local només es pot usar dins d'un dipòsit git"
-#: builtin/config.c:621
+#: builtin/config.c:624
#, c-format
msgid "cannot create configuration file %s"
-msgstr "no es pot crear el fitxer de configuració '%s'"
+msgstr "no es pot crear el fitxer de configuració %s"
-#: builtin/config.c:633
+#: builtin/config.c:637
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-"no es pot sobreescriure múltiples valors amb un sol valor\n"
+"no es poden sobreescriure múltiples valors amb un sol valor\n"
" Useu una expressió regular, --add o --replace-all per a canviar %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "imprimeix les mides en un format llegible pels humans"
@@ -7738,70 +7885,70 @@
msgid "annotated"
msgstr "anotat"
-#: builtin/describe.c:253
+#: builtin/describe.c:264
#, c-format
msgid "annotated tag %s not available"
msgstr "l'etiqueta anotada %s no és disponible"
-#: builtin/describe.c:257
+#: builtin/describe.c:268
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'etiqueta anotada %s no té nom incrustat"
-#: builtin/describe.c:259
+#: builtin/describe.c:270
#, c-format
msgid "tag '%s' is really '%s' here"
-msgstr "l'etiqueta '%s' realment és '%s' aquí"
+msgstr "l'etiqueta «%s» realment és «%s» aquí"
-#: builtin/describe.c:286 builtin/log.c:489
+#: builtin/describe.c:297 builtin/log.c:493
#, c-format
msgid "Not a valid object name %s"
msgstr "%s no és un nom d'objecte vàlid"
-#: builtin/describe.c:289
+#: builtin/describe.c:300
#, c-format
msgid "%s is not a valid '%s' object"
-msgstr "%s no és un objecte de '%s' vàlid"
+msgstr "%s no és un objecte de «%s» vàlid"
-#: builtin/describe.c:306
+#: builtin/describe.c:317
#, c-format
msgid "no tag exactly matches '%s'"
-msgstr "cap etiqueta coincideix exactament amb '%s'"
+msgstr "cap etiqueta coincideix exactament amb «%s»"
-#: builtin/describe.c:308
+#: builtin/describe.c:319
#, c-format
msgid "searching to describe %s\n"
msgstr "s'està cercant per a descriure %s\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:366
#, c-format
msgid "finished search at %s\n"
msgstr "s'ha finalitzat la cerca a %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:393
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-"Cap etiqueta anotada pot descriure '%s'.\n"
+"Cap etiqueta anotada pot descriure «%s».\n"
"No obstant, hi havia etiquetes no anotades: proveu --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:397
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-"Cap etiqueta pot descriure '%s'.\n"
+"Cap etiqueta pot descriure «%s».\n"
"Proveu --always, o creeu algunes etiquetes."
-#: builtin/describe.c:416
+#: builtin/describe.c:427
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu comissions travessades\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:430
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7810,203 +7957,206 @@
"s'han trobat més de %i etiquetes: s'han llistat les %i més recents\n"
"s'ha renunciat la cerca a %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:452
msgid "find the tag that comes after the commit"
msgstr "troba l'etiqueta que vingui després de la comissió"
-#: builtin/describe.c:442
+#: builtin/describe.c:453
msgid "debug search strategy on stderr"
msgstr "estratègia de cerca de depuració en stderr"
-#: builtin/describe.c:443
+#: builtin/describe.c:454
msgid "use any ref"
msgstr "usa qualsevol referència"
-#: builtin/describe.c:444
+#: builtin/describe.c:455
msgid "use any tag, even unannotated"
msgstr "usa qualsevol etiqueta, fins i tot aquelles sense anotar"
-#: builtin/describe.c:445
+#: builtin/describe.c:456
msgid "always use long format"
msgstr "sempre usa el format llarg"
-#: builtin/describe.c:446
+#: builtin/describe.c:457
msgid "only follow first parent"
msgstr "només segueix la primera mare"
-#: builtin/describe.c:449
+#: builtin/describe.c:460
msgid "only output exact matches"
msgstr "emet només coincidències exactes"
-#: builtin/describe.c:451
+#: builtin/describe.c:462
msgid "consider <n> most recent tags (default: 10)"
msgstr "considera les <n> etiquetes més recents (per defecte: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:464
msgid "only consider tags matching <pattern>"
msgstr "només considera les etiquetes que coincideixen amb <patró>"
-#: builtin/describe.c:455
+#: builtin/describe.c:466
msgid "do not consider tags matching <pattern>"
msgstr "no consideris les etiquetes que no coincideixen amb <patró>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:468 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "mostra l'objecte de comissió abreviat com a sistema alternatiu"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:469 builtin/describe.c:472
msgid "mark"
msgstr "marca"
-#: builtin/describe.c:459
+#: builtin/describe.c:470
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:473
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "annexa <marca> en l'arbre de treball brut (per defecte: \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:491
msgid "--long is incompatible with --abbrev=0"
msgstr "--long és incompatible amb --abbrev=0"
-#: builtin/describe.c:509
+#: builtin/describe.c:520
msgid "No names found, cannot describe anything."
msgstr "No s'ha trobat cap nom, no es pot descriure res."
-#: builtin/describe.c:552
+#: builtin/describe.c:563
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty és incompatible amb les comissions"
-#: builtin/describe.c:554
+#: builtin/describe.c:565
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken és incompatible amb les comissions"
#: builtin/diff.c:83
#, c-format
msgid "'%s': not a regular file or symlink"
-msgstr "'%s': no és ni fitxer regular ni enllaç simbòlic"
+msgstr "«%s»: no és ni fitxer regular ni enllaç simbòlic"
#: builtin/diff.c:235
#, c-format
msgid "invalid option: %s"
msgstr "opció no vàlida: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:357
msgid "Not a git repository"
msgstr "No és un dipòsit de git"
-#: builtin/diff.c:402
+#: builtin/diff.c:400
#, c-format
msgid "invalid object '%s' given."
-msgstr "s'ha donat un objecte no vàlid '%s'."
+msgstr "s'ha donat un objecte no vàlid «%s»."
-#: builtin/diff.c:411
+#: builtin/diff.c:409
#, c-format
msgid "more than two blobs given: '%s'"
-msgstr "s'ha donat més de dos blobs: '%s"
+msgstr "s'ha donat més de dos blobs: «%s»"
-#: builtin/diff.c:416
+#: builtin/diff.c:414
#, c-format
msgid "unhandled object '%s' given."
-msgstr "s'ha donat l'objecte no gestionat '%s'."
+msgstr "s'ha donat l'objecte no gestionat «%s»."
#: builtin/difftool.c:29
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<opcions>] [<commit> [<commit>]] [--] [<camí>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "ha fallat: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "no s'ha pogut llegir l'enllaç simbòlic %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, 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:301
+#: builtin/difftool.c:311
#, 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:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
+"els formats de diff combinats ('-c' and '--cc') no són admesos \n"
+"en el mode diff per directoris ('-d' and '--dir-diff')."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:633
#, c-format
msgid "both files modified: '%s' and '%s'."
-msgstr "s'han modificat ambdós fitxers: '%s' i '%s'."
+msgstr "s'han modificat ambdós fitxers: «%s» i «%s»."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:635
msgid "working tree file has been left."
msgstr "s'ha deixat un fitxer de l'arbre de treball."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:646
#, c-format
msgid "temporary files exist in '%s'."
msgstr "existeix un fitxer temporal a %s'."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:647
msgid "you may want to cleanup or recover these."
msgstr "podeu netejar o recuperar-los."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:696
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utilitza `diff.guitool` en comptes de `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:698
msgid "perform a full-directory diff"
msgstr "fes un diff de tot el directori"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:700
msgid "do not prompt before launching a diff tool"
msgstr "no preguntis abans d'executar l'eina diff"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:706
msgid "use symlinks in dir-diff mode"
msgstr "utilitza enllaços simbòlics en mode dir-diff"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:707
msgid "<tool>"
msgstr "<tool>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:708
msgid "use the specified diff tool"
msgstr "utilitza l'eina de diff especificada"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:710
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"imprimeix una llista de totes les eines diff que podeu usar amb `--tool`"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:713
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
+"fes que 'git-difftool' surti quan l'eina de diff invocada torna un codi de sortida diferent de zero"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:715
msgid "<command>"
msgstr "<command>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:716
msgid "specify a custom command for viewing diffs"
msgstr "especifiqueu una ordre personalitzada per veure diffs"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:740
msgid "no <tool> given for --tool=<tool>"
msgstr "no s'ha proporcionat <tool> per --tool=<tool>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:747
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "no s'ha proporcionat <cmd> per --extcmd=<cmd>"
@@ -8014,232 +8164,233 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [opcions-de-llista-de-revisions]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "mostra el progrés després de <n> objectes"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "selecciona la gestió de les etiquetes signades"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "selecciona la gestió de les etiquetes que etiquetin objectes filtrats"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Bolca les marques a aquest fitxer"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Importa les marques d'aquest fitxer"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "Fingeix un etiquetador quan els en manca un a les etiquetes"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Imprimeix l'arbre complet de cada comissió"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Usa la característica done per a acabar el corrent"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Omet l'emissió de dades de blob"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "especificació de referència"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Aplica l'especificació de referència a les referències exportades"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "anonimitza la sortida"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:23
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:24
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<opcions>] <grup>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:25
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<opcions>] [(<dipòsit> | <grup>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:26
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<opcions>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:112 builtin/pull.c:182
msgid "fetch from all remotes"
msgstr "obtén de tots els remots"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:114 builtin/pull.c:185
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "annexa a .git/FETCH_HEAD en lloc de sobreescriure"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:116 builtin/pull.c:188
msgid "path to upload pack on remote end"
msgstr "camí al qual pujar el paquet al costat remot"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:117 builtin/pull.c:190
msgid "force overwrite of local branch"
msgstr "força la sobreescriptura de la branca local"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:119
msgid "fetch from multiple remotes"
msgstr "obtén de múltiples remots"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:121 builtin/pull.c:192
msgid "fetch all tags and associated objects"
msgstr "obtén totes les etiquetes i tots els objectes associats"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:123
msgid "do not fetch all tags (--no-tags)"
msgstr "no obtinguis les etiquetes (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:125
msgid "number of submodules fetched in parallel"
msgstr "nombre de submòduls obtinguts en paral·lel"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:127 builtin/pull.c:195
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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:128 builtin/fetch.c:151 builtin/pull.c:123
msgid "on-demand"
msgstr "sota demanda"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:129
msgid "control recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:133 builtin/pull.c:203
msgid "keep downloaded pack"
msgstr "retén el paquet baixat"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:135
msgid "allow updating of HEAD ref"
msgstr "permet l'actualització de la referència HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:138 builtin/fetch.c:144 builtin/pull.c:206
msgid "deepen history of shallow clone"
msgstr "aprofundeix la història d'un clon superficial"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:140
msgid "deepen history of shallow repository based on time"
msgstr "aprofundeix la història d'un clon superficial basat en temps"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:146 builtin/pull.c:209
msgid "convert to a complete repository"
msgstr "converteix en un dipòsit complet"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:148 builtin/log.c:1456
msgid "dir"
msgstr "directori"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:149
msgid "prepend this to submodule path output"
msgstr "anteposa això a la sortida de camí del submòdul"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:152
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ó)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:156 builtin/pull.c:212
msgid "accept refs that update .git/shallow"
msgstr "accepta les referències que actualitzin .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:157 builtin/pull.c:214
msgid "refmap"
msgstr "mapa de referències"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:158 builtin/pull.c:215
msgid "specify fetch refmap"
msgstr "mostra el mapa de referències d'obtenció"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:416
msgid "Couldn't find remote ref HEAD"
msgstr "No s'ha pogut trobar la referència HEAD remota"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:534
#, 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:605
+#: builtin/fetch.c:627
#, c-format
msgid "object %s not found"
msgstr "objecte %s no trobat"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:631
msgid "[up to date]"
msgstr "[al dia]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:644 builtin/fetch.c:724
msgid "[rejected]"
msgstr "[rebutjat]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:645
msgid "can't fetch in current branch"
msgstr "no es pot obtenir en la branca actual"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:654
msgid "[tag update]"
msgstr "[actualització d'etiqueta]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:655 builtin/fetch.c:688 builtin/fetch.c:704
+#: builtin/fetch.c:719
msgid "unable to update local ref"
msgstr "no s'ha pogut actualitzar la referència local"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:674
msgid "[new tag]"
msgstr "[etiqueta nova]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:677
msgid "[new branch]"
msgstr "[branca nova]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:680
msgid "[new ref]"
msgstr "[referència nova]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:719
msgid "forced update"
msgstr "actualització forçada"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:724
msgid "non-fast-forward"
msgstr "sense avanç ràpid"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:769
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s no ha enviat tots els objectes necessaris\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:789
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"rebutja %s perquè no es permet que les arrels superficials s'actualitzin"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:877 builtin/fetch.c:973
#, c-format
msgid "From %.*s\n"
msgstr "De %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:888
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8249,96 +8400,96 @@
" intenteu executar 'git remote prune %s' per a eliminar\n"
" qualsevol branca antiga o conflictiva"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:943
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s es tornarà penjant)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:944
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s s'ha tornat penjant)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:976
msgid "[deleted]"
msgstr "[suprimit]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:977 builtin/remote.c:1024
msgid "(none)"
msgstr "(cap)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1000
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "S'està refusant obtenir en la branca actual %s d'un dipòsit no nu"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1019
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "L'opció \"%s\" amb valor \"%s\" no és vàlida per a %s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1022
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "S'ignora l'opció \"%s\" per a %s\n"
-#: builtin/fetch.c:1076
+#: builtin/fetch.c:1098
#, c-format
msgid "Don't know how to fetch from %s"
msgstr "No se sap com obtenir de %s"
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1258
#, c-format
msgid "Fetching %s\n"
msgstr "S'està obtenint %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1260 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "No s'ha pogut obtenir %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1278
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr ""
-"Cap dipòsit remot especificat. Si us plau, especifiqueu un URL o\n"
+"Cap dipòsit remot especificat. Especifiqueu un URL o\n"
"un nom remot del qual es deuen obtenir les revisions noves."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1301
msgid "You need to specify a tag name."
msgstr "Necessiteu especificar un nom d'etiqueta."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1344
msgid "Negative depth in --deepen is not supported"
msgstr "No s'admet una profunditat negativa en --deepen"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1346
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen i --depth són mutualment exclusius"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1351
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth i --unshallow no es poden usar junts"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1353
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow en un dipòsit complet no té sentit"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1366
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all no accepta un paràmetre de dipòsit"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1368
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all no té sentit amb especificacions de referència"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1379
#, c-format
msgid "No such remote or remote group: %s"
msgstr "No hi ha tal remot ni tal grup remot: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1387
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Obtenir un grup i especificar referències no té sentit"
@@ -8348,23 +8499,23 @@
msgstr ""
"git fmt-merge-msg [-m <missatge>] [--log[=<n>] | --no-log] [--file <fitxer>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:665
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:667
+#: builtin/fmt-merge-msg.c:668
msgid "alias for --log (deprecated)"
msgstr "àlies per --log (en desús)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:671
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:672
msgid "use <text> as start of message"
msgstr "usa <text> com a inici de missatge"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:673
msgid "file to read from"
msgstr "fitxer del qual llegir"
@@ -8383,7 +8534,7 @@
#: 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ó>]]"
+"git for-each-ref [--contains [<comissió>]] [--no-contains [<comissió>]]"
#: builtin/for-each-ref.c:28
msgid "quote placeholders suitably for shells"
@@ -8406,101 +8557,105 @@
msgid "show only <n> matched refs"
msgstr "mostra només <n> referències coincidents"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respecta els colors del format"
+
+#: builtin/for-each-ref.c:43
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:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "imprimeix només les referències que s'han fusionat"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
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:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "imprimeix només les referències que continguin la comissió"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "imprimeix només les referències que no continguin la comissió"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "S'estan comprovant els directoris d'objecte"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<opcions>] [<objecte>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "mostra els objectes inabastables"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "mostra els objectes penjants"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "informa de les etiquetes"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "informa dels nodes d'arrel"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "fes els objectes d'índex nodes de cap"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "fes que els registres de referències siguin nodes de cap (per defecte)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "també considera els paquets i els objectes alternatius"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "comprova només la connectivitat"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "habilita la comprovació més estricta"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "escriu objectes penjants a .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "mostra el progrés"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "mostra els noms detallats dels objectes abastables"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "S'estan comprovant els objectes"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<opcions>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "S'ha produït un error en fer fstat %s: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "No es pot fer stat en %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8509,58 +8664,58 @@
"\n"
"%s"
msgstr ""
-"L'última execució de gc ha informat el següent. Si us plau, corregiu\n"
+"L'última execució de gc ha informat el següent. Corregiu\n"
"la causa primordial i elimineu %s.\n"
"No es realitzarà la neteja automàtica fins que s'elimini el fitxer.\n"
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "poda objectes sense referència"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "sigues més exhaustiu (el temps d'execució augmenta)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "habilita el mode de recollida d'escombraries automàtica"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "força l'execució de gc encara que hi pugui haver un altre gc executant"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "No s'ha pogut analitzar el valor gc.logexpiry %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
"S'està empaquetant el dipòsit automàticament en el fons per rendiment "
"òptim.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "S'està empaquetant automàticament el dipòsit per rendiment òptim.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Vegeu \"git help gc\" per neteja manual.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, 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:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8571,12 +8726,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<opcions>] [-e] <patró> [<revisió>...] [[--] <camí>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: s'ha produït un error en crear fil: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, 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"
@@ -8585,254 +8740,245 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1693
#, c-format
msgid "no threads support, ignoring %s"
msgstr "no hi ha suport de fils, s'està ignorant %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:451 builtin/grep.c:571 builtin/grep.c:613
#, c-format
msgid "unable to read tree (%s)"
msgstr "no s'ha pogut llegir l'arbre (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:628
#, 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:912
+#: builtin/grep.c:694
#, c-format
msgid "switch `%c' expects a numerical value"
-msgstr "l'opció `%c' espera un valor numèric"
+msgstr "l'opció «%c» espera un valor numèric"
-#: builtin/grep.c:999
+#: builtin/grep.c:781
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:1001
+#: builtin/grep.c:783
msgid "find in contents not managed by git"
msgstr "cerca en continguts no gestionats per git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:785
msgid "search in both tracked and untracked files"
msgstr "cerca tant en fitxers seguits com en no seguits"
-#: builtin/grep.c:1005
+#: builtin/grep.c:787
msgid "ignore files specified via '.gitignore'"
msgstr "ignora els fitxers especificats mitjançant '.gitignore'"
-#: builtin/grep.c:1007
+#: builtin/grep.c:789
msgid "recursively search in each submodule"
msgstr "cerca recursivament a cada submòdul"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nom base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "anteposa això a la sortida del nom base del projecte pare"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:792
msgid "show non-matching lines"
msgstr "mostra les línies no coincidents"
-#: builtin/grep.c:1015
+#: builtin/grep.c:794
msgid "case insensitive matching"
msgstr "coincidència insensible a majúscula i minúscula"
-#: builtin/grep.c:1017
+#: builtin/grep.c:796
msgid "match patterns only at word boundaries"
msgstr "coincideix amb els patrons només als límits de paraula"
-#: builtin/grep.c:1019
+#: builtin/grep.c:798
msgid "process binary files as text"
msgstr "processa els fitxers binaris com a text"
-#: builtin/grep.c:1021
+#: builtin/grep.c:800
msgid "don't match patterns in binary files"
msgstr "no coincideixis amb els patrons en els fitxers binaris"
-#: builtin/grep.c:1024
+#: builtin/grep.c:803
msgid "process binary files with textconv filters"
msgstr "processa els fitxers binaris amb filtres de textconv"
-#: builtin/grep.c:1026
+#: builtin/grep.c:805
msgid "descend at most <depth> levels"
msgstr "descendeix com a màxim <profunditat> nivells"
-#: builtin/grep.c:1030
+#: builtin/grep.c:809
msgid "use extended POSIX regular expressions"
-msgstr "usa les expressions regulars POSIX esteses"
+msgstr "usa les expressions regulars POSIX ampliades"
-#: builtin/grep.c:1033
+#: builtin/grep.c:812
msgid "use basic POSIX regular expressions (default)"
msgstr "usa les expressions regulars POSIX bàsiques (per defecte)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:815
msgid "interpret patterns as fixed strings"
msgstr "interpreta els patrons com a cadenes fixes"
-#: builtin/grep.c:1039
+#: builtin/grep.c:818
msgid "use Perl-compatible regular expressions"
msgstr "usa les expressions regulars compatibles amb Perl"
-#: builtin/grep.c:1042
+#: builtin/grep.c:821
msgid "show line numbers"
msgstr "mostra els números de línia"
-#: builtin/grep.c:1043
+#: builtin/grep.c:822
msgid "don't show filenames"
msgstr "no mostris els noms de fitxer"
-#: builtin/grep.c:1044
+#: builtin/grep.c:823
msgid "show filenames"
msgstr "mostra els noms de fitxer"
-#: builtin/grep.c:1046
+#: builtin/grep.c:825
msgid "show filenames relative to top directory"
msgstr "mostra els noms de fitxer relatius al directori superior"
-#: builtin/grep.c:1048
+#: builtin/grep.c:827
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:1050
+#: builtin/grep.c:829
msgid "synonym for --files-with-matches"
msgstr "sinònim de --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:832
msgid "show only the names of files without match"
msgstr "mostra només els noms dels fitxers sense coincidència"
-#: builtin/grep.c:1055
+#: builtin/grep.c:834
msgid "print NUL after filenames"
msgstr "imprimeix NUL després dels noms de fitxer"
-#: builtin/grep.c:1057
+#: builtin/grep.c:836
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:1058
+#: builtin/grep.c:837
msgid "highlight matches"
msgstr "ressalta les coincidències"
-#: builtin/grep.c:1060
+#: builtin/grep.c:839
msgid "print empty line between matches from different files"
msgstr "imprimeix una línia buida entre coincidències de fitxers distints"
-#: builtin/grep.c:1062
+#: builtin/grep.c:841
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:1065
+#: builtin/grep.c:844
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:1068
+#: builtin/grep.c:847
msgid "show <n> context lines before matches"
msgstr "mostra <n> línies de context abans d'una coincidència"
-#: builtin/grep.c:1070
+#: builtin/grep.c:849
msgid "show <n> context lines after matches"
msgstr "mostra <n> línies de context després d'una coincidència"
-#: builtin/grep.c:1072
+#: builtin/grep.c:851
msgid "use <n> worker threads"
msgstr "usa <n> fils de treball"
-#: builtin/grep.c:1073
+#: builtin/grep.c:852
msgid "shortcut for -C NUM"
msgstr "drecera per -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:855
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:1078
+#: builtin/grep.c:857
msgid "show the surrounding function"
msgstr "mostra la funció circumdant"
-#: builtin/grep.c:1081
+#: builtin/grep.c:860
msgid "read patterns from file"
msgstr "llegeix els patrons des d'un fitxer"
-#: builtin/grep.c:1083
+#: builtin/grep.c:862
msgid "match <pattern>"
msgstr "coincideix amb <patró>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:864
msgid "combine patterns specified with -e"
msgstr "combina els patrons especificats amb -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:876
msgid "indicate hit with exit status without output"
msgstr "indica coincidència amb estat de sortida sense sortida textual"
-#: builtin/grep.c:1099
+#: builtin/grep.c:878
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:1101
+#: builtin/grep.c:880
msgid "show parse tree for grep expression"
-msgstr "mostra l'arbre d'anàlisis de l'expressió de grep"
+msgstr "mostra l'arbre d'anàlisi de l'expressió grep"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "pager"
msgstr "paginador"
-#: builtin/grep.c:1105
+#: builtin/grep.c:884
msgid "show matching files in the pager"
msgstr "mostra els fitxers coincidents en el paginador"
-#: builtin/grep.c:1108
+#: builtin/grep.c:887
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permet la invocació de grep(1) (ignorat per aquesta compilació)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:950
msgid "no pattern given."
msgstr "cap patró donat."
-#: builtin/grep.c:1204
+#: builtin/grep.c:982
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index o --untracked no es pot usar amb revisions"
-#: builtin/grep.c:1211
+#: builtin/grep.c:989
#, c-format
msgid "unable to resolve revision: %s"
msgstr "no s'ha pogut resoldre la revisió: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1023 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "s'ha especificat un nombre de fils no vàlid (%d)"
-#: builtin/grep.c:1250
-#, fuzzy
+#: builtin/grep.c:1028
msgid "no threads support, ignoring --threads"
-msgstr "no hi ha suport de fils, s'està ignorant %s"
+msgstr "no hi ha suport de fils, s'està ignorant --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1052
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:1304
+#: builtin/grep.c:1075
msgid "option not supported with --recurse-submodules."
msgstr "opció no admesa amb --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1081
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached o --untracked no es pot usar amb --no-index."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1087
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard no es pot usar per als continguts seguits."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1095
msgid "both --cached and trees are given."
msgstr "s'han donat ambdós --caches i arbres."
@@ -8862,7 +9008,7 @@
#: builtin/hash-object.c:98
msgid "read the object from stdin"
-msgstr "llegeix l'objecte des d'stdin"
+msgstr "llegeix l'objecte des de stdin"
#: builtin/hash-object.c:100
msgid "store file as is without filters"
@@ -8910,7 +9056,7 @@
#: builtin/help.c:67
#, c-format
msgid "unrecognized help format '%s'"
-msgstr "format d'ajuda no reconegut '%s'"
+msgstr "format d'ajuda no reconegut «%s»"
#: builtin/help.c:94
msgid "Failed to start emacsclient."
@@ -8923,185 +9069,185 @@
#: builtin/help.c:115
#, c-format
msgid "emacsclient version '%d' too old (< 22)."
-msgstr "la versió d'emacsclient '%d' és massa vella (< 22)."
+msgstr "la versió d'emacsclient «%d» és massa vella (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
-msgstr "s'ha produït un error en executar '%s'"
+msgstr "s'ha produït un error en executar «%s»"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-"'%s': camí a un visualitzador de manuals no compatible.\n"
-"Si us plau, considereu usar 'man.<eina>.cmd' en lloc d'això."
+"«%s»: camí a un visualitzador de manuals no compatible.\n"
+"Considereu usar 'man.<eina>.cmd' en lloc d'això."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-"'%s': ordre per a un visualitzador de manuals compatible.\n"
-"Si us plau, considereu usar 'man.<eina>.path' en lloc d'això."
+"«%s»: ordre per a un visualitzador de manuals compatible.\n"
+"Considereu usar 'man.<eina>.path' en lloc d'això."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
-msgstr "'%s': visualitzador de manuals desconegut."
+msgstr "«%s»: visualitzador de manuals desconegut."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "cap visualitzador de manuals ha gestionat la sol·licitud"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "cap visualitzador d'informació ha gestionat la sol·licitud"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "La definició d'atributs per camí"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git quotidià amb més o menys 20 ordres"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Un glossari de Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Especifica els fitxers intencionalment no seguits a ignorar"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "La definició de les propietats de submòduls"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "L'especificació de revisions i rangs per al Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Una introducció tutorial al Git (per a la versió 1.5.1 o més nova)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Una visió de conjunt de fluxos de treball recomanats amb Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Les guies de Git comunes són:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' és un àlies de `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "«%s» és un àlies de «%s»"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "ús: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "no s'ha pogut obrir %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "hi ha una discordança de tipus d'objecte a %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "no s'ha rebut l'objecte esperat %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
-msgstr "objecte %s: tipus %s esperat, %s trobat"
+msgstr "objecte %s: s'esperava el tipus %s, s'ha trobat %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "no es pot omplir %d octet"
msgstr[1] "no es pot omplir %d octets"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "EOF prematur"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "error de lectura d'entrada"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "s'han usat més octets que hi havia disponibles"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "el paquet supera la mida màxima permesa"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
-msgstr "no s'ha pogut crear '%s'"
+msgstr "no s'ha pogut crear «%s»"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
-msgstr "no es pot obrir el fitxer de paquet '%s'"
+msgstr "no es pot obrir el fitxer de paquet «%s»"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "hi ha una discordança de signatura de paquet"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la versió de paquet %<PRIu32> no és compatible"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
-msgstr "el paquet té un objecte dolent a la posició %<PRIuMAX>: %s"
+msgstr "el paquet té un objecte incorrecte a la posició %<PRIuMAX>: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "la inflació ha retornat %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
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:536
+#: builtin/index-pack.c:537
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:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "tipus d'objecte desconegut %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "no es pot fer pread en el fitxer de paquet"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -9109,224 +9255,224 @@
msgstr[1] ""
"el final del fitxer de paquet és prematur, manquen %<PRIuMAX> octets"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "hi ha una inconsistència seriosa d'inflació"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "S'HA TROBAT UNA COL·LISIÓ SHA1 AMB %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:168
+#: builtin/pack-objects.c:262
#, c-format
msgid "unable to read %s"
msgstr "no s'ha pogut llegir %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "no es pot llegir la informació d'objecte existent %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "no es pot llegir l'objecte existent %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "objecte de blob no vàlid %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "%s no vàlid"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Error en objecte"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "s'ha produït un error en aplicar la diferència"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "S'estan rebent objectes"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "S'estan indexant objectes"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "el paquet és malmès (discordança SHA1)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "no es pot fer fstat en el fitxer de paquet"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "el paquet té brossa al seu final"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusió més enllà de la bogeria en parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "S'estan resolent les diferències"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "no s'ha pogut crear fil: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "confusió més enllà de la bogeria"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, 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:1282
+#: builtin/index-pack.c:1283
#, 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:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "no s'ha pogut desinflar l'objecte annexat (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objecte local %s és malmès"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "error en tancar el fitxer de paquet"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
-msgstr "no es pot escriure el fitxer a retenir '%s'"
+msgstr "no es pot escriure el fitxer a mantenir «%s»"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
-msgstr "no es pot tancar el fitxer escrit a retenir '%s'"
+msgstr "no es pot tancar el fitxer escrit a mantenir «%s»"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "no es pot emmagatzemar el fitxer de paquet"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "no es pot emmagatzemar el fitxer d'índex"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
-msgstr "pack.indexversion=%<PRIu32> dolent"
+msgstr "pack.indexversion=%<PRIu32> incorrecte"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
-msgstr "No es pot obrir el fitxer de paquet existent '%s'"
+msgstr "No es pot obrir el fitxer de paquet existent «%s»"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, 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'"
+msgstr "No es pot obrir el fitxer d'índex de paquets existent de «%s»"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, 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:1609
+#: builtin/index-pack.c:1610
#, 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:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
-msgstr "el nom del fitxer de paquet '%s' no acaba amb '.pack'"
+msgstr "el nom del fitxer de paquet «%s» no acaba amb '.pack'"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1705 builtin/index-pack.c:1708
+#: builtin/index-pack.c:1724 builtin/index-pack.c:1728
#, c-format
msgid "bad %s"
-msgstr "%s dolent"
+msgstr "%s incorrecte"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1744
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin no es pot usar sense --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1746
msgid "--stdin requires a git repository"
-msgstr "--stdin requereix d'un dipòsit git"
+msgstr "--stdin requereix un dipòsit git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1754
msgid "--verify with no packfile name given"
msgstr "s'ha donat --verify sense nom de fitxer de paquet"
#: builtin/init-db.c:55
#, c-format
msgid "cannot stat '%s'"
-msgstr "no es pot fer stat en '%s'"
+msgstr "no es pot fer stat en «%s»"
#: builtin/init-db.c:61
#, c-format
msgid "cannot stat template '%s'"
-msgstr "no es pot fer stat en la plantilla '%s'"
+msgstr "no es pot fer stat en la plantilla «%s»"
#: builtin/init-db.c:66
#, c-format
msgid "cannot opendir '%s'"
-msgstr "no es pot fer opendir en el directori '%s'"
+msgstr "no es pot fer opendir en el directori «%s»"
#: builtin/init-db.c:77
#, c-format
msgid "cannot readlink '%s'"
-msgstr "no es pot fer readlink en '%s'"
+msgstr "no es pot fer readlink en «%s»"
#: builtin/init-db.c:79
#, c-format
msgid "cannot symlink '%s' '%s'"
-msgstr "no es pot fer symlink en '%s' '%s'"
+msgstr "no es pot fer symlink en «%s» «%s»"
#: builtin/init-db.c:85
#, c-format
msgid "cannot copy '%s' to '%s'"
-msgstr "no es pot copiar '%s' a '%s'"
+msgstr "no es pot copiar «%s» a «%s»"
#: builtin/init-db.c:89
#, c-format
@@ -9341,7 +9487,7 @@
#: builtin/init-db.c:135
#, c-format
msgid "not copying templates from '%s': %s"
-msgstr "no s'està copiant plantilles de '%s': %s"
+msgstr "no s'estan copiant plantilles de «%s»: %s"
#: builtin/init-db.c:328
#, c-format
@@ -9416,7 +9562,7 @@
#: builtin/init-db.c:574
#, c-format
msgid "Cannot access work tree '%s'"
-msgstr "No es pot accedir a l'arbre de treball '%s'"
+msgstr "No es pot accedir a l'arbre de treball «%s»"
#: builtin/interpret-trailers.c:15
msgid ""
@@ -9426,132 +9572,164 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<testimoni>[(=|:)<valor>])...] [<fitxer>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "edita els fitxers in situ"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "escurça els remolcs buits"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "on ubica"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "acció si el «trailer» ja existeix"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "acció si el «trailer» falta"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "mostra només els «trailer»"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "no apliquis les regles de configuració"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "uneix els valors continus amb espais en blanc"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "estableix les opcions d'anàlisi"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "remolc"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "remolcs a afegir"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer amb --only-input no té sentit"
+
+#: builtin/interpret-trailers.c:127
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:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<opcions>] [<rang-de-revisions>] [[--] <camí>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<opcions>] <objecte>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "opció --decorate no vàlida: %s"
-#: builtin/log.c:147
+#: builtin/log.c:148
msgid "suppress diff output"
msgstr "omet la sortida de diferències"
-#: builtin/log.c:148
+#: builtin/log.c:149
msgid "show source"
msgstr "mostra la font"
-#: builtin/log.c:149
+#: builtin/log.c:150
msgid "Use mail map file"
msgstr "Usa el fitxer de mapa de correu"
-#: builtin/log.c:150
+#: builtin/log.c:151
msgid "decorate options"
msgstr "opcions de decoració"
-#: builtin/log.c:153
+#: builtin/log.c:154
msgid "Process line range n,m in file, counting from 1"
msgstr "Processa el rang de línies n,m en el fitxer, comptant des d'1"
-#: builtin/log.c:249
+#: builtin/log.c:250
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortida final: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:501
#, c-format
msgid "git show %s: bad file"
-msgstr "git show %s: fitxer dolent"
+msgstr "git show %s: fitxer incorrecte"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:516 builtin/log.c:610
#, c-format
msgid "Could not read object %s"
msgstr "No es pot llegir l'objecte %s"
-#: builtin/log.c:630
+#: builtin/log.c:634
#, c-format
msgid "Unknown type: %d"
msgstr "Tipus desconegut: %d"
-#: builtin/log.c:751
+#: builtin/log.c:755
msgid "format.headers without value"
msgstr "format.headers sense valor"
-#: builtin/log.c:852
+#: builtin/log.c:856
msgid "name of output directory is too long"
msgstr "el nom del directori de sortida és massa llarg"
-#: builtin/log.c:868
+#: builtin/log.c:872
#, c-format
msgid "Cannot open patch file %s"
msgstr "No es pot obrir el fitxer de pedaç %s"
-#: builtin/log.c:885
+#: builtin/log.c:889
msgid "Need exactly one range."
msgstr "Cal exactament un rang."
-#: builtin/log.c:895
+#: builtin/log.c:899
msgid "Not a range."
msgstr "No és un rang."
-#: builtin/log.c:1001
+#: builtin/log.c:1005
msgid "Cover letter needs email format"
msgstr "La carta de presentació necessita el format de correu electrònic"
-#: builtin/log.c:1081
+#: builtin/log.c:1085
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to boig: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1112
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<opcions>] [<des-de> | <rang-de-revisions>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1162
msgid "Two output directories?"
msgstr "Hi ha dos directoris de sortida?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1269 builtin/log.c:1920 builtin/log.c:1922 builtin/log.c:1934
#, c-format
msgid "Unknown commit %s"
msgstr "Comissió desconeguda %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1279 builtin/notes.c:887 builtin/tag.c:516
#, 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."
+msgstr "S'ha produït un error en resoldre «%s» com a referència vàlida."
-#: builtin/log.c:1280
+#: builtin/log.c:1284
msgid "Could not find exact merge base."
msgstr "No s'ha pogut trobar la base exacta de fusió."
-#: builtin/log.c:1284
+#: builtin/log.c:1288
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"
@@ -9559,330 +9737,338 @@
msgstr ""
"S'ha produït un error en obtenir la font. Si voleu registrar la comissió "
"base\n"
-"automàticament, si us plau, useu git branch --set-upstream-to per a\n"
+"automàticament, useu git branch --set-upstream-to per a\n"
"seguir una branca remota. O podeu especificar la comissió base manualment\n"
"amb --base=<id-de-comissió-base>."
-#: builtin/log.c:1304
+#: builtin/log.c:1308
msgid "Failed to find exact merge base"
msgstr "S'ha produït un error en trobar la base exacta de fusió."
-#: builtin/log.c:1315
+#: builtin/log.c:1319
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:1319
+#: builtin/log.c:1323
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:1368
+#: builtin/log.c:1372
msgid "cannot get patch id"
msgstr "no es pot obtenir l'id del pedaç"
-#: builtin/log.c:1425
+#: builtin/log.c:1431
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:1428
+#: builtin/log.c:1434
msgid "use [PATCH] even with multiple patches"
msgstr "usa [PATCH] fins i tot amb múltiples pedaços"
-#: builtin/log.c:1432
+#: builtin/log.c:1438
msgid "print patches to standard out"
msgstr "imprimeix els pedaços a la sortida estàndard"
-#: builtin/log.c:1434
+#: builtin/log.c:1440
msgid "generate a cover letter"
msgstr "genera una carta de presentació"
-#: builtin/log.c:1436
+#: builtin/log.c:1442
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:1437
+#: builtin/log.c:1443
msgid "sfx"
msgstr "sufix"
-#: builtin/log.c:1438
+#: builtin/log.c:1444
msgid "use <sfx> instead of '.patch'"
msgstr "usa <sufix> en lloc de '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1446
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:1442
+#: builtin/log.c:1448
msgid "mark the series as Nth re-roll"
msgstr "marca la sèrie com a l'enèsima llançada"
-#: builtin/log.c:1444
+#: builtin/log.c:1450
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Usa [RFC PATCH] en lloc de [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1453
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Usa [<prefix>] en lloc de [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1456
msgid "store resulting files in <dir>"
msgstr "emmagatzema els fitxers resultants a <directori>"
-#: builtin/log.c:1453
+#: builtin/log.c:1459
msgid "don't strip/add [PATCH]"
msgstr "no despullis/afegeixis [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1462
msgid "don't output binary diffs"
msgstr "no emetis diferències binàries"
-#: builtin/log.c:1458
+#: builtin/log.c:1464
msgid "output all-zero hash in From header"
msgstr "emet un hash de tots zeros en la capçalera From"
-#: builtin/log.c:1460
+#: builtin/log.c:1466
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:1462
+#: builtin/log.c:1468
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:1464
+#: builtin/log.c:1470
msgid "Messaging"
msgstr "Missatgeria"
-#: builtin/log.c:1465
+#: builtin/log.c:1471
msgid "header"
msgstr "capçalera"
-#: builtin/log.c:1466
+#: builtin/log.c:1472
msgid "add email header"
msgstr "afegeix una capçalera de correu electrònic"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1473 builtin/log.c:1475
msgid "email"
msgstr "correu electrònic"
-#: builtin/log.c:1467
+#: builtin/log.c:1473
msgid "add To: header"
msgstr "afegeix la capçalera To:"
-#: builtin/log.c:1469
+#: builtin/log.c:1475
msgid "add Cc: header"
msgstr "afegeix la capçalera Cc:"
-#: builtin/log.c:1471
+#: builtin/log.c:1477
msgid "ident"
msgstr "identitat"
-#: builtin/log.c:1472
+#: builtin/log.c:1478
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:1474
+#: builtin/log.c:1480
msgid "message-id"
msgstr "ID de missatge"
-#: builtin/log.c:1475
+#: builtin/log.c:1481
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:1476 builtin/log.c:1479
+#: builtin/log.c:1482 builtin/log.c:1485
msgid "boundary"
msgstr "límit"
-#: builtin/log.c:1477
+#: builtin/log.c:1483
msgid "attach the patch"
-msgstr "ajunta el pedaç"
+msgstr "adjunta el pedaç"
-#: builtin/log.c:1480
+#: builtin/log.c:1486
msgid "inline the patch"
msgstr "posa el pedaç en el cos"
-#: builtin/log.c:1484
+#: builtin/log.c:1490
msgid "enable message threading, styles: shallow, deep"
msgstr "habilita l'enfilada de missatges, estils: shallow, deep"
-#: builtin/log.c:1486
+#: builtin/log.c:1492
msgid "signature"
msgstr "signatura"
-#: builtin/log.c:1487
+#: builtin/log.c:1493
msgid "add a signature"
msgstr "afegeix una signatura"
-#: builtin/log.c:1488
+#: builtin/log.c:1494
msgid "base-commit"
msgstr "comissió base"
-#: builtin/log.c:1489
+#: builtin/log.c:1495
msgid "add prerequisite tree info to the patch series"
msgstr "afegeix la informació d'arbre prerequerida a la sèrie de pedaços"
-#: builtin/log.c:1491
+#: builtin/log.c:1497
msgid "add a signature from a file"
msgstr "afegeix una signatura des d'un fitxer"
-#: builtin/log.c:1492
+#: builtin/log.c:1498
msgid "don't print the patch filenames"
msgstr "no imprimeixis els noms de fitxer del pedaç"
-#: builtin/log.c:1567
+#: builtin/log.c:1500
+msgid "show progress while generating patches"
+msgstr "mostra el progrés durant la generació de pedaços"
+
+#: builtin/log.c:1575
#, c-format
msgid "invalid ident line: %s"
msgstr "línia d'identitat no vàlida: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1590
msgid "-n and -k are mutually exclusive."
msgstr "-n i -k són mutualment exclusius."
-#: builtin/log.c:1584
+#: builtin/log.c:1592
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc i -k són mutualment exclusius."
-#: builtin/log.c:1592
+#: builtin/log.c:1600
msgid "--name-only does not make sense"
msgstr "--name-only no té sentit"
-#: builtin/log.c:1594
+#: builtin/log.c:1602
msgid "--name-status does not make sense"
msgstr "--name-status no té sentit"
-#: builtin/log.c:1596
+#: builtin/log.c:1604
msgid "--check does not make sense"
msgstr "--check no té sentit"
-#: builtin/log.c:1626
+#: builtin/log.c:1634
msgid "standard output, or directory, which one?"
msgstr "sortida estàndard o directori, quin dels dos?"
-#: builtin/log.c:1628
+#: builtin/log.c:1636
#, c-format
msgid "Could not create directory '%s'"
-msgstr "No s'ha pogut crear el directori '%s'"
+msgstr "No s'ha pogut crear el directori «%s»"
-#: builtin/log.c:1722
+#: builtin/log.c:1729
#, c-format
msgid "unable to read signature file '%s'"
-msgstr "no s'ha pogut llegir el fitxer de signatura '%s'"
+msgstr "no s'ha pogut llegir el fitxer de signatura «%s»"
-#: builtin/log.c:1794
+#: builtin/log.c:1761
+msgid "Generating patches"
+msgstr "S'estan generant els pedaços"
+
+#: builtin/log.c:1805
msgid "Failed to create output files"
msgstr "S'ha produït un error en crear els fitxers de sortida"
-#: builtin/log.c:1843
+#: builtin/log.c:1855
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<font> [<cap> [<límit>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1909
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
msgstr ""
-"No s'ha pogut trobar una branca remota seguida. Si us plau, especifiqueu "
+"No s'ha pogut trobar una branca remota seguida. Especifiqueu "
"<font> manualment.\n"
-#: builtin/ls-files.c:468
+#: builtin/ls-files.c:466
msgid "git ls-files [<options>] [<file>...]"
msgstr "git ls-files [<opcions>] [<fitxer>...]"
-#: builtin/ls-files.c:517
+#: builtin/ls-files.c:515
msgid "identify the file status with tags"
msgstr "identifica l'estat de fitxer amb etiquetes"
-#: builtin/ls-files.c:519
+#: builtin/ls-files.c:517
msgid "use lowercase letters for 'assume unchanged' files"
msgstr "usa lletres minúscules per als fitxers 'assume unchanged'"
-#: builtin/ls-files.c:521
+#: builtin/ls-files.c:519
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:523
+#: builtin/ls-files.c:521
msgid "show deleted files in the output"
msgstr "mostra en la sortida els fitxers suprimits"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:523
msgid "show modified files in the output"
msgstr "mostra en la sortida els fitxers modificats"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:525
msgid "show other files in the output"
msgstr "mostra en la sortida els altres fitxers"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:527
msgid "show ignored files in the output"
msgstr "mostra en la sortida els fitxers ignorats"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:530
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:534
+#: builtin/ls-files.c:532
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:536
+#: builtin/ls-files.c:534
msgid "show 'other' directories' names only"
msgstr "mostra només els noms dels directoris 'other'"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:536
msgid "show line endings of files"
msgstr "mostra els terminadors de línia dels fitxers"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:538
msgid "don't show empty directories"
msgstr "no mostris els directoris buits"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:541
msgid "show unmerged files in the output"
msgstr "mostra en la sortida els fitxers sense fusionar"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:543
msgid "show resolve-undo information"
msgstr "mostra la informació de resolució de desfet"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:545
msgid "skip files matching pattern"
msgstr "omet els fitxers coincidents amb el patró"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:548
msgid "exclude patterns are read from <file>"
msgstr "els patrons d'exclusió es llegeixen de <fitxer>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:551
msgid "read additional per-directory exclude patterns in <file>"
msgstr "llegeix els patrons addicionals d'exclusió per directori en <fitxer>"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:553
msgid "add the standard git exclusions"
msgstr "afegeix les exclusions estàndards de git"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:556
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:561
+#: builtin/ls-files.c:559
msgid "recurse through submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:561
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:564
+#: builtin/ls-files.c:562
msgid "tree-ish"
msgstr "arbre"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:563
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:567
+#: builtin/ls-files.c:565
msgid "show debugging data"
msgstr "mostra les dades de depuració"
@@ -9973,181 +10159,185 @@
#: builtin/mailsplit.c:241
#, c-format
msgid "empty mbox: '%s'"
-msgstr ""
+msgstr "mbox buit: «%s»"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<opcions>] [<comissió>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
-msgstr "l'opció `m' requereix un valor"
+msgstr "l'opció «m» requereix un valor"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
-msgstr "No s'ha pogut trobar l'estratègia de fusió '%s'.\n"
+msgstr "No s'ha pogut trobar l'estratègia de fusió «%s».\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Les estratègies disponibles són:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Les estratègies personalitzades disponibles són:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 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:200 builtin/pull.c:137
+#: builtin/merge.c:203 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:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:140
msgid "(synonym to --stat)"
msgstr "(sinònim de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 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ó"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:146
msgid "create a single commit instead of doing a merge"
msgstr "crea una única comissió en lloc de fusionar"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:149
msgid "perform a commit if the merge succeeds (default)"
msgstr "realitza una comissió si la fusió té èxit (per defecte)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:152
msgid "edit message before committing"
msgstr "edita el missatge abans de cometre"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "permet l'avanç ràpid (per defecte)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:158
msgid "abort if fast-forward is not possible"
msgstr "avorta si l'avanç ràpid no és possible"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:161
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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:165
#: builtin/revert.c:109
msgid "strategy"
msgstr "estratègia"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:166
msgid "merge strategy to use"
msgstr "estratègia de fusió a usar"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:169
msgid "option=value"
msgstr "opció=valor"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:170
msgid "option for selected merge strategy"
msgstr "opció per a l'estratègia de fusió seleccionada"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
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:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "avorta la fusió en curs actual"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "continua la fusió en curs actual"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:177
msgid "allow merging unrelated histories"
msgstr "permet fusionar històries no relacionades"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "verifica el lligam de missatge de comissió"
+
+#: builtin/merge.c:265
msgid "could not run stash."
-msgstr "no s'ha pogut executar stash."
+msgstr "no s'ha pogut executar «stash»."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
-msgstr "l'emmagatzemament ha fallat"
+msgstr "l'«stash» ha fallat"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "no és un objecte vàlid: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree ha fallat"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (res a fer «squash»)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Comissió «squash» -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Cap missatge de fusió -- no s'està actualitzant HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:456
#, c-format
msgid "'%s' does not point to a commit"
-msgstr "'%s' no assenyala una comissió"
+msgstr "«%s» no assenyala una comissió"
-#: builtin/merge.c:537
+#: builtin/merge.c:546
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
-msgstr "Cadena branch.%s.mergeoptions dolenta: %s"
+msgstr "Cadena branch.%s.mergeoptions incorrecta: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:666
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:671
+#: builtin/merge.c:680
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Opció desconeguda de merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:695
#, c-format
msgid "unable to write %s"
msgstr "no s'ha pogut escriure %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:747
#, c-format
msgid "Could not read from '%s'"
-msgstr "No s'ha pogut llegir de '%s'"
+msgstr "No s'ha pogut llegir de «%s»"
-#: builtin/merge.c:747
+#: builtin/merge.c:756
#, 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:753
+#: builtin/merge.c:762
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -10156,200 +10346,200 @@
"Lines starting with '%c' will be ignored, and an empty message aborts\n"
"the commit.\n"
msgstr ""
-"Si us plau, introduïu un missatge de comissió per a explicar per què\n"
+"Introduïu un missatge de comissió per a explicar per què\n"
"aquesta fusió és necessària, especialment si fusiona una font\n"
"actualitzada a una branca temàtica.\n"
"\n"
"S'ignoraran les línies que comencin amb '%c', i un missatge buit\n"
"avorta la comissió.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:798
msgid "Empty commit message."
msgstr "El missatge de comissió és buit."
-#: builtin/merge.c:797
+#: builtin/merge.c:818
#, c-format
msgid "Wonderful.\n"
msgstr "Meravellós.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:871
#, 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:889
+#: builtin/merge.c:910
msgid "No current branch."
msgstr "No hi ha cap branca actual."
-#: builtin/merge.c:891
+#: builtin/merge.c:912
msgid "No remote for the current branch."
msgstr "No hi ha cap remot per a la branca actual."
-#: builtin/merge.c:893
+#: builtin/merge.c:914
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:898
+#: builtin/merge.c:919
#, 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:945
+#: builtin/merge.c:972
#, c-format
msgid "Bad value '%s' in environment '%s'"
-msgstr "Valor dolent '%s' en l'entorn '%s'"
+msgstr "Valor incorrecte «%s» en l'entorn «%s»"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1073
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "no és quelcom que puguem fusionar en %s: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1107
msgid "not something we can merge"
msgstr "no és quelcom que puguem fusionar"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1172
msgid "--abort expects no arguments"
msgstr "--abort no accepta paràmetres"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1176
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "No hi ha fusió a avortar (manca MERGE_HEAD)."
-#: builtin/merge.c:1161
+#: builtin/merge.c:1188
msgid "--continue expects no arguments"
msgstr "--continue no accepta paràmetres"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1192
msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "No hi ha fusió en progrés (manca MERGE_HEAD)."
+msgstr "No hi ha cap fusió en curs (manca MERGE_HEAD)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1208
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"No heu conclòs la vostra fusió (MERGE_HEAD existeix).\n"
-"Si us plau, cometeu els vostres canvis abans de fusionar."
+"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1215
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
"No heu conclòs el vostre «cherry pick» (CHERRY_PICK_HEAD existeix).\n"
-"Si us plau, cometeu els vostres canvis abans de fusionar."
+"Cometeu els vostres canvis abans de fusionar."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1218
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:1200
+#: builtin/merge.c:1227
msgid "You cannot combine --squash with --no-ff."
msgstr "No podeu combinar --squash amb --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1235
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:1225
+#: builtin/merge.c:1252
msgid "Squash commit into empty head not supported yet"
msgstr "Una comissió «squash» a un HEAD buit encara no es permet"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1254
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:1232
+#: builtin/merge.c:1259
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - no és una cosa que puguem fusionar"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1261
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:1268
+#: builtin/merge.c:1295
#, 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."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1298
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
-msgstr "La comissió %s té una signatura GPG dolenta suposadament de %s."
+msgstr "La comissió %s té una signatura GPG incorrecta suposadament de %s."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1301
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La comissió %s no té signatura GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1304
#, 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"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1366
msgid "refusing to merge unrelated histories"
msgstr "s'està refusant fusionar històries no relacionades"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1375
+msgid "Already up to date."
msgstr "Ja està al dia."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1385
#, c-format
msgid "Updating %s..%s\n"
msgstr "S'estan actualitzant %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1426
#, 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:1406
+#: builtin/merge.c:1433
#, c-format
msgid "Nope.\n"
msgstr "No.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1458
+msgid "Already up to date. Yeeah!"
msgstr "Ja està al dia. Estupend!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1464
msgid "Not possible to fast-forward, aborting."
msgstr "No és possible avançar ràpidament, s'està avortant."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1487 builtin/merge.c:1566
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "S'està rebobinant l'arbre a la pristina...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1491
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "S'està intentant l'estratègia de fusió %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1557
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Cap estratègia de fusió ha gestionat la fusió.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1559
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "L'estratègia de fusió %s ha fallat.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1568
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "S'està usant el %s per a preparar la resolució a mà.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1580
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10445,7 +10635,7 @@
#: builtin/merge-recursive.c:51
#, c-format
msgid "could not parse object '%s'"
-msgstr "no s'ha pogut analitzar l'objecte '%s'"
+msgstr "no s'ha pogut analitzar l'objecte «%s»"
#: builtin/merge-recursive.c:55
#, c-format
@@ -10461,7 +10651,7 @@
#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
#, c-format
msgid "could not resolve ref '%s'"
-msgstr "no s'ha pogut resoldre la referència '%s'"
+msgstr "no s'ha pogut resoldre la referència «%s»"
#: builtin/merge-recursive.c:77
#, c-format
@@ -10493,10 +10683,10 @@
msgid "Directory %s is in index and no submodule?"
msgstr "El directori %s és en l'índex i no hi ha cap submòdul?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
-"Si us plau, «stage» els vostres canvis a .gitmodules o feu «stage» dels "
+"Feu «stage» dels vostres canvis a .gitmodules o feu «stash» dels "
"mateixos per a procedir"
#: builtin/mv.c:103
@@ -10512,71 +10702,71 @@
msgid "skip move/rename errors"
msgstr "omet els errors de moviment / canvi de nom"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
-msgstr "el destí '%s' no és un directori"
+msgstr "el destí «%s» no és un directori"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
-msgstr "S'està comprovant el canvi de nom de '%s' a '%s'\n"
+msgstr "S'està comprovant el canvi de nom de «%s» a «%s»\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
-msgstr "font dolenta"
+msgstr "font incorrecta"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "no es pot moure un directori a dins d'ell mateix"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "no es pot moure un directori sobre un fitxer"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "el directori font està buit"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "no està sota control de versions"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "el destí existeix"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
-msgstr "s'està sobreescrivint '%s'"
+msgstr "s'està sobreescrivint «%s»"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "No es pot sobreescriure"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "múltiples fonts per al mateix destí"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "el directori destí no existeix"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, origen=%s, destí=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "S'està canviant el nom de %s a %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
-msgstr "el canvi del nom de '%s' ha fallat"
+msgstr "el canvi del nom de «%s» ha fallat"
#: builtin/name-rev.c:338
msgid "git name-rev [<options>] <commit>..."
@@ -10612,7 +10802,7 @@
#: builtin/name-rev.c:403
msgid "read from stdin"
-msgstr "llegeix d'stdin"
+msgstr "llegeix de stdin"
#: builtin/name-rev.c:404
msgid "allow to print `undefined` names (default)"
@@ -10620,7 +10810,7 @@
#: builtin/name-rev.c:410
msgid "dereference tags in the input (internal use)"
-msgstr "dereferencia les etiquetes en l'entrada (ús intern)"
+msgstr "desreferencia les etiquetes en l'entrada (ús intern)"
#: builtin/notes.c:26
msgid "git notes [--ref <notes-ref>] [list [<object>]]"
@@ -10742,7 +10932,7 @@
#: builtin/notes.c:148
#, c-format
msgid "unable to start 'show' for object '%s'"
-msgstr "no s'ha pogut iniciar 'show' per a l'objecte '%s'"
+msgstr "no s'ha pogut iniciar 'show' per a l'objecte «%s»"
#: builtin/notes.c:152
msgid "could not read 'show' output"
@@ -10751,12 +10941,12 @@
#: builtin/notes.c:160
#, 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:195
msgid "please supply the note contents using either -m or -F option"
msgstr ""
-"si us plau, proveïu els continguts de la nota fent servir l'opció -m o "
+"especifiqueu el contingut de la nota fent servir l'opció -m o "
"l'opció -F"
#: builtin/notes.c:204
@@ -10768,87 +10958,87 @@
msgid "the note contents have been left in %s"
msgstr "s'han deixat els continguts de la nota en %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
-msgstr "no es pot llegir '%s'"
+msgstr "no es pot llegir «%s»"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
-msgstr "no s'ha pogut obrir o llegir '%s'"
+msgstr "no s'ha pogut obrir o llegir «%s»"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, 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."
+msgstr "s'ha produït un error en resoldre «%s» com a referència vàlida."
#: builtin/notes.c:258
#, c-format
msgid "failed to read object '%s'."
-msgstr "s'ha produït un error en llegir l'objecte '%s'."
+msgstr "s'ha produït un error en llegir l'objecte «%s»."
#: builtin/notes.c:262
#, c-format
msgid "cannot read note data from non-blob object '%s'."
-msgstr "no es pot llegir les dades de node de l'objecte no de blob '%s'."
+msgstr "no es poden llegir les dades de node de l'objecte no de blob «%s»."
#: builtin/notes.c:302
#, c-format
msgid "malformed input line: '%s'."
-msgstr "línia d'entrada mal formada: '%s'."
+msgstr "línia d'entrada mal formada: «%s»."
#: builtin/notes.c:317
#, 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'"
+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:348
+#: builtin/notes.c:349
#, 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "massa paràmetres"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "no s'ha trobat cap nota per a l'objecte %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "anota els continguts com a cadena"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "anota els continguts en un fitxer"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "reusa i edita l'objecte de nota especificat"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "reusa l'objecte de nota especificat"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "permet l'emmagatzematge d'una nota buida"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "reemplaça les notes existents"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10857,30 +11047,30 @@
"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:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, 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:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "S'està eliminant la nota de l'objecte %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
-msgstr "llegeix els objectes des d'stdin"
+msgstr "llegeix els objectes des de stdin"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"carrega la configuració de reescriptura per a <ordre> (implica --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "hi ha massa pocs paràmetres"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10889,67 +11079,67 @@
"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:540
+#: builtin/notes.c:541
#, 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:592
+#: builtin/notes.c:593
#, 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 ""
"Es desaconsellen les opcions -m/-F/-c/-C en favor de la subordre 'edit'.\n"
-"Si us plau, useu 'git notes add -f -m/-F/-c/-C' en lloc d'això.\n"
+"Useu «git notes add -f -m/-F/-c/-C» en lloc d'això.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
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:689
+#: builtin/notes.c:690
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:691
+#: builtin/notes.c:692
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:711
+#: builtin/notes.c:712
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:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut trobar cap comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "no s'ha pogut analitzar la comissió de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "s'ha produït un error en resoldre NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "s'ha produït un error en finalitzar la fusió de notes"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "estratègia de fusió de notes desconeguda %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Opcions generals"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Opcions de fusió"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10957,48 +11147,48 @@
"resol els conflictes de nota usant l'estratègia donada (manual/ours/theirs/"
"union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "S'estan cometent les notes sense fusionar"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "finalitza la fusió de notes cometent les notes sense fusionar"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "S'està avortant la resolució de fusió de notes"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "avorta la fusió de notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "no es pot combinar --commit, --abort i -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "cal especificar una referència de notes a fusionar"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy desconeguda: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, 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:865
+#: builtin/notes.c:866
#, 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:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11009,236 +11199,236 @@
"cometeu el resultat amb 'git notes merge --commit', o avorteu la fusió amb "
"'git notes merge --abort'.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objecte %s no té cap nota\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
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:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "llegeix els noms d'objecte des de l'entrada estàndard"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:146
msgid "do not remove, show only"
msgstr "no eliminis, només mostra"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "informa de notes podades"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "referència de notes"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "usa les notes de <referència-de-notes>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "subordre desconeguda: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:31
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:31
+#: builtin/pack-objects.c:32
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:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:181 builtin/pack-objects.c:184
#, c-format
msgid "deflate error (%d)"
msgstr "error de deflació (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:777
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"s'està inhabilitant l'escriptura de mapes de bits, es divideixen els paquets "
"a causa de pack.packSizeLimit"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:790
msgid "Writing objects"
msgstr "S'estan escrivint els objectes"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1070
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
"s'està inhabilitant l'escriptura de mapes de bits, perquè alguns objectes no "
"s'empaqueten"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2440
msgid "Compressing objects"
msgstr "S'estan comprimint objectes"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2849
#, c-format
msgid "unsupported index version %s"
msgstr "versió d'índex no compatible %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2853
#, c-format
msgid "bad index version '%s'"
-msgstr "versió d'índex dolenta '%s'"
+msgstr "versió d'índex incorrecta «%s»"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2883
msgid "do not show progress meter"
msgstr "no mostris l'indicador de progrés"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2885
msgid "show progress meter"
msgstr "mostra l'indicador de progrés"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2887
msgid "show progress meter during object writing phase"
msgstr "mostra l'indicador de progrés durant la fase d'escriptura d'objectes"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2890
msgid "similar to --all-progress when progress meter is shown"
msgstr "similar a --all-progress quan l'indicador de progrés es mostra"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2891
msgid "version[,offset]"
msgstr "versió[,desplaçament]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2892
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:2889
+#: builtin/pack-objects.c:2895
msgid "maximum size of each output pack file"
msgstr "mida màxima de cada fitxer de paquet de sortida"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2897
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-"ignora els objectes prestats d'un emmagatzemament d'objectes alternatiu"
+"ignora els objectes prestats d'un emmagatzematge d'objectes alternatiu"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2899
msgid "ignore packed objects"
msgstr "ignora els objectes empaquetats"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2901
msgid "limit pack window by objects"
msgstr "limita la finestra d'empaquetament per objectes"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2903
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:2899
+#: builtin/pack-objects.c:2905
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:2901
+#: builtin/pack-objects.c:2907
msgid "reuse existing deltas"
msgstr "reusa les diferències existents"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2909
msgid "reuse existing objects"
msgstr "reusa els objectes existents"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2911
msgid "use OFS_DELTA objects"
msgstr "usa objectes OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2913
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:2909
+#: builtin/pack-objects.c:2915
msgid "do not create an empty pack output"
msgstr "no creïs una emissió de paquet buida"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2917
msgid "read revision arguments from standard input"
msgstr "llegeix els paràmetres de revisió des de l'entrada estàndard"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2919
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:2916
+#: builtin/pack-objects.c:2922
msgid "include objects reachable from any reference"
msgstr "inclou els objectes abastables de qualsevol referència"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2925
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:2922
+#: builtin/pack-objects.c:2928
msgid "include objects referred to by the index"
msgstr "inclou els objectes als quals faci referència l'índex"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2931
msgid "output pack to stdout"
msgstr "emet el paquet a stdout"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2933
msgid "include tag objects that refer to objects to be packed"
msgstr ""
"inclou els objectes d'etiqueta que facin referència als objectes a empaquetar"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2935
msgid "keep unreachable objects"
msgstr "retén els objectes inabastables"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2937
msgid "pack loose unreachable objects"
msgstr "empaqueta els objectes inabastables solts"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2939
msgid "unpack unreachable objects newer than <time>"
msgstr "desempaqueta els objectes inabastables més nous que <hora>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2942
msgid "create thin packs"
msgstr "crea paquets prims"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2944
msgid "create packs suitable for shallow fetches"
msgstr "crea paquets adequats per a les obtencions superficials"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2946
msgid "ignore packs that have companion .keep file"
msgstr "ignora els paquets que tinguin un fitxer .keep corresponent"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:2948
msgid "pack compression level"
msgstr "nivell de compressió de paquet"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:2950
msgid "do not hide commits by grafts"
msgstr "no amaguis les comissions per empelt"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:2952
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:2948
+#: builtin/pack-objects.c:2954
msgid "write a bitmap index together with the pack index"
-msgstr "escriu un índex de mapa de bits junt amb l'índex de paquet"
+msgstr "escriu un índex de mapa de bits juntament amb l'índex de paquet"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3081
msgid "Counting objects"
msgstr "S'estan comptant els objectes"
@@ -11254,11 +11444,11 @@
msgid "prune loose refs (default)"
msgstr "poda les referències soltes (per defecte)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "S'estan eliminant objectes duplicats"
@@ -11288,7 +11478,6 @@
msgstr "git pull [<opcions>] [<dipòsit> [<especificació-de-referència>...]]"
#: builtin/pull.c:124
-#, fuzzy
msgid "control for recursive fetching of submodules"
msgstr "controla l'obtenció recursiva de submòduls"
@@ -11300,13 +11489,14 @@
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorpora els canvis fent «rebase» en lloc de fusionar"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:155 builtin/rebase--helper.c:21 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "permet l'avanç ràpid"
#: builtin/pull.c:164
msgid "automatically stash/stash pop before and after rebase"
-msgstr "automàticament emmagatzema/desempila abans i després de fer «rebase»"
+msgstr ""
+"fes «stash» i «stash pop» automàticament abans i després de fer «rebase»"
#: builtin/pull.c:180
msgid "Options related to fetching"
@@ -11321,7 +11511,7 @@
msgid "Invalid value for pull.ff: %s"
msgstr "Valor no vàlid per a pull.ff: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:403
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -11329,13 +11519,13 @@
"No hi ha cap candidat sobre el qual fer «rebase» entre les referències que "
"acabeu d'obtenir."
-#: builtin/pull.c:401
+#: builtin/pull.c:405
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
"No hi ha candidats per a fusionar entre les referències que acabeu d'obtenir."
-#: builtin/pull.c:402
+#: builtin/pull.c:406
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11343,96 +11533,96 @@
"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:405
+#: builtin/pull.c:409
#, 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 ""
-"Heu demanat baixar del remot '%s', però no heu especificat cap branca.\n"
+"Heu demanat baixar del remot «%s», però no heu especificat cap branca.\n"
"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:410 git-parse-remote.sh:73
+#: builtin/pull.c:414 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Actualment no sou en cap branca."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:416 builtin/pull.c:431 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
-msgstr "Si us plau, especifiqueu sobre què branca voleu fer «rebase»."
+msgstr "Especifiqueu sobre què branca voleu fer «rebase»."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:418 builtin/pull.c:433 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
-msgstr "Si us plau, especifiqueu amb què branca voleu fusionar."
+msgstr "Especifiqueu amb quina branca voleu fusionar."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:419 builtin/pull.c:434
msgid "See git-pull(1) for details."
msgstr "Vegeu git-pull(1) per detalls."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:421 builtin/pull.c:427 builtin/pull.c:436
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<remot>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:421 builtin/pull.c:436 builtin/pull.c:441 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branca>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:429 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "No hi ha cap informació de seguiment per a la branca actual."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:438 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si voleu establir informació de seguiment per a aquesta branca, podeu fer-ho "
"amb:"
-#: builtin/pull.c:439
+#: builtin/pull.c:443
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr ""
-"La vostra configuració especifica fusionar amb la referència '%s'\n"
+"La vostra configuració especifica fusionar amb la referència «%s»\n"
"del remot, però no s'ha obtingut tal referència."
-#: builtin/pull.c:792
+#: builtin/pull.c:796
msgid "ignoring --verify-signatures for rebase"
msgstr "s'està ignorant --verify-signatures en fer «rebase»"
-#: builtin/pull.c:840
+#: builtin/pull.c:844
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'opció --[no-]-autostash és vàlid només amb --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:852
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:851
+#: builtin/pull.c:855
msgid "pull with rebase"
msgstr "baixar fent «rebase»"
-#: builtin/pull.c:852
+#: builtin/pull.c:856
msgid "please commit or stash them."
-msgstr "si us plau, cometeu-los o emmagatzemeu-los."
+msgstr "cometeu-los o emmagatzemeu-los."
-#: builtin/pull.c:877
+#: builtin/pull.c:881
#, c-format
msgid ""
"fetch updated the current branch head.\n"
"fast-forwarding your working tree from\n"
"commit %s."
msgstr ""
-"l'obtenció ha actualitzat el cap de la branca actual.\n"
+"l'obtenció ha actualitzat HEAD de la branca actual.\n"
"s'està avançant ràpidament el vostre arbre de treball des de\n"
"la comissió %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:886
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11450,17 +11640,17 @@
"$ git reset --hard\n"
"per a recuperar."
-#: builtin/pull.c:897
+#: builtin/pull.c:901
msgid "Cannot merge multiple branches into empty head."
msgstr "No es poden fusionar múltiples branques a un HEAD buit."
-#: builtin/pull.c:901
+#: builtin/pull.c:905
msgid "Cannot rebase onto multiple branches."
msgstr "No es pot fer «rebase» sobre múltiples branques."
-#: builtin/pull.c:908
+#: builtin/pull.c:912
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr ""
+msgstr "no es pot fer «rebase» amb modificacions als submòduls enregistrades localment"
#: builtin/push.c:17
msgid "git push [<options>] [<repository> [<refspec>...]]"
@@ -11549,8 +11739,8 @@
"your current branch '%s', without telling me what to push\n"
"to update which remote branch."
msgstr ""
-"Esteu pujant al remot '%s', que no és la font de la vostra\n"
-"branca actual '%s', sense dir-me què pujar per a actualitzar\n"
+"Esteu pujant al remot «%s», que no és la font de la vostra\n"
+"branca actual «%s», sense dir-me què pujar per a actualitzar\n"
"quina branca remota."
#: builtin/push.c:246
@@ -11624,12 +11814,12 @@
#: builtin/push.c:339
#, c-format
msgid "failed to push some refs to '%s'"
-msgstr "s'ha produït un error en pujar algunes referències a '%s'"
+msgstr "s'ha produït un error en pujar algunes referències a «%s»"
#: builtin/push.c:370
#, c-format
msgid "bad repository '%s'"
-msgstr "dipòsit dolent '%s'"
+msgstr "dipòsit incorrecte «%s»"
#: builtin/push.c:371
msgid ""
@@ -11728,7 +11918,7 @@
#: builtin/push.c:547
msgid "bypass pre-push hook"
-msgstr "evita el ganxo de prepujada"
+msgstr "evita el lligam de prepujada"
#: builtin/push.c:548
msgid "push missing but relevant tags"
@@ -11840,19 +12030,47 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<opcions>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:22
+msgid "keep empty commits"
+msgstr "mantén les comissions buides"
+
+#: builtin/rebase--helper.c:23
msgid "continue rebase"
msgstr "continua el «rebase»"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:25
msgid "abort rebase"
msgstr "avorta el «rebase»"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:28
+msgid "make rebase script"
+msgstr "fes un script de «rebase»"
+
+#: builtin/rebase--helper.c:30
+msgid "shorten SHA-1s in the todo list"
+msgstr "escurça els SHA-1 en la llista per a fer"
+
+#: builtin/rebase--helper.c:32
+msgid "expand SHA-1s in the todo list"
+msgstr "expandeix els SHA-1 en la llista per a fer"
+
+#: builtin/rebase--helper.c:34
+msgid "check the todo list"
+msgstr "comprova la llista a fer"
+
+#: builtin/rebase--helper.c:36
+msgid "skip unnecessary picks"
+msgstr "omet els «picks» no necessaris"
+
+#: builtin/rebase--helper.c:38
+msgid "rearrange fixup/squash lines"
+msgstr "reorganitza les línies «fixup/pick»"
+
+#: builtin/receive-pack.c:29
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:839
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"
@@ -11879,11 +12097,11 @@
"recomana això a menys que hàgiu decidit actualitzar el seu arbre en\n"
"alguna altra manera per a coincidir amb el que hàgiu pujat.\n"
"\n"
-"Per a silenciar aquest missatge i encara retenir el comportament\n"
+"Per a silenciar aquest missatge i mantenir el comportament\n"
"predeterminat, establiu la variable de configuració\n"
"'receive.denyCurrentBranch' a 'refuse'."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:859
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"
@@ -11905,23 +12123,23 @@
"\n"
"Per a silenciar aquest missatge, podeu establir-la a 'refuse'."
-#: builtin/receive-pack.c:1933
+#: builtin/receive-pack.c:1932
msgid "quiet"
msgstr "silenciós"
-#: builtin/receive-pack.c:1947
+#: builtin/receive-pack.c:1946
msgid "You must specify a directory."
msgstr "Heu d'especificar un directori."
#: builtin/reflog.c:424
#, c-format
msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' per a '%s' no és una marca de temps vàlida"
+msgstr "«%s» per a «%s» no és una marca de temps vàlida"
#: builtin/reflog.c:541 builtin/reflog.c:546
#, c-format
msgid "'%s' is not a valid timestamp"
-msgstr "'%s' no és una marca de temps vàlida"
+msgstr "«%s» no és una marca de temps vàlida"
#: builtin/remote.c:13
msgid "git remote [-v | --verbose]"
@@ -12015,8 +12233,8 @@
"--mirror is dangerous and deprecated; please\n"
"\t use --mirror=fetch or --mirror=push instead"
msgstr ""
-"--mirror és perillós i està en desús; si us\n"
-"\t plau, useu --mirror=fetch o\n"
+"--mirror és perillós i està en desús; \n"
+"\t useu --mirror=fetch o\n"
"\t --mirror=push en lloc d'això"
#: builtin/remote.c:144
@@ -12061,20 +12279,20 @@
msgstr ""
"especificar les branques a seguir té sentit només amb miralls d'obtenció"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "el remot %s ja existeix."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
-msgstr "'%s' no és un nom de remot vàlid"
+msgstr "«%s» no és un nom de remot vàlid"
#: builtin/remote.c:235
#, c-format
msgid "Could not setup master '%s'"
-msgstr "No s'ha pogut configurar la mestra '%s'"
+msgstr "No s'ha pogut configurar la mestra «%s»"
#: builtin/remote.c:337
#, c-format
@@ -12090,17 +12308,17 @@
msgid "(delete)"
msgstr "(suprimir)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "No hi ha tal remot: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, 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'"
+msgstr "No s'ha pogut canviar el nom de la secció de configuració «%s» a «%s»"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -12110,19 +12328,19 @@
"No s'està actualitzant l'especificació de referències d'obtenció no per "
"defecte\n"
"\t%s\n"
-"\tSi us plau, actualitzeu la configuració manualment si és necessari."
+"\tActualitzeu la configuració manualment si és necessari."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
-msgstr "la supressió de '%s' ha fallat"
+msgstr "la supressió de «%s» ha fallat"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
-msgstr "la creació de '%s' ha fallat"
+msgstr "la creació de «%s» ha fallat"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -12137,113 +12355,113 @@
"eliminat;\n"
"per a suprimir-les, useu:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
-msgstr "No s'ha pogut eliminar la secció de configuració '%s'"
+msgstr "No s'ha pogut eliminar la secció de configuració «%s»"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nou (la pròxima obtenció emmagatzemarà a remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " seguit"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " estancat (useu 'git remote prune' per a eliminar)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, 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:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "es fa «rebase» interactivament sobre el remot %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "es fa «rebase» sobre el remot %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "es fusiona amb el remot %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s i amb el remot %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "crea"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "suprimeix"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "al dia"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "avanç ràpid possible"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "local no actualitzat"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s força a %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s puja a %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s força a %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s puja a %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "no consultis els remots"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* remot %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL d'obtenció: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(sense URL)"
@@ -12251,187 +12469,187 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL de pujada: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Branca de HEAD: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(no consultat)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(desconegut)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
" Branca de HEAD (el HEAD remot és ambigu, pot ser un dels següents):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branca remota:%s"
msgstr[1] " Branques remotes:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (estat no consultat)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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':"
+msgstr[0] " Branca local configurada per a «git pull»:"
+msgstr[1] " Branques locals configurades per a «git pull»:"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
-msgstr " 'git push' reflectirà les referències locals"
+msgstr " «git push» reflectirà les referències locals"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:"
+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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "estableix refs/remotes/<name>/HEAD segons el remot"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "suprimeix refs/remotes/<name>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "No es pot determinar el HEAD remot"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-"Múltiples branques de HEAD remotes. Si us plau, trieu-ne una explícitament "
+"Múltiples branques de HEAD remotes. Trieu-ne una explícitament "
"amb:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "No s'ha pogut suprimir %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "No és una referència vàlida: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "No s'ha pogut configurar %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s es tornarà penjant!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s s'ha tornat penjant!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "S'està podant %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [podaria] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [podat] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "poda els remots després d'obtenir-los"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
-msgstr "No hi ha tal remot '%s'"
+msgstr "No hi ha tal remot «%s»"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "afegeix branca"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "cap remot especificat"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "consulta els URL de pujada en lloc dels URL d'obtenció"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "retorna tots els URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
-msgstr "cap URL configurat per al remot '%s'"
+msgstr "cap URL configurat per al remot «%s»"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "manipula els URL de pujada"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "afegeix URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
-msgstr "suprimeix URLs"
+msgstr "suprimeix els URL"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete no té sentit"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Patró d'URL antic no vàlid: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "No s'ha trobat tal URL: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "No se suprimiran tots els URL no de pujada"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "sigues detallat; s'ha de col·locar abans d'una subordre"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Subordre desconeguda: %s"
@@ -12445,6 +12663,8 @@
"Incremental repacks are incompatible with bitmap indexes. Use\n"
"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
msgstr ""
+"Els reempaquetaments incrementals són incompatibles amb els índexs de bitmaps. Useu\n"
+"--no-write-bitmap-index o inhabiliteu el paràmetre de configuració pack.writebitmaps."
#: builtin/repack.c:168
msgid "pack everything in a single pack"
@@ -12509,9 +12729,8 @@
msgstr "limita la profunditat màxima de les diferències"
#: builtin/repack.c:196
-#, fuzzy
msgid "limits the maximum number of threads"
-msgstr "limita la profunditat màxima de les diferències"
+msgstr "limita el nombre màxim de fils"
#: builtin/repack.c:198
msgid "maximum size of each packfile"
@@ -12523,16 +12742,16 @@
#: builtin/repack.c:210
msgid "cannot delete packs in a precious-objects repo"
-msgstr "no es pot suprimir paquets en un dipòsit d'objectes preciosos"
+msgstr "no es poden suprimir paquets en un dipòsit d'objectes preciosos"
#: builtin/repack.c:214
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable i -A són incompatibles"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:134
#, c-format
msgid "failed to remove '%s'"
-msgstr "s'ha produït un error en eliminar '%s'"
+msgstr "s'ha produït un error en eliminar «%s»"
#: builtin/replace.c:20
msgid "git replace [-f] <object> <replacement>"
@@ -12557,17 +12776,17 @@
#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
#, c-format
msgid "Not a valid object name: '%s'"
-msgstr "No és un nom d'objecte vàlid: '%s'"
+msgstr "No és un nom d'objecte vàlid: «%s»"
#: builtin/replace.c:361
#, c-format
msgid "bad mergetag in commit '%s'"
-msgstr "etiqueta de fusió dolenta en la comissió '%s'"
+msgstr "etiqueta de fusió incorrecta en la comissió «%s»"
#: builtin/replace.c:363
#, c-format
msgid "malformed mergetag in commit '%s'"
-msgstr "etiqueta de fusió mal formada en la comissió '%s'"
+msgstr "etiqueta de fusió mal formada en la comissió «%s»"
#: builtin/replace.c:374
#, c-format
@@ -12575,13 +12794,13 @@
"original commit '%s' contains mergetag '%s' that is discarded; use --edit "
"instead of --graft"
msgstr ""
-"la comissió original '%s' conté l'etiqueta de fusió '%s' que es descarta; "
+"la comissió original «%s» conté l'etiqueta de fusió «%s» que es descarta; "
"useu --edit en lloc de --graft"
#: builtin/replace.c:407
#, c-format
msgid "the original commit '%s' has a gpg signature."
-msgstr "la comissió original '%s' té una signatura gpg."
+msgstr "la comissió original «%s» té una signatura gpg."
#: builtin/replace.c:408
msgid "the signature will be removed in the replacement commit!"
@@ -12590,7 +12809,7 @@
#: builtin/replace.c:414
#, c-format
msgid "could not write replacement commit for: '%s'"
-msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: '%s'"
+msgstr "no s'ha pogut escriure la comissió de reemplaçament per a: «%s»"
#: builtin/replace.c:438
msgid "list replace refs"
@@ -12662,121 +12881,121 @@
msgid "keep"
msgstr "reteniment"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "No teniu un HEAD vàlid."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "S'ha produït un error en trobar l'arbre de HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, 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:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ara és a %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, 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:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "sigues silenciós, només informa d'errors"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "restableix HEAD i l'índex"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "restableix només HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "restableix HEAD, l'índex i l'arbre de treball"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "restableix HEAD però retén els canvis locals"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
-msgstr "registra només el fet de que els camins eliminats s'afegiran després"
+msgstr "registra només el fet que els camins eliminats s'afegiran després"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, 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:328
-#, 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."
+msgstr "S'ha produït un error en resoldre «%s» com a revisió vàlida."
#: builtin/reset.c:337
+#, 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:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch és incompatible amb --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
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:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "No es pot restablir de %s amb camins."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "el restabliment de %s no es permet en un dipòsit nu"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N només es pot usar amb --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Canvis «unstaged» després del restabliment:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, 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'."
+msgstr "No s'ha pogut restablir el fitxer d'índex a la revisió «%s»."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "No s'ha pogut escriure el fitxer d'índex nou."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:361
msgid "rev-list does not support display of notes"
msgstr "el rev-list no permet mostrar notes"
-#: builtin/rev-parse.c:394
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<opcions>] -- [<paràmetres>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
-msgstr "retén el `--` passat com a paràmetre"
+msgstr "retén el «--» passat com a paràmetre"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "deixa d'analitzar després del primer paràmetre no d'opció"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "emet en forma llarga enganxada"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12868,11 +13087,11 @@
msgid "keep redundant, empty commits"
msgstr "retén les comissions redundants i buides"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "la reversió ha fallat"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "el «cherry pick» ha fallat"
@@ -12914,7 +13133,7 @@
"(use --cached to keep the file, or -f to force removal)"
msgstr ""
"\n"
-"(useu --cached per a retenir el fitxer, o -f per a forçar l'eliminació)"
+"(useu --cached per a mantenir el fitxer, o -f per a forçar l'eliminació)"
#: builtin/rm.c:225
msgid "the following file has local modifications:"
@@ -12942,20 +13161,20 @@
msgid "exit with a zero status even if nothing matched"
msgstr "surt amb estat zero encara que res hagi coincidit"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
-msgstr "no s'està eliminant '%s' recursivament sense -r"
+msgstr "no s'està eliminant «%s» recursivament sense -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: no s'ha pogut eliminar %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
-msgstr "no s'ha pogut suprimir '%s'"
+msgstr "no s'ha pogut suprimir «%s»"
#: builtin/send-pack.c:19
msgid ""
@@ -12979,7 +13198,7 @@
#: builtin/send-pack.c:177
msgid "read refs from stdin"
-msgstr "llegeix les referències des d'stdin"
+msgstr "llegeix les referències des de stdin"
#: builtin/send-pack.c:178
msgid "print status from remote helper"
@@ -12989,28 +13208,28 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<opcions>] [<rang-de-revisions>] [[--] [<camí>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
-msgstr ""
+msgstr "Agrupa per «comitter» en comptes de per autor"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
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:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Omet les descripcions de comissió, només proveeix el recompte de comissions"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
-msgstr "Mostra l'adreça de correu electrònic de cada autor"
+msgstr "Mostra l'adreça electrònica de cada autor"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Ajusta les línies de la sortida"
@@ -13022,9 +13241,9 @@
"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
msgstr ""
"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
-"\t\t [--current] [--color[=<quan>] | --no-color] [--sparse]\n"
-"\t\t [--more=<n> | --list | --independent | --merge-base]\n"
-"\t\t [--no-name | --sha1-name] [--topics] [(<revisió> | <glob>)...]"
+"\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>)...]"
#: builtin/show-branch.c:16
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
@@ -13064,7 +13283,7 @@
#: builtin/show-branch.c:635
msgid "suppress naming strings"
-msgstr "omet l'anomenar cadenes"
+msgstr "omet anomenar cadenes"
#: builtin/show-branch.c:637
msgid "include the current branch"
@@ -13142,7 +13361,7 @@
#: builtin/show-branch.c:812
#, c-format
msgid "'%s' is not a valid ref."
-msgstr "'%s' no és una referència vàlida."
+msgstr "«%s» no és una referència vàlida."
#: builtin/show-branch.c:815
#, c-format
@@ -13181,7 +13400,7 @@
#: builtin/show-ref.c:168
msgid "dereference tags into object IDs"
-msgstr "desreferencia les etiquetes a IDs d'objecte"
+msgstr "desreferencia les etiquetes a ID d'objecte"
#: builtin/show-ref.c:170
msgid "only show SHA1 hash using <n> digits"
@@ -13193,7 +13412,7 @@
#: builtin/show-ref.c:176
msgid "show refs from stdin that aren't in local repository"
-msgstr "mostra les referències d'stdin que no siguin en el dipòsit local"
+msgstr "mostra les referències de stdin que no siguin en el dipòsit local"
#: builtin/stripspace.c:18
msgid "git stripspace [-s | --strip-comments]"
@@ -13212,118 +13431,119 @@
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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:24 builtin/submodule--helper.c:1094
#, c-format
msgid "No such ref: %s"
msgstr "No hi ha tal referència: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:31 builtin/submodule--helper.c:1103
#, 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:72
+#: builtin/submodule--helper.c:71
#, c-format
msgid "cannot strip one component off url '%s'"
-msgstr "no es pot despullar un component de l'url '%s'"
+msgstr "no es pot despullar un component de l'url «%s»"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:302 builtin/submodule--helper.c:623
msgid "alternative anchor for relative paths"
msgstr "àncora alternativa per als camins relatius"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:307
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:350 builtin/submodule--helper.c:374
#, 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"
+msgstr "No s'ha trobat cap url per al camí de submòdul «%s» a .gitmodules"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:389
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
+"no s'ha pogut trobar la configuració «%s». S'assumeix que aquest dipòsit és el seu dipòsit font autoritzat."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:400
#, 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'"
+msgstr "S'ha produït un error en registrar l'url per al camí de submòdul «%s»"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:404
#, 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"
+msgstr "S'ha registrat el submòdul «%s» (%s) per al camí «%s»\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:414
#, 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"
+"«%s»\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:421
#, 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'"
+"submòdul «%s»"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:437
msgid "Suppress output for initializing a submodule"
msgstr "Omet la sortida d'inicialitzar un submòdul"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:442
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<camí>]"
-#: builtin/submodule--helper.c:476
+#: builtin/submodule--helper.c:470
msgid "git submodule--helper name <path>"
msgstr "git submodule--helper name <camí>"
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:475
#, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:558 builtin/submodule--helper.c:561
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
-msgstr "el submòdul '%s' no pot afegir un alternatiu: %s"
+msgstr "el submòdul «%s» no pot afegir un alternatiu: %s"
+
+#: builtin/submodule--helper.c:597
+#, 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:604
#, 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:611
-#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
-msgstr "No es reconeix el valor '%s' per a submodule.alternateLocation"
+msgstr "No es reconeix el valor «%s» per a submodule.alternateLocation"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:626
msgid "where the new submodule will be cloned to"
msgstr "a on es clonarà el submòdul nou"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:629
msgid "name of the new submodule"
msgstr "nom del submòdul nou"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:632
msgid "url where to clone the submodule from"
msgstr "url del qual clonar el submòdul"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:638
msgid "depth for shallow clones"
msgstr "profunditat dels clons superficials"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:1012
msgid "force cloning progress"
msgstr "força el progrés del clonatge"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:646
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13331,82 +13551,82 @@
"git submodule--helper clone [--prefix=<camí>] [--quiet] [--reference "
"<dipòsit>] [--name <nom>] [--depth <profunditat>] --url <url> --path <camí>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:677
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
-msgstr "el clonatge de '%s' al camí de submòdul '%s' ha fallat"
+msgstr "el clonatge de «%s» al camí de submòdul «%s» ha fallat"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:692
#, c-format
msgid "could not get submodule directory for '%s'"
-msgstr "no s'ha pogut obtenir el directori de submòdul per a '%s'"
+msgstr "no s'ha pogut obtenir el directori de submòdul per a «%s»"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:757
#, c-format
msgid "Submodule path '%s' not initialized"
-msgstr "El camí de submòdul '%s' no està inicialitzat"
+msgstr "El camí de submòdul «%s» no està inicialitzat"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:761
msgid "Maybe you want to use 'update --init'?"
msgstr "Potser voleu usar 'update --init'?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:790
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "S'està ometent el submòdul no fusionat %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:819
#, c-format
msgid "Skipping submodule '%s'"
-msgstr "S'està ometent el submòdul '%s'"
+msgstr "S'està ometent el submòdul «%s»"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:952
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
-msgstr "S'ha produït un error en clonar '%s'. S'ha programat un reintent"
+msgstr "S'ha produït un error en clonar «%s». S'ha programat un reintent"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:963
#, 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"
+msgstr "S'ha produït un error per segon cop en clonar «%s», s'està avortant"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:993 builtin/submodule--helper.c:1213
msgid "path into the working tree"
msgstr "camí a l'arbre de treball"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:996
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:981
+#: builtin/submodule--helper.c:1000
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout o none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1004
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:988
+#: builtin/submodule--helper.c:1007
msgid "parallel jobs"
msgstr "tasques paral·leles"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1009
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:991
+#: builtin/submodule--helper.c:1010
msgid "don't print cloning progress"
msgstr "no imprimeixis el progrés del clonatge"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1017
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<camí>] [<camí>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1030
msgid "bad value for update parameter"
-msgstr "valor dolent per al paràmetre update"
+msgstr "valor incorrecte per al paràmetre update"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1098
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13415,23 +13635,23 @@
"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:1163
+#: builtin/submodule--helper.c:1214
msgid "recurse into submodules"
msgstr "inclou recursivament als submòduls"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1220
msgid "git submodule--helper embed-git-dir [<path>...]"
-msgstr "git submodule--helper embed-git-dir [<camí>]"
+msgstr "git submodule--helper embed-git-dir [<camí>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1278
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s no admet --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1284
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
-msgstr "'%s' no és una subordre vàlida de submodule--helper"
+msgstr "«%s» no és una subordre vàlida de submodule--helper"
#: builtin/symbolic-ref.c:8
msgid "git symbolic-ref [<options>] <name> [<ref>]"
@@ -13441,23 +13661,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nom>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "omet el missatge d'error de referències no simbòliques (separades)"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "suprimeix la referència simbòlica"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "escurça la sortida de referències"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "raó"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "raó de l'actualització"
@@ -13487,17 +13707,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nom-d'etiqueta>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
-msgstr "no s'ha trobat l'etiqueta '%s'."
+msgstr "no s'ha trobat l'etiqueta «%s»."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
-msgstr "S'ha suprimit l'etiqueta '%s' (era %s)\n"
+msgstr "S'ha suprimit l'etiqueta «%s» (era %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13510,7 +13730,7 @@
" %s\n"
"Les línies que comencin amb '%c' s'ignoraran.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13525,145 +13745,145 @@
"Les línies que comencin amb '%c' es retindran; podeu eliminar-les per vós "
"mateix si voleu.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "no s'ha pogut signar l'etiqueta"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "no s'ha pogut escriure el fitxer d'etiqueta"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
-msgstr "el tipus d'objecte és dolent."
+msgstr "el tipus d'objecte és incorrecte."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "no hi ha cap missatge d'etiqueta?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, 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:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "llista els noms d'etiqueta"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "imprimeix <n> línies de cada missatge d'etiqueta"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "suprimeix les etiquetes"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "verifica les etiquetes"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Opcions de creació d'etiquetes"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "etiqueta anotada, necessita un missatge"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "missatge d'etiqueta"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "etiqueta anotada i signada per GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "usa una altra clau per a signar l'etiqueta"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "reemplaça l'etiqueta si existeix"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "crea un registre de referències"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Opcions de llistat d'etiquetes"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "mostra la llista d'etiquetes en columnes"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "imprimeix només les etiquetes que continguin la comissió"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "imprimeix només les etiquetes que no continguin la comissió"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "imprimeix només les etiquetes que s'han fusionat"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "imprimeix només les etiquetes que no s'han fusionat"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "imprimeix només les etiquetes de l'objecte"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column i -n són incompatibles"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "es permet l'opció -n només amb mode llista"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "es permet l'opció --contains només amb mode llista"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
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:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "es permet --points-at option només amb mode llista"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
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:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "només es permet una opció -F o -m."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "massa paràmetres"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
-msgstr "'%s' no és un nom d'etiqueta vàlid."
+msgstr "«%s» no és un nom d'etiqueta vàlid."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
-msgstr "l'etiqueta '%s' ja existeix"
+msgstr "l'etiqueta «%s» ja existeix"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
-msgstr "Etiqueta '%s' actualitzada (era %s)\n"
+msgstr "Etiqueta «%s» actualitzada (era %s)\n"
#: builtin/unpack-objects.c:494
msgid "Unpacking objects"
@@ -13697,7 +13917,7 @@
#: builtin/update-index.c:136
#, c-format
msgid "Testing mtime in '%s' "
-msgstr "S'està provant mtime en '%s' "
+msgstr "S'està provant mtime en «%s» "
#: builtin/update-index.c:150
msgid "directory stat info does not change after adding a new file"
@@ -13734,132 +13954,132 @@
msgid " OK"
msgstr " D'acord"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:571
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<opcions>] [--] [<fitxer>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:926
msgid "continue refresh even when index needs update"
msgstr ""
"continua l'actualització encara que l'índex necessiti una actualització"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:929
msgid "refresh: ignore submodules"
msgstr "actualitza: ignora els submòduls"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:932
msgid "do not ignore new files"
msgstr "no ignoris els fitxers nous"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:934
msgid "let files replace directories and vice-versa"
msgstr "deixa que els fitxers reemplacin els directoris i viceversa"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:936
msgid "notice files missing from worktree"
msgstr "tingues en compte els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:938
msgid "refresh even if index contains unmerged entries"
msgstr "actualitza encara que l'índex contingui entrades no fusionades"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:941
msgid "refresh stat information"
msgstr "actualitza la informació d'estadístiques"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:945
msgid "like --refresh, but ignore assume-unchanged setting"
-msgstr "com --refresh, però ignora l'ajust assume-unchanged"
+msgstr "com --refresh, però ignora el paràmetre assume-unchanged"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:949
msgid "<mode>,<object>,<path>"
msgstr "<mode>,<objecte>,<camí>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:950
msgid "add the specified entry to the index"
msgstr "afegeix l'entrada especificada a l'índex"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:959
msgid "mark files as \"not changing\""
msgstr "marca els fitxers com a \"no canviant\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:962
msgid "clear assumed-unchanged bit"
msgstr "neteja el bit assumed-unchanged"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:965
msgid "mark files as \"index-only\""
msgstr "marca els fitxers com a \"només índex\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:968
msgid "clear skip-worktree bit"
msgstr "neteja el bit skip-worktree"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:971
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:971
+#: builtin/update-index.c:973
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:973
+#: builtin/update-index.c:975
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:975
+#: builtin/update-index.c:977
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:979
+#: builtin/update-index.c:981
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:983
+#: builtin/update-index.c:985
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:987
+#: builtin/update-index.c:989
msgid "only update entries that differ from HEAD"
msgstr "només actualitza les entrades que difereixin de HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:993
msgid "ignore files missing from worktree"
msgstr "ignora els fitxers absents de l'arbre de treball"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:996
msgid "report actions to standard output"
msgstr "informa de les accions en la sortida estàndard"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:998
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(per a porcellanes) oblida't dels conflictes no resolts ni desats"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1002
msgid "write index in this format"
msgstr "escriu l'índex en aquest format"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1004
msgid "enable or disable split index"
msgstr "habilita o inhabilita l'índex dividit"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1006
msgid "enable/disable untracked cache"
msgstr "habilita/inhabilita la memòria cau no seguida"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1008
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:1008
+#: builtin/update-index.c:1010
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:1108
+#: builtin/update-index.c:1107
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -13867,7 +14087,7 @@
"core.splitIndex està establert a fals; elimineu-lo o canviar-lo, si realment "
"voleu habilitar l'índex dividit"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1116
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -13875,8 +14095,7 @@
"core.splitIndex està establert a cert; elimineu-lo o canvieu-lo, si realment "
"voleu inhabilitar l'índex dividit"
-#: builtin/update-index.c:1128
-#, fuzzy
+#: builtin/update-index.c:1127
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13884,11 +14103,11 @@
"core.untrackedCache està establert a cert; elimineu-lo o canvieu-lo, si "
"realment voleu inhabilitar el cau no seguit"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1131
msgid "Untracked cache disabled"
msgstr "La memòria cau no seguida està inhabilitada"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1139
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13896,10 +14115,10 @@
"core.untrackedCache està establert a fals; elimineu-lo o canviar-lo, si "
"realment voleu habilitar el cau no seguit"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1143
#, c-format
msgid "Untracked cache enabled for '%s'"
-msgstr "La memòria cau no seguida està habilitada per a '%s'"
+msgstr "La memòria cau no seguida està habilitada per a «%s»"
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
@@ -13914,21 +14133,21 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<opcions>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "suprimeix la referència"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "actualitza <nom de referència>, no la que assenyali"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "stdin té paràmetres acabats amb NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
-msgstr "llegeix les actualitzacions des d'stdin"
+msgstr "llegeix les actualitzacions des de stdin"
#: builtin/update-server-info.c:7
msgid "git update-server-info [--force]"
@@ -13990,107 +14209,116 @@
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <camí>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:46
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Eliminació de worktrees/%s: no és un directori vàlid"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:52
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Eliminació de worktrees/%s: el fitxer gitdir no existeix"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:57 builtin/worktree.c:66
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Eliminació de worktrees/%s: no s'ha pogut llegir el fitxer gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:76
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"S'estan suprimint els arbres de treball/%s: lectura curta (s'esperaven %<PRIuMAX> bytes, llegits "
+"%<PRIuMAX>)"
+
+#: builtin/worktree.c:84
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Eliminació de worktrees/%s: fitxer gitdir no vàlid"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:100
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Eliminació de worktrees/%s: el fitxer gitdir es refereix a una ubicació no "
"existent"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:147
msgid "report pruned working trees"
msgstr "informa dels arbres de treball podats"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:149
msgid "expire working trees older than <time>"
msgstr "fes caducar els arbres de treball més vells que <hora>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:223
#, c-format
msgid "'%s' already exists"
-msgstr "'%s' ja existeix"
+msgstr "«%s» ja existeix"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:254
#, c-format
msgid "could not create directory of '%s'"
-msgstr "no s'ha pogut crear directori de '%s'"
+msgstr "no s'ha pogut crear directori de «%s»"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:293
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "S'està preparant %s (identificador %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:345
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:329
+#: builtin/worktree.c:347
msgid "create a new branch"
msgstr "crea una branca nova"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:349
msgid "create or reset a branch"
msgstr "crea o restableix una branca"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:351
msgid "populate the new working tree"
msgstr "emplena l'arbre de treball nou"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:352
msgid "keep the new working tree locked"
msgstr "mantén l'arbre de treball nou bloquejat"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:360
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B i --detach són mutualment exclusius"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:499
msgid "reason for locking"
msgstr "raó per bloquejar"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:511 builtin/worktree.c:544
#, c-format
msgid "'%s' is not a working tree"
-msgstr "'%s' no és un arbre de treball"
+msgstr "«%s» no és un arbre de treball"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:513 builtin/worktree.c:546
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:498
+#: builtin/worktree.c:518
#, c-format
msgid "'%s' is already locked, reason: %s"
-msgstr "'%s' ja està bloquejat, raó: '%s'"
+msgstr "«%s» ja està bloquejat, raó: «%s»"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:520
#, c-format
msgid "'%s' is already locked"
-msgstr "'%s' ja està bloquejat"
+msgstr "«%s» ja està bloquejat"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:548
#, c-format
msgid "'%s' is not locked"
-msgstr "'%s' no està bloquejat"
+msgstr "«%s» no està bloquejat"
#: builtin/write-tree.c:14
msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
@@ -14112,24 +14340,24 @@
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<opcions>] <directori>"
-#: upload-pack.c:1041
+#: upload-pack.c:1040
msgid "quit after a single request/response exchange"
msgstr "surt després d'un sol intercanvi de sol·licitud/resposta"
-#: upload-pack.c:1043
+#: upload-pack.c:1042
msgid "exit immediately after initial ref advertisement"
msgstr "surt immediatament després de l'anunci inicial de referència"
-#: upload-pack.c:1045
+#: upload-pack.c:1044
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"
-#: upload-pack.c:1047
+#: upload-pack.c:1046
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interromp la transferència després de <n> segons d'inactivitat"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14143,7 +14371,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "imprimeix els missatges de depuració a stderr"
@@ -14157,20 +14385,20 @@
"algunes guies de concepte. Vegeu 'git help <ordre>' o\n"
"'git help <concepte>' per a llegir sobre una subordre o concepte específic."
-#: http.c:337
+#: http.c:338
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
-msgstr ""
+msgstr "valor negatiu per http.postbuffer; utilitzant el valor %d"
-#: http.c:358
+#: http.c:359
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:367
+#: http.c:368
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "No s'admet l'enganx de clau pública amb cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1768
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -14341,7 +14569,7 @@
#: git-bisect.sh:154
msgid "Bad HEAD - I need a HEAD"
-msgstr "HEAD dolent - Cal un HEAD"
+msgstr "HEAD incorrecte - Cal un HEAD"
#: git-bisect.sh:167
#, sh-format
@@ -14357,12 +14585,12 @@
#: git-bisect.sh:181
msgid "Bad HEAD - strange symbolic ref"
-msgstr "HEAD dolent - referència simbòlica estranya"
+msgstr "HEAD incorrecte - referència simbòlica estranya"
#: git-bisect.sh:233
#, sh-format
msgid "Bad bisect_write argument: $state"
-msgstr "Paràmetre bisect_write dolent: $state"
+msgstr "Paràmetre bisect_write incorrecte: $state"
#: git-bisect.sh:262
#, sh-format
@@ -14480,7 +14708,7 @@
#: git-bisect.sh:565
msgid "please use two different terms"
-msgstr "si us plau, useu dos termes distintes"
+msgstr "useu dos termes distintes"
#: git-bisect.sh:575
#, sh-format
@@ -14539,8 +14767,8 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
-msgstr "Ja al dia amb $pretty_name"
+msgid "Already up to date with $pretty_name"
+msgstr "Ja està al dia amb $pretty_name"
#: git-merge-octopus.sh:89
#, sh-format
@@ -14559,52 +14787,54 @@
#: git-rebase.sh:58
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"
-"\"."
+"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 ""
-"Quan hàgiu resolt aquest problema, executeu \"git rebase --continue\".\n"
-"Si preferiu ometre aquest pedaç, executeu \"git rebase --skip\" en lloc "
-"d'això.\n"
-"Per a agafar la branca original i deixar de fer «rebase», executeu \"git "
-"rebase --abort\"."
+"Resolgueu tots els conflictes manualment, marqueu-los com a resolts amb\n"
+"«git add/rm <fitxers amb conflicte>», llavors executeu «git rebase --"
+"continue».\n"
+"Podeu en comptes ometre aquesta comissió: executeu «git rebase --skip».\n"
+"Per a avortar i tornar a l'estat anterior abans de l'ordre «git rebase», "
+"executeu «git rebase --abort»."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "No s'ha pogut tornar a $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "S'ha aplicat el magatzem automàtic."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "No es pot emmagatzemar $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
-msgstr "El ganxo pre-«rebase» ha refusat a fer «rebase»."
+msgstr "El lligam pre-«rebase» ha refusat a fer «rebase»."
-#: git-rebase.sh:217
+#: git-rebase.sh:219
msgid "It looks like git-am is in progress. Cannot rebase."
msgstr "Sembla que git-am està en curs. No es pot fer «rebase»."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "No hi ha un «rebase» en curs?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
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."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "No es pot llegir HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14612,7 +14842,7 @@
"Heu d'editar tots els conflictes de fusió i després\n"
"marcar-los com a resolts fent servir git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14626,110 +14856,109 @@
msgstr ""
"Sembla que ja hi ha un directori $state_dir_base, i\n"
"em pregunto si esteu enmig d'un altre «rebase». Si aquest és el\n"
-"cas, si us plau, proveu\n"
+"cas, proveu\n"
"\t$cmd_live_rebase\n"
-"Si no és el cas, si us plau,\n"
+"Si no és el cas, \n"
"\t$cmd_clear_stale_rebase\n"
"i executeu-me de nou. M'aturo per si encara hi teniu alguna cosa\n"
"de valor."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
msgid "invalid upstream $upstream_name"
msgstr "font no vàlida $upstream_name"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: ja hi ha més d'una base de fusió"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: no hi ha cap base de fusió"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "No assenyala una comissió vàlida: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:539
#, sh-format
msgid "fatal: no such branch: $branch_name"
msgstr "fatal: no hi ha tal branca: $branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:572
msgid "Cannot autostash"
msgstr "No es pot emmagatzemar automàticament"
-#: git-rebase.sh:567
+#: git-rebase.sh:577
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "S'ha creat un magatzem automàtic: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:581
msgid "Please commit or stash them."
-msgstr "Si us plau, cometeu-los o emmagatzemeu-los."
+msgstr "Cometeu-los o emmagatzemeu-los."
-#: git-rebase.sh:591
+#: git-rebase.sh:601
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branca actual $branch_name està al dia."
-#: git-rebase.sh:595
+#: git-rebase.sh:605
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branca actual $branch_name està al dia; «rebase» forçat."
-#: git-rebase.sh:606
+#: git-rebase.sh:616
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Canvis de $mb a $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:625
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-"Primer, s'està rebobinant el cap per a reproduir el vostre treball al "
-"damunt..."
+"Primer, s'està rebobinant HEAD per a reproduir el vostre treball al damunt..."
-#: git-rebase.sh:625
+#: git-rebase.sh:635
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "S'ha avançat $branch_name ràpidament a $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear amb paràmetres no està implementat"
-#: git-stash.sh:95
+#: git-stash.sh:102
msgid "You do not have the initial commit yet"
msgstr "Encara no teniu la comissió inicial"
-#: git-stash.sh:110
+#: git-stash.sh:117
msgid "Cannot save the current index state"
msgstr "No es pot desar l'estat d'índex actual"
-#: git-stash.sh:125
+#: git-stash.sh:132
msgid "Cannot save the untracked files"
-msgstr "No es pot desar els fitxers no seguits"
+msgstr "No es poden desar els fitxers no seguits"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:152 git-stash.sh:165
msgid "Cannot save the current worktree state"
msgstr "No es pot desar l'estat d'arbre de treball actual"
-#: git-stash.sh:162
+#: git-stash.sh:169
msgid "No changes selected"
msgstr "No hi ha canvis seleccionats"
-#: git-stash.sh:165
+#: git-stash.sh:172
msgid "Cannot remove temporary index (can't happen)"
msgstr "No es pot eliminar l'índex temporal (això no pot passar)"
-#: git-stash.sh:178
+#: git-stash.sh:185
msgid "Cannot record working tree state"
msgstr "No es pot registrar l'estat de l'arbre de treball"
-#: git-stash.sh:210
+#: git-stash.sh:217
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "No es pot actualitzar $ref_stash amb $w_commit"
@@ -14744,7 +14973,7 @@
#. $ git stash save --blah-blah 2>&1 | head -n 2
#. error: unknown option for 'stash save': --blah-blah
#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:273
#, sh-format
msgid ""
"error: unknown option for 'stash save': $option\n"
@@ -14753,110 +14982,108 @@
"error: opció desconeguda de 'stash save': $option\n"
" Per a proveir un missatge, useu git stash save -- '$option'"
-#: git-stash.sh:281
+#: git-stash.sh:288
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."
-#: git-stash.sh:289
+#: git-stash.sh:296
msgid "No local changes to save"
msgstr "No hi ha canvis locals a desar"
-#: git-stash.sh:294
+#: git-stash.sh:301
msgid "Cannot initialize stash"
msgstr "No es pot inicialitzar el magatzem"
-#: git-stash.sh:298
+#: git-stash.sh:305
msgid "Cannot save the current status"
msgstr "No es pot desar l'estat actual"
-#: git-stash.sh:299
+#: git-stash.sh:306
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "S'han desat el directori de treball i l'estat d'índex $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:334
msgid "Cannot remove worktree changes"
msgstr "No es poden eliminar els canvis de l'arbre de treball"
-#: git-stash.sh:474
+#: git-stash.sh:482
#, sh-format
msgid "unknown option: $opt"
msgstr "opció desconeguda: $opt"
-#: git-stash.sh:487
-#, fuzzy
+#: git-stash.sh:495
msgid "No stash entries found."
-msgstr "No s'ha trobat cap magatzem."
+msgstr "No s'ha trobat cap «stash»."
-#: git-stash.sh:494
+#: git-stash.sh:502
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "S'han especificat massa revisions: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:517
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference no és una referència vàlida"
-#: git-stash.sh:537
+#: git-stash.sh:545
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' no és una comissió de tipus magatzem"
-#: git-stash.sh:548
+#: git-stash.sh:556
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' no és una referència de magatzem"
-#: git-stash.sh:556
+#: git-stash.sh:564
msgid "unable to refresh index"
msgstr "no s'ha pogut actualitzar l'índex"
-#: git-stash.sh:560
+#: git-stash.sh:568
msgid "Cannot apply a stash in the middle of a merge"
msgstr "No es pot aplicar un magatzem enmig d'una fusió"
-#: git-stash.sh:568
+#: git-stash.sh:576
msgid "Conflicts in index. Try without --index."
msgstr "Hi ha conflictes en l'índex. Proveu-ho sense --index."
-#: git-stash.sh:570
+#: git-stash.sh:578
msgid "Could not save index tree"
msgstr "No s'ha pogut desar l'arbre d'índex"
-#: git-stash.sh:579
-#, fuzzy
+#: git-stash.sh:587
msgid "Could not restore untracked files from stash entry"
-msgstr "No s'ha pogut restaurar els fitxers no seguits des d'emmagatzematge"
+msgstr "No s'han pogut restaurar els fitxers no seguits des del «stash»"
-#: git-stash.sh:604
+#: git-stash.sh:612
msgid "Cannot unstage modified files"
msgstr "No es pot fer «unstage» dels fitxers modificats"
-#: git-stash.sh:619
+#: git-stash.sh:627
msgid "Index was not unstashed."
msgstr "L'índex no estava sense emmagatzemar."
-#: git-stash.sh:633
-#, fuzzy
+#: git-stash.sh:641
msgid "The stash entry is kept in case you need it again."
-msgstr "Es conserva el magatzem en cas de que el necessiteu altra vegada."
+msgstr ""
+"Es conserva l'entrada «stash» en cas que la necessiteu altra vegada."
-#: git-stash.sh:642
+#: git-stash.sh:650
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} ($s) descartada"
-#: git-stash.sh:643
+#: git-stash.sh:651
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: No s'ha pogut descartar l'entrada de magatzem"
-#: git-stash.sh:651
+#: git-stash.sh:659
msgid "No branch name specified"
msgstr "Cap nom de branca especificat"
-#: git-stash.sh:730
+#: git-stash.sh:738
msgid "(To restore them type \"git stash apply\")"
msgstr "(Per restaurar-les teclegeu \"git stash apply\")"
@@ -15005,18 +15232,18 @@
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Submòdul '$name' ($url) no registrat per al camí '$displaypath'"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, 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:648
+#: git-submodule.sh:647
#, 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:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15025,12 +15252,12 @@
"No s'ha pogut trobar la revisió actual de ${remote_name}/${branch} en el "
"camí de submòdul '$sm_path'"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "No s'ha pogut obtenir en el camí de submòdul '$displaypath'"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15039,87 +15266,87 @@
"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:684
+#: git-submodule.sh:683
#, 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:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha agafat '$sha1'"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, 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:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fet «rebase» en '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, 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:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Camí de submòdul '$displaypath': s'ha fusionat en '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, 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:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Camí de submòdul '$displaypath': '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
"S'ha produït un error en recorre recursivament dins del camí de submòdul "
"'$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:840
msgid "The --cached option cannot be used with the --files option"
msgstr "L'opció --cached no es pot usar amb l'opció --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:892
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode inesperat $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:912
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Avís: $display_name no conté la comissió $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:915
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Avís: $display_name no conté la comissió $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:918
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Avís: $display_name no conté les comissions $sha1_src i $sha1_dst"
-#: git-submodule.sh:1065
+#: git-submodule.sh:1064
#, sh-format
msgid "Failed to recurse into submodule path '$sm_path'"
msgstr ""
"S'ha produït un error en cercar recursivament al camí de submòdul '$sm_path'"
-#: git-submodule.sh:1137
+#: git-submodule.sh:1136
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "S'està sincronitzant l'url de submòdul per a '$displaypath'"
@@ -15138,13 +15365,13 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -15156,7 +15383,7 @@
" s, squash = usa la comissió, però fusiona'l a la comissió prèvia\n"
" f, fixup = com \"squash\", però descarta el missatge de registre d'aquesta "
"comissió\n"
-" x, exec = executa l'ordre (el reste de la línia) usant l'intèrpret "
+" x, exec = executa l'ordre (la resta de la línia) usant l'intèrpret "
"d'ordres\n"
" d, drop = elimina la comissió\n"
"\n"
@@ -15232,49 +15459,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "S'està refusant fer «squash» a una fusió: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Error en refer la fusió $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "No s'ha pogut escollir $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Aquest és el missatge de comissió núm. ${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "El missatge de comissió núm. ${n} s'ometrà:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "Això és una combinació de $count comissió."
msgstr[1] "Això és una combinació de $count comissions."
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "No es pot escriure $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Això és una combinació de 2 comissions."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "No s'ha pogut aplicar $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15285,36 +15512,36 @@
msgstr ""
"No s'ha pogut esmenar la comissió després d'escollir amb èxit $sha1... "
"$rest\n"
-"Això és probablement a causa d'un missatge de comissió buit, o el ganxo de\n"
-"precomissió ha fallat. Si el ganxo de precomissió ha fallat, pot ser que\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--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "S'ha aturat a $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "No es pot '$squash_style' sense una comissió prèvia"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "S'està executant: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'execució ha fallat: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
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--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15325,7 +15552,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15340,96 +15567,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Ordre desconeguda: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
-msgstr "Si us plau, arregleu això usant 'git rebase --edit-todo'."
+msgstr "Corregiu-ho usant «git rebase --edit-todo»."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "S'ha fet «rebase» i actualitzat $head_name amb èxit."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "No s'ha pogut ometre ordres innecessaris d'elecció"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Advertència: manca el SHA-1 o no és una comissió en la línia següent:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Advertència: no es reconeix l'ordre en la línia següent:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:749
msgid "could not detach HEAD"
msgstr "no s'ha pogut separar HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Advertència: pot ser que algunes comissions s'hagin descartat "
-"accidentalment.\n"
-"Les comissions descartades (més nova a més vella):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"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"
-"Els comportaments possibles són: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"No s'ha reconegut l'ajust $check_level per a l'opció rebase."
-"missingCommitsCheck. S'està ignorant."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Podeu arreglar això amb 'git rebase --edit-todo' i després 'git rebase --"
-"continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "O podeu avortar el «rebase» amb 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:784
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "No s'ha pogut eliminar CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:789
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15460,25 +15620,25 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:806
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--interactive.sh:1110
+#: git-rebase--interactive.sh:811
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. Si us plau,\n"
-"primer cometeu-los i després executeu 'git rebase --continue' de nou."
+"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--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:816 git-rebase--interactive.sh:820
msgid "Could not commit staged changes."
-msgstr "No s'ha pogut cometre els canvis «staged»."
+msgstr "No s'han pogut cometre els canvis «staged»."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:848
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15492,40 +15652,40 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:856 git-rebase--interactive.sh:1015
msgid "Could not execute editor"
msgstr "No s'ha pogut executar l'editor"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:869
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "No s'ha pogut agafar $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:874
msgid "No HEAD?"
msgstr "No hi ha cap HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:875
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "No s'ha pogut crear el $state_dir temporal"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:877
msgid "Could not mark as interactive"
msgstr "No s'ha pogut marcar com a interactiu"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:887 git-rebase--interactive.sh:892
msgid "Could not init rewritten commits"
-msgstr "No s'ha pogut iniciar les comissions reescrites"
+msgstr "No s'han pogut iniciar les comissions reescrites"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:993
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "Rebasa $shortrevisions sobre $shortonto ($todocount ordre)"
msgstr[1] "Rebasa $shortrevisions sobre $shortonto ($todocount ordres)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:998
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15535,7 +15695,7 @@
"No obstant, si elimineu tot, s'avortarà el «rebase».\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:1005
msgid "Note that empty commits are commented out"
msgstr "Nota que les comissions buides estan comentades"
@@ -15562,7 +15722,7 @@
#: git-sh-setup.sh:223
msgid "Cannot rewrite branches: You have unstaged changes."
-msgstr "No es pot reescriure branques: Teniu canvis «unstaged»."
+msgstr "No es poden reescriure branques: Teniu canvis «unstaged»."
#: git-sh-setup.sh:226
msgid "Cannot pull with rebase: You have unstaged changes."
@@ -15604,7 +15764,7 @@
#: git-add--interactive.perl:196
#, perl-format
msgid "%12s %12s %s"
-msgstr ""
+msgstr "%12s %12s %s"
#: git-add--interactive.perl:197
msgid "staged"
@@ -15734,8 +15894,8 @@
"Lines starting with %s will be removed.\n"
msgstr ""
"---\n"
-"Per suprimir '%s' línies, feu-les línies ' ' (context).\n"
-"Per suprimir '%s' línies, suprimiu-les.\n"
+"Per suprimir «%s» línies, feu-les línies ' ' (context).\n"
+"Per suprimir «%s» línies, suprimiu-les.\n"
"Les línies que comencin per %s seran suprimides.\n"
#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
@@ -15818,6 +15978,12 @@
"a - apply this hunk and all later hunks in the file\n"
"d - do not apply this hunk or any of the later hunks in the file"
msgstr ""
+"y - aplica aquest tros a l'índex\n"
+"n - no apliquis aquest tros a l'índex\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
+"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
+
#: git-add--interactive.perl:1167
msgid ""
@@ -15827,6 +15993,11 @@
"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 - descarta aquest tros de l'arbre de treball\n"
+"n - no descartis aquest tros des de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"a - descarta aquest tros i tots els trossos posteriors en el fitxer\n"
+"d - no descartis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1173
msgid ""
@@ -15836,6 +16007,11 @@
"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 - descarta aquest tros de l'índex i de l'arbre de treball\n"
+"n - no descartis aquest tros des de l'índex i de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"a - 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:1179
msgid ""
@@ -15845,6 +16021,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"
msgstr ""
+"y - aplica aquest tros a l'índex i l'arbre de treball\n"
+"n - no apliquis aquest tros des de l'índex i de l'arbre de treball\n"
+"q - surt; no apliquis aquest tros ni cap dels pendents\n"
+"a - aplica aquest tros i tots els trossos posteriors en el fitxer\n"
+"d - no apliquis aquest tros ni cap dels trossos posteriors en el fitxer"
#: git-add--interactive.perl:1188
msgid ""
@@ -15858,6 +16039,15 @@
"e - manually edit the current hunk\n"
"? - print help\n"
msgstr ""
+"g - selecciona el tros on voleu anar\n"
+"/ - cerca un tros que coincideixi amb l'expressió regular donada\n"
+"j - deixa aquest tros sense decidir, veure el tros sense decidir següent\n"
+"J - deixa aquest tros sense decidir, veure el tros següent\n"
+"k - deixa aquest tros sense decidir, veure el tros sense decidir anterior\n"
+"K - deixa aquest tros sense decidir, veure el tros anterior\n"
+"s - divideix el tros actual en trossos més petits\n"
+"e - edita manualment el tros actual\n"
+"? - mostra l'ajuda\n"
#: git-add--interactive.perl:1219
msgid "The selected hunks do not apply to the index!\n"
@@ -15865,7 +16055,7 @@
#: git-add--interactive.perl:1220
msgid "Apply them to the worktree anyway? "
-msgstr "Voleu aplicar-los igualment a l'arbre de treball"
+msgstr "Voleu aplicar-los igualment a l'arbre de treball? "
#: git-add--interactive.perl:1223
msgid "Nothing was applied.\n"
@@ -15911,7 +16101,7 @@
#: git-add--interactive.perl:1311
#, perl-format
msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
-msgstr "Suprimeix «stage» [y,n,q,a,d,/%s,?]? "
+msgstr "Suprimeix «stash» [y,n,q,a,d,/%s,?]? "
#: git-add--interactive.perl:1312
#, perl-format
@@ -15962,7 +16152,7 @@
#: git-add--interactive.perl:1327
#, perl-format
msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
-msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?"
+msgstr "Descarta aquest tros des de l'arbre de treball [y,n,q,a,d,/%s,?]?"
#: git-add--interactive.perl:1330
#, perl-format
@@ -16001,11 +16191,11 @@
#: git-add--interactive.perl:1440
msgid "go to which hunk (<ret> to see more)? "
-msgstr "vés a quin tros (<ret> per veure'n més)? "
+msgstr "ves a quin tros (<ret> per veure'n més)? "
#: git-add--interactive.perl:1442
msgid "go to which hunk? "
-msgstr "vés a quin tros? "
+msgstr "ves a quin tros? "
#: git-add--interactive.perl:1451
#, perl-format
@@ -16063,6 +16253,12 @@
"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"
+"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"
#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
@@ -16088,60 +16284,60 @@
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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'editor no ha sortit correctament, avortant-ho tot"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
-msgstr "'%s' conté una versió intermèdia del correu que estàveu redactant.\n"
+msgstr "«%s» conté una versió intermèdia del correu que estàveu redactant.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' conté el correu redactat.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases és incompatible amb altres opcions\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "No es pot executar git format-patch des de fora del dipòsit\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
-msgstr "Camp --suppress-cc desconegut: '%s'\n"
+msgstr "Camp --suppress-cc desconegut: «%s»\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
-msgstr "--confirm setting desconegut: '%s'\n"
+msgstr "--confirm setting desconegut: «%s»\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "avís: el sobrenom de sendmail amb cometes no està suportat: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "avís: `:include:` no està suportat: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "avís: les redireccions `/file` or `|pipe no són admeses: %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, 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:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -16150,18 +16346,18 @@
" * Saying \"./%s\" if you mean a file; or\n"
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-"El fitxer '%s' existeix però també pot ser un rang de comissions\n"
+"El fitxer «%s» existeix però també pot ser un rang de comissions\n"
"per produir pedaços. Desambigüeu...\n"
"\n"
" * Dient \"./%s\" si volíeu especificar aquest fitxer; o\n"
" * Proporcionant l'opció --format-patch si volíeu especificar un rang.\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
-msgstr "S'ha produït un error a l'obrir el directori %s: %s"
+msgstr "S'ha produït un error en obrir el directori %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -16170,7 +16366,7 @@
"fatal: %s: %s\n"
"avís: no s'han enviat pedaços\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -16180,17 +16376,17 @@
"No s'han especificat fitxers de pedaç\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Sense assumpte a %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, 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:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -16204,31 +16400,31 @@
"\n"
"Netegeu el contingut del cos si no voleu enviar un resum.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, 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:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "S'ha produït un error en obrir %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "Els camps A/Cc/Bcc no s'interpreten encara, s'ignoraran\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
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:791
+#: git-send-email.perl:786
#, 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:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -16236,11 +16432,11 @@
"Els fitxers següents són 8bit, però no declaren un Content-Transfer-"
"Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quina codificació de 8 bits hauria de declarar [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -16248,24 +16444,28 @@
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really "
"want to send.\n"
msgstr ""
+"S'ha refusat a enviar perquè el pedaç\n"
+"\t%s\n"
+"perquè la plantilla té l'assumpte '*** SUBJECT HERE ***'. Passeu --force si realment "
+"voleu enviar-lo.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
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:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
-msgstr "fatal: l'àlias '%s' s'espandeix a si mateix\n"
+msgstr "fatal: l'àlies «%s» s'expandeix a si mateix\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:927 git-send-email.perl:935
#, 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"
@@ -16273,16 +16473,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:944
+#: git-send-email.perl:939
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
-msgstr "Què fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
+msgstr "Què cal fer amb aquesta adreça? ([q]surt|[d]escarta|[e]dita): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1260
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "el camí CA \"%s\" no existeix"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1335
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16295,9 +16495,9 @@
" run 'git config --global sendemail.confirm auto'.\n"
"\n"
msgstr ""
-" La llista de Cc de sobre s'ha estès amb adreces addicionals\n"
+" La llista de Cc de sobre s'ha ampliat amb adreces addicionals\n"
" trobades al missatge de la comissió del pedaç. Per defecte, \n"
-" send-email pregunta abans d'enviar el missatge quan això succeix.\n"
+" send-email pregunta abans d'enviar el missatge quan això succeeix.\n"
" Aquest comportament està controlat pel paràmetre de configuració\n"
" sendemail.confirm.\n"
"\n"
@@ -16309,287 +16509,133 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1350
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Voleu enviar aquest correu electrònic? ([y]sí|[n]o|[q]surt|[a]tot): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1353
msgid "Send this email reply required"
-msgstr "Requereix contestació a l'enviar correu"
+msgstr "Requereix resposta en enviar el correu"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1379
msgid "The required SMTP server is not properly defined."
msgstr "El servidor SMTP requerit no està correctament definit."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1426
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "El servidor no admet STARTTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1431 git-send-email.perl:1435
#, perl-format
msgid "STARTTLS failed! %s"
-msgstr ""
+msgstr "STARTTLS ha fallat! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1445
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"No s'ha pogut inicialitzar SMTP correctament. Comproveu-ho la configuració i "
"useu --smtp-debug."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1463
#, perl-format
msgid "Failed to send %s\n"
msgstr "S'ha produït un error en enviar %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Simulació d'enviament %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1466
#, perl-format
msgid "Sent %s\n"
msgstr "Enviat %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "Dry-OK. Log says:\n"
msgstr "Simulació de correcte. El registre diu:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1468
msgid "OK. Log says:\n"
msgstr "Correcte. El registre diu: \n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1480
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1483
msgid "Result: OK\n"
msgstr "Resultat: correcte\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1496
#, perl-format
msgid "can't open file %s"
msgstr "no es pot obrir el fitxer %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1543 git-send-email.perl:1563
#, 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"
+msgstr "(mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1549
#, 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"
+msgstr "(mbox) S'està afegint a: %s des de la línia «%s»\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1597
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
-msgstr "(mbox) S'està afegint cc: %s des de la línia '%s'\n"
+msgstr "(no mbox) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1622
#, 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"
+msgstr "(cos) S'està afegint cc: %s des de la línia «%s»\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1728
#, perl-format
msgid "(%s) Could not execute '%s'"
-msgstr "(%s) no s'ha pogut executar '%s'"
+msgstr "(%s) no s'ha pogut executar «%s»"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1735
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
-msgstr "(%s) S'està afegint %s: %s des de: '%s'\n"
+msgstr "(%s) S'està afegint %s: %s des de: «%s»\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1739
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
-msgstr "(%s) s'ha produït un error en tancar el conducte '%s'"
+msgstr "(%s) s'ha produït un error en tancar el conducte «%s»"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1766
msgid "cannot send message as 7bit"
msgstr "no es pot enviar el missatge en 7 bits"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1774
msgid "invalid transfer encoding"
-msgstr "codificació de transferència invàlida"
+msgstr "codificació de transferència no vàlida"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1812 git-send-email.perl:1863 git-send-email.perl:1873
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "no s'ha pogut obrir %s: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1815
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: el pedaç conté una línia més gran de 998 caràcters"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1831
#, 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"
+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:1818
+#: git-send-email.perl:1835
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Esteu segur que voleu enviar %s? [y|N]: "
-#~ msgid "Could not open file '%s'"
-#~ msgstr "No s'ha pogut obrir el fitxer '%s'"
-
-#~ msgid "in %0.1f seconds automatically..."
-#~ msgstr "en %0.1f segons automàticament..."
-
-#~ msgid "dup2(%d,%d) failed"
-#~ msgstr "dup2(%d,%d) ha fallat"
-
-#~ msgid "Initial commit on "
-#~ msgstr "Comissió inicial en "
-
-#~ msgid "Patch is empty. Was it split wrong?"
-#~ msgstr "El pedaç és buit. S'ha dividit malament?"
-
-#~ msgid ""
-#~ "You still have unmerged paths in your index.\n"
-#~ "Did you forget to use 'git add'?"
-#~ msgstr ""
-#~ "Encara teniu camins sense fusionar en el vostre índex.\n"
-#~ "Heu oblidat d'usar '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 ""
-#~ "No es poden actualitzar els camins i canviar a la branca '%s' a la "
-#~ "vegada.\n"
-#~ "Volíeu agafar '%s', la qual no es pot resoldre com a comissió?"
-
-#~ msgid "Explicit paths specified without -i or -o; assuming --only paths..."
-#~ msgstr ""
-#~ "S'han especificat camins explícits sense -i o -o; s'està presumint --only "
-#~ "camins..."
-
-#~ msgid "default mode for recursion"
-#~ msgstr "mode de recursivitat per defecte"
-
-#~ msgid "submodule--helper subcommand must be called with a subcommand"
-#~ msgstr "s'ha d'executar la subordre submodule--helper amb una subordre"
-
-#, fuzzy
-#~ msgid "object of unknown type"
-#~ msgstr "tipus d'objecte"
-
-#, fuzzy
-#~ msgid "commit object"
-#~ msgstr "Error en objecte"
-
-#, fuzzy
-#~ msgid "tree object"
-#~ msgstr "objecte"
-
-#, fuzzy
-#~ msgid "blob object"
-#~ msgstr "objecte"
-
-#, fuzzy
-#~ msgid "other tag object"
-#~ msgstr "objecte d'arbre massa curt"
-
-#~ msgid ""
-#~ "There is nothing to exclude from by :(exclude) patterns.\n"
-#~ "Perhaps you forgot to add either ':/' or '.' ?"
-#~ msgstr ""
-#~ "No hi ha res a excloure per patrons :(exclusió).\n"
-#~ "Potser heu oblidat afegir o ':/' o '.' ?"
-
-#~ msgid "unrecognized format: %%(%s)"
-#~ msgstr "format no reconegut: %%(%s)"
-
-#~ msgid ":strip= requires a positive integer argument"
-#~ msgstr ":strip= requereix un paràmetre enter positiu"
-
-#~ msgid "ref '%s' does not have %ld components to :strip"
-#~ msgstr "la referència '%s' no té %ld components per a :strip"
-
-#~ msgid "unknown %.*s format %s"
-#~ msgstr "format de %.*s desconegut %s"
-
-#~ msgid "[%s: gone]"
-#~ msgstr "[%s: no hi és]"
-
-#~ msgid "[%s]"
-#~ msgstr "[%s]"
-
-#~ msgid "[%s: behind %d]"
-#~ msgstr "[%s: darrere per %d]"
-
-#~ msgid "[%s: ahead %d]"
-#~ msgstr "[%s: davant per %d]"
-
-#~ msgid "[%s: ahead %d, behind %d]"
-#~ msgstr "[%s: davant per %d, darrere per %d]"
-
-#~ msgid " **** invalid ref ****"
-#~ msgstr " **** referència no vàlida ****"
-
-#~ msgid "insanely long object directory %.*s"
-#~ msgstr "directori d'objectes increïblement llarg %.*s"
-
-#~ msgid "git merge [<options>] <msg> HEAD <commit>"
-#~ msgstr "git merge [<opcions>] <missatge> HEAD <comissió>"
-
-#~ msgid "'%s' is not a commit"
-#~ msgstr "'%s' no és una comissió"
-
-#~ msgid "cannot open file '%s'"
-#~ msgstr "no es pot obrir el fitxer '%s'"
-
-#~ msgid "could not close file %s"
-#~ msgstr "no s'ha pogut tancar el fitxer %s"
-
-#~ msgid "tag name too long: %.*s..."
-#~ msgstr "nom d'etiqueta massa llarg: %.*s..."
-
-#~ msgid "tag header too big."
-#~ msgstr "la capçalera d'etiqueta és massa gran."
-
-#~ msgid ""
-#~ "If the patch applies cleanly, the edited hunk will immediately be\n"
-#~ "marked for discarding"
-#~ msgstr ""
-#~ "Si el pedaç s'aplica correctament, el tros editat es marcarà "
-#~ "immediatament\n"
-#~ "per descartar-se."
-
-#~ msgid "Use an experimental blank-line-based heuristic to improve diffs"
-#~ msgstr ""
-#~ "Usa un heurístic experimental basat en línies en blanc per a millorar les "
-#~ "diferències"
-
-#~ msgid "Clever... amending the last one with dirty index."
-#~ msgstr "Intel·ligent... s'està esmenant l'últim amb índex brut."
-
-#~ 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] ""
-#~ "el submòdul següent (o un dels seus submòduls niats)\n"
-#~ "usa un directori .git:"
-#~ msgstr[1] ""
-#~ "els submòduls següents (o un dels seus submòduls niats)\n"
-#~ "usa un directori .git:"
-
-#~ msgid ""
-#~ "\n"
-#~ "(use 'rm -rf' if you really want to remove it including all of its "
-#~ "history)"
-#~ msgstr ""
-#~ "\n"
-#~ "(useu 'rm -rf' si realment voleu eliminar-lo, incloent tota la seva "
-#~ "història)"
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no accepta paràmetres"
diff --git a/po/de.po b/po/de.po
index 362ebb6..eef4897 100644
--- a/po/de.po
+++ b/po/de.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: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
"PO-Revision-Date: 2016-11-28 18:10+0100\n"
"Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n"
"Language-Team: German <>\n"
@@ -17,43 +17,43 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "Hinweis: %.*s\n"
-#: advice.c:86
+#: advice.c:90
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:88
+#: advice.c:92
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:90
+#: advice.c:94
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:92
+#: advice.c:96
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:94
+#: advice.c:98
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:96
+#: advice.c:100
#, 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:104
+#: advice.c:108
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."
@@ -62,23 +62,23 @@
"dann 'git add/rm <Datei>', um die Auflösung entsprechend zu markieren\n"
"und zu committen."
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "Beende wegen unaufgelöstem Konflikt."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Sie haben Ihren Merge nicht abgeschlossen (MERGE_HEAD existiert)."
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "Bitte committen Sie Ihre Änderungen, bevor Sie mergen."
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "Beende wegen nicht abgeschlossenem Merge."
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -95,7 +95,7 @@
msgstr ""
"Hinweis: Checke '%s' aus.\n"
"\n"
-"Sie befinden sich im Zustand eines 'lösgelösten HEAD'. Sie können sich\n"
+"Sie befinden sich im Zustand eines 'losgelösten HEAD'. Sie können sich\n"
"umschauen, experimentelle Änderungen vornehmen und diese committen, und\n"
"Sie können alle möglichen Commits, die Sie in diesem Zustand machen,\n"
"ohne Auswirkungen auf irgendeinen Branch verwerfen, indem Sie einen\n"
@@ -119,89 +119,89 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "nicht erkannte Option zum Ignorieren von Whitespace: '%s'"
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject und --3way können nicht gemeinsam verwendet werden."
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached und --3way können nicht gemeinsam verwendet werden."
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr ""
"Die Option --3way kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr ""
"Die Option --index kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr ""
"Die Option --cached kann nicht außerhalb eines Repositories verwendet werden."
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden."
-#: apply.c:967
+#: apply.c:942
#, 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:973
+#: apply.c:948
#, 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:974
+#: apply.c:949
#, 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:979
+#: apply.c:954
#, 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:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "Ungültiger Modus in Zeile %d: %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "Inkonsistente Kopfzeilen %d und %d."
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: unerwartete Zeile: %.*s"
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s"
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -216,72 +216,72 @@
"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn "
"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)"
-#: apply.c:1600
+#: apply.c:1575
#, 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:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "neue Datei hängt von alten Inhalten ab"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "entfernte Datei hat noch Inhalte"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "fehlerhafter Patch bei Zeile %d"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "neue Datei %s hängt von alten Inhalten ab"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "entfernte Datei %s hat noch Inhalte"
-#: apply.c:1848
+#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt."
-#: apply.c:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "nicht erkannter Binär-Patch bei Zeile %d"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "Patch mit nutzlosen Informationen bei Zeile %d"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "konnte %s nicht öffnen oder lesen"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "Ungültiger Zeilenanfang: '%c'"
-#: apply.c:3052
+#: apply.c:3055
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -289,12 +289,12 @@
msgstr[1] ""
"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)"
-#: apply.c:3064
+#: apply.c:3067
#, 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:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -303,25 +303,25 @@
"bei der Suche nach:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "keine Daten in Binär-Patch für '%s'"
-#: apply.c:3100
+#: apply.c:3103
#, 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:3146
+#: apply.c:3149
#, 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:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -329,301 +329,301 @@
"der Patch wird angewendet auf '%s' (%s), was nicht den aktuellen Inhalten\n"
"entspricht"
-#: apply.c:3164
+#: apply.c:3167
#, 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:3182
+#: apply.c:3185
#, 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:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "Konnte Binär-Patch nicht auf '%s' anwenden"
-#: apply.c:3201
+#: apply.c:3204
#, 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:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "kann %s nicht auschecken"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "Fehler beim Lesen von %s"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "'%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "Pfad %s wurde umbenannt/gelöscht"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s ist nicht im Index"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s entspricht nicht der Version im Index"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"Dem Repository fehlt der notwendige Blob, um auf einen 3-Wege-Merge\n"
"zurückzufallen."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Falle zurück auf 3-Wege-Merge ...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kann aktuelle Inhalte von '%s' nicht lesen"
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Fehler beim Zurückfallen auf 3-Wege-Merge...\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch auf '%s' mit Konflikten angewendet.\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch auf '%s' sauber angewendet.\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "Lösch-Patch hinterlässt Dateiinhalte"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: falscher Typ"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s ist vom Typ %o, erwartete %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "Ungültiger Pfad '%s'"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s ist bereits bereitgestellt"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s existiert bereits im Arbeitsverzeichnis"
-#: apply.c:3941
+#: apply.c:3945
#, 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:3946
+#: apply.c:3950
#, 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:3966
+#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "betroffene Datei '%s' ist hinter einer symbolischen Verknüpfung"
-#: apply.c:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: Patch konnte nicht angewendet werden"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "Prüfe Patch %s ..."
-#: apply.c:4076
+#: apply.c:4080
#, 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:4083
+#: apply.c:4087
#, 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:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "SHA-1 Information fehlt oder ist unbrauchbar (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen"
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "konnte %s nicht zum temporären Index hinzufügen"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "konnte temporären Index nicht nach %s schreiben"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "konnte %s nicht aus dem Index entfernen"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "fehlerhafter Patch für Submodul %s"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "konnte neu erstellte Datei '%s' nicht lesen"
-#: apply.c:4292
+#: apply.c:4296
#, 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:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "Fehler beim Schreiben nach '%s'"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "schließe Datei '%s'"
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "konnte Datei '%s' mit Modus %o nicht schreiben"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s sauber angewendet"
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "interner Fehler"
-#: apply.c:4522
+#: apply.c:4526
#, 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:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "Verkürze Name von .rej Datei zu %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "kann '%s' nicht öffnen"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Patch-Bereich #%d sauber angewendet."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "Patch-Block #%d zurückgewiesen."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "Patch '%s' ausgelassen."
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "nicht erkannte Eingabe"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "Konnte Index-Datei nicht lesen"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kann Patch '%s' nicht öffnen: %s"
-#: apply.c:4860
+#: apply.c:4864
#, 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:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, 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:4874
+#: apply.c:4878
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "Pfad"
@@ -636,7 +636,7 @@
msgid "apply changes matching the given path"
msgstr "Änderungen nur im angegebenen Pfad anwenden"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "Anzahl"
@@ -700,7 +700,7 @@
"einen temporären Index, basierend auf den integrierten Index-Informationen, "
"erstellen"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "Pfade sind getrennt durch NUL Zeichen"
@@ -709,7 +709,9 @@
msgstr ""
"sicher stellen, dass mindestens <n> Zeilen des Kontextes übereinstimmen"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "Aktion"
@@ -738,9 +740,9 @@
msgid "allow overlapping hunks"
msgstr "sich überlappende Patch-Blöcke erlauben"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "erweiterte Ausgaben"
@@ -752,7 +754,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "den Zeilennummern im Kopf des Patch-Blocks nicht vertrauen"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "Wurzelverzeichnis"
@@ -779,108 +781,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <Repository> [--exec <Programm>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "Format"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "Archivformat"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "Präfix"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "einen Präfix vor jeden Pfadnamen in dem Archiv stellen"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "Datei"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "das Archiv in diese Datei schreiben"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr ".gitattributes aus dem Arbeitsverzeichnis lesen"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "archivierte Dateien in der Standard-Fehlerausgabe ausgeben"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "nur speichern"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "schneller komprimieren"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "besser komprimieren"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "unterstützte Archivformate auflisten"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "Repository"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "Archiv vom Remote-Repository <Repository> abrufen"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "Programm"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "Pfad zum externen \"git-upload-archive\"-Programm"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Unerwartete Option --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "Die Option --exec kann nur zusammen mit --remote verwendet werden."
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Unerwartete Option --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Unbekanntes Archivformat '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument für Format '%s' nicht unterstützt: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s ist kein gültiger Attributname"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -888,22 +890,22 @@
"Verneinende Muster werden in Git-Attributen ignoriert.\n"
"Benutzen Sie '\\!' für führende Ausrufezeichen."
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Ungültiger Inhalt bzgl. Anführungsstriche in Datei '%s': %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Keine binäre Suche mehr möglich!\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s ist kein gültiger Commit-Name"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -912,7 +914,7 @@
"Die Merge-Basis %s ist fehlerhaft.\n"
"Das bedeutet, der Fehler wurde zwischen %s und [%s] behoben.\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -921,7 +923,7 @@
"Die Merge-Basis %s ist neu.\n"
"Das bedeutet, die Eigenschaft hat sich zwischen %s und [%s] geändert.\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -930,7 +932,7 @@
"Die Merge-Basis %s ist %s.\n"
"Das bedeutet, der erste '%s' Commit befindet sich zwischen %s und [%s].\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -941,7 +943,7 @@
"git bisect kann in diesem Fall nicht richtig arbeiten.\n"
"Vielleicht verwechselten Sie %s und %s Commits?\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -953,36 +955,36 @@
"erste %s Commit zwischen %s und %s befindet.\n"
"Es wird dennoch fortgesetzt."
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "binäre Suche: eine Merge-Basis muss geprüft werden\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "ein %s Commit wird benötigt"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "konnte Datei '%s' nicht erstellen"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "Konnte Datei '%s' nicht lesen"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "Lesen von Referenzen für binäre Suche fehlgeschlagen"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s war sowohl %s als auch %s\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
@@ -991,7 +993,7 @@
"Kein testbarer Commit gefunden.\n"
"Vielleicht starteten Sie mit falschen Pfad-Parametern?\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1001,7 +1003,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -1024,10 +1026,10 @@
"endgültigen\n"
"Commits"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "Einrichtung des Revisionsgangs fehlgeschlagen"
@@ -1069,45 +1071,43 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr ""
-"Branch %s konfiguriert zum Folgen von Remote-Branch %s von %s durch Rebase."
+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 konfiguriert zum Folgen von Remote-Branch %s von %s."
+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 konfiguriert zum Folgen von lokalem Branch %s durch Rebase."
+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 konfiguriert zum Folgen von lokalem Branch %s."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Branch '%s' folgt nun lokalem Branch '%s'."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s durch Rebase."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "Branch '%s' folgt nun Remote-Referenz '%s' durch Rebase."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Branch %s konfiguriert zum Folgen von Remote-Referenz %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Branch '%s' folgt nun Remote-Referenz '%s'."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr ""
-"Branch %s konfiguriert zum Folgen von lokaler Referenz %s durch Rebase."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr "Branch '%s' folgt nun lokaler Referenz '%s' durch Rebase."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "Branch %s konfiguriert zum Folgen von lokaler Referenz %s."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Branch '%s' folgt nun lokaler Referenz '%s'."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1120,33 +1120,33 @@
"Konfiguration zum Folgen von Branch nicht eingerichtet. Referenz %s ist "
"mehrdeutig."
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' ist kein gültiger Branchname."
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Branch '%s' existiert bereits."
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Kann Aktualisierung des aktuellen Branches nicht erzwingen."
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Kann Tracking-Informationen nicht einrichten; Startpunkt '%s' ist kein "
"Branch."
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "der angeforderte Upstream-Branch '%s' existiert nicht"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1167,27 +1167,27 @@
"\"git push -u\" verwenden, um den Upstream-Branch beim \"push\"\n"
"zu konfigurieren."
-#: branch.c:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Ungültiger Objekt-Name: '%s'"
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "mehrdeutiger Objekt-Name: '%s'"
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Ungültiger Branchpunkt: '%s'"
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' ist bereits in '%s' ausgecheckt"
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD des Arbeitsverzeichnisses %s ist nicht aktualisiert."
@@ -1202,7 +1202,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "nicht erkannter Kopfbereich: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "Konnte '%s' nicht öffnen"
@@ -1211,56 +1212,56 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Dem Repository fehlen folgende vorausgesetzte Commits:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Das Paket enthält diese Referenz:"
msgstr[1] "Das Paket enthält diese %d Referenzen:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Das Paket speichert eine komplette Historie."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Das Paket benötigt diese Referenz:"
msgstr[1] "Das Paket benötigt diese %d Referenzen:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Konnte Paketobjekte nicht erstellen"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "Erstellung der Paketobjekte abgebrochen"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "\"rev-list\" abgebrochen"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "nicht erkanntes Argument: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Erstellung eines leeren Pakets zurückgewiesen."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "kann '%s' nicht erstellen"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "Erstellung der Paketindexdatei abgebrochen"
@@ -1269,8 +1270,8 @@
msgid "invalid color value: %.*s"
msgstr "Ungültiger Farbwert: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "konnte %s nicht parsen"
@@ -1280,7 +1281,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s ist kein Commit!"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1292,7 +1293,7 @@
"Encoding,\n"
"welches von ihrem Projekt verwendet wird.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "Speicher verbraucht"
@@ -1388,86 +1389,91 @@
msgid "failed to expand user dir in: '%s'"
msgstr "Fehler beim Erweitern des Nutzerverzeichnisses in: '%s'"
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "ungültiger zlib Komprimierungsgrad %d"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "Ungültiger Modus für Objekterstellung: %s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "ungültiger Komprimierungsgrad (%d) für Paketierung"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr ""
"Konnte die über die Befehlszeile angegebene Konfiguration nicht parsen."
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr ""
"Es trat ein unbekannter Fehler beim Lesen der Konfigurationsdateien auf."
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Ungültiger %s: '%s'"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"Unbekannter Wert '%s' in core.untrackedCache; benutze Standardwert 'keep'"
-#: config.c:2111
+#: config.c:2162
#, 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:2122
+#: config.c:2187
#, 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:2124
+#: config.c:2189
#, 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:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s hat mehrere Werte"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "fstat auf %s fehlgeschlagen"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' setzen."
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "Konnte '%s' nicht aufheben."
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "Die Gegenseite hat nach dem ersten Kontakt abgebrochen."
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1480,19 +1486,19 @@
"bestehen\n"
"und das Repository existiert."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Prüfe Konnektivität"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Konnte 'git rev-list' nicht ausführen"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "Fehler beim Schreiben nach rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe"
@@ -1599,32 +1605,40 @@
msgid "failed to read orderfile '%s'"
msgstr "Fehler beim Lesen der Reihenfolgedatei '%s'."
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "Führe Erkennung für ungenaue Umbenennung aus"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "Option '%s' erfordert einen Wert."
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
" Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Unbekannter \"dirstat\" Parameter '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"\"color moved\"-Einstellung muss eines von diesen sein: 'no', 'default', "
+"'zebra', 'dimmed_zebra', 'plain'"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'"
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1633,21 +1647,21 @@
"Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n"
"%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "externes Diff-Programm unerwartet beendet, angehalten bei %s"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"--name-only, --name-status, --check und -s schließen sich gegenseitig aus"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow erfordert genau eine Pfadspezifikation"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1656,22 +1670,22 @@
"Fehler beim Parsen des --dirstat/-X Optionsparameters:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'"
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"Ungenaue Erkennung für Umbenennungen wurde aufgrund zu vieler Dateien\n"
"übersprungen."
-#: diff.c:4719
+#: diff.c:5449
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:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1679,209 +1693,218 @@
"Sie könnten die Variable %s auf mindestens %d setzen und den Befehl\n"
"erneut versuchen."
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "Fehler beim Sammeln von Namen und Informationen zum Kernel"
-#: dir.c:2067
+#: dir.c:2219
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:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "Konnte Verzeichnisse für '%s' nicht erstellen."
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "Konnte Git-Verzeichnis nicht von '%s' nach '%s' migrieren."
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "Hinweis: Warte auf das Schließen der Datei durch Ihren Editor...%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Filtere Inhalt"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "konnte Datei '%s' nicht lesen"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: erwartete shallow-Liste"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ACK/NAK erwartet, EOF bekommen"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "Fehler am anderen Ende: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK erwartet, '%s' bekommen"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc benötigt multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "Ungültige shallow-Zeile: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "Ungültige unshallow-Zeile: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "Objekt nicht gefunden: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "Fehler in Objekt: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "Kein shallow-Objekt gefunden: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow erwartet, %s bekommen"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "%s %d %s bekommen"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "Ungültiger Commit %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "Gebe auf"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "Fertig"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "%s (%d) %s bekommen"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Markiere %s als vollständig"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "habe %s (%s) bereits"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: Fehler beim Starten des sideband demultiplexer"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "Protokollfehler: ungültiger Pack-Header"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: konnte %s nicht starten"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "%s fehlgeschlagen"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "Fehler in sideband demultiplexer"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "Server unterstützt keine shallow-Clients"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "Server unterstützt multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "Server unterstützt no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "Server unterstützt multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "Server unterstützt side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "Server unterstützt side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Server unterstützt allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Server unterstützt allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "Server unterstützt ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "Server-Version ist %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "Server unterstützt kein --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Server unterstützt kein --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "Server unterstützt kein --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "keine gemeinsamen Commits"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: Abholen fehlgeschlagen."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "kein übereinstimmender Remote-Branch"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "keine solche Remote-Referenz %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Der Server lehnt Anfrage nach nicht angebotenem Objekt %s ab."
@@ -1894,7 +1917,7 @@
msgid "could not create temporary file"
msgstr "konnte temporäre Datei nicht erstellen"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "Fehler beim Schreiben der losgelösten Signatur nach '%s'"
@@ -1904,17 +1927,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "Ignoriere ungültige Farbe '%.*s' in log.graphColors"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': konnte %s nicht lesen"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "'%s': read() zu kurz"
@@ -1948,7 +1971,8 @@
#: help.c:358
#, 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."
+msgstr ""
+"WARNUNG: Sie haben Git-Befehl '%s' ausgeführt, welcher nicht existiert."
#: help.c:363
#, c-format
@@ -1972,19 +1996,23 @@
msgid_plural ""
"\n"
"The most similar commands are"
-msgstr[0] "\nDer ähnlichste Befehl ist"
-msgstr[1] "\nDie ähnlichsten Befehle sind"
+msgstr[0] ""
+"\n"
+"Der ähnlichste Befehl ist"
+msgstr[1] ""
+"\n"
+"Die ähnlichsten Befehle sind"
#: help.c:395
msgid "git version [<options>]"
msgstr "git version [<Optionen>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -2052,12 +2080,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "Name besteht nur aus nicht erlaubten Zeichen: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "Ungültiges Datumsformat: %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "Mehrere Arten von Objekt-Filtern können nicht kombiniert werden."
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "Ungültiger filter-spec Ausdruck '%s'."
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2077,87 +2114,87 @@
"ein früherer Git-Prozess in diesem Repository abgestürzt sein:\n"
"Löschen Sie die Datei manuell um fortzufahren."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Konnte '%s.lock' nicht erstellen: %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "Lesen des Zwischenspeichers fehlgeschlagen"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(ungültiger Commit)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache für Pfad '%s' fehlgeschlagen"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "Fehler beim Erstellen der \"Tree\"-Objekte"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "Fehler beim Erstellen des Pfades '%s'%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": vielleicht ein Verzeichnis/Datei-Konflikt?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "verweigere, da unversionierte Dateien in '%s' verloren gehen würden"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kann Objekt %s '%s' nicht lesen"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "Blob erwartet für %s '%s'"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "Fehler beim Öffnen von '%s': %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "Fehler beim Erstellen einer symbolischen Verknüpfung für '%s': %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, 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:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Fehler bei Ausführung des internen Merges"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "Konnte %s nicht zur Datenbank hinzufügen"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2166,7 +2203,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:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2175,7 +2212,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:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2184,7 +2221,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:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2193,20 +2230,20 @@
"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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "umbenennen"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "umbenannt"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, 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:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2215,143 +2252,148 @@
"KONFLIKT (umbenennen/umbenennen): Benenne um \"%s\"->\"%s\" in Branch \"%s\" "
"und \"%s\"->\"%s\" in Branch \"%s\"%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (bleibt unaufgelöst)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Benenne stattdessen %s nach %s und %s nach %s um"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"KONFLIKT (umbenennen/hinzufügen): Benenne um %s->%s in %s. %s hinzugefügt in "
"%s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Füge zusammengeführte Datei %s hinzu"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Füge stattdessen als %s hinzu"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "kann Objekt %s nicht lesen"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "Objekt %s ist kein Blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "ändern"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "geändert"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "Inhalt"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "hinzufügen/hinzufügen"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s ausgelassen (Ergebnis des Merges existiert bereits)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "automatischer Merge von %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "Submodul"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Merge-Konflikt in %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Entferne %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "Datei/Verzeichnis"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "Verzeichnis/Datei"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "Füge %s hinzu"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Geänderter Index: kann nicht mergen (geändert: %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "Bereits aktuell!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "Zusammenführen der \"Tree\"-Objekte %s und %s fehlgeschlagen"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Merge:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, 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:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "Merge hat keinen Commit zurückgegeben"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Konnte Objekt '%s' nicht parsen."
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Konnte Index nicht schreiben."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2366,7 +2408,7 @@
"Merge\n"
"von Notizen beginnen."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Sie haben Ihren Merge von Notizen nicht abgeschlossen (%s existiert)."
@@ -2374,7 +2416,7 @@
#: notes-utils.c:42
msgid "Cannot commit uninitialized/unreferenced notes tree"
msgstr ""
-"Kann uninitialisiertes/unreferenzierte Notiz-Verzeichnis nicht committen."
+"Kann uninitialisiertes/unreferenziertes Notiz-Verzeichnis nicht committen."
#: notes-utils.c:101
#, c-format
@@ -2396,16 +2438,30 @@
msgid "Bad %s value: '%s'"
msgstr "Ungültiger %s Wert: '%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "Konnte Objekt '%s' nicht parsen."
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
+
+#: packfile.c:1683
+#, 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:1687
+#, 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.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "Verwendung: %s"
@@ -2413,17 +2469,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " oder: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
@@ -2432,7 +2488,7 @@
msgid "malformed object name '%s'"
msgstr "fehlerhafter Objekt-Name '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Konnte Gruppenschreibrecht für %s nicht setzen."
@@ -2508,25 +2564,16 @@
msgstr ""
"%s: Pfadspezifikationsangabe wird von diesem Befehl nicht unterstützt: %s"
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"Leere Strings als Pfadspezifikationen werden in kommenden Releases "
-"ungültig.\n"
-"Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "Pfadspezifikation '%s' ist hinter einer symbolischen Verknüpfung"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "Konnte --pretty Format nicht parsen."
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2535,7 +2582,7 @@
"index.version gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2544,53 +2591,54 @@
"GIT_INDEX_VERSION gesetzt, aber Wert ungültig.\n"
"Verwende Version %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "Konnte '%s' nicht schließen"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "Konnte '%s' nicht lesen."
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "konnte Git-Verzeichnis nicht öffnen: %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "Konnte '%s' nicht entfernen."
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
"Aktualisierungen von Referenzen ist innerhalb der Quarantäne-Umgebung "
"verboten."
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Konnte Referenz %s nicht entfernen: %s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "Konnte Referenzen nicht entfernen: %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "Konnte Referenz %s nicht löschen"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "Konnte Referenz %s nicht entfernen: %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "Konnte Referenzen nicht entfernen: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "entfernt"
@@ -2609,157 +2657,157 @@
msgid "ahead %d, behind %d"
msgstr "%d voraus, %d hinterher"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "Erwartetes Format: %%(color:<Farbe>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "nicht erkannte Farbe: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Positiver Wert erwartet refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Positiver Wert erwartet refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "nicht erkanntes %%(%s) Argument: %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) akzeptiert keine Argumente"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) akzeptiert keine Argumente"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) akzeptiert keine Argumente"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "unbekanntes %%(trailers) Argument: %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "Positiver Wert erwartet contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "nicht erkanntes %%(contents) Argument: %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "Positiver Wert erwartet objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "nicht erkanntes %%(objectname) Argument: %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "Erwartetes Format: %%(align:<Breite>,<Position>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "nicht erkannte Position:%s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "nicht erkannte Breite:%s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "nicht erkanntes %%(align) Argument: %s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "Positive Breitenangabe für %%(align) erwartet"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "nicht erkanntes %%(if) Argument: %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "Fehlerhafter Feldname: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "Unbekannter Feldname: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: %%(if) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: %%(then) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: %%(then) Atom mehr als einmal verwendet"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: %%(then) Atom nach %%(else) verwendet"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: %%(else) Atom ohne ein %%(if) Atom verwendet"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "Format: %%(else) Atom ohne ein %%(then) Atom verwendet"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "Format: %%(end) Atom mehr als einmal verwendet"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "Format: %%(end) Atom ohne zugehöriges Atom verwendet"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "Fehlerhafter Formatierungsstring %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(kein Branch, Rebase von Branch %s im Gange)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(kein Branch, binäre Suche begonnen bei %s)"
@@ -2767,7 +2815,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD losgelöst bei %s)"
@@ -2775,140 +2823,140 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD losgelöst von %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(kein Branch)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "Objekt %s fehlt für %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer bei %s für %s fehlgeschlagen"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "fehlerhaftes Objekt bei '%s'"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "Ignoriere Referenz mit fehlerhaftem Namen %s"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "Ignoriere fehlerhafte Referenz %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "Format: %%(end) Atom fehlt"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "Missgebildeter Objektname %s"
-#: remote.c:747
+#: remote.c:780
#, 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:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s folgt üblicherweise %s, nicht %s"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s folgt sowohl %s als auch %s"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "Interner Fehler"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD zeigt auf keinen Branch"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "Kein solcher Branch: '%s'"
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "Kein Upstream-Branch für Branch '%s' konfiguriert."
-#: remote.c:1698
+#: remote.c:1729
#, 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:1713
+#: remote.c:1744
#, 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:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "Push-Refspecs für '%s' beinhalten nicht '%s'"
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "kein Ziel für \"push\" (push.default ist 'nothing')"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr "kann einzelnes Ziel für \"push\" im Modus 'simple' nicht auflösen"
-#: remote.c:2076
+#: remote.c:2106
#, 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:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (benutzen Sie \"git branch --unset-upstream\" zum Beheben)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
-msgstr "Ihr Branch ist auf dem selben Stand wie '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Ihr Branch ist auf demselben Stand wie '%s'.\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (benutzen Sie \"git push\", um lokale Commits zu publizieren)\n"
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2918,12 +2966,12 @@
msgstr[1] ""
"Ihr Branch ist %2$d Commits hinter '%1$s', und kann vorgespult werden.\n"
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
" (benutzen Sie \"git pull\", um Ihren lokalen Branch zu aktualisieren)\n"
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2938,49 +2986,58 @@
"Ihr Branch und '%s' sind divergiert,\n"
"und haben jeweils %d und %d unterschiedliche Commits.\n"
-#: remote.c:2117
+#: remote.c:2147
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"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "Ihr aktueller Branch scheint fehlerhaft zu sein."
-#: revision.c:2190
+#: revision.c:2271
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "Ihr aktueller Branch '%s' hat noch keine Commits."
-#: revision.c:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "Die Optionen --first-parent und --bisect sind inkompatibel."
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "Öffnen von /dev/null fehlgeschlagen"
-#: send-pack.c:151
+#: run-command.c:1188
+#, 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:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "Konnte Status des Entpackens der Gegenseite nicht parsen: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "Entpacken auf der Gegenseite fehlgeschlagen: %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "Fehler beim Signieren des \"push\"-Zertifikates"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr ""
"die Gegenseite unterstützt keinen signierten Versand (\"--signed push\")"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2988,32 +3045,32 @@
"kein Versand des \"push\"-Zertifikates, da die Gegenseite keinen signierten\n"
"Versand (\"--signed push\") unterstützt"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "die Gegenseite unterstützt keinen atomaren Versand (\"--atomic push\")"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "die Gegenseite unterstützt keine Push-Optionen"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "Revert"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "Cherry-Pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "interaktives Rebase"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Unbekannte Aktion: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -3021,7 +3078,7 @@
"nach Auflösung der Konflikte markieren Sie die korrigierten Pfade\n"
"mit 'git add <Pfade>' oder 'git rm <Pfade>'"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3031,43 +3088,44 @@
"mit 'git add <Pfade>' oder 'git rm <Pfade>' und tragen Sie das Ergebnis mit\n"
"'git commit' ein"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "Konnte '%s' nicht sperren"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "Konnte nicht nach '%s' schreiben."
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "Konnte EOL nicht nach '%s' schreiben."
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "Fehler beim Fertigstellen von '%s'."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "Konnte '%s' nicht lesen"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "Ihre lokalen Änderungen würden durch den %s überschrieben werden."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr ""
"Committen Sie Ihre Änderungen oder benutzen Sie \"stash\", um fortzufahren."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: Vorspulen"
@@ -3075,20 +3133,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Konnte neue Index-Datei nicht schreiben"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "Konnte HEAD-Commit nicht auflösen\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "Konnte HEAD-Commit nicht auflösen."
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "Konnte Cache-Verzeichnis nicht aktualisieren\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "Konnte Cache-Verzeichnis nicht aktualisieren."
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3119,17 +3177,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "Konnte Commit %s nicht parsen\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "Konnte Eltern-Commit %s nicht parsen\n"
+msgid "could not parse commit %s"
+msgstr "Konnte Commit %s nicht parsen."
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "Konnte Eltern-Commit %s nicht parsen."
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3140,7 +3198,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3151,230 +3209,242 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "Das ist eine Kombination aus %d Commits."
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "benötige HEAD für fixup"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "Konnte HEAD nicht lesen"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "Konnte Commit-Beschreibung von HEAD nicht lesen"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "kann '%s' nicht schreiben"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Das ist die erste Commit-Beschreibung:"
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "Konnte Commit-Beschreibung von %s nicht lesen."
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "Das ist Commit-Beschreibung #%d:"
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Die Commit-Beschreibung #%d wird ausgelassen:"
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "Unbekannter Befehl: %d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "Ihre Index-Datei ist nicht zusammengeführt."
-#: sequencer.c:973
+#: sequencer.c:986
#, 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:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "Commit %s hat keinen Eltern-Commit %d"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "Hauptlinie wurde spezifiziert, aber Commit %s ist kein Merge."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kann Eltern-Commit %s nicht parsen"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "Konnte '%s' nicht zu '%s' umbenennen."
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "Konnte \"revert\" nicht auf %s... (%s) ausführen"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "Konnte %s... (%s) nicht anwenden"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "leere Menge von Commits übergeben"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: Fehler beim Lesen des Index"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: Fehler beim Aktualisieren des Index"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s akzeptiert keine Argumente: '%s'"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "Fehlende Argumente für %s."
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "Ungültige Zeile %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "Kann '%s' nicht ohne vorherigen Commit ausführen"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "Konnte '%s' nicht lesen."
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
"Bitte beheben Sie dieses, indem Sie 'git rebase --edit-todo' ausführen."
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "Unbenutzbares Instruktionsblatt: '%s'"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "Keine Commits geparst."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "Kann Cherry-Pick nicht während eines Reverts ausführen."
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "Kann Revert nicht während eines Cherry-Picks ausführen."
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "Ungültiger Schlüssel: %s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "Ungültiger Wert für %s: %s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "Fehlerhaftes Optionsblatt: '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "Konnte \"sequencer\"-Verzeichnis '%s' nicht erstellen."
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "Konnte HEAD nicht sperren"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "kein \"cherry-pick\" oder \"revert\" im Gang"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "kann HEAD nicht auflösen"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
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:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "kann '%s' nicht öffnen"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "Kann '%s' nicht lesen: %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "Unerwartetes Dateiende"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, 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:1658
+#: sequencer.c:1691
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."
+msgstr ""
+"Sie scheinen HEAD verändert zu haben. Keine Rückspulung, prüfen Sie HEAD."
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "Konnte '%s' nicht nach '%s' kopieren."
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "Konnte den Index nicht lesen."
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3390,11 +3460,11 @@
"\n"
"ausführen.\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
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:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3412,17 +3482,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Automatischen Stash angewendet.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "kann %s nicht speichern"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3433,59 +3503,59 @@
"Ihre Änderungen sind im Stash sicher.\n"
"Sie können jederzeit \"git stash pop\" oder \"git stash drop\" ausführen.\n"
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Angehalten bei %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "Unbekannter Befehl %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "Konnte orig-head nicht lesen."
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "Konnte 'onto' nicht lesen."
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "Konnte %s nicht aktualisieren."
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "Konnte HEAD nicht auf %s aktualisieren."
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr ""
"Rebase nicht möglich: Sie haben Änderungen, die nicht zum Commit\n"
"vorgemerkt sind."
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen."
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "Kann nicht existierenden Commit nicht nachbessern."
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "Ungültige Datei: '%s'"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "Ungültige Inhalte: '%s'"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3496,24 +3566,97 @@
"committen Sie diese zuerst und führen Sie dann 'git rebase --continue'\n"
"erneut aus."
-#: sequencer.c:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s kann nicht in \"cherry-pick\" benutzt werden"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: ungültiger Commit"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "Kann nicht als allerersten Commit einen Revert ausführen."
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: unbehandelte Optionen"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: Fehler beim Vorbereiten der Commits"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "Unbenutzbare TODO-Liste: '%s'"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Nicht erkannte Einstellung %s für Option rebase.missingCommitsCheck. "
+"Ignoriere."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
+"Entfernte Commits (neu zu alt):\n"
+
+#: sequencer.c:2702
+#, 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 ""
+"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
+"entfernen.\n"
+"\n"
+"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der\n"
+"Warnungen zu ändern.\n"
+"Die möglichen Verhaltensweisen sind: ignore, warn, error.\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
+"'git rebase --continue' aus.\n"
+"Oder Sie können den Rebase mit 'git rebase --abort' abbrechen.\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "Konnte Commit '%s' nicht parsen."
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "Das Script wurde bereits umgeordnet."
+
#: setup.c:171
#, c-format
msgid ""
@@ -3547,34 +3690,34 @@
"Benutzen Sie '--', um Pfade und Commits zu trennen, ähnlich wie:\n"
"'git <Befehl> [<Commit>...] -- [<Datei>...]'"
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Erwartete Git-Repository-Version <= %d, %d gefunden"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "Unbekannte Repository-Erweiterungen gefunden:"
-#: setup.c:810
+#: setup.c:811
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Kein Git-Repository (oder irgendein Elternverzeichnis): %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Kann nicht zurück zum Arbeitsverzeichnis wechseln"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht lesen."
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "Kann nicht nach '%s' wechseln."
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3584,7 +3727,7 @@
"%s)\n"
"Stoppe bei Dateisystemgrenze (GIT_DISCOVERY_ACROSS_FILESYSTEM nicht gesetzt)."
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3593,60 +3736,46 @@
"Problem mit Wert für Dateimodus (0%.3o) von core.sharedRepository.\n"
"Der Besitzer der Dateien muss immer Lese- und Schreibrechte haben."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "Pfad '%s' existiert nicht"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"Referenziertes Repository '%s' wird noch nicht als verknüpftes\n"
"Arbeitsverzeichnis unterstützt."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "Referenziertes Repository '%s' ist kein lokales Repository."
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
"Referenziertes Repository '%s' hat eine unvollständige Historie (shallow)."
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
"Referenziertes Repository '%s' ist mit künstlichen Vorgängern (\"grafts\") "
"eingehängt."
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "Offset vor Ende der Packdatei (fehlerhafte Indexdatei?)"
-
-#: sha1_file.c:2729
-#, 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?)"
-
-#: sha1_file.c:2733
-#, 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?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "Kurzer SHA-1 %s ist mehrdeutig."
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "Die Kandidaten sind:"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3671,66 +3800,71 @@
"indem Sie \"git config advice.objectNameWarning false\"\n"
"ausführen."
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
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:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Konnte keine Sektion in .gitmodules mit Pfad \"%s\" finden"
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Konnte Eintrag '%s' in .gitmodules nicht aktualisieren"
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Konnte Eintrag '%s' nicht aus .gitmodules entfernen"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "Konnte aktualisierte .gitmodules-Datei nicht zum Commit vormerken"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "Negative Werte für submodule.fetchJobs nicht erlaubt"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "In nicht ausgechecktem Submodul '%s'."
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Pfadspezifikation '%s' befindet sich in Submodul '%.*s'"
-#: submodule.c:1337
+#: submodule.c:833
+#, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' nicht als Git-Repository erkannt"
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht starten."
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "Konnte 'git status' in Submodul '%s' nicht ausführen."
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "Submodul '%s' hat einen geänderten Index."
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3738,18 +3872,18 @@
"relocate_gitdir für Submodul '%s' mit mehr als einem Arbeitsverzeichnis\n"
"wird nicht unterstützt"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "konnte Name für Submodul '%s' nicht nachschlagen"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3760,79 +3894,83 @@
"'%s' nach\n"
"'%s'\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '%s'"
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "Konnte 'ls-files' nicht in .. starten"
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "FEHLER: zurückgegebene Zeichenkette für Pfad entspricht nicht cwd?"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree mit unerwartetem Rückgabewert %d beendet"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "Negative Werte für submodule.fetchjobs nicht erlaubt."
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "Ungültiger Wert für %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "Ausführen des Anhang-Befehls '%s' fehlgeschlagen"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "unbekannter Wert '%s' für Schlüssel %s"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "mehr als ein %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "leerer Anhang-Token in Anhang '%.*s'"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "Konnte Eingabe-Datei '%s' nicht lesen"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "konnte nicht von der Standard-Eingabe lesen"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "Datei '%s' ist keine reguläre Datei"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "Datei %s ist vom Benutzer nicht beschreibbar."
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "konnte temporäre Datei '%s' nicht öffnen"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "konnte temporäre Datei nicht zu %s umbenennen"
@@ -3847,7 +3985,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: ungültige --depth Option '%s'"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3856,7 +3994,7 @@
"Die folgenden Submodul-Pfade enthalten Änderungen, die in keinem\n"
"Remote-Repository gefunden wurden:\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3883,11 +4021,11 @@
"zum Versenden zu einem Remote-Repository.\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "Abbruch."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "Konnte Referenz %s nicht lesen."
@@ -3904,11 +4042,11 @@
msgid "empty filename in tree entry"
msgstr "leerer Dateiname in Tree-Eintrag"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "zu kurze Tree-Datei"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3919,7 +4057,7 @@
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie Branches\n"
"wechseln."
-#: unpack-trees.c:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3929,7 +4067,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3939,7 +4077,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie mergen."
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3949,7 +4087,7 @@
"überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3959,7 +4097,7 @@
"überschrieben werden:\n"
"%%sBitte committen oder stashen Sie Ihre Änderungen, bevor Sie %s ausführen."
-#: unpack-trees.c:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3968,7 +4106,7 @@
"Ihre lokalen Änderungen würden durch %s überschrieben werden.\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3978,7 +4116,7 @@
"Dateien in diesen Verzeichnissen verloren gehen:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3988,7 +4126,7 @@
"den Checkout entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3999,7 +4137,7 @@
"Checkout entfernt werden:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4009,7 +4147,7 @@
"den Merge entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie mergen."
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4020,7 +4158,7 @@
"Merge entfernt werden:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4030,7 +4168,7 @@
"den %s entfernt werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4040,7 +4178,7 @@
"den %s entfernt werden:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4051,7 +4189,7 @@
"den Checkout überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie Branches wechseln."
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4063,7 +4201,7 @@
"Checkout überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4073,7 +4211,7 @@
"den Merge überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor Sie mergen."
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4083,7 +4221,7 @@
"den Merge überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4093,7 +4231,7 @@
"den %s überschrieben werden:\n"
"%%sBitte verschieben oder entfernen Sie diese, bevor sie %s ausführen."
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4104,23 +4242,22 @@
"%s überschrieben werden:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Eintrag '%s' überschneidet sich mit '%s'. Kann nicht verbinden."
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge sind "
-"nicht\n"
-"aktuell:\n"
+"Kann partiellen Checkout nicht aktualisieren: die folgenden Einträge\n"
+"sind nicht aktuell:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4131,7 +4268,7 @@
"über einen partiellen Checkout überschrieben werden:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4142,7 +4279,7 @@
"über einen partiellen Checkout entfernt werden:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4151,19 +4288,12 @@
"Kann Submodul nicht aktualisieren:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "Abbruch\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-"Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht "
-"unterstützt."
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "Checke Dateien aus"
@@ -4206,13 +4336,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "Konnte '%s' nicht zum Lesen und Schreiben öffnen."
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "Konnte '%s' nicht zum Lesen öffnen."
@@ -4226,292 +4351,282 @@
msgid "unable to get current working directory"
msgstr "Konnte aktuelles Arbeitsverzeichnis nicht bekommen."
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "Konnte nicht nach '%s' schreiben."
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "Konnte '%s' nicht schließen."
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Nicht zusammengeführte Pfade:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git reset %s <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
" (benutzen Sie \"git rm --cached <Datei>...\" zum Entfernen aus der Staging-"
"Area)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung entsprechend zu "
"markieren)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Auflösung zu markieren)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "zum Commit vorgemerkte Änderungen:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "Änderungen, die nicht zum Commit vorgemerkt sind:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (benutzen Sie \"git add/rm <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (benutzen Sie \"git checkout -- <Datei>...\", um die Änderungen im "
"Arbeitsverzeichnis zu verwerfen)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (committen oder verwerfen Sie den unversionierten oder geänderten Inhalt "
"in den Submodulen)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (benutzen Sie \"git %s <Datei>...\", um die Änderungen zum Commit "
"vorzumerken)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "beide gelöscht:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "von uns hinzugefügt:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "von denen gelöscht:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "von denen hinzugefügt:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "von uns gelöscht:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "von beiden hinzugefügt:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "von beiden geändert:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "neue Datei:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "kopiert:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "gelöscht:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "geändert:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "umbenannt:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "Typänderung:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "unbekannt:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "nicht gemerged:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "neue Commits, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "geänderter Inhalt, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "unversionierter Inhalt, "
-#: wt-status.c:821
+#: wt-status.c:824
#, 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:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "Submodule geändert, aber nicht aktualisiert:"
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "Änderungen in Submodul zum Committen:"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"Ändern Sie nicht die obige Zeile.\n"
-"Alles unterhalb von ihr wird entfernt."
+"Ändern oder entfernen Sie nicht die obige Zeile.\n"
+"Alles unterhalb von ihr wird ignoriert."
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "Sie haben nicht zusammengeführte Pfade."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)"
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (benutzen Sie \"git merge --abort\", um den Merge abzubrechen)"
-#: wt-status.c:1059
+#: wt-status.c:1063
msgid "All conflicts fixed but you are still merging."
msgstr "Alle Konflikte sind behoben, aber Sie sind immer noch beim Merge."
-#: wt-status.c:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " (benutzen Sie \"git commit\", um den Merge abzuschließen)"
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr "Eine \"am\"-Sitzung ist im Gange."
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "Der aktuelle Patch ist leer."
-#: wt-status.c:1079
+#: wt-status.c:1083
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:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git am --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1083
+#: wt-status.c:1087
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:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo fehlt."
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "Keine Befehle ausgeführt."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Zuletzt ausgeführter Befehl (%d Befehl ausgeführt):"
msgstr[1] "Zuletzt ausgeführte Befehle (%d Befehle ausgeführt):"
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " (mehr Informationen in Datei %s)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "Keine Befehle verbleibend."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nächster auszuführender Befehl (%d Befehle verbleibend):"
msgstr[1] "Nächste auszuführende Befehle (%d Befehle verbleibend):"
-#: wt-status.c:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (benutzen Sie \"git rebase --edit-todo\" zum Ansehen und Bearbeiten)"
-#: wt-status.c:1259
+#: wt-status.c:1264
#, 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:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "Sie sind gerade beim Rebase."
-#: wt-status.c:1278
+#: wt-status.c:1283
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:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (benutzen Sie \"git rebase --skip\", um diesen Patch auszulassen)"
-#: wt-status.c:1282
+#: wt-status.c:1287
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:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4519,138 +4634,138 @@
"Sie teilen gerade einen Commit auf, während ein Rebase von Branch '%s' auf "
"'%s' im Gange ist."
-#: wt-status.c:1297
+#: wt-status.c:1302
msgid "You are currently splitting a commit during a rebase."
msgstr "Sie teilen gerade einen Commit während eines Rebase auf."
-#: wt-status.c:1300
+#: wt-status.c:1305
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:1304
+#: wt-status.c:1309
#, 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:1309
+#: wt-status.c:1314
msgid "You are currently editing a commit during a rebase."
msgstr "Sie editieren gerade einen Commit während eines Rebase."
-#: wt-status.c:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
" (benutzen Sie \"git commit --amend\", um den aktuellen Commit "
"nachzubessern)"
-#: wt-status.c:1314
+#: wt-status.c:1319
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:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Sie führen gerade \"cherry-pick\" von Commit %s aus."
-#: wt-status.c:1329
+#: wt-status.c:1334
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:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (alle Konflikte behoben: führen Sie \"git cherry-pick --continue\" aus)"
-#: wt-status.c:1334
+#: wt-status.c:1339
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:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Sie sind gerade an einem Revert von Commit '%s'."
-#: wt-status.c:1348
+#: wt-status.c:1353
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:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alle Konflikte behoben: führen Sie \"git revert --continue\" aus)"
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
" (benutzen Sie \"git revert --abort\", um die Revert-Operation abzubrechen)"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, 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:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "Sie sind gerade bei einer binären Suche."
-#: wt-status.c:1371
+#: wt-status.c:1376
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:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "Auf Branch "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "interaktives Rebase im Gange; auf "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "Rebase im Gange; auf "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "HEAD losgelöst bei "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "HEAD losgelöst von "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "Im Moment auf keinem Branch."
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "Initialer Commit"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "Noch keine Commits"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "Unversionierte Dateien"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "Ignorierte Dateien"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4661,32 +4776,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:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "Unversionierte Dateien nicht aufgelistet%s"
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr " (benutzen Sie die Option -u, um unversionierte Dateien anzuzeigen)"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "Keine Änderungen"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, 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:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "keine Änderungen zum Commit vorgemerkt\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4695,69 +4810,69 @@
"nichts zum Commit vorgemerkt, aber es gibt unversionierte Dateien\n"
"(benutzen Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, 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:1658
+#: wt-status.c:1663
#, 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"
+"nichts zu committen (erstellen/kopieren Sie Dateien und benutzen\n"
"Sie \"git add\" zum Versionieren)\n"
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "nichts zu committen\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, 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:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "nichts zu committen, Arbeitsverzeichnis unverändert\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "Noch keine Commits in "
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (kein Branch)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "hinterher "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "voraus "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, 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:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "Zusätzlich enthält die Staging-Area nicht committete Änderungen."
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"%s nicht möglich: Die Staging-Area enthält nicht committete Änderungen."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "Konnte '%s' nicht entfernen."
@@ -4766,128 +4881,132 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<Optionen>] [--] <Pfadspezifikation>..."
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "unerwarteter Differenz-Status %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "Aktualisierung der Dateien fehlgeschlagen"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "lösche '%s'\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr ""
"Nicht zum Commit vorgemerkte Änderungen nach Aktualisierung der Staging-Area:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Konnte den Index nicht lesen"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Konnte '%s' nicht zum Schreiben öffnen."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "Konnte Patch nicht schreiben"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "Bearbeitung des Patches fehlgeschlagen"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "Konnte Verzeichnis '%s' nicht lesen"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "Leerer Patch. Abgebrochen."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "Konnte '%s' nicht anwenden."
-#: builtin/add.c:249
+#: builtin/add.c:271
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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "Probelauf"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "interaktives Auswählen"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "Blöcke interaktiv auswählen"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "aktuelle Unterschiede editieren und anwenden"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "das Hinzufügen andernfalls ignorierter Dateien erlauben"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "versionierte Dateien aktualisieren"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "erneutes Normalisieren der Zeilenenden von versionierten Dateien (impliziert -u)"
+
+#: builtin/add.c:300
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:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr ""
"Änderungen von allen versionierten und unversionierten Dateien hinzufügen"
-#: builtin/add.c:281
+#: builtin/add.c:304
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:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "nichts hinzufügen, nur den Index aktualisieren"
-#: builtin/add.c:284
+#: builtin/add.c:307
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:285
+#: builtin/add.c:308
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:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "das \"ausführbar\"-Bit der aufgelisteten Dateien überschreiben"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "warnen wenn eingebettetes Repository hinzugefügt wird"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4904,8 +5023,10 @@
"\n"
"See \"git help submodule\" for more information."
msgstr ""
-"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories hinzugefügt.\n"
-"Klone des äußeren Repositories werden die Inhalte des eingebetteten Repositories\n"
+"Sie haben ein Git-Repository innerhalb ihres aktuellen Repositories "
+"hinzugefügt.\n"
+"Klone des äußeren Repositories werden die Inhalte des eingebetteten "
+"Repositories\n"
"weder enthalten, noch wissen, wie diese zu beschaffen sind.\n"
"Wenn Sie ein Submodul hinzufügen wollten, benutzen Sie:\n"
"\n"
@@ -4919,159 +5040,159 @@
"\n"
"Siehe \"git help submodule\" für weitere Informationen."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "Füge eingebettetes Repository hinzu: %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "Hinzufügen von Dateien fehlgeschlagen"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "Die Optionen -A und -u sind zueinander inkompatibel."
-#: builtin/add.c:401
+#: builtin/add.c:424
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:405
+#: builtin/add.c:428
#, 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:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Nichts spezifiziert, nichts hinzugefügt.\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Meinten Sie vielleicht 'git add .'?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "Index-Datei beschädigt"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "konnte Autor-Skript nicht parsen"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' wurde durch den applypatch-msg Hook entfernt"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Fehlerhafte Eingabezeile: '%s'."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "\"fseek\" fehlgeschlagen"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "konnte Patch '%s' nicht parsen"
-#: builtin/am.c:842
+#: builtin/am.c:855
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:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "ungültiger Zeitstempel"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "Ungültige \"Date\"-Zeile"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "Ungültiger Offset in der Zeitzone"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "Patch-Formaterkennung fehlgeschlagen."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "Fehler beim Aufteilen der Patches."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "Konnte Index-Datei nicht schreiben."
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, 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:1172
+#: builtin/am.c:1161
#, 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:1173
+#: 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:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Patch ist leer."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "Ungültige Identifikationszeile: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "Konnte Commit '%s' nicht parsen."
-#: builtin/am.c:1586
+#: builtin/am.c:1550
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:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr ""
"Verwende Informationen aus der Staging-Area, um ein Basisverzeichnis "
"nachzustellen ..."
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -5079,39 +5200,39 @@
"Haben Sie den Patch per Hand editiert?\n"
"Er kann nicht auf die Blobs in seiner 'index' Zeile angewendet werden."
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "Falle zurück zum Patchen der Basis und zum 3-Wege-Merge ..."
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Merge der Änderungen fehlgeschlagen."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "\"git write-tree\" schlug beim Schreiben eines \"Tree\"-Objektes fehl"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "auf leere Historie anwenden"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "Fehler beim Schreiben des Commit-Objektes."
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "Kann nicht fortsetzen: %s existiert nicht"
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"Kann nicht interaktiv sein, ohne dass die Standard-Eingabe mit einem "
"Terminal verbunden ist."
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "Commit-Beschreibung ist:"
@@ -5119,35 +5240,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
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:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Geänderter Index: kann Patches nicht anwenden (geändert: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Wende an: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "Keine Änderungen -- Patches bereits angewendet."
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Anwendung des Patches fehlgeschlagen bei %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Die Kopie des fehlgeschlagenen Patches befindet sich in: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5158,7 +5279,7 @@
"diese bereits anderweitig eingefügt worden sein; Sie könnten diesen Patch\n"
"auslassen."
-#: builtin/am.c:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -5171,17 +5292,17 @@
"Sie können 'git rm' auf Dateien ausführen, um \"von denen gelöscht\" für\n"
"diese zu akzeptieren."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "Konnte Objekt '%s' nicht parsen."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "Fehler beim Bereinigen des Index"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5189,135 +5310,134 @@
"Sie scheinen seit dem letzten gescheiterten 'am' HEAD geändert zu haben.\n"
"Keine Zurücksetzung zu ORIG_HEAD."
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Ungültiger Wert für --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<Optionen>] [(<mbox> | <E-Mail-Verzeichnis>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<Optionen>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "interaktiv ausführen"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "historische Option -- kein Effekt"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "erlaube, falls notwendig, das Zurückfallen auf einen 3-Wege-Merge"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "weniger Ausgaben"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "der Commit-Beschreibung eine Signed-off-by Zeile hinzufügen"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "nach UTF-8 umkodieren (Standard)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "-k an git-mailinfo übergeben"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "-b an git-mailinfo übergeben"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "-m an git-mailinfo übergeben"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
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:2241
+#: builtin/am.c:2204
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:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "alles vor einer Scheren-Zeile entfernen"
-#: 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:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "an git-apply übergeben"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "Anzahl"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "Format"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "Patch-Format"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "Meldung bei fehlerhafter Patch-Anwendung überschreiben"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "Anwendung der Patches nach Auflösung eines Konfliktes fortsetzen"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "Synonyme für --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "den aktuellen Patch auslassen"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr ""
"ursprünglichen Branch wiederherstellen und Anwendung der Patches abbrechen"
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "Autor-Datum als Commit-Datum verwenden"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "aktuellen Zeitstempel als Autor-Datum verwenden"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "GPG-Schlüsselkennung"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "Commits mit GPG signieren"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(intern für git-rebase verwendet)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5325,16 +5445,16 @@
"Die -b/--binary Option hat seit Langem keinen Effekt und wird\n"
"entfernt. Bitte verwenden Sie diese nicht mehr."
-#: builtin/am.c:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "Fehler beim Lesen des Index"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, 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:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5343,7 +5463,7 @@
"Stray %s Verzeichnis gefunden.\n"
"Benutzen Sie \"git am --abort\", um es zu entfernen."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Es ist keine Auflösung im Gange, es wird nicht fortgesetzt."
@@ -5381,18 +5501,69 @@
msgid "git archive: expected a flush"
msgstr "git archive: erwartete eine Spülung (flush)"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' ist kein gültiger Begriff."
+
+#: builtin/bisect--helper.c:50
+#, 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:60
+#, 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:71
+msgid "please use two different terms"
+msgstr "Bitte verwenden Sie zwei verschiedene Begriffe."
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "Konnte die Datei BISECT_TERMS nicht öffnen."
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "'git bisect next' ausführen"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "die Begriffe nach .git/BISECT_TERMS schreiben"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "den Zustand der binären Suche aufräumen"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "auf erwartete Commits prüfen"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "BISECT_HEAD aktualisieren, anstatt den aktuellen Commit auszuchecken"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms benötigt zwei Argumente."
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state erwartet keine Argumente."
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<Optionen>] [<rev-opts>] [<Commit>] [--] <Datei>"
@@ -5552,14 +5723,18 @@
msgstr "git branch [<Optionen>] (-m | -M) [<alter-Branch>] <neuer-Branch>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<Optionen>] (-c | -C) [<alter-Branch>] <neuer-Branch>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<Optionen>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<Optionen>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5568,7 +5743,7 @@
"entferne Branch '%s', der zusammengeführt wurde mit\n"
" '%s', aber noch nicht mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5577,12 +5752,12 @@
"entferne Branch '%s' nicht, der noch nicht zusammengeführt wurde mit\n"
" '%s', obwohl er mit HEAD zusammengeführt wurde."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Konnte Commit-Objekt für '%s' nicht nachschlagen."
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5592,94 +5767,119 @@
"Wenn Sie sicher sind diesen Branch zu entfernen, führen Sie 'git branch -D "
"%s' aus."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen."
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "kann -a nicht mit -d benutzen"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "Konnte Commit-Objekt für HEAD nicht nachschlagen."
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Kann Branch '%s' nicht entfernen, ausgecheckt in '%s'."
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "Remote-Tracking-Branch '%s' nicht gefunden"
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "Branch '%s' nicht gefunden."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fehler beim Entfernen des Remote-Tracking-Branches '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fehler beim Entfernen des Branches '%s'"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Remote-Tracking-Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branch %s entfernt (war %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "Konnte Formatierungsstring nicht parsen."
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Branch %s wird auf %s umgesetzt"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Binäre Suche von Branch %s zu %s im Gange"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+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:473
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:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Ungültiger Branchname: '%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "Umbenennung des Branches fehlgeschlagen"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Kopie des Branches fehlgeschlagen"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Kopie eines falsch benannten Branches '%s' erstellt."
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "falsch benannten Branch '%s' umbenannt"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, 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:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
"Branch ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist "
"fehlgeschlagen."
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+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:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5690,177 +5890,185 @@
" %s\n"
"Zeilen, die mit '%c' beginnen, werden entfernt.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "Allgemeine Optionen"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
msgid "show hash and subject, give twice for upstream branch"
msgstr "Hash und Betreff anzeigen; -vv: zusätzlich Upstream-Branch"
-#: builtin/branch.c:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "Informationsmeldungen unterdrücken"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
-msgstr "den Übernahmemodus einstellen (siehe git-pull(1))"
+msgstr "Modus zum Folgen von Branches einstellen (siehe git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "Informationen zum Upstream-Branch ändern"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "nicht verwenden"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "Upstream"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "Informationen zum Upstream-Branch ändern"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "Informationen zum Upstream-Branch entfernen"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "farbige Ausgaben verwenden"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "auf Remote-Tracking-Branches wirken"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit enthalten"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "nur Branches ausgeben, die diesen Commit nicht enthalten"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "spezifische Aktionen für \"git-branch\":"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "Remote-Tracking und lokale Branches auflisten"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "vollständig zusammengeführten Branch entfernen"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "Branch löschen (auch wenn nicht zusammengeführt)"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr "einen Branch und dessen Reflog verschieben/umbenennen"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr ""
"einen Branch verschieben/umbenennen, auch wenn das Ziel bereits existiert"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "einen Branch und dessen Reflog kopieren"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "einen Branch kopieren, auch wenn das Ziel bereits existiert"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "Branchnamen auflisten"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "das Reflog des Branches erzeugen"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "die Beschreibung für den Branch bearbeiten"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "Erstellung, Verschiebung/Umbenennung oder Löschung erzwingen"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "nur zusammengeführte Branches ausgeben"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "nur nicht zusammengeführte Branches ausgeben"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "Branches in Spalten auflisten"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "Schüssel"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "sortiere nach diesem Feld"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "Objekt"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "nur Branches von diesem Objekt ausgeben"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "Sortierung und Filterung sind unabhängig von Groß- und Kleinschreibung"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "für die Ausgabe zu verwendendes Format"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Konnte HEAD nicht als gültige Referenz auflösen."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "HEAD wurde nicht unter \"refs/heads\" gefunden!"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "Die Optionen --column und --verbose sind inkompatibel."
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "Branchname erforderlich"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "zu losgelöstem HEAD kann keine Beschreibung hinterlegt werden"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "Beschreibung von mehr als einem Branch kann nicht bearbeitet werden"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Noch kein Commit in Branch '%s'."
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "Branch '%s' nicht vorhanden."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "zu viele Branches für eine Umbenennen-Operation angegeben"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "zu viele Branches für eine Kopieroperation angegeben"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "zu viele Branches angegeben, um Upstream-Branch zu setzen"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "zu viele Argumente für eine Umbenennen-Operation angegeben"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "zu viele Argumente angegeben, um Upstream-Branch zu setzen"
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5868,61 +6076,46 @@
"Konnte keinen neuen Upstream-Branch von HEAD zu %s setzen, da dieser auf\n"
"keinen Branch zeigt."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "Kein solcher Branch '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "Branch '%s' existiert nicht"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
msgstr ""
-"zu viele Branches angegeben, um Konfiguration zu Upstream-Branch zu entfernen"
+"zu viele Argumente angegeben, um Konfiguration zu Upstream-Branch zu "
+"entfernen"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
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:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Branch '%s' hat keinen Upstream-Branch gesetzt"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "'HEAD' darf nicht manuell erstellt werden"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem "
"Branchnamen verwendet werden."
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --"
-"track oder --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, führen "
-"Sie aus:\n"
+"Die '--set-upstream' Option wird nicht länger unterstützt.\n"
+"Bitte benutzen Sie stattdessen '--track' oder '--set-upstream-to'."
#: builtin/bundle.c:45
#, c-format
@@ -5937,7 +6130,7 @@
msgid "Need a repository to unbundle."
msgstr "Zum Entpacken wird ein Repository benötigt."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5945,7 +6138,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <Art> | --textconv | --filters) [--path=<Pfad>] <Objekt>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5953,68 +6146,68 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<Art> kann sein: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "Objektart anzeigen"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "Objektgröße anzeigen"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "mit Rückgabewert 0 beenden, wenn kein Fehler aufgetreten ist"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "ansprechende Anzeige des Objektinhaltes"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
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:566
+#: builtin/cat-file.c:568
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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "Blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "einen bestimmten Pfad für --textconv/--filters verwenden"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s und -t mit beschädigten Objekten erlauben"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "Ausgabe von --batch puffern"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
"Anzeige von Informationen und Inhalt von Objekten, gelesen von der Standard-"
"Eingabe"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr ""
"Anzeige von Informationen über Objekte, gelesen von der Standard-Eingabe"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
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:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "alle Objekte mit --batch oder --batch-check anzeigen"
@@ -6042,7 +6235,7 @@
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:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "Fortschrittsanzeige unterdrücken"
@@ -6100,164 +6293,164 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr "--stage sollte zwischen 1 und 3 oder 'all' sein"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "alle Dateien im Index auschecken"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "das Überschreiben bereits existierender Dateien erzwingen"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
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:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "keine neuen Dateien auschecken"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "Dateiinformationen in der Index-Datei aktualisieren"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr "eine Liste von Pfaden von der Standard-Eingabe lesen"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "den Inhalt in temporäre Dateien schreiben"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "Zeichenkette"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr ""
"wenn Dateien erzeugt werden, stelle <Zeichenkette> dem Dateinamen voran"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "Dateien von dem benannten Stand kopieren"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<Optionen>] <Branch>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<Optionen>] [<Branch>] -- <Datei>..."
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "Pfad '%s' hat nicht unsere Version."
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "Pfad '%s' hat nicht deren Version."
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "Pfad '%s' hat nicht alle notwendigen Versionen."
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "Pfad '%s' hat nicht die notwendigen Versionen."
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "Pfad '%s': kann nicht zusammenführen"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Konnte Merge-Ergebnis von '%s' nicht hinzufügen."
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' kann nicht mit der Aktualisierung von Pfaden verwendet werden"
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, 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:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "Pfad '%s' ist nicht zusammengeführt."
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
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:628
+#: builtin/checkout.c:637
#, 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:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD ist jetzt bei"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "Konnte HEAD nicht aktualisieren."
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Setze Branch '%s' neu\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "Bereits auf '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Zu umgesetztem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Zu neuem Branch '%s' gewechselt\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Zu Branch '%s' gewechselt\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " ... und %d weitere.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6280,7 +6473,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6307,162 +6500,163 @@
" git branch <neuer-Branchname> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "interner Fehler im Revisionsgang"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "Vorherige Position von HEAD war"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr "Sie sind auf einem Branch, der noch nicht geboren ist"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "nur eine Referenz erwartet, %d gegeben."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "Ungültige Referenz: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "Referenz ist kein \"Tree\"-Objekt: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "Pfade können nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' kann nicht beim Wechseln von Branches verwendet werden"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' kann nicht mit '%s' verwendet werden"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kann Branch nicht zu Nicht-Commit '%s' wechseln"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "Branch"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "einen neuen Branch erzeugen und auschecken"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "einen Branch erstellen/umsetzen und auschecken"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "das Reflog für den neuen Branch erzeugen"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "HEAD bei benanntem Commit loslösen"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "Informationen zum Upstream-Branch für den neuen Branch setzen"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "neuer Branch"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "neuer Branch ohne Eltern-Commit"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "unsere Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "ihre Variante für nicht zusammengeführte Dateien auschecken"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "Auschecken erzwingen (verwirft lokale Änderungen)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr "einen 3-Wege-Merge mit dem neuen Branch ausführen"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "ignorierte Dateien aktualisieren (Standard)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "Stil"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "Konfliktstil (merge oder diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "keine Einschränkung bei Pfadspezifikationen zum partiellen Auschecken"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "second guess 'git checkout <no-such-branch>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "Fortschrittsanzeige erzwingen"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus."
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "Bei der Option --track muss ein Branchname angegeben werden."
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "Vermisse Branchnamen; versuchen Sie -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "ungültige Pfadspezifikation"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, 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."
+msgstr ""
+"'%s' ist kein Commit und es kann kein Branch '%s' aus diesem erstellt werden."
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, 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:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6501,7 +6695,7 @@
msgid "failed to remove %s"
msgstr "Fehler beim Löschen von %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6514,7 +6708,7 @@
"foo - Element anhand eines eindeutigen Präfix auswählen\n"
" - (leer) nichts auswählen\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6535,38 +6729,38 @@
"* - alle Elemente auswählen\n"
" - (leer) Auswahl beenden\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Wie bitte (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ignorier-Muster eingeben>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "WARNUNG: Kann keine Einträge finden die Muster entsprechen: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
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:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "'%s' löschen [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Tschüss.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6584,63 +6778,64 @@
"help - diese Meldung anzeigen\n"
"? - Hilfe zur Auswahl mittels Eingabe anzeigen"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Befehle ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "Was nun"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
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:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "Keine Dateien mehr zum Löschen, beende."
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "keine Namen von gelöschten Dateien ausgeben"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "Aktion erzwingen"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "interaktives Clean"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "ganze Verzeichnisse löschen"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "Muster"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "<Muster> zu den Regeln für ignorierte Pfade hinzufügen"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "auch ignorierte Dateien löschen"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "nur ignorierte Dateien löschen"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden."
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6648,7 +6843,7 @@
"clean.requireForce auf \"true\" gesetzt und weder -i, -n noch -f gegeben; "
"\"clean\" verweigert"
-#: builtin/clean.c:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6656,148 +6851,150 @@
"clean.requireForce standardmäßig auf \"true\" gesetzt und weder -i, -n noch -"
"f gegeben; \"clean\" verweigert"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<Optionen>] [--] <Repository> [<Verzeichnis>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "kein Auschecken"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "ein Bare-Repository erstellen"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "ein Spiegelarchiv erstellen (impliziert --bare)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "von einem lokalen Repository klonen"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "lokal keine harten Verweise verwenden, immer Kopien"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "als verteiltes Repository einrichten"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "Pfadspezifikation"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "Submodule im Klon initialisieren"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "Anzahl der parallel zu klonenden Submodule"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "Vorlagenverzeichnis"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "Verzeichnis, von welchem die Vorlagen verwendet werden"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "Repository referenzieren"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "--reference nur während des Klonens benutzen"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "Name"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "<Name> statt 'origin' für Upstream-Repository verwenden"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "<Branch> auschecken, anstatt HEAD des Remote-Repositories"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "Pfad zu \"git-upload-pack\" auf der Gegenseite"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "Tiefe"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr ""
"einen Klon mit unvollständiger Historie (shallow) in dieser Tiefe erstellen"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "Zeit"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
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:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "Commit"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
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:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "nur einen Branch klonen, HEAD oder --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
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:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "jedes geklonte Submodul mit unvollständiger Historie (shallow)"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr ".git-Verzeichnis"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "Git-Verzeichnis vom Arbeitsverzeichnis separieren"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "Schlüssel=Wert"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "Konfiguration innerhalb des neuen Repositories setzen"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "nur IPv4-Adressen benutzen"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "nur IPv6-Adressen benutzen"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6805,42 +7002,42 @@
"Konnte keinen Verzeichnisnamen erraten.\n"
"Bitte geben Sie ein Verzeichnis auf der Befehlszeile an."
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, 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:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "Fehler beim Öffnen von '%s'"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existiert und ist kein Verzeichnis"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "Konnte %s nicht lesen\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "Konnte Verweis '%s' nicht erstellen"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "Konnte Datei nicht nach '%s' kopieren"
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "Fertig.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6850,101 +7047,101 @@
"Sie können mit 'git status' prüfen, was ausgecheckt worden ist\n"
"und das Auschecken mit 'git checkout -f HEAD' erneut versuchen.\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Konnte zu klonenden Remote-Branch %s nicht finden."
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "Remote-Repository hat nicht alle erforderlichen Objekte gesendet."
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "kann %s nicht aktualisieren"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
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:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "Arbeitsverzeichnis konnte nicht ausgecheckt werden"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "konnte Parameter nicht in Konfigurationsdatei schreiben"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "Kann \"repack\" zum Aufräumen nicht aufrufen"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "Kann temporäre \"alternates\"-Datei nicht entfernen"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "Zu viele Argumente."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Sie müssen ein Repository zum Klonen angeben."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "Die Optionen --bare und --origin %s sind inkompatibel."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "Repository '%s' existiert nicht."
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "Tiefe %s ist keine positive Zahl"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, 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:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "Arbeitsverzeichnis '%s' existiert bereits."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen."
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klone in Bare-Repository '%s' ...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klone nach '%s' ...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6952,45 +7149,40 @@
"'clone --recursive' ist nicht kompatibel mit --reference und --reference-if-"
"able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie "
"stattdessen file://"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
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:1071
+#: builtin/clone.c:1075
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:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr ""
"Quelle ist ein Repository mit unvollständiger Historie (shallow),\n"
"ignoriere --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local wird ignoriert"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Weiß nicht wie %s zu klonen ist."
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Remote-Branch %s nicht im Upstream-Repository %s gefunden"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "Sie scheinen ein leeres Repository geklont zu haben."
@@ -7016,7 +7208,7 @@
#: builtin/column.c:32
msgid "Padding space on right border"
-msgstr "Abstand zur rechten Rand"
+msgstr "Abstand zum rechten Rand"
#: builtin/column.c:33
msgid "Padding space between columns"
@@ -7133,62 +7325,62 @@
"Benutzen Sie anschließend \"git cherry-pick --continue\", um die\n"
"Cherry-Pick-Operation mit den verbleibenden Commits fortzusetzen.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "Fehler beim Entpacken des \"Tree\"-Objektes von HEAD."
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "Konnte temporären Index nicht erstellen."
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "interaktives Hinzufügen fehlgeschlagen"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "Konnte temporären Index nicht aktualisieren."
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Konnte Haupt-Cache-Verzeichnis nicht aktualisieren"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "Konnte new_index Datei nicht schreiben"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
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:461
+#: builtin/commit.c:463
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:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "Konnte temporäre Index-Datei nicht schreiben."
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "Commit '%s' fehlt Autor-Kopfbereich"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "Commit '%s' hat fehlerhafte Autor-Zeile"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "Fehlerhafter --author Parameter"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -7196,38 +7388,38 @@
"Konnte kein Kommentar-Zeichen auswählen, das nicht in\n"
"der aktuellen Commit-Beschreibung verwendet wird."
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "Konnte Commit %s nicht nachschlagen"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(lese Log-Nachricht von Standard-Eingabe)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "Konnte Log nicht von Standard-Eingabe lesen."
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "Konnte Log-Datei '%s' nicht lesen"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "Konnte SQUASH_MSG nicht lesen"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "Konnte MERGE_MSG nicht lesen"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "Konnte Commit-Vorlage nicht schreiben"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7242,7 +7434,7 @@
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7257,7 +7449,7 @@
"\t%s\n"
"und versuchen Sie es erneut.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7267,7 +7459,7 @@
"die mit '%c' beginnen, werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7280,157 +7472,164 @@
"entfernen.\n"
"Eine leere Beschreibung bricht den Commit ab.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAutor: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sCommit-Ersteller: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Kann Index nicht lesen"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "Fehler beim Erzeugen der \"Tree\"-Objekte"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, 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:1068
+#: builtin/commit.c:1076
#, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Ungültiger ignored-Modus '%s'."
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ungültiger Modus '%s' für unversionierte Dateien"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "Die Optionen --long und -z sind inkompatibel."
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
"Die Optionen --reset-author und --author können nicht gemeinsam verwendet "
"werden."
-#: builtin/commit.c:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "Sie haben nichts für \"--amend\"."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Ein Merge ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "\"cherry-pick\" ist im Gange -- kann \"--amend\" nicht ausführen."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden."
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
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:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1226
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:1207
+#: builtin/commit.c:1228
msgid "No paths with --include/--only does not make sense."
msgstr ""
"Die Optionen --include und --only können nur mit der Angabe von Pfaden "
"verwendet werden."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Ungültiger \"cleanup\" Modus %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "Die Option -a kann nicht mit der Angabe von Pfaden verwendet werden."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "Status im Kurzformat anzeigen"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "Branchinformationen anzeigen"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "Stashinformationen anzeigen"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "Version"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "maschinenlesbare Ausgabe"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "Status im Langformat anzeigen (Standard)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "Einträge mit NUL-Zeichen abschließen"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "Modus"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"unversionierte Dateien anzeigen, optionale Modi: all, normal, no. (Standard: "
"all)"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "ignorierte Dateien anzeigen"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr "ignorierte Dateien anzeigen, optionale Modi: traditional, matching, no. (Standard: traditional)"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "wann"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7438,203 +7637,212 @@
"Änderungen in Submodulen ignorieren, optional wenn: all, dirty, untracked. "
"(Standard: all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "unversionierte Dateien in Spalten auflisten"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Nicht unterstützte Kombination von ignored und untracked-files Argumenten."
+
+#: builtin/commit.c:1469
msgid "couldn't look up newly created commit"
msgstr "Konnte neu erstellten Commit nicht nachschlagen."
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
-msgstr "Konnte neulich erstellten Commit nicht analysieren."
+msgstr "Konnte neu erstellten Commit nicht analysieren."
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "Konnte HEAD nicht auflösen, nachdem der Commit erstellt wurde."
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "losgelöster HEAD"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (Basis-Commit)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "Zusammenfassung nach erfolgreichem Commit unterdrücken"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "Unterschiede in Commit-Beschreibungsvorlage anzeigen"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "Optionen für Commit-Beschreibung"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "Beschreibung von Datei lesen"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "Autor"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "Autor eines Commits überschreiben"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "Datum"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "Datum eines Commits überschreiben"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "Beschreibung"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "Commit-Beschreibung"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "Commit"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden und editieren"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "Beschreibung des angegebenen Commits wiederverwenden"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung zum Nachbessern des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
"eine automatisch zusammengesetzte Beschreibung beim \"squash\" des "
"angegebenen Commits verwenden"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1630
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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "'Signed-off-by:'-Zeile hinzufügen"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "angegebene Vorlagendatei verwenden"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "Bearbeitung des Commits erzwingen"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "Standard"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr ""
"wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "Status in die Commit-Beschreibungsvorlage einfügen"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "Commit mit GPG signieren"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "Optionen für Commit-Inhalt"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "alle geänderten Dateien committen"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "die angegebenen Dateien zusätzlich zum Commit vormerken"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "interaktives Hinzufügen von Dateien"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "interaktives Hinzufügen von Änderungen"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "nur die angegebenen Dateien committen"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "Hooks pre-commit und commit-msg umgehen"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "anzeigen, was committet werden würde"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "vorherigen Commit ändern"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "\"post-rewrite hook\" umgehen"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "Aufzeichnung einer leeren Änderung erlauben"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "Aufzeichnung einer Änderung mit einer leeren Beschreibung erlauben"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "Konnte Commit von HEAD nicht analysieren."
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Beschädigte MERGE_HEAD-Datei (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "Konnte MERGE_MODE nicht lesen"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "Konnte Commit-Beschreibung nicht lesen: %s"
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Commit aufgrund leerer Beschreibung abgebrochen.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, 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:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7649,141 +7857,145 @@
msgid "git config [<options>]"
msgstr "git config [<Optionen>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "Ort der Konfigurationsdatei"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "globale Konfigurationsdatei verwenden"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "systemweite Konfigurationsdatei verwenden"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "Konfigurationsdatei des Repositories verwenden"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "die angegebene Konfigurationsdatei verwenden"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "Blob-Id"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "Konfiguration von angegebenem Blob-Objekt lesen"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "Aktion"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "Wert zurückgeben: Name [Wert-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "alle Werte zurückgeben: Schlüssel [Wert-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "Werte für den regulären Ausdruck zurückgeben: Name-regex [Wert-regex]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "Wert spezifisch für eine URL zurückgeben: section[.var] URL"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr "alle passenden Variablen ersetzen: Name Wert [Wert-regex] "
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "neue Variable hinzufügen: Name Wert"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "eine Variable entfernen: Name [Wert-regex]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "alle Übereinstimmungen entfernen: Name [Wert-regex]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "eine Sektion umbenennen: alter-Name neuer-Name"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "eine Sektion entfernen: Name"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "alles auflisten"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "einen Editor öffnen"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "die konfigurierte Farbe finden: Slot [Standard]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "die Farbeinstellung finden: Slot [Standard-Ausgabe-ist-Terminal]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "Wert ist \"true\" oder \"false\""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "Wert ist eine Dezimalzahl"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "Wert ist --bool oder --int"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "Wert ist ein Pfad (Datei oder Verzeichnisname)"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "Wert ist ein Verfallsdatum"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "Sonstiges"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "schließt Werte mit NUL-Byte ab"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "nur Variablennamen anzeigen"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "beachtet \"include\"-Direktiven beim Nachschlagen"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"Ursprung der Konfiguration anzeigen (Datei, Standard-Eingabe, Blob, "
"Befehlszeile)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "konnte Standard-Farbwert nicht parsen"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7798,16 +8010,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local kann nur innerhalb eines Git-Repositories verwendet werden."
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "Konnte Konfigurationsdatei '%s' nicht erstellen."
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7817,75 +8029,65 @@
" Benutzen Sie einen regulären Ausdruck, --add oder --replace, um %s\n"
" zu ändern."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "gibt Größenangaben in menschenlesbaren Format aus"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<Optionen>] [<Commit-Angabe>...]"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<Optionen>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "Branch"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "nicht-annotiert"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "annotiert"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "annotiertes Tag %s ist nicht verfügbar"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "annotiertes Tag %s hat keinen eingebetteten Namen"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "Tag '%s' ist eigentlich '%s' hier"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "%s ist kein gültiger Objekt-Name"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s ist kein gültiges '%s' Objekt"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "kein Tag entspricht exakt '%s'"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "suche zur Beschreibung von %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "Keine exakte Übereinstimmung bei Referenzen oder Tags, Suche zum Beschreiben\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "beendete Suche bei %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7894,7 +8096,7 @@
"Keine annotierten Tags können '%s' beschreiben.\n"
"Jedoch gab es nicht-annotierte Tags: versuchen Sie --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7903,12 +8105,12 @@
"Keine Tags können '%s' beschreiben.\n"
"Versuchen Sie --always oder erstellen Sie einige Tags."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu Commits durchlaufen\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7917,79 +8119,94 @@
"mehr als %i Tags gefunden; führe die ersten %i auf\n"
"Suche bei %s aufgegeben\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "Beschreibe %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "%s ist kein gültiger Objekt-Name"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s ist weder ein Commit, noch ein Blob."
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "das Tag finden, das nach dem Commit kommt"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "die Suchstrategie in der Standard-Fehlerausgabe protokollieren"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "alle Referenzen verwenden"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "jedes Tag verwenden, auch nicht-annotierte"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "immer langes Format verwenden"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "nur erstem Elternteil folgen"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "nur exakte Übereinstimmungen ausgeben"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "die jüngsten <n> Tags betrachten (Standard: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "nur Tags, die <Muster> entsprechen, betrachten"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "keine Tags betrachten, die <Muster> entsprechen"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "gekürztes Commit-Objekt anzeigen, wenn sonst nichts zutrifft"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "Kennzeichen"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
"<Kennzeichen> bei geändertem Arbeitsverzeichnis anhängen (Standard: \"-dirty"
"\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"<Kennzeichen> bei defektem Arbeitsverzeichnis anhängen (Standard: \"-broken"
"\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel."
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "Keine Namen gefunden, kann nichts beschreiben."
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "Die Option --dirty kann nicht mit Commits verwendet werden."
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "Die Option --broken kann nicht mit Commits verwendet werden."
@@ -7998,26 +8215,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "'%s': keine reguläre Datei oder symbolische Verknüpfung"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "Ungültige Option: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "Kein Git-Repository"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "Objekt '%s' ist ungültig."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "Mehr als zwei Blobs angegeben: '%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "unbehandeltes Objekt '%s' angegeben"
@@ -8026,27 +8243,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<Optionen>] [<Commit> [<Commit>]] [--] [<Pfad>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "fehlgeschlagen: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "konnte symbolische Verknüpfung %s nicht lesen"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "Konnte Datei von symbolischer Verknüpfung '%s' nicht lesen."
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, 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:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -8054,54 +8271,54 @@
"Kombinierte Diff-Formate('-c' und '--cc') werden im Verzeichnis-\n"
"Diff-Modus('-d' und '--dir-diff') nicht unterstützt."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "beide Dateien geändert: '%s' und '%s'."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "Datei im Arbeitsverzeichnis belassen."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "Es existieren temporäre Dateien in '%s'."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "Sie könnten diese aufräumen oder wiederherstellen."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.guitool` anstatt `diff.tool` benutzen"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "Diff über ganzes Verzeichnis ausführen"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "keine Eingabeaufforderung vor Ausführung eines Diff-Tools"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "symbolische Verknüpfungen im dir-diff Modus verwenden"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<Tool>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "das angegebene Diff-Tool benutzen"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
"eine Liste mit Diff-Tools darstellen, die mit `--tool` benutzt werden können"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -8110,19 +8327,19 @@
"Rückkehrwert\n"
"verschieden 0 ausgeführt wurde"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<Programm>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "eigenen Befehl zur Anzeige von Unterschieden angeben"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "kein <Tool> für --tool=<Tool> angegeben"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "kein <Programm> für --extcmd=<Programm> angegeben"
@@ -8130,149 +8347,149 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "Fortschritt nach <n> Objekten anzeigen"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "Behandlung von signierten Tags wählen"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "Behandlung von Tags wählen, die gefilterte Objekte markieren"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Kennzeichen in diese Datei schreiben"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Kennzeichen von dieser Datei importieren"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "künstlich einen Tag-Ersteller erzeugen, wenn das Tag keinen hat"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "für jeden Commit das gesamte Verzeichnis ausgeben"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "die \"done\"-Funktion benutzen, um den Datenstrom abzuschließen"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Ausgabe von Blob-Daten überspringen"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "Refspec"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Refspec auf exportierte Referenzen anwenden"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "Ausgabe anonymisieren"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<Optionen>] <Gruppe>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<Optionen>] [(<Repository> | <Gruppe>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<Optionen>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "fordert von allen Remote-Repositories an"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "an .git/FETCH_HEAD anhängen, anstatt zu überschreiben"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "Pfad des Programms zum Hochladen von Paketen auf der Gegenseite"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "das Überschreiben von lokalen Branches erzwingen"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "von mehreren Remote-Repositories anfordern"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "alle Tags und verbundene Objekte anfordern"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "nicht alle Tags anfordern (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "Anzahl der parallel anzufordernden Submodule"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "bei-Bedarf"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "heruntergeladenes Paket behalten"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "Aktualisierung der \"HEAD\"-Referenz erlauben"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr ""
"die Historie eines Klons mit unvollständiger Historie (shallow) vertiefen"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
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:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "zu einem vollständigen Repository konvertieren"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "Verzeichnis"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "dies an die Ausgabe der Submodul-Pfade voranstellen"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -8280,91 +8497,91 @@
"Standard für die rekursive Anforderung von Submodulen (geringere Priorität\n"
"als Konfigurationsdateien)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "Referenzen, die .git/shallow aktualisieren, akzeptieren"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "Refmap"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "Refmap für 'fetch' angeben"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "Konnte Remote-Referenz von HEAD nicht finden."
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "Konfiguration fetch.output enthält ungültigen Wert %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "Objekt %s nicht gefunden"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[aktuell]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[zurückgewiesen]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "kann \"fetch\" im aktuellen Branch nicht ausführen"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[Tag Aktualisierung]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "kann lokale Referenz nicht aktualisieren"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[neues Tag]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[neuer Branch]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[neue Referenz]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "Aktualisierung erzwungen"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "kein Vorspulen"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositoriesmit "
+"%s wurde zurückgewiesen, da Ursprungs-Commits von Repositories mit "
"unvollständiger Historie (shallow) nicht aktualisiert werden dürfen."
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "Von %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8373,57 +8590,52 @@
"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:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s wird unreferenziert)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s wurde unreferenziert)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[gelöscht]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(nichts)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Der \"fetch\" in den aktuellen Branch %s von einem Nicht-Bare-Repository "
"wurde verweigert."
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Option \"%s\" wird ignoriert für %s\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Weiß nicht wie von %s angefordert wird."
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "Fordere an von %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Konnte nicht von %s anfordern"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8432,43 +8644,43 @@
"oder den Namen des Remote-Repositories an, von welchem neue\n"
"Commits angefordert werden sollen."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "Sie müssen den Namen des Tags angeben."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "Negative Tiefe wird von --deepen nicht unterstützt."
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen und --depth schließen sich gegenseitig aus"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr ""
"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden."
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"Die Option --unshallow kann nicht in einem Repository mit unvollständiger "
"Historie verwendet werden."
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all akzeptiert kein Repository als Argument"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kann nicht mit Refspecs verwendet werden."
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Kein Remote-Repository (einzeln oder Gruppe): %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
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"
@@ -8481,23 +8693,23 @@
"git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>] | --no-log] [--file "
"<Datei>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
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:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "Alias für --log (veraltet)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "Text"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "<Text> als Beschreibungsanfang verwenden"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "Datei zum Einlesen"
@@ -8537,101 +8749,105 @@
msgid "show only <n> matched refs"
msgstr "nur <n> passende Referenzen anzeigen"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "Formatfarben beachten"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "nur auf dieses Objekt zeigende Referenzen ausgeben"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "nur zusammengeführte Referenzen ausgeben"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "nur nicht zusammengeführte Referenzen ausgeben"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit enthalten"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "nur Referenzen ausgeben, die diesen Commit nicht enthalten"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Prüfe Objekt-Verzeichnisse"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<Optionen>] [<Objekt>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "unerreichbare Objekte anzeigen"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "unreferenzierte Objekte anzeigen"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "Tags melden"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "Hauptwurzeln melden"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "Index-Objekte in Erreichbarkeitsprüfung einbeziehen"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "Reflogs in Erreichbarkeitsprüfung einbeziehen (Standard)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "ebenso Pakete und alternative Objekte betrachten"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "nur Konnektivität prüfen"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "genauere Prüfung aktivieren"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "unreferenzierte Objekte nach .git/lost-found schreiben"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "ausführliche Namen für erreichbare Objekte anzeigen"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Prüfe Objekte"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<Optionen>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Konnte '%s' nicht lesen: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "Kann '%s' nicht lesen."
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8647,49 +8863,49 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "unreferenzierte Objekte entfernen"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "mehr Gründlichkeit (erhöht Laufzeit)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "\"auto-gc\" Modus aktivieren"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
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:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Fehler beim Parsen des Wertes '%s' von gc.logexpiry"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, 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:410
+#: builtin/gc.c:411
#, 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:411
+#: builtin/gc.c:412
#, 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:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8697,7 +8913,7 @@
"\"git gc\" wird bereits auf Maschine '%s' pid %<PRIuMAX> ausgeführt\n"
"(benutzen Sie --force falls nicht)"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8708,12 +8924,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<Optionen>] [-e] <Muster> [<Commit>...] [[--] <Pfad>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: Fehler beim Erzeugen eines Thread: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "ungültige Anzahl von Threads (%d) für %s angegeben"
@@ -8722,259 +8938,251 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "keine Unterstützung von Threads, '%s' wird ignoriert"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "konnte \"Tree\"-Objekt (%s) nicht lesen"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, 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:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "Schalter '%c' erwartet einen numerischen Wert"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr "im Index anstatt im Arbeitsverzeichnis suchen"
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "auch in Inhalten finden, die nicht von Git verwaltet werden"
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "in versionierten und unversionierten Dateien suchen"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "Dateien, die über '.gitignore' angegeben sind, ignorieren"
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "rekursive Suche in jedem Submodul"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "Basisname"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "Zeilen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "Übereinstimmungen unabhängig von Groß- und Kleinschreibung finden"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "nur ganze Wörter suchen"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "binäre Dateien als Text verarbeiten"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "keine Muster in Binärdateien finden"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr "binäre Dateien mit \"textconv\"-Filtern verarbeiten"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "höchstens <Tiefe> Ebenen durchlaufen"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "erweiterte reguläre Ausdrücke aus POSIX verwenden"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "grundlegende reguläre Ausdrücke aus POSIX verwenden (Standard)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "Muster als feste Zeichenketten interpretieren"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "Perl-kompatible reguläre Ausdrücke verwenden"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "Zeilennummern anzeigen"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "keine Dateinamen anzeigen"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "Dateinamen anzeigen"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr "Dateinamen relativ zum Projektverzeichnis anzeigen"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "nur Dateinamen anzeigen anstatt übereinstimmende Zeilen"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "Synonym für --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr "nur die Dateinamen ohne Übereinstimmungen anzeigen"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "NUL-Zeichen nach Dateinamen ausgeben"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr "anstatt der Zeilen, die Anzahl der übereinstimmenden Zeilen anzeigen"
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "Übereinstimmungen hervorheben"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr ""
"eine Leerzeile zwischen Übereinstimmungen in verschiedenen Dateien ausgeben"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
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:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "<n> Zeilen vor und nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "<n> Zeilen vor den Übereinstimmungen anzeigen"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "<n> Zeilen nach den Übereinstimmungen anzeigen"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "<n> Threads benutzen"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "Kurzform für -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr "eine Zeile mit dem Funktionsnamen vor Übereinstimmungen anzeigen"
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "die umgebende Funktion anzeigen"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "Muster von einer Datei lesen"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "<Muster> finden"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "Muster kombinieren, die mit -e angegeben wurden"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr "Übereinstimmungen nur durch Beendigungsstatus anzeigen"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
msgid "show only matches from files that match all patterns"
msgstr ""
"nur Übereinstimmungen von Dateien anzeigen, die allen Mustern entsprechen"
-#: builtin/grep.c:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "geparstes Verzeichnis für \"grep\"-Ausdruck anzeigen"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "Anzeigeprogramm"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "Dateien mit Übereinstimmungen im Anzeigeprogramm anzeigen"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "den Aufruf von grep(1) erlauben (von dieser Programmversion ignoriert)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "keine Muster angegeben"
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
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:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "Konnte Commit nicht auflösen: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "ungültige Anzahl von Threads angegeben (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "keine Unterstützung von Threads, --threads wird ignoriert"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
"Die Option --open-files-in-pager kann nur innerhalb des "
"Arbeitsverzeichnisses verwendet werden."
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "Option wird mit --recurse-submodules nicht unterstützt."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"Die Optionen --cached und --untracked können nicht mit --no-index verwendet "
"werden."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
"Die Option --[no-]exclude-standard kann nicht mit versionierten Inhalten "
"verwendet werden."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "Die Option --cached kann nicht mit \"Tree\"-Objekten verwendet werden."
@@ -9067,12 +9275,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "Version des emacsclient '%d' ist zu alt (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "Fehler beim Ausführen von '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -9081,7 +9289,7 @@
"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -9090,352 +9298,352 @@
"'%s': Programm für unterstützten Handbuchbetrachter.\n"
"Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': unbekannter Handbuch-Betrachter."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Definition von Attributen pro Pfad"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Tägliche Benutzung von Git mit ungefähr 20 Befehlen"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Ein Git-Glossar"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spezifikation von bewusst ignorierten, unversionierten Dateien"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Definition von Submodul-Eigenschaften"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Spezifikation von Commits und Bereichen für Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Eine einführende Anleitung zu Git (für Version 1.5.1 oder neuer)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Eine Übersicht über empfohlene Arbeitsabläufe mit Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Die allgemein verwendeten Git-Anleitungen sind:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "für `git %s' wurde der Alias `%s' angelegt"
+msgid "'%s' is aliased to '%s'"
+msgstr "Für '%s' wurde der Alias '%s' angelegt."
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "Verwendung: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "kann %s nicht öffnen"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "Objekt-Typen passen bei %s nicht zusammen"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "konnte erwartetes Objekt %s nicht empfangen"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "Objekt %s: erwarteter Typ %s, %s gefunden"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, 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:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "zu frühes Dateiende"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "Fehler beim Lesen der Eingabe"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "verwendete mehr Bytes als verfügbar waren"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "Paket überschreitet die maximal erlaubte Größe"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "konnte '%s' nicht erstellen"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "Kann Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "Paketsignatur stimmt nicht überein"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "Paketversion %<PRIu32> nicht unterstützt"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, 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:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "Dekomprimierung gab %d zurück"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "Wert für Versatz bei Differenzobjekt übergelaufen"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
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:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "Unbekannter Objekt-Typ %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "Kann Paketdatei %s nicht lesen"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "ernsthafte Inkonsistenz nach Dekomprimierung"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "kann %s nicht lesen"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "Kann existierende Informationen zu Objekt %s nicht lesen."
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "Kann existierendes Objekt %s nicht lesen."
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "ungültiges Blob-Objekt %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "Ungültiger Objekt-Typ %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Fehler in Objekt"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Nicht alle Kind-Objekte von %s sind erreichbar"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "Konnte Dateiunterschied nicht anwenden"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Empfange Objekte"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Indiziere Objekte"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "Paket ist beschädigt (SHA1 unterschiedlich)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "kann Paketdatei nicht lesen"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "Paketende enthält nicht verwendbaren Inhalt"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "Fehler beim Ausführen von \"parse_pack_objects()\""
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Löse Unterschiede auf"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "kann Thread nicht erzeugen: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "Fehler beim Auflösen der Unterschiede"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Unerwartete Prüfsumme für %s (Festplattenfehler?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "Paket hat %d unaufgelöste Unterschied"
msgstr[1] "Paket hat %d unaufgelöste Unterschiede"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "lokales Objekt %s ist beschädigt"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "Fehler beim Schließen der Paketdatei"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "Kann Paketdatei nicht speichern"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "Kann Indexdatei nicht speichern"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "\"pack.indexversion=%<PRIu32>\" ist ungültig"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kann existierende Paketdatei '%s' nicht öffnen"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, 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:1602
+#: builtin/index-pack.c:1603
#, 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:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "Länge der Objekt-Liste = %d: %lu Objekt"
msgstr[1] "Länge der Objekt-Liste = %d: %lu Objekte"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "%s ist ungültig"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden."
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "--stdin erfordert ein Git-Repository"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben."
@@ -9567,132 +9775,174 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<Token>[(=|:)<Wert>])...] [<Datei>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "vorhandene Dateien direkt bearbeiten"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "kürzt leere Anhänge"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "wo der neue Anhang platziert wird"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "Aktion, wenn Anhang bereits existiert"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "Aktion, wenn Anhang fehlt"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "nur Anhänge ausgeben"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "Regeln aus Konfiguration nicht anwenden"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "durch Leerzeichen fortgesetzte Werte verbinden"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "Optionen für das Parsen setzen"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "Anhang"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "Anhang/Anhänge hinzufügen"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+"Die Optionen --trailer und --only-input können nicht gemeinsam verwendet "
+"werden."
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "keine Datei zur direkten Bearbeitung angegeben"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<Optionen>] [<Commitbereich>] [[--] <Pfad>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<Optionen>] <Objekt>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "Ungültige Option für --decorate: %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "Ausgabe der Unterschiede unterdrücken"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "Quelle anzeigen"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "\"mailmap\"-Datei verwenden"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "\"decorate\" nur bei Referenzen anwenden, die <Muster> entsprechen"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "\"decorate\" nicht bei Referenzen anwenden, die <Muster> entsprechen"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "decorate-Optionen"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr "Verarbeitet nur Zeilen im Bereich n,m in der Datei, gezählt von 1"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "letzte Ausgabe: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: ungültige Datei"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "Kann Objekt %s nicht lesen."
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "Unbekannter Typ: %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "format.headers ohne Wert"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "Name des Ausgabeverzeichnisses ist zu lang."
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kann Patch-Datei %s nicht öffnen"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "Brauche genau einen Commit-Bereich."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "Kein Commit-Bereich."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "Anschreiben benötigt E-Mail-Format"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ungültiges in-reply-to: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<Optionen>] [<seit> | <Commitbereich>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "Zwei Ausgabeverzeichnisse?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "Unbekannter Commit %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "Konnte keine exakte Merge-Basis finden."
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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"
@@ -9703,221 +9953,229 @@
"'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:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "Fehler beim Finden einer exakten Merge-Basis."
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr "Basis-Commit sollte der Vorgänger der Revisionsliste sein."
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr "Basis-Commit sollte nicht in der Revisionsliste enthalten sein."
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "kann Patch-Id nicht lesen"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr "[PATCH n/m] auch mit einzelnem Patch verwenden"
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "[PATCH] auch mit mehreren Patches verwenden"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "Ausgabe der Patches in Standard-Ausgabe"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "ein Deckblatt erzeugen"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr "einfache Nummernfolge für die Namen der Ausgabedateien verwenden"
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "Dateiendung"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "<Dateiendung> anstatt '.patch' verwenden"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr "die Nummerierung der Patches bei <n> anstatt bei 1 beginnen"
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "die Serie als n-te Fassung kennzeichnen"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[RFC PATCH] anstatt [PATCH] verwenden"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[<Präfix>] anstatt [PATCH] verwenden"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "erzeugte Dateien in <Verzeichnis> speichern"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "[PATCH] nicht entfernen/hinzufügen"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "keine binären Unterschiede ausgeben"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "Hash mit Nullen in \"From\"-Header ausgeben"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
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:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr "Patchformat anstatt des Standards anzeigen (Patch + Zusammenfassung)"
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "E-Mail-Einstellungen"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "Header"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "E-Mail-Header hinzufügen"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "E-Mail"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "\"To:\"-Header hinzufügen"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "\"Cc:\"-Header hinzufügen"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "Ident"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
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:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "aus erster E-Mail eine Antwort zu <message-id> machen"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "Grenze"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "den Patch anhängen"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "den Patch direkt in die Nachricht einfügen"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr "Nachrichtenverkettung aktivieren, Stile: shallow, deep"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "Signatur"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "eine Signatur hinzufügen"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "Basis-Commit"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "erforderliche Revisions-Informationen der Patch-Serie hinzufügen"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "eine Signatur aus einer Datei hinzufügen"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "keine Dateinamen der Patches anzeigen"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "Forschrittsanzeige während der Erzeugung der Patches"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "Ungültige Identifikationszeile: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "Die Optionen -n und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc und -k schließen sich gegenseitig aus."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "Die Option --name-only kann nicht verwendet werden."
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "Die Option --name-status kann nicht verwendet werden."
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "Die Option --check kann nicht verwendet werden."
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?"
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "Konnte Signatur-Datei '%s' nicht lesen"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Erzeuge Patches"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "Fehler beim Erstellen der Ausgabedateien."
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<Upstream> [<Branch> [<Limit>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9939,94 +10197,98 @@
"Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung verwenden"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "Kleinbuchstaben für 'fsmonitor clean' Dateien verwenden"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "zwischengespeicherte Dateien in der Ausgabe anzeigen (Standard)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "entfernte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "geänderte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "sonstige Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "ignorierte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
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:534
+#: builtin/ls-files.c:536
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:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "nur Namen von 'sonstigen' Verzeichnissen anzeigen"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "Zeilenenden von Dateien anzeigen"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "keine leeren Verzeichnisse anzeigen"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "nicht zusammengeführte Dateien in der Ausgabe anzeigen"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "'resolve-undo' Informationen anzeigen"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "Dateien auslassen, die einem Muster entsprechen"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "Muster, gelesen von <Datei>, ausschließen"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr "zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei> auslesen"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "die standardmäßigen Git-Ausschlüsse hinzufügen"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr "Ausgabe relativ zum Projektverzeichnis"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "Rekursion in Submodulen durchführen"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
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:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "Commit-Referenz"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
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:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "Ausgaben zur Fehlersuche anzeigen"
@@ -10121,181 +10383,185 @@
msgid "empty mbox: '%s'"
msgstr "Leere mbox: '%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<Optionen>] [<Commit>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "Schalter 'm' erfordert einen Wert."
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Konnte Merge-Strategie '%s' nicht finden.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Verfügbare Strategien sind:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Verfügbare benutzerdefinierte Strategien sind:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "eine Zusammenfassung der Unterschiede am Schluss des Merges anzeigen"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(Synonym für --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr "einen einzelnen Commit anstatt eines Merges erzeugen"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "einen Commit durchführen, wenn der Merge erfolgreich war (Standard)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "Bearbeitung der Beschreibung vor dem Commit"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "Vorspulen erlauben (Standard)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "abbrechen, wenn kein Vorspulen möglich ist"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "Strategie"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "zu verwendende Merge-Strategie"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "Option=Wert"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "Option für ausgewählte Merge-Strategie"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
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:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge abbrechen"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "den sich im Gange befindlichen Merge fortsetzen"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "erlaube das Zusammenführen von nicht zusammenhängenden Historien"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "commit-msg Hook überprüfen"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "Konnte \"stash\" nicht ausführen."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "\"stash\" fehlgeschlagen"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "kein gültiges Objekt: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree fehlgeschlagen"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (nichts zu quetschen)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Quetsche Commit -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Keine Merge-Commit-Beschreibung -- HEAD wird nicht aktualisiert\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' zeigt auf keinen Commit"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Ungültiger branch.%s.mergeoptions String: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr "Es wird nur der Merge von zwei Branches behandelt."
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Unbekannte Option für merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "konnte %s nicht schreiben"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "konnte nicht von '%s' lesen"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, 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:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -10311,71 +10577,71 @@
"Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung\n"
"bricht den Commit ab.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "Leere Commit-Beschreibung"
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "Wunderbar.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, 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:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "Sie befinden sich auf keinem Branch."
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "Kein Remote-Repository für den aktuellen Branch."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
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:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Kein Remote-Tracking-Branch für %s von %s"
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Fehlerhafter Wert '%s' in Umgebungsvariable '%s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, 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:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "nichts was wir zusammenführen können"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "--abort akzeptiert keine Argumente"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Es gibt keinen Merge abzubrechen (MERGE_HEAD fehlt)"
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "--continue erwartet keine Argumente"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
-msgstr "Es ist keine Merge im Gange (MERGE_HEAD fehlt)."
+msgstr "Es ist kein Merge im Gange (MERGE_HEAD fehlt)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10383,7 +10649,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:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10391,117 +10657,117 @@
"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:1191
+#: builtin/merge.c:1220
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:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "Sie können --squash nicht mit --no-ff kombinieren."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Kein Commit angegeben und merge.defaultToUpstream ist nicht gesetzt."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr ""
"Bin auf einem Commit, der noch geboren wird; kann \"squash\" nicht ausführen."
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
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:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - nichts was wir zusammenführen können"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
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:1268
+#: builtin/merge.c:1297
#, 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."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, 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."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Commit %s hat keine GPG-Signatur."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, 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"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "Verweigere den Merge von nicht zusammenhängenden Historien."
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "Bereits aktuell."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "Aktualisiere %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Probiere wirklich trivialen \"in-index\"-Merge ...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "Nein.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "Bereits aktuell."
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "Vorspulen nicht möglich, breche ab."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Rücklauf des Verzeichnisses bis zum Ursprung ...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Probiere Merge-Strategie %s ...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Keine Merge-Strategie behandelt diesen Merge.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Merge mit Strategie %s fehlgeschlagen.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Benutzen Sie \"%s\", um die Auflösung per Hand vorzubereiten.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10527,23 +10793,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <Referenz> [<Commit>]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "Ausgabe aller gemeinsamen Vorgänger-Commits"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
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:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "Commits auflisten, die nicht durch Andere erreichbar sind"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "ist der Erste ein Vorgänger-Commit des Anderen?"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<Commit> finden, von wo Reflog von <Referenz> abgespalten wurde"
@@ -10643,7 +10909,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "Verzeichnis %s ist zum Commit vorgemerkt und kein Submodul?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Bitte merken Sie Ihre Änderungen in .gitmodules zum Commit vor oder "
@@ -10663,68 +10929,68 @@
msgid "skip move/rename errors"
msgstr "Fehler beim Verschieben oder Umbenennen überspringen"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "Ziel '%s' ist kein Verzeichnis"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Prüfe Umbenennung von '%s' nach '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "ungültige Quelle"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "kann Verzeichnis nicht in sich selbst verschieben"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "kann Verzeichnis nicht über Datei verschieben"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "Quellverzeichnis ist leer"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "nicht unter Versionskontrolle"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "Ziel existiert bereits"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "überschreibe '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Kann nicht überschreiben"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
-msgstr "mehrere Quellen für das selbe Ziel"
+msgstr "mehrere Quellen für dasselbe Ziel"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "Zielverzeichnis existiert nicht"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, Quelle=%s, Ziel=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Benenne %s nach %s um\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "Umbenennung von '%s' fehlgeschlagen"
@@ -10751,7 +11017,7 @@
#: builtin/name-rev.c:398
msgid "only use refs matching <pattern>"
-msgstr "nur Referenzen verwenden die <Muster> entsprechen"
+msgstr "nur Referenzen verwenden, die <Muster> entsprechen"
#: builtin/name-rev.c:400
msgid "ignore refs matching <pattern>"
@@ -10826,8 +11092,8 @@
msgstr "git notes [--ref <Notiz-Referenz>] remove [<Objekt>...]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <Notiz-Referenz>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <Notiz-Referenz>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10917,19 +11183,19 @@
msgid "the note contents have been left in %s"
msgstr "Die Notiz-Inhalte wurden in %s belassen."
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "kann '%s' nicht lesen"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "konnte '%s' nicht öffnen oder lesen"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "Konnte '%s' nicht als gültige Referenz auflösen."
@@ -10957,49 +11223,49 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "zu viele Parameter"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "Keine Notiz für Objekt %s gefunden."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "Notizinhalte als Zeichenkette"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "Notizinhalte in einer Datei"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "Wiederverwendung des angegebenen Notiz-Objektes"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "Speichern leerer Notiz erlauben"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "existierende Notizen ersetzen"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11008,31 +11274,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:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Überschreibe existierende Notizen für Objekt %s\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Entferne Notiz für Objekt %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "Objekte von der Standard-Eingabe lesen"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"Konfiguration für <Befehl> zum Umschreiben von Commits laden (impliziert --"
"stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "zu wenig Parameter"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11041,12 +11307,12 @@
"Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. "
"Verwenden Sie '-f', um die existierenden Notizen zu überschreiben."
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, 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:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11055,52 +11321,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:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "Fehler beim Löschen der Referenz NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "Fehler beim Löschen des Arbeitsverzeichnisses von 'git notes merge'."
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "Fehler beim Lesen der Referenz NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht finden."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "Konnte Commit von NOTES_MERGE_PARTIAL nicht parsen."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "Fehler beim Auflösen von NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "Fehler beim Abschließen der Zusammenführung der Notizen."
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "unbekannte Merge-Strategie '%s' für Notizen"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Allgemeine Optionen"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Merge-Optionen"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -11108,49 +11374,49 @@
"löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "nicht zusammengeführte Notizen eintragen"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
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:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Konfliktauflösung beim Merge von Notizen abbrechen"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "Merge von Notizen abbrechen"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "Kann --commit, --abort oder -s/--strategy nicht kombinieren."
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "Sie müssen eine Notiz-Referenz zum Mergen angeben."
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "Unbekannter Wert für -s/--strategy: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, 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:865
+#: builtin/notes.c:866
#, 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:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11162,235 +11428,243 @@
"commit',\n"
"oder brechen Sie den Merge mit 'git notes merge --abort' ab.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "Objekt %s hat keine Notiz\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
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:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "Objektnamen von der Standard-Eingabe lesen"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "nicht löschen, nur anzeigen"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "gelöschte Notizen melden"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "Notiz-Referenz"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "Notizen von <Notiz-Referenz> verwenden"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<Optionen>...] [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<Optionen>...] <Basis-Name> [< <Referenzliste> | < "
"<Objektliste>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "Fehler beim Komprimieren (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
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:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "Schreibe Objekte"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
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:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "Komprimiere Objekte"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "Ungültiger Wert für --missing."
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "Nicht unterstützte Index-Version %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "Ungültige Index-Version '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "keine Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "Fortschrittsanzeige anzeigen"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "Forschrittsanzeige während des Schreibens von Objekten anzeigen"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "ähnlich zu --all-progress wenn Fortschrittsanzeige darstellt wird"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
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:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "maximale Größe für jede ausgegebene Paketdatei"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "geliehene Objekte von alternativem Objektspeicher ignorieren"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "gepackte Objekte ignorieren"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "Paketfenster durch Objekte begrenzen"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
msgid "limit pack window by memory in addition to object limit"
msgstr ""
"Paketfenster, zusätzlich zur Objektbegrenzung, durch Speicher begrenzen"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2958
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:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "existierende Unterschiede wiederverwenden"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "existierende Objekte wiederverwenden"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA Objekte verwenden"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
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:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "keine leeren Pakete erzeugen"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "Argumente bezüglich Commits von der Standard-Eingabe lesen"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
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:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr "Objekte einschließen, die von jeder Referenz erreichbar sind"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr ""
"Objekte einschließen, die von Einträgen des Reflogs referenziert werden"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "Objekte einschließen, die vom Index referenziert werden"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "Paket in die Standard-Ausgabe schreiben"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
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:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "nicht erreichbare Objekte behalten"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "nicht erreichbare lose Objekte packen"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "nicht erreichbare Objekte entpacken, die neuer als <Zeit> sind"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "dünnere Pakete erzeugen"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr ""
"Pakete geeignet für Abholung mit unvollständiger Historie (shallow) erzeugen"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "Pakete ignorieren, die .keep Dateien haben"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "Komprimierungsgrad für Paketierung"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr "keine künstlichen Vorgänger-Commits (\"grafts\") verbergen"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
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:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr "Bitmap-Index zusammen mit Pack-Index schreiben"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "Behandlung für fehlende Objekte"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "Zähle Objekte"
@@ -11406,17 +11680,17 @@
msgid "prune loose refs (default)"
msgstr "lose Referenzen entfernen (Standard)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Lösche doppelte Objekte"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <Zeit>] [--] [<head>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <Zeit>] [--] [<Branch>...]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11439,40 +11713,40 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "rekursive Anforderungen von Submodulen kontrollieren"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "Optionen bezogen auf Merge"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr "Integration von Änderungen durch Rebase statt Merge"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "Vorspulen erlauben"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "automatischer Stash/Stash-Pop vor und nach eines Rebase"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "Optionen bezogen auf Fetch"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "Anzahl der parallel mit 'pull' zu verarbeitenden Submodule"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Ungültiger Wert für pull.ff: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -11480,14 +11754,14 @@
"Es gibt keinen Kandidaten für Rebase innerhalb der Referenzen, die eben "
"angefordert wurden."
-#: builtin/pull.c:401
+#: builtin/pull.c:417
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:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11495,7 +11769,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:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11507,39 +11781,39 @@
"Repository für den aktuellen Branch ist, müssen Sie einen Branch auf\n"
"der Befehlszeile angeben."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Im Moment auf keinem Branch."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
"Bitte geben Sie den Branch an, gegen welchen Sie \"rebase\" ausführen "
"möchten."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Bitte geben Sie den Branch an, welchen Sie zusammenführen möchten."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "Siehe git-pull(1) für weitere Details."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<Remote-Repository>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<Branch>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Es gibt keine Tracking-Informationen für den aktuellen Branch."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
@@ -11547,7 +11821,7 @@
"Sie\n"
"dies tun mit:"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11557,29 +11831,29 @@
"des Remote-Repositories durchzuführen, aber diese Referenz\n"
"wurde nicht angefordert."
-#: builtin/pull.c:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "Ignoriere --verify-signatures für Rebase"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash ist nur mit --rebase zulässig."
-#: builtin/pull.c:848
+#: builtin/pull.c:873
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:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "Pull mit Rebase"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11589,7 +11863,7 @@
"\"fetch\" aktualisierte die Spitze des aktuellen Branches.\n"
"Spule Ihr Arbeitsverzeichnis von Commit %s vor."
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11606,31 +11880,33 @@
"$ git reset --hard\n"
"zur Wiederherstellung aus."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "Kann nicht mehrere Branches in einen leeren Branch zusammenführen."
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "Kann Rebase nicht auf mehrere Branches ausführen."
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
-msgstr "Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen ausführen."
+msgstr ""
+"Kann Rebase nicht mit lokal aufgezeichneten Änderungen in Submodulen "
+"ausführen."
#: builtin/push.c:17
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<Optionen>] [<Repository> [<Refspec>...]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "Kurzschrift für Tag ohne <Tag>"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel."
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11639,7 +11915,7 @@
"Um eine Variante permanent zu verwenden, siehe push.default in 'git help "
"config'."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11659,13 +11935,13 @@
"\n"
" git push %s HEAD:%s\n"
"\n"
-"Um auf den Branch mit dem selben Namen im Remote-Repository zu versenden,\n"
+"Um auf den Branch mit demselben Namen im Remote-Repository zu versenden,\n"
"benutzen Sie:\n"
"\n"
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11680,7 +11956,7 @@
"\n"
" git push %s HEAD:<Name-des-Remote-Branches>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11694,13 +11970,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"Der aktuelle Branch %s hat mehrere Upstream-Branches, \"push\" verweigert."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11711,14 +11987,14 @@
"Branches '%s' ist, ohne anzugeben, was versendet werden soll, um welchen\n"
"Remote-Branch zu aktualisieren."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Sie haben keine Refspec für \"push\" angegeben, und push.default ist "
"\"nothing\"."
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11732,7 +12008,7 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11746,7 +12022,7 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11765,13 +12041,13 @@
"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n"
"für weitere Details."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Aktualisierungen wurden zurückgewiesen, weil das Tag bereits\n"
"im Remote-Repository existiert."
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11781,22 +12057,22 @@
"das kein Commit ist, oder es auf ein solches Objekt zeigen lassen, ohne\n"
"die Option '--force' zu verwenden.\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "Versende nach %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "Fehler beim Versenden einiger Referenzen nach '%s'"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "ungültiges Repository '%s'"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11818,112 +12094,112 @@
"\n"
" git push <Name>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "Die Optionen --all und --tags sind inkompatibel."
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr "Die Option --all kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "Die Optionen --mirror und --tags sind inkompatibel."
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr "Die Option --mirror kann nicht mit Refspecs kombiniert werden."
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "Die Optionen --all und --mirror sind inkompatibel."
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "Repository"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "alle Referenzen versenden"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "alle Referenzen spiegeln"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "Referenzen löschen"
-#: builtin/push.c:528
+#: builtin/push.c:540
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:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "Aktualisierung erzwingen"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "Referenzname>:<Erwartungswert"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "Referenz muss sich auf dem angegebenen Wert befinden"
-#: builtin/push.c:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "rekursiven \"push\" von Submodulen steuern"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "kleinere Pakete verwenden"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "'receive pack' Programm"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "Upstream für \"git pull/status\" setzen"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "lokal gelöschte Referenzen entfernen"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "\"pre-push hook\" umgehen"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr "fehlende, aber relevante Tags versenden"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "signiert \"push\" mit GPG"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "Referenzen atomar versenden"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "serverspezifisch"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "Option übertragen"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags."
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "Die Option --delete kann nur mit Referenzen verwendet werden."
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr "Push-Optionen dürfen keine Zeilenvorschubzeichen haben"
@@ -12006,19 +12282,51 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<Optionen>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "leere Commits behalten"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "Rebase fortsetzen"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "Rebase abbrechen"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "Rebase-Skript erstellen"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "Commit-IDs in der TODO-Liste verkürzen"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "Commit-IDs in der TODO-Liste erweitern"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "die TODO-Liste prüfen"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "nicht erforderliche \"pick\"-Befehle auslassen"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash-Zeilen umordnen"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "\"exec\"-Befehle in TODO-Liste einfügen"
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <Git-Verzeichnis>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -12050,7 +12358,7 @@
"setzen Sie die Konfigurationsvariable 'receive.denyCurrentBranch' auf\n"
"'refuse'."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -12079,12 +12387,7 @@
msgid "You must specify a directory."
msgstr "Sie müssen ein Repository angeben."
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' ist kein gültiger Zeitstempel für '%s'"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' ist kein gültiger Zeitstempel"
@@ -12199,7 +12502,7 @@
#: builtin/remote.c:165
msgid "or do not fetch any tag at all (--no-tags)"
-msgstr "oder fordere gar keine Zweige an (--no-tags)"
+msgstr "oder fordere gar keine Tags an (--no-tags)"
#: builtin/remote.c:167
msgid "branch(es) to track"
@@ -12231,12 +12534,12 @@
"Die Angabe von zu folgenden Branches kann nur mit dem Anfordern von "
"Spiegelarchiven verwendet werden."
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "externes Repository %s existiert bereits"
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' ist kein gültiger Name für ein Remote-Repository"
@@ -12259,17 +12562,17 @@
msgid "(delete)"
msgstr "(lösche)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Kein solches Remote-Repository: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -12280,17 +12583,17 @@
"\t%s\n"
"\tBitte aktualisieren Sie, falls notwendig, die Konfiguration manuell."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "Konnte '%s' nicht löschen"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "Konnte '%s' nicht erstellen"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -12302,117 +12605,117 @@
"gelöscht;\n"
"um diesen zu löschen, benutzen Sie:"
msgstr[1] ""
-"Hinweis: Einige Branches außer der refs/remotes/ Hierarchie wurden nicht "
+"Hinweis: Einige Branches außerhalb der refs/remotes/ Hierarchie wurden nicht "
"entfernt;\n"
"um diese zu entfernen, benutzen Sie:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, 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:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " gefolgt"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " veraltet (benutzen Sie 'git remote prune' zum Löschen)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, 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:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "interaktiver Rebase auf Remote-Branch %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "Rebase auf Remote-Branch %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "führt mit Remote-Branch %s zusammen"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s und mit Remote-Branch %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "erstellt"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "gelöscht"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "aktuell"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "vorspulbar"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "lokal nicht aktuell"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s erzwingt Versandt nach %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s versendet nach %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s erzwingt Versand nach %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s versendet nach %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "keine Abfrage von Remote-Repositories"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* Remote-Repository %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL zum Abholen: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(keine URL)"
@@ -12420,25 +12723,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL zum Versenden: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Hauptbranch: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(nicht abgefragt)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(unbekannt)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12446,163 +12749,163 @@
" Hauptbranch (externer HEAD ist mehrdeutig, könnte einer der folgenden "
"sein):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Remote-Branch:%s"
msgstr[1] " Remote-Branches:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (Zustand nicht abgefragt)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokale Referenzen werden von 'git push' gespiegelt"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "setzt refs/remotes/<Name>/HEAD gemäß dem Remote-Repository"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "entfernt refs/remotes/<Name>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Kann HEAD des Remote-Repositories nicht bestimmen"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
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:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "Konnte %s nicht entfernen"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "keine gültige Referenz: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "Konnte %s nicht einrichten"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s wird unreferenziert!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s wurde unreferenziert!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "entferne veraltete Branches von %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [würde veralteten Branch entfernen] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr "* [veralteten Branch entfernt] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "entferne veraltete Branches im Remote-Repository nach \"fetch\""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Kein solches Remote-Repository '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "Branch hinzufügen"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "kein Remote-Repository angegeben"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "nur URLs für Push ausgeben"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "alle URLs ausgeben"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "Keine URLs für Remote-Repository '%s' konfiguriert."
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "URLs für \"push\" manipulieren"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "URL hinzufügen"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "URLs löschen"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr ""
"Die Optionen --add und --delete können nicht gemeinsam verwendet werden."
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "ungültiges altes URL Format: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Keine solche URL gefunden: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Werde keine URLs entfernen, die nicht für \"push\" bestimmt sind"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "erweiterte Ausgaben; muss vor einem Unterbefehl angegeben werden"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Unbekannter Unterbefehl: %s"
@@ -12703,7 +13006,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable und -A sind inkompatibel"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "Fehler beim Löschen von '%s'"
@@ -12836,122 +13139,135 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "Sie haben keinen gültigen HEAD."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Fehler beim Finden des \"Tree\"-Objektes von %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD ist jetzt bei %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, 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:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "weniger Ausgaben, meldet nur Fehler"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "HEAD und Index umsetzen"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "nur HEAD umsetzen"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "HEAD, Index und Arbeitsverzeichnis umsetzen"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "HEAD umsetzen, aber lokale Änderungen behalten"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
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:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Konnte '%s' nicht als gültigen Commit auflösen."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, 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:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
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:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Ein '%s'-Reset mit Pfaden ist nicht möglich."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, 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:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N kann nur mit -mixed benutzt werden"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Nicht zum Commit vorgemerkte Änderungen nach Zurücksetzung:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Konnte Index-Datei nicht zu Commit '%s' setzen."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "Konnte neue Index-Datei nicht schreiben."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "Das Filtern von Objekten erfordert --objects."
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "Ungültiger \"sparse\"-Wert '%s'."
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "rev-list unterstützt keine Anzeige von Notizen"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "--use-bitmap-index kann nicht mit dem Filtern von Objekten kombiniert werden."
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<Optionen>] -- [<Argumente>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "`--` als Argument lassen"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "das Parsen nach dem ersten Argument, was keine Option ist, stoppen"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr ""
"Ausgabe in Langform mit Argumenten an den Optionen (getrennt durch '=')"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13043,11 +13359,11 @@
msgid "keep redundant, empty commits"
msgstr "redundante, leere Commits behalten"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "\"revert\" fehlgeschlagen"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" fehlgeschlagen"
@@ -13119,17 +13435,17 @@
msgid "exit with a zero status even if nothing matched"
msgstr "mit Rückgabewert 0 beenden, wenn keine Übereinstimmung gefunden wurde"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "'%s' wird nicht ohne -r rekursiv entfernt"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: konnte %s nicht löschen"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "Konnte '%s' nicht löschen"
@@ -13167,27 +13483,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<Optionen>] [<Commitbereich>] [[--] [<Pfad>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "über Commit-Ersteller anstatt Autor gruppieren"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "die Ausgabe entsprechend der Anzahl von Commits pro Autor sortieren"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Commit-Beschreibungen unterdrücken, nur Anzahl der Commits liefern"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "die E-Mail-Adresse von jedem Autor anzeigen"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Ausgabe mit Zeilenumbrüchen"
@@ -13394,35 +13710,35 @@
msgid "prepend comment character and space to each line"
msgstr "Kommentarzeichen mit Leerzeichen an jede Zeile voranstellen"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "Referenz nicht gefunden: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Vollständiger Referenzname erwartet, %s erhalten"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "Kann eine Komponente von URL '%s' nicht extrahieren"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "Alternativer Anker für relative Pfade"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, 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:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13432,82 +13748,110 @@
"Repository\n"
"sein eigenes verbindliches Upstream-Repository ist."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, 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:410
+#: builtin/submodule--helper.c:479
#, 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:420
+#: builtin/submodule--helper.c:489
#, 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:427
+#: builtin/submodule--helper.c:496
#, 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:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "Ausgaben bei Initialisierung eines Submoduls unterdrücken"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<Pfad>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <Pfad>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, 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:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "Fehler bei Rekursion in Submodul '%s'."
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "Ausgabe über Submodul-Status unterdrücken"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "Benutze den Commit, der im Index gespeichert ist, statt den im Submodul HEAD"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "Rekursion in verschachtelte Submodule durchführen"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<Pfad>...]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <Pfad>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "Submodul '%s' kann Alternative nicht hinzufügen: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, 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:611
+#: builtin/submodule--helper.c:842
#, 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:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "Pfad für neues Submodul"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "Name des neuen Submoduls"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "URL von der das Submodul geklont wird"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "Tiefe des Klons mit unvollständiger Historie (shallow)"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "Fortschrittsanzeige beim Klonen erzwingen"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13516,88 +13860,88 @@
"<Repository>] [--name <Name>] [--url <URL>] [--name <Name>] [--depth "
"<Tiefe>] --url <URL> --path <Pfad>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Klonen von '%s' in Submodul-Pfad '%s' fehlgeschlagen"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "Konnte Submodul-Verzeichnis '%s' nicht finden."
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Submodul-Pfad '%s' nicht initialisiert"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "Meinten Sie vielleicht 'update --init'?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Überspringe nicht zusammengeführtes Submodul %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Überspringe Submodul '%s'"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Fehler beim Klonen von '%s'. Weiterer Versuch geplant"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Zweiter Versuch '%s' zu klonen fehlgeschlagen, breche ab."
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "Pfad zum Arbeitsverzeichnis"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
"Pfad zum Arbeitsverzeichnis, über verschachtelte Submodul-Grenzen hinweg"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout oder none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
"Erstellung eines Klons mit unvollständiger Historie (shallow), abgeschnitten "
"bei\n"
"der angegebenen Anzahl von Commits."
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "Parallele Ausführungen"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
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:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "keine Fortschrittsanzeige beim Klonen"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<Pfad>] [<Pfad>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "Fehlerhafter Wert für --update Parameter"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13606,20 +13950,20 @@
"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:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "Rekursion in Submodule durchführen"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<Pfad>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s unterstützt kein --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' ist kein gültiger Unterbefehl von submodule--helper"
@@ -13632,24 +13976,24 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <Name>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"Fehlermeldungen für nicht-symbolische (losgelöste) Referenzen unterdrücken"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "symbolische Referenzen löschen"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "verkürzte Ausgabe der Referenzen"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "Grund"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "Grund für die Aktualisierung"
@@ -13679,17 +14023,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<Format>] <Tagname>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "Tag '%s' nicht gefunden."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tag '%s' gelöscht (war %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13702,7 +14046,7 @@
" %s\n"
"ein. Zeilen, die mit '%c' beginnen, werden ignoriert.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13717,142 +14061,142 @@
"ein. Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n"
"selbst entfernen wenn Sie möchten.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "konnte Tag nicht signieren"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "konnte Tag-Datei nicht schreiben"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "ungültiger Objekt-Typ"
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "keine Tag-Beschreibung?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Die Tag-Beschreibung wurde gelassen in %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "Tagnamen auflisten"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "<n> Zeilen jeder Tag-Beschreibung anzeigen"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "Tags löschen"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "Tags überprüfen"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Optionen für Erstellung von Tags"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "annotiertes Tag, benötigt eine Beschreibung"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "Tag-Beschreibung"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "annotiertes und GPG-signiertes Tag"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "einen anderen Schlüssel verwenden, um das Tag zu signieren"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "das Tag ersetzen, wenn es existiert"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "Reflog erstellen"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Optionen für Auflistung der Tags"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "Liste der Tags in Spalten anzeigen"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit beinhalten"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "nur Tags ausgeben, die diesen Commit nicht enthalten"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "nur Tags ausgeben, die gemerged wurden"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "nur Tags ausgeben, die nicht gemerged wurden"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "nur Tags von dem Objekt ausgeben"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column und -n sind inkompatibel"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "Die Option -n ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "Die Option --contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "Die Option --no-contains ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "Die Option --points-at ist nur im Listenmodus erlaubt."
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "Die Optionen --merged und --no-merged sind nur im Listenmodus erlaubt."
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "nur eine -F oder -m Option ist erlaubt."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "zu viele Parameter"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' ist kein gültiger Tagname."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "Tag '%s' existiert bereits"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Tag '%s' aktualisiert (war %s)\n"
@@ -13861,204 +14205,220 @@
msgid "Unpacking objects"
msgstr "Entpacke Objekte"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "Fehler beim Erstellen von Verzeichnis '%s'"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "Konnte '%s' nicht lesen"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "Konnte Datei '%s' nicht erstellen"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "Konnte Datei '%s' nicht löschen"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: 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:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Prüfe mtime in '%s' "
-#: builtin/update-index.c:150
+#: 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:163
+#: 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:176
+#: 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:187
+#: 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:198
+#: 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:211
+#: 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:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<Optionen>] [--] [<Datei>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr ""
"Aktualisierung fortsetzen, auch wenn der Index aktualisiert werden muss"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "Aktualisierung: ignoriert Submodule"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "keine neuen Dateien ignorieren"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "Dateien Verzeichnisse ersetzen lassen, und umgedreht"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis beachten"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr ""
"aktualisieren, auch wenn der Index nicht zusammengeführte Einträge beinhaltet"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "Dateiinformationen aktualisieren"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "wie --refresh, ignoriert aber \"assume-unchanged\" Einstellung"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<Modus>,<Objekt>,<Pfad>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "den angegebenen Eintrag zum Commit vormerken"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "diese Datei immer als unverändert betrachten"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "\"assumed-unchanged\"-Bit löschen"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "Dateien als \"index-only\" markieren"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "\"skip-worktree\"-Bit löschen"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
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:971
+#: builtin/update-index.c:983
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:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "mit --stdin: eingegebene Zeilen sind durch NUL-Bytes abgeschlossen"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
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:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr "Einträge von der Standard-Eingabe zum Commit vormerken"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
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:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "nur Einträge aktualisieren, die unterschiedlich zu HEAD sind"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "fehlende Dateien im Arbeitsverzeichnis ignorieren"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "die Aktionen in der Standard-Ausgabe ausgeben"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(für Fremdprogramme) keine gespeicherten, nicht aufgelöste Konflikte"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "Index-Datei in diesem Format schreiben"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "Splitting des Index aktivieren oder deaktivieren"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "Cache für unversionierte Dateien aktivieren oder deaktivieren"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr ""
-"prüfen ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
+"prüfen, ob das Dateisystem einen Cache für unversionierte Dateien unterstützt"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr ""
"Cache für unversionierte Dateien ohne Prüfung des Dateisystems aktivieren"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+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:1024
+msgid "enable or disable file system monitor"
+msgstr "Dateisystem-Monitor aktivieren oder deaktivieren"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "Dateien als \"fsmonitor valid\" markieren"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "\"fsmonitor valid\"-Bit löschen"
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -14066,7 +14426,7 @@
"core.splitIndex ist auf 'false' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn sie wirklich das Splitting des Index aktivieren möchten."
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -14074,7 +14434,7 @@
"core.splitIndex ist auf 'true' gesetzt. Entfernen oder ändern Sie dies,\n"
"wenn Sie wirklich das Splitting des Index deaktivieren möchten."
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -14082,11 +14442,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:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "Cache für unversionierte Dateien deaktiviert"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -14095,11 +14455,32 @@
"dies,\n"
"wenn sie wirklich den Cache für unversionierte Dateien aktivieren möchten."
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Cache für unversionierte Dateien für '%s' aktiviert"
+#: builtin/update-index.c:1171
+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:1175
+msgid "fsmonitor enabled"
+msgstr "Dateisystem-Monitor aktiviert"
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor ist gesetzt. Löschen Sie es, wenn Sie den Dateisystem-Monitor\n"
+"wirklich deaktivieren möchten."
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr "Dateisystem-Monitor deaktiviert"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<Optionen>] -d <Referenzname> [<alter-Wert>]"
@@ -14113,19 +14494,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<Optionen>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "diese Referenz löschen"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "<Referenzname> aktualisieren, nicht den Verweis"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "Standard-Eingabe hat durch NUL-Zeichen abgeschlossene Argumente"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "Aktualisierungen von der Standard-Eingabe lesen"
@@ -14169,124 +14550,147 @@
msgid "print tag contents"
msgstr "Tag-Inhalte ausgeben"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<Optionen>] <Pfad> [<Branch>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<Optionen>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<Optionen>] <Pfad>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<Optionen>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <Pfad>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Lösche worktrees/%s: kein gültiges Verzeichnis"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Lösche worktrees/%s: gitdir-Datei existiert nicht"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Lösche worktrees/%s: konnte gitdir-Datei (%s) nicht lesen"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Lösche worktrees/%s: read() zu kurz (%<PRIuMAX> Bytes erwartet, %<PRIuMAX> "
+"gelesen)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Lösche worktrees/%s: ungültige gitdir-Datei"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Lösche worktrees/%s: gitdir-Datei verweist auf nicht existierenden Ort"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "entfernte Arbeitsverzeichnisse ausgeben"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr "Arbeitsverzeichnisse älter als <Zeit> verfallen lassen"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existiert bereits"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "Konnte Verzeichnis '%s' nicht erstellen."
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Bereite %s vor (Identifikation %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
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:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "neuen Branch erstellen"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "Branch erstellen oder umsetzen"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "das neue Arbeitsverzeichnis auschecken"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "das neue Arbeitsverzeichnis gesperrt lassen"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "Modus zum Folgen von Branches einstellen (siehe git-branch(1))"
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+"versuchen, eine Übereinstimmung des Branch-Namens mit einem\n"
+"Remote-Tracking-Branch herzustellen"
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B und --detach schließen sich gegenseitig aus"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+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:553
msgid "reason for locking"
msgstr "Sperrgrund"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' ist kein Arbeitsverzeichnis"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr "Das Hauptarbeitsverzeichnis kann nicht gesperrt oder entsperrt werden."
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' ist bereits gesperrt, Grund: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' ist bereits gesperrt"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' ist nicht gesperrt"
@@ -14307,7 +14711,7 @@
msgid "only useful for debugging"
msgstr "nur nützlich für Fehlersuche"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<Optionen>] <Verzeichnis>"
@@ -14329,7 +14733,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "Übertragung nach <n> Sekunden Inaktivität unterbrechen"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14345,7 +14749,7 @@
"\n"
"auszuführen."
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "Meldungen zur Fehlersuche in Standard-Fehlerausgabe ausgeben"
@@ -14360,22 +14764,22 @@
"oder 'git help <Konzept>', um mehr über einen spezifischen Befehl oder\n"
"Konzept zu erfahren."
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "negativer Wert für http.postbuffer; benutze Standardwert %d"
-#: http.c:358
+#: http.c:360
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:367
+#: http.c:369
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
"Das Anheften des öffentlichen Schlüssels wird mit cURL < 7.44.0\n"
"nicht unterstützt."
-#: http.c:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -14391,6 +14795,14 @@
msgid "redirecting to %s"
msgstr "Leite nach %s um"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "Argumente"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "Filtern nach Objekten"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "Arbeitsverzeichnis anlegen (siehe auch: git help tutorial)"
@@ -14577,27 +14989,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "Ungültiges \"bisect_write\" Argument: $state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Ungültige Referenz-Eingabe: $arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Ungültige Referenz-Eingabe: $bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Ungültige Referenz-Eingabe: $rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' kann nur ein Argument entgegennehmen."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Warnung: binäre Suche nur mit einem $TERM_BAD Commit."
@@ -14605,11 +15017,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "Sind Sie sicher [Y/n]? "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14620,7 +15032,7 @@
"(Sie können dafür \"git bisect $bad_syn\" und \"git bisect $good_syn\" "
"benutzen.)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14633,16 +15045,16 @@
"(Sie können dafür \"git bisect $bad_syn\" und \"git bisect $good_syn\" "
"benutzen.)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "keine binäre Suche im Gange"
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' ist kein gültiger Commit"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14651,25 +15063,29 @@
"Konnte den ursprünglichen HEAD '$branch' nicht auschecken.\n"
"Versuchen Sie 'git bisect reset <Commit>'."
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "Keine Log-Datei gegeben"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kann $file nicht für das Abspielen lesen"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? Was reden Sie da?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "'bisect run' fehlgeschlagen: kein Befehl angegeben."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "führe $command aus"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14678,11 +15094,11 @@
"'bisect run' fehlgeschlagen:\n"
"Rückkehrwert $res von '$command' ist < 0 oder >= 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "'bisect run' kann nicht mehr fortgesetzt werden"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14691,41 +15107,22 @@
"'bisect run' fehlgeschlagen:\n"
"'bisect_state $state' wurde mit Fehlerwert $res beendet"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "'bisect run' erfolgreich ausgeführt"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "Bitte verwenden Sie zwei verschiedene Begriffe."
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term' ist kein gültiger Begriff"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "Kann eingebauten Befehl '$term' nicht als Begriff verwenden"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "Kann Bedeutung von '$term' nicht ändern."
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Ungültiger Befehl: Sie sind gerade bei einer binären $TERM_BAD/$TERM_GOOD "
"Suche."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "Keine Begriffe definiert."
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14739,7 +15136,7 @@
"Error: Your local changes to the following files would be overwritten by "
"merge"
msgstr ""
-"Fehler Ihre lokalen Änderungen in den folgenden Dateien würden durch den "
+"Fehler: Ihre lokalen Änderungen in den folgenden Dateien würden durch den "
"Merge\n"
"überschrieben werden"
@@ -14758,7 +15155,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Bereits aktuell mit $pretty_name"
#: git-merge-octopus.sh:89
@@ -14777,55 +15174,57 @@
#: git-rebase.sh:58
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"
-"\"."
+"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 ""
-"Wenn Sie das Problem aufgelöst haben, führen Sie \"git rebase --continue\" "
-"aus.\n"
-"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"git "
-"rebase --skip\" aus.\n"
-"Um den ursprünglichen Branch wiederherzustellen und den Rebase abzubrechen,\n"
+"Lösen Sie alle Konflikte manuell auf, markieren Sie diese mit\n"
+"\"git add/rm <konfliktbehaftete_Dateien>\" und führen Sie dann\n"
+"\"git rebase --continue\" aus.\n"
+"Sie können auch stattdessen diesen Commit auslassen, indem\n"
+"Sie \"git rebase --skip\" ausführen.\n"
+"Um abzubrechen und zurück zum Zustand vor \"git rebase\" zu gelangen,\n"
"führen Sie \"git rebase --abort\" aus."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Konnte nicht zu $head_name zurückgehen"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Automatischen Stash angewendet."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kann $stash_sha1 nicht speichern."
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Der \"pre-rebase hook\" hat den Rebase zurückgewiesen."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "\"git-am\" scheint im Gange zu sein. Kann Rebase nicht durchführen."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "'git-am' scheint im Gange zu sein. Kann Rebase nicht durchführen."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Kein Rebase im Gange?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
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."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Kann HEAD nicht lesen"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14833,7 +15232,7 @@
"Sie müssen alle Merge-Konflikte editieren und diese dann\n"
"mittels \"git add\" als aufgelöst markieren"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14854,230 +15253,228 @@
"und führen Sie diesen Befehl nochmal aus. Es wird angehalten, falls noch\n"
"etwas Schützenswertes vorhanden ist."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "ungültiger Upstream-Branch $upstream_name"
+msgid "invalid upstream '$upstream_name'"
+msgstr "Ungültiger Upstream-Branch '$upstream_name'."
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: es gibt mehr als eine Merge-Basis"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: es gibt keine Merge-Basis"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "$onto_name zeigt auf keinen gültigen Commit"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "fatal: Branch $branch_name nicht gefunden"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "fatal: Branch/Commit '$branch_name' nicht gefunden"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "Kann automatischen Stash nicht erzeugen."
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Automatischen Stash erzeugt: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "Bitte committen Sie die Änderungen oder benutzen Sie \"stash\"."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD ist aktuell."
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktueller Branch $branch_name ist auf dem neuesten Stand."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD ist aktuell, Rebase erzwungen."
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
"Aktueller Branch $branch_name ist auf dem neuesten Stand, Rebase erzwungen."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Änderungen von $mb zu $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Zunächst wird der Branch zurückgespult, um Ihre Änderungen\n"
"darauf neu anzuwenden ..."
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name zu $onto_name vorgespult."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear mit Parametern ist nicht implementiert"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "Sie haben bisher noch keinen initialen Commit"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "Kann den aktuellen Zustand des Index nicht speichern"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "Kann die unversionierten Dateien nicht speichern"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "Kann den aktuellen Zustand des Arbeitsverzeichnisses nicht speichern"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "Keine Änderungen ausgewählt"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kann temporären Index nicht löschen (kann nicht passieren)"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "Kann Zustand des Arbeitsverzeichnisses nicht aufzeichnen"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kann $ref_stash nicht mit $w_commit aktualisieren."
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"Fehler: unbekannte Option für 'stash save': $option\n"
-" Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
-"'$option'\""
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "Fehler: unbekannte Option für 'stash push': $option"
+
+#: git-stash.sh:295
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"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "Keine lokalen Änderungen zum Speichern"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "Kann \"stash\" nicht initialisieren"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "Kann den aktuellen Status nicht speichern"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Speicherte Arbeitsverzeichnis und Index-Status $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "Kann Änderungen im Arbeitsverzeichnis nicht löschen"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "unbekannte Option: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "Keine Stash-Einträge gefunden."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Zu viele Commits angegeben: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference ist keine gültige Referenz"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' ist kein \"stash\"-artiger Commit"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' ist keine \"stash\"-Referenz"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "Konnte den Index nicht aktualisieren."
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
-msgstr "Kann \"stash\" nicht anwenden, solang ein Merge im Gange ist"
+msgstr "Kann \"stash\" nicht anwenden, solange ein Merge im Gange ist"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "Konflikte im Index. Versuchen Sie es ohne --index."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "Konnte Index-Verzeichnis nicht speichern"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
-msgstr "Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
+msgstr ""
+"Konnte unversionierte Dateien vom Stash-Eintrag nicht wiederherstellen."
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "Kann geänderte Dateien nicht aus dem Index entfernen"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "Index wurde nicht aus dem Stash zurückgeladen."
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
-msgstr "Der Stash-Eintrag wird behalten, im Falle Sie benötigen diesen nochmal."
+msgstr ""
+"Der Stash-Eintrag wird für den Fall behalten, dass Sie diesen nochmal "
+"benötigen."
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Gelöscht ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Konnte \"stash\"-Eintrag nicht löschen"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "Kein Branchname spezifiziert"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)"
@@ -15235,17 +15632,17 @@
"Submodul '$name' ($url) für Pfad '$displaypath' wurde aus der Konfiguration "
"entfernt."
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, 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:648
+#: git-submodule.sh:647
#, 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:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15254,12 +15651,12 @@
"Konnte aktuellen Commit von ${remote_name}/${branch} in Submodul-Pfad\n"
"'$sm_path' nicht finden."
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Konnte \"fetch\" in Submodul-Pfad '$displaypath' nicht ausführen"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15268,85 +15665,80 @@
"\"fetch\" in Submodul-Pfad '$displaypath' ausgeführt, aber $sha1 nicht\n"
"enthalten. Direktes Anfordern dieses Commits ist fehlgeschlagen."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Konnte '$sha1' in Submodul-Pfad '$displaypath' nicht auschecken."
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Submodul-Pfad: '$displaypath': '$sha1' ausgecheckt"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, 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:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Submodul-Pfad '$displaypath': Rebase auf '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Merge von '$sha1' in Submodul-Pfad '$displaypath' fehlgeschlagen"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Submodul-Pfad '$displaypath': zusammengeführt in '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, 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:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Submodul-Pfad '$displaypath': '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Fehler bei Rekursion in Submodul-Pfad '$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr ""
"Die Optionen --cached und --files können nicht gemeinsam verwendet werden."
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "unerwarteter Modus $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Warnung: $display_name beinhaltet nicht Commit $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Warnung: $display_name beinhaltet nicht die Commits $sha1_src und $sha1_dst"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisiere Submodul-URL für '$displaypath'"
@@ -15365,25 +15757,25 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Befehle:\n"
-" p, pick = Commit verwenden\n"
-" r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
-" e, edit = Commit verwenden, aber zum Nachbessern anhalten\n"
-" s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n"
-" f, fixup = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n"
-" x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n"
-" d, drop = Commit entfernen\n"
+"p, pick = Commit verwenden\n"
+"r, reword = Commit verwenden, aber Commit-Beschreibung bearbeiten\n"
+"e, edit = Commit verwenden, aber zum Nachbessern anhalten\n"
+"s, squash = Commit verwenden, aber mit vorherigem Commit vereinen\n"
+"f, fixup = wie \"squash\", aber diese Commit-Beschreibung verwerfen\n"
+"x, exec = Befehl (Rest der Zeile) mittels Shell ausführen\n"
+"d, drop = Commit entfernen\n"
"\n"
"Diese Zeilen können umsortiert werden; Sie werden von oben nach unten\n"
"ausgeführt.\n"
@@ -15458,49 +15850,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "\"squash\" eines Merges ($sha1) zurückgewiesen."
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fehler beim Wiederholen des Merges von $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "Konnte $sha1 nicht picken"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Das ist Commit-Beschreibung #${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Commit-Beschreibung #${n} wird ausgelassen:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kann $fixup_msg nicht schreiben"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Das ist eine Kombination aus 2 Commits."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Konnte $sha1... ($rest) nicht anwenden"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15517,31 +15909,31 @@
"sollten Sie das Problem beheben, bevor Sie die Commit-Beschreibung ändern "
"können."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Angehalten bei $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Kann nicht '$squash_style' ohne vorherigen Commit"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Führe aus: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "Ausführung fehlgeschlagen: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "Der Index und/oder das Arbeitsverzeichnis wurde geändert."
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15554,7 +15946,7 @@
"ausführen."
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15570,97 +15962,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Unbekannter Befehl: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Bitte beheben Sie das, indem Sie 'git rebase --edit-todo' ausführen."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Erfolgreich Rebase ausgeführt und $head_name aktualisiert."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Fehler beim Auslassen von nicht erforderlichen \"pick\"-Befehlen."
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "Konnte HEAD nicht loslösen"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Warnung: Einige Commits könnten aus Versehen entfernt worden sein.\n"
-"Entfernte Commits (neu zu alt):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Um diese Meldung zu vermeiden, benutzen Sie \"drop\", um exlizit Commits zu\n"
-"entfernen.\n"
-"\n"
-"Benutzen Sie 'git config rebase.missingCommitsCheck', um die Stufe der "
-"Warnungen\n"
-"zu ändern.\n"
-"Die möglichen Verhaltensweisen sind: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Nicht erkannte Einstellung $check_level für Option rebase."
-"missingCommitsCheck.\n"
-"Ignoriere."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Sie können das mit 'git rebase --edit-todo' beheben. Führen Sie danach\n"
-"'git rebase --continue' aus."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Konnte CHERRY_PICK_HEAD nicht löschen"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15692,13 +16016,13 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
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--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15708,11 +16032,11 @@
"erneut\n"
"aus."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "Konnte Änderungen aus der Staging-Area nicht committen."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15726,40 +16050,44 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Konnte Editor nicht ausführen."
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Konnte $switch_to nicht auschecken."
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "Kein HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Konnte temporäres Verzeichnis $state_dir nicht erstellen."
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "Konnte nicht als interaktiven Rebase markieren."
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "Konnte neu geschriebene Commits nicht initialisieren."
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Konnte TODO-Liste nicht erzeugen."
+
+#: git-rebase--interactive.sh:973
#, 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--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15769,7 +16097,7 @@
"Wenn Sie jedoch alles löschen, wird der Rebase abgebrochen.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Leere Commits sind auskommentiert."
@@ -16329,7 +16657,7 @@
#: git-add--interactive.perl:1505
msgid "No hunk matches the given pattern\n"
-msgstr "Kein Patch-Block entspricht dem angegebenen Pattern\n"
+msgstr "Kein Patch-Block entspricht dem angegebenen Muster\n"
#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
msgid "No previous hunk\n"
@@ -16396,63 +16724,63 @@
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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "Der Editor wurde unsauber beendet, breche alles ab."
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, 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:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' enthält die verfasste E-Mail.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases ist mit anderen Optionen inkompatibel\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
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:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Unbekanntes --suppress-cc Feld: '%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Unbekannte --confirm Einstellung: '%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
"Warnung: sendemail Alias mit Anführungsstrichen wird nicht unterstützt: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "Warnung: `:include:` wird nicht unterstützt: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, 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:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "Warnung: sendmail Zeile wird nicht erkannt: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -16469,12 +16797,12 @@
" * die Option --format-patch angeben, wenn Sie einen Commit-Bereich "
"meinen\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -16483,7 +16811,7 @@
"fatal: %s: %s\n"
"Warnung: Es wurden keine Patches versendet.\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -16493,17 +16821,17 @@
"keine Patch-Dateien angegeben!\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Keine Betreffzeile in %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Fehler beim Öffnen von '%s' zum Schreiben: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -16518,32 +16846,32 @@
"Leeren Sie den Inhalt des Bodys, wenn Sie keine Zusammenfassung senden "
"möchten.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Fehler beim Öffnen von %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Fehler beim Öffnen von %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
"To/Cc/Bcc Felder wurden noch nicht interpretiert, sie wurden ignoriert\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
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:791
+#: git-send-email.perl:786
#, 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:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -16551,11 +16879,11 @@
"Die folgenden Dateien sind 8-Bit, aber deklarieren kein\n"
"Content-Transfer-Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Welches 8-Bit-Encoding soll deklariert werden [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -16569,22 +16897,22 @@
"an,\n"
"wenn Sie den Patch wirklich versenden wollen.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
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:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "fatal: Alias '%s' erweitert sich zu sich selbst\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "Fehler: konnte keine gültige Adresse aus %s extrahieren\n"
@@ -16592,18 +16920,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:944
+#: git-send-email.perl:941
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:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA Pfad \"%s\" existiert nicht"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16632,135 +16960,233 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Diese E-Mail versenden? (Ja [y]|Nein [n]|Beenden [q]|Alle [a]): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "Zum Versenden dieser E-Mail ist eine Antwort erforderlich."
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr "Der erforderliche SMTP-Server ist nicht korrekt definiert."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Server unterstützt kein STARTTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS fehlgeschlagen! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
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:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "Fehler beim Senden %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Probeversand %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "%s gesendet\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "Probeversand OK. Log enthält:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "OK. Log enthält:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "Ergebnis: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "Ergebnis: OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "Kann Datei %s nicht öffnen"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, 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:1534
+#: git-send-email.perl:1551
#, 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:1582
+#: git-send-email.perl:1599
#, 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:1605
+#: git-send-email.perl:1624
#, 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:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Konnte '%s' nicht ausführen"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Füge %s: %s hinzu von: '%s'\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) Fehler beim Schließen der Pipe nach '%s'"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "Kann Nachricht nicht als 7bit versenden."
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "Ungültiges Transfer-Encoding"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "konnte %s nicht öffnen: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: Patch enthält eine Zeile, die länger als 998 Zeichen ist"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Wollen Sie %s wirklich versenden? [y|N]: "
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "Leere Strings als Pfadspezifikationen werden in kommenden Releases "
+#~ "ungültig.\n"
+#~ "Bitte benutzen Sie stattdessen . wenn Sie alle Pfade meinen."
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "Konnte '%s' nicht zum Schreiben öffnen."
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "Konnte '%s' nicht abschneiden."
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "Konnte '%s' nicht abschließen."
+
+#~ msgid "could not write to %s"
+#~ msgstr "Konnte nicht nach '%s' schreiben."
+
+#~ msgid "could not close %s"
+#~ msgstr "Konnte '%s' nicht schließen."
+
+#~ msgid "Copied a misnamed branch '%s' away"
+#~ msgstr "falsch benannten Branch '%s' wegkopiert"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "'HEAD' darf nicht manuell erstellt werden"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "Weiß nicht wie %s zu klonen ist."
+
+#~ msgid "show ignored files"
+#~ msgstr "ignorierte Dateien anzeigen"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s ist kein gültiges '%s' Objekt"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "Weiß nicht wie von %s angefordert wird."
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "'$term' ist kein gültiger Begriff"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "Fehler: unbekannte Option für 'stash save': $option\n"
+#~ " Um eine Beschreibung anzugeben, benutzen Sie \"git stash save -- "
+#~ "'$option'\""
+
+#~ msgid "Failed to recurse into submodule path '$sm_path'"
+#~ msgstr "Fehler bei Rekursion in Submodul-Pfad '$sm_path'"
+
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) akzeptiert keine Argumente"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Warnung: Der SHA-1 in der folgenden Zeile fehlt oder ist kein Commit:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Warnung: Das Kommando in der folgenden Zeile wurde nicht erkannt:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Oder Sie können den Rebase mit 'git rebase --abort' abbrechen."
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "Strategie zur Aktualisierung von Submodulen für Submodul '%s' nicht "
+#~ "unterstützt."
+
+#~ msgid "change upstream info"
+#~ msgstr "Informationen zum Upstream-Branch ändern"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Wenn Sie wollten, dass '%s' den Branch '%s' als Upstream-Branch hat, "
+#~ "führen Sie aus:\n"
+
+#~ msgid "basename"
+#~ msgstr "Basisname"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "Basisname des Elternprojektes an Ausgaben voranstellen"
+
#~ msgid "Could not open file '%s'"
#~ msgstr "Konnte Datei '%s' nicht öffnen"
@@ -16879,9 +17305,6 @@
#~ msgid "git merge [<options>] <msg> HEAD <commit>"
#~ msgstr "git merge [<Optionen>] <Beschreibung> HEAD <Commit>"
-#~ msgid "'%s' is not a commit"
-#~ msgstr "'%s' ist kein Commit"
-
#~ msgid "cannot open file '%s'"
#~ msgstr "Kann Datei '%s' nicht öffnen"
@@ -16919,9 +17342,6 @@
#~ "(benutzen Sie 'rm -rf' wenn Sie dieses Submodul wirklich mitsamt\n"
#~ "seiner Historie löschen möchten)"
-#~ msgid "Could not write to %s"
-#~ msgstr "Konnte nicht nach %s schreiben"
-
#~ msgid "Error wrapping up %s."
#~ msgstr "Fehler beim Einpacken von %s."
diff --git a/po/es.po b/po/es.po
new file mode 100644
index 0000000..e5d42a9
--- /dev/null
+++ b/po/es.po
@@ -0,0 +1,16827 @@
+# Spanish translations for Git.
+# Copyright (C) 2018 Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>
+# This file is distributed under the same license as the Git package.
+# Christopher Diaz Riveros <christopher.diaz.riv@gmail.com>, 2017.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Git\n"
+"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-07 12:14-0500\n"
+"Last-Translator: christopher.diaz.riv@gmail.com\n"
+"Language-Team: CodeLabora <codelabora@gmail.com>\n"
+"Language: es\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: Poedit 1.8.7\n"
+
+#: advice.c:62
+#, c-format
+msgid "hint: %.*s\n"
+msgstr "ayuda: %.*s\n"
+
+#: advice.c:90
+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:92
+msgid "Committing is not possible because you have unmerged files."
+msgstr "No es posible realizar un commit porque tienes archivos sin fusionar."
+
+#: advice.c:94
+msgid "Merging is not possible because you have unmerged files."
+msgstr "No es posible hacer merge porque tienes archivos sin fusionar."
+
+#: advice.c:96
+msgid "Pulling is not possible because you have unmerged files."
+msgstr "No es posible hacer pull porque tienes archivos sin fusionar."
+
+#: advice.c:98
+msgid "Reverting is not possible because you have unmerged files."
+msgstr "No es posible revertir porque tienes archivos sin fusionar."
+
+#: advice.c:100
+#, 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:108
+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 ""
+"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:116
+msgid "Exiting because of an unresolved conflict."
+msgstr "Saliendo porque existe un conflicto sin resolver."
+
+#: advice.c:121 builtin/merge.c:1213
+msgid "You have not concluded your merge (MERGE_HEAD exists)."
+msgstr "No has concluido tu fusión (MERGE_HEAD existe)."
+
+#: advice.c:123
+msgid "Please, commit your changes before merging."
+msgstr "Por favor, realiza un commit antes de fusionar."
+
+#: advice.c:124
+msgid "Exiting because of unfinished merge."
+msgstr "Saliendo por una fusión inconclusa."
+
+#: advice.c:130
+#, c-format
+msgid ""
+"Note: checking out '%s'.\n"
+"\n"
+"You are in 'detached HEAD' state. You can look around, make experimental\n"
+"changes and commit them, and you can discard any commits you make in this\n"
+"state without impacting any branches by performing another checkout.\n"
+"\n"
+"If you want to create a new branch to retain commits you create, you may\n"
+"do so (now or later) by using -b with the checkout command again. Example:\n"
+"\n"
+" git checkout -b <new-branch-name>\n"
+"\n"
+msgstr ""
+"Nota: actualizando el árbol de trabajo '%s'.\n"
+"\n"
+"Te encuentras en estado 'detached HEAD'. Puedes revisar por aquí, hacer\n"
+"cambios experimentales y confirmarlos, y puedes descartar cualquier\n"
+"commit que hayas hecho en este estado sin impactar a tu rama realizando\n"
+"otro checkout.\n"
+"\n"
+"Si quieres crear una nueva rama para mantener los commits que has creado,\n"
+"puedes hacerlo (ahora o después) usando -b con el comando checkout. "
+"Ejemplo:\n"
+"\n"
+" git checkout -b <nombre-de-nueva-rama>\n"
+"\n"
+
+#: apply.c:58
+#, c-format
+msgid "unrecognized whitespace option '%s'"
+msgstr "opción de espacios en blanco no reconocida '%s'"
+
+#: apply.c:74
+#, c-format
+msgid "unrecognized whitespace ignore option '%s'"
+msgstr "opción de ignorar espacios en blanco no reconocida '%s'"
+
+#: apply.c:122
+msgid "--reject and --3way cannot be used together."
+msgstr "--reject y --3way no se pueden utilizar juntas."
+
+#: apply.c:124
+msgid "--cached and --3way cannot be used together."
+msgstr "--cached y --3way no se pueden utilizar juntas."
+
+#: apply.c:127
+msgid "--3way outside a repository"
+msgstr "--3way esta fuera de un repositorio"
+
+#: apply.c:138
+msgid "--index outside a repository"
+msgstr "--index esta fuera de un repositorio"
+
+#: apply.c:141
+msgid "--cached outside a repository"
+msgstr "--cached esta fuera de un repositorio"
+
+#: apply.c:821
+#, c-format
+msgid "Cannot prepare timestamp regexp %s"
+msgstr "No se puede preparar una marca de tiempo para la expresión regular %s"
+
+#: apply.c:830
+#, c-format
+msgid "regexec returned %d for input: %s"
+msgstr "regexec retorno %d para la entrada: %s"
+
+#: apply.c:904
+#, c-format
+msgid "unable to find filename in patch at line %d"
+msgstr ""
+"no se puede encontrar el nombre del archivo en el parche en la línea %d"
+
+#: apply.c:942
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
+msgstr ""
+"git apply: mal git-diff - se esperaba /dev/null, se encontró %s en la línea "
+"%d"
+
+#: apply.c:948
+#, c-format
+msgid "git apply: bad git-diff - inconsistent new filename on line %d"
+msgstr ""
+"git apply: mal git-diff - nuevo nombre de archivo inconsistente en la línea "
+"%d"
+
+#: apply.c:949
+#, c-format
+msgid "git apply: bad git-diff - inconsistent old filename on line %d"
+msgstr ""
+"git apply: mal git-diff - viejo nombre de archivo inconsistente en la línea "
+"%d"
+
+#: apply.c:954
+#, c-format
+msgid "git apply: bad git-diff - expected /dev/null on line %d"
+msgstr "git apply: mal git-diff - se esperaba /dev/null en la línea %d"
+
+#: apply.c:983
+#, c-format
+msgid "invalid mode on line %d: %s"
+msgstr "modo inválido en la línea %d: %s"
+
+#: apply.c:1301
+#, c-format
+msgid "inconsistent header lines %d and %d"
+msgstr "header inconsistente en las líneas %d y %d"
+
+#: apply.c:1473
+#, c-format
+msgid "recount: unexpected line: %.*s"
+msgstr "recount: línea inesperada: %.*s"
+
+#: apply.c:1542
+#, c-format
+msgid "patch fragment without header at line %d: %.*s"
+msgstr "fragmento de parche sin header en la línea %d: %.*s"
+
+#: apply.c:1562
+#, 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] ""
+"al header de git diff carece de información del nombre del archivo %d cuando "
+"lo remueve de la ruta principalcomponente (línea %d)"
+msgstr[1] ""
+"los headers de git diff carecen de información de los nombres de los "
+"archivos %d cuando los remueven de la ruta principalcomponentes (línea %d)"
+
+#: apply.c:1575
+#, c-format
+msgid "git diff header lacks filename information (line %d)"
+msgstr ""
+"el header de git diff carece de información del nombre del archivo (línea %d)"
+
+#: apply.c:1763
+msgid "new file depends on old contents"
+msgstr "el nuevo archivo depende de contenidos viejos"
+
+#: apply.c:1765
+msgid "deleted file still has contents"
+msgstr "el archivo eliminado todavía tiene contenido"
+
+#: apply.c:1799
+#, c-format
+msgid "corrupt patch at line %d"
+msgstr "parche corrupto en la línea %d"
+
+#: apply.c:1836
+#, c-format
+msgid "new file %s depends on old contents"
+msgstr "nuevo archivo %s depende en contenidos viejos"
+
+#: apply.c:1838
+#, c-format
+msgid "deleted file %s still has contents"
+msgstr "el archivo borrado %s todavía tiene contenido"
+
+#: apply.c:1841
+#, c-format
+msgid "** warning: file %s becomes empty but is not deleted"
+msgstr "** peligro: el archivo %s esta vacío pero no es borrado"
+
+#: apply.c:1988
+#, c-format
+msgid "corrupt binary patch at line %d: %.*s"
+msgstr "parche binario corrupto en la línea %d: %.*s"
+
+#: apply.c:2025
+#, c-format
+msgid "unrecognized binary patch at line %d"
+msgstr "parche binario no reconocido en la línea %d"
+
+#: apply.c:2185
+#, c-format
+msgid "patch with only garbage at line %d"
+msgstr "parche que solo contiene basura en la línea %d"
+
+#: apply.c:2271
+#, c-format
+msgid "unable to read symlink %s"
+msgstr "no es posible leer el enlace simbólico %s"
+
+#: apply.c:2275
+#, c-format
+msgid "unable to open or read %s"
+msgstr "no es posible abrir o leer %s"
+
+#: apply.c:2934
+#, c-format
+msgid "invalid start of line: '%c'"
+msgstr "comienzo invalido de línea: '%c'"
+
+#: apply.c:3055
+#, 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 exito en %d (%d líneas compensadas)."
+
+#: apply.c:3067
+#, 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:3073
+#, c-format
+msgid ""
+"while searching for:\n"
+"%.*s"
+msgstr ""
+"Mientras se busca:\n"
+"%.*s"
+
+#: apply.c:3095
+#, c-format
+msgid "missing binary patch data for '%s'"
+msgstr "data perdida en parche binario para '%s'"
+
+#: apply.c:3103
+#, c-format
+msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
+msgstr ""
+"no se puede revertir-aplicar un parche binario sin el hunk revertido a '%s'"
+
+#: apply.c:3149
+#, 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:3159
+#, c-format
+msgid ""
+"the patch applies to '%s' (%s), which does not match the current contents."
+msgstr ""
+"el parche aplica a '%s' (%s), lo cual no concuerda con los contenidos "
+"actuales."
+
+#: apply.c:3167
+#, 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:3185
+#, 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:3198
+#, c-format
+msgid "binary patch does not apply to '%s'"
+msgstr "el parche binario no aplica para '%s'"
+
+#: apply.c:3204
+#, c-format
+msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
+msgstr ""
+"el parche binario para '%s' crea un resultado incorrecto (saliendo %s, se "
+"obtuvo %s)"
+
+#: apply.c:3225
+#, c-format
+msgid "patch failed: %s:%ld"
+msgstr "el parche fallo: %s:%ld"
+
+#: apply.c:3347
+#, c-format
+msgid "cannot checkout %s"
+msgstr "no se puede hacer checkout a %s"
+
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
+#, c-format
+msgid "failed to read %s"
+msgstr "no se pudo leer %s"
+
+#: apply.c:3404
+#, c-format
+msgid "reading from '%s' beyond a symbolic link"
+msgstr "leyendo de '%s' tras un enlace simbólico"
+
+#: apply.c:3433 apply.c:3673
+#, c-format
+msgid "path %s has been renamed/deleted"
+msgstr "la ruta %s ha sido renombrada/suprimida"
+
+#: apply.c:3516 apply.c:3687
+#, c-format
+msgid "%s: does not exist in index"
+msgstr "%s: no existe en el indice"
+
+#: apply.c:3525 apply.c:3695
+#, c-format
+msgid "%s: does not match index"
+msgstr "%s: no concuerda con el indice"
+
+#: apply.c:3560
+msgid "repository lacks the necessary blob to fall back on 3-way merge."
+msgstr ""
+"el repositorio carece del blob necesario para regresar en un merge de tres-"
+"vias"
+
+#: apply.c:3563
+#, c-format
+msgid "Falling back to three-way merge...\n"
+msgstr "Retrocediendo en un merge de tres-vias...\n"
+
+#: apply.c:3579 apply.c:3583
+#, c-format
+msgid "cannot read the current contents of '%s'"
+msgstr "no se pueden leer los contenidos actuales de '%s'"
+
+#: apply.c:3595
+#, c-format
+msgid "Failed to fall back on three-way merge...\n"
+msgstr "Fallo el merge en retroceso de tres-vias...\n"
+
+#: apply.c:3609
+#, c-format
+msgid "Applied patch to '%s' with conflicts.\n"
+msgstr "Parche aplicado a '%s' con conflictos.\n"
+
+#: apply.c:3614
+#, c-format
+msgid "Applied patch to '%s' cleanly.\n"
+msgstr "Parche aplicado a '%s' limpiamente\n"
+
+#: apply.c:3640
+msgid "removal patch leaves file contents"
+msgstr "parche de remoción deja contenidos en el archivo"
+
+#: apply.c:3712
+#, c-format
+msgid "%s: wrong type"
+msgstr "%s: tipo incorrecto"
+
+#: apply.c:3714
+#, c-format
+msgid "%s has type %o, expected %o"
+msgstr "%s tiene tipo %o, se esperaba %o"
+
+#: apply.c:3864 apply.c:3866
+#, c-format
+msgid "invalid path '%s'"
+msgstr "ruta invalida '%s'"
+
+#: apply.c:3922
+#, c-format
+msgid "%s: already exists in index"
+msgstr "%s: ya existe en el indice"
+
+#: apply.c:3925
+#, c-format
+msgid "%s: already exists in working directory"
+msgstr "%s: ya existe en el directorio de trabajo"
+
+#: apply.c:3945
+#, 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:3950
+#, 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:3970
+#, c-format
+msgid "affected file '%s' is beyond a symbolic link"
+msgstr "archivo afectado '%s' esta tras un enlace simbólico"
+
+#: apply.c:3974
+#, c-format
+msgid "%s: patch does not apply"
+msgstr "%s: el parche no aplica"
+
+#: apply.c:3989
+#, c-format
+msgid "Checking patch %s..."
+msgstr "Revisando el parche %s..."
+
+#: apply.c:4080
+#, c-format
+msgid "sha1 information is lacking or useless for submodule %s"
+msgstr "falta información del sha1 o es inútil para el submodulo %s"
+
+#: apply.c:4087
+#, 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:4090
+#, c-format
+msgid "sha1 information is lacking or useless (%s)."
+msgstr "falta información sha1 o es inútil (%s)."
+
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
+#, c-format
+msgid "make_cache_entry failed for path '%s'"
+msgstr "make_cache_entry fallo para la ruta '%s'"
+
+#: apply.c:4099
+#, c-format
+msgid "could not add %s to temporary index"
+msgstr "no se pudo anadir %s al índice temporal"
+
+#: apply.c:4109
+#, c-format
+msgid "could not write temporary index to %s"
+msgstr "no se pudo escribir un índice temporal para %s"
+
+#: apply.c:4247
+#, c-format
+msgid "unable to remove %s from index"
+msgstr "no se puede remover %s del indice"
+
+#: apply.c:4282
+#, c-format
+msgid "corrupt patch for submodule %s"
+msgstr "parche corrupto para el submodulo %s"
+
+#: apply.c:4288
+#, c-format
+msgid "unable to stat newly created file '%s'"
+msgstr "no es posible establecer el archivo recién creado '%s'"
+
+#: apply.c:4296
+#, 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:4302 apply.c:4446
+#, c-format
+msgid "unable to add cache entry for %s"
+msgstr "no es posible agregar una entrada en el cache para %s"
+
+#: apply.c:4343
+#, c-format
+msgid "failed to write to '%s'"
+msgstr "fallo escribir para '%s'"
+
+#: apply.c:4347
+#, c-format
+msgid "closing file '%s'"
+msgstr "cerrando archivo '%s'"
+
+#: apply.c:4417
+#, c-format
+msgid "unable to write file '%s' mode %o"
+msgstr "no es posible escribir el archivo '%s' modo %o"
+
+#: apply.c:4515
+#, c-format
+msgid "Applied patch %s cleanly."
+msgstr "Parche %s aplicado limpiamente"
+
+#: apply.c:4523
+msgid "internal error"
+msgstr "Error interno"
+
+#: apply.c:4526
+#, 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:4537
+#, c-format
+msgid "truncating .rej filename to %.*s.rej"
+msgstr "truncando el nombre de archivo .rej a %.*s.rej "
+
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
+#, c-format
+msgid "cannot open %s"
+msgstr "no se puede abrir %s"
+
+#: apply.c:4559
+#, c-format
+msgid "Hunk #%d applied cleanly."
+msgstr "Hunk #%d aplicado limpiamente"
+
+#: apply.c:4563
+#, c-format
+msgid "Rejected hunk #%d."
+msgstr "hunk #%d rechazado"
+
+#: apply.c:4673
+#, c-format
+msgid "Skipped patch '%s'."
+msgstr "Parche '%s' saltado."
+
+#: apply.c:4681
+msgid "unrecognized input"
+msgstr "input no reconocido"
+
+#: apply.c:4700
+msgid "unable to read index file"
+msgstr "no es posible leer el archivo indice"
+
+#: apply.c:4837
+#, c-format
+msgid "can't open patch '%s': %s"
+msgstr "no se puede abrir el parche '%s': %s"
+
+#: apply.c:4864
+#, c-format
+msgid "squelched %d whitespace error"
+msgid_plural "squelched %d whitespace errors"
+msgstr[0] "%d error de espacios en blanco aplastado"
+msgstr[1] "%d errores de espacios en blanco aplastados"
+
+#: apply.c:4870 apply.c:4885
+#, 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 erroes de espacios en blanco."
+
+#: apply.c:4878
+#, c-format
+msgid "%d line applied after fixing whitespace errors."
+msgid_plural "%d lines applied after fixing whitespace errors."
+msgstr[0] ""
+"%d línea aplicada después de arreglar los errores de espacios en blanco."
+msgstr[1] ""
+"%d líneas aplicadas despues de arreglar los errores de espacios en blanco."
+
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
+msgid "Unable to write new index file"
+msgstr "No es posible escribir el archivo indice"
+
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
+#: git-add--interactive.perl:197
+msgid "path"
+msgstr "ruta"
+
+#: apply.c:4922
+msgid "don't apply changes matching the given path"
+msgstr "no aplicar cambios que concuerden con la ruta suministrada"
+
+#: apply.c:4925
+msgid "apply changes matching the given path"
+msgstr "aplicar cambios que concuerden con la ruta suministrada"
+
+#: apply.c:4927 builtin/am.c:2229
+msgid "num"
+msgstr "num"
+
+#: apply.c:4928
+msgid "remove <num> leading slashes from traditional diff paths"
+msgstr "remover <num> slashes iniciales de las rutas diff tradicionales"
+
+#: apply.c:4931
+msgid "ignore additions made by the patch"
+msgstr "ignorar adiciones hechas por el parche"
+
+#: apply.c:4933
+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:4937
+msgid "show number of added and deleted lines in decimal notation"
+msgstr "mostrar el numero de líneas agregadas y eliminadas en notación decimal"
+
+#: apply.c:4939
+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:4941
+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:4943
+msgid "make sure the patch is applicable to the current index"
+msgstr "asegurar que el parche es aplicable al índice actual"
+
+#: apply.c:4945
+msgid "apply a patch without touching the working tree"
+msgstr "aplicar un parche sin tocar el árbol de trabajo"
+
+#: apply.c:4947
+msgid "accept a patch that touches outside the working area"
+msgstr "aceptar un parche que toca fuera del área de trabajo"
+
+#: apply.c:4949
+msgid "also apply the patch (use with --stat/--summary/--check)"
+msgstr "también aplicar el parche ( usar con --stat/--summary/--check"
+
+#: apply.c:4951
+msgid "attempt three-way merge if a patch does not apply"
+msgstr "intentar merge de tres-vias si el parche no aplica"
+
+#: apply.c:4953
+msgid "build a temporary index based on embedded index information"
+msgstr ""
+"construir un índice temporal basado en la información del índice incrustado"
+
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
+msgid "paths are separated with NUL character"
+msgstr "rutas están separadas con un carácter NULL "
+
+#: apply.c:4958
+msgid "ensure at least <n> lines of context match"
+msgstr "asegure que por lo menos <n> líneas del contexto concuerden"
+
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
+msgid "action"
+msgstr "acción"
+
+#: apply.c:4960
+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:4963 apply.c:4966
+msgid "ignore changes in whitespace when finding context"
+msgstr ""
+"ignorar cambios en los espacios en blanco cuando se encuentra el contexto"
+
+#: apply.c:4969
+msgid "apply the patch in reverse"
+msgstr "aplicar el parche en reversa"
+
+#: apply.c:4971
+msgid "don't expect at least one line of context"
+msgstr "no espera al menos una línea del contexto"
+
+#: apply.c:4973
+msgid "leave the rejected hunks in corresponding *.rej files"
+msgstr "dejar los hunks rechazados en los archivos *.rej correspontientes"
+
+#: apply.c:4975
+msgid "allow overlapping hunks"
+msgstr "permitir solapamiento de hunks"
+
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
+msgid "be verbose"
+msgstr "ser verboso"
+
+#: apply.c:4978
+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:4981
+msgid "do not trust the line counts in the hunk headers"
+msgstr "no confiar en el conteo de líneas en los headers del hunk"
+
+#: apply.c:4983 builtin/am.c:2217
+msgid "root"
+msgstr "raiz"
+
+#: apply.c:4984
+msgid "prepend <root> to all filenames"
+msgstr "anteponer <root> a todos los nombres de archivos"
+
+#: archive.c:13
+msgid "git archive [<options>] <tree-ish> [<path>...]"
+msgstr "git archive [<opciones>] <parte-del-árbol> [<ruta>...]"
+
+#: archive.c:14
+msgid "git archive --list"
+msgstr "git archive --list"
+
+#: archive.c:15
+msgid ""
+"git archive --remote <repo> [--exec <cmd>] [<options>] <tree-ish> [<path>...]"
+msgstr ""
+"git archive --remote <repo> [--exec <comando> ] [<opciones>] <parte-del-"
+"árbol> [<ruta>...]"
+
+#: archive.c:16
+msgid "git archive --remote <repo> [--exec <cmd>] --list"
+msgstr "git archive --remote <repo> [--exec <comando>] --list"
+
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
+#, c-format
+msgid "pathspec '%s' did not match any files"
+msgstr "ruta especificada '%s' no concordó con ninguna carpeta"
+
+#: archive.c:436
+msgid "fmt"
+msgstr "fmt"
+
+#: archive.c:436
+msgid "archive format"
+msgstr "formato del archivo"
+
+#: archive.c:437 builtin/log.c:1459
+msgid "prefix"
+msgstr "prefijo"
+
+#: archive.c:438
+msgid "prepend prefix to each pathname in the archive"
+msgstr "anteponer prefijo a cada ruta en el archivo"
+
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
+#: parse-options.h:153
+msgid "file"
+msgstr "carpeta"
+
+#: archive.c:440 builtin/archive.c:89
+msgid "write the archive to this file"
+msgstr "escribe el archivo en esta carpeta"
+
+#: archive.c:442
+msgid "read .gitattributes in working directory"
+msgstr "leer .gitatributes en el directorio de trabajo"
+
+#: archive.c:443
+msgid "report archived files on stderr"
+msgstr "reportar archivos archivados por stderr"
+
+#: archive.c:444
+msgid "store only"
+msgstr "solo guardar"
+
+#: archive.c:445
+msgid "compress faster"
+msgstr "comprimir mas rapido"
+
+#: archive.c:453
+msgid "compress better"
+msgstr "comprimir mejor"
+
+#: archive.c:456
+msgid "list supported archive formats"
+msgstr "listar los formatos de carpeta soportados"
+
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
+msgid "repo"
+msgstr "repo"
+
+#: archive.c:459 builtin/archive.c:91
+msgid "retrieve the archive from remote repository <repo>"
+msgstr "obtener la carpeta del repositorio remoto <repo>"
+
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
+msgid "command"
+msgstr "comando"
+
+#: archive.c:461 builtin/archive.c:93
+msgid "path to the remote git-upload-archive command"
+msgstr "ruta para el comando git-upload-archivo remoto "
+
+#: archive.c:468
+msgid "Unexpected option --remote"
+msgstr "opción inesperada --remote"
+
+#: archive.c:470
+msgid "Option --exec can only be used together with --remote"
+msgstr "Opción --exec solo puede ser utilizada con --remote"
+
+#: archive.c:472
+msgid "Unexpected option --output"
+msgstr "Opción inesperada --output"
+
+#: archive.c:494
+#, c-format
+msgid "Unknown archive format '%s'"
+msgstr "Formato de carpeta desconocido '%s'"
+
+#: archive.c:501
+#, c-format
+msgid "Argument not supported for format '%s': -%d"
+msgstr "Argumento no soportado para formato '%s': -%d"
+
+#: attr.c:218
+#, c-format
+msgid "%.*s is not a valid attribute name"
+msgstr "%.*s no es un nombre de atributo valido"
+
+#: attr.c:415
+msgid ""
+"Negative patterns are ignored in git attributes\n"
+"Use '\\!' for literal leading exclamation."
+msgstr ""
+"Los patrones negativos son ignorados en los atributos de git\n"
+"Usa '\\!' para comenzar literalmente con exclamación."
+
+#: bisect.c:458
+#, c-format
+msgid "Badly quoted content in file '%s': %s"
+msgstr "Revisa las comillas en el archivo '%s': %s"
+
+#: bisect.c:666
+#, c-format
+msgid "We cannot bisect more!\n"
+msgstr "No podemos bisecar mas!\n"
+
+#: bisect.c:720
+#, c-format
+msgid "Not a valid commit name %s"
+msgstr "No es un nombre de commit valido %s"
+
+#: bisect.c:744
+#, c-format
+msgid ""
+"The merge base %s is bad.\n"
+"This means the bug has been fixed between %s and [%s].\n"
+msgstr ""
+"La base de fisión %s esta mal.\n"
+"Esto quiere decir que el bug ha sido arreglado enter %s y [%s].\n"
+
+#: bisect.c:749
+#, c-format
+msgid ""
+"The merge base %s is new.\n"
+"The property has changed between %s and [%s].\n"
+msgstr ""
+"La base de fisión %s es nueva.\n"
+"Esta propiedad ha cambiado entre %s y [%s].\n"
+
+#: bisect.c:754
+#, c-format
+msgid ""
+"The merge base %s is %s.\n"
+"This means the first '%s' commit is between %s and [%s].\n"
+msgstr ""
+"La base de fisión %s es %s.\n"
+"Esto quiere decir que el primer '%s' commit esta entre %s y [%s].\n"
+
+#: bisect.c:762
+#, 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 ""
+"Algunas %s revisiones no son ancestros de la revisión %s.\n"
+"git bisect no puede trabajar bien en este caso.\n"
+"Tal vez confundió la revisión %s y %s?\n"
+
+#: bisect.c:775
+#, 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 ""
+"la base de fusion entre %s y [%s] tiene que ser saltada.\n"
+"Asi que no podemos estar seguros que el primer %s commit esta entre%s y %s.\n"
+"Vamos a continuar de todas maneras."
+
+#: bisect.c:810
+#, c-format
+msgid "Bisecting: a merge base must be tested\n"
+msgstr "Bisectando: una base de fisión debe ser probada\n"
+
+#: bisect.c:862
+#, c-format
+msgid "a %s revision is needed"
+msgstr "una %s revisión es necesaria"
+
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
+#, c-format
+msgid "could not create file '%s'"
+msgstr "no se pudo crear el archivo '%s'"
+
+#: bisect.c:930
+#, c-format
+msgid "could not read file '%s'"
+msgstr "no se pudo leer el archivo '%s'"
+
+#: bisect.c:960
+msgid "reading bisect refs failed"
+msgstr "fallo leer las refs de bisect"
+
+#: bisect.c:979
+#, c-format
+msgid "%s was both %s and %s\n"
+msgstr "%s fue tanto %s como %s\n"
+
+#: bisect.c:987
+#, c-format
+msgid ""
+"No testable commit found.\n"
+"Maybe you started with bad path parameters?\n"
+msgstr ""
+"No se encontró commit que se pueda probar.\n"
+"¿Quizás iniciaste con parámetros de rutas incorrectos?\n"
+
+#: bisect.c:1006
+#, c-format
+msgid "(roughly %d step)"
+msgid_plural "(roughly %d steps)"
+msgstr[0] "(aproximadamente %d paso)"
+msgstr[1] "(aproximadamente %d pasos)"
+
+#. TRANSLATORS: the last %s will be replaced with "(roughly %d
+#. steps)" translation.
+#.
+#: bisect.c:1012
+#, 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] "Bisectando: falta %d revisión por probar después de esto %s\n"
+msgstr[1] "Bisectando: faltan %d revisiones por probar despues de esto %s\n"
+
+#: blame.c:1757
+msgid "--contents and --reverse do not blend well."
+msgstr "--contents y --reverse no se mezclan bien."
+
+#: blame.c:1768
+msgid "cannot use --contents with final commit object name"
+msgstr "no se puede usar --contents con el nombre de objeto commit final"
+
+#: blame.c:1788
+msgid "--reverse and --first-parent together require specified latest commit"
+msgstr ""
+"--reverse y --first-parent juntos requieren especificar el ultimo commit"
+
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
+msgid "revision walk setup failed"
+msgstr "fallo la configuración del camino de revisión"
+
+#: blame.c:1815
+msgid ""
+"--reverse --first-parent together require range along first-parent chain"
+msgstr ""
+"--reverse --first-parent jutnos requieren un rango a lo largo de la cadena "
+"del primer padre"
+
+#: blame.c:1826
+#, c-format
+msgid "no such path %s in %s"
+msgstr "no hay una ruta %s en %s"
+
+#: blame.c:1837
+#, c-format
+msgid "cannot read blob %s for path %s"
+msgstr "no se puede leer el blob %s para la ruta %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"
+"Tras arreglar la causa del error puedes intentar arreglar\n"
+"la infamación del rastreo remoto invocando\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 rama %s no se configura como su propio upstream."
+
+#: branch.c:93
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s' "
+"por rebase."
+
+#: branch.c:94
+#, c-format
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama remota '%s' de '%s'."
+
+#: branch.c:98
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la rama local '%s' por rebase."
+
+#: branch.c:99
+#, c-format
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Rama '%s' configurada para hacer seguimiento a la rama local '%s'."
+
+#: branch.c:104
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s' por "
+"rebase."
+
+#: branch.c:105
+#, c-format
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia remota '%s'."
+
+#: branch.c:109
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s' por "
+"rebase."
+
+#: branch.c:110
+#, c-format
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr ""
+"Rama '%s' configurada para hacer seguimiento a la referencia local '%s'."
+
+#: branch.c:119
+msgid "Unable to write upstream branch configuration"
+msgstr "No es posible escribir la configuración de la rama upstream"
+
+#: branch.c:156
+#, c-format
+msgid "Not tracking: ambiguous information for ref %s"
+msgstr "No rastreando: información ambigua para la referencia %s"
+
+#: branch.c:189
+#, c-format
+msgid "'%s' is not a valid branch name."
+msgstr "'%s' no es un nombre valido de rama."
+
+#: branch.c:208
+#, c-format
+msgid "A branch named '%s' already exists."
+msgstr "Una rama llamada '%s' ya existe."
+
+#: branch.c:213
+msgid "Cannot force update the current branch."
+msgstr "No se puede forzar la actualización de la rama actual."
+
+#: branch.c:233
+#, c-format
+msgid "Cannot setup tracking information; starting point '%s' is not a branch."
+msgstr ""
+"No se puede configurar el rastreo de información; el punto de partida '%s' "
+"no es una rama"
+
+#: branch.c:235
+#, c-format
+msgid "the requested upstream branch '%s' does not exist"
+msgstr "la rama de upstream solicitada '%s' no existe"
+
+#: branch.c:237
+msgid ""
+"\n"
+"If you are planning on basing your work on an upstream\n"
+"branch that already exists at the remote, you may need to\n"
+"run \"git fetch\" to retrieve it.\n"
+"\n"
+"If you are planning to push out a new local branch that\n"
+"will track its remote counterpart, you may want to use\n"
+"\"git push -u\" to set the upstream config as you push."
+msgstr ""
+"\n"
+"Si estas planeando basar tu trabajo en una rama upstream\n"
+"que ya existe en el remoto, tal vez necesites ejecutar\n"
+"\"git fetch\" para recibirla.\n"
+"\n"
+"Si estás planeando hacer push a una nueva rama local que\n"
+"va a rastrear a su contraparte remota, tal vez quieras usar\n"
+"\"git push -u\" para configurar tu upstream predeterminado cuando realizas "
+"el push."
+
+#: branch.c:280
+#, c-format
+msgid "Not a valid object name: '%s'."
+msgstr "Nombre de objeto no valido: '%s'."
+
+#: branch.c:300
+#, c-format
+msgid "Ambiguous object name: '%s'."
+msgstr "Nombre de objeto ambiguo: '%s'."
+
+#: branch.c:305
+#, c-format
+msgid "Not a valid branch point: '%s'."
+msgstr "Punto de rama no valido: '%s'."
+
+#: branch.c:359
+#, c-format
+msgid "'%s' is already checked out at '%s'"
+msgstr "'%s' ya ha sido marcado en '%s'"
+
+#: branch.c:382
+#, c-format
+msgid "HEAD of working tree %s is not updated"
+msgstr "la HEAD del árbol de trabajo %s no esta actualizada"
+
+#: bundle.c:34
+#, c-format
+msgid "'%s' does not look like a v2 bundle file"
+msgstr "'%s' no se ve como un archivo bundle v2"
+
+#: bundle.c:62
+#, c-format
+msgid "unrecognized header: %s%s (%d)"
+msgstr "header no reconocido %s%s (%d)"
+
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
+#, c-format
+msgid "could not open '%s'"
+msgstr "no se pudo abrir '%s'"
+
+#: bundle.c:140
+msgid "Repository lacks these prerequisite commits:"
+msgstr "Al repositorio le falta estos commits prerrequisito:"
+
+#: bundle.c:193
+#, c-format
+msgid "The bundle contains this ref:"
+msgid_plural "The bundle contains these %d refs:"
+msgstr[0] "El bundle contiene esta referencia:"
+msgstr[1] "El bundle contiene estas %d referencias:"
+
+#: bundle.c:200
+msgid "The bundle records a complete history."
+msgstr "El bundle registra una historia completa."
+
+#: bundle.c:202
+#, c-format
+msgid "The bundle requires this ref:"
+msgid_plural "The bundle requires these %d refs:"
+msgstr[0] "El bundle requiere esta referencia:"
+msgstr[1] "El bundle requiere estas %d referencias:"
+
+#: bundle.c:261
+msgid "Could not spawn pack-objects"
+msgstr "no se pudo engendrar el pack-objetcts"
+
+#: bundle.c:272
+msgid "pack-objects died"
+msgstr "pack-objects muerio"
+
+#: bundle.c:314
+msgid "rev-list died"
+msgstr "rev-list muerio"
+
+#: bundle.c:363
+#, c-format
+msgid "ref '%s' is excluded by the rev-list options"
+msgstr "referencia '%s' es excluida por las opciones de rev-list"
+
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
+#, c-format
+msgid "unrecognized argument: %s"
+msgstr "argumento no reconocido: %s"
+
+#: bundle.c:461
+msgid "Refusing to create empty bundle."
+msgstr "Rechazando crear un bundle vacio."
+
+#: bundle.c:473
+#, c-format
+msgid "cannot create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: bundle.c:501
+msgid "index-pack died"
+msgstr "index-pack murio"
+
+#: color.c:301
+#, c-format
+msgid "invalid color value: %.*s"
+msgstr "color inválido: %.*s"
+
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
+#, c-format
+msgid "could not parse %s"
+msgstr "no se puede analizar %s"
+
+#: commit.c:43
+#, c-format
+msgid "%s %s is not a commit!"
+msgstr "%s %s no es un commit!"
+
+#: commit.c:1524
+msgid ""
+"Warning: commit message did not conform to UTF-8.\n"
+"You may want to amend it after fixing the message, or set the config\n"
+"variable i18n.commitencoding to the encoding your project uses.\n"
+msgstr ""
+"Peligro: el mensaje del commit no se ajusta a UTF-8.\n"
+"Tal vez quiera enmendarlo después de arreglar el mensaje, o arreglar la\n"
+"variable de configuración i18n.commitencoding para la codificación que usa "
+"su proyecto.\n"
+
+#: compat/obstack.c:405 compat/obstack.c:407
+msgid "memory exhausted"
+msgstr "memoria agotada"
+
+#: config.c:186
+msgid "relative config include conditionals must come from files"
+msgstr ""
+"la configuración relativa incluye condicionales que deben venir de archivos"
+
+#: config.c:720
+#, c-format
+msgid "bad config line %d in blob %s"
+msgstr "mala línea de config %d en el blob %s"
+
+#: config.c:724
+#, c-format
+msgid "bad config line %d in file %s"
+msgstr "mala línea de config %d en el archivo %s"
+
+#: config.c:728
+#, c-format
+msgid "bad config line %d in standard input"
+msgstr "mala línea de config %d en la entrada standard"
+
+#: config.c:732
+#, c-format
+msgid "bad config line %d in submodule-blob %s"
+msgstr "mala línea de config %d en el submodulo-blob %s"
+
+#: config.c:736
+#, 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:740
+#, c-format
+msgid "bad config line %d in %s"
+msgstr "mala línea de config %d en %s"
+
+#: config.c:868
+msgid "out of range"
+msgstr "fuera de rango"
+
+#: config.c:868
+msgid "invalid unit"
+msgstr "unidad invalida"
+
+#: config.c:874
+#, c-format
+msgid "bad numeric config value '%s' for '%s': %s"
+msgstr "mal valor de config numérica '%s' para '%s': %s"
+
+#: config.c:879
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in blob %s: %s"
+msgstr "mal valor de config numérica '%s' para '%s' en el blob %s: %s"
+
+#: config.c:882
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in file %s: %s"
+msgstr "mal valor de config numérica '%s' para '%s' en el archivo %s: %s"
+
+#: config.c:885
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in standard input: %s"
+msgstr "mal valor de config numérica '%s' para '%s' en la entrada standard: %s"
+
+#: config.c:888
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in submodule-blob %s: %s"
+msgstr ""
+"mal valor de config numérica '%s' para '%s' en el submodulo-blob %s: %s"
+
+#: config.c:891
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in command line %s: %s"
+msgstr ""
+"mal valor de config numérica '%s' para '%s' en la línea de comando %s: %s"
+
+#: config.c:894
+#, c-format
+msgid "bad numeric config value '%s' for '%s' in %s: %s"
+msgstr "mal valor de config numérica '%s' para '%s' en %s: %s"
+
+#: config.c:989
+#, c-format
+msgid "failed to expand user dir in: '%s'"
+msgstr "fallo al expandir el directorio de usuario en: '%s'"
+
+#: config.c:998
+#, 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:1094 config.c:1105
+#, c-format
+msgid "bad zlib compression level %d"
+msgstr "mala compresión zlib en nivel %d"
+
+#: config.c:1222
+#, c-format
+msgid "invalid mode for object creation: %s"
+msgstr "modo invalido de creación de objetos: %s"
+
+#: config.c:1378
+#, c-format
+msgid "bad pack compression level %d"
+msgstr "mala compresión pack en el nivel %d"
+
+#: config.c:1574
+msgid "unable to parse command-line config"
+msgstr "no es posible analizar la configuración de la línea de comando"
+
+#: config.c:1906
+msgid "unknown error occurred while reading the configuration files"
+msgstr ""
+"error desconocido ocurrió mientras se leían los archivos de configuración"
+
+#: config.c:2093
+#, c-format
+msgid "Invalid %s: '%s'"
+msgstr "Invalido %s: '%s'"
+
+#: config.c:2136
+#, c-format
+msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
+msgstr ""
+"valor core.untrackedCache '%s' desconocido; usando valor por defecto 'keep'"
+
+#: config.c:2162
+#, 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:2187
+#, 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:2189
+#, 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:2248
+#, c-format
+msgid "%s has multiple values"
+msgstr "%s tiene múltiples valores"
+
+#: config.c:2591 config.c:2808
+#, c-format
+msgid "fstat on %s failed"
+msgstr "fstat en %s fallo"
+
+#: config.c:2698
+#, c-format
+msgid "could not set '%s' to '%s'"
+msgstr "no se pudo configurar '%s' a '%s'"
+
+#: config.c:2700 builtin/remote.c:776
+#, c-format
+msgid "could not unset '%s'"
+msgstr "no se pudo desactivar '%s'"
+
+#: connect.c:52
+msgid "The remote end hung up upon initial contact"
+msgstr "El remoto se colgó en el contacto inicial"
+
+#: connect.c:54
+msgid ""
+"Could not read from remote repository.\n"
+"\n"
+"Please make sure you have the correct access rights\n"
+"and the repository exists."
+msgstr ""
+"No se pudo leer del repositorio remoto.\n"
+"\n"
+"Por favor asegúrese que tiene los permisos de acceso correctos\n"
+"y que el repositorio existe."
+
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
+msgid "Checking connectivity"
+msgstr "Verificando conectividad"
+
+#: connected.c:76
+msgid "Could not run 'git rev-list'"
+msgstr "No se pudo correr 'git rev-list'"
+
+#: connected.c:96
+msgid "failed write to rev-list"
+msgstr "fallo escribir a rev-list"
+
+#: connected.c:103
+msgid "failed to close rev-list's stdin"
+msgstr "fallo al cerrar la entrada standard de rev-list"
+
+#: convert.c:205
+#, 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 sera remplazado por LF en %s.\n"
+"El archivo tendrá sus finales de línea originales en tu directorio de "
+"trabajo."
+
+#: convert.c:209
+#, c-format
+msgid "CRLF would be replaced by LF in %s."
+msgstr "CRLF sera remplazado por LF en %s."
+
+#: convert.c:215
+#, 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 sera reemplazado por CRLF en %s.\n"
+"El archivo tendrá sus finales de línea originales en tu directorio de "
+"trabajo."
+
+#: convert.c:219
+#, c-format
+msgid "LF would be replaced by CRLF in %s"
+msgstr "LF sera reemplazado por CRLF en %s"
+
+#: date.c:116
+msgid "in the future"
+msgstr "en el futuro"
+
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "hace %<PRIuMAX> segundo"
+msgstr[1] "hace %<PRIuMAX> segundos"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "hace %<PRIuMAX> minuto"
+msgstr[1] "hace %<PRIuMAX> minutos"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "hace %<PRIuMAX> hora"
+msgstr[1] "hace %<PRIuMAX> horas"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "hace %<PRIuMAX> día"
+msgstr[1] "hace %<PRIuMAX> días"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "hace %<PRIuMAX> semana"
+msgstr[1] "hace %<PRIuMAX> semanas"
+
+#: date.c:156
+#, c-format
+msgid "%<PRIuMAX> month ago"
+msgid_plural "%<PRIuMAX> months ago"
+msgstr[0] "hace %<PRIuMAX> mes"
+msgstr[1] "hace %<PRIuMAX> meses"
+
+#: date.c:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> año"
+msgstr[1] "%<PRIuMAX> años"
+
+#. TRANSLATORS: "%s" is "<n> years"
+#: date.c:170
+#, c-format
+msgid "%s, %<PRIuMAX> month ago"
+msgid_plural "%s, %<PRIuMAX> months ago"
+msgstr[0] "%s, y %<PRIuMAX> mes atrás"
+msgstr[1] "%s, y %<PRIuMAX> meses atrás"
+
+#: date.c:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "hace %<PRIuMAX> año"
+msgstr[1] "hace %<PRIuMAX> años"
+
+#: diffcore-order.c:24
+#, c-format
+msgid "failed to read orderfile '%s'"
+msgstr "fallo al leer orden de archivos '%s'"
+
+#: diffcore-rename.c:535
+msgid "Performing inexact rename detection"
+msgstr "Realizando una detección de cambios de nombre inexacta"
+
+#: diff.c:74
+#, c-format
+msgid "option '%s' requires a value"
+msgstr "opción '%s' requiere un valor"
+
+#: diff.c:152
+#, c-format
+msgid " Failed to parse dirstat cut-off percentage '%s'\n"
+msgstr " Fallo al analizar dirstat porcentaje de corte '%s'\n"
+
+#: diff.c:157
+#, c-format
+msgid " Unknown dirstat parameter '%s'\n"
+msgstr " parámetro '%s' de dirstat desconocido\n"
+
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"opción de color debe ser una entre 'no', 'default', 'zebra', 'dimmed_zebra, "
+"'plain'"
+
+#: diff.c:341
+#, c-format
+msgid "Unknown value for 'diff.submodule' config variable: '%s'"
+msgstr "valor para la variable de config 'diff.submodule' desconocido: '%s'"
+
+#: diff.c:401
+#, c-format
+msgid ""
+"Found errors in 'diff.dirstat' config variable:\n"
+"%s"
+msgstr ""
+"Errores en la variable de config 'diff.dirstat' encontrados:\n"
+"%s"
+
+#: diff.c:3799
+#, c-format
+msgid "external diff died, stopping at %s"
+msgstr "digg externo murió, deteniendo en %s"
+
+#: diff.c:4127
+msgid "--name-only, --name-status, --check and -s are mutually exclusive"
+msgstr "--name-only, --name-status, --check y -s son mutuamente exclusivas"
+
+#: diff.c:4215
+msgid "--follow requires exactly one pathspec"
+msgstr "--follow requiere exactamente un pathspec"
+
+#: diff.c:4381
+#, c-format
+msgid ""
+"Failed to parse --dirstat/-X option parameter:\n"
+"%s"
+msgstr ""
+"Fallo al analizar parámetro de opción --dirstat/-X:\n"
+"%s"
+
+#: diff.c:4395
+#, c-format
+msgid "Failed to parse --submodule option parameter: '%s'"
+msgstr "Fallo al analizar parámetro de opción --submodule: '%s'"
+
+#: diff.c:5446
+msgid "inexact rename detection was skipped due to too many files."
+msgstr ""
+"detección de cambio de nombre inexacta fue saltada por haber muchos archivos"
+
+#: diff.c:5449
+msgid "only found copies from modified paths due to too many files."
+msgstr ""
+"solo se encontraron copias de rutas modificadas por haber muchos archivos"
+
+#: diff.c:5452
+#, c-format
+msgid ""
+"you may want to set your %s variable to at least %d and retry the command."
+msgstr ""
+"tal vez quiera configurar la variable %s para por lo menos %d y volver a "
+"intentar el comando."
+
+#: dir.c:2100
+msgid "failed to get kernel name and information"
+msgstr "fallo al conseguir la información y nombre del kernel"
+
+#: dir.c:2219
+msgid "Untracked cache is disabled on this system or location."
+msgstr "Untracked cache esta desactivado en este sistema o ubicación"
+
+#: dir.c:3002 dir.c:3007
+#, c-format
+msgid "could not create directories for %s"
+msgstr "no se pudo crear directorios para %s"
+
+#: dir.c:3032
+#, 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:61
+#, 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:177
+msgid "Filtering content"
+msgstr "Filtrando contenido"
+
+#: entry.c:435
+#, c-format
+msgid "could not stat file '%s'"
+msgstr "no se pudo establecer el archivo '%s'"
+
+#: fetch-pack.c:252
+msgid "git fetch-pack: expected shallow list"
+msgstr "git fetch-pack: lista poco profunda esperada"
+
+#: fetch-pack.c:264
+msgid "git fetch-pack: expected ACK/NAK, got EOF"
+msgstr "git getch-pack: se esperaba ACK/NAK, se obtuvo EOF"
+
+#: fetch-pack.c:283 builtin/archive.c:63
+#, c-format
+msgid "remote error: %s"
+msgstr "error remoto: %s"
+
+#: fetch-pack.c:284
+#, 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:336
+msgid "--stateless-rpc requires multi_ack_detailed"
+msgstr "--stateless-rpc requiere multi_ack_detailed"
+
+#: fetch-pack.c:422
+#, c-format
+msgid "invalid shallow line: %s"
+msgstr "línea poco profunda invalida: %s"
+
+#: fetch-pack.c:428
+#, c-format
+msgid "invalid unshallow line: %s"
+msgstr "línea superficial inválida: %s"
+
+#: fetch-pack.c:430
+#, c-format
+msgid "object not found: %s"
+msgstr "objeto no encontrado: %s"
+
+#: fetch-pack.c:433
+#, c-format
+msgid "error in object: %s"
+msgstr "error en objeto: %s"
+
+#: fetch-pack.c:435
+#, c-format
+msgid "no shallow found: %s"
+msgstr "superficie no encontrada: %s"
+
+#: fetch-pack.c:438
+#, c-format
+msgid "expected shallow/unshallow, got %s"
+msgstr "se esperaba shallow/unshallow, se obtuvo %s"
+
+#: fetch-pack.c:477
+#, c-format
+msgid "got %s %d %s"
+msgstr "se obtuvo %s %d %s"
+
+#: fetch-pack.c:491
+#, c-format
+msgid "invalid commit %s"
+msgstr "commit inválido %s"
+
+#: fetch-pack.c:524
+msgid "giving up"
+msgstr "rindiendose"
+
+#: fetch-pack.c:534 progress.c:229
+msgid "done"
+msgstr "listo"
+
+#: fetch-pack.c:546
+#, c-format
+msgid "got %s (%d) %s"
+msgstr "se obtuvo %s (%d) %s"
+
+#: fetch-pack.c:592
+#, c-format
+msgid "Marking %s as complete"
+msgstr "Marcando %s como completa"
+
+#: fetch-pack.c:777
+#, c-format
+msgid "already have %s (%s)"
+msgstr "ya se tiene %s (%s)"
+
+#: fetch-pack.c:815
+msgid "fetch-pack: unable to fork off sideband demultiplexer"
+msgstr "fetch-pack: no se puede extraer un demultiplexor de banda lateral"
+
+#: fetch-pack.c:823
+msgid "protocol error: bad pack header"
+msgstr "error de protocolo: mal paquete de header"
+
+#: fetch-pack.c:879
+#, c-format
+msgid "fetch-pack: unable to fork off %s"
+msgstr "fetch-pack: no se puede quitar %s"
+
+#: fetch-pack.c:895
+#, c-format
+msgid "%s failed"
+msgstr "%s fallo"
+
+#: fetch-pack.c:897
+msgid "error in sideband demultiplexer"
+msgstr "error en demultiplexor de banda lateral"
+
+#: fetch-pack.c:924
+msgid "Server does not support shallow clients"
+msgstr "Servidor no soporta clientes superficiales"
+
+#: fetch-pack.c:928
+msgid "Server supports multi_ack_detailed"
+msgstr "Servidor soporta ulti_ack_detailed"
+
+#: fetch-pack.c:931
+msgid "Server supports no-done"
+msgstr "Servidor soporta no-done"
+
+#: fetch-pack.c:937
+msgid "Server supports multi_ack"
+msgstr "Servidor soporta multi_ack"
+
+#: fetch-pack.c:941
+msgid "Server supports side-band-64k"
+msgstr "Servidor soporta side-band-64k"
+
+#: fetch-pack.c:945
+msgid "Server supports side-band"
+msgstr "Servidor soporta side-band"
+
+#: fetch-pack.c:949
+msgid "Server supports allow-tip-sha1-in-want"
+msgstr "Servidor soporta allow-tip-sha1-in-want"
+
+#: fetch-pack.c:953
+msgid "Server supports allow-reachable-sha1-in-want"
+msgstr "Servidor soporta allow-reachable-sha1-in-want"
+
+#: fetch-pack.c:963
+msgid "Server supports ofs-delta"
+msgstr "Servidor soporta ofs-delta"
+
+#: fetch-pack.c:970
+#, c-format
+msgid "Server version is %.*s"
+msgstr "Versión de servidor es %.*s"
+
+#: fetch-pack.c:976
+msgid "Server does not support --shallow-since"
+msgstr "Servidor no soporta --shalow-since"
+
+#: fetch-pack.c:980
+msgid "Server does not support --shallow-exclude"
+msgstr "Servidor no soporta --shalow-exclude"
+
+#: fetch-pack.c:982
+msgid "Server does not support --deepen"
+msgstr "Servidor no soporta --deepen"
+
+#: fetch-pack.c:993
+msgid "no common commits"
+msgstr "no hay commits comunes"
+
+#: fetch-pack.c:1005
+msgid "git fetch-pack: fetch failed."
+msgstr "git fetch-pack: fetch fallo"
+
+#: fetch-pack.c:1167
+msgid "no matching remote head"
+msgstr "no concuerda el head remoto"
+
+#: fetch-pack.c:1189
+#, c-format
+msgid "no such remote ref %s"
+msgstr "no existe ref remota %s"
+
+#: fetch-pack.c:1192
+#, c-format
+msgid "Server does not allow request for unadvertised object %s"
+msgstr "Servidor no permite solicitudes de objetos inadvertidos %s"
+
+#: gpg-interface.c:181
+msgid "gpg failed to sign the data"
+msgstr "gpg fallo al firmar la data"
+
+#: gpg-interface.c:211
+msgid "could not create temporary file"
+msgstr "no se pudo crear archivo temporal"
+
+#: gpg-interface.c:214
+#, c-format
+msgid "failed writing detached signature to '%s'"
+msgstr "fallo al escribir la firma separada para '%s'"
+
+#: graph.c:97
+#, c-format
+msgid "ignore invalid color '%.*s' in log.graphColors"
+msgstr "ignora color invalido '%.*s' en log.graphColors"
+
+#: grep.c:2017
+#, c-format
+msgid "'%s': unable to read %s"
+msgstr "'%s': no es posible leer %s"
+
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
+#, c-format
+msgid "failed to stat '%s'"
+msgstr "fallo al marcar '%s'"
+
+#: grep.c:2045
+#, c-format
+msgid "'%s': short read"
+msgstr "'%s': lectura corta"
+
+#: help.c:179
+#, c-format
+msgid "available git commands in '%s'"
+msgstr "comandos disponibles de git en '%s'"
+
+#: help.c:186
+msgid "git commands available from elsewhere on your $PATH"
+msgstr "comandos disponibles de git desde otro lugar en tu $PATH"
+
+#: help.c:217
+msgid "These are common Git commands used in various situations:"
+msgstr "Estos son comandos comunes de Git usados en varias situaciones:"
+
+#: help.c:281
+#, c-format
+msgid ""
+"'%s' appears to be a git command, but we were not\n"
+"able to execute it. Maybe git-%s is broken?"
+msgstr ""
+"'%s' parece ser un comando de git, pero no hemos\n"
+"podido ejecutarlo. Tal vez git-%s se ha roto?"
+
+#: help.c:336
+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:358
+#, 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:363
+#, c-format
+msgid "Continuing under the assumption that you meant '%s'."
+msgstr "Continuando asumiendo que quisiste decir '%s'."
+
+#: help.c:368
+#, c-format
+msgid "Continuing in %0.1f seconds, assuming that you meant '%s'."
+msgstr "Continuando en %0.1f segundos, asumiendo que tu dijiste '%s'."
+
+#: help.c:376
+#, 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:380
+msgid ""
+"\n"
+"The most similar command is"
+msgid_plural ""
+"\n"
+"The most similar commands are"
+msgstr[0] ""
+"\n"
+"El comando mas similar es"
+msgstr[1] ""
+"\n"
+"Los comandos mas similares son"
+
+#: help.c:395
+msgid "git version [<options>]"
+msgstr "git versión [<opciones>]"
+
+#: help.c:462
+#, c-format
+msgid "%s: %s - %s"
+msgstr "%s: %s - %s"
+
+#: help.c:466
+msgid ""
+"\n"
+"Did you mean this?"
+msgid_plural ""
+"\n"
+"Did you mean one of these?"
+msgstr[0] ""
+"\n"
+"Quisiste decir esto?"
+msgstr[1] ""
+"\n"
+"Quisiste decir alguno de estos?"
+
+#: ident.c:342
+msgid ""
+"\n"
+"*** Please tell me who you are.\n"
+"\n"
+"Run\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Your Name\"\n"
+"\n"
+"to set your account's default identity.\n"
+"Omit --global to set the identity only in this repository.\n"
+"\n"
+msgstr ""
+"\n"
+"*** Por favor cuéntame quien eres.\n"
+"\n"
+"Corre\n"
+"\n"
+" git config --global user.email \"you@example.com\"\n"
+" git config --global user.name \"Tu Nombre\"\n"
+"\n"
+"para configurar la identidad por defecto de tu cuenta.\n"
+"Omite --global para configurar tu identidad solo en este repositorio.\n"
+"\n"
+
+#: ident.c:366
+msgid "no email was given and auto-detection is disabled"
+msgstr "no se entrego ningún email y la detección automática esta desactivada"
+
+#: ident.c:371
+#, c-format
+msgid "unable to auto-detect email address (got '%s')"
+msgstr "no es posible auto-detectar la dirección de correo (se obtuvo '%s')"
+
+#: ident.c:381
+msgid "no name was given and auto-detection is disabled"
+msgstr "no se entrego ningún nombre y la detección automática esta desactivada"
+
+#: ident.c:387
+#, c-format
+msgid "unable to auto-detect name (got '%s')"
+msgstr "no es posible auto-detectar el nombre (se obtuvo '%s')"
+
+#: ident.c:395
+#, c-format
+msgid "empty ident name (for <%s>) not allowed"
+msgstr "no se puede tener un nombre vacío (para <%s>)"
+
+#: ident.c:401
+#, c-format
+msgid "name consists only of disallowed characters: %s"
+msgstr "el nombre consiste solo de caracteres no permitidos: %s"
+
+#: ident.c:416 builtin/commit.c:616
+#, c-format
+msgid "invalid date format: %s"
+msgstr "formato de fecha invalido: %s"
+
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "no se pueden combinar múltiples tipos de objeto filtro"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "expresión filter-spec inválida '%s'"
+
+#: lockfile.c:151
+#, c-format
+msgid ""
+"Unable to create '%s.lock': %s.\n"
+"\n"
+"Another git process seems to be running in this repository, e.g.\n"
+"an editor opened by 'git commit'. Please make sure all processes\n"
+"are terminated then try again. If it still fails, a git process\n"
+"may have crashed in this repository earlier:\n"
+"remove the file manually to continue."
+msgstr ""
+"No se puede crear '%s.lock': %s.\n"
+"\n"
+"Otro proceso git parece estar corriendo en el repositorio, es decir\n"
+"un editor abierto con 'git commit'. Por favor asegúrese 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"
+"borra el archivo manualmente para continuar."
+
+#: lockfile.c:159
+#, c-format
+msgid "Unable to create '%s.lock': %s"
+msgstr "No se pudo crear '%s.lock': %s"
+
+#: merge.c:74
+msgid "failed to read the cache"
+msgstr "fallo al leer la cache"
+
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
+msgid "unable to write new index file"
+msgstr "no es posible escribir el archivo indice"
+
+#: merge-recursive.c:235
+msgid "(bad commit)\n"
+msgstr "(mal commit)\n"
+
+#: merge-recursive.c:257 merge-recursive.c:265
+#, c-format
+msgid "addinfo_cache failed for path '%s'"
+msgstr "addinfo_cache fallo para la ruta '%s'"
+
+#: merge-recursive.c:329
+msgid "error building trees"
+msgstr "error construyendo árboles"
+
+#: merge-recursive.c:752
+#, c-format
+msgid "failed to create path '%s'%s"
+msgstr "fallo al crear la ruta '%s'%s"
+
+#: merge-recursive.c:763
+#, c-format
+msgid "Removing %s to make room for subdirectory\n"
+msgstr "Removiendo %s para hacer espacio para un subdirectorio\n"
+
+#: merge-recursive.c:777 merge-recursive.c:796
+msgid ": perhaps a D/F conflict?"
+msgstr ": tal vez un conflicto D/F?"
+
+#: merge-recursive.c:786
+#, c-format
+msgid "refusing to lose untracked file at '%s'"
+msgstr "rehusando perder el archivo rastreado en '%s'"
+
+#: merge-recursive.c:828 builtin/cat-file.c:37
+#, c-format
+msgid "cannot read object %s '%s'"
+msgstr "no se puede leer el objeto %s '%s'"
+
+#: merge-recursive.c:830
+#, c-format
+msgid "blob expected for %s '%s'"
+msgstr "se esperaba blob para %s '%s'"
+
+#: merge-recursive.c:854
+#, c-format
+msgid "failed to open '%s': %s"
+msgstr "fallo al abrir '%s': %s"
+
+#: merge-recursive.c:865
+#, c-format
+msgid "failed to symlink '%s': %s"
+msgstr "fallo al crear el enlace simbólico '%s': %s"
+
+#: merge-recursive.c:870
+#, c-format
+msgid "do not know what to do with %06o %s '%s'"
+msgstr "no se que hacer con %06o %s '%s'"
+
+#: merge-recursive.c:1010
+msgid "Failed to execute internal merge"
+msgstr "Fallo al ejecutar la fusión interna"
+
+#: merge-recursive.c:1014
+#, c-format
+msgid "Unable to add %s to database"
+msgstr "No es posible agregar %s a la base de datos"
+
+#: merge-recursive.c:1117
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s en %s. Falta versión %s de %s "
+"en el árbol"
+
+#: merge-recursive.c:1122
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
+"left in tree."
+msgstr ""
+"CONFLICTO (%s/borrar): %s borrado en %s y %s para %s en %s. Versión %s de %s "
+"permanece en el árbol"
+
+#: merge-recursive.c:1129
+#, c-format
+msgid ""
+"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
+"in tree at %s."
+msgstr ""
+"CONFLICTO (%s/eliminar): %s eliminado en %s y %s en %s. Versión %s de %s "
+"dejada en el árbol, en %s."
+
+#: merge-recursive.c:1134
+#, 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 ""
+"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:1168
+msgid "rename"
+msgstr "renombrar"
+
+#: merge-recursive.c:1168
+msgid "renamed"
+msgstr "renombrado"
+
+#: merge-recursive.c:1225
+#, 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:1250
+#, c-format
+msgid ""
+"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
+"\"->\"%s\" in \"%s\"%s"
+msgstr ""
+"CONFLICTO (renombrar/renombrar): Renombrar \"%s\"->\"%s\" en la rama \"%s\" "
+"renombrar \"%s\"->\"%s\" en \"%s\"%s"
+
+#: merge-recursive.c:1255
+msgid " (left unresolved)"
+msgstr " (dejado sin resolver)"
+
+#: merge-recursive.c:1317
+#, 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:1350
+#, c-format
+msgid "Renaming %s to %s and %s to %s instead"
+msgstr "Renombrando %s a %s y %s a %s más bien"
+
+#: merge-recursive.c:1553
+#, c-format
+msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
+msgstr ""
+"CONFLICTO (renombrar/agregar): Renombrar %s->%s en %s. %s agregado en %s"
+
+#: merge-recursive.c:1568
+#, c-format
+msgid "Adding merged %s"
+msgstr "Agregar %s fusionado"
+
+#: merge-recursive.c:1575 merge-recursive.c:1805
+#, c-format
+msgid "Adding as %s instead"
+msgstr "Agregando más bien como %s"
+
+#: merge-recursive.c:1632
+#, c-format
+msgid "cannot read object %s"
+msgstr "no se pudo leer el objeto %s"
+
+#: merge-recursive.c:1635
+#, c-format
+msgid "object %s is not a blob"
+msgstr "objeto %s no es un blob"
+
+#: merge-recursive.c:1704
+msgid "modify"
+msgstr "modificar"
+
+#: merge-recursive.c:1704
+msgid "modified"
+msgstr "modificado"
+
+#: merge-recursive.c:1714
+msgid "content"
+msgstr "contenido"
+
+#: merge-recursive.c:1721
+msgid "add/add"
+msgstr "agregar/agregar"
+
+#: merge-recursive.c:1757
+#, c-format
+msgid "Skipped %s (merged same as existing)"
+msgstr "Saltado %s (fusionado como existente)"
+
+#: merge-recursive.c:1771
+#, c-format
+msgid "Auto-merging %s"
+msgstr "Auto-fusionando %s"
+
+#: merge-recursive.c:1775 git-submodule.sh:932
+msgid "submodule"
+msgstr "submódulo"
+
+#: merge-recursive.c:1776
+#, c-format
+msgid "CONFLICT (%s): Merge conflict in %s"
+msgstr "CONFLICTO (%s): Conflicto de fusión en %s"
+
+#: merge-recursive.c:1870
+#, c-format
+msgid "Removing %s"
+msgstr "Eliminando %s"
+
+#: merge-recursive.c:1896
+msgid "file/directory"
+msgstr "archivo/directorio"
+
+#: merge-recursive.c:1902
+msgid "directory/file"
+msgstr "directorio/archivo"
+
+#: merge-recursive.c:1909
+#, 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:1918
+#, c-format
+msgid "Adding %s"
+msgstr "Agregando %s"
+
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Índice sucio: no se puede fusionar (sucio: %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
+msgstr "¡Ya está actualizado!"
+
+#: merge-recursive.c:1971
+#, c-format
+msgid "merging of trees %s and %s failed"
+msgstr "falló la fusión de los árboles %s y %s"
+
+#: merge-recursive.c:2068
+msgid "Merging:"
+msgstr "Fusionando:"
+
+#: merge-recursive.c:2081
+#, 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:2120
+msgid "merge returned no commit"
+msgstr "la fusión no devolvió ningun commit"
+
+#: merge-recursive.c:2183
+#, c-format
+msgid "Could not parse object '%s'"
+msgstr "No se pudo analizar el objeto '%s'"
+
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
+msgid "Unable to write index."
+msgstr "Incapaz de escribir el índice."
+
+#: notes-merge.c:272
+#, 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 ""
+"No has concluido tus notas previas de fusión (%s existe).\n"
+"Por favor, usa 'git notes merge --commit' o 'git notes merge --abort' para "
+"confirmar/abortar la fusión previa antes de que puedas comenzar una nueva "
+"nota de fusión."
+
+#: notes-merge.c:279
+#, c-format
+msgid "You have not concluded your notes merge (%s exists)."
+msgstr "No has terminado tus notas de fusión (%s existe)."
+
+#: notes-utils.c:42
+msgid "Cannot commit uninitialized/unreferenced notes tree"
+msgstr ""
+"No se puede realizar commit, notas del árbol no inicializadas o no "
+"referenciadas."
+
+#: notes-utils.c:101
+#, c-format
+msgid "Bad notes.rewriteMode value: '%s'"
+msgstr "Mal valor para notes.rewriteMode: '%s'"
+
+#: notes-utils.c:111
+#, c-format
+msgid "Refusing to rewrite notes in %s (outside of refs/notes/)"
+msgstr "Rehusando reescribir notas en %s (fuera de refs/notes/)"
+
+#. TRANSLATORS: The first %s is the name of
+#. the environment variable, the second %s is
+#. its value.
+#.
+#: notes-utils.c:141
+#, c-format
+msgid "Bad %s value: '%s'"
+msgstr "Mal valor para %s: '%s'"
+
+#: object.c:239
+#, c-format
+msgid "unable to parse object: %s"
+msgstr "incapaz de analizar objeto: %s"
+
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset antes del final del paquete (broken .idx?)"
+
+#: packfile.c:1683
+#, 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:1687
+#, 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.c:573
+msgid "..."
+msgstr "..."
+
+#: parse-options.c:592
+#, c-format
+msgid "usage: %s"
+msgstr "uso: %s"
+
+#. TRANSLATORS: the colon here should align with the
+#. one in "usage: %s" translation.
+#.
+#: parse-options.c:598
+#, c-format
+msgid " or: %s"
+msgstr " o: %s"
+
+#: parse-options.c:601
+#, c-format
+msgid " %s"
+msgstr " %s"
+
+#: parse-options.c:640
+msgid "-NUM"
+msgstr "-NUM"
+
+#: parse-options-cb.c:108
+#, c-format
+msgid "malformed object name '%s'"
+msgstr "nombre de objeto malformado '%s'"
+
+#: path.c:891
+#, c-format
+msgid "Could not make %s writable by group"
+msgstr "No se pudo hacer que %s fuera escribible por el grupo"
+
+#: pathspec.c:129
+msgid "Escape character '\\' not allowed as last character in attr value"
+msgstr ""
+"Carácter de escape '\\' no permitido como ultimo carácter en el valor attr"
+
+#: pathspec.c:147
+msgid "Only one 'attr:' specification is allowed."
+msgstr "Solo una especificación 'attr' es permitida."
+
+#: pathspec.c:150
+msgid "attr spec must not be empty"
+msgstr "especificación attr no puede estar vacia"
+
+#: pathspec.c:193
+#, c-format
+msgid "invalid attribute name %s"
+msgstr "nombre de atributo %s invalido"
+
+#: pathspec.c:258
+msgid "global 'glob' and 'noglob' pathspec settings are incompatible"
+msgstr ""
+"configuraciones globales de pathspec 'glob' y 'noglob' son incompatibles "
+
+#: pathspec.c:265
+msgid ""
+"global 'literal' pathspec setting is incompatible with all other global "
+"pathspec settings"
+msgstr ""
+"la configuración global de 'literal' para patrones de ruta es incompatible "
+"con las demás configuraciones globales de patrones de ruta"
+
+#: pathspec.c:305
+msgid "invalid parameter for pathspec magic 'prefix'"
+msgstr "parámetro no válido para el prefijo 'magic pathspec'"
+
+#: pathspec.c:326
+#, c-format
+msgid "Invalid pathspec magic '%.*s' in '%s'"
+msgstr "magic pathspec invalido '%.*s' en '%s'"
+
+#: pathspec.c:331
+#, c-format
+msgid "Missing ')' at the end of pathspec magic in '%s'"
+msgstr "Falta ')' al final del magic pathspec en '%s'"
+
+#: pathspec.c:369
+#, c-format
+msgid "Unimplemented pathspec magic '%c' in '%s'"
+msgstr "Magic pathspec '%c' en '%s' no implementado"
+
+#: pathspec.c:428
+#, c-format
+msgid "%s: 'literal' and 'glob' are incompatible"
+msgstr "%s: 'literal' y 'glob' son incompatibles"
+
+#: pathspec.c:441
+#, c-format
+msgid "%s: '%s' is outside repository"
+msgstr "%s: '%s' está fuera del repositorio"
+
+#: pathspec.c:515
+#, c-format
+msgid "'%s' (mnemonic: '%c')"
+msgstr "'%s' (nemotecnico: '%c')"
+
+#: pathspec.c:525
+#, c-format
+msgid "%s: pathspec magic not supported by this command: %s"
+msgstr "%s: magic pathspec no soportado por este comando: %s"
+
+#: pathspec.c:592
+#, 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"
+
+#: pretty.c:962
+msgid "unable to parse --pretty format"
+msgstr "incapaz de analizar el formato --pretty"
+
+#: read-cache.c:1472
+#, c-format
+msgid ""
+"index.version set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"index.version configurado, pero el valor no es válido.\n"
+"Usando versión %i"
+
+#: read-cache.c:1482
+#, c-format
+msgid ""
+"GIT_INDEX_VERSION set, but the value is invalid.\n"
+"Using version %i"
+msgstr ""
+"GIT_INDEX_VERSION configurado, pero el valor no es válido.\n"
+"Usando versión %i"
+
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
+#, c-format
+msgid "could not close '%s'"
+msgstr "no se pudo cerrar '%s'"
+
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
+#, c-format
+msgid "could not stat '%s'"
+msgstr "no se pudo definir '%s'"
+
+#: read-cache.c:2455
+#, c-format
+msgid "unable to open git dir: %s"
+msgstr "no es posible abrir el directorio de git: %s"
+
+#: read-cache.c:2467
+#, c-format
+msgid "unable to unlink: %s"
+msgstr "no es posible remover el vinculo: %s"
+
+#: refs.c:706
+#, c-format
+msgid "Could not open '%s' for writing"
+msgstr "No sepudo abrir '%s' para escritura"
+
+#: refs.c:1850
+msgid "ref updates forbidden inside quarantine environment"
+msgstr "actualizaciones de ref prohibidas dentro de ambiente de cuarentena"
+
+#: refs/files-backend.c:1189
+#, c-format
+msgid "could not remove reference %s"
+msgstr "no se pudo remover la referencia %s"
+
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "no se pudo eliminar la referencia %s: %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "no se pudo eliminar la referencia: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
+msgid "gone"
+msgstr "desaparecido"
+
+#: ref-filter.c:36
+#, c-format
+msgid "ahead %d"
+msgstr "adelante %d"
+
+#: ref-filter.c:37
+#, c-format
+msgid "behind %d"
+msgstr "detrás %d"
+
+#: ref-filter.c:38
+#, c-format
+msgid "ahead %d, behind %d"
+msgstr "delante %d, detrás %d"
+
+#: ref-filter.c:107
+#, c-format
+msgid "expected format: %%(color:<color>)"
+msgstr "formato esperado: %%(color:<color>)"
+
+#: ref-filter.c:109
+#, c-format
+msgid "unrecognized color: %%(color:%s)"
+msgstr "color no reconocido: %%(color:%s)"
+
+#: ref-filter.c:129
+#, c-format
+msgid "Integer value expected refname:lstrip=%s"
+msgstr "valor entero esperado refname:lstrip=%s"
+
+#: ref-filter.c:133
+#, c-format
+msgid "Integer value expected refname:rstrip=%s"
+msgstr "valor entero esperado refname:rstrip=%s"
+
+#: ref-filter.c:135
+#, c-format
+msgid "unrecognized %%(%s) argument: %s"
+msgstr "argumento: %s no reconocido %%(%s)"
+
+#: ref-filter.c:184
+#, c-format
+msgid "%%(body) does not take arguments"
+msgstr "%%(body) no toma ningún argumento"
+
+#: ref-filter.c:191
+#, c-format
+msgid "%%(subject) does not take arguments"
+msgstr "%%(subject) no toma ningún argumento"
+
+#: ref-filter.c:209
+#, c-format
+msgid "unknown %%(trailers) argument: %s"
+msgstr "%%(trailers) desconocidos, argumento: %s"
+
+#: ref-filter.c:232
+#, c-format
+msgid "positive value expected contents:lines=%s"
+msgstr "valor positivo esperado contents:lines=%s"
+
+#: ref-filter.c:234
+#, c-format
+msgid "unrecognized %%(contents) argument: %s"
+msgstr "argumento %s no reconocido %%(contents)"
+
+#: ref-filter.c:247
+#, c-format
+msgid "positive value expected objectname:short=%s"
+msgstr "valor positivo esperado objectname:short=%s"
+
+#: ref-filter.c:251
+#, c-format
+msgid "unrecognized %%(objectname) argument: %s"
+msgstr "argumento: %s no reconocido %%(objectname)"
+
+#: ref-filter.c:278
+#, c-format
+msgid "expected format: %%(align:<width>,<position>)"
+msgstr "formato esperado: %%(align:<ancho>,<posición>)"
+
+#: ref-filter.c:290
+#, c-format
+msgid "unrecognized position:%s"
+msgstr "posición desconocida: %s"
+
+#: ref-filter.c:294
+#, c-format
+msgid "unrecognized width:%s"
+msgstr "ancho desconocido: %s"
+
+#: ref-filter.c:300
+#, c-format
+msgid "unrecognized %%(align) argument: %s"
+msgstr "argumento no reconocido para %%(align): %s"
+
+#: ref-filter.c:304
+#, c-format
+msgid "positive width expected with the %%(align) atom"
+msgstr "se esperaba un ancho positivo con el átomo %%(align)"
+
+#: ref-filter.c:319
+#, c-format
+msgid "unrecognized %%(if) argument: %s"
+msgstr "argumento: %s no reconocido %%(if)"
+
+#: ref-filter.c:409
+#, c-format
+msgid "malformed field name: %.*s"
+msgstr "nombre malformado de campo: %.*s"
+
+#: ref-filter.c:435
+#, c-format
+msgid "unknown field name: %.*s"
+msgstr "nombre de campo desconocido: %.*s"
+
+#: ref-filter.c:547
+#, c-format
+msgid "format: %%(if) atom used without a %%(then) atom"
+msgstr "formato: átomo %%(if) usado sin un átomo %%(then)"
+
+#: ref-filter.c:607
+#, c-format
+msgid "format: %%(then) atom used without an %%(if) atom"
+msgstr "formato: átomo %%(then) usado sin átomo %%(if)"
+
+#: ref-filter.c:609
+#, c-format
+msgid "format: %%(then) atom used more than once"
+msgstr "formato: átomo %%(then) usado mas de una vez"
+
+#: ref-filter.c:611
+#, c-format
+msgid "format: %%(then) atom used after %%(else)"
+msgstr "formato: átomo %%(then) usado después de %%(else)"
+
+#: ref-filter.c:637
+#, c-format
+msgid "format: %%(else) atom used without an %%(if) atom"
+msgstr "formato: átomo %%(else) usado sin un átomo %%(if)"
+
+#: ref-filter.c:639
+#, c-format
+msgid "format: %%(else) atom used without a %%(then) atom"
+msgstr "formato: átomo %%(else) usado sin un átomo %%(then) "
+
+#: ref-filter.c:641
+#, c-format
+msgid "format: %%(else) atom used more than once"
+msgstr "formato: átomo %%(else) usado mas de una vez"
+
+#: ref-filter.c:654
+#, c-format
+msgid "format: %%(end) atom used without corresponding atom"
+msgstr "formato: átomo %%(end) usado sin átomo correspondiente"
+
+#: ref-filter.c:709
+#, c-format
+msgid "malformed format string %s"
+msgstr "formato de cadena malformado %s"
+
+#: ref-filter.c:1313
+#, c-format
+msgid "(no branch, rebasing %s)"
+msgstr "(no hay rama, rebasando %s)"
+
+#: ref-filter.c:1316
+#, c-format
+msgid "(no branch, bisect started on %s)"
+msgstr "(no hay rama, comenzando bisectado en %s)"
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached at " in wt-status.c
+#.
+#: ref-filter.c:1324
+#, c-format
+msgid "(HEAD detached at %s)"
+msgstr "(HEAD desacoplado en %s)"
+
+#. TRANSLATORS: make sure this matches "HEAD
+#. detached from " in wt-status.c
+#.
+#: ref-filter.c:1331
+#, c-format
+msgid "(HEAD detached from %s)"
+msgstr "(HEAD desacoplado de %s)"
+
+#: ref-filter.c:1335
+msgid "(no branch)"
+msgstr "(sin rama)"
+
+#: ref-filter.c:1488 ref-filter.c:1519
+#, c-format
+msgid "missing object %s for %s"
+msgstr "objeto %s faltante para %s"
+
+#: ref-filter.c:1491 ref-filter.c:1522
+#, c-format
+msgid "parse_object_buffer failed on %s for %s"
+msgstr "parse_object_buffer falló en %s para %s"
+
+#: ref-filter.c:1822
+#, c-format
+msgid "malformed object at '%s'"
+msgstr "objeto malformado en '%s'"
+
+#: ref-filter.c:1889
+#, c-format
+msgid "ignoring ref with broken name %s"
+msgstr "ignorando referencia con nombre roto %s"
+
+#: ref-filter.c:1894
+#, c-format
+msgid "ignoring broken ref %s"
+msgstr "ignorando referencia rota %s"
+
+#: ref-filter.c:2156
+#, c-format
+msgid "format: %%(end) atom missing"
+msgstr "formato: falta átomo %%(end)"
+
+#: ref-filter.c:2250
+#, c-format
+msgid "malformed object name %s"
+msgstr "nombre de objeto malformado %s"
+
+#: remote.c:780
+#, c-format
+msgid "Cannot fetch both %s and %s to %s"
+msgstr "No se pueden traer ambos %s y %s a %s"
+
+#: remote.c:784
+#, c-format
+msgid "%s usually tracks %s, not %s"
+msgstr "%s por lo general hace seguimiento a %s, no a %s"
+
+#: remote.c:788
+#, c-format
+msgid "%s tracks both %s and %s"
+msgstr "%s hace seguimiento tanto a %s como a %s"
+
+#: remote.c:796
+msgid "Internal error"
+msgstr "Error interno"
+
+#: remote.c:1711 remote.c:1813
+msgid "HEAD does not point to a branch"
+msgstr "HEAD no apunta a ninguna rama"
+
+#: remote.c:1720
+#, c-format
+msgid "no such branch: '%s'"
+msgstr "no existe tal rama: '%s'"
+
+#: remote.c:1723
+#, c-format
+msgid "no upstream configured for branch '%s'"
+msgstr "no se ha configurado upstream para la rama '%s'"
+
+#: remote.c:1729
+#, c-format
+msgid "upstream branch '%s' not stored as a remote-tracking branch"
+msgstr "la rama '%s' de upstream no es guardad como rama de rastreo remoto"
+
+#: remote.c:1744
+#, c-format
+msgid "push destination '%s' on remote '%s' has no local tracking branch"
+msgstr ""
+"destino de push '%s' en el remoto '%s' no tiene una rama de rastreo local"
+
+#: remote.c:1756
+#, c-format
+msgid "branch '%s' has no remote for pushing"
+msgstr "la rama '%s' no tiene remoto para enviar"
+
+#: remote.c:1767
+#, c-format
+msgid "push refspecs for '%s' do not include '%s'"
+msgstr "refspecs del push para '%s' no incluyen '%s'"
+
+#: remote.c:1780
+msgid "push has no destination (push.default is 'nothing')"
+msgstr "push no tiene destino (push.default es 'nada')"
+
+#: remote.c:1802
+msgid "cannot resolve 'simple' push to a single destination"
+msgstr "no se puede resolver push 'simple' para un destino unico"
+
+#: remote.c:2106
+#, c-format
+msgid "Your branch is based on '%s', but the upstream is gone.\n"
+msgstr "tu rama esta basada en '%s', pero upstream ha desaparecido.\n"
+
+#: remote.c:2110
+msgid " (use \"git branch --unset-upstream\" to fixup)\n"
+msgstr " (usa \"git branch --unset-upstream\" para arreglar)\n"
+
+#: remote.c:2113
+#, c-format
+msgid "Your branch is up to date with '%s'.\n"
+msgstr "Tu rama está actualizada con '%s'.\n"
+
+#: remote.c:2117
+#, c-format
+msgid "Your branch is ahead of '%s' by %d commit.\n"
+msgid_plural "Your branch is ahead of '%s' by %d commits.\n"
+msgstr[0] "Tu rama está adelantada a '%s' por %d commit.\n"
+msgstr[1] "Tu rama está adelantada a '%s' por %d commits.\n"
+
+#: remote.c:2123
+msgid " (use \"git push\" to publish your local commits)\n"
+msgstr " (usa \"git push\" para publicar tus commits locales)\n"
+
+#: remote.c:2126
+#, 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] ""
+"Tu rama está detrás de '%s' por %d commit, y puede ser avanzada rápido.\n"
+msgstr[1] ""
+"Tu rama está detrás de '%s' por %d commits, y puede ser avanzada rápido.\n"
+
+#: remote.c:2134
+msgid " (use \"git pull\" to update your local branch)\n"
+msgstr " (usa \"git pull\" para actualizar tu rama local)\n"
+
+#: remote.c:2137
+#, 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] ""
+"Tu rama y '%s' han divergido,\n"
+"y se tiene %d y %d commit diferentes en cada una respectivamente.\n"
+msgstr[1] ""
+"Tu rama y '%s' han divergido,\n"
+"y tienen %d y %d commits diferentes cada una respectivamente.\n"
+
+#: remote.c:2147
+msgid " (use \"git pull\" to merge the remote branch into yours)\n"
+msgstr " (usa \"git pull\" para fusionar la rama remota en la tuya)\n"
+
+#: revision.c:2268
+msgid "your current branch appears to be broken"
+msgstr "tu rama actual parece estar rota"
+
+#: revision.c:2271
+#, 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:2465
+msgid "--first-parent is incompatible with --bisect"
+msgstr "--first-parent es incompatible con --bisect"
+
+#: run-command.c:645
+msgid "open /dev/null failed"
+msgstr "falló al abrir /dev/null"
+
+#: run-command.c:1188
+#, 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 ifnorado porque no ha sido configurado como ejecutable.\n"
+"Puedes desactivar esta advertencias con `git config advice.ignoredHook "
+"false`."
+
+#: send-pack.c:141
+#, c-format
+msgid "unable to parse remote unpack status: %s"
+msgstr "no es posible analizar el estado de desempaquetado remoto: %s"
+
+#: send-pack.c:143
+#, c-format
+msgid "remote unpack failed: %s"
+msgstr "desempaquetado remoto falló: %s"
+
+#: send-pack.c:306
+msgid "failed to sign the push certificate"
+msgstr "falló al firmar el certificado de push"
+
+#: send-pack.c:419
+msgid "the receiving end does not support --signed push"
+msgstr "el final receptor no soporta --signed push"
+
+#: send-pack.c:421
+msgid ""
+"not sending a push certificate since the receiving end does not support --"
+"signed push"
+msgstr ""
+"no se manda un certificado de push ya que el destino no soporta push firmado "
+"(--signed )"
+
+#: send-pack.c:433
+msgid "the receiving end does not support --atomic push"
+msgstr "el destino no soporta push atómicos (--atomic)"
+
+#: send-pack.c:438
+msgid "the receiving end does not support push options"
+msgstr "el destino no soporta opciones de push"
+
+#: sequencer.c:218
+msgid "revert"
+msgstr "revertir"
+
+#: sequencer.c:220
+msgid "cherry-pick"
+msgstr "cherry-pick"
+
+#: sequencer.c:222
+msgid "rebase -i"
+msgstr "rebase -i"
+
+#: sequencer.c:224
+#, c-format
+msgid "Unknown action: %d"
+msgstr "Acción desconocida: %d"
+
+#: sequencer.c:281
+msgid ""
+"after resolving the conflicts, mark the corrected paths\n"
+"with 'git add <paths>' or 'git rm <paths>'"
+msgstr ""
+"despues de resolver los conflictos, marca las rutas corregidas\n"
+"con 'git add <rutas>' o 'git rm <rutas>'"
+
+#: sequencer.c:284
+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'"
+
+#: sequencer.c:297 sequencer.c:1718
+#, c-format
+msgid "could not lock '%s'"
+msgstr "No se pudo bloquear '%s'"
+
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
+#, c-format
+msgid "could not write to '%s'"
+msgstr "No se pudo escribir en '%s'"
+
+#: sequencer.c:304
+#, c-format
+msgid "could not write eol to '%s'"
+msgstr "No se pudo escribir EOL en '%s'"
+
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
+#, c-format
+msgid "failed to finalize '%s'."
+msgstr "Fallo al finalizar '%s'."
+
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
+#, c-format
+msgid "could not read '%s'"
+msgstr "No se pudo leer '%s'"
+
+#: sequencer.c:358
+#, c-format
+msgid "your local changes would be overwritten by %s."
+msgstr "Tus cambios locales serán sobreescritos por %s."
+
+#: sequencer.c:362
+msgid "commit your changes or stash them to proceed."
+msgstr "Realiza un commit con tus cambios o aplica un stash para proceder."
+
+#: sequencer.c:391
+#, c-format
+msgid "%s: fast-forward"
+msgstr "%s: avance rápido"
+
+#. TRANSLATORS: %s will be "revert", "cherry-pick" or
+#. "rebase -i".
+#.
+#: sequencer.c:477
+#, c-format
+msgid "%s: Unable to write new index file"
+msgstr "%s: Incapaz de escribir el nuevo archivo índice"
+
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "No se pudo resolver el commit de HEAD"
+
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "no es posible actualizar el árbol de la caché"
+
+#: sequencer.c:600
+#, 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 ""
+"se ha aplicado un stage a los cambios en el árbol de trabajo\n"
+"si estos cambios están destinados a ser aplastados en el commit previo, "
+"ejecuta:\n"
+"\n"
+" git commit --amend %s\n"
+"\n"
+"Si estos cambios están destinados a un nuevo commit, ejecuta:\n"
+"\n"
+" git commit %s\n"
+"\n"
+"en cambos casos, cuando acabes, continua con:\n"
+"\n"
+" git rebase --continue\n"
+
+#: sequencer.c:702
+#, c-format
+msgid "could not parse commit %s"
+msgstr "No se pudo analizar commit %s"
+
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "No se pudo analizar el commit padre %s"
+
+#: sequencer.c:836
+#, c-format
+msgid ""
+"unexpected 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"1ra línea del mensaje squash no esperada:\n"
+"\n"
+"\t%.*s"
+
+#: sequencer.c:842
+#, c-format
+msgid ""
+"invalid 1st line of squash message:\n"
+"\n"
+"\t%.*s"
+msgstr ""
+"1ra línea del mensaje squash inválida:\n"
+"\n"
+"\t%.*s"
+
+#: sequencer.c:848 sequencer.c:873
+#, c-format
+msgid "This is a combination of %d commits."
+msgstr "Esta es una combinación de %d commits."
+
+#: sequencer.c:857 sequencer.c:2748
+msgid "need a HEAD to fixup"
+msgstr "se necesita un HEAD para arreglar"
+
+#: sequencer.c:859
+msgid "could not read HEAD"
+msgstr "no se pudo leer HEAD"
+
+#: sequencer.c:861
+msgid "could not read HEAD's commit message"
+msgstr "no se pudo leer el mensaje de commit de HEAD"
+
+#: sequencer.c:867
+#, c-format
+msgid "cannot write '%s'"
+msgstr "no se puede escribir '%s'"
+
+#: sequencer.c:876 git-rebase--interactive.sh:446
+msgid "This is the 1st commit message:"
+msgstr "Este es el mensaje del 1er commit:"
+
+#: sequencer.c:884
+#, c-format
+msgid "could not read commit message of %s"
+msgstr "no se puede leer el mensaje del commit de %s"
+
+#: sequencer.c:891
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr "este es el mensaje del commit #%d:"
+
+#: sequencer.c:896
+#, c-format
+msgid "The commit message #%d will be skipped:"
+msgstr "El mensaje del commit #%d sera saltado: "
+
+#: sequencer.c:901
+#, c-format
+msgid "unknown command: %d"
+msgstr "comando desconocido: %d"
+
+#: sequencer.c:967
+msgid "your index file is unmerged."
+msgstr "tu archivo índice no esta fusionado."
+
+#: sequencer.c:986
+#, 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 entrego la opción -m."
+
+#: sequencer.c:994
+#, c-format
+msgid "commit %s does not have parent %d"
+msgstr "el commit %s no tiene un padre %d"
+
+#: sequencer.c:998
+#, c-format
+msgid "mainline was specified but commit %s is not a merge."
+msgstr "línea principal especificada pero el commit %s no es una fusión."
+
+#: sequencer.c:1004
+#, 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:1023
+#, c-format
+msgid "%s: cannot parse parent commit %s"
+msgstr "%s: no se puede analizar el commit padre %s"
+
+#: sequencer.c:1086 sequencer.c:1867
+#, c-format
+msgid "could not rename '%s' to '%s'"
+msgstr "No se puede renombrar '%s' a '%s'"
+
+#: sequencer.c:1137
+#, c-format
+msgid "could not revert %s... %s"
+msgstr "no se pudo revertir %s... %s"
+
+#: sequencer.c:1138
+#, c-format
+msgid "could not apply %s... %s"
+msgstr "no se pudo aplicar %s... %s"
+
+#: sequencer.c:1180
+msgid "empty commit set passed"
+msgstr "conjunto de commits vacío entregado"
+
+#: sequencer.c:1190
+#, c-format
+msgid "git %s: failed to read the index"
+msgstr "git %s: fallo al leer el índice"
+
+#: sequencer.c:1196
+#, c-format
+msgid "git %s: failed to refresh the index"
+msgstr "git %s: fallo al refrescar el índice"
+
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s no acepta los argumentos: '%s'"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "faltan argumentos para para %s"
+
+#: sequencer.c:1322
+#, c-format
+msgid "invalid line %d: %.*s"
+msgstr "línea inválida %d: %.*s"
+
+#: sequencer.c:1330
+#, c-format
+msgid "cannot '%s' without a previous commit"
+msgstr "no se puede '%s' sin un commit previo"
+
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
+#, c-format
+msgid "could not read '%s'."
+msgstr "no se puede leer '%s'."
+
+#: sequencer.c:1375
+msgid "please fix this using 'git rebase --edit-todo'."
+msgstr "por favor arregle esto usando 'git rebase --edit-todo'."
+
+#: sequencer.c:1377
+#, c-format
+msgid "unusable instruction sheet: '%s'"
+msgstr "hoja de instrucciones inutilízale: '%s'"
+
+#: sequencer.c:1382
+msgid "no commits parsed."
+msgstr "ningún commit analizado."
+
+#: sequencer.c:1393
+msgid "cannot cherry-pick during a revert."
+msgstr "no se puede realizar cherry-pick durante un revert."
+
+#: sequencer.c:1395
+msgid "cannot revert during a cherry-pick."
+msgstr "no se puede realizar un revert durante un cherry-pick"
+
+#: sequencer.c:1462
+#, c-format
+msgid "invalid key: %s"
+msgstr "llave invalida: %s"
+
+#: sequencer.c:1465
+#, c-format
+msgid "invalid value for %s: %s"
+msgstr "valor invalido para %s: %s"
+
+#: sequencer.c:1531
+#, c-format
+msgid "malformed options sheet: '%s'"
+msgstr "hoja de opciones mal formada: '%s'"
+
+#: sequencer.c:1569
+msgid "a cherry-pick or revert is already in progress"
+msgstr "un cherry-pick o rever ya esta en progreso"
+
+#: sequencer.c:1570
+msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
+msgstr "intenta \"git cherry-pick (--continue | --quit | --abort)\""
+
+#: sequencer.c:1573
+#, c-format
+msgid "could not create sequencer directory '%s'"
+msgstr "no se pudo crear un directorio secuenciador '%s' "
+
+#: sequencer.c:1588
+msgid "could not lock HEAD"
+msgstr "no se pudo bloquear HEAD"
+
+#: sequencer.c:1646 sequencer.c:2230
+msgid "no cherry-pick or revert in progress"
+msgstr "ningún cherry-pick o revert en progreso"
+
+#: sequencer.c:1648
+msgid "cannot resolve HEAD"
+msgstr "no se puede resolver HEAD"
+
+#: sequencer.c:1650 sequencer.c:1685
+msgid "cannot abort from a branch yet to be born"
+msgstr "no se puede abortar de una rama por nacer"
+
+#: sequencer.c:1671 builtin/grep.c:713
+#, c-format
+msgid "cannot open '%s'"
+msgstr "no se puede abrir '%s'"
+
+#: sequencer.c:1673
+#, c-format
+msgid "cannot read '%s': %s"
+msgstr "no se puede leer '%s': %s"
+
+#: sequencer.c:1674
+msgid "unexpected end of file"
+msgstr "final de archivo inesperado"
+
+#: sequencer.c:1680
+#, c-format
+msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
+msgstr "archivo HEAD de pre-cherry-pick guardado '%s' esta corrupto"
+
+#: sequencer.c:1691
+msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
+msgstr "Parece que se ha movido HEAD. No se hace rebobinado, revise su HEAD!"
+
+#: sequencer.c:1832 sequencer.c:2128
+msgid "cannot read HEAD"
+msgstr "no se puede leer HEAD"
+
+#: sequencer.c:1872 builtin/difftool.c:639
+#, c-format
+msgid "could not copy '%s' to '%s'"
+msgstr "no se pudo copiar '%s' a '%s'"
+
+#: sequencer.c:1891
+msgid "could not read index"
+msgstr "no se pudo leer indice"
+
+#: sequencer.c:1896
+#, c-format
+msgid ""
+"execution failed: %s\n"
+"%sYou can fix the problem, and then run\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"ejecución fallida: %s\n"
+"%sse puede arreglar el problema , y luego ejecutar\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1902
+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:1908
+#, 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 ""
+"ejecución exitosa: %s\n"
+"pero todavía quedan cambios para el índice o árbol de trabajo.\n"
+"Realiza un commit o stash con tus cambios, y luego ejecuta\n"
+"\n"
+" git rebase --continue\n"
+"\n"
+
+#: sequencer.c:1967
+#, c-format
+msgid "Applied autostash.\n"
+msgstr "Autostash aplicado.\n"
+
+#: sequencer.c:1979
+#, c-format
+msgid "cannot store %s"
+msgstr "no se puede guardar %s"
+
+#: sequencer.c:1982 git-rebase.sh:175
+#, c-format
+msgid ""
+"Applying autostash resulted in conflicts.\n"
+"Your changes are safe in the stash.\n"
+"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
+msgstr ""
+"Aplicando autostash resultó en conflictos.\n"
+"Tus cambios estan seguros en el stash.\n"
+"Puedes ejecutar \"git stash pop\" o \"git stash drop\" en cualquier "
+"momento.\n"
+
+#: sequencer.c:2064
+#, c-format
+msgid "Stopped at %s... %.*s\n"
+msgstr "Detenido en %s... %.*s\n"
+
+#: sequencer.c:2106
+#, c-format
+msgid "unknown command %d"
+msgstr "comando desconocido %d"
+
+#: sequencer.c:2136
+msgid "could not read orig-head"
+msgstr "no se puede leer orig-head"
+
+#: sequencer.c:2141 sequencer.c:2745
+msgid "could not read 'onto'"
+msgstr "no se puede leer 'onto'"
+
+#: sequencer.c:2148
+#, c-format
+msgid "could not update %s"
+msgstr "no se puede actualizar %s"
+
+#: sequencer.c:2155
+#, c-format
+msgid "could not update HEAD to %s"
+msgstr "no se puede actualizar HEAD a %s"
+
+#: sequencer.c:2239
+msgid "cannot rebase: You have unstaged changes."
+msgstr "no se puede realizar rebase: Tienes cambios fuera del área de stage."
+
+#: sequencer.c:2244
+msgid "could not remove CHERRY_PICK_HEAD"
+msgstr "no se puede remover CHERRY_PICK_HEAD"
+
+#: sequencer.c:2253
+msgid "cannot amend non-existing commit"
+msgstr "no se puede arreglar un commit no existente"
+
+#: sequencer.c:2255
+#, c-format
+msgid "invalid file: '%s'"
+msgstr "archivo invalido: '%s'"
+
+#: sequencer.c:2257
+#, c-format
+msgid "invalid contents: '%s'"
+msgstr "contenido inválido: '%s'"
+
+#: sequencer.c:2260
+msgid ""
+"\n"
+"You have uncommitted changes in your working tree. Please, commit them\n"
+"first and then run 'git rebase --continue' again."
+msgstr ""
+"\n"
+"Tienes cambios fuera de un commit en tu árbol de trabajo. Por favor, realiza "
+"un commit con estos\n"
+"primero y luego ejecuta 'git rebase --continue' de nuevo."
+
+#: sequencer.c:2270
+msgid "could not commit staged changes."
+msgstr "no se pudo realizar el commit con los cambios en el área de stage."
+
+#: sequencer.c:2350
+#, c-format
+msgid "%s: can't cherry-pick a %s"
+msgstr "%s: no se puede aplicar cherry-pick a un %s"
+
+#: sequencer.c:2354
+#, c-format
+msgid "%s: bad revision"
+msgstr "%s: mala revision"
+
+#: sequencer.c:2387
+msgid "can't revert as initial commit"
+msgstr "no se puede revertir como commit inicial"
+
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: opciones desconocidas"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: error preparando revisiones"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "lista de pendientes inutilízale: '%s'"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"Opción %s no reconocida para la opción rebase.missingCommitsCheck. Ignorando."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Peligro: algunos commits pueden haber sido botados de forma accidental.\n"
+"Commits botados (empezando con el mas nuevo):\n"
+
+#: sequencer.c:2702
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"Para evitar este mensaje, use \"drop\" para remover de forma explícita un "
+"commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' para cambiar el nivel de "
+"advertencias.\n"
+"Los posibles comportamientos son: ignore,warn,error.\n"
+"\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Se puede arreglar esto con 'git rebase --edit-todo' y después ejecutar 'git "
+"rebase --continue'.\n"
+"O se puede abortar el rebase con 'git rebase --abort'.\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "no se pudo abrir '%s' para escritura"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "No se pudo analizar commit '%s'"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "este script ya fue reorganizado."
+
+#: setup.c:171
+#, 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 existe la ruta en el árbol de trabajo.\n"
+"Use 'git <comando> -- <ruta>...' para especificar rutas que no existen "
+"localmente."
+
+#: setup.c:184
+#, 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 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"
+"'git <comando> [<revisión>...] -- [<archivo>...]'"
+
+#: setup.c:252
+#, 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 ""
+"argumento ambiguo '%s': ambos revisión y nombre de archivo\n"
+"Use '--' para separar rutas de revisiones, de esta manera:\n"
+"'git <comando> [<revisión>...] -- [<archivo>...]'"
+
+#: setup.c:501
+#, c-format
+msgid "Expected git repo version <= %d, found %d"
+msgstr "Se esperaba versión de git repo <= %d, encontrada %d"
+
+#: setup.c:509
+msgid "unknown repository extensions found:"
+msgstr "se encontró extensión de repositorio desconocida:"
+
+#: setup.c:811
+#, c-format
+msgid "Not a git repository (or any of the parent directories): %s"
+msgstr ""
+"No es un repositorio git (ni ninguno de los directorios superiores): %s"
+
+#: setup.c:813 builtin/index-pack.c:1653
+msgid "Cannot come back to cwd"
+msgstr "No se puede regresar a cwd"
+
+#: setup.c:1052
+msgid "Unable to read current working directory"
+msgstr "Incapaz de leer el directorio de trabajo actual"
+
+#: setup.c:1064 setup.c:1070
+#, c-format
+msgid "Cannot change to '%s'"
+msgstr "No se puede cambiar a '%s'"
+
+#: setup.c:1083
+#, 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 es un repositorio git ( o ningún padre en el punto de montado %s)\n"
+"Parando en el límite del sistema de archivos "
+"(GIT_DISCOVERY_ACROSS_FILESYSTEM no establecido)."
+
+#: setup.c:1167
+#, c-format
+msgid ""
+"Problem with core.sharedRepository filemode value (0%.3o).\n"
+"The owner of files must always have read and write permissions."
+msgstr ""
+"Problema con el valor del modo de archivo core.sharedRepository (0%.3o).\n"
+"El dueño de los archivos tiene que tener permisos de lectura y escritura."
+
+#: sha1_file.c:598
+#, c-format
+msgid "path '%s' does not exist"
+msgstr "ruta '%s' no existe"
+
+#: sha1_file.c:624
+#, c-format
+msgid "reference repository '%s' as a linked checkout is not supported yet."
+msgstr ""
+"repositorio de referencia '%s' como un checkout vinculado no es soportado "
+"todavía."
+
+#: sha1_file.c:630
+#, c-format
+msgid "reference repository '%s' is not a local repository."
+msgstr "repositorio de referencia '%s' no es un repositorio local."
+
+#: sha1_file.c:636
+#, c-format
+msgid "reference repository '%s' is shallow"
+msgstr "repositorio de referencia '%s' es superficial (shallow)"
+
+#: sha1_file.c:644
+#, c-format
+msgid "reference repository '%s' is grafted"
+msgstr "repositorio de referencia '% s' está injertado"
+
+#: sha1_name.c:422
+#, c-format
+msgid "short SHA1 %s is ambiguous"
+msgstr "SHA1 %s corta es ambigua"
+
+#: sha1_name.c:433
+msgid "The candidates are:"
+msgstr "Los candidatos son:"
+
+#: sha1_name.c:693
+msgid ""
+"Git normally never creates a ref that ends with 40 hex characters\n"
+"because it will be ignored when you just specify 40-hex. These refs\n"
+"may be created by mistake. For example,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"where \"$br\" is somehow empty and a 40-hex ref is created. Please\n"
+"examine these refs and maybe delete them. Turn this message off by\n"
+"running \"git config advice.objectNameWarning false\""
+msgstr ""
+"Git normalmente nunca crea una ref que termine con 40 caracteres hex\n"
+"porque esto sería ignorado cuando solo se especifiquen 40-hex. Estas refs\n"
+"tal vez sean creadas por error. Por ejemplo,\n"
+"\n"
+" git checkout -b $br $(git rev-parse ...)\n"
+"\n"
+"donde \"$br\" está de alguna manera vacía y una ref de 40-hex es creada. Por "
+"favor\n"
+"examine estas refs y tal vez bórrelas. Silencie este mensaje \n"
+"ejecutando \"git config advice.objectNameWarning false\""
+
+#: submodule.c:96 submodule.c:130
+msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
+msgstr ""
+"No se puede cambiar .gitmodules no fusionados, resuelva este problema primero"
+
+#: submodule.c:100 submodule.c:134
+#, c-format
+msgid "Could not find section in .gitmodules where path=%s"
+msgstr "No se pudo encontrar la sección en .gitmodules donde path=%s"
+
+#: submodule.c:108
+#, c-format
+msgid "Could not update .gitmodules entry %s"
+msgstr "No se pudo actualizar la entrada %s de .gitmodules"
+
+#: submodule.c:141
+#, c-format
+msgid "Could not remove .gitmodules entry for %s"
+msgstr "No se pudo remover la entrada %s de .gitmodules"
+
+#: submodule.c:152
+msgid "staging updated .gitmodules failed"
+msgstr "falló realizar stage a los .gitmodules actualizados"
+
+#: submodule.c:312
+#, c-format
+msgid "in unpopulated submodule '%s'"
+msgstr "en el submódulo no poblado '%s'"
+
+#: submodule.c:343
+#, c-format
+msgid "Pathspec '%s' is in submodule '%.*s'"
+msgstr "El patrón de ruta '%s' está en el submódulo '%.*s'"
+
+#: submodule.c:833
+#, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Fallo al resolver HEAD como un ref valido."
+
+#: submodule.c:1370
+#, c-format
+msgid "'%s' not recognized as a git repository"
+msgstr "'%s' no reconocido como un repositorio git"
+
+#: submodule.c:1508
+#, 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:1521
+#, 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:1614
+#, c-format
+msgid "submodule '%s' has dirty index"
+msgstr "submódulo '%s' tiene un índice corrupto"
+
+#: submodule.c:1876
+#, c-format
+msgid ""
+"relocate_gitdir for submodule '%s' with more than one worktree not supported"
+msgstr ""
+"relocate_gitdir para el submódulo '%s' con más de un árbol de trabajo no "
+"soportado"
+
+#: submodule.c:1888 submodule.c:1944
+#, c-format
+msgid "could not lookup name for submodule '%s'"
+msgstr "no se pudo resolver el nombre para el submódulo '%s'"
+
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
+#, c-format
+msgid "could not create directory '%s'"
+msgstr "no se pudo crear el directorio '%s'"
+
+#: submodule.c:1895
+#, c-format
+msgid ""
+"Migrating git directory of '%s%s' from\n"
+"'%s' to\n"
+"'%s'\n"
+msgstr ""
+"Migrando directorio git de '%s%s' desde\n"
+"'%s' hacia\n"
+"'%s'\n"
+
+#: submodule.c:1979
+#, c-format
+msgid "could not recurse into submodule '%s'"
+msgstr "No pudo recursar en el submódulo '%s'"
+
+#: submodule.c:2023
+msgid "could not start ls-files in .."
+msgstr "no se pudo comenzar ls-files en .."
+
+#: submodule.c:2043
+msgid "BUG: returned path string doesn't match cwd?"
+msgstr "BUG: string de ruta recibido no concuerda con cwd?"
+
+#: submodule.c:2062
+#, c-format
+msgid "ls-tree returned unexpected return code %d"
+msgstr "ls-tree retornó un código %d inesperado"
+
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "no se permiten valores negativos para submodule.fetchjobs"
+
+#: submodule-config.c:436
+#, c-format
+msgid "invalid value for %s"
+msgstr "valor inválido para %s"
+
+#: trailer.c:238
+#, c-format
+msgid "running trailer command '%s' failed"
+msgstr "no se pudo ejecutar el comando de remolque '%s'"
+
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
+#, c-format
+msgid "unknown value '%s' for key '%s'"
+msgstr "valor '%s' desconocido para la clave '%s'"
+
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
+#, c-format
+msgid "more than one %s"
+msgstr "más de un %s"
+
+#: trailer.c:730
+#, c-format
+msgid "empty trailer token in trailer '%.*s'"
+msgstr "token de remolque vacío en el trailer '%.*s'"
+
+#: trailer.c:750
+#, c-format
+msgid "could not read input file '%s'"
+msgstr "no se pudo leer el archivo de entrada '%s'"
+
+#: trailer.c:753
+msgid "could not read from stdin"
+msgstr "no se pudo leer desde stdin"
+
+#: trailer.c:1008 builtin/am.c:46
+#, c-format
+msgid "could not stat %s"
+msgstr "no se pudo definir %s"
+
+#: trailer.c:1010
+#, c-format
+msgid "file %s is not a regular file"
+msgstr "el archivo %s no es un archivo regular"
+
+#: trailer.c:1012
+#, c-format
+msgid "file %s is not writable by user"
+msgstr "el archivo %s no puede ser escrito por el usuario "
+
+#: trailer.c:1024
+msgid "could not open temporary file"
+msgstr "no se pudo abrir el archivo temporal"
+
+#: trailer.c:1064
+#, c-format
+msgid "could not rename temporary file to %s"
+msgstr "no se pudo renombrar el archivo temporal a %s"
+
+#: transport.c:63
+#, c-format
+msgid "Would set upstream of '%s' to '%s' of '%s'\n"
+msgstr "Configurará upstream de '%s' a '%s' de '%s'\n"
+
+#: transport.c:152
+#, c-format
+msgid "transport: invalid depth option '%s'"
+msgstr "transport: opción inválida '%s'"
+
+#: transport.c:904
+#, c-format
+msgid ""
+"The following submodule paths contain changes that can\n"
+"not be found on any remote:\n"
+msgstr ""
+"La siguiente ruta de submódulo contiene cambios que no\n"
+"pueden ser encontrados en ningún remoto:\n"
+
+#: transport.c:908
+#, c-format
+msgid ""
+"\n"
+"Please try\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"or cd to the path and use\n"
+"\n"
+"\tgit push\n"
+"\n"
+"to push them to a remote.\n"
+"\n"
+msgstr ""
+"\n"
+"Por favor intenta\n"
+"\n"
+"\tgit push --recurse-submodules=on-demand\n"
+"\n"
+"o cd a la ruta y usa\n"
+"\n"
+"\tgit push\n"
+"\n"
+"para hacer un push al remoto.\n"
+"\n"
+
+#: transport.c:916
+msgid "Aborting."
+msgstr "Abortando."
+
+#: transport-helper.c:1074
+#, c-format
+msgid "Could not read ref %s"
+msgstr "No se pudo leer la referencia %s"
+
+#: tree-walk.c:31
+msgid "too-short tree object"
+msgstr "objeto de árbol muy corto"
+
+#: tree-walk.c:37
+msgid "malformed mode in tree entry"
+msgstr "modo mal formado en la entrada de árbol"
+
+#: tree-walk.c:41
+msgid "empty filename in tree entry"
+msgstr "nombre de archivo vacío en la entrada de árbol"
+
+#: tree-walk.c:114
+msgid "too-short tree file"
+msgstr "archivo de árbol muy corto"
+
+#: unpack-trees.c:107
+#, 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 ""
+"Los cambios locales de los siguientes archivos serán sobrescritos al "
+"actualizar el árbol de trabajo:\n"
+"%%sPor favor, confirma tus cambios o salvaguárdalos antes de intercambiar "
+"ramas."
+
+#: unpack-trees.c:109
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"checkout:\n"
+"%%s"
+
+#: unpack-trees.c:112
+#, 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 ""
+"Los cambios locales de los siguientes archivos serán sobrescritos al "
+"fusionar:\n"
+"%%sPor favor, confirma tus cambios o salvaguárdalos antes de fusionar."
+
+#: unpack-trees.c:114
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por "
+"merge:\n"
+"%%s"
+
+#: unpack-trees.c:117
+#, 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 ""
+"Los cambios locales de los siguientes archivos serán sobrescritos al %s:\n"
+"%%sPor favor, confirma tus cambios o salvaguárdalos antes de %s."
+
+#: unpack-trees.c:119
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Los cambios locales de los siguientes archivos serán sobreescritos por %s:\n"
+"%%s"
+
+#: unpack-trees.c:124
+#, c-format
+msgid ""
+"Updating the following directories would lose untracked files in them:\n"
+"%s"
+msgstr ""
+"Al actualizar los siguientes directorios se perderán los archivos sin "
+"seguimiento en ellos:\n"
+"%s"
+
+#: unpack-trees.c:128
+#, 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 ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al actualizar el árbol de trabajo:\n"
+"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
+
+#: unpack-trees.c:130
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by checkout:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento del árbol de trabajo serán removidos "
+"al actualizar el árbol de trabajo:\n"
+"%%s"
+
+#: unpack-trees.c:133
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al fusionar:\n"
+"%%sPor favor, muévelos o elimínalos antes de fusionar."
+
+#: unpack-trees.c:135
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán removidos "
+"al fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:138
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al %s:\n"
+"%%sPor favor, muévelos o elimínalos antes de %s."
+
+#: unpack-trees.c:140
+#, c-format
+msgid ""
+"The following untracked working tree files would be removed by %s:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"removidos al ejecutar %s:\n"
+"%%s"
+
+#: unpack-trees.c:145
+#, 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 ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
+"%%sPor favor, muévelos o elimínalos antes de intercambiar ramas."
+
+#: unpack-trees.c:147
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al actualizar el árbol de trabajo:\n"
+"%%s"
+
+#: unpack-trees.c:150
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%sPlease move or remove them before you merge."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
+"%%sPor favor, muévelos o elimínalos antes de fusionar."
+
+#: unpack-trees.c:152
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos sin seguimiento de árbol de trabajo serán "
+"sobrescritos al fusionar:\n"
+"%%s"
+
+#: unpack-trees.c:155
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%sPlease move or remove them before you %s."
+msgstr ""
+"Los siguientes archivos sin seguimiento en el árbol de trabajo serán "
+"sobrescritos al %s:\n"
+"%%sPor favor, muévelos o elimínalos antes de %s."
+
+#: unpack-trees.c:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
+"%%s"
+msgstr ""
+"Los siguientes archivos no rastreados en el árbol de trabajo serán removidos "
+"por %s:\n"
+"%%s"
+
+#: unpack-trees.c:164
+#, c-format
+msgid "Entry '%s' overlaps with '%s'. Cannot bind."
+msgstr "Entrada '%s' se superpone con '%s'. No se pueden unir"
+
+#: unpack-trees.c:167
+#, c-format
+msgid ""
+"Cannot update sparse checkout: the following entries are not up to date:\n"
+"%s"
+msgstr ""
+"No se puede actualizar el sparse checkout: las siguientes entradas no están "
+"actualizadas:\n"
+"%s"
+
+#: unpack-trees.c:169
+#, c-format
+msgid ""
+"The following working tree files would be overwritten by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Los siguientes archivos del árbol de trabajo serán sobrescritos por la "
+"actualización sparse checkout:\n"
+"%s"
+
+#: unpack-trees.c:171
+#, c-format
+msgid ""
+"The following working tree files would be removed by sparse checkout "
+"update:\n"
+"%s"
+msgstr ""
+"Los siguientes archivos del árbol de trabajo serán removidos por la "
+"actualización sparse checkout:\n"
+"%s"
+
+#: unpack-trees.c:173
+#, c-format
+msgid ""
+"Cannot update submodule:\n"
+"%s"
+msgstr ""
+"No se puede actualizar le submodulo:\n"
+"%s"
+
+#: unpack-trees.c:250
+#, c-format
+msgid "Aborting\n"
+msgstr "Abortando\n"
+
+#: unpack-trees.c:332
+msgid "Checking out files"
+msgstr "Revisando archivos"
+
+#: urlmatch.c:163
+msgid "invalid URL scheme name or missing '://' suffix"
+msgstr "nombre de URL invalido o falta sufijo '://'"
+
+#: urlmatch.c:187 urlmatch.c:346 urlmatch.c:405
+#, c-format
+msgid "invalid %XX escape sequence"
+msgstr "secuencia de escape %XX invalida "
+
+#: urlmatch.c:215
+msgid "missing host and scheme is not 'file:'"
+msgstr "falta host y el esquema no es 'archivo':"
+
+#: urlmatch.c:232
+msgid "a 'file:' URL may not have a port number"
+msgstr "un 'archivo:' URL puede no tener un número de puerto"
+
+#: urlmatch.c:247
+msgid "invalid characters in host name"
+msgstr "carácter inválido en el nombre del host"
+
+#: urlmatch.c:292 urlmatch.c:303
+msgid "invalid port number"
+msgstr "numero de puerto invalido"
+
+#: urlmatch.c:371
+msgid "invalid '..' path segment"
+msgstr "segmento de ruta '..' invalido"
+
+#: worktree.c:245
+#, c-format
+msgid "failed to read '%s'"
+msgstr "fallo al leer '%s'"
+
+#: wrapper.c:223 wrapper.c:393
+#, c-format
+msgid "could not open '%s' for reading and writing"
+msgstr "no se pudo abrir '%s' para lectura y escritura"
+
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
+#, c-format
+msgid "could not open '%s' for reading"
+msgstr "no se pudo abrir '%s' para lectura"
+
+#: wrapper.c:424 wrapper.c:624
+#, c-format
+msgid "unable to access '%s'"
+msgstr "no es posible acceder '%s'"
+
+#: wrapper.c:632
+msgid "unable to get current working directory"
+msgstr "no es posible obtener el directorio de trabajo actual"
+
+#: wt-status.c:150
+msgid "Unmerged paths:"
+msgstr "rutas no fusionadas:"
+
+#: wt-status.c:177 wt-status.c:204
+#, c-format
+msgid " (use \"git reset %s <file>...\" to unstage)"
+msgstr " (usa \"git reset %s <archivo>...\" para sacar del área de stage)"
+
+#: wt-status.c:179 wt-status.c:206
+msgid " (use \"git rm --cached <file>...\" to unstage)"
+msgstr " (usa \"git rm --cached <archivo>...\" para sacar del área de stage)"
+
+#: wt-status.c:183
+msgid " (use \"git add <file>...\" to mark resolution)"
+msgstr " (usa \"git add <archivo>...\" para marcar una resolución)"
+
+#: wt-status.c:185 wt-status.c:189
+msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
+msgstr ""
+" (usa \"git add/rm <archivo>...\" como una forma apropiada de marcar la "
+"resolución)"
+
+#: wt-status.c:187
+msgid " (use \"git rm <file>...\" to mark resolution)"
+msgstr " (usa \"git rm <file>...\" para marcar la resolución)"
+
+#: wt-status.c:198 wt-status.c:984
+msgid "Changes to be committed:"
+msgstr "Cambios a ser confirmados:"
+
+#: wt-status.c:216 wt-status.c:993
+msgid "Changes not staged for commit:"
+msgstr "Cambios no rastreados para el commit:"
+
+#: wt-status.c:220
+msgid " (use \"git add <file>...\" to update what will be committed)"
+msgstr ""
+" (usa \"git add <archivo>...\" para actualizar lo que será confirmado)"
+
+#: wt-status.c:222
+msgid " (use \"git add/rm <file>...\" to update what will be committed)"
+msgstr ""
+" (usa \"git add/rm <archivo>...\" para actualizar a lo que se le va a hacer "
+"commit)"
+
+#: wt-status.c:223
+msgid ""
+" (use \"git checkout -- <file>...\" to discard changes in working directory)"
+msgstr ""
+" (usa \"git checkout -- <archivo>...\" para descartar los cambios en el "
+"directorio de trabajo)"
+
+#: wt-status.c:225
+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)"
+
+#: wt-status.c:237
+#, c-format
+msgid " (use \"git %s <file>...\" to include in what will be committed)"
+msgstr ""
+" (usa \"git %s <archivo>...\" para incluirlo a lo que se será confirmado)"
+
+#: wt-status.c:252
+msgid "both deleted:"
+msgstr "ambos borrados:"
+
+#: wt-status.c:254
+msgid "added by us:"
+msgstr "agregado por nosotros:"
+
+#: wt-status.c:256
+msgid "deleted by them:"
+msgstr "borrados por ellso:"
+
+#: wt-status.c:258
+msgid "added by them:"
+msgstr "agregado por ellos:"
+
+#: wt-status.c:260
+msgid "deleted by us:"
+msgstr "borrado por nosotros:"
+
+#: wt-status.c:262
+msgid "both added:"
+msgstr "ambos agregados:"
+
+#: wt-status.c:264
+msgid "both modified:"
+msgstr "ambos modificados:"
+
+#: wt-status.c:274
+msgid "new file:"
+msgstr "nuevo archivo:"
+
+#: wt-status.c:276
+msgid "copied:"
+msgstr "copiado:"
+
+#: wt-status.c:278
+msgid "deleted:"
+msgstr "borrado:"
+
+#: wt-status.c:280
+msgid "modified:"
+msgstr "modificado:"
+
+#: wt-status.c:282
+msgid "renamed:"
+msgstr "renombrado:"
+
+#: wt-status.c:284
+msgid "typechange:"
+msgstr "cambio de tipo:"
+
+#: wt-status.c:286
+msgid "unknown:"
+msgstr "desconocido:"
+
+#: wt-status.c:288
+msgid "unmerged:"
+msgstr "des-fusionado:"
+
+#: wt-status.c:370
+msgid "new commits, "
+msgstr "nuevos commits, "
+
+#: wt-status.c:372
+msgid "modified content, "
+msgstr "contenido modificado, "
+
+#: wt-status.c:374
+msgid "untracked content, "
+msgstr "contenido no rastreado, "
+
+#: wt-status.c:824
+#, c-format
+msgid "Your stash currently has %d entry"
+msgid_plural "Your stash currently has %d entries"
+msgstr[0] "Tu stash actualmente tine %d entrada"
+msgstr[1] "Tu stash actualmente tiene %d entradas"
+
+#: wt-status.c:856
+msgid "Submodules changed but not updated:"
+msgstr "Submodulos cambiados pero no actualizados:"
+
+#: wt-status.c:858
+msgid "Submodule changes to be committed:"
+msgstr "Submodulos cambiados listos para realizar commit:"
+
+#: wt-status.c:940
+msgid ""
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr ""
+"No modifique o borre la línea de encima.\n"
+"Todo lo que este por abajo será removido."
+
+#: wt-status.c:1053
+msgid "You have unmerged paths."
+msgstr "tienes rutas no fusionadas"
+
+#: wt-status.c:1056
+msgid " (fix conflicts and run \"git commit\")"
+msgstr " (arregla los conflictos y corre \"git commit\""
+
+#: wt-status.c:1058
+msgid " (use \"git merge --abort\" to abort the merge)"
+msgstr " (usa \"git merge --abort\" para abortar la fusion)"
+
+#: wt-status.c:1063
+msgid "All conflicts fixed but you are still merging."
+msgstr "Todos los conflictos resueltos pero sigues fusionando."
+
+#: wt-status.c:1066
+msgid " (use \"git commit\" to conclude merge)"
+msgstr " (usa \"git commit\" para concluir la fusión)"
+
+#: wt-status.c:1076
+msgid "You are in the middle of an am session."
+msgstr "Estas en medio de una sesión am."
+
+#: wt-status.c:1079
+msgid "The current patch is empty."
+msgstr "El parche actual esta vacío."
+
+#: wt-status.c:1083
+msgid " (fix conflicts and then run \"git am --continue\")"
+msgstr " (arregla los conflictos y luego corre \"git am --continue\""
+
+#: wt-status.c:1085
+msgid " (use \"git am --skip\" to skip this patch)"
+msgstr " (usa \"git am --skip\" para saltar este parche)"
+
+#: wt-status.c:1087
+msgid " (use \"git am --abort\" to restore the original branch)"
+msgstr " (usa \"git am --abort\" para restaurar la rama original)"
+
+#: wt-status.c:1219
+msgid "git-rebase-todo is missing."
+msgstr "git-rebase-todo no esta presente."
+
+#: wt-status.c:1221
+msgid "No commands done."
+msgstr "No se realizaron los comandos."
+
+#: wt-status.c:1224
+#, c-format
+msgid "Last command done (%d command done):"
+msgid_plural "Last commands done (%d commands done):"
+msgstr[0] "El ultimo comando realizado (%d comando realizado):"
+msgstr[1] "Los ultimos comandos realizados (%d comandos realizados):"
+
+#: wt-status.c:1235
+#, c-format
+msgid " (see more in file %s)"
+msgstr " (ver mas en el archivo %s)"
+
+#: wt-status.c:1240
+msgid "No commands remaining."
+msgstr "No quedan mas comandos."
+
+#: wt-status.c:1243
+#, c-format
+msgid "Next command to do (%d remaining command):"
+msgid_plural "Next commands to do (%d remaining commands):"
+msgstr[0] "Siguiente comando a realizar (%d comando restante)"
+msgstr[1] "Siguiente comandos a realizar (%d comandos faltantes="
+
+#: wt-status.c:1251
+msgid " (use \"git rebase --edit-todo\" to view and edit)"
+msgstr " (usa \"git rebase --edit-todo\" para ver y editar)"
+
+#: wt-status.c:1264
+#, c-format
+msgid "You are currently rebasing branch '%s' on '%s'."
+msgstr "Estas aplicando un rebase de la rama '%s' en '%s."
+
+#: wt-status.c:1269
+msgid "You are currently rebasing."
+msgstr "Estas aplicando un rebase."
+
+#: wt-status.c:1283
+msgid " (fix conflicts and then run \"git rebase --continue\")"
+msgstr " (corrige los conflictos y ejecuta \"git rebase --continue\")"
+
+#: wt-status.c:1285
+msgid " (use \"git rebase --skip\" to skip this patch)"
+msgstr " (usa \"git rebase --skip\" para omitir este parche)"
+
+#: wt-status.c:1287
+msgid " (use \"git rebase --abort\" to check out the original branch)"
+msgstr " (usa \"git rebase --abort\" para volver a tu rama original)"
+
+#: wt-status.c:1293
+msgid " (all conflicts fixed: run \"git rebase --continue\")"
+msgstr " (todos los conflictos corregidos: ejecuta \"git rebase --continue\")"
+
+#: wt-status.c:1297
+#, c-format
+msgid ""
+"You are currently splitting a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Estas dividiendo un commit mientras aplicas un rebase de la rama '%s' en "
+"'%s'."
+
+#: wt-status.c:1302
+msgid "You are currently splitting a commit during a rebase."
+msgstr "Estas dividiendo un commit durante un rebase."
+
+#: wt-status.c:1305
+msgid " (Once your working directory is clean, run \"git rebase --continue\")"
+msgstr ""
+" (Una vez que tu directorio de trabajo esté limpio, ejecuta \"git rebase --"
+"continue\")"
+
+#: wt-status.c:1309
+#, c-format
+msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
+msgstr ""
+"Estas editando un commit mientras se aplica un rebase de la rama '%s' en "
+"'%s'."
+
+#: wt-status.c:1314
+msgid "You are currently editing a commit during a rebase."
+msgstr "Estas editando un commit durante un rebase."
+
+#: wt-status.c:1317
+msgid " (use \"git commit --amend\" to amend the current commit)"
+msgstr " (usa \"git commit --amend\" para enmendar el commit actual)"
+
+#: wt-status.c:1319
+msgid ""
+" (use \"git rebase --continue\" once you are satisfied with your changes)"
+msgstr ""
+" (usa \"git rebase --continue\" una vez que estés satisfecho con tus "
+"cambios)"
+
+#: wt-status.c:1329
+#, c-format
+msgid "You are currently cherry-picking commit %s."
+msgstr "Estas realizando un cherry-picking en el commit %s."
+
+#: wt-status.c:1334
+msgid " (fix conflicts and run \"git cherry-pick --continue\")"
+msgstr " (corrige los conflictos y ejecuta \"git cherry-pick --continue\")"
+
+#: wt-status.c:1337
+msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
+msgstr ""
+" (todos los conflictos corregidos: ejecuta \"git cherry-pick --continue\")"
+
+#: wt-status.c:1339
+msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
+msgstr ""
+" (use \"git cherry-pick --abort\" para cancelar la operación cherry-pick)"
+
+#: wt-status.c:1348
+#, c-format
+msgid "You are currently reverting commit %s."
+msgstr "Estas revirtiendo el commit %s."
+
+#: wt-status.c:1353
+msgid " (fix conflicts and run \"git revert --continue\")"
+msgstr " (corrige los conflictos y ejecuta \"git revert --continue\")"
+
+#: wt-status.c:1356
+msgid " (all conflicts fixed: run \"git revert --continue\")"
+msgstr " (todos los conflictos corregidos: ejecuta \"git revert --continue\")"
+
+#: wt-status.c:1358
+msgid " (use \"git revert --abort\" to cancel the revert operation)"
+msgstr " (usa \"git revert --abort\" para cancelar la operación de revertir)"
+
+#: wt-status.c:1369
+#, c-format
+msgid "You are currently bisecting, started from branch '%s'."
+msgstr "Estas aplicando un bisect, comenzando en la rama '%s'."
+
+#: wt-status.c:1373
+msgid "You are currently bisecting."
+msgstr "Estas aplicando un bisect."
+
+#: wt-status.c:1376
+msgid " (use \"git bisect reset\" to get back to the original branch)"
+msgstr " (usa \"git bisect reset\" para volver a la rama original)"
+
+#: wt-status.c:1573
+msgid "On branch "
+msgstr "En la rama "
+
+#: wt-status.c:1579
+msgid "interactive rebase in progress; onto "
+msgstr "rebase interactivo en progreso; en"
+
+#: wt-status.c:1581
+msgid "rebase in progress; onto "
+msgstr "rebase en progreso; en"
+
+#: wt-status.c:1586
+msgid "HEAD detached at "
+msgstr "HEAD desacoplada en"
+
+#: wt-status.c:1588
+msgid "HEAD detached from "
+msgstr "HEAD desacoplada de"
+
+#: wt-status.c:1591
+msgid "Not currently on any branch."
+msgstr "Actualmente no estás en ninguna rama."
+
+#: wt-status.c:1611
+msgid "Initial commit"
+msgstr "Confirmación inicial"
+
+#: wt-status.c:1612
+msgid "No commits yet"
+msgstr "No hay commits todavia"
+
+#: wt-status.c:1626
+msgid "Untracked files"
+msgstr "Archivos sin seguimiento"
+
+#: wt-status.c:1628
+msgid "Ignored files"
+msgstr "Archivos ignorados"
+
+#: wt-status.c:1632
+#, 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 ""
+"Tomó %.2f segundos enumerar los archivos no rastreados. 'status -uno'\n"
+"puede acelerarlo, pero tiene que ser cuidadoso de no olvidar agregar\n"
+"nuevos archivos usted mismo (vea 'git help status')."
+
+#: wt-status.c:1638
+#, c-format
+msgid "Untracked files not listed%s"
+msgstr "Archivos no rastreados no son mostrados %s"
+
+#: wt-status.c:1640
+msgid " (use -u option to show untracked files)"
+msgstr " (usa la opción -u para mostrar los archivos sin seguimiento)"
+
+#: wt-status.c:1646
+msgid "No changes"
+msgstr "Sin cambios"
+
+#: wt-status.c:1651
+#, c-format
+msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
+msgstr ""
+"sin cambios agregados al commit (usa \"git add\" y/o \"git commit -a\")\n"
+
+#: wt-status.c:1654
+#, c-format
+msgid "no changes added to commit\n"
+msgstr "no se agregaron cambios al commit\n"
+
+#: wt-status.c:1657
+#, c-format
+msgid ""
+"nothing added to commit but untracked files present (use \"git add\" to "
+"track)\n"
+msgstr ""
+"no hay nada agregado al commit pero hay archivos sin seguimiento presentes "
+"(usa \"git add\" para hacerles seguimiento)\n"
+
+#: wt-status.c:1660
+#, c-format
+msgid "nothing added to commit but untracked files present\n"
+msgstr ""
+"no hay nada agregado para confirmar, pero hay archivos sin seguimiento "
+"presentes\n"
+
+#: wt-status.c:1663
+#, c-format
+msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
+msgstr ""
+"no hay nada para confirmar (crea/copia archivos y usa \"git add\" para "
+"hacerles seguimiento)\n"
+
+#: wt-status.c:1666 wt-status.c:1671
+#, c-format
+msgid "nothing to commit\n"
+msgstr "nada para hacer commit\n"
+
+#: wt-status.c:1669
+#, c-format
+msgid "nothing to commit (use -u to show untracked files)\n"
+msgstr ""
+"nada para hacer commit (usa -u para mostrar los archivos no rastreados)\n"
+
+#: wt-status.c:1673
+#, c-format
+msgid "nothing to commit, working tree clean\n"
+msgstr "nada para hacer commit, el árbol de trabajo esta limpio\n"
+
+#: wt-status.c:1785
+msgid "No commits yet on "
+msgstr "No hay commits todavía en "
+
+#: wt-status.c:1789
+msgid "HEAD (no branch)"
+msgstr "HEAD (sin rama)"
+
+#: wt-status.c:1818 wt-status.c:1826
+msgid "behind "
+msgstr "detras"
+
+#: wt-status.c:1821 wt-status.c:1824
+msgid "ahead "
+msgstr "adelante"
+
+#. TRANSLATORS: the action is e.g. "pull with rebase"
+#: wt-status.c:2318
+#, c-format
+msgid "cannot %s: You have unstaged changes."
+msgstr "no se puede %s: Tienes cambios sin marcar."
+
+#: wt-status.c:2324
+msgid "additionally, your index contains uncommitted changes."
+msgstr "adicionalmente, tu índice contiene cambios que no están en un commit."
+
+#: wt-status.c:2326
+#, c-format
+msgid "cannot %s: Your index contains uncommitted changes."
+msgstr "no se puede %s: Tu índice contiene cambios que no están en un commit."
+
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
+#, c-format
+msgid "failed to unlink '%s'"
+msgstr "fallo al desvincular '%s'"
+
+#: builtin/add.c:24
+msgid "git add [<options>] [--] <pathspec>..."
+msgstr "git add [<opción>] [--] <especificación-de-ruta>..."
+
+#: builtin/add.c:83
+#, c-format
+msgid "unexpected diff status %c"
+msgstr "diff status inesperado %c"
+
+#: builtin/add.c:88 builtin/commit.c:291
+msgid "updating files failed"
+msgstr "fallo la actualización de carpetas"
+
+#: builtin/add.c:98
+#, c-format
+msgid "remove '%s'\n"
+msgstr "remover '%s'\n"
+
+#: builtin/add.c:173
+msgid "Unstaged changes after refreshing the index:"
+msgstr "Cambios fuera del área de stage tras refrescar el índice:"
+
+#: builtin/add.c:233 builtin/rev-parse.c:888
+msgid "Could not read the index"
+msgstr "No se pudo leer el indice"
+
+#: builtin/add.c:244
+#, c-format
+msgid "Could not open '%s' for writing."
+msgstr "No se pudo abrir '%s' para escritura."
+
+#: builtin/add.c:248
+msgid "Could not write patch"
+msgstr "No se puede escribir el parche"
+
+#: builtin/add.c:251
+msgid "editing patch failed"
+msgstr "fallo la edición del parche"
+
+#: builtin/add.c:254
+#, c-format
+msgid "Could not stat '%s'"
+msgstr "No se pudo definir '%s'"
+
+#: builtin/add.c:256
+msgid "Empty patch. Aborted."
+msgstr "Parche vacío. Abortado."
+
+#: builtin/add.c:261
+#, c-format
+msgid "Could not apply '%s'"
+msgstr "No se pudo aplicar '%s'"
+
+#: builtin/add.c:271
+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:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
+msgid "dry run"
+msgstr "dry run ( ejecución en seco)"
+
+#: builtin/add.c:294
+msgid "interactive picking"
+msgstr "selección interactiva"
+
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
+msgid "select hunks interactively"
+msgstr "elegir hunks de forma interactiva"
+
+#: builtin/add.c:296
+msgid "edit current diff and apply"
+msgstr "editar diff actual y aplicar"
+
+#: builtin/add.c:297
+msgid "allow adding otherwise ignored files"
+msgstr "permitir agregar caso contrario ignorar archivos"
+
+#: builtin/add.c:298
+msgid "update tracked files"
+msgstr "actualizado las carpetas rastreadas"
+
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "renormalizar EOL de los archivos rastreados (implica -u)"
+
+#: builtin/add.c:300
+msgid "record only the fact that the path will be added later"
+msgstr "grabar solo el hecho de que la ruta será agregada después"
+
+#: builtin/add.c:301
+msgid "add changes from all tracked and untracked files"
+msgstr "agregar los cambios de todas las carpetas con y sin seguimiento"
+
+#: builtin/add.c:304
+msgid "ignore paths removed in the working tree (same as --no-all)"
+msgstr "ignorar rutas removidas en el árbol de trabajo (lo mismo que --no-all)"
+
+#: builtin/add.c:306
+msgid "don't add, only refresh the index"
+msgstr "no agregar, solo actualizar el indice"
+
+#: builtin/add.c:307
+msgid "just skip files which cannot be added because of errors"
+msgstr "saltar las carpetas que no pueden ser agregadas a causa de errores"
+
+#: builtin/add.c:308
+msgid "check if - even missing - files are ignored in dry run"
+msgstr "comprobar si - incluso los archivos que faltan - se ignoran en dry run"
+
+#: builtin/add.c:309 builtin/update-index.c:964
+msgid "(+/-)x"
+msgstr "(+/-)x"
+
+#: builtin/add.c:309 builtin/update-index.c:965
+msgid "override the executable bit of the listed files"
+msgstr "sobrescribir el bit ejecutable de los archivos listados"
+
+#: builtin/add.c:311
+msgid "warn when adding an embedded repository"
+msgstr "avisar cuando se agrega un repositorio incrustado"
+
+#: builtin/add.c:326
+#, 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 ""
+"Se ha agregado otro repositorio de git dentro del repositorio actual.\n"
+"Clones del repositorio exterior no tendrán el contenido del \n"
+"repositorio embebido y no sabrán como obtenerla.\n"
+"Si quería agregar un submodulo, use:\n"
+"\n"
+"\tgit submodule add <url> %s\n"
+"\n"
+"Si se agrego esta ruta por error, puede removerla desde el índice \n"
+"usando:\n"
+"\n"
+"\tgit rm --cached %s\n"
+"\n"
+"Vea \"git help submodule\" para mas información."
+
+#: builtin/add.c:354
+#, c-format
+msgid "adding embedded git repository: %s"
+msgstr "agregando repositorio embebido: %s"
+
+#: builtin/add.c:372
+#, c-format
+msgid "Use -f if you really want to add them.\n"
+msgstr "Use -f si realmente quiere agregarlos.\n"
+
+#: builtin/add.c:380
+msgid "adding files failed"
+msgstr "fallo al agregar archivos"
+
+#: builtin/add.c:417
+msgid "-A and -u are mutually incompatible"
+msgstr "-A y -u son mutuamente incompatibles"
+
+#: builtin/add.c:424
+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:428
+#, c-format
+msgid "--chmod param '%s' must be either -x or +x"
+msgstr "El parámetro '%s' para --chmod debe ser -x ó +x"
+
+#: builtin/add.c:443
+#, c-format
+msgid "Nothing specified, nothing added.\n"
+msgstr "Nada especificado, nada agregado.\n"
+
+#: builtin/add.c:444
+#, c-format
+msgid "Maybe you wanted to say 'git add .'?\n"
+msgstr "Tal vez quiso decir 'git add .'?\n"
+
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
+msgid "index file corrupt"
+msgstr "archivo índice corrompido"
+
+#: builtin/am.c:414
+msgid "could not parse author script"
+msgstr "no se pudo analizar el script del autor"
+
+#: builtin/am.c:498
+#, c-format
+msgid "'%s' was deleted by the applypatch-msg hook"
+msgstr "'%s' fue borrado por el hook de applypatch-msg"
+
+#: builtin/am.c:539
+#, c-format
+msgid "Malformed input line: '%s'."
+msgstr "línea mal formada: '%s'."
+
+#: builtin/am.c:576
+#, c-format
+msgid "Failed to copy notes from '%s' to '%s'"
+msgstr "Fallo al copiar notas de '%s' a '%s'"
+
+#: builtin/am.c:602
+msgid "fseek failed"
+msgstr "fall de fseek"
+
+#: builtin/am.c:790
+#, c-format
+msgid "could not parse patch '%s'"
+msgstr "no se pudo analizar el parche '%s'"
+
+#: builtin/am.c:855
+msgid "Only one StGIT patch series can be applied at once"
+msgstr "Solo un parche StGIT puede ser aplicado de una vez "
+
+#: builtin/am.c:903
+msgid "invalid timestamp"
+msgstr "timestamp invalido"
+
+#: builtin/am.c:908 builtin/am.c:920
+msgid "invalid Date line"
+msgstr "línea Date invalida"
+
+#: builtin/am.c:915
+msgid "invalid timezone offset"
+msgstr "offset de zona horaria inválido"
+
+#: builtin/am.c:1008
+msgid "Patch format detection failed."
+msgstr "Falló al detectar el formato del parche."
+
+#: builtin/am.c:1013 builtin/clone.c:402
+#, c-format
+msgid "failed to create directory '%s'"
+msgstr "fallo al crear el directorio '%s'"
+
+#: builtin/am.c:1017
+msgid "Failed to split patches."
+msgstr "Fallo al dividir parches"
+
+#: builtin/am.c:1146 builtin/commit.c:376
+msgid "unable to write index file"
+msgstr "no es posible escribir en el archivo indice"
+
+#: builtin/am.c:1160
+#, c-format
+msgid "When you have resolved this problem, run \"%s --continue\"."
+msgstr "Cuando haya resuelto este problema, ejecute \"%s --continue\"."
+
+#: builtin/am.c:1161
+#, 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:1162
+#, c-format
+msgid "To restore the original branch and stop patching, run \"%s --abort\"."
+msgstr ""
+"Para restaurar la rama original y detener el parchado, ejecutar \"%s --abort"
+"\"."
+
+#: builtin/am.c:1269
+msgid "Patch is empty."
+msgstr "El parche esta vacío."
+
+#: builtin/am.c:1335
+#, c-format
+msgid "invalid ident line: %.*s"
+msgstr "sangría no válida: %.*s"
+
+#: builtin/am.c:1357
+#, c-format
+msgid "unable to parse commit %s"
+msgstr "no es posible analizar el commit %s"
+
+#: builtin/am.c:1550
+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:1552
+msgid "Using index info to reconstruct a base tree..."
+msgstr "Usando la información del índice para reconstruir un árbol base..."
+
+#: builtin/am.c:1571
+msgid ""
+"Did you hand edit your patch?\n"
+"It does not apply to blobs recorded in its index."
+msgstr ""
+"Editaste el parche a mano?\n"
+"No aplica a blobs guardados en su índice."
+
+#: builtin/am.c:1577
+msgid "Falling back to patching base and 3-way merge..."
+msgstr "Retrocediento para parchar base y fusión de 3-vías..."
+
+#: builtin/am.c:1602
+msgid "Failed to merge in the changes."
+msgstr "Falló al fusionar en los cambios."
+
+#: builtin/am.c:1626 builtin/merge.c:642
+msgid "git write-tree failed to write a tree"
+msgstr "git write-tree falló al escribir el árbol"
+
+#: builtin/am.c:1633
+msgid "applying to an empty history"
+msgstr "aplicando a un historial vacio"
+
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
+msgid "failed to write commit object"
+msgstr "fallo al escribir el objeto commit"
+
+#: builtin/am.c:1679 builtin/am.c:1683
+#, c-format
+msgid "cannot resume: %s does not exist."
+msgstr "no se puede continuar: %s no existe"
+
+#: builtin/am.c:1699
+msgid "cannot be interactive without stdin connected to a terminal."
+msgstr "no se puede ser interactivo sin stdin conectado a un terminal"
+
+#: builtin/am.c:1704
+msgid "Commit Body is:"
+msgstr "Cuerpo de commit es:"
+
+#. 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:1714
+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:1764
+#, c-format
+msgid "Dirty index: cannot apply patches (dirty: %s)"
+msgstr "Índice sucio: no se puede aplicar parches (sucio: %s)"
+
+#: builtin/am.c:1804 builtin/am.c:1876
+#, c-format
+msgid "Applying: %.*s"
+msgstr "Aplicando: %.*s"
+
+#: builtin/am.c:1820
+msgid "No changes -- Patch already applied."
+msgstr "Sin cambios -- parche ya aplicado."
+
+#: builtin/am.c:1828
+#, c-format
+msgid "Patch failed at %s %.*s"
+msgstr "El parche fallo en %s %.*s"
+
+#: builtin/am.c:1834
+#, c-format
+msgid "The copy of the patch that failed is found in: %s"
+msgstr "La copia del parche que fallido se encuentra en: %s"
+
+#: builtin/am.c:1879
+msgid ""
+"No changes - did you forget to use 'git add'?\n"
+"If there is nothing left to stage, chances are that something else\n"
+"already introduced the same changes; you might want to skip this patch."
+msgstr ""
+"Sin cambios - olvidaste usar 'git add'?\n"
+"Si no hay nada en el área de stage, las posibilidad es que algo mas\n"
+"ya haya introducido el mismo cambio; tal vez quieras omitir este parche."
+
+#: builtin/am.c:1886
+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 ""
+"Todavía tiene rutas sin fusionar en su índice.\n"
+"Debe realizar 'git add' cada archivo con conflictos resueltos y marcarlos "
+"como tal.\n"
+"Tal vez ejecute `git rm` en el archivo para aceptar \"borrado por ellos\" en "
+"él."
+
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
+#, c-format
+msgid "Could not parse object '%s'."
+msgstr "No se pudo analizar el objeto '%s'."
+
+#: builtin/am.c:2045
+msgid "failed to clean index"
+msgstr "fallo al limpiar el indice"
+
+#: builtin/am.c:2080
+msgid ""
+"You seem to have moved HEAD since the last 'am' failure.\n"
+"Not rewinding to ORIG_HEAD"
+msgstr ""
+"Parece haber movido HEAD desde el último fallo 'am'.\n"
+"No rebobinando a ORIG_HEAD "
+
+#: builtin/am.c:2143
+#, c-format
+msgid "Invalid value for --patch-format: %s"
+msgstr "valor invalido para --patch-format: %s"
+
+#: builtin/am.c:2176
+msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
+msgstr "git am [<opciones>] [(<mbox> | <Directorio-de-correo>)...]"
+
+#: builtin/am.c:2177
+msgid "git am [<options>] (--continue | --skip | --abort)"
+msgstr "git am [<opciones>] (--continue | --skip | --abort)"
+
+#: builtin/am.c:2183
+msgid "run interactively"
+msgstr "ejecutar de manera interactiva"
+
+#: builtin/am.c:2185
+msgid "historical option -- no-op"
+msgstr "opción histórica -- no-op"
+
+#: builtin/am.c:2187
+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:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/repack.c:180
+msgid "be quiet"
+msgstr "ser silencioso"
+
+#: builtin/am.c:2190
+msgid "add a Signed-off-by line to the commit message"
+msgstr "agregar una línea \"Firmado-por\" al mensaje del commit"
+
+#: builtin/am.c:2193
+msgid "recode into utf8 (default)"
+msgstr "recodificar en utf8 (default)"
+
+#: builtin/am.c:2195
+msgid "pass -k flag to git-mailinfo"
+msgstr "pasar flag -k a git-mailinfo"
+
+#: builtin/am.c:2197
+msgid "pass -b flag to git-mailinfo"
+msgstr "pasar flag -b a git-mailinfo"
+
+#: builtin/am.c:2199
+msgid "pass -m flag to git-mailinfo"
+msgstr "pasar flag -m a git-mailinfo"
+
+#: builtin/am.c:2201
+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:2204
+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:2207
+msgid "strip everything before a scissors line"
+msgstr "descubrir todo antes de una línea de tijeras"
+
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
+msgid "pass it through git-apply"
+msgstr "pasarlo a través de git-apply"
+
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
+msgid "n"
+msgstr "n"
+
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
+msgid "format"
+msgstr "formato"
+
+#: builtin/am.c:2233
+msgid "format the patch(es) are in"
+msgstr "formatear el parche(s)"
+
+#: builtin/am.c:2239
+msgid "override error message when patch failure occurs"
+msgstr "sobrescribir mensajes de error cuando fallos de parchado ocurran"
+
+#: builtin/am.c:2241
+msgid "continue applying patches after resolving a conflict"
+msgstr "continuar aplicando los parches tras resolver conflictos"
+
+#: builtin/am.c:2244
+msgid "synonyms for --continue"
+msgstr "sinónimos para --continue"
+
+#: builtin/am.c:2247
+msgid "skip the current patch"
+msgstr "saltar el parche actual"
+
+#: builtin/am.c:2250
+msgid "restore the original branch and abort the patching operation."
+msgstr "restaurar la rama original y abortar la operación de parchado."
+
+#: builtin/am.c:2254
+msgid "lie about committer date"
+msgstr "mentir sobre la fecha del committer"
+
+#: builtin/am.c:2256
+msgid "use current timestamp for author date"
+msgstr "usar el timestamp actual para la fecha del autor"
+
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
+msgid "key-id"
+msgstr "key-id"
+
+#: builtin/am.c:2259
+msgid "GPG-sign commits"
+msgstr "commits con firma GPG"
+
+#: builtin/am.c:2262
+msgid "(internal use for git-rebase)"
+msgstr "(uso interno para git-rebase)"
+
+#: builtin/am.c:2280
+msgid ""
+"The -b/--binary option has been a no-op for long time, and\n"
+"it will be removed. Please do not use it anymore."
+msgstr ""
+"La opción -b/--binary ha estado deshabilitada por mucho tiempo, y\n"
+"será removida. Por favor no la use más."
+
+#: builtin/am.c:2287
+msgid "failed to read the index"
+msgstr "fallo al leer el indice"
+
+#: builtin/am.c:2302
+#, c-format
+msgid "previous rebase directory %s still exists but mbox given."
+msgstr "directorio de rebase previo %s todavía existe en el mbox dado."
+
+#: builtin/am.c:2326
+#, 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."
+
+#: builtin/am.c:2332
+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/apply.c:8
+msgid "git apply [<options>] [<patch>...]"
+msgstr "git apply [<opciones>] [<parch>...]"
+
+#: builtin/archive.c:17
+#, c-format
+msgid "could not create archive file '%s'"
+msgstr "no se pudo crear el archivo comprimido '%s'"
+
+#: builtin/archive.c:20
+msgid "could not redirect output"
+msgstr "no se pudo direccionar la salida"
+
+#: builtin/archive.c:37
+msgid "git archive: Remote with no URL"
+msgstr "git archive: Remote sin URL"
+
+#: builtin/archive.c:58
+msgid "git archive: expected ACK/NAK, got EOF"
+msgstr "git archive: se esperaba ACK/NAK, se obtuvo EOF"
+
+#: builtin/archive.c:61
+#, c-format
+msgid "git archive: NACK %s"
+msgstr "git archive: NACK %s"
+
+#: builtin/archive.c:64
+msgid "git archive: protocol error"
+msgstr "git archive: error de protocolo"
+
+#: builtin/archive.c:68
+msgid "git archive: expected a flush"
+msgstr "git archive: se esperaba un flush"
+
+#: builtin/bisect--helper.c:12
+msgid "git bisect--helper --next-all [--no-checkout]"
+msgstr "git bisect--helper --next-all [--no-checkout]"
+
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <mal_término> <buen_término>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' no es un término válido."
+
+#: builtin/bisect--helper.c:50
+#, 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:60
+#, 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:71
+msgid "please use two different terms"
+msgstr "por favor use dos términos diferentes"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "no se pudo abrir el archivo BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
+msgid "perform 'git bisect next'"
+msgstr "realiza 'git bisect next'"
+
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "escribe los términos a .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "limpiar el estado de bisección"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "revisar por revs esperados"
+
+#: builtin/bisect--helper.c:128
+msgid "update BISECT_HEAD instead of checking out the current commit"
+msgstr "actualiza BISECT_HEAD en lugar de revisar el commit actual"
+
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms requiere dos argumentos"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state no requiere argumentos"
+
+#: builtin/blame.c:27
+msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
+msgstr "git blame [<opciones>] [<opciones-rev>] [<revision>] [--] <archivo>"
+
+#: builtin/blame.c:32
+msgid "<rev-opts> are documented in git-rev-list(1)"
+msgstr "<rev-opts> están documentadas en git-rev-list(1)"
+
+#: builtin/blame.c:668
+msgid "Show blame entries as we find them, incrementally"
+msgstr "Mostrar las entradas blame como las encontramos, incrementalmente"
+
+#: builtin/blame.c:669
+msgid "Show blank SHA-1 for boundary commits (Default: off)"
+msgstr "Mostrar SHA-1 en blanco para commits extremos (Default: off)"
+
+#: builtin/blame.c:670
+msgid "Do not treat root commits as boundaries (Default: off)"
+msgstr "No tratar commits raíces como extremos (Default: off)"
+
+#: builtin/blame.c:671
+msgid "Show work cost statistics"
+msgstr "Mostrar estadísticas de costo de trabajo"
+
+#: builtin/blame.c:672
+msgid "Force progress reporting"
+msgstr "Forzar el reporte de progreso"
+
+#: builtin/blame.c:673
+msgid "Show output score for blame entries"
+msgstr "Mostrar la puntuación de salida de las entradas de blame"
+
+#: builtin/blame.c:674
+msgid "Show original filename (Default: auto)"
+msgstr "Mostrar nombre original del archivo (Default: auto)"
+
+#: builtin/blame.c:675
+msgid "Show original linenumber (Default: off)"
+msgstr "Mostrar número de línea original (Default: off)"
+
+#: builtin/blame.c:676
+msgid "Show in a format designed for machine consumption"
+msgstr "Mostrar en un formato diseñado para consumo de máquina"
+
+#: builtin/blame.c:677
+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:678
+msgid "Use the same output mode as git-annotate (Default: off)"
+msgstr "Usar el mismo modo salida como git-annotate (Default: off)"
+
+#: builtin/blame.c:679
+msgid "Show raw timestamp (Default: off)"
+msgstr "Mostrar timestamp en formato raw (Default: off)"
+
+#: builtin/blame.c:680
+msgid "Show long commit SHA1 (Default: off)"
+msgstr "Mostrar SHA1 del commit en formato largo (Default: off)"
+
+#: builtin/blame.c:681
+msgid "Suppress author name and timestamp (Default: off)"
+msgstr "Suprimir nombre del autor y timestamp (Default: off)"
+
+#: builtin/blame.c:682
+msgid "Show author email instead of name (Default: off)"
+msgstr "Mostrar en cambio el email del autor (Default: off)"
+
+#: builtin/blame.c:683
+msgid "Ignore whitespace differences"
+msgstr "Ignorar diferencias de espacios en blanco"
+
+#: builtin/blame.c:690
+msgid "Use an experimental heuristic to improve diffs"
+msgstr "Usar un heurístico experimental para mejorar los diffs"
+
+#: builtin/blame.c:692
+msgid "Spend extra cycles to find better match"
+msgstr "Ocupo más ciclos para encontrar mejoras resultados"
+
+#: builtin/blame.c:693
+msgid "Use revisions from <file> instead of calling git-rev-list"
+msgstr "Use revisiones desde <archivo> en lugar de llamar git-rev-list"
+
+#: builtin/blame.c:694
+msgid "Use <file>'s contents as the final image"
+msgstr "Usar contenido de <archivo> como imagen final"
+
+#: builtin/blame.c:695 builtin/blame.c:696
+msgid "score"
+msgstr "puntaje"
+
+#: builtin/blame.c:695
+msgid "Find line copies within and across files"
+msgstr "Encontrar copias de líneas entre y a través de archivos"
+
+#: builtin/blame.c:696
+msgid "Find line movements within and across files"
+msgstr "Encontrar movimientos de líneas entre y a través de archivos"
+
+#: builtin/blame.c:697
+msgid "n,m"
+msgstr "n,m"
+
+#: builtin/blame.c:697
+msgid "Process only line range n,m, counting from 1"
+msgstr "Procesar solo el rango de líneas n,m, contando desde 1"
+
+#: builtin/blame.c:744
+msgid "--progress can't be used with --incremental or porcelain formats"
+msgstr "--progress no puede ser usado con --incremental o formatos porcelana"
+
+#. TRANSLATORS: This string is used to tell us the
+#. maximum display width for a relative timestamp in
+#. "git blame" output. For C locale, "4 years, 11
+#. months ago", which takes 22 places, is the longest
+#. among various forms of relative timestamps, but
+#. your language may need more or fewer display
+#. columns.
+#.
+#: builtin/blame.c:795
+msgid "4 years, 11 months ago"
+msgstr "hace 4 años, 11 meses"
+
+#: builtin/blame.c:882
+#, 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:928
+msgid "Blaming lines"
+msgstr "Blaming a líneas"
+
+#: builtin/branch.c:27
+msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
+msgstr "git branch [<opciones>] [-r | -a] [--merged | --no-merged]"
+
+#: builtin/branch.c:28
+msgid "git branch [<options>] [-l] [-f] <branch-name> [<start-point>]"
+msgstr "git branch [<opciones>] [-l] [-f] <nombre-de-rama> [<punto-inicial>]"
+
+#: builtin/branch.c:29
+msgid "git branch [<options>] [-r] (-d | -D) <branch-name>..."
+msgstr "git branch [<opciones>] [-r] (-d | -D) <nombre-de-rama>..."
+
+#: builtin/branch.c:30
+msgid "git branch [<options>] (-m | -M) [<old-branch>] <new-branch>"
+msgstr "git branch [<opciones>] (-m | -M) [<rama-vieja>] <rama-nueva>"
+
+#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<opciones>] (-c | -C) [<rama-vieja>] <rama-nueva>"
+
+#: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr "git branch [<opciones>] [-r | -a] [--points-at]"
+
+#: builtin/branch.c:33
+msgid "git branch [<options>] [-r | -a] [--format]"
+msgstr "git branch [<opciones>] [-r | -a] [--formato]"
+
+#: builtin/branch.c:146
+#, c-format
+msgid ""
+"deleting branch '%s' that has been merged to\n"
+" '%s', but not yet merged to HEAD."
+msgstr ""
+"borrando la rama '%s' que ha sido fusionada en\n"
+" '%s', pero aún no ha sido fusionada a HEAD."
+
+#: builtin/branch.c:150
+#, c-format
+msgid ""
+"not deleting branch '%s' that is not yet merged to\n"
+" '%s', even though it is merged to HEAD."
+msgstr ""
+"no borrando rama '%s' que todavía no ha sido fusionada \n"
+"\ta '%s', aunque se fusione con HEAD."
+
+#: builtin/branch.c:164
+#, c-format
+msgid "Couldn't look up commit object for '%s'"
+msgstr "No se pudo encontrar el objeto commit para '%s'"
+
+#: builtin/branch.c:168
+#, 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 ""
+"La rama '%s' no ha sido fusionada completamente.\n"
+"Si está seguro de querer borrarla, ejecute 'git branch -D %s'."
+
+#: builtin/branch.c:181
+msgid "Update of config-file failed"
+msgstr "Fallo de actualización de config-file"
+
+#: builtin/branch.c:212
+msgid "cannot use -a with -d"
+msgstr "no se puede usar-a con -d"
+
+#: builtin/branch.c:218
+msgid "Couldn't look up commit object for HEAD"
+msgstr "No se pudo revisar el objeto commit para HEAD"
+
+#: builtin/branch.c:232
+#, c-format
+msgid "Cannot delete branch '%s' checked out at '%s'"
+msgstr "No se puede borrar rama '%s' que cuenta con checkout en '%s'"
+
+#: builtin/branch.c:247
+#, c-format
+msgid "remote-tracking branch '%s' not found."
+msgstr "rama de rastreo remoto '%s' no encontrada."
+
+#: builtin/branch.c:248
+#, c-format
+msgid "branch '%s' not found."
+msgstr "rama '%s' no encontrada."
+
+#: builtin/branch.c:263
+#, c-format
+msgid "Error deleting remote-tracking branch '%s'"
+msgstr "Error al eliminar la rama de rastreo remota '%s'"
+
+#: builtin/branch.c:264
+#, c-format
+msgid "Error deleting branch '%s'"
+msgstr "Error al eliminar la rama '%s'"
+
+#: builtin/branch.c:271
+#, c-format
+msgid "Deleted remote-tracking branch %s (was %s).\n"
+msgstr "Eliminada la rama de rastreo remota %s (era %s).\n"
+
+#: builtin/branch.c:272
+#, c-format
+msgid "Deleted branch %s (was %s).\n"
+msgstr "Eliminada la rama %s (era %s)..\n"
+
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "no es posible analizar el string de formato"
+
+#: builtin/branch.c:450
+#, c-format
+msgid "Branch %s is being rebased at %s"
+msgstr "Rama %s está siendo rebasada en %s"
+
+#: builtin/branch.c:454
+#, c-format
+msgid "Branch %s is being bisected at %s"
+msgstr "Rama %s está siendo bisecada en %s"
+
+#: builtin/branch.c:471
+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:473
+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:484
+#, c-format
+msgid "Invalid branch name: '%s'"
+msgstr "Nombre de rama invalido: '%s'"
+
+#: builtin/branch.c:511
+msgid "Branch rename failed"
+msgstr "Cambio de nombre de rama fallido"
+
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Copiado de rama fallido"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Copia creada de la rama malnombrada '%s' "
+
+#: builtin/branch.c:520
+#, c-format
+msgid "Renamed a misnamed branch '%s' away"
+msgstr "Rama mal llamada '%s' renombrada"
+
+#: builtin/branch.c:526
+#, 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:535
+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:537
+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:553
+#, c-format
+msgid ""
+"Please edit the description for the branch\n"
+" %s\n"
+"Lines starting with '%c' will be stripped.\n"
+msgstr ""
+"Por favor, edita la descripción para la rama\n"
+"%s\n"
+"Las líneas que comiencen con '%c' serán removidas.\n"
+
+#: builtin/branch.c:586
+msgid "Generic options"
+msgstr "Opciones genericas"
+
+#: builtin/branch.c:588
+msgid "show hash and subject, give twice for upstream branch"
+msgstr "mostrar hash y tema, dar dos veces para rama upstream"
+
+#: builtin/branch.c:589
+msgid "suppress informational messages"
+msgstr "Suprimir mensajes informativos"
+
+#: builtin/branch.c:590
+msgid "set up tracking mode (see git-pull(1))"
+msgstr "configurando modo tracking (mirar git-pull(1))"
+
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "no usar"
+
+#: builtin/branch.c:594
+msgid "upstream"
+msgstr "upstream"
+
+#: builtin/branch.c:594
+msgid "change the upstream info"
+msgstr "cambiar info de upstream"
+
+#: builtin/branch.c:595
+msgid "Unset the upstream info"
+msgstr "Desconfigurando la info de upstream"
+
+#: builtin/branch.c:596
+msgid "use colored output"
+msgstr "usar salida con colores"
+
+#: builtin/branch.c:597
+msgid "act on remote-tracking branches"
+msgstr "actuar en ramas de traqueo remoto"
+
+#: builtin/branch.c:599 builtin/branch.c:601
+msgid "print only branches that contain the commit"
+msgstr "mostrar solo ramas que contienen el commit"
+
+#: builtin/branch.c:600 builtin/branch.c:602
+msgid "print only branches that don't contain the commit"
+msgstr "mostrar solo ramas que no contienen el commit"
+
+#: builtin/branch.c:605
+msgid "Specific git-branch actions:"
+msgstr "Acciones específicas de git-branch:"
+
+#: builtin/branch.c:606
+msgid "list both remote-tracking and local branches"
+msgstr "listar ramas de remote-tracking y locales"
+
+#: builtin/branch.c:608
+msgid "delete fully merged branch"
+msgstr "borrar ramas totalmente fusionadas"
+
+#: builtin/branch.c:609
+msgid "delete branch (even if not merged)"
+msgstr "borar rama (incluso si no esta fusionada)"
+
+#: builtin/branch.c:610
+msgid "move/rename a branch and its reflog"
+msgstr "mover/renombrar una rama y su reflog"
+
+#: builtin/branch.c:611
+msgid "move/rename a branch, even if target exists"
+msgstr "mover/renombrar una rama, incluso si el destino existe"
+
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "copiar una rama y su reflog"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "copiar una rama, incluso si el objetivo existe"
+
+#: builtin/branch.c:614
+msgid "list branch names"
+msgstr "listar nombres de ramas"
+
+#: builtin/branch.c:615
+msgid "create the branch's reflog"
+msgstr "crea el reflog de la rama"
+
+#: builtin/branch.c:617
+msgid "edit the description for the branch"
+msgstr "edita la descripción de la rama"
+
+#: builtin/branch.c:618
+msgid "force creation, move/rename, deletion"
+msgstr "fuerza la creación,movimiento/renombrado,borrado"
+
+#: builtin/branch.c:619
+msgid "print only branches that are merged"
+msgstr "muestra solo ramas que han sido fusionadas"
+
+#: builtin/branch.c:620
+msgid "print only branches that are not merged"
+msgstr "muestra solo ramas que no han sido fusionadas"
+
+#: builtin/branch.c:621
+msgid "list branches in columns"
+msgstr "muestra las ramas en columnas"
+
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
+msgid "key"
+msgstr "clave"
+
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
+msgid "field name to sort on"
+msgstr "nombre del campo por el cuál ordenar"
+
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
+msgid "object"
+msgstr "objeto"
+
+#: builtin/branch.c:626
+msgid "print only branches of the object"
+msgstr "imprimir sólo las ramas del objeto"
+
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
+msgid "sorting and filtering are case insensitive"
+msgstr "ordenamiento y filtrado son case-insensitive"
+
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
+#: builtin/verify-tag.c:39
+msgid "format to use for the output"
+msgstr "formato para usar para el output"
+
+#: builtin/branch.c:652 builtin/clone.c:730
+msgid "HEAD not found below refs/heads!"
+msgstr "HEAD no encontrado abajo de refs/heads!"
+
+#: builtin/branch.c:675
+msgid "--column and --verbose are incompatible"
+msgstr "--column y --verbose son incompatibles"
+
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
+msgid "branch name required"
+msgstr "se necesita el nombre de la rama"
+
+#: builtin/branch.c:718
+msgid "Cannot give description to detached HEAD"
+msgstr "No se puede dar descripción al HEAD desacoplado"
+
+#: builtin/branch.c:723
+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:730
+#, c-format
+msgid "No commit on branch '%s' yet."
+msgstr "Aún no hay commits en la rama '%s'."
+
+#: builtin/branch.c:733
+#, c-format
+msgid "No branch named '%s'."
+msgstr "No hay ninguna rama llamada '%s'."
+
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "demasiadas ramas para una operación de copiado"
+
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "demasiados argumentos para una operación de renombrado"
+
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "demasiados argumentos para configurar un nuevo upstream"
+
+#: builtin/branch.c:766
+#, c-format
+msgid ""
+"could not set upstream of HEAD to %s when it does not point to any branch."
+msgstr ""
+"no se pudo configurar upstream de HEAD a %s cuando este no apunta a ninguna "
+"rama."
+
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
+#, c-format
+msgid "no such branch '%s'"
+msgstr "no hay tal rama '%s'"
+
+#: builtin/branch.c:773
+#, c-format
+msgid "branch '%s' does not exist"
+msgstr "la rama '%s' no existe"
+
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "demasiados argumentos para desconfigurar upstream"
+
+#: builtin/branch.c:789
+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:795
+#, c-format
+msgid "Branch '%s' has no upstream information"
+msgstr "Rama '%s' no tiene información de upstream"
+
+#: builtin/branch.c:810
+msgid "-a and -r options to 'git branch' do not make sense with a branch name"
+msgstr ""
+"opciones -a y -r para 'git branch' no tienen sentido con un nombre de rama"
+
+#: builtin/branch.c:813
+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 '--"
+"set-upstream-to' en cambio."
+
+#: builtin/bundle.c:45
+#, c-format
+msgid "%s is okay\n"
+msgstr "%s está bien\n"
+
+#: builtin/bundle.c:58
+msgid "Need a repository to create a bundle."
+msgstr "Se necesita un repositorio para agrupar."
+
+#: builtin/bundle.c:62
+msgid "Need a repository to unbundle."
+msgstr "Se necesita un repositorio para desagrupar."
+
+#: builtin/cat-file.c:521
+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 | <tipo> | --textconv | --filters) [--path=<ruta>] <objeto>"
+
+#: builtin/cat-file.c:522
+msgid ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+msgstr ""
+"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
+"filters]"
+
+#: builtin/cat-file.c:559
+msgid "<type> can be one of: blob, tree, commit, tag"
+msgstr "<tipo> puede ser: blob, tree, commit, tag"
+
+#: builtin/cat-file.c:560
+msgid "show object type"
+msgstr "mostrar el tipo del objeto"
+
+#: builtin/cat-file.c:561
+msgid "show object size"
+msgstr "mostrar el tamaño del objeto"
+
+#: builtin/cat-file.c:563
+msgid "exit with zero when there's no error"
+msgstr "salir con cero cuando no haya error"
+
+#: builtin/cat-file.c:564
+msgid "pretty-print object's content"
+msgstr "realizar pretty-print del contenido del objeto"
+
+#: builtin/cat-file.c:566
+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:568
+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:569 git-submodule.sh:931
+msgid "blob"
+msgstr "blob"
+
+#: builtin/cat-file.c:570
+msgid "use a specific path for --textconv/--filters"
+msgstr "use una ruta específica para --textconv/--filters"
+
+#: builtin/cat-file.c:572
+msgid "allow -s and -t to work with broken/corrupt objects"
+msgstr "permita -s y -t para trabajar con objetos rotos o corruptos"
+
+#: builtin/cat-file.c:573
+msgid "buffer --batch output"
+msgstr "salida buffer --batch "
+
+#: builtin/cat-file.c:575
+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:578
+msgid "show info about objects fed from the standard input"
+msgstr "mostrar info de los objetos alimentados por standard input"
+
+#: builtin/cat-file.c:581
+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:583
+msgid "show all objects with --batch or --batch-check"
+msgstr "mostrar todos los objetos con --batch o --batch-check"
+
+#: builtin/check-attr.c:12
+msgid "git check-attr [-a | --all | <attr>...] [--] <pathname>..."
+msgstr "git check-attr [-a | --all | <attr>...] [--] <nombre-de-ruta>..."
+
+#: builtin/check-attr.c:13
+msgid "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+msgstr "git check-attr --stdin [-z] [-a | --all | <attr>...]"
+
+#: builtin/check-attr.c:20
+msgid "report all attributes set on file"
+msgstr "reportar todos los atributos configurados en el archivo"
+
+#: builtin/check-attr.c:21
+msgid "use .gitattributes only from the index"
+msgstr "use .gitattributes solo desde el índice"
+
+#: builtin/check-attr.c:22 builtin/check-ignore.c:24 builtin/hash-object.c:99
+msgid "read file names from stdin"
+msgstr "leer nombres de archivos de stdin"
+
+#: builtin/check-attr.c:24 builtin/check-ignore.c:26
+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:20 builtin/checkout.c:1118 builtin/gc.c:358
+msgid "suppress progress reporting"
+msgstr "suprimir el reporte de progreso"
+
+#: builtin/check-ignore.c:28
+msgid "show non-matching input paths"
+msgstr "mostrar rutas de entrada que no concuerdan"
+
+#: builtin/check-ignore.c:30
+msgid "ignore index when checking"
+msgstr "ignorar el índice cuando se revise"
+
+#: builtin/check-ignore.c:158
+msgid "cannot specify pathnames with --stdin"
+msgstr "no se puede especificar los nombres de rutas con --stdin"
+
+#: builtin/check-ignore.c:161
+msgid "-z only makes sense with --stdin"
+msgstr "-z sólo tiene sentido con --stdin"
+
+#: builtin/check-ignore.c:163
+msgid "no path specified"
+msgstr "ruta no especificada"
+
+#: builtin/check-ignore.c:167
+msgid "--quiet is only valid with a single pathname"
+msgstr "--quiet solo es válido con un nombre de ruta único"
+
+#: builtin/check-ignore.c:169
+msgid "cannot have both --quiet and --verbose"
+msgstr "no se puede tener ambos --quiet y --verbose"
+
+#: builtin/check-ignore.c:172
+msgid "--non-matching is only valid with --verbose"
+msgstr "--non-matching sólo es válida con --verbose"
+
+#: builtin/check-mailmap.c:9
+msgid "git check-mailmap [<options>] <contact>..."
+msgstr "git check-mailmap [<opciones>] <contacto>..."
+
+#: builtin/check-mailmap.c:14
+msgid "also read contacts from stdin"
+msgstr "también leer contactos desde stdin"
+
+#: builtin/check-mailmap.c:25
+#, c-format
+msgid "unable to parse contact: %s"
+msgstr "no es posible analizar el contacto: %s"
+
+#: builtin/check-mailmap.c:48
+msgid "no contacts specified"
+msgstr "contactos no especificados"
+
+#: builtin/checkout-index.c:128
+msgid "git checkout-index [<options>] [--] [<file>...]"
+msgstr "git checkout-index [<opciones>] [--] [<archivo>...]"
+
+#: builtin/checkout-index.c:143
+msgid "stage should be between 1 and 3 or all"
+msgstr "stage tiene que estar entre 1 y 3 o all"
+
+#: builtin/checkout-index.c:159
+msgid "check out all files in the index"
+msgstr "revisar todos los archivos en el indice"
+
+#: builtin/checkout-index.c:160
+msgid "force overwrite of existing files"
+msgstr "forzar sobreescritura de los archivos existentes"
+
+#: builtin/checkout-index.c:162
+msgid "no warning for existing files and files not in index"
+msgstr ""
+"no hay advertencias para los archivos existentes y los archivos no están en "
+"el índice"
+
+#: builtin/checkout-index.c:164
+msgid "don't checkout new files"
+msgstr "no revisar archivos nuevos"
+
+#: builtin/checkout-index.c:166
+msgid "update stat information in the index file"
+msgstr "actualizar información de estado en el archivo índice"
+
+#: builtin/checkout-index.c:170
+msgid "read list of paths from the standard input"
+msgstr "leer lista de rutas desde standard input"
+
+#: builtin/checkout-index.c:172
+msgid "write the content to temporary files"
+msgstr "escribir el contenido en un archivo temporal"
+
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
+msgid "string"
+msgstr "string"
+
+#: builtin/checkout-index.c:174
+msgid "when creating files, prepend <string>"
+msgstr "cuando cree archivos, anteponer <string>"
+
+#: builtin/checkout-index.c:176
+msgid "copy out the files from named stage"
+msgstr "copiar los archivos del stage nombrado"
+
+#: builtin/checkout.c:27
+msgid "git checkout [<options>] <branch>"
+msgstr "git checkout [<opciones>] <rama>"
+
+#: builtin/checkout.c:28
+msgid "git checkout [<options>] [<branch>] -- <file>..."
+msgstr "git checkout [<opciones>] [<rama>] -- <archivo>..."
+
+#: builtin/checkout.c:136 builtin/checkout.c:169
+#, c-format
+msgid "path '%s' does not have our version"
+msgstr "ruta '%s' no tiene nuestra versión"
+
+#: builtin/checkout.c:138 builtin/checkout.c:171
+#, c-format
+msgid "path '%s' does not have their version"
+msgstr "ruta '%s' no tiene su versión"
+
+#: builtin/checkout.c:154
+#, c-format
+msgid "path '%s' does not have all necessary versions"
+msgstr "ruta '%s' no tiene todas las versiones necesarias"
+
+#: builtin/checkout.c:198
+#, c-format
+msgid "path '%s' does not have necessary versions"
+msgstr "ruta '%s' no tiene versiones necesarias"
+
+#: builtin/checkout.c:215
+#, c-format
+msgid "path '%s': cannot merge"
+msgstr "ruta '%s': no se puede fusionar"
+
+#: builtin/checkout.c:232
+#, c-format
+msgid "Unable to add merge result for '%s'"
+msgstr "Incapaz de agregar resultados de fusión a '%s'"
+
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
+#, c-format
+msgid "'%s' cannot be used with updating paths"
+msgstr "'%s' no puede ser usada con rutas actualizadas"
+
+#: builtin/checkout.c:266 builtin/checkout.c:269
+#, c-format
+msgid "'%s' cannot be used with %s"
+msgstr "'%s' no puede ser usado con %s"
+
+#: builtin/checkout.c:272
+#, c-format
+msgid "Cannot update paths and switch to branch '%s' at the same time."
+msgstr "no se puede actualizar rutas y cambiar a la rama '%s' al mismo tiempo."
+
+#: builtin/checkout.c:341 builtin/checkout.c:348
+#, c-format
+msgid "path '%s' is unmerged"
+msgstr "ruta '%s' no esta fusionada"
+
+#: builtin/checkout.c:506
+msgid "you need to resolve your current index first"
+msgstr "necesita resolver su índice actual primero"
+
+#: builtin/checkout.c:637
+#, c-format
+msgid "Can not do reflog for '%s': %s\n"
+msgstr "No se puede hacer reflog para '%s': %s\n"
+
+#: builtin/checkout.c:678
+msgid "HEAD is now at"
+msgstr "HEAD está ahora en"
+
+#: builtin/checkout.c:682 builtin/clone.c:684
+msgid "unable to update HEAD"
+msgstr "no es posible actualizar HEAD"
+
+#: builtin/checkout.c:686
+#, c-format
+msgid "Reset branch '%s'\n"
+msgstr "Reiniciar rama '%s'\n"
+
+#: builtin/checkout.c:689
+#, c-format
+msgid "Already on '%s'\n"
+msgstr "Ya en '%s'\n"
+
+#: builtin/checkout.c:693
+#, c-format
+msgid "Switched to and reset branch '%s'\n"
+msgstr "Rama reiniciada y cambiada a '%s'\n"
+
+#: builtin/checkout.c:695 builtin/checkout.c:1051
+#, c-format
+msgid "Switched to a new branch '%s'\n"
+msgstr "Cambiado a nueva rama '%s'\n"
+
+#: builtin/checkout.c:697
+#, c-format
+msgid "Switched to branch '%s'\n"
+msgstr "Cambiado a rama '%s'\n"
+
+#: builtin/checkout.c:748
+#, c-format
+msgid " ... and %d more.\n"
+msgstr " ... y %d más.\n"
+
+#: builtin/checkout.c:754
+#, 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] ""
+"Peligro: está saliendo %d commit atrás, no está conectado\n"
+"a ninguna rama:\n"
+"\n"
+"%s\n"
+msgstr[1] ""
+"Peligro: está saliendo %d commits antrás, no está conectado\n"
+"a ninguna rama:\n"
+"\n"
+"%s\n"
+
+#: builtin/checkout.c:773
+#, 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] ""
+"Si quiere conservarlo creando una nueva rama, este es un buen momento\n"
+"para hacerlo:\n"
+"\n"
+" git branch <nuevo-nombre-de-rama> %s\n"
+"\n"
+msgstr[1] ""
+"Si quiere conservarlos creando una nueva rama, este es un buen momento\n"
+"para hacerlo:\n"
+"\n"
+" git branch <nombre-de-rama> %s\n"
+"\n"
+
+#: builtin/checkout.c:814
+msgid "internal error in revision walk"
+msgstr "error interno en camino de reivison"
+
+#: builtin/checkout.c:818
+msgid "Previous HEAD position was"
+msgstr "La posición previa de HEAD era"
+
+#: builtin/checkout.c:848 builtin/checkout.c:1046
+msgid "You are on a branch yet to be born"
+msgstr "Estas en una rama por nacer"
+
+#: builtin/checkout.c:952
+#, c-format
+msgid "only one reference expected, %d given."
+msgstr "solo una referencia esperada, %d entregadas."
+
+#: builtin/checkout.c:992 builtin/worktree.c:247
+#, c-format
+msgid "invalid reference: %s"
+msgstr "referencia invalida: %s"
+
+#: builtin/checkout.c:1021
+#, c-format
+msgid "reference is not a tree: %s"
+msgstr "la referencia no es n árbol: %s"
+
+#: builtin/checkout.c:1060
+msgid "paths cannot be used with switching branches"
+msgstr "rutas no pueden ser usadas con cambios de rama"
+
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
+#, c-format
+msgid "'%s' cannot be used with switching branches"
+msgstr "'%s' no puede ser usado con cambios de ramas"
+
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
+#, c-format
+msgid "'%s' cannot be used with '%s'"
+msgstr "'%s' no puede ser usado con '%s'"
+
+#: builtin/checkout.c:1087
+#, 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:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
+msgid "branch"
+msgstr "rama"
+
+#: builtin/checkout.c:1120
+msgid "create and checkout a new branch"
+msgstr "crear y hacer checkout a una nueva rama"
+
+#: builtin/checkout.c:1122
+msgid "create/reset and checkout a branch"
+msgstr "crear/reiniciar y hacer checkout a una rama"
+
+#: builtin/checkout.c:1123
+msgid "create reflog for new branch"
+msgstr "crear un reflog para una nueva rama"
+
+#: builtin/checkout.c:1124 builtin/worktree.c:373
+msgid "detach HEAD at named commit"
+msgstr "desacoplar HEAD en el commit nombrado"
+
+#: builtin/checkout.c:1125
+msgid "set upstream info for new branch"
+msgstr "configurar info de upstream para una rama nueva"
+
+#: builtin/checkout.c:1127
+msgid "new-branch"
+msgstr "nueva-rama"
+
+#: builtin/checkout.c:1127
+msgid "new unparented branch"
+msgstr "nueva rama no emparentada"
+
+#: builtin/checkout.c:1128
+msgid "checkout our version for unmerged files"
+msgstr "hacer checkout a nuestra versión para archivos sin fusionar"
+
+#: builtin/checkout.c:1130
+msgid "checkout their version for unmerged files"
+msgstr "hacer checkout a su versión para los archivos sin fusionar"
+
+#: builtin/checkout.c:1132
+msgid "force checkout (throw away local modifications)"
+msgstr "forzar el checkout (descartar modificaciones locales)"
+
+#: builtin/checkout.c:1133
+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:1134 builtin/merge.c:238
+msgid "update ignored files (default)"
+msgstr "actualizar archivos ignorados (default)"
+
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
+msgid "style"
+msgstr "estilo"
+
+#: builtin/checkout.c:1136
+msgid "conflict style (merge or diff3)"
+msgstr "conflicto de estilos (merge o diff3)"
+
+#: builtin/checkout.c:1139
+msgid "do not limit pathspecs to sparse entries only"
+msgstr "no limitar pathspecs a dispersar entradas solamente"
+
+#: builtin/checkout.c:1141
+msgid "second guess 'git checkout <no-such-branch>'"
+msgstr "segunda opción 'git checkout <no-hay-tal-rama>'"
+
+#: builtin/checkout.c:1143
+msgid "do not check if another worktree is holding the given ref"
+msgstr "no revise si otro árbol de trabajo contiene la ref entregada"
+
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
+#: builtin/send-pack.c:173
+msgid "force progress reporting"
+msgstr "forzar el reporte de progreso"
+
+#: builtin/checkout.c:1177
+msgid "-b, -B and --orphan are mutually exclusive"
+msgstr "-b, -B y --orphan son mutuamente exclusivas"
+
+#: builtin/checkout.c:1194
+msgid "--track needs a branch name"
+msgstr "--track necesita el nombre de una rama"
+
+#: builtin/checkout.c:1199
+msgid "Missing branch name; try -b"
+msgstr "Falta nombre de rama; prueba -b"
+
+#: builtin/checkout.c:1235
+msgid "invalid path specification"
+msgstr "Especificación de ruta invalida"
+
+#: builtin/checkout.c:1242
+#, 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:1246
+#, 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:1250
+msgid ""
+"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
+"checking out of the index."
+msgstr ""
+"git checkout: --ours/--theirs, --force y --merge son incompatibles cuando\n"
+"se revisa fuera del índice."
+
+#: builtin/clean.c:26
+msgid ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..."
+msgstr ""
+"git clean [-d] [-f] [-i] [-n] [-q] [-e <patrón>] [-x | -X] [--] <rutas>..."
+
+#: builtin/clean.c:30
+#, c-format
+msgid "Removing %s\n"
+msgstr "Borrando %s\n"
+
+#: builtin/clean.c:31
+#, c-format
+msgid "Would remove %s\n"
+msgstr "Sera borrado %s\n"
+
+#: builtin/clean.c:32
+#, c-format
+msgid "Skipping repository %s\n"
+msgstr "Saltando repositorio %s\n"
+
+#: builtin/clean.c:33
+#, c-format
+msgid "Would skip repository %s\n"
+msgstr "Se saltara repositorio %s\n"
+
+#: builtin/clean.c:34
+#, c-format
+msgid "failed to remove %s"
+msgstr "fallo al borrar %s"
+
+#: builtin/clean.c:302 git-add--interactive.perl:572
+#, 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 ""
+"Ayuda rápida:\n"
+"1 - selecciona un objeto por numero\n"
+"foo - selecciona un objeto basado en un prefijo único\n"
+" - (vacío) no elegir nada\n"
+
+#: builtin/clean.c:306 git-add--interactive.perl:581
+#, 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 ""
+"Ayuda rápida:\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"
+"-... - de-seleccionar objetos especificados\n"
+"* - escoger todos los objetos\n"
+" - (vacío) terminar selección\n"
+
+#: builtin/clean.c:522 git-add--interactive.perl:547
+#: git-add--interactive.perl:552
+#, c-format, perl-format
+msgid "Huh (%s)?\n"
+msgstr "Ahh (%s)?\n"
+
+#: builtin/clean.c:664
+#, c-format
+msgid "Input ignore patterns>> "
+msgstr "Input ignora los patrones >> "
+
+#: builtin/clean.c:701
+#, c-format
+msgid "WARNING: Cannot find items matched by: %s"
+msgstr "PELIGRO: No se puede encontrar objetos que concuerden con: %s"
+
+#: builtin/clean.c:722
+msgid "Select items to delete"
+msgstr "Seleccionar objetos para borrar"
+
+#. TRANSLATORS: Make sure to keep [y/N] as is
+#: builtin/clean.c:763
+#, c-format
+msgid "Remove %s [y/N]? "
+msgstr "Borrar %s [y/N]? "
+
+#: builtin/clean.c:788 git-add--interactive.perl:1616
+#, c-format
+msgid "Bye.\n"
+msgstr "Adiós.\n"
+
+#: builtin/clean.c:796
+msgid ""
+"clean - start cleaning\n"
+"filter by pattern - exclude items from deletion\n"
+"select by numbers - select items to be deleted by numbers\n"
+"ask each - confirm each deletion (like \"rm -i\")\n"
+"quit - stop cleaning\n"
+"help - this screen\n"
+"? - help for prompt selection"
+msgstr ""
+"clean - comenzar la limpieza\n"
+"filtrar por patrón - excluye objetos del borrado \n"
+"elegir por números - selecciona objetos a ser borrados por numero\n"
+"preguntar cada uno - confirmar cada borrado (como \"rm -i\")\n"
+"quit - parar limpieza\n"
+"help - esta ventana\n"
+"? - ayuda para selección de opciones"
+
+#: builtin/clean.c:823 git-add--interactive.perl:1692
+msgid "*** Commands ***"
+msgstr "*** Comandos ***"
+
+#: builtin/clean.c:824 git-add--interactive.perl:1689
+msgid "What now"
+msgstr "Ahora que"
+
+#: builtin/clean.c:832
+msgid "Would remove the following item:"
+msgid_plural "Would remove the following items:"
+msgstr[0] "Se removerá el siguiente objeto"
+msgstr[1] "Se removerán los siguientes objetos:"
+
+#: builtin/clean.c:848
+msgid "No more files to clean, exiting."
+msgstr "No hay mas archivos para limpiar, saliendo."
+
+#: builtin/clean.c:910
+msgid "do not print names of files removed"
+msgstr "no imprimir nombres de archivos borrados"
+
+#: builtin/clean.c:912
+msgid "force"
+msgstr "forzar"
+
+#: builtin/clean.c:913
+msgid "interactive cleaning"
+msgstr "limpieza interactiva"
+
+#: builtin/clean.c:915
+msgid "remove whole directories"
+msgstr "borrar directorios completos"
+
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
+msgid "pattern"
+msgstr "patron"
+
+#: builtin/clean.c:917
+msgid "add <pattern> to ignore rules"
+msgstr "agregar <patrón> para ignorar reglas"
+
+#: builtin/clean.c:918
+msgid "remove ignored files, too"
+msgstr "borrar archivos ignorados, tambien"
+
+#: builtin/clean.c:920
+msgid "remove only ignored files"
+msgstr "borrar solo archivos ignorados"
+
+#: builtin/clean.c:938
+msgid "-x and -X cannot be used together"
+msgstr "-x y -X no pueden ser usadas juntas"
+
+#: builtin/clean.c:942
+msgid ""
+"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
+"clean"
+msgstr ""
+"clean.requireForce configurado como true y ninguno -i, -n, ni -f entregados; "
+"rehusando el clean"
+
+#: builtin/clean.c:945
+msgid ""
+"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
+"refusing to clean"
+msgstr ""
+"clean.requireForce default en true y ninguno -i, -n, ni -f entregados; "
+"rehusando el clean"
+
+#: builtin/clone.c:39
+msgid "git clone [<options>] [--] <repo> [<dir>]"
+msgstr "git clone [<opciones>] [--] <repo> [<directorio>]"
+
+#: builtin/clone.c:83
+msgid "don't create a checkout"
+msgstr "no crear checkout"
+
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
+msgid "create a bare repository"
+msgstr "crear un repositorio vacio"
+
+#: builtin/clone.c:88
+msgid "create a mirror repository (implies bare)"
+msgstr "crear un repositorio espejo (implica vacío)"
+
+#: builtin/clone.c:90
+msgid "to clone from a local repository"
+msgstr "clonar de un repositorio local"
+
+#: builtin/clone.c:92
+msgid "don't use local hardlinks, always copy"
+msgstr "no usar hardlinks, siempre copiar"
+
+#: builtin/clone.c:94
+msgid "setup as shared repository"
+msgstr "configurar como repositorio compartido"
+
+#: builtin/clone.c:96 builtin/clone.c:100
+msgid "pathspec"
+msgstr "pathspec"
+
+#: builtin/clone.c:96 builtin/clone.c:100
+msgid "initialize submodules in the clone"
+msgstr "inicializar submodulos en el clonado"
+
+#: builtin/clone.c:103
+msgid "number of submodules cloned in parallel"
+msgstr "numero de submodulos clonados en paralelo"
+
+#: builtin/clone.c:104 builtin/init-db.c:476
+msgid "template-directory"
+msgstr "directorio-template"
+
+#: builtin/clone.c:105 builtin/init-db.c:477
+msgid "directory from which templates will be used"
+msgstr "directorio del cual los templates serán usados"
+
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
+msgid "reference repository"
+msgstr "repositorio de referencia"
+
+#: builtin/clone.c:111
+msgid "use --reference only while cloning"
+msgstr "usa--reference solamente si estas clonado"
+
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
+msgid "name"
+msgstr "nombre"
+
+#: builtin/clone.c:113
+msgid "use <name> instead of 'origin' to track upstream"
+msgstr "use <nombre> en lugar de 'origin' para rastrear upstream"
+
+#: builtin/clone.c:115
+msgid "checkout <branch> instead of the remote's HEAD"
+msgstr "checkout <rama> en lugar de HEAD remota"
+
+#: builtin/clone.c:117
+msgid "path to git-upload-pack on the remote"
+msgstr "ruta para git-upload-pack en el remoto"
+
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
+msgid "depth"
+msgstr "profundidad"
+
+#: builtin/clone.c:119
+msgid "create a shallow clone of that depth"
+msgstr "crear un clon superficial para esa profundidad"
+
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
+#: parse-options.h:142
+msgid "time"
+msgstr "tiempo"
+
+#: builtin/clone.c:121
+msgid "create a shallow clone since a specific time"
+msgstr "crear un clon superficial desde el tiempo específico"
+
+#: builtin/clone.c:122 builtin/fetch.c:142
+msgid "revision"
+msgstr "revision"
+
+#: builtin/clone.c:123 builtin/fetch.c:143
+msgid "deepen history of shallow clone, excluding rev"
+msgstr "ahondando historia de clon superficial, excluyendo rev"
+
+#: builtin/clone.c:125
+msgid "clone only one branch, HEAD or --branch"
+msgstr "clonar solo una rama,HEAD o --branch"
+
+#: builtin/clone.c:127
+msgid "don't clone any tags, and make later fetches not to follow them"
+msgstr "no clonar niun tag, y hacer que los subsiguientes fetch no los sigan"
+
+#: builtin/clone.c:129
+msgid "any cloned submodules will be shallow"
+msgstr "cualquier submódulo clonado será superficial"
+
+#: builtin/clone.c:130 builtin/init-db.c:485
+msgid "gitdir"
+msgstr "gitdir"
+
+#: builtin/clone.c:131 builtin/init-db.c:486
+msgid "separate git dir from working tree"
+msgstr "separa git dir del árbol de trabajo"
+
+#: builtin/clone.c:132
+msgid "key=value"
+msgstr "llave=valor"
+
+#: builtin/clone.c:133
+msgid "set config inside the new repository"
+msgstr "configurar config dentro del nuevo repositorio"
+
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
+msgid "use IPv4 addresses only"
+msgstr "solo usar direcciones IPv4"
+
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
+msgid "use IPv6 addresses only"
+msgstr "solo usar direcciones IPv6"
+
+#: builtin/clone.c:273
+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:326
+#, 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:398
+#, c-format
+msgid "failed to open '%s'"
+msgstr "fallo al abrir '%s'"
+
+#: builtin/clone.c:406
+#, c-format
+msgid "%s exists and is not a directory"
+msgstr "%s existe pero no es un directorio"
+
+#: builtin/clone.c:420
+#, c-format
+msgid "failed to stat %s\n"
+msgstr "falló al analizar %s\n"
+
+#: builtin/clone.c:442
+#, c-format
+msgid "failed to create link '%s'"
+msgstr "fallo al crear link '%s'"
+
+#: builtin/clone.c:446
+#, c-format
+msgid "failed to copy file to '%s'"
+msgstr "fallo al copiar archivo a '%s'"
+
+#: builtin/clone.c:472
+#, c-format
+msgid "done.\n"
+msgstr "hecho.\n"
+
+#: builtin/clone.c:484
+msgid ""
+"Clone succeeded, but checkout failed.\n"
+"You can inspect what was checked out with 'git status'\n"
+"and retry the checkout with 'git checkout -f HEAD'\n"
+msgstr ""
+"Clonado exitoso, pero falló el checkout.\n"
+"Puede inspeccionar a qué se hizo checkout con 'git status'\n"
+"y volver a intentarlo con 'git checkout -f HEAD'\n"
+
+#: builtin/clone.c:561
+#, 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:656
+msgid "remote did not send all necessary objects"
+msgstr "remoto no mando todos los objetos necsarios"
+
+#: builtin/clone.c:672
+#, c-format
+msgid "unable to update %s"
+msgstr "incapaz de actualizar %s"
+
+#: builtin/clone.c:721
+msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
+msgstr ""
+"HEAD remoto refiere a un ref inexistente, no se puede hacer checkout.\n"
+
+#: builtin/clone.c:751
+msgid "unable to checkout working tree"
+msgstr "no es posible realizar checkout en el árbol de trabajo"
+
+#: builtin/clone.c:796
+msgid "unable to write parameters to config file"
+msgstr "no es posible escribir parámetros al archivo config"
+
+#: builtin/clone.c:859
+msgid "cannot repack to clean up"
+msgstr "no se puede reempaquetar para limpiar"
+
+#: builtin/clone.c:861
+msgid "cannot unlink temporary alternates file"
+msgstr "no se puede desvincular archivos alternos temporales"
+
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
+msgid "Too many arguments."
+msgstr "Muchos argumentos."
+
+#: builtin/clone.c:898
+msgid "You must specify a repository to clone."
+msgstr "Tienes que especificar un repositorio para clonar"
+
+#: builtin/clone.c:911
+#, c-format
+msgid "--bare and --origin %s options are incompatible."
+msgstr "Las opciones --bare y --origin %s son incompatibles."
+
+#: builtin/clone.c:914
+msgid "--bare and --separate-git-dir are incompatible."
+msgstr "--bare y --separate-git-dir son incompatibles."
+
+#: builtin/clone.c:927
+#, c-format
+msgid "repository '%s' does not exist"
+msgstr "repositorio '%s' no existe"
+
+#: builtin/clone.c:933 builtin/fetch.c:1358
+#, c-format
+msgid "depth %s is not a positive number"
+msgstr "profundidad %s no es un numero positivo"
+
+#: builtin/clone.c:943
+#, 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 vacio"
+
+#: builtin/clone.c:953
+#, c-format
+msgid "working tree '%s' already exists."
+msgstr "directorio de trabajo '%s' ya existe."
+
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
+#, c-format
+msgid "could not create leading directories of '%s'"
+msgstr "no se pudo crear directorios principales de '%s'"
+
+#: builtin/clone.c:971
+#, c-format
+msgid "could not create work tree dir '%s'"
+msgstr "no se pudo crear un árbol de trabajo '%s'"
+
+#: builtin/clone.c:983
+#, c-format
+msgid "Cloning into bare repository '%s'...\n"
+msgstr "Clonando en un repositorio vacio '%s'...\n"
+
+#: builtin/clone.c:985
+#, c-format
+msgid "Cloning into '%s'...\n"
+msgstr "Clonando en '%s'...\n"
+
+#: builtin/clone.c:1009
+msgid ""
+"clone --recursive is not compatible with both --reference and --reference-if-"
+"able"
+msgstr ""
+"clone --recursive no es compatible con --reference y --reference-if-able al "
+"mismo tiempo"
+
+#: builtin/clone.c:1071
+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:1073
+msgid "--shallow-since is ignored in local clones; use file:// instead."
+msgstr "--shallow-since es ignorado en el clon local; use file:// ."
+
+#: builtin/clone.c:1075
+msgid "--shallow-exclude is ignored in local clones; use file:// instead."
+msgstr "--shallow-exclude es ignorado en clones locales; use file://."
+
+#: builtin/clone.c:1078
+msgid "source repository is shallow, ignoring --local"
+msgstr "repositorio fuente es superficial, ignorando --local"
+
+#: builtin/clone.c:1083
+msgid "--local is ignored"
+msgstr "--local es ignorado"
+
+#: builtin/clone.c:1139 builtin/clone.c:1147
+#, c-format
+msgid "Remote branch %s not found in upstream %s"
+msgstr "Rama remota %s no encontrada en upstream %s"
+
+#: builtin/clone.c:1150
+msgid "You appear to have cloned an empty repository."
+msgstr "Pareces haber clonado un repositorio sin contenido."
+
+#: builtin/column.c:10
+msgid "git column [<options>]"
+msgstr "git column [<opciones>]"
+
+#: builtin/column.c:27
+msgid "lookup config vars"
+msgstr "revisa las variables de configuraciones "
+
+#: builtin/column.c:28 builtin/column.c:29
+msgid "layout to use"
+msgstr "capa a usar"
+
+#: builtin/column.c:30
+msgid "Maximum width"
+msgstr "Ancho maximo"
+
+#: builtin/column.c:31
+msgid "Padding space on left border"
+msgstr "Realizando padding en el borde izquierdo"
+
+#: builtin/column.c:32
+msgid "Padding space on right border"
+msgstr "Realizando padding en el borde derecho"
+
+#: builtin/column.c:33
+msgid "Padding space between columns"
+msgstr "Realizando padding entre columnas"
+
+#: builtin/column.c:52
+msgid "--command must be the first argument"
+msgstr "--command debe ser el primer argumento"
+
+#: builtin/commit.c:39
+msgid "git commit [<options>] [--] <pathspec>..."
+msgstr "git commit [<opciones>] [--] <especificación-de-ruta>..."
+
+#: builtin/commit.c:44
+msgid "git status [<options>] [--] <pathspec>..."
+msgstr "git status [<opciones>] [--] <especificación-de-ruta>..."
+
+#: builtin/commit.c:49
+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 ""
+"Tu nombre y correo fueron configurados automáticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
+"Tu puedes suprimir este mensaje configurándolos de forma explicita. Ejecuta "
+"el \n"
+"siguiente comando y sigue las instrucciones de tu editor\n"
+" para modificar tu archivo de configuración:\n"
+"\n"
+" git config --global --edit\n"
+"\n"
+"Tras hacer esto, puedes arreglar la identidad usada para este commit con:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: builtin/commit.c:62
+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 ""
+"Tu nombre y correo fueron configurados automáticamente basados\n"
+"en tu usuario y nombre de host. Por favor verifica que son correctos.\n"
+"Tu puedes suprimir este mensaje configurándolos de forma explicita: \n"
+"\n"
+" git config --global user.name \"Tu nombre\"\n"
+" git config --global user.email you@example.com\n"
+"\n"
+"Tras hacer esto, puedes arreglar tu identidad para este commit con:\n"
+"\n"
+" git commit --amend --reset-author\n"
+
+#: builtin/commit.c:74
+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 ""
+"Has solicitado un amend en tu commit mas reciente, pero hacerlo lo \n"
+"vaciaria. Puedes repetir el commando con --alow-empty, o puedes remover \n"
+"el commit completamente con \"git reset HEAD^\".\n"
+
+#: builtin/commit.c:79
+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 ""
+"El cherry-pick anterior ahora esta vacío, posiblemente por un conflicto de "
+"resolución.\n"
+"Si desea realizar un commit de todas maneras, use:\n"
+"\n"
+" git commit --allow-empty\n"
+"\n"
+
+#: builtin/commit.c:86
+msgid "Otherwise, please use 'git reset'\n"
+msgstr "Caso contrario, por favor usa 'git reset'\n"
+
+#: builtin/commit.c:89
+msgid ""
+"If you wish to skip this commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Then \"git cherry-pick --continue\" will resume cherry-picking\n"
+"the remaining commits.\n"
+msgstr ""
+"Si quiere saltar este commit, use:\n"
+"\n"
+" git reset\n"
+"\n"
+"Luego \"git cherry-pick --continue\" continuara el cherry-picking\n"
+"para los commits restantes.\n"
+
+#: builtin/commit.c:318
+msgid "failed to unpack HEAD tree object"
+msgstr "fallo al desempaquetar objeto del árbol HEAD"
+
+#: builtin/commit.c:359
+msgid "unable to create temporary index"
+msgstr "no es posible crear un índice temporal"
+
+#: builtin/commit.c:365
+msgid "interactive add failed"
+msgstr "adición interactiva fallida"
+
+#: builtin/commit.c:378
+msgid "unable to update temporary index"
+msgstr "no es posible actualizar el índice temporal"
+
+#: builtin/commit.c:380
+msgid "Failed to update main cache tree"
+msgstr "Fallo al actualizar el cache principal del árbol"
+
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
+msgid "unable to write new_index file"
+msgstr "no es posible escribir archiv new_index"
+
+#: builtin/commit.c:461
+msgid "cannot do a partial commit during a merge."
+msgstr "no se puede realizar un commit parcial durante una fusión."
+
+#: builtin/commit.c:463
+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:471
+msgid "cannot read the index"
+msgstr "no se puede leer el índice."
+
+#: builtin/commit.c:490
+msgid "unable to write temporary index file"
+msgstr "no es posible escribir el índice temporal "
+
+#: builtin/commit.c:587
+#, c-format
+msgid "commit '%s' lacks author header"
+msgstr "falta header de autor al commit '%s'"
+
+#: builtin/commit.c:589
+#, c-format
+msgid "commit '%s' has malformed author line"
+msgstr "el commit '%s' tiene una línea de autor mal formada"
+
+#: builtin/commit.c:608
+msgid "malformed --author parameter"
+msgstr "malformado - parámetro de autor"
+
+#: builtin/commit.c:660
+msgid ""
+"unable to select a comment character that is not used\n"
+"in the current commit message"
+msgstr ""
+"no es posible seleccionar un carácter de comentario que no es usado\n"
+"en el mensaje de commit actual"
+
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
+#, c-format
+msgid "could not lookup commit %s"
+msgstr "no se pudo revisar el commit %s"
+
+#: builtin/commit.c:709 builtin/shortlog.c:309
+#, c-format
+msgid "(reading log message from standard input)\n"
+msgstr "(leyendo mensajes de logs desde standard input)\n"
+
+#: builtin/commit.c:711
+msgid "could not read log from standard input"
+msgstr "no se pudo leer log desde standard input"
+
+#: builtin/commit.c:715
+#, c-format
+msgid "could not read log file '%s'"
+msgstr "no se pudo leer el log '%s'"
+
+#: builtin/commit.c:742 builtin/commit.c:750
+msgid "could not read SQUASH_MSG"
+msgstr "no se pudo leer SQUASH_MSG"
+
+#: builtin/commit.c:747
+msgid "could not read MERGE_MSG"
+msgstr "no se pudo leer MERGE_MSG"
+
+#: builtin/commit.c:801
+msgid "could not write commit template"
+msgstr "no se pudo escribir el template del commit"
+
+#: builtin/commit.c:819
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a merge.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Parece que estas haciendo un commit con una fusión dentro.\n"
+"Si esto no es correcto, por favor remueve el archivo\n"
+"\t%s\n"
+"y vuelve a intentar.\n"
+
+#: builtin/commit.c:824
+#, c-format
+msgid ""
+"\n"
+"It looks like you may be committing a cherry-pick.\n"
+"If this is not correct, please remove the file\n"
+"\t%s\n"
+"and try again.\n"
+msgstr ""
+"\n"
+"Parece que puede estar haciendo un commit a un cherry-pick.\n"
+"Si esto no es correcto, por favor elimine el archivo\n"
+"\t%s\n"
+"y vuelva a intentar.\n"
+
+#: builtin/commit.c:837
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be ignored, and an empty message aborts the commit.\n"
+msgstr ""
+"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"comiencen\n"
+"con '%c' serán ignoradas, y un mensaje vacío aborta el commit.\n"
+
+#: builtin/commit.c:844
+#, c-format
+msgid ""
+"Please enter the commit message for your changes. Lines starting\n"
+"with '%c' will be kept; you may remove them yourself if you want to.\n"
+"An empty message aborts the commit.\n"
+msgstr ""
+"Por favor ingrese el mensaje del commit para sus cambios. Las líneas que "
+"comiencen\n"
+"con '%c' serán guardadas; puede removerlas usted mismo si desea.\n"
+"Un mensaje vacío aborta el commit.\n"
+
+#: builtin/commit.c:861
+#, c-format
+msgid "%sAuthor: %.*s <%.*s>"
+msgstr "%sAutor: %.*s <%.*s>"
+
+#: builtin/commit.c:869
+#, c-format
+msgid "%sDate: %s"
+msgstr "%sFecha: %s"
+
+#: builtin/commit.c:876
+#, c-format
+msgid "%sCommitter: %.*s <%.*s>"
+msgstr "%sCommitter: %.*s <%.*s>"
+
+#: builtin/commit.c:893
+msgid "Cannot read index"
+msgstr "No se puede leer el índice"
+
+#: builtin/commit.c:959
+msgid "Error building trees"
+msgstr "Error al construir los árboles"
+
+#: builtin/commit.c:973 builtin/tag.c:252
+#, 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:1076
+#, 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:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Modo ignorado inválido '%s'"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
+#, c-format
+msgid "Invalid untracked files mode '%s'"
+msgstr "Modo inválido de los archivos no rastreados '%s'"
+
+#: builtin/commit.c:1142
+msgid "--long and -z are incompatible"
+msgstr "--long y -z son incompatibles"
+
+#: builtin/commit.c:1172
+msgid "Using both --reset-author and --author does not make sense"
+msgstr "Usar ambos --reset-author y --author no tiene sentido"
+
+#: builtin/commit.c:1181
+msgid "You have nothing to amend."
+msgstr "No tienes nada que enmendar."
+
+#: builtin/commit.c:1184
+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:1186
+msgid "You are in the middle of a cherry-pick -- cannot amend."
+msgstr "Está en medio de un cherry-pick -- no se puede enmendar."
+
+#: builtin/commit.c:1189
+msgid "Options --squash and --fixup cannot be used together"
+msgstr "Opciones --squash y --fixup no pueden ser usadas juntas"
+
+#: builtin/commit.c:1199
+msgid "Only one of -c/-C/-F/--fixup can be used."
+msgstr "Solo uno de -c/-C/-F/--fixup puede ser usardo."
+
+#: builtin/commit.c:1201
+msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
+msgstr "La opción -m no puede ser combinada con -c/-C/-F/--fixup."
+
+#: builtin/commit.c:1209
+msgid "--reset-author can be used only with -C, -c or --amend."
+msgstr "--reset-author sólo puede ser usada con -C, -c o --amend."
+
+#: builtin/commit.c:1226
+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:1228
+msgid "No paths with --include/--only does not make sense."
+msgstr "No hay rutas con --include/--only no tiene sentido."
+
+#: builtin/commit.c:1240 builtin/tag.c:535
+#, c-format
+msgid "Invalid cleanup mode %s"
+msgstr "Modo cleanup invalido %s"
+
+#: builtin/commit.c:1245
+msgid "Paths with -a does not make sense."
+msgstr "Rutas con -a no tiene sentido."
+
+#: builtin/commit.c:1363 builtin/commit.c:1648
+msgid "show status concisely"
+msgstr "mostrar status de manera concisa"
+
+#: builtin/commit.c:1365 builtin/commit.c:1650
+msgid "show branch information"
+msgstr "mostrar información de la rama"
+
+#: builtin/commit.c:1367
+msgid "show stash information"
+msgstr "mostrar información del stash"
+
+#: builtin/commit.c:1369
+msgid "version"
+msgstr "version"
+
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
+msgid "machine-readable output"
+msgstr "output formato-maquina"
+
+#: builtin/commit.c:1372 builtin/commit.c:1654
+msgid "show status in long format (default)"
+msgstr "mostrar status en formato largo (default)"
+
+#: builtin/commit.c:1375 builtin/commit.c:1657
+msgid "terminate entries with NUL"
+msgstr "terminar entradas con NUL"
+
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
+msgid "mode"
+msgstr "modo"
+
+#: builtin/commit.c:1378 builtin/commit.c:1660
+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:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"mostrar archivos ignorados, modos opcionales: traditional, matching, no. "
+"(Predeterminado: traditional)"
+
+#: builtin/commit.c:1384 parse-options.h:155
+msgid "when"
+msgstr "cuando"
+
+#: builtin/commit.c:1385
+msgid ""
+"ignore changes to submodules, optional when: all, dirty, untracked. "
+"(Default: all)"
+msgstr ""
+"ignorar cambios en submodulos, opcional cuando: all,dirty,untracked. "
+"(Default: all)"
+
+#: builtin/commit.c:1387
+msgid "list untracked files in columns"
+msgstr "listar en columnas los archivos sin seguimiento"
+
+#: builtin/commit.c:1406
+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:1469
+msgid "couldn't look up newly created commit"
+msgstr "no se pudo revisar el commit recién creado"
+
+#: builtin/commit.c:1471
+msgid "could not parse newly created commit"
+msgstr "no se pudo analizar el commit recién creado"
+
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "No se pudo resolver HEAD tras crear el commit"
+
+#: builtin/commit.c:1518
+msgid "detached HEAD"
+msgstr "HEAD desacoplado"
+
+#: builtin/commit.c:1521
+msgid " (root-commit)"
+msgstr "(commit-raiz)"
+
+#: builtin/commit.c:1618
+msgid "suppress summary after successful commit"
+msgstr "suprime summary tras un commit exitoso"
+
+#: builtin/commit.c:1619
+msgid "show diff in commit message template"
+msgstr "mostrar diff en el template del mensaje de commit"
+
+#: builtin/commit.c:1621
+msgid "Commit message options"
+msgstr "Opciones para el mensaje del commit"
+
+#: builtin/commit.c:1622 builtin/tag.c:388
+msgid "read message from file"
+msgstr "leer mensaje desde un archivo"
+
+#: builtin/commit.c:1623
+msgid "author"
+msgstr "autor"
+
+#: builtin/commit.c:1623
+msgid "override author for commit"
+msgstr "sobrescribe el autor del commit"
+
+#: builtin/commit.c:1624 builtin/gc.c:359
+msgid "date"
+msgstr "fecha"
+
+#: builtin/commit.c:1624
+msgid "override date for commit"
+msgstr "sobrescribe la fecha del commit"
+
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
+msgid "message"
+msgstr "mensaje"
+
+#: builtin/commit.c:1625
+msgid "commit message"
+msgstr "mensaje del commit"
+
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
+msgid "commit"
+msgstr "confirmar"
+
+#: builtin/commit.c:1626
+msgid "reuse and edit message from specified commit"
+msgstr "reusar y editar el mensaje de un commit especifico"
+
+#: builtin/commit.c:1627
+msgid "reuse message from specified commit"
+msgstr "reusar el mensaje de un commit especifico"
+
+#: builtin/commit.c:1628
+msgid "use autosquash formatted message to fixup specified commit"
+msgstr ""
+"usar mensaje de formato autosquash para arreglar el commit especificado"
+
+#: builtin/commit.c:1629
+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:1630
+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:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
+msgid "add Signed-off-by:"
+msgstr "agregar Signed-off-by: (firmado por)"
+
+#: builtin/commit.c:1632
+msgid "use specified template file"
+msgstr "usar archivo de template especificado"
+
+#: builtin/commit.c:1633
+msgid "force edit of commit"
+msgstr "forzar la edición del commit"
+
+#: builtin/commit.c:1634
+msgid "default"
+msgstr "default"
+
+#: builtin/commit.c:1634 builtin/tag.c:391
+msgid "how to strip spaces and #comments from message"
+msgstr "cómo quitar espacios y #comentarios de mensajes"
+
+#: builtin/commit.c:1635
+msgid "include status in commit message template"
+msgstr "incluir status en el template del mensaje de commit"
+
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
+#: builtin/revert.c:113
+msgid "GPG sign commit"
+msgstr "firmar commit con GPG"
+
+#: builtin/commit.c:1640
+msgid "Commit contents options"
+msgstr "Opciones para el contenido del commit"
+
+#: builtin/commit.c:1641
+msgid "commit all changed files"
+msgstr "confirmar todos los archivos cambiados"
+
+#: builtin/commit.c:1642
+msgid "add specified files to index for commit"
+msgstr "agregar archivos específicos al índice para confirmar"
+
+#: builtin/commit.c:1643
+msgid "interactively add files"
+msgstr "agregar archivos interactivamente"
+
+#: builtin/commit.c:1644
+msgid "interactively add changes"
+msgstr "agregar cambios interactivamente"
+
+#: builtin/commit.c:1645
+msgid "commit only specified files"
+msgstr "sólo confirmar archivos específicos"
+
+#: builtin/commit.c:1646
+msgid "bypass pre-commit and commit-msg hooks"
+msgstr "evitar los capturadores (hooks) de pre-commit y commit-msg"
+
+#: builtin/commit.c:1647
+msgid "show what would be committed"
+msgstr "mostrar lo que sería incluído en el commit"
+
+#: builtin/commit.c:1658
+msgid "amend previous commit"
+msgstr "enmendar commit previo"
+
+#: builtin/commit.c:1659
+msgid "bypass post-rewrite hook"
+msgstr "gancho bypass post reescritura"
+
+#: builtin/commit.c:1664
+msgid "ok to record an empty change"
+msgstr "ok al grabar un cambio vacio"
+
+#: builtin/commit.c:1666
+msgid "ok to record a change with an empty message"
+msgstr "ok al grabar un cambio con un mensaje vacio"
+
+#: builtin/commit.c:1696
+msgid "could not parse HEAD commit"
+msgstr "no se pudo analizar el commit de HEAD"
+
+#: builtin/commit.c:1741
+#, c-format
+msgid "Corrupt MERGE_HEAD file (%s)"
+msgstr "Archivo MERGE_HEAD (%s) corrupto"
+
+#: builtin/commit.c:1748
+msgid "could not read MERGE_MODE"
+msgstr "no se pudo leer MERGE_MODE"
+
+#: builtin/commit.c:1767
+#, c-format
+msgid "could not read commit message: %s"
+msgstr "no se pudo leer el mensaje de commit: %s"
+
+#: builtin/commit.c:1778
+#, 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:1783
+#, 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:1831
+msgid ""
+"Repository has been updated, but unable to write\n"
+"new_index file. Check that disk is not full and quota is\n"
+"not exceeded, and then \"git reset HEAD\" to recover."
+msgstr ""
+"El repositorio ha sido actualizado, pero no se pudo escribir el archivo\n"
+"new_index. Verifique que el disco no este lleno y la quota no ha\n"
+"sido superada, y luego \"git reset HEAD\" para recuperar."
+
+#: builtin/config.c:10
+msgid "git config [<options>]"
+msgstr "git config [<opciones>]"
+
+#: builtin/config.c:58
+msgid "Config file location"
+msgstr "ubicación del archivo config"
+
+#: builtin/config.c:59
+msgid "use global config file"
+msgstr "usar archivo de config global"
+
+#: builtin/config.c:60
+msgid "use system config file"
+msgstr "usar archivo de config del sistema"
+
+#: builtin/config.c:61
+msgid "use repository config file"
+msgstr "usar archivo de config del repositorio"
+
+#: builtin/config.c:62
+msgid "use given config file"
+msgstr "usar archivo config especificado"
+
+#: builtin/config.c:63
+msgid "blob-id"
+msgstr "blob-id"
+
+#: builtin/config.c:63
+msgid "read config from given blob object"
+msgstr "leer config del objeto blob suministrado"
+
+#: builtin/config.c:64
+msgid "Action"
+msgstr "Acción"
+
+#: builtin/config.c:65
+msgid "get value: name [value-regex]"
+msgstr "obtener valor: nombre [valor-regex]"
+
+#: builtin/config.c:66
+msgid "get all values: key [value-regex]"
+msgstr "obtener todos los valores: llave [valores-regex]"
+
+#: builtin/config.c:67
+msgid "get values for regexp: name-regex [value-regex]"
+msgstr "obtener valores para una regexp: nombre-regex [valor-regex]"
+
+#: builtin/config.c:68
+msgid "get value specific for the URL: section[.var] URL"
+msgstr "obtener valor especifico para el URL: sección[.var] URL"
+
+#: builtin/config.c:69
+msgid "replace all matching variables: name value [value_regex]"
+msgstr ""
+"remplazar todas las variables que concuerden: nombre valor [valor_regex]"
+
+#: builtin/config.c:70
+msgid "add a new variable: name value"
+msgstr "agregar nueva variable: nombre valor "
+
+#: builtin/config.c:71
+msgid "remove a variable: name [value-regex]"
+msgstr "borrar una variable. nombre [valor-regex]"
+
+#: builtin/config.c:72
+msgid "remove all matches: name [value-regex]"
+msgstr "borrar todas las concurrencias: nombre [valor-regex]"
+
+#: builtin/config.c:73
+msgid "rename section: old-name new-name"
+msgstr "renombrar sección: nombre-viejo nombre-nuevo"
+
+#: builtin/config.c:74
+msgid "remove a section: name"
+msgstr "borrar una sección: nombre"
+
+#: builtin/config.c:75
+msgid "list all"
+msgstr "listar todo"
+
+#: builtin/config.c:76
+msgid "open an editor"
+msgstr "abrir el editor"
+
+#: builtin/config.c:77
+msgid "find the color configured: slot [default]"
+msgstr "encontrar el color configurado: slot [default]"
+
+#: builtin/config.c:78
+msgid "find the color setting: slot [stdout-is-tty]"
+msgstr "encontrar las opciones del color: slot [stdout-es-tty]"
+
+#: builtin/config.c:79
+msgid "Type"
+msgstr "Tipo"
+
+#: builtin/config.c:80
+msgid "value is \"true\" or \"false\""
+msgstr "valor es \"true\" o \"false\""
+
+#: builtin/config.c:81
+msgid "value is decimal number"
+msgstr "valor es un numero decimal"
+
+#: builtin/config.c:82
+msgid "value is --bool or --int"
+msgstr "valor es --bool o --int"
+
+#: builtin/config.c:83
+msgid "value is a path (file or directory name)"
+msgstr "valor es una ruta (archivo o nombre de directorio)"
+
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "valor es una fecha de expiración"
+
+#: builtin/config.c:85
+msgid "Other"
+msgstr "Otro"
+
+#: builtin/config.c:86
+msgid "terminate values with NUL byte"
+msgstr "Terminar valores con un byte NUL"
+
+#: builtin/config.c:87
+msgid "show variable names only"
+msgstr "mostrar solo nombres de variables"
+
+#: builtin/config.c:88
+msgid "respect include directives on lookup"
+msgstr "respetar directivas include en la busqueda"
+
+#: builtin/config.c:89
+msgid "show origin of config (file, standard input, blob, command line)"
+msgstr "mostrar el origen de configuración (archivo, stdin, blob, comando)"
+
+#: builtin/config.c:335
+msgid "unable to parse default color value"
+msgstr "no es posible analizar el valor default de color "
+
+#: builtin/config.c:479
+#, 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 ""
+"# Este es el archivo de configuración de Git por usuario.\n"
+"[user]\n"
+"# Por favor, adapta y descomenta las siguientes líneas:\n"
+"#\tname = %s\n"
+"#\temail = %s\n"
+
+#: builtin/config.c:507
+msgid "--local can only be used inside a git repository"
+msgstr "--local solo puedo ser usado dentro de un repositorio"
+
+#: builtin/config.c:632
+#, c-format
+msgid "cannot create configuration file %s"
+msgstr "no se puede crear el archivo de configuración %s"
+
+#: builtin/config.c:645
+#, c-format
+msgid ""
+"cannot overwrite multiple values with a single value\n"
+" Use a regexp, --add or --replace-all to change %s."
+msgstr ""
+"no se puede sobrescribir múltiples valores con un único valor\n"
+"\tUse una regexp, --add o --replace-all para cambiar %s."
+
+#: builtin/count-objects.c:88
+msgid "git count-objects [-v] [-H | --human-readable]"
+msgstr "git count-objects [-v] [-H | --human-readable]"
+
+#: builtin/count-objects.c:98
+msgid "print sizes in human readable format"
+msgstr "mostrar tamaños en formato legible para humano"
+
+#: builtin/describe.c:22
+msgid "git describe [<options>] [<commit-ish>...]"
+msgstr "git describe [<opciones>] [<commit-ish>...]"
+
+#: builtin/describe.c:23
+msgid "git describe [<options>] --dirty"
+msgstr "git describe [<opciones>] --dirty"
+
+#: builtin/describe.c:57
+msgid "head"
+msgstr "head"
+
+#: builtin/describe.c:57
+msgid "lightweight"
+msgstr "ligero"
+
+#: builtin/describe.c:57
+msgid "annotated"
+msgstr "anotado"
+
+#: builtin/describe.c:267
+#, c-format
+msgid "annotated tag %s not available"
+msgstr "tag anotado %s no disponible"
+
+#: builtin/describe.c:271
+#, c-format
+msgid "annotated tag %s has no embedded name"
+msgstr "tag anotado %s no tiene nombre embebido "
+
+#: builtin/describe.c:273
+#, c-format
+msgid "tag '%s' is really '%s' here"
+msgstr "tag '%s' es realmente '%s' aquí"
+
+#: builtin/describe.c:314
+#, c-format
+msgid "no tag exactly matches '%s'"
+msgstr "no hay tag que concuerde exactamente con '%s'"
+
+#: builtin/describe.c:316
+#, c-format
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "No hay coincidencia exacta en refs o tags, buscando en describe\n"
+
+#: builtin/describe.c:363
+#, c-format
+msgid "finished search at %s\n"
+msgstr "búsqueda finalizada a las %s\n"
+
+#: builtin/describe.c:389
+#, c-format
+msgid ""
+"No annotated tags can describe '%s'.\n"
+"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."
+
+#: builtin/describe.c:393
+#, c-format
+msgid ""
+"No tags can describe '%s'.\n"
+"Try --always, or create some tags."
+msgstr ""
+"Ningún tag puede describit '%s'.\n"
+"Intente --always, o cree algunos tags."
+
+#: builtin/describe.c:423
+#, c-format
+msgid "traversed %lu commits\n"
+msgstr "%lu commits cruzados\n"
+
+#: builtin/describe.c:426
+#, c-format
+msgid ""
+"more than %i tags found; listed %i most recent\n"
+"gave up search at %s\n"
+msgstr ""
+"se encontró más de %i tags; se mostró %i más reciente\n"
+"fin de la búsqueda en %s\n"
+
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "describe %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Nombre de objeto %s no válido"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s no es un commit ni un blob"
+
+#: builtin/describe.c:519
+msgid "find the tag that comes after the commit"
+msgstr "encontrar el tag que viene después del commit"
+
+#: builtin/describe.c:520
+msgid "debug search strategy on stderr"
+msgstr "hacer debug a la estrategia de búsqueda en stderr"
+
+#: builtin/describe.c:521
+msgid "use any ref"
+msgstr "use cualquier ref"
+
+#: builtin/describe.c:522
+msgid "use any tag, even unannotated"
+msgstr "use cualquier tag, incluso los no anotados"
+
+#: builtin/describe.c:523
+msgid "always use long format"
+msgstr "siempre usar formato largo"
+
+#: builtin/describe.c:524
+msgid "only follow first parent"
+msgstr "solo seguir el primer patrón"
+
+#: builtin/describe.c:527
+msgid "only output exact matches"
+msgstr "solo mostrar concordancias exactas"
+
+#: builtin/describe.c:529
+msgid "consider <n> most recent tags (default: 10)"
+msgstr "considerar <n> tags más recientes (default:10)"
+
+#: builtin/describe.c:531
+msgid "only consider tags matching <pattern>"
+msgstr "solo considerar tags que concuerden con <patrón>"
+
+#: builtin/describe.c:533
+msgid "do not consider tags matching <pattern>"
+msgstr "no considerar tags que concuerden con <patrón>"
+
+#: builtin/describe.c:535 builtin/name-rev.c:406
+msgid "show abbreviated commit object as fallback"
+msgstr "mostrar el objeto commit abreviado como fallback"
+
+#: builtin/describe.c:536 builtin/describe.c:539
+msgid "mark"
+msgstr "marca"
+
+#: builtin/describe.c:537
+msgid "append <mark> on dirty working tree (default: \"-dirty\")"
+msgstr "adjuntar <marca> en el árbol de trabajo sucio (default: \"-dirty\")"
+
+#: builtin/describe.c:540
+msgid "append <mark> on broken working tree (default: \"-broken\")"
+msgstr "adjuntar <marca> en un árbol de trbajo roto (default: \"-broken\")"
+
+#: builtin/describe.c:558
+msgid "--long is incompatible with --abbrev=0"
+msgstr "--long es incompatible con --abbrev=0"
+
+#: builtin/describe.c:587
+msgid "No names found, cannot describe anything."
+msgstr "No se encontraron nombres, no se puede describir nada."
+
+#: builtin/describe.c:637
+msgid "--dirty is incompatible with commit-ishes"
+msgstr "--dirty es incompatible con commit-ismos"
+
+#: builtin/describe.c:639
+msgid "--broken is incompatible with commit-ishes"
+msgstr "--broken es incompatible con commit-ismos"
+
+#: builtin/diff.c:83
+#, c-format
+msgid "'%s': not a regular file or symlink"
+msgstr "'%s': no es un archivo regular o un enlace simbólico"
+
+#: builtin/diff.c:234
+#, c-format
+msgid "invalid option: %s"
+msgstr "opción inválida: %s"
+
+#: builtin/diff.c:356
+msgid "Not a git repository"
+msgstr "No es un repositorio git"
+
+#: builtin/diff.c:399
+#, c-format
+msgid "invalid object '%s' given."
+msgstr "objeto '%s' entregado no es válido"
+
+#: builtin/diff.c:408
+#, c-format
+msgid "more than two blobs given: '%s'"
+msgstr "más de dos blobs entregados: '%s'"
+
+#: builtin/diff.c:413
+#, c-format
+msgid "unhandled object '%s' given."
+msgstr "objeto no manejado '%s' entregado."
+
+#: builtin/difftool.c:29
+msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
+msgstr "git difftool [<opciones>] [<commit> [<commit>]] [--] [<ruta>...]"
+
+#: builtin/difftool.c:259
+#, c-format
+msgid "failed: %d"
+msgstr "falló: %d"
+
+#: builtin/difftool.c:301
+#, c-format
+msgid "could not read symlink %s"
+msgstr "no se pudo leer el symlink %s"
+
+#: builtin/difftool.c:303
+#, c-format
+msgid "could not read symlink file %s"
+msgstr "no se pudo leer el archivo symlink %s"
+
+#: builtin/difftool.c:311
+#, 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:412
+msgid ""
+"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:632
+#, c-format
+msgid "both files modified: '%s' and '%s'."
+msgstr "ambos archivos modificados: '%s' y '%s'."
+
+#: builtin/difftool.c:634
+msgid "working tree file has been left."
+msgstr "archivo del árbol de trabajo ha sido dejado."
+
+#: builtin/difftool.c:645
+#, c-format
+msgid "temporary files exist in '%s'."
+msgstr "archivo temporal existe en '%s'."
+
+#: builtin/difftool.c:646
+msgid "you may want to cleanup or recover these."
+msgstr "tal vez desee limpiar o recuperar estos."
+
+#: builtin/difftool.c:695
+msgid "use `diff.guitool` instead of `diff.tool`"
+msgstr "use `diff.guitool` en lugar de `diff.tool`"
+
+#: builtin/difftool.c:697
+msgid "perform a full-directory diff"
+msgstr "realizar un diff de todo el directorio"
+
+#: builtin/difftool.c:699
+msgid "do not prompt before launching a diff tool"
+msgstr "no mostrar antes de lanzar una herramienta de diff"
+
+#: builtin/difftool.c:705
+msgid "use symlinks in dir-diff mode"
+msgstr "usar enlaces simbólicos en modo dir-diff"
+
+#: builtin/difftool.c:706
+msgid "<tool>"
+msgstr "<herramienta>"
+
+#: builtin/difftool.c:707
+msgid "use the specified diff tool"
+msgstr "usar la herramienta de diff especificada"
+
+#: 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:712
+msgid ""
+"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:714
+msgid "<command>"
+msgstr "<comando>"
+
+#: builtin/difftool.c:715
+msgid "specify a custom command for viewing diffs"
+msgstr "especificar un comando personalizado para ver diffs"
+
+#: builtin/difftool.c:739
+msgid "no <tool> given for --tool=<tool>"
+msgstr "no se ha proporcionado <herramienta> para --tool=<herramienta>"
+
+#: builtin/difftool.c:746
+msgid "no <cmd> given for --extcmd=<cmd>"
+msgstr "no se ha entregado <comando> para --extcmd=<comando>"
+
+#: builtin/fast-export.c:26
+msgid "git fast-export [rev-list-opts]"
+msgstr "git fast-export [rev-list-opts]"
+
+#: builtin/fast-export.c:998
+msgid "show progress after <n> objects"
+msgstr "mostrar progreso después de <n> objetos"
+
+#: builtin/fast-export.c:1000
+msgid "select handling of signed tags"
+msgstr "seleccionar el manejo de tags firmados"
+
+#: builtin/fast-export.c:1003
+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:1006
+msgid "Dump marks to this file"
+msgstr "Volcar marcas a este archivo"
+
+#: builtin/fast-export.c:1008
+msgid "Import marks from this file"
+msgstr "Importar marcas de este archivo"
+
+#: builtin/fast-export.c:1010
+msgid "Fake a tagger when tags lack one"
+msgstr "Falsificar un tagger cuando les falta uno"
+
+#: builtin/fast-export.c:1012
+msgid "Output full tree for each commit"
+msgstr "Mostrar todo el árbol para cada commit"
+
+#: builtin/fast-export.c:1014
+msgid "Use the done feature to terminate the stream"
+msgstr "Use el feature done para terminar el stream"
+
+#: builtin/fast-export.c:1015
+msgid "Skip output of blob data"
+msgstr "Saltar el output de data blob"
+
+#: builtin/fast-export.c:1016
+msgid "refspec"
+msgstr "refspec"
+
+#: builtin/fast-export.c:1017
+msgid "Apply refspec to exported refs"
+msgstr "Aplicar refspec para los refs exportados"
+
+#: builtin/fast-export.c:1018
+msgid "anonymize output"
+msgstr "anonimizar la salida"
+
+#: builtin/fetch.c:24
+msgid "git fetch [<options>] [<repository> [<refspec>...]]"
+msgstr "git fetch [<opciones>] [<repositorio> [<refspec>...]]"
+
+#: builtin/fetch.c:25
+msgid "git fetch [<options>] <group>"
+msgstr "git fetch [<opciones>] <grupo>"
+
+#: builtin/fetch.c:26
+msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
+msgstr "git fetch --multiple [<opciones>] [(<repositorio> | <grupo>)...]"
+
+#: builtin/fetch.c:27
+msgid "git fetch --all [<options>]"
+msgstr "git fetch --all [<opciones>]"
+
+#: builtin/fetch.c:113 builtin/pull.c:188
+msgid "fetch from all remotes"
+msgstr "extraer de todos los remotos"
+
+#: builtin/fetch.c:115 builtin/pull.c:191
+msgid "append to .git/FETCH_HEAD instead of overwriting"
+msgstr "adjuntar a .git/FETCH_HEAD en lugar de sobrescribir"
+
+#: builtin/fetch.c:117 builtin/pull.c:194
+msgid "path to upload pack on remote end"
+msgstr "ruta para cargar el paquete al final del remoto"
+
+#: builtin/fetch.c:118 builtin/pull.c:196
+msgid "force overwrite of local branch"
+msgstr "forzar sobrescritura de la rama local"
+
+#: builtin/fetch.c:120
+msgid "fetch from multiple remotes"
+msgstr "extraer de múltiples remotos"
+
+#: builtin/fetch.c:122 builtin/pull.c:198
+msgid "fetch all tags and associated objects"
+msgstr "extraer todos los tags y objetos asociados"
+
+#: builtin/fetch.c:124
+msgid "do not fetch all tags (--no-tags)"
+msgstr "no extraer todos los tags (--no-tags)"
+
+#: builtin/fetch.c:126
+msgid "number of submodules fetched in parallel"
+msgstr "número de submódulos extraídos en paralelo"
+
+#: builtin/fetch.c:128 builtin/pull.c:201
+msgid "prune remote-tracking branches no longer on remote"
+msgstr "Limpiar ramas remotas rastreadas que ya no están en el remoto"
+
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
+msgid "on-demand"
+msgstr "en demanda"
+
+#: builtin/fetch.c:130
+msgid "control recursive fetching of submodules"
+msgstr "controlar extracción recursiva de submódulos"
+
+#: builtin/fetch.c:134 builtin/pull.c:209
+msgid "keep downloaded pack"
+msgstr "mantener el paquete descargado"
+
+#: builtin/fetch.c:136
+msgid "allow updating of HEAD ref"
+msgstr "permitir actualizar la ref HEAD"
+
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
+msgid "deepen history of shallow clone"
+msgstr "historia profunda de un clon superficial"
+
+#: builtin/fetch.c:141
+msgid "deepen history of shallow repository based on time"
+msgstr "historia profunda de un repositorio superficial basado en tiempo"
+
+#: builtin/fetch.c:147 builtin/pull.c:215
+msgid "convert to a complete repository"
+msgstr "convertir a un repositorio completo"
+
+#: builtin/fetch.c:149 builtin/log.c:1463
+msgid "dir"
+msgstr "dir"
+
+#: builtin/fetch.c:150
+msgid "prepend this to submodule path output"
+msgstr "anteponer esto a salida de la ruta del submódulo "
+
+#: builtin/fetch.c:153
+msgid ""
+"default for recursive fetching of submodules (lower priority than config "
+"files)"
+msgstr ""
+"default para extracción recursiva de submódulos (menor prioridad que "
+"archivos de configuración)"
+
+#: builtin/fetch.c:157 builtin/pull.c:218
+msgid "accept refs that update .git/shallow"
+msgstr "aceptar refs que actualicen .git/shallow"
+
+#: builtin/fetch.c:158 builtin/pull.c:220
+msgid "refmap"
+msgstr "refmap"
+
+#: builtin/fetch.c:159 builtin/pull.c:221
+msgid "specify fetch refmap"
+msgstr "especificar extracción de refmap"
+
+#: builtin/fetch.c:417
+msgid "Couldn't find remote ref HEAD"
+msgstr "No se puedo encontrar ref remota HEAD"
+
+#: builtin/fetch.c:535
+#, 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:628
+#, c-format
+msgid "object %s not found"
+msgstr "objeto %s no encontrado"
+
+#: builtin/fetch.c:632
+msgid "[up to date]"
+msgstr "[actualizado]"
+
+#: builtin/fetch.c:645 builtin/fetch.c:725
+msgid "[rejected]"
+msgstr "[rechazado]"
+
+#: builtin/fetch.c:646
+msgid "can't fetch in current branch"
+msgstr "no se puede traer en la rama actual"
+
+#: builtin/fetch.c:655
+msgid "[tag update]"
+msgstr "[actualización de tag]"
+
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
+msgid "unable to update local ref"
+msgstr "no se posible actualizar el ref local"
+
+#: builtin/fetch.c:675
+msgid "[new tag]"
+msgstr "[nuevo tag]"
+
+#: builtin/fetch.c:678
+msgid "[new branch]"
+msgstr "[nueva rama]"
+
+#: builtin/fetch.c:681
+msgid "[new ref]"
+msgstr "[nueva referencia]"
+
+#: builtin/fetch.c:720
+msgid "forced update"
+msgstr "actualización forzada"
+
+#: builtin/fetch.c:725
+msgid "non-fast-forward"
+msgstr "avance lento"
+
+#: builtin/fetch.c:770
+#, c-format
+msgid "%s did not send all necessary objects\n"
+msgstr "%s no envió todos los objetos necesarios\n"
+
+#: builtin/fetch.c:790
+#, c-format
+msgid "reject %s because shallow roots are not allowed to be updated"
+msgstr "rechazado %s porque raíces superficiales no pueden ser actualizadas"
+
+#: builtin/fetch.c:878 builtin/fetch.c:974
+#, c-format
+msgid "From %.*s\n"
+msgstr "Desde %.*s\n"
+
+#: builtin/fetch.c:889
+#, 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"
+" 'git remote prune %s' para remover cualquier rama vieja o conflictiva"
+
+#: builtin/fetch.c:944
+#, c-format
+msgid " (%s will become dangling)"
+msgstr " (%s se pondrá colgado)"
+
+#: builtin/fetch.c:945
+#, c-format
+msgid " (%s has become dangling)"
+msgstr " (%s se ha colgado)"
+
+#: builtin/fetch.c:977
+msgid "[deleted]"
+msgstr "[eliminado]"
+
+#: builtin/fetch.c:978 builtin/remote.c:1024
+msgid "(none)"
+msgstr "(nada)"
+
+#: builtin/fetch.c:1001
+#, 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:1020
+#, c-format
+msgid "Option \"%s\" value \"%s\" is not valid for %s"
+msgstr "Opción \"%s\" valor \"%s\" no es válido para %s"
+
+#: builtin/fetch.c:1023
+#, c-format
+msgid "Option \"%s\" is ignored for %s\n"
+msgstr "Opción \"%s\" es ignorada por %s\n"
+
+#: builtin/fetch.c:1256
+#, c-format
+msgid "Fetching %s\n"
+msgstr "Extrayendo %s\n"
+
+#: builtin/fetch.c:1258 builtin/remote.c:97
+#, c-format
+msgid "Could not fetch %s"
+msgstr "No se pudo extraer %s"
+
+#: builtin/fetch.c:1276
+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"
+"nombre remoto del cual las nuevas revisiones deben ser extraídas."
+
+#: builtin/fetch.c:1299
+msgid "You need to specify a tag name."
+msgstr "Tiene que especificar un nombre de tag."
+
+#: builtin/fetch.c:1342
+msgid "Negative depth in --deepen is not supported"
+msgstr "Profundidad negativa en --deepen no soportada"
+
+#: builtin/fetch.c:1344
+msgid "--deepen and --depth are mutually exclusive"
+msgstr "--depen y --depth son mutuamente exclusivas"
+
+#: builtin/fetch.c:1349
+msgid "--depth and --unshallow cannot be used together"
+msgstr "--depth y --unshallow no pueden ser usadas juntas"
+
+#: builtin/fetch.c:1351
+msgid "--unshallow on a complete repository does not make sense"
+msgstr "--unshallow no tiene sentido en un repositorio completo"
+
+#: builtin/fetch.c:1364
+msgid "fetch --all does not take a repository argument"
+msgstr "fetch --all no toma un argumento de repositorio"
+
+#: builtin/fetch.c:1366
+msgid "fetch --all does not make sense with refspecs"
+msgstr "fetch --all no tiene sentido con refspecs"
+
+#: builtin/fetch.c:1377
+#, c-format
+msgid "No such remote or remote group: %s"
+msgstr "No existe el remoto o grupo remoto: %s"
+
+#: builtin/fetch.c:1385
+msgid "Fetching a group and specifying refspecs does not make sense"
+msgstr "Extraer un grupo y especificar un refspecs no tiene sentido"
+
+#: builtin/fmt-merge-msg.c:15
+msgid ""
+"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
+msgstr ""
+"git fmt-merge-msg [-m <mensaje>] [--log[=<n>] | --no-log] [--file <archivo>]"
+
+#: builtin/fmt-merge-msg.c:666
+msgid "populate log with at most <n> entries from shortlog"
+msgstr "poblar el log con máximo <n> entradas del shorlog"
+
+#: builtin/fmt-merge-msg.c:669
+msgid "alias for --log (deprecated)"
+msgstr "alias para --log (deprecado)"
+
+#: builtin/fmt-merge-msg.c:672
+msgid "text"
+msgstr "texto"
+
+#: builtin/fmt-merge-msg.c:673
+msgid "use <text> as start of message"
+msgstr "use <text> como comienzo de mensaje"
+
+#: builtin/fmt-merge-msg.c:674
+msgid "file to read from"
+msgstr "archivo del cual leer"
+
+#: builtin/for-each-ref.c:10
+msgid "git for-each-ref [<options>] [<pattern>]"
+msgstr "git for-each-ref [<opciones>] [<patrón>]"
+
+#: builtin/for-each-ref.c:11
+msgid "git for-each-ref [--points-at <object>]"
+msgstr "git for-each-ref [--points-at <objeto>]"
+
+#: builtin/for-each-ref.c:12
+msgid "git for-each-ref [(--merged | --no-merged) [<commit>]]"
+msgstr "git for-each-ref [(--merged | --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 [<commit>]] [--no-contains [<commit>]]"
+
+#: builtin/for-each-ref.c:28
+msgid "quote placeholders suitably for shells"
+msgstr "Cite los marcadores de posición adecuadamente para los shells"
+
+#: builtin/for-each-ref.c:30
+msgid "quote placeholders suitably for perl"
+msgstr "Cite los marcadores de posición adecuadamente para perl"
+
+#: builtin/for-each-ref.c:32
+msgid "quote placeholders suitably for python"
+msgstr "Cite los marcadores de posición adecuadamente para python"
+
+#: builtin/for-each-ref.c:34
+msgid "quote placeholders suitably for Tcl"
+msgstr "Cite los marcadores de posición adecuadamente para Tcl"
+
+#: builtin/for-each-ref.c:37
+msgid "show only <n> matched refs"
+msgstr "mostrar solo <n> refs encontradas"
+
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respetar el formato de colores"
+
+#: builtin/for-each-ref.c:43
+msgid "print only refs which points at the given object"
+msgstr "mostrar solo refs que apunten al objeto dado"
+
+#: builtin/for-each-ref.c:45
+msgid "print only refs that are merged"
+msgstr "mostrar solo refs que son fusionadas"
+
+#: builtin/for-each-ref.c:46
+msgid "print only refs that are not merged"
+msgstr "mostrar solo refs que no son fusionadas"
+
+#: builtin/for-each-ref.c:47
+msgid "print only refs which contain the commit"
+msgstr "mostrar solo refs que contienen el commit"
+
+#: builtin/for-each-ref.c:48
+msgid "print only refs which don't contain the commit"
+msgstr "mostrar solo refs que no contienen el commit"
+
+#: builtin/fsck.c:543
+msgid "Checking object directories"
+msgstr "Revisando objetos directorios"
+
+#: builtin/fsck.c:635
+msgid "git fsck [<options>] [<object>...]"
+msgstr "git fsck [<opciones>] [<objeto>...]"
+
+#: builtin/fsck.c:641
+msgid "show unreachable objects"
+msgstr "mostrar objetos ilegibles"
+
+#: builtin/fsck.c:642
+msgid "show dangling objects"
+msgstr "mostrar objetos colgados"
+
+#: builtin/fsck.c:643
+msgid "report tags"
+msgstr "reportar tags"
+
+#: builtin/fsck.c:644
+msgid "report root nodes"
+msgstr "reportar nodos raíz"
+
+#: builtin/fsck.c:645
+msgid "make index objects head nodes"
+msgstr "hacer objetos índices cabezas de nodos"
+
+#: builtin/fsck.c:646
+msgid "make reflogs head nodes (default)"
+msgstr "hacer reflogs cabeza de nodos (default)"
+
+#: builtin/fsck.c:647
+msgid "also consider packs and alternate objects"
+msgstr "también considerar paquetes y objetos alternos"
+
+#: builtin/fsck.c:648
+msgid "check only connectivity"
+msgstr "revisar solo connectividad"
+
+#: builtin/fsck.c:649
+msgid "enable more strict checking"
+msgstr "habilitar revisión más estricta"
+
+#: builtin/fsck.c:651
+msgid "write dangling objects in .git/lost-found"
+msgstr "escribir objetos colgados en .git/lost-found"
+
+#: builtin/fsck.c:652 builtin/prune.c:107
+msgid "show progress"
+msgstr "mostrar prograso"
+
+#: builtin/fsck.c:653
+msgid "show verbose names for reachable objects"
+msgstr "mostrar nombres verboso para objetos alcanzables"
+
+#: builtin/fsck.c:714
+msgid "Checking objects"
+msgstr "Revisando objetos"
+
+#: builtin/gc.c:27
+msgid "git gc [<options>]"
+msgstr "git gc [<opciones>]"
+
+#: builtin/gc.c:80
+#, c-format
+msgid "Failed to fstat %s: %s"
+msgstr "Falló el fstat %s: %s"
+
+#: builtin/gc.c:312
+#, c-format
+msgid "Can't stat %s"
+msgstr "No se puede definir %s"
+
+#: builtin/gc.c:321
+#, 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 ""
+"El último gc reportó lo siguiente. Por favor corrige la causa\n"
+"y remueva %s.\n"
+"Limpieza automática no se realizará hasta que el archivo sea removido.\n"
+"\n"
+"%s"
+
+#: builtin/gc.c:360
+msgid "prune unreferenced objects"
+msgstr "limpiar objetos no referenciados"
+
+#: builtin/gc.c:362
+msgid "be more thorough (increased runtime)"
+msgstr "ser más exhaustivo (aumentar runtime)"
+
+#: builtin/gc.c:363
+msgid "enable auto-gc mode"
+msgstr "habilitar modo auto-gc"
+
+#: builtin/gc.c:364
+msgid "force running gc even if there may be another gc running"
+msgstr "forzar la ejecución de gc incluso si puede haber otro gc ejecutándose"
+
+#: builtin/gc.c:381
+#, c-format
+msgid "Failed to parse gc.logexpiry value %s"
+msgstr "Falló al analizar valor %s de gc.logexpirity"
+
+#: builtin/gc.c:409
+#, c-format
+msgid "Auto packing the repository in background for optimum performance.\n"
+msgstr ""
+"Auto empaquetado del repositorio en segundo plano para un performance "
+"óptimo.\n"
+
+#: builtin/gc.c:411
+#, c-format
+msgid "Auto packing the repository for optimum performance.\n"
+msgstr "Auto empaquetado del repositorio para performance óptimo.\n"
+
+#: builtin/gc.c:412
+#, c-format
+msgid "See \"git help gc\" for manual housekeeping.\n"
+msgstr "Vea \"git help gc\" para limpieza manual.\n"
+
+#: builtin/gc.c:437
+#, 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 so no "
+"es así)"
+
+#: builtin/gc.c:481
+msgid ""
+"There are too many unreachable loose objects; run 'git prune' to remove them."
+msgstr ""
+"Hay muchos objetos sueltos inalcanzables; ejecute 'git prune' para "
+"removerlos."
+
+#: builtin/grep.c:27
+msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
+msgstr "git grep [<opciones>] [-e] <patrón> [<rev>...] [[--] <ruta>...]"
+
+#: builtin/grep.c:226
+#, c-format
+msgid "grep: failed to create thread: %s"
+msgstr "grep: falló al crear el hilo: %s"
+
+#: builtin/grep.c:284
+#, c-format
+msgid "invalid number of threads specified (%d) for %s"
+msgstr "número inválido de hilos especificado (%d) para %s"
+
+#. TRANSLATORS: %s is the configuration
+#. variable for tweaking threads, currently
+#. grep.threads
+#.
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
+#, c-format
+msgid "no threads support, ignoring %s"
+msgstr "no hay soporte para hilos, ignorando %s"
+
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
+#, c-format
+msgid "unable to read tree (%s)"
+msgstr "no es posible leer el árbol (%s)"
+
+#: builtin/grep.c:630
+#, 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:696
+#, c-format
+msgid "switch `%c' expects a numerical value"
+msgstr "switch `%c' espera un valor numérico"
+
+#: builtin/grep.c:783
+msgid "search in index instead of in the work tree"
+msgstr "buscar en el índice en lugar del árbol de trabajo"
+
+#: builtin/grep.c:785
+msgid "find in contents not managed by git"
+msgstr "encontrar en contenidos no manejados por git"
+
+#: builtin/grep.c:787
+msgid "search in both tracked and untracked files"
+msgstr "buscar en archivos rastreados y no rastreados"
+
+#: builtin/grep.c:789
+msgid "ignore files specified via '.gitignore'"
+msgstr "ignorar archivos especificados via '.gitignore'"
+
+#: builtin/grep.c:791
+msgid "recursively search in each submodule"
+msgstr "búsqueda recursiva en cada submódulo"
+
+#: builtin/grep.c:794
+msgid "show non-matching lines"
+msgstr "mostrar líneas que no concuerdan"
+
+#: builtin/grep.c:796
+msgid "case insensitive matching"
+msgstr "búsqueda insensible a mayúsculas"
+
+#: builtin/grep.c:798
+msgid "match patterns only at word boundaries"
+msgstr "concordar patrón solo a los límites de las palabras"
+
+#: builtin/grep.c:800
+msgid "process binary files as text"
+msgstr "procesar archivos binarios como texto"
+
+#: builtin/grep.c:802
+msgid "don't match patterns in binary files"
+msgstr "no concordar patrones en archivos binarios"
+
+#: builtin/grep.c:805
+msgid "process binary files with textconv filters"
+msgstr "procesar archivos binarios con filtros textconv "
+
+#: builtin/grep.c:807
+msgid "descend at most <depth> levels"
+msgstr "descender como máximo <valor-de-profundiad> niveles"
+
+#: builtin/grep.c:811
+msgid "use extended POSIX regular expressions"
+msgstr "usar expresiones regulares POSIX extendidas"
+
+#: builtin/grep.c:814
+msgid "use basic POSIX regular expressions (default)"
+msgstr "usar expresiones regulares POSIX (default)"
+
+#: builtin/grep.c:817
+msgid "interpret patterns as fixed strings"
+msgstr "interpretar patrones como strings arreglados"
+
+#: builtin/grep.c:820
+msgid "use Perl-compatible regular expressions"
+msgstr "usar expresiones regulares compatibles con Perl"
+
+#: builtin/grep.c:823
+msgid "show line numbers"
+msgstr "mostrar números de línea"
+
+#: builtin/grep.c:824
+msgid "don't show filenames"
+msgstr "no mostrar nombres de archivo"
+
+#: builtin/grep.c:825
+msgid "show filenames"
+msgstr "mostrar nombres de archivo"
+
+#: builtin/grep.c:827
+msgid "show filenames relative to top directory"
+msgstr "mostrar nombres de archivo relativos al directorio superior"
+
+#: builtin/grep.c:829
+msgid "show only filenames instead of matching lines"
+msgstr "mostrar solo nombres de archivos en lugar de líneas encontradas"
+
+#: builtin/grep.c:831
+msgid "synonym for --files-with-matches"
+msgstr "sinónimo para --files-with-matches"
+
+#: builtin/grep.c:834
+msgid "show only the names of files without match"
+msgstr "mostrar solo los nombres de archivos sin coincidencias"
+
+#: builtin/grep.c:836
+msgid "print NUL after filenames"
+msgstr "imprimir NUL después del nombre de archivo"
+
+#: builtin/grep.c:838
+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:839
+msgid "highlight matches"
+msgstr "resaltar concordancias"
+
+#: builtin/grep.c:841
+msgid "print empty line between matches from different files"
+msgstr "imprimir una línea vacía entre coincidencias de diferentes archivos"
+
+#: builtin/grep.c:843
+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:846
+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:849
+msgid "show <n> context lines before matches"
+msgstr "mostrar <n> líneas de contexto antes de las concordancias"
+
+#: builtin/grep.c:851
+msgid "show <n> context lines after matches"
+msgstr "mostrar <n> líneas de context después de las concordancias"
+
+#: builtin/grep.c:853
+msgid "use <n> worker threads"
+msgstr "usar <n> hilos de trabajo"
+
+#: builtin/grep.c:854
+msgid "shortcut for -C NUM"
+msgstr "atajo para -C NUM"
+
+#: builtin/grep.c:857
+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:859
+msgid "show the surrounding function"
+msgstr "mostrar la función circundante"
+
+#: builtin/grep.c:862
+msgid "read patterns from file"
+msgstr "leer patrones del archivo"
+
+#: builtin/grep.c:864
+msgid "match <pattern>"
+msgstr "concordar <patrón>"
+
+#: builtin/grep.c:866
+msgid "combine patterns specified with -e"
+msgstr "combinar patrones especificados con -e"
+
+#: builtin/grep.c:878
+msgid "indicate hit with exit status without output"
+msgstr "indicar concordancia con exit status sin output"
+
+#: builtin/grep.c:880
+msgid "show only matches from files that match all patterns"
+msgstr ""
+"mostrar solo concordancias con archivos que concuerdan todos los patrones"
+
+#: builtin/grep.c:882
+msgid "show parse tree for grep expression"
+msgstr "mostrar árbol analizado para la expresión grep"
+
+#: builtin/grep.c:886
+msgid "pager"
+msgstr "paginador"
+
+#: builtin/grep.c:886
+msgid "show matching files in the pager"
+msgstr "mostrar archivos concordantes en el paginador"
+
+#: builtin/grep.c:889
+msgid "allow calling of grep(1) (ignored by this build)"
+msgstr "permitir el llamado de grep(1) (ignorado por esta build)"
+
+#: builtin/grep.c:952
+msgid "no pattern given."
+msgstr "no se ha entregado patrón"
+
+#: builtin/grep.c:984
+msgid "--no-index or --untracked cannot be used with revs"
+msgstr "--no-index o --untracked no se puede usar con revs"
+
+#: builtin/grep.c:991
+#, c-format
+msgid "unable to resolve revision: %s"
+msgstr "no se posible resolver revisión: %s"
+
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
+#, c-format
+msgid "invalid number of threads specified (%d)"
+msgstr "número inválido de hilos especificado (%d)"
+
+#: builtin/grep.c:1031
+msgid "no threads support, ignoring --threads"
+msgstr "no se soportan hilos, ignorando --threads"
+
+#: builtin/grep.c:1055
+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:1078
+msgid "option not supported with --recurse-submodules."
+msgstr "opción no soportada con --recurse-submodules."
+
+#: builtin/grep.c:1084
+msgid "--cached or --untracked cannot be used with --no-index."
+msgstr "--cached o --untracked no pueden ser usadas con --no-index."
+
+#: builtin/grep.c:1090
+msgid "--[no-]exclude-standard cannot be used for tracked contents."
+msgstr "--[no-]exclude-standard no puede ser usada para contenido rastreado."
+
+#: builtin/grep.c:1098
+msgid "both --cached and trees are given."
+msgstr "--cached y árboles han sido entregados."
+
+#: builtin/hash-object.c:82
+msgid ""
+"git hash-object [-t <type>] [-w] [--path=<file> | --no-filters] [--stdin] "
+"[--] <file>..."
+msgstr ""
+"git hash-object [-t <tipo>] [-w] [--path=<archivo> | --no-filters] [--stdin] "
+"[--] <archivo>..."
+
+#: builtin/hash-object.c:83
+msgid "git hash-object --stdin-paths"
+msgstr "git hash-object --stdin-paths"
+
+#: builtin/hash-object.c:95
+msgid "type"
+msgstr "tipo"
+
+#: builtin/hash-object.c:95
+msgid "object type"
+msgstr "tipo de objeto"
+
+#: builtin/hash-object.c:96
+msgid "write the object into the object database"
+msgstr "escribir el objeto en la base de datos de objetos"
+
+#: builtin/hash-object.c:98
+msgid "read the object from stdin"
+msgstr "leer el objeto de stdin"
+
+#: builtin/hash-object.c:100
+msgid "store file as is without filters"
+msgstr "guardar el archivo como es sin filtros"
+
+#: builtin/hash-object.c:101
+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 Gti"
+
+#: builtin/hash-object.c:102
+msgid "process file as it were from this path"
+msgstr "procesar el archivo como si fuera de esta ruta"
+
+#: builtin/help.c:43
+msgid "print all available commands"
+msgstr "mostrar todos los comandos disponibles"
+
+#: builtin/help.c:44
+msgid "exclude guides"
+msgstr "excluir las guias"
+
+#: builtin/help.c:45
+msgid "print list of useful guides"
+msgstr "mostrar una lista de nociones utiles"
+
+#: builtin/help.c:46
+msgid "show man page"
+msgstr "mostrar la pagina del manual"
+
+#: builtin/help.c:47
+msgid "show manual in web browser"
+msgstr "mostrar la pagina del manual en un navegador web"
+
+#: builtin/help.c:49
+msgid "show info page"
+msgstr "mostrar la pagina de info"
+
+#: builtin/help.c:55
+msgid "git help [--all] [--guides] [--man | --web | --info] [<command>]"
+msgstr "git help [--all] [--guides] [--man | --web | --info] [<comando>]"
+
+#: builtin/help.c:67
+#, c-format
+msgid "unrecognized help format '%s'"
+msgstr "formato help no reconocido '%s'"
+
+#: builtin/help.c:94
+msgid "Failed to start emacsclient."
+msgstr "Fallo al iniciar emacsclient."
+
+#: builtin/help.c:107
+msgid "Failed to parse emacsclient version."
+msgstr "Fallo al analizar la versión de emacsclient."
+
+#: builtin/help.c:115
+#, c-format
+msgid "emacsclient version '%d' too old (< 22)."
+msgstr "la versión '%d' de emacsclient es muy antigua (<22)."
+
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
+#, c-format
+msgid "failed to exec '%s'"
+msgstr "fallo al ejecutar '%s'"
+
+#: builtin/help.c:211
+#, c-format
+msgid ""
+"'%s': path for unsupported man viewer.\n"
+"Please consider using 'man.<tool>.cmd' instead."
+msgstr ""
+"'%s': ruta para el visualizador del manual no soportada.\n"
+"Por favor considere usar 'man.<herramienta.cmd'."
+
+#: builtin/help.c:223
+#, c-format
+msgid ""
+"'%s': cmd for supported man viewer.\n"
+"Please consider using 'man.<tool>.path' instead."
+msgstr ""
+"'%s': comando no soportado para man viewer.\n"
+"Por favor considere usar 'man.<herramienta>.path."
+
+#: builtin/help.c:340
+#, c-format
+msgid "'%s': unknown man viewer."
+msgstr "'%s': visualizador de man desconocido"
+
+#: builtin/help.c:357
+msgid "no man viewer handled the request"
+msgstr "ningun visualizador de manual proceso la petición"
+
+#: builtin/help.c:365
+msgid "no info viewer handled the request"
+msgstr "ningún vizor de info manejo la peticion"
+
+#: builtin/help.c:407
+msgid "Defining attributes per path"
+msgstr "Definiendo atributos por ruta"
+
+#: builtin/help.c:408
+msgid "Everyday Git With 20 Commands Or So"
+msgstr "Git diario con 20 comandos o algo asi"
+
+#: builtin/help.c:409
+msgid "A Git glossary"
+msgstr "Un glosario de Git"
+
+#: builtin/help.c:410
+msgid "Specifies intentionally untracked files to ignore"
+msgstr "Especifica de forma intencional archivos sin seguimiento a ignorar"
+
+#: builtin/help.c:411
+msgid "Defining submodule properties"
+msgstr "Definiendo las propiedades del submodulo"
+
+#: builtin/help.c:412
+msgid "Specifying revisions and ranges for Git"
+msgstr "Especificando revisiones y rangos para Git"
+
+#: builtin/help.c:413
+msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
+msgstr "Un tutorial de introducción para Git ( para versiones 1.5.1 o mayores)"
+
+#: builtin/help.c:414
+msgid "An overview of recommended workflows with Git"
+msgstr "Una visión general de flujos de trabajo recomendados con Git"
+
+#: builtin/help.c:426
+msgid "The common Git guides are:\n"
+msgstr "Las guías comunes de Git son:\n"
+
+#: builtin/help.c:444
+#, c-format
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' tiene el alias '%s'"
+
+#: builtin/help.c:466 builtin/help.c:483
+#, c-format
+msgid "usage: %s%s"
+msgstr "uso: %s%s"
+
+#: builtin/index-pack.c:156
+#, c-format
+msgid "unable to open %s"
+msgstr "no es posible abrir %s"
+
+#: builtin/index-pack.c:206
+#, c-format
+msgid "object type mismatch at %s"
+msgstr "el tipo del objeto no concuerda en %s"
+
+#: builtin/index-pack.c:226
+#, c-format
+msgid "did not receive expected object %s"
+msgstr "no se recibió el objeto esperado %s"
+
+#: builtin/index-pack.c:229
+#, c-format
+msgid "object %s: expected type %s, found %s"
+msgstr "objeto %s: tipo esperado %s, encontrado %s"
+
+#: builtin/index-pack.c:271
+#, 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:281
+msgid "early EOF"
+msgstr "EOF temprano"
+
+#: builtin/index-pack.c:282
+msgid "read error on input"
+msgstr "leer error en input"
+
+#: builtin/index-pack.c:294
+msgid "used more bytes than were available"
+msgstr "se usaron más bytes de los disponibles"
+
+#: builtin/index-pack.c:301
+msgid "pack too large for current definition of off_t"
+msgstr "paquete muy grande para la definición actual de off_t"
+
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
+msgid "pack exceeds maximum allowed size"
+msgstr "paquete excede el máximo tamaño permitido"
+
+#: builtin/index-pack.c:319
+#, c-format
+msgid "unable to create '%s'"
+msgstr "no se puede crear '%s'"
+
+#: builtin/index-pack.c:325
+#, c-format
+msgid "cannot open packfile '%s'"
+msgstr "no se puede abrir el archivo de paquete '%s'"
+
+#: builtin/index-pack.c:339
+msgid "pack signature mismatch"
+msgstr "firma del paquete no concuerda"
+
+#: builtin/index-pack.c:341
+#, c-format
+msgid "pack version %<PRIu32> unsupported"
+msgstr "versión de paquete %<PRIu32> no soportada"
+
+#: builtin/index-pack.c:359
+#, 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:480
+#, c-format
+msgid "inflate returned %d"
+msgstr "inflate retornó %d"
+
+#: builtin/index-pack.c:529
+msgid "offset value overflow for delta base object"
+msgstr "valor de offset desbordado para el objeto base delta"
+
+#: builtin/index-pack.c:537
+msgid "delta base offset is out of bound"
+msgstr "offset de base delta está fuera de límites"
+
+#: builtin/index-pack.c:545
+#, c-format
+msgid "unknown object type %d"
+msgstr "tipo de objeto %d desconocido"
+
+#: builtin/index-pack.c:576
+msgid "cannot pread pack file"
+msgstr "no se puede propagar el paquete"
+
+#: builtin/index-pack.c:578
+#, 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:604
+msgid "serious inflate inconsistency"
+msgstr "inconsistencia seria en inflate"
+
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
+#, c-format
+msgid "SHA1 COLLISION FOUND WITH %s !"
+msgstr "COLISIÓN DE TIPO SHA1 ENCONTRADA CON %s !"
+
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
+#, c-format
+msgid "unable to read %s"
+msgstr "no se posible leer %s"
+
+#: builtin/index-pack.c:815
+#, 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:823
+#, c-format
+msgid "cannot read existing object %s"
+msgstr "no se puede leer el objeto existente %s"
+
+#: builtin/index-pack.c:837
+#, c-format
+msgid "invalid blob object %s"
+msgstr "objeto blob %s inválido"
+
+#: builtin/index-pack.c:852
+#, c-format
+msgid "invalid %s"
+msgstr "%s inválido"
+
+#: builtin/index-pack.c:855
+msgid "Error in object"
+msgstr "Error en el objeto"
+
+#: builtin/index-pack.c:857
+#, 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:929 builtin/index-pack.c:960
+msgid "failed to apply delta"
+msgstr "falló al aplicar delta"
+
+#: builtin/index-pack.c:1131
+msgid "Receiving objects"
+msgstr "Recibiendo objetos"
+
+#: builtin/index-pack.c:1131
+msgid "Indexing objects"
+msgstr "Indexando objetos"
+
+#: builtin/index-pack.c:1165
+msgid "pack is corrupted (SHA1 mismatch)"
+msgstr "paquete está corrompido (SHA1 no concuerda)"
+
+#: builtin/index-pack.c:1170
+msgid "cannot fstat packfile"
+msgstr "no se puede fstat al archivo de paquete"
+
+#: builtin/index-pack.c:1173
+msgid "pack has junk at the end"
+msgstr "el paquete tiene basura al final"
+
+#: builtin/index-pack.c:1185
+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:1208
+msgid "Resolving deltas"
+msgstr "Resolviendo deltas"
+
+#: builtin/index-pack.c:1219
+#, c-format
+msgid "unable to create thread: %s"
+msgstr "no es posible crear hilo: %s"
+
+#: builtin/index-pack.c:1261
+msgid "confusion beyond insanity"
+msgstr "confusión más allá de la locura"
+
+#: builtin/index-pack.c:1267
+#, 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:1279
+#, c-format
+msgid "Unexpected tail checksum for %s (disk corruption?)"
+msgstr "tail checksum para %s inesperada (corrupción de disco?)"
+
+#: builtin/index-pack.c:1283
+#, 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:1307
+#, c-format
+msgid "unable to deflate appended object (%d)"
+msgstr "no es posible desinflar el objeto adjunto (%d)"
+
+#: builtin/index-pack.c:1383
+#, c-format
+msgid "local object %s is corrupt"
+msgstr "objeto local %s está corrompido"
+
+#: builtin/index-pack.c:1409
+msgid "error while closing pack file"
+msgstr "error mientras se cierra el archivo paquete"
+
+#: builtin/index-pack.c:1421
+#, c-format
+msgid "cannot write keep file '%s'"
+msgstr "no se puede escribir el archivo guardado '%s'"
+
+#: builtin/index-pack.c:1429
+#, c-format
+msgid "cannot close written keep file '%s'"
+msgstr "no se puede cerrar el archivo guardado escrito '%s'"
+
+#: builtin/index-pack.c:1439
+msgid "cannot store pack file"
+msgstr "no se puede guardar el archivo paquete"
+
+#: builtin/index-pack.c:1447
+msgid "cannot store index file"
+msgstr "no se puede guardar el archivo índice"
+
+#: builtin/index-pack.c:1485
+#, c-format
+msgid "bad pack.indexversion=%<PRIu32>"
+msgstr "mal pack.indexversion=%<PRIu32>"
+
+#: builtin/index-pack.c:1553
+#, c-format
+msgid "Cannot open existing pack file '%s'"
+msgstr "No se puede abrir el archivo paquete existente '%s'"
+
+#: builtin/index-pack.c:1555
+#, c-format
+msgid "Cannot open existing pack idx file for '%s'"
+msgstr "No se puede abrir el índice del archivo paquete para '%s'"
+
+#: builtin/index-pack.c:1603
+#, 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:1610
+#, 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:1623
+#, c-format
+msgid "packfile name '%s' does not end with '.pack'"
+msgstr "nombre '%s' de archivo de paquete no termina con '.pack'"
+
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
+#, c-format
+msgid "bad %s"
+msgstr "mal %s"
+
+#: builtin/index-pack.c:1739
+msgid "--fix-thin cannot be used without --stdin"
+msgstr "--fix-thin no puede ser usada sin --stdin"
+
+#: builtin/index-pack.c:1741
+msgid "--stdin requires a git repository"
+msgstr "--stdin requiere un repositorio git"
+
+#: builtin/index-pack.c:1749
+msgid "--verify with no packfile name given"
+msgstr "--verify no recibió ningún nombre de archivo de paquete"
+
+#: builtin/init-db.c:55
+#, c-format
+msgid "cannot stat '%s'"
+msgstr "no se pudo definir '%s'"
+
+#: builtin/init-db.c:61
+#, c-format
+msgid "cannot stat template '%s'"
+msgstr "no se pudo definir template '%s'"
+
+#: builtin/init-db.c:66
+#, c-format
+msgid "cannot opendir '%s'"
+msgstr "no se puede abrir directorio '%s'"
+
+#: builtin/init-db.c:77
+#, c-format
+msgid "cannot readlink '%s'"
+msgstr "no se puede leer link '%s'"
+
+#: builtin/init-db.c:79
+#, c-format
+msgid "cannot symlink '%s' '%s'"
+msgstr "no se puede crear symlink '%s' '%s'"
+
+#: builtin/init-db.c:85
+#, c-format
+msgid "cannot copy '%s' to '%s'"
+msgstr "no se puede copiar '%s' a '%s'"
+
+#: builtin/init-db.c:89
+#, c-format
+msgid "ignoring template %s"
+msgstr "ignorando template %s"
+
+#: builtin/init-db.c:120
+#, c-format
+msgid "templates not found %s"
+msgstr "no se encontraron templates %s"
+
+#: builtin/init-db.c:135
+#, c-format
+msgid "not copying templates from '%s': %s"
+msgstr "no se copian templates de '%s': %s"
+
+#: builtin/init-db.c:328
+#, c-format
+msgid "unable to handle file type %d"
+msgstr "no es posible manejar el tipo de archivo %d"
+
+#: builtin/init-db.c:331
+#, c-format
+msgid "unable to move %s to %s"
+msgstr "no se puede mover %s a %s"
+
+#: builtin/init-db.c:348 builtin/init-db.c:351
+#, c-format
+msgid "%s already exists"
+msgstr "%s ya existe"
+
+#: builtin/init-db.c:404
+#, c-format
+msgid "Reinitialized existing shared Git repository in %s%s\n"
+msgstr "Reinicializado el repositorio Git compartido existente en %s%s\n"
+
+#: builtin/init-db.c:405
+#, c-format
+msgid "Reinitialized existing Git repository in %s%s\n"
+msgstr "Reinicializado el repositorio Git existente en %s%s\n"
+
+#: builtin/init-db.c:409
+#, c-format
+msgid "Initialized empty shared Git repository in %s%s\n"
+msgstr "Inicializado repositorio Git compartido vacío en %s%s\n"
+
+#: builtin/init-db.c:410
+#, c-format
+msgid "Initialized empty Git repository in %s%s\n"
+msgstr "Inicializado repositorio Git vacío en %s%s\n"
+
+#: builtin/init-db.c:458
+msgid ""
+"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--"
+"shared[=<permissions>]] [<directory>]"
+msgstr ""
+"git init [-q | --quiet] [--bare] [--template=<directorio-template>] [--"
+"shared[=<permisos>]] [<directorio>]"
+
+#: builtin/init-db.c:481
+msgid "permissions"
+msgstr "permisos"
+
+#: builtin/init-db.c:482
+msgid "specify that the git repository is to be shared amongst several users"
+msgstr ""
+"especifica que el repositorio de git será compartido entre varios usuarios"
+
+#: builtin/init-db.c:516 builtin/init-db.c:521
+#, c-format
+msgid "cannot mkdir %s"
+msgstr "no se pude crear directorio %s"
+
+#: builtin/init-db.c:525
+#, c-format
+msgid "cannot chdir to %s"
+msgstr "no se puede aplicar chdir a %s"
+
+#: builtin/init-db.c:546
+#, c-format
+msgid ""
+"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-"
+"dir=<directory>)"
+msgstr ""
+"%s (o --work-tree=<directorio>) no se permite sin especificar %s (o --git-"
+"dir=<directorio>)"
+
+#: builtin/init-db.c:574
+#, c-format
+msgid "Cannot access work tree '%s'"
+msgstr "No se puede acceder al árbol de trabajo '%s'"
+
+#: builtin/interpret-trailers.c:15
+msgid ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<value>])...] [<file>...]"
+msgstr ""
+"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
+"<token>[(=|:)<valor>])...] [<archivo>...]"
+
+#: builtin/interpret-trailers.c:92
+msgid "edit files in place"
+msgstr "editar archivos en el lugar"
+
+#: builtin/interpret-trailers.c:93
+msgid "trim empty trailers"
+msgstr "cortar trailers vacíos"
+
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "donde colocar el nuevo trailer"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "acción if trailer ya existe"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "acción si falta el trailer"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "mostrar solo los trailers"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "no aplicar reglas de configuración"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "juntar valores con espacios en blanco contiguos"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "configurar opciones de análisis"
+
+#: builtin/interpret-trailers.c:107
+msgid "trailer"
+msgstr "trailer"
+
+#: builtin/interpret-trailers.c:108
+msgid "trailer(s) to add"
+msgstr "trailer(s) para agregar"
+
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer con --only-input no tiene sentido"
+
+#: builtin/interpret-trailers.c:127
+msgid "no input file given for in-place editing"
+msgstr "no se entregó archivo de entrada para edición en lugar"
+
+#: builtin/log.c:46
+msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
+msgstr "git log [<opciones>] [<rango-de-revisión>] [[--] <ruta>...]"
+
+#: builtin/log.c:47
+msgid "git show [<options>] <object>..."
+msgstr "git show [<opciones>] <objeto>..."
+
+#: builtin/log.c:91
+#, c-format
+msgid "invalid --decorate option: %s"
+msgstr "opción --decorate inválida: %s"
+
+#: builtin/log.c:151
+msgid "suppress diff output"
+msgstr "suprimir salida de diff"
+
+#: builtin/log.c:152
+msgid "show source"
+msgstr "mostrar fuente"
+
+#: builtin/log.c:153
+msgid "Use mail map file"
+msgstr "usar archivo de mapa de mail"
+
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "solo decorar refs que concuerden con <patrón>"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "no decorar refs que concuerden con <patrón>"
+
+#: builtin/log.c:158
+msgid "decorate options"
+msgstr "opciones de decorado"
+
+#: builtin/log.c:161
+msgid "Process line range n,m in file, counting from 1"
+msgstr "Procesar rango de líneas n,m en archivo, contando desde 1"
+
+#: builtin/log.c:257
+#, c-format
+msgid "Final output: %d %s\n"
+msgstr "Salida final: %d %s\n"
+
+#: builtin/log.c:508
+#, c-format
+msgid "git show %s: bad file"
+msgstr "git show %s: mal archivo"
+
+#: builtin/log.c:523 builtin/log.c:617
+#, c-format
+msgid "Could not read object %s"
+msgstr "No se pudo leer objeto %s"
+
+#: builtin/log.c:641
+#, c-format
+msgid "Unknown type: %d"
+msgstr "Tipo desconocido: %d"
+
+#: builtin/log.c:762
+msgid "format.headers without value"
+msgstr "formate.headers. sin valor"
+
+#: builtin/log.c:863
+msgid "name of output directory is too long"
+msgstr "nombre del directorio de salida es muy largo"
+
+#: builtin/log.c:879
+#, c-format
+msgid "Cannot open patch file %s"
+msgstr "No se puede abrir archivo patch %s"
+
+#: builtin/log.c:896
+msgid "Need exactly one range."
+msgstr "Exactamente un rango necesario."
+
+#: builtin/log.c:906
+msgid "Not a range."
+msgstr "No es un rango."
+
+#: builtin/log.c:1012
+msgid "Cover letter needs email format"
+msgstr "Letras de portada necesita formato email"
+
+#: builtin/log.c:1092
+#, c-format
+msgid "insane in-reply-to: %s"
+msgstr "insano in-reply-to: %s"
+
+#: builtin/log.c:1119
+msgid "git format-patch [<options>] [<since> | <revision-range>]"
+msgstr "git format-patch [<opciones>] [<desde> | <rango-de-revisiones>]"
+
+#: builtin/log.c:1169
+msgid "Two output directories?"
+msgstr "dos directorios de salida?"
+
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
+#, c-format
+msgid "Unknown commit %s"
+msgstr "Commit desconocido %s"
+
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
+#, c-format
+msgid "Failed to resolve '%s' as a valid ref."
+msgstr "Falló al resolver '%s' como una ref válida."
+
+#: builtin/log.c:1291
+msgid "Could not find exact merge base."
+msgstr "No se pudo encontrar una base de fusión."
+
+#: builtin/log.c:1295
+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 ""
+"Falló al conseguir upstream, si quiere grabar un commit base de manera "
+"automática,\n"
+"por favor use git branch --set-upstream-to para rastrear una rama remota.\n"
+"O puede especificar un commit base mediante --base=<id-commit-base> "
+"manualmente."
+
+#: builtin/log.c:1315
+msgid "Failed to find exact merge base"
+msgstr "Fallo al encontrar una base de fusión exacta"
+
+#: builtin/log.c:1326
+msgid "base commit should be the ancestor of revision list"
+msgstr "el commit base debe ser el ancestro de la lista de revisión"
+
+#: builtin/log.c:1330
+msgid "base commit shouldn't be in revision list"
+msgstr "el commit base no debe estar en la lista de revisión"
+
+#: builtin/log.c:1379
+msgid "cannot get patch id"
+msgstr "no se puede obtener id de patch"
+
+#: builtin/log.c:1438
+msgid "use [PATCH n/m] even with a single patch"
+msgstr "use [PATCH n/m] incluso con un único parche"
+
+#: builtin/log.c:1441
+msgid "use [PATCH] even with multiple patches"
+msgstr "use [PATCH] incluso con múltiples parches"
+
+#: builtin/log.c:1445
+msgid "print patches to standard out"
+msgstr "mostrar parches en standard out"
+
+#: builtin/log.c:1447
+msgid "generate a cover letter"
+msgstr "generar letra de cover"
+
+#: builtin/log.c:1449
+msgid "use simple number sequence for output file names"
+msgstr ""
+"usar una secuencia simple de números para salida de nombres de archivos"
+
+#: builtin/log.c:1450
+msgid "sfx"
+msgstr "sfx"
+
+#: builtin/log.c:1451
+msgid "use <sfx> instead of '.patch'"
+msgstr "use <sfx> en lugar de '.patch'"
+
+#: builtin/log.c:1453
+msgid "start numbering patches at <n> instead of 1"
+msgstr "comenzar a numerar los parches desde <n> en lugar de 1"
+
+#: builtin/log.c:1455
+msgid "mark the series as Nth re-roll"
+msgstr "marcar las series como Nth re-roll"
+
+#: builtin/log.c:1457
+msgid "Use [RFC PATCH] instead of [PATCH]"
+msgstr "Use [RFC PATCH] en lugar de [PATCH]"
+
+#: builtin/log.c:1460
+msgid "Use [<prefix>] instead of [PATCH]"
+msgstr "Use [<prefijo>] en lugar de [PATCH]"
+
+#: builtin/log.c:1463
+msgid "store resulting files in <dir>"
+msgstr "guardar archivos resultantes en <dir>"
+
+#: builtin/log.c:1466
+msgid "don't strip/add [PATCH]"
+msgstr "no cortar/agregar [PATCH]"
+
+#: builtin/log.c:1469
+msgid "don't output binary diffs"
+msgstr "no mostrar diffs binarios"
+
+#: builtin/log.c:1471
+msgid "output all-zero hash in From header"
+msgstr "salida como hash de todos-ceros en la cabecera From "
+
+#: builtin/log.c:1473
+msgid "don't include a patch matching a commit upstream"
+msgstr "no incluya un parche que coincida con un commit en upstream"
+
+#: builtin/log.c:1475
+msgid "show patch format instead of default (patch + stat)"
+msgstr "mostrar formato de parche en lugar del default (parche + stat)"
+
+#: builtin/log.c:1477
+msgid "Messaging"
+msgstr "Mensajeando"
+
+#: builtin/log.c:1478
+msgid "header"
+msgstr "cabezal"
+
+#: builtin/log.c:1479
+msgid "add email header"
+msgstr "agregar cabecera email"
+
+#: builtin/log.c:1480 builtin/log.c:1482
+msgid "email"
+msgstr "email"
+
+#: builtin/log.c:1480
+msgid "add To: header"
+msgstr "agregar cabecera To:"
+
+#: builtin/log.c:1482
+msgid "add Cc: header"
+msgstr "agregar cabecera Cc:"
+
+#: builtin/log.c:1484
+msgid "ident"
+msgstr "ident"
+
+#: builtin/log.c:1485
+msgid "set From address to <ident> (or committer ident if absent)"
+msgstr ""
+"configurar dirección From a <ident> ( o identidad de committer si está "
+"ausente)"
+
+#: builtin/log.c:1487
+msgid "message-id"
+msgstr "id de mensaje"
+
+#: builtin/log.c:1488
+msgid "make first mail a reply to <message-id>"
+msgstr "hacer primer mail una respuesta a <id de mensaje>"
+
+#: builtin/log.c:1489 builtin/log.c:1492
+msgid "boundary"
+msgstr "límite"
+
+#: builtin/log.c:1490
+msgid "attach the patch"
+msgstr "adjuntar el parche"
+
+#: builtin/log.c:1493
+msgid "inline the patch"
+msgstr "poner el parche en línea"
+
+#: builtin/log.c:1497
+msgid "enable message threading, styles: shallow, deep"
+msgstr "habilitar hilos de mensajes, estilos: superficial, profundo"
+
+#: builtin/log.c:1499
+msgid "signature"
+msgstr "firma"
+
+#: builtin/log.c:1500
+msgid "add a signature"
+msgstr "agregar una firma"
+
+#: builtin/log.c:1501
+msgid "base-commit"
+msgstr "commit-base"
+
+#: builtin/log.c:1502
+msgid "add prerequisite tree info to the patch series"
+msgstr ""
+"agregar información de árbol de requisitos previos a la serie de parches"
+
+#: builtin/log.c:1504
+msgid "add a signature from a file"
+msgstr "agregar una firma de un archivo"
+
+#: builtin/log.c:1505
+msgid "don't print the patch filenames"
+msgstr "no mostrar los nombres de archivos de los parches"
+
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "mostrar medidor de progreso mientras se generan los parches"
+
+#: builtin/log.c:1582
+#, c-format
+msgid "invalid ident line: %s"
+msgstr "línea de identificación inválida: %s"
+
+#: builtin/log.c:1597
+msgid "-n and -k are mutually exclusive."
+msgstr "-n y -k son mutuamente exclusivas."
+
+#: builtin/log.c:1599
+msgid "--subject-prefix/--rfc and -k are mutually exclusive."
+msgstr "--subject-prefix/--rfc y -k son mutuamente exclusivos."
+
+#: builtin/log.c:1607
+msgid "--name-only does not make sense"
+msgstr "--name-only no tiene sentido"
+
+#: builtin/log.c:1609
+msgid "--name-status does not make sense"
+msgstr "--name-status no tiene sentido"
+
+#: builtin/log.c:1611
+msgid "--check does not make sense"
+msgstr "--check no tiene sentido"
+
+#: builtin/log.c:1641
+msgid "standard output, or directory, which one?"
+msgstr "salida standard, o directorio, cual? "
+
+#: builtin/log.c:1643
+#, c-format
+msgid "Could not create directory '%s'"
+msgstr "No se pudo crear el directorio '%s'"
+
+#: builtin/log.c:1736
+#, c-format
+msgid "unable to read signature file '%s'"
+msgstr "no se puede leer la firma del archivo '%s'"
+
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Generando parches"
+
+#: builtin/log.c:1812
+msgid "Failed to create output files"
+msgstr "Falló al crear los archivos de salida"
+
+#: builtin/log.c:1862
+msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
+msgstr "git cherry [-v] [<upstream> [<head> [<límite>]]]"
+
+#: builtin/log.c:1916
+#, c-format
+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 "
+"<upstream> manualmente.\n"
+
+#: builtin/ls-files.c:468
+msgid "git ls-files [<options>] [<file>...]"
+msgstr "git ls-files [<opciones>] [<archivo>...]"
+
+#: builtin/ls-files.c:517
+msgid "identify the file status with tags"
+msgstr "identifique el estado del archivo con tags"
+
+#: builtin/ls-files.c:519
+msgid "use lowercase letters for 'assume unchanged' files"
+msgstr "usar letras minúsculas para archivos 'asumidos sin cambios'"
+
+#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "usar letras minúsculas para archivos de 'fsmonitor clean'"
+
+#: builtin/ls-files.c:523
+msgid "show cached files in the output (default)"
+msgstr "mostrar archivos en caché en la salida (default)"
+
+#: builtin/ls-files.c:525
+msgid "show deleted files in the output"
+msgstr "mostrar archivos borrados en la salida"
+
+#: builtin/ls-files.c:527
+msgid "show modified files in the output"
+msgstr "mostrar archivos modificados en la salida"
+
+#: builtin/ls-files.c:529
+msgid "show other files in the output"
+msgstr "mostrar otros archivos en la salida"
+
+#: builtin/ls-files.c:531
+msgid "show ignored files in the output"
+msgstr "mostrar archivos ignorados en la salida"
+
+#: builtin/ls-files.c:534
+msgid "show staged contents' object name in the output"
+msgstr ""
+"mostrar contenido de nombres de objetos en el área de stage en la salida"
+
+#: builtin/ls-files.c:536
+msgid "show files on the filesystem that need to be removed"
+msgstr "mostrar archivos en el filesystem que necesitan ser borrados"
+
+#: builtin/ls-files.c:538
+msgid "show 'other' directories' names only"
+msgstr "mostrar solo nombres de 'directorios otros'"
+
+#: builtin/ls-files.c:540
+msgid "show line endings of files"
+msgstr "mostrar finales de línea de archivos"
+
+#: builtin/ls-files.c:542
+msgid "don't show empty directories"
+msgstr "no mostrar directorios vacíos"
+
+#: builtin/ls-files.c:545
+msgid "show unmerged files in the output"
+msgstr "mostrar archivos no fusionados en la salida"
+
+#: builtin/ls-files.c:547
+msgid "show resolve-undo information"
+msgstr "mostrar información resolver-deshacer"
+
+#: builtin/ls-files.c:549
+msgid "skip files matching pattern"
+msgstr "saltar archivos que concuerden con el patrón"
+
+#: builtin/ls-files.c:552
+msgid "exclude patterns are read from <file>"
+msgstr "excluir patrones leídos de <archivo>"
+
+#: builtin/ls-files.c:555
+msgid "read additional per-directory exclude patterns in <file>"
+msgstr ""
+"leer patrones de exclusión de manera adicional por directorio en <archivo>"
+
+#: builtin/ls-files.c:557
+msgid "add the standard git exclusions"
+msgstr "agregar las exclusiones standard de git"
+
+#: builtin/ls-files.c:560
+msgid "make the output relative to the project top directory"
+msgstr "hacer la salidad relativa al directorio principal del proyecto"
+
+#: builtin/ls-files.c:563
+msgid "recurse through submodules"
+msgstr "recurrir a través de submódulos"
+
+#: builtin/ls-files.c:565
+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:566
+msgid "tree-ish"
+msgstr "árbol-ismo"
+
+#: builtin/ls-files.c:567
+msgid "pretend that paths removed since <tree-ish> are still present"
+msgstr ""
+"fingir que las rutas han sido borradas ya que todavía hay <árbol-ismos> "
+"presentes"
+
+#: builtin/ls-files.c:569
+msgid "show debugging data"
+msgstr "mostrar data de debug"
+
+#: builtin/ls-remote.c:7
+msgid ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repository> [<refs>...]]"
+msgstr ""
+"git ls-remote [--heads] [--tags] [--refs] [--upload-pack=<exec>]\n"
+" [-q | --quiet] [--exit-code] [--get-url]\n"
+" [--symref] [<repositorio> [<refs>...]]"
+
+#: builtin/ls-remote.c:52
+msgid "do not print remote URL"
+msgstr "no mostrar el URL remoto"
+
+#: builtin/ls-remote.c:53 builtin/ls-remote.c:55
+msgid "exec"
+msgstr "ejecutar"
+
+#: builtin/ls-remote.c:54 builtin/ls-remote.c:56
+msgid "path of git-upload-pack on the remote host"
+msgstr "ruta de git-upload-pack en el host remoto"
+
+#: builtin/ls-remote.c:58
+msgid "limit to tags"
+msgstr "limitar a tags"
+
+#: builtin/ls-remote.c:59
+msgid "limit to heads"
+msgstr "limitar a heads"
+
+#: builtin/ls-remote.c:60
+msgid "do not show peeled tags"
+msgstr "no mostrar tags pelados"
+
+#: builtin/ls-remote.c:62
+msgid "take url.<base>.insteadOf into account"
+msgstr "tomar url.<base>.insteadOf en cuenta"
+
+#: builtin/ls-remote.c:64
+msgid "exit with exit code 2 if no matching refs are found"
+msgstr "salir con código de salida 2 si no se encuentran refs que concuerden"
+
+#: builtin/ls-remote.c:66
+msgid "show underlying ref in addition to the object pointed by it"
+msgstr "mostrar ref subyacente en adición al objeto apuntado por él"
+
+#: builtin/ls-tree.c:29
+msgid "git ls-tree [<options>] <tree-ish> [<path>...]"
+msgstr "git ls-tree [<opciones>] <árbol-ismo> [<ruta>...]"
+
+#: builtin/ls-tree.c:127
+msgid "only show trees"
+msgstr "solo mostrar árboles"
+
+#: builtin/ls-tree.c:129
+msgid "recurse into subtrees"
+msgstr "recurrir en subárboles"
+
+#: builtin/ls-tree.c:131
+msgid "show trees when recursing"
+msgstr "mostrar árboles cuando se recurre"
+
+#: builtin/ls-tree.c:134
+msgid "terminate entries with NUL byte"
+msgstr "terminar entradas con byte NUL"
+
+#: builtin/ls-tree.c:135
+msgid "include object size"
+msgstr "incluir tamaño de objeto"
+
+#: builtin/ls-tree.c:137 builtin/ls-tree.c:139
+msgid "list only filenames"
+msgstr "listar solo nombres de archivos"
+
+#: builtin/ls-tree.c:142
+msgid "use full path names"
+msgstr "usar rutas completas"
+
+#: builtin/ls-tree.c:144
+msgid "list entire tree; not just current directory (implies --full-name)"
+msgstr ""
+"mostrar todo el árbol; no solo el directorio actual (implica --full-name)"
+
+#: builtin/mailsplit.c:241
+#, c-format
+msgid "empty mbox: '%s'"
+msgstr "mbox vacío: '%s'"
+
+#: builtin/merge.c:48
+msgid "git merge [<options>] [<commit>...]"
+msgstr "git merge [<opciones>] [<commit>...]"
+
+#: builtin/merge.c:49
+msgid "git merge --abort"
+msgstr "git merge --abort"
+
+#: builtin/merge.c:50
+msgid "git merge --continue"
+msgstr "git merge --continue"
+
+#: builtin/merge.c:107
+msgid "switch `m' requires a value"
+msgstr "cambiar `m' requiere un valor"
+
+#: builtin/merge.c:144
+#, c-format
+msgid "Could not find merge strategy '%s'.\n"
+msgstr "No se pudo encontrar estrategia de fusión '%s'.\n"
+
+#: builtin/merge.c:145
+#, c-format
+msgid "Available strategies are:"
+msgstr "Estrategias disponibles son:"
+
+#: builtin/merge.c:150
+#, c-format
+msgid "Available custom strategies are:"
+msgstr "Estrategias personalizadas disponibles son:"
+
+#: builtin/merge.c:200 builtin/pull.c:137
+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:203 builtin/pull.c:140
+msgid "show a diffstat at the end of the merge"
+msgstr "mostrar un diffstat al final de la fusión"
+
+#: builtin/merge.c:204 builtin/pull.c:143
+msgid "(synonym to --stat)"
+msgstr "(sinónimo para --stat)"
+
+#: builtin/merge.c:206 builtin/pull.c:146
+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:209 builtin/pull.c:152
+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:211 builtin/pull.c:155
+msgid "perform a commit if the merge succeeds (default)"
+msgstr "realizar un commit si la fusión es exitosa (default)"
+
+#: builtin/merge.c:213 builtin/pull.c:158
+msgid "edit message before committing"
+msgstr "editar mensaje antes de realizar commit"
+
+#: builtin/merge.c:214
+msgid "allow fast-forward (default)"
+msgstr "permitir fast-forwars (default)"
+
+#: builtin/merge.c:216 builtin/pull.c:164
+msgid "abort if fast-forward is not possible"
+msgstr "abortar si fast-forward no es posible"
+
+#: builtin/merge.c:220 builtin/pull.c:167
+msgid "verify that the named commit has a valid GPG signature"
+msgstr "verificar que el commit nombrado tiene una firma GPG válida"
+
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
+#: builtin/revert.c:109
+msgid "strategy"
+msgstr "estrategia"
+
+#: builtin/merge.c:222 builtin/pull.c:172
+msgid "merge strategy to use"
+msgstr "estrategia de fusión para usar"
+
+#: builtin/merge.c:223 builtin/pull.c:175
+msgid "option=value"
+msgstr "opción=valor"
+
+#: builtin/merge.c:224 builtin/pull.c:176
+msgid "option for selected merge strategy"
+msgstr "opción para la estrategia de fusión seleccionada"
+
+#: builtin/merge.c:226
+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:230
+msgid "abort the current in-progress merge"
+msgstr "abortar la fusión en progreso actual"
+
+#: builtin/merge.c:232
+msgid "continue the current in-progress merge"
+msgstr "continuar la fusión en progreso actual"
+
+#: builtin/merge.c:234 builtin/pull.c:183
+msgid "allow merging unrelated histories"
+msgstr "permitir fusionar historias no relacionadas"
+
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "verificar el hook commit-msg"
+
+#: builtin/merge.c:265
+msgid "could not run stash."
+msgstr "no se pudo ejecutar stash."
+
+#: builtin/merge.c:270
+msgid "stash failed"
+msgstr "stash falló"
+
+#: builtin/merge.c:275
+#, c-format
+msgid "not a valid object: %s"
+msgstr "no es un objeto válido: %s"
+
+#: builtin/merge.c:297 builtin/merge.c:314
+msgid "read-tree failed"
+msgstr "lectura de árbol falló"
+
+#: builtin/merge.c:344
+msgid " (nothing to squash)"
+msgstr " (nada para hacer squash)"
+
+#: builtin/merge.c:355
+#, c-format
+msgid "Squash commit -- not updating HEAD\n"
+msgstr "Commit de squash -- no actualizando HEAD\n"
+
+#: builtin/merge.c:405
+#, c-format
+msgid "No merge message -- not updating HEAD\n"
+msgstr "No hay mensaje de fusión -- no actualizando HEAD\n"
+
+#: builtin/merge.c:455
+#, c-format
+msgid "'%s' does not point to a commit"
+msgstr "'%s' no apunta a ningun commit"
+
+#: builtin/merge.c:545
+#, c-format
+msgid "Bad branch.%s.mergeoptions string: %s"
+msgstr "Mal string branch.%s.mergeoptions: %s"
+
+#: builtin/merge.c:667
+msgid "Not handling anything other than two heads merge."
+msgstr "No manejando nada más que fusión de dos heads."
+
+#: builtin/merge.c:681
+#, c-format
+msgid "Unknown option for merge-recursive: -X%s"
+msgstr "Opción desconocida para merge-recursive: -X%s"
+
+#: builtin/merge.c:696
+#, c-format
+msgid "unable to write %s"
+msgstr "no es posible escribir %s"
+
+#: builtin/merge.c:748
+#, c-format
+msgid "Could not read from '%s'"
+msgstr "No se puedo leer de '%s'"
+
+#: builtin/merge.c:757
+#, c-format
+msgid "Not committing merge; use 'git commit' to complete the merge.\n"
+msgstr ""
+"No se realiza commit de la fusión; use 'git commit' para completar la "
+"fusión.\n"
+
+#: builtin/merge.c:763
+#, c-format
+msgid ""
+"Please enter a commit message to explain why this merge is necessary,\n"
+"especially if it merges an updated upstream into a topic branch.\n"
+"\n"
+"Lines starting with '%c' will be ignored, and an empty message aborts\n"
+"the commit.\n"
+msgstr ""
+"Por favor ingrese un mensaje de commit que explique por qué es necesaria "
+"esta fusión,\n"
+"especialmente si esto fusiona un upstream actualizado en una rama de "
+"tópico.\n"
+"\n"
+"Líneas comenzando con '%c' serán ignoradas, y un mensaje vacío aborta\n"
+"el commit.\n"
+
+#: builtin/merge.c:799
+msgid "Empty commit message."
+msgstr "Mensaje de commit vacío."
+
+#: builtin/merge.c:819
+#, c-format
+msgid "Wonderful.\n"
+msgstr "Maravilloso.\n"
+
+#: builtin/merge.c:872
+#, 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:911
+msgid "No current branch."
+msgstr "No rama actual."
+
+#: builtin/merge.c:913
+msgid "No remote for the current branch."
+msgstr "No hay remoto para la rama actual."
+
+#: builtin/merge.c:915
+msgid "No default upstream defined for the current branch."
+msgstr "Por defecto, no hay un upstream definido para la rama actual."
+
+#: builtin/merge.c:920
+#, c-format
+msgid "No remote-tracking branch for %s from %s"
+msgstr "No hay rama de rastreo remoto para %s de %s"
+
+#: builtin/merge.c:973
+#, c-format
+msgid "Bad value '%s' in environment '%s'"
+msgstr "Mal valor '%s' en el entorno '%s'"
+
+#: builtin/merge.c:1075
+#, c-format
+msgid "not something we can merge in %s: %s"
+msgstr "nada que podamos fusionar en %s: %s"
+
+#: builtin/merge.c:1109
+msgid "not something we can merge"
+msgstr "nada que podamos fusionar"
+
+#: builtin/merge.c:1174
+msgid "--abort expects no arguments"
+msgstr "--abort no espera argumentos"
+
+#: builtin/merge.c:1178
+msgid "There is no merge to abort (MERGE_HEAD missing)."
+msgstr "No hay una fusión para abortar (falta MERGE_HEAD)"
+
+#: builtin/merge.c:1190
+msgid "--continue expects no arguments"
+msgstr "--continue no espera argumentos"
+
+#: builtin/merge.c:1194
+msgid "There is no merge in progress (MERGE_HEAD missing)."
+msgstr "No hay fusión en progreso (falta MERGE_HEAD)."
+
+#: builtin/merge.c:1210
+msgid ""
+"You have not concluded your merge (MERGE_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"No ha concluido la fusión (existe MERGE_HEAD).\n"
+"Por favor, realice un commit con los cambios antes de fusionar."
+
+#: builtin/merge.c:1217
+msgid ""
+"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
+"Please, commit your changes before you merge."
+msgstr ""
+"No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD).\n"
+"Por favor, realice un commit con los cambios antes de fusionar."
+
+#: builtin/merge.c:1220
+msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
+msgstr "No ha concluido el cherry-pick (existe CHERRY_PICK_HEAD)."
+
+#: builtin/merge.c:1229
+msgid "You cannot combine --squash with --no-ff."
+msgstr "No se puede combinar --squash con --no-ff."
+
+#: builtin/merge.c:1237
+msgid "No commit specified and merge.defaultToUpstream not set."
+msgstr ""
+"No hay commit especificado y merge.defaultToUpstream no está configurado."
+
+#: builtin/merge.c:1254
+msgid "Squash commit into empty head not supported yet"
+msgstr "Commit aplastado dentro de un head vacío no es soportado todavía"
+
+#: builtin/merge.c:1256
+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:1261
+#, c-format
+msgid "%s - not something we can merge"
+msgstr "%s - nada que podamos fusionar"
+
+#: builtin/merge.c:1263
+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:1297
+#, 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."
+
+#: builtin/merge.c:1300
+#, c-format
+msgid "Commit %s has a bad GPG signature allegedly by %s."
+msgstr "Commit %s tiene una mala firma GPG pretendidamente por %s."
+
+#: builtin/merge.c:1303
+#, c-format
+msgid "Commit %s does not have a GPG signature."
+msgstr "Commit %s no tiene una firma GPG."
+
+#: builtin/merge.c:1306
+#, 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"
+
+#: builtin/merge.c:1368
+msgid "refusing to merge unrelated histories"
+msgstr "rehusando fusionar historias no relacionadas"
+
+#: builtin/merge.c:1377
+msgid "Already up to date."
+msgstr "Ya está actualizado."
+
+#: builtin/merge.c:1387
+#, c-format
+msgid "Updating %s..%s\n"
+msgstr "Actualizando %s..%s\n"
+
+#: builtin/merge.c:1428
+#, c-format
+msgid "Trying really trivial in-index merge...\n"
+msgstr "Intentando fusión en índice realmente trivial...\n"
+
+#: builtin/merge.c:1435
+#, c-format
+msgid "Nope.\n"
+msgstr "Nop.\n"
+
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
+msgstr "Ya está actualizado. ¡Oh, yeaahh!"
+
+#: builtin/merge.c:1466
+msgid "Not possible to fast-forward, aborting."
+msgstr "No es posible hacer fast-forward, abortando."
+
+#: builtin/merge.c:1489 builtin/merge.c:1568
+#, c-format
+msgid "Rewinding the tree to pristine...\n"
+msgstr "Rebobinando el árbol a original...\n"
+
+#: builtin/merge.c:1493
+#, c-format
+msgid "Trying merge strategy %s...\n"
+msgstr "Intentando estrategia de fusión %s...\n"
+
+#: builtin/merge.c:1559
+#, c-format
+msgid "No merge strategy handled the merge.\n"
+msgstr "Ninguna estrategia de fusión manejó la fusión.\n"
+
+#: builtin/merge.c:1561
+#, c-format
+msgid "Merge with strategy %s failed.\n"
+msgstr "Fusionar con estrategia %s falló.\n"
+
+#: builtin/merge.c:1570
+#, c-format
+msgid "Using the %s to prepare resolving by hand.\n"
+msgstr "Usando el %s para preparar resolución a mano.\n"
+
+#: builtin/merge.c:1582
+#, c-format
+msgid "Automatic merge went well; stopped before committing as requested\n"
+msgstr ""
+"Fusión automática fue bien; detenida antes del commit como se solicitó\n"
+
+#: builtin/merge-base.c:30
+msgid "git merge-base [-a | --all] <commit> <commit>..."
+msgstr "git merge-base [-a | --all] <commit> <commit>..."
+
+#: builtin/merge-base.c:31
+msgid "git merge-base [-a | --all] --octopus <commit>..."
+msgstr "git merge-base [-a | --all] --octopus <commit>..."
+
+#: builtin/merge-base.c:32
+msgid "git merge-base --independent <commit>..."
+msgstr "git merge-base --independent <commit>..."
+
+#: builtin/merge-base.c:33
+msgid "git merge-base --is-ancestor <commit> <commit>"
+msgstr "git merge-base --is-ancestor <commit> <commit>"
+
+#: builtin/merge-base.c:34
+msgid "git merge-base --fork-point <ref> [<commit>]"
+msgstr "git merge-base --fork-point <ref> [<commit>]"
+
+#: builtin/merge-base.c:220
+msgid "output all common ancestors"
+msgstr "mostrar todos los ancestros comunes"
+
+#: builtin/merge-base.c:222
+msgid "find ancestors for a single n-way merge"
+msgstr "encontrar ancestros para una única fusión de n-vías "
+
+#: builtin/merge-base.c:224
+msgid "list revs not reachable from others"
+msgstr "listar revs no alcanzables desde otros"
+
+#: builtin/merge-base.c:226
+msgid "is the first one ancestor of the other?"
+msgstr "es el primer ancestro del otro?"
+
+#: builtin/merge-base.c:228
+msgid "find where <commit> forked from reflog of <ref>"
+msgstr "encontrar donde <commit> forjó del reflog de <ref>"
+
+#: builtin/merge-file.c:9
+msgid ""
+"git merge-file [<options>] [-L <name1> [-L <orig> [-L <name2>]]] <file1> "
+"<orig-file> <file2>"
+msgstr ""
+"git merge-file [<opciones>] [-L <nombre1> [-L <origen> [-L <nombre2>]]] "
+"<archivo1> <archivo-origen> <archivo2>"
+
+#: builtin/merge-file.c:33
+msgid "send results to standard output"
+msgstr "mandar resultados a standard output"
+
+#: builtin/merge-file.c:34
+msgid "use a diff3 based merge"
+msgstr "usar un fusión basada en diff3 "
+
+#: builtin/merge-file.c:35
+msgid "for conflicts, use our version"
+msgstr "por conflictos, usar nuestra versión"
+
+#: builtin/merge-file.c:37
+msgid "for conflicts, use their version"
+msgstr "por conflictos, usar la versión de ellos"
+
+#: builtin/merge-file.c:39
+msgid "for conflicts, use a union version"
+msgstr "por conflictos, usar una versión de unión"
+
+#: builtin/merge-file.c:42
+msgid "for conflicts, use this marker size"
+msgstr "por conflictos, usar el tamaño de este marcador"
+
+#: builtin/merge-file.c:43
+msgid "do not warn about conflicts"
+msgstr "no advertir sobre conflictos"
+
+#: builtin/merge-file.c:45
+msgid "set labels for file1/orig-file/file2"
+msgstr "configurar labels para archivo1/orig-archivo/archivo2"
+
+#: builtin/merge-recursive.c:45
+#, c-format
+msgid "unknown option %s"
+msgstr "opción %s desconocida"
+
+#: builtin/merge-recursive.c:51
+#, c-format
+msgid "could not parse object '%s'"
+msgstr "no se pudo analizar el objeto '%s'"
+
+#: builtin/merge-recursive.c:55
+#, c-format
+msgid "cannot handle more than %d base. Ignoring %s."
+msgid_plural "cannot handle more than %d bases. Ignoring %s."
+msgstr[0] "no se puede manejar más de %d base. Ignorando %s."
+msgstr[1] "no se puede manejar más de %d bases. Ignorando %s."
+
+#: builtin/merge-recursive.c:63
+msgid "not handling anything other than two heads merge."
+msgstr "no manejando nada distinto a fusiones de dos heads."
+
+#: builtin/merge-recursive.c:69 builtin/merge-recursive.c:71
+#, c-format
+msgid "could not resolve ref '%s'"
+msgstr "no se pudo resolver ref '%s'"
+
+#: builtin/merge-recursive.c:77
+#, c-format
+msgid "Merging %s with %s\n"
+msgstr "Fusionando %s con %s\n"
+
+#: builtin/mktree.c:65
+msgid "git mktree [-z] [--missing] [--batch]"
+msgstr "git mktree [-z] [--missing] [--batch]"
+
+#: builtin/mktree.c:153
+msgid "input is NUL terminated"
+msgstr "input es terminada con NUL"
+
+#: builtin/mktree.c:154 builtin/write-tree.c:25
+msgid "allow missing objects"
+msgstr "permitir objetos faltantes"
+
+#: builtin/mktree.c:155
+msgid "allow creation of more than one tree"
+msgstr "permitir la creación de más de un árbol"
+
+#: builtin/mv.c:17
+msgid "git mv [<options>] <source>... <destination>"
+msgstr "git mv [<opciones>] <fuente>... <destino>"
+
+#: builtin/mv.c:83
+#, c-format
+msgid "Directory %s is in index and no submodule?"
+msgstr "Directorio %s está en el índice y no hay submódulo?"
+
+#: builtin/mv.c:85 builtin/rm.c:289
+msgid "Please stage your changes to .gitmodules or stash them to proceed"
+msgstr ""
+"Por favor agrega el stage de tus cambios a .gitmodules o realiza un stash "
+"para proceder"
+
+#: builtin/mv.c:103
+#, c-format
+msgid "%.*s is in index"
+msgstr "%.*s está en el índice"
+
+#: builtin/mv.c:125
+msgid "force move/rename even if target exists"
+msgstr "forzar mover/renombrar incluso si el objetivo existe"
+
+#: builtin/mv.c:126
+msgid "skip move/rename errors"
+msgstr "saltar errores de mover/renombrar"
+
+#: builtin/mv.c:167
+#, c-format
+msgid "destination '%s' is not a directory"
+msgstr "destino '%s' no es un directorio"
+
+#: builtin/mv.c:178
+#, c-format
+msgid "Checking rename of '%s' to '%s'\n"
+msgstr "Revisando cambio de nombre de '%s' a '%s'\n"
+
+#: builtin/mv.c:182
+msgid "bad source"
+msgstr "mala fuente"
+
+#: builtin/mv.c:185
+msgid "can not move directory into itself"
+msgstr "no se pude mover un directorio en sí mismo"
+
+#: builtin/mv.c:188
+msgid "cannot move directory over file"
+msgstr "no se puede mover un directorio dentro de un archivo"
+
+#: builtin/mv.c:197
+msgid "source directory is empty"
+msgstr "directorio de fuente está vacío"
+
+#: builtin/mv.c:222
+msgid "not under version control"
+msgstr "no se encuentra bajo control de versión "
+
+#: builtin/mv.c:225
+msgid "destination exists"
+msgstr "destino existe"
+
+#: builtin/mv.c:233
+#, c-format
+msgid "overwriting '%s'"
+msgstr "sobrescribiendo '%s'"
+
+#: builtin/mv.c:236
+msgid "Cannot overwrite"
+msgstr "No se puede sobrescribir"
+
+#: builtin/mv.c:239
+msgid "multiple sources for the same target"
+msgstr "múltiples fuentes para el mismo objetivo"
+
+#: builtin/mv.c:241
+msgid "destination directory does not exist"
+msgstr "el directorio de destino no existe"
+
+#: builtin/mv.c:248
+#, c-format
+msgid "%s, source=%s, destination=%s"
+msgstr "%s, fuente=%s, destino=%s"
+
+#: builtin/mv.c:269
+#, c-format
+msgid "Renaming %s to %s\n"
+msgstr "Renombrando %s a %s\n"
+
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
+#, c-format
+msgid "renaming '%s' failed"
+msgstr "fallo al renombrar '%s'"
+
+#: builtin/name-rev.c:338
+msgid "git name-rev [<options>] <commit>..."
+msgstr "git name-rev [<opciones>] <commit>..."
+
+#: builtin/name-rev.c:339
+msgid "git name-rev [<options>] --all"
+msgstr "git name-rev [<opciones>] --all"
+
+#: builtin/name-rev.c:340
+msgid "git name-rev [<options>] --stdin"
+msgstr "git name-rev [<opciones>] --stdin"
+
+#: builtin/name-rev.c:395
+msgid "print only names (no SHA-1)"
+msgstr "imprimir sólo nombres (sin SHA-1)"
+
+#: builtin/name-rev.c:396
+msgid "only use tags to name the commits"
+msgstr "sólo usar tags para nombrar commits"
+
+#: builtin/name-rev.c:398
+msgid "only use refs matching <pattern>"
+msgstr "solo usar refs que concuerden con <patrón>"
+
+#: builtin/name-rev.c:400
+msgid "ignore refs matching <pattern>"
+msgstr "ignorar refs que concuerden con <patrón>"
+
+#: builtin/name-rev.c:402
+msgid "list all commits reachable from all refs"
+msgstr "listar todos los commits alcanzables desde todas las referencias"
+
+#: builtin/name-rev.c:403
+msgid "read from stdin"
+msgstr "leer desde stdin"
+
+#: builtin/name-rev.c:404
+msgid "allow to print `undefined` names (default)"
+msgstr "permitir imprimir nombres `undefined` (predeterminado)"
+
+#: builtin/name-rev.c:410
+msgid "dereference tags in the input (internal use)"
+msgstr "desreferenciar tags en la entrada (uso interno)"
+
+#: builtin/notes.c:26
+msgid "git notes [--ref <notes-ref>] [list [<object>]]"
+msgstr "git notes [--ref <referencia-de-notas>] [list [<objeto>]]"
+
+#: builtin/notes.c:27
+msgid ""
+"git notes [--ref <notes-ref>] add [-f] [--allow-empty] [-m <msg> | -F <file> "
+"| (-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] add [-f] [--allow-empty] [-m "
+"<mensaje> | -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
+
+#: builtin/notes.c:28
+msgid "git notes [--ref <notes-ref>] copy [-f] <from-object> <to-object>"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] copy [-f] <objeto-origen> <objeto-"
+"destino>"
+
+#: builtin/notes.c:29
+msgid ""
+"git notes [--ref <notes-ref>] append [--allow-empty] [-m <msg> | -F <file> | "
+"(-c | -C) <object>] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] append [--allow-empty] [-m <mensaje> "
+"| -F <archivo> | (-c | -C) <objeto>] [<objeto>]"
+
+#: builtin/notes.c:30
+msgid "git notes [--ref <notes-ref>] edit [--allow-empty] [<object>]"
+msgstr ""
+"git notes [--ref <referencia-de-notas>] edit [--allow-empty] [<objeto>]"
+
+#: builtin/notes.c:31
+msgid "git notes [--ref <notes-ref>] show [<object>]"
+msgstr "git notes [--ref <referencia-de-notas>] show [<objeto>]"
+
+#: builtin/notes.c:32
+msgid ""
+"git notes [--ref <notes-ref>] merge [-v | -q] [-s <strategy>] <notes-ref>"
+msgstr ""
+"git notes [--ref <referencia-de notas>] merge [-v | -q] [-s <estrategia>] "
+"<referencia-de-notas>"
+
+#: builtin/notes.c:33
+msgid "git notes merge --commit [-v | -q]"
+msgstr "git notes merge --commit [-v | -q]"
+
+#: builtin/notes.c:34
+msgid "git notes merge --abort [-v | -q]"
+msgstr "git notes merge --abort [-v | -q]"
+
+#: builtin/notes.c:35
+msgid "git notes [--ref <notes-ref>] remove [<object>...]"
+msgstr "git notes [--ref <referencia-de-notas>] remove [<objeto>...]"
+
+#: builtin/notes.c:36
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <referencia-de-notas>] prune [-n] [-v]"
+
+#: builtin/notes.c:37
+msgid "git notes [--ref <notes-ref>] get-ref"
+msgstr "git notes [--ref <referencia-de-notas>] get-ref"
+
+#: builtin/notes.c:42
+msgid "git notes [list [<object>]]"
+msgstr "git notes [list [<objeto>]]"
+
+#: builtin/notes.c:47
+msgid "git notes add [<options>] [<object>]"
+msgstr "git notes add [<opciones>] [<objeto>]"
+
+#: builtin/notes.c:52
+msgid "git notes copy [<options>] <from-object> <to-object>"
+msgstr "git notes copy [<opciones>] <objeto-origen> <objeto-destino>"
+
+#: builtin/notes.c:53
+msgid "git notes copy --stdin [<from-object> <to-object>]..."
+msgstr "git notes copy --stdin [<objeto-origen> <objeto-destino>]..."
+
+#: builtin/notes.c:58
+msgid "git notes append [<options>] [<object>]"
+msgstr "git notes append [<opciones>] [<objeto>]"
+
+#: builtin/notes.c:63
+msgid "git notes edit [<object>]"
+msgstr "git notes edit [<objeto>]"
+
+#: builtin/notes.c:68
+msgid "git notes show [<object>]"
+msgstr "git notes show [<objeto>]"
+
+#: builtin/notes.c:73
+msgid "git notes merge [<options>] <notes-ref>"
+msgstr "git notes merge [<opciones>] <referencia-de-notas>"
+
+#: builtin/notes.c:74
+msgid "git notes merge --commit [<options>]"
+msgstr "git notes merge --commit [<opciones>]"
+
+#: builtin/notes.c:75
+msgid "git notes merge --abort [<options>]"
+msgstr "git notes merge --abort [<opciones>]"
+
+#: builtin/notes.c:80
+msgid "git notes remove [<object>]"
+msgstr "git notes remove [<objeto>]"
+
+#: builtin/notes.c:85
+msgid "git notes prune [<options>]"
+msgstr "git notes prune [<opciones>]"
+
+#: builtin/notes.c:90
+msgid "git notes get-ref"
+msgstr "git notes get-ref"
+
+#: builtin/notes.c:95
+msgid "Write/edit the notes for the following object:"
+msgstr "Escribe/edita las notas para los siguientes objetos:"
+
+#: builtin/notes.c:148
+#, c-format
+msgid "unable to start 'show' for object '%s'"
+msgstr "incapaz de iniciar 'show' para el objeto '%s'"
+
+#: builtin/notes.c:152
+msgid "could not read 'show' output"
+msgstr "no se pudo leer salida de 'show'"
+
+#: builtin/notes.c:160
+#, c-format
+msgid "failed to finish 'show' for object '%s'"
+msgstr "falló la finalización de 'show' para el objeto '%s'"
+
+#: 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"
+
+#: builtin/notes.c:204
+msgid "unable to write note object"
+msgstr "incapaz de escribir el objeto de nota"
+
+#: 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:234 builtin/tag.c:500
+#, c-format
+msgid "cannot read '%s'"
+msgstr "no se puede leer '%s'"
+
+#: builtin/notes.c:236 builtin/tag.c:503
+#, c-format
+msgid "could not open or read '%s'"
+msgstr "no se pudo abrir o leer '%s'"
+
+#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
+#, c-format
+msgid "failed to resolve '%s' as a valid ref."
+msgstr "falló al resolver '%s' como ref válida."
+
+#: builtin/notes.c:258
+#, c-format
+msgid "failed to read object '%s'."
+msgstr "falló al leer objeto '%s'."
+
+#: builtin/notes.c:262
+#, c-format
+msgid "cannot read note data from non-blob object '%s'."
+msgstr "no se puede leer la data de la nota de un objeto no-blob '%s'."
+
+#: builtin/notes.c:302
+#, c-format
+msgid "malformed input line: '%s'."
+msgstr "línea de entrada mal formada: '%s'."
+
+#: builtin/notes.c:317
+#, c-format
+msgid "failed to copy notes from '%s' to '%s'"
+msgstr "falló al copiar notas de '%s' a '%s'"
+
+#. TRANSLATORS: the first %s will be replaced by a git
+#. notes command: 'add', 'merge', 'remove', etc.
+#.
+#: builtin/notes.c:349
+#, 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:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
+msgid "too many parameters"
+msgstr "demasiados parámetros"
+
+#: builtin/notes.c:382 builtin/notes.c:668
+#, c-format
+msgid "no note found for object %s."
+msgstr "no se encontraron notas para objeto %s."
+
+#: builtin/notes.c:403 builtin/notes.c:566
+msgid "note contents as a string"
+msgstr "contenidos de la nota como cadena"
+
+#: builtin/notes.c:406 builtin/notes.c:569
+msgid "note contents in a file"
+msgstr "contenidos de la nota en un archivo"
+
+#: builtin/notes.c:409 builtin/notes.c:572
+msgid "reuse and edit specified note object"
+msgstr "reutilizar y editar el objeto de nota especificada"
+
+#: builtin/notes.c:412 builtin/notes.c:575
+msgid "reuse specified note object"
+msgstr "reutilizar el objeto de nota especificado"
+
+#: builtin/notes.c:415 builtin/notes.c:578
+msgid "allow storing empty note"
+msgstr "permitir almacenar nota vacía"
+
+#: builtin/notes.c:416 builtin/notes.c:487
+msgid "replace existing notes"
+msgstr "reemplazar notas existentes"
+
+#: builtin/notes.c:441
+#, 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 "
+"'-f' para sobrescribir las notas existentes"
+
+#: builtin/notes.c:456 builtin/notes.c:535
+#, c-format
+msgid "Overwriting existing notes for object %s\n"
+msgstr "Sobrescribiendo notas existentes para objeto %s\n"
+
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
+#, c-format
+msgid "Removing note for object %s\n"
+msgstr "Removiendo nota para objeto %s\n"
+
+#: builtin/notes.c:488
+msgid "read objects from stdin"
+msgstr "leer objetos desde stdin"
+
+#: builtin/notes.c:490
+msgid "load rewriting config for <command> (implies --stdin)"
+msgstr "cargar configuración de reescritura para <comando> (implica --stdin)"
+
+#: builtin/notes.c:508
+msgid "too few parameters"
+msgstr "muy pocos parámetros"
+
+#: builtin/notes.c:529
+#, 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 notes existentes"
+
+#: builtin/notes.c:541
+#, c-format
+msgid "missing notes on source object %s. Cannot copy."
+msgstr "faltan notas en la fuente del objeto %s. No se puede copiar."
+
+#: builtin/notes.c:593
+#, 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"
+
+#: builtin/notes.c:688
+msgid "failed to delete ref NOTES_MERGE_PARTIAL"
+msgstr "falló al borrar ref NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:690
+msgid "failed to delete ref NOTES_MERGE_REF"
+msgstr "falló al borrar ref NOTES_MERGE_REF"
+
+#: builtin/notes.c:692
+msgid "failed to remove 'git notes merge' worktree"
+msgstr "no se pudo eliminar el árbol de trabajo 'git notes merge'"
+
+#: builtin/notes.c:712
+msgid "failed to read ref NOTES_MERGE_PARTIAL"
+msgstr "falló al leer ref NOTES_MERGE_PARTIAL"
+
+#: builtin/notes.c:714
+msgid "could not find commit from NOTES_MERGE_PARTIAL."
+msgstr "no se pudo encontrar commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:716
+msgid "could not parse commit from NOTES_MERGE_PARTIAL."
+msgstr "no se pudo analizar commit de NOTES_MERGE_PARTIAL."
+
+#: builtin/notes.c:729
+msgid "failed to resolve NOTES_MERGE_REF"
+msgstr "falló al resolver NOTES_MERGE_REF"
+
+#: builtin/notes.c:732
+msgid "failed to finalize notes merge"
+msgstr "falló al finalizar las notas de fusión"
+
+#: builtin/notes.c:758
+#, c-format
+msgid "unknown notes merge strategy %s"
+msgstr "estrategia de fusión de notas %s desconocida"
+
+#: builtin/notes.c:774
+msgid "General options"
+msgstr "Opciones generales"
+
+#: builtin/notes.c:776
+msgid "Merge options"
+msgstr "Opciones de fusión"
+
+#: builtin/notes.c:778
+msgid ""
+"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
+"cat_sort_uniq)"
+msgstr ""
+"resolver conflictos de notas usando la estrategia entregadas (manual/ours/"
+"theirs/union/cat_sort_uniq)"
+
+#: builtin/notes.c:780
+msgid "Committing unmerged notes"
+msgstr "Realizando commit a las notas no fusionadas"
+
+#: builtin/notes.c:782
+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:784
+msgid "Aborting notes merge resolution"
+msgstr "Abortando notas de resolución de fusión"
+
+#: builtin/notes.c:786
+msgid "abort notes merge"
+msgstr "abortar notas de fusión"
+
+#: builtin/notes.c:797
+msgid "cannot mix --commit, --abort or -s/--strategy"
+msgstr "no se pueden mezclar --commit, --abort ó -s/--strategy"
+
+#: builtin/notes.c:802
+msgid "must specify a notes ref to merge"
+msgstr "debe especificar una ref de notas a fusionar"
+
+#: builtin/notes.c:826
+#, c-format
+msgid "unknown -s/--strategy: %s"
+msgstr "--strategy/-s desconocida: %s"
+
+#: builtin/notes.c:863
+#, 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:866
+#, 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:868
+#, 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 "
+"'git notes merge --abort'.\n"
+
+#: builtin/notes.c:890
+#, c-format
+msgid "Object %s has no note\n"
+msgstr "El objeto %s no tiene notas\n"
+
+#: builtin/notes.c:902
+msgid "attempt to remove non-existent note is not an error"
+msgstr "intentar remover una nota no existente no es un error"
+
+#: builtin/notes.c:905
+msgid "read object names from the standard input"
+msgstr "leer nombres de objetos de standard input"
+
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
+msgid "do not remove, show only"
+msgstr "no remover, solo mostrar"
+
+#: builtin/notes.c:944
+msgid "report pruned notes"
+msgstr "reportar notas recortadas"
+
+#: builtin/notes.c:986
+msgid "notes-ref"
+msgstr "referencia-de-notas"
+
+#: builtin/notes.c:987
+msgid "use notes from <notes-ref>"
+msgstr "usar notas desde <referencia-de-notas>"
+
+#: builtin/notes.c:1022
+#, c-format
+msgid "unknown subcommand: %s"
+msgstr "subcomando desconocido: %s"
+
+#: builtin/pack-objects.c:33
+msgid ""
+"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects --stdout [<opciones>...] [< <lista-de-ref> | < <lista-de-"
+"objetos>]"
+
+#: builtin/pack-objects.c:34
+msgid ""
+"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
+msgstr ""
+"git pack-objects [<opciones>...] <nombre-base> [< <lista-de-refs> | < <lista-"
+"de-objetos>]"
+
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
+#, c-format
+msgid "deflate error (%d)"
+msgstr "error al desinflar (%d)"
+
+#: builtin/pack-objects.c:788
+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:801
+msgid "Writing objects"
+msgstr "Escribiendo objetos"
+
+#: builtin/pack-objects.c:1081
+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:2451
+msgid "Compressing objects"
+msgstr "Comprimiendo objetos"
+
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "valor inválido para --missing"
+
+#: builtin/pack-objects.c:2902
+#, c-format
+msgid "unsupported index version %s"
+msgstr "versión de índice no soportada %s"
+
+#: builtin/pack-objects.c:2906
+#, c-format
+msgid "bad index version '%s'"
+msgstr "mala versión del índice '%s'"
+
+#: builtin/pack-objects.c:2936
+msgid "do not show progress meter"
+msgstr "no mostrar medidor de progreso"
+
+#: builtin/pack-objects.c:2938
+msgid "show progress meter"
+msgstr "mostrar medidor de progreso"
+
+#: builtin/pack-objects.c:2940
+msgid "show progress meter during object writing phase"
+msgstr "mostrar medidor de progreso durante la fase de escritura de objeto"
+
+#: builtin/pack-objects.c:2943
+msgid "similar to --all-progress when progress meter is shown"
+msgstr "similar a --all-progress cuando medidor de progreso es mostrado"
+
+#: builtin/pack-objects.c:2944
+msgid "version[,offset]"
+msgstr "versión[,offset]"
+
+#: builtin/pack-objects.c:2945
+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:2948
+msgid "maximum size of each output pack file"
+msgstr "tamaño máximo de cada paquete resultante"
+
+#: builtin/pack-objects.c:2950
+msgid "ignore borrowed objects from alternate object store"
+msgstr "ignorar objetos prestados de otros almacenes de objetos"
+
+#: builtin/pack-objects.c:2952
+msgid "ignore packed objects"
+msgstr "ignorar objetos paquete"
+
+#: builtin/pack-objects.c:2954
+msgid "limit pack window by objects"
+msgstr "limitar ventana de paquete por objetos"
+
+#: builtin/pack-objects.c:2956
+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:2958
+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:2960
+msgid "reuse existing deltas"
+msgstr "reusar deltas existentes"
+
+#: builtin/pack-objects.c:2962
+msgid "reuse existing objects"
+msgstr "reutilizar objetos existentes"
+
+#: builtin/pack-objects.c:2964
+msgid "use OFS_DELTA objects"
+msgstr "usar objetos OFS_DELTA"
+
+#: builtin/pack-objects.c:2966
+msgid "use threads when searching for best delta matches"
+msgstr "usar hilos cuando se busque para mejores concordancias de delta"
+
+#: builtin/pack-objects.c:2968
+msgid "do not create an empty pack output"
+msgstr "no crear un paquete resultante vacío"
+
+#: builtin/pack-objects.c:2970
+msgid "read revision arguments from standard input"
+msgstr "leer argumentos de revisión de standard input"
+
+#: builtin/pack-objects.c:2972
+msgid "limit the objects to those that are not yet packed"
+msgstr "limitar los objetos a aquellos que no han sido empaquetados todavía"
+
+#: builtin/pack-objects.c:2975
+msgid "include objects reachable from any reference"
+msgstr "incluir objetos alcanzables por cualquier referencia"
+
+#: builtin/pack-objects.c:2978
+msgid "include objects referred by reflog entries"
+msgstr "incluir objetos referidos por entradas de reflog"
+
+#: builtin/pack-objects.c:2981
+msgid "include objects referred to by the index"
+msgstr "incluir objetos referidos por el índice"
+
+#: builtin/pack-objects.c:2984
+msgid "output pack to stdout"
+msgstr "mostrar paquete en stdout"
+
+#: builtin/pack-objects.c:2986
+msgid "include tag objects that refer to objects to be packed"
+msgstr "incluir objetos tag que refieren a objetos a ser empaquetados"
+
+#: builtin/pack-objects.c:2988
+msgid "keep unreachable objects"
+msgstr "mantener objetos inalcanzables"
+
+#: builtin/pack-objects.c:2990
+msgid "pack loose unreachable objects"
+msgstr "empaquetar objetos sueltos inalcanzables"
+
+#: builtin/pack-objects.c:2992
+msgid "unpack unreachable objects newer than <time>"
+msgstr "desempaquetar objetos inalcanzables más nuevos que <tiempo>"
+
+#: builtin/pack-objects.c:2995
+msgid "create thin packs"
+msgstr "crear paquetes delgados"
+
+#: builtin/pack-objects.c:2997
+msgid "create packs suitable for shallow fetches"
+msgstr "crear paquetes adecuados para fetches superficiales"
+
+#: builtin/pack-objects.c:2999
+msgid "ignore packs that have companion .keep file"
+msgstr "ignorar paquetes que tienen un archivo .keep acompañante"
+
+#: builtin/pack-objects.c:3001
+msgid "pack compression level"
+msgstr "nivel de compresión del paquete"
+
+#: builtin/pack-objects.c:3003
+msgid "do not hide commits by grafts"
+msgstr "no ocultar commits por injertos"
+
+#: builtin/pack-objects.c:3005
+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:3007
+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:3010
+msgid "handling for missing objects"
+msgstr "manejo de objetos perdidos"
+
+#: builtin/pack-objects.c:3144
+msgid "Counting objects"
+msgstr "Contando objetos"
+
+#: builtin/pack-refs.c:6
+msgid "git pack-refs [<options>]"
+msgstr "git pack-refs [<opciones>]"
+
+#: builtin/pack-refs.c:14
+msgid "pack everything"
+msgstr "empaquetar todo"
+
+#: builtin/pack-refs.c:15
+msgid "prune loose refs (default)"
+msgstr "recortar refs perdidos (default)"
+
+#: builtin/prune-packed.c:8
+msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
+msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
+
+#: builtin/prune-packed.c:41
+msgid "Removing duplicate objects"
+msgstr "Removiendo objetos duplicados"
+
+#: builtin/prune.c:11
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tiempo>] [--] [<head>...]"
+
+#: builtin/prune.c:106
+msgid "report pruned objects"
+msgstr "reportar objetos recortados"
+
+#: builtin/prune.c:109
+msgid "expire objects older than <time>"
+msgstr "expirar objetos más viejos a <tiempo>"
+
+#: builtin/prune.c:123
+msgid "cannot prune in a precious-objects repo"
+msgstr "no se puede recortar en un repositorio de objetos-preciosos"
+
+#: builtin/pull.c:54 builtin/pull.c:56
+#, c-format
+msgid "Invalid value for %s: %s"
+msgstr "Valor inválido para %s: %s"
+
+#: builtin/pull.c:76
+msgid "git pull [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+"git pull [<opciones>] [<repositorio> [<especificación-de-referencia>...]]"
+
+#: builtin/pull.c:127
+msgid "control for recursive fetching of submodules"
+msgstr "control de fetch recursivo en submódulos"
+
+#: builtin/pull.c:131
+msgid "Options related to merging"
+msgstr "Opciones relacionadas a fusión"
+
+#: builtin/pull.c:134
+msgid "incorporate changes by rebasing rather than merging"
+msgstr "incorporar cambios por rebase en lugar de fusión"
+
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
+msgid "allow fast-forward"
+msgstr "permitir fast-forward"
+
+#: builtin/pull.c:170
+msgid "automatically stash/stash pop before and after rebase"
+msgstr "ejecutar automáticamente stash/stash pop antes y después de rebase"
+
+#: builtin/pull.c:186
+msgid "Options related to fetching"
+msgstr "Opciones relacionadas a fetch"
+
+#: builtin/pull.c:204
+msgid "number of submodules pulled in parallel"
+msgstr "número de submódulos que realizan pull en paralelo"
+
+#: builtin/pull.c:299
+#, c-format
+msgid "Invalid value for pull.ff: %s"
+msgstr "valor inválido para pull.ff: %s"
+
+#: builtin/pull.c:415
+msgid ""
+"There is no candidate for rebasing against among the refs that you just "
+"fetched."
+msgstr "No hay candidato para rebasar entre las refs que has bajado con fetch."
+
+#: builtin/pull.c:417
+msgid ""
+"There are no candidates for merging among the refs that you just fetched."
+msgstr ""
+"No hay candidatos para fusionar entre las refs que has bajado con fetch."
+
+#: builtin/pull.c:418
+msgid ""
+"Generally this means that you provided a wildcard refspec which had no\n"
+"matches on the remote end."
+msgstr ""
+"Generalmente esto significa que has proveído un wildcard de refspec que no "
+"tiene\n"
+"concordancia en el final remoto."
+
+#: builtin/pull.c:421
+#, 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 ""
+"Se ha solicitado un pull del remoto '%s', pero no se ha especificado\n"
+"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:426 git-parse-remote.sh:73
+msgid "You are not currently on a branch."
+msgstr "No te encuentras actualmente en la rama."
+
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
+msgid "Please specify which branch you want to rebase against."
+msgstr "Por favor especifica a qué rama quieres rebasar."
+
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
+msgid "Please specify which branch you want to merge with."
+msgstr "Por favor especifica a qué rama quieres fusionar."
+
+#: builtin/pull.c:431 builtin/pull.c:446
+msgid "See git-pull(1) for details."
+msgstr "Ver git-pull(1) para detalles."
+
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
+#: git-parse-remote.sh:64
+msgid "<remote>"
+msgstr "<remoto>"
+
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
+#: git-parse-remote.sh:65
+msgid "<branch>"
+msgstr "<rama>"
+
+#: builtin/pull.c:441 git-parse-remote.sh:75
+msgid "There is no tracking information for the current branch."
+msgstr "No hay información de rastreo para la rama actual."
+
+#: builtin/pull.c:450 git-parse-remote.sh:95
+msgid ""
+"If you wish to set tracking information for this branch you can do so with:"
+msgstr ""
+"Si deseas configurar el rastreo de información para esta rama, puedes "
+"hacerlo con:"
+
+#: builtin/pull.c:455
+#, c-format
+msgid ""
+"Your configuration specifies to merge with the ref '%s'\n"
+"from the remote, but no such ref was fetched."
+msgstr ""
+"Tu configuración especifica fusionar con la ref '%s'\n"
+"de tu remoto, pero no se pudo hacer fetch a esa ref."
+
+#: builtin/pull.c:817
+msgid "ignoring --verify-signatures for rebase"
+msgstr "ignorando --verify-signatures para rebase"
+
+#: builtin/pull.c:865
+msgid "--[no-]autostash option is only valid with --rebase."
+msgstr "La opción --[no-]autostash sólo es válida con --rebase."
+
+#: builtin/pull.c:873
+msgid "Updating an unborn branch with changes added to the index."
+msgstr "Actualizando una rama no nata con cambios agregados al índice."
+
+#: builtin/pull.c:876
+msgid "pull with rebase"
+msgstr "pull con rebase"
+
+#: builtin/pull.c:877
+msgid "please commit or stash them."
+msgstr "por favor realiza un commit o un stash con ellos."
+
+#: builtin/pull.c:902
+#, c-format
+msgid ""
+"fetch updated the current branch head.\n"
+"fast-forwarding your working tree from\n"
+"commit %s."
+msgstr ""
+"fetch actualizó el head de la rama actual.\n"
+"realizando fast-forward al árbol de trabajo\n"
+"desde commit %s."
+
+#: builtin/pull.c:907
+#, 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 ""
+"No se puede realizar fast-forward en tu árbol de trabajo.\n"
+"Tras asegurarse que ha guardado todo lo preciado de la salida de\n"
+"$ git diff %s\n"
+",ejecute\n"
+"$ git reset --hard\n"
+"para recuperar."
+
+#: builtin/pull.c:922
+msgid "Cannot merge multiple branches into empty head."
+msgstr "No se puede fusionar múltiples ramas en un head vacío."
+
+#: builtin/pull.c:926
+msgid "Cannot rebase onto multiple branches."
+msgstr "No se puede rebasar en múltiples ramas."
+
+#: builtin/pull.c:933
+msgid "cannot rebase with locally recorded submodule modifications"
+msgstr ""
+"no se puede rebasar con modificaciones de submódulos grabadas localmente"
+
+#: builtin/push.c:17
+msgid "git push [<options>] [<repository> [<refspec>...]]"
+msgstr ""
+"git push [<opciones>] [<repositorio> [<especificaciones-de-referencia>...]]"
+
+#: builtin/push.c:92
+msgid "tag shorthand without <tag>"
+msgstr "taquigrafía de tag sin <tag>"
+
+#: builtin/push.c:102
+msgid "--delete only accepts plain target ref names"
+msgstr "--delete solo acepta como objetivos nombres de ref planos"
+
+#: builtin/push.c:146
+msgid ""
+"\n"
+"To choose either option permanently, see push.default in 'git help config'."
+msgstr ""
+"\n"
+"Para elegir si la opción es permanente, mira push.default en 'git help "
+"config'."
+
+#: builtin/push.c:149
+#, 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 %s\n"
+"%s"
+msgstr ""
+"La rama upstream de tu rama actual no concuerda\n"
+"con el nombre de tu rama actual. Para hacer un push a la rama upstream\n"
+"en el remoto, ejecuta\n"
+"\n"
+"\tgit push %s HEAD:%s\n"
+"\n"
+"Para hacer un push a la rama del mismo nombre en el remoto, ejecuta\n"
+"\n"
+"\tgit push %s %s\n"
+"%s"
+
+#: builtin/push.c:164
+#, 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 ""
+"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"
+"\n"
+"\tgit push %s HEAD:<nombre-de-rama-remota>\n"
+
+#: builtin/push.c:178
+#, 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 ""
+"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"
+"\n"
+"\tgit push --set-upstream %s %s\n"
+
+#: builtin/push.c:186
+#, c-format
+msgid "The current branch %s has multiple upstream branches, refusing to push."
+msgstr "La rama actual %s tiene múltiples ramas upstream, rechazando el push."
+
+#: builtin/push.c:189
+#, 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 ""
+"Está haciendo un push al remoto '%s', el cual no es el upstream de\n"
+"su rama actual '%s', sin decirme qué poner en el push\n"
+"para actualizar en qué rama de remoto."
+
+#: builtin/push.c:248
+msgid ""
+"You didn't specify any refspecs to push, and push.default is \"nothing\"."
+msgstr ""
+"No se especificó ningún refspecs para hacer push, y push.default es \"nada\"."
+
+#: builtin/push.c:255
+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 ""
+"Actualizaciones fueron rechazadas porque la punta de tu rama actual esta\n"
+"detrás de su contraparte remota. Integra los cambios remotos (es decir\n"
+"'git pull ...') antes de hacer push de nuevo.\n"
+"Mira 'Note about fast-forwards' en 'git push --help' para mas detalles."
+
+#: builtin/push.c:261
+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 ""
+"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 "
+"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."
+
+#: builtin/push.c:267
+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 ""
+"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"
+"remotos (ej. 'git pull ...') antes de volver a hacer push.\n"
+"Vea 'Notes about fast-forwards0 en 'git push --help' para detalles."
+
+#: builtin/push.c:274
+msgid "Updates were rejected because the tag already exists in the remote."
+msgstr ""
+"Actualizaciones fueron rechazadas porque el tag ya existe en el remoto."
+
+#: builtin/push.c:277
+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 ""
+"No puede actualizar un ref remoto que apunta a un objeto no-commit,\n"
+"o actualizar un ref remoto para hacer que apunte a un objeto no-commit,\n"
+"sin usar la opción '--force'.\n"
+
+#: builtin/push.c:337
+#, c-format
+msgid "Pushing to %s\n"
+msgstr "Haciendo push a %s\n"
+
+#: builtin/push.c:341
+#, c-format
+msgid "failed to push some refs to '%s'"
+msgstr "fallo el push de algunas referencias a '%s'"
+
+#: builtin/push.c:372
+#, c-format
+msgid "bad repository '%s'"
+msgstr "mal repositorio '%s'"
+
+#: builtin/push.c:373
+msgid ""
+"No configured push destination.\n"
+"Either specify the URL from the command-line or configure a remote "
+"repository using\n"
+"\n"
+" git remote add <name> <url>\n"
+"\n"
+"and then push using the remote name\n"
+"\n"
+" git push <name>\n"
+msgstr ""
+"No se ha configurado un destino para el push.\n"
+"Puedes o especificar una URL desde la línea de comandos o configurar un "
+"repositorio remoto usando\n"
+"\n"
+" git remote add <nombre> <url>\n"
+"\n"
+"y luego haciendo push al nombre del remoto\n"
+"\n"
+" git push <nombre>\n"
+
+#: builtin/push.c:391
+msgid "--all and --tags are incompatible"
+msgstr "--all y --tags son incompatibles"
+
+#: builtin/push.c:392
+msgid "--all can't be combined with refspecs"
+msgstr "--all no puede ser combinada con refspecs"
+
+#: builtin/push.c:397
+msgid "--mirror and --tags are incompatible"
+msgstr "--mirror y --tags son incompatibles"
+
+#: builtin/push.c:398
+msgid "--mirror can't be combined with refspecs"
+msgstr "--mirror no puede ser combinado con refspecs"
+
+#: builtin/push.c:403
+msgid "--all and --mirror are incompatible"
+msgstr "--all y --mirror son incompatibles"
+
+#: builtin/push.c:535
+msgid "repository"
+msgstr "repositorio"
+
+#: builtin/push.c:536 builtin/send-pack.c:163
+msgid "push all refs"
+msgstr "realizar push a todas las refs"
+
+#: builtin/push.c:537 builtin/send-pack.c:165
+msgid "mirror all refs"
+msgstr "realizar mirror a todas las refs"
+
+#: builtin/push.c:539
+msgid "delete refs"
+msgstr "borrar refs"
+
+#: builtin/push.c:540
+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:543 builtin/send-pack.c:166
+msgid "force updates"
+msgstr "forzar actualizaciones"
+
+#: builtin/push.c:545 builtin/send-pack.c:180
+msgid "refname>:<expect"
+msgstr "refname>:<expect"
+
+#: builtin/push.c:546 builtin/send-pack.c:181
+msgid "require old value of ref to be at this value"
+msgstr "requiere haber valor viejo de ref en este valor"
+
+#: builtin/push.c:549
+msgid "control recursive pushing of submodules"
+msgstr "controlar push recursivo de submódulos"
+
+#: builtin/push.c:551 builtin/send-pack.c:174
+msgid "use thin pack"
+msgstr "usar empaquetado delgado"
+
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
+#: builtin/send-pack.c:161
+msgid "receive pack program"
+msgstr "recibir programa de paquete"
+
+#: builtin/push.c:554
+msgid "set upstream for git pull/status"
+msgstr "configurar upstream para git pulll/status"
+
+#: builtin/push.c:557
+msgid "prune locally removed refs"
+msgstr "recortando refs removidas localmente"
+
+#: builtin/push.c:559
+msgid "bypass pre-push hook"
+msgstr "hacer un bypass al hook pre-push"
+
+#: builtin/push.c:560
+msgid "push missing but relevant tags"
+msgstr "realizar push de tags faltantes pero relevantes"
+
+#: builtin/push.c:563 builtin/send-pack.c:168
+msgid "GPG sign the push"
+msgstr "firmar con GPG el push"
+
+#: builtin/push.c:565 builtin/send-pack.c:175
+msgid "request atomic transaction on remote side"
+msgstr "solicitar transacción atómica en el lado remoto"
+
+#: builtin/push.c:566 builtin/send-pack.c:171
+msgid "server-specific"
+msgstr "especifico-de-servidor"
+
+#: builtin/push.c:566 builtin/send-pack.c:172
+msgid "option to transmit"
+msgstr "opción para trasmitir"
+
+#: builtin/push.c:583
+msgid "--delete is incompatible with --all, --mirror and --tags"
+msgstr "--delete es incompatible con --all, --mirror y --tags"
+
+#: builtin/push.c:585
+msgid "--delete doesn't make sense without any refs"
+msgstr "--delete no tiene sentido sin ninguna referencia"
+
+#: builtin/push.c:604
+msgid "push options must not have new line characters"
+msgstr "opciones de push no pueden tener caracteres de línea nueva"
+
+#: builtin/read-tree.c:40
+msgid ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --prefix=<prefix>) "
+"[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--"
+"index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])"
+msgstr ""
+"git read-tree [(-m [--trivial] [--aggressive] | --reset | --"
+"prefix=<prefijo>) [-u [--exclude-per-directory=<gitignore>] | -i]] [--no-"
+"sparse-checkout] [--index-output=<archivo>] (--empty | <árbol-ismo1> [<árbol-"
+"ismo2> [<árbol-ismo3>]])"
+
+#: builtin/read-tree.c:121
+msgid "write resulting index to <file>"
+msgstr "escribir índice resultante en <archivo>"
+
+#: builtin/read-tree.c:124
+msgid "only empty the index"
+msgstr "solo vaciar el índice"
+
+#: builtin/read-tree.c:126
+msgid "Merging"
+msgstr "Fusionando"
+
+#: builtin/read-tree.c:128
+msgid "perform a merge in addition to a read"
+msgstr "realizar un merge en adición a una lectura"
+
+#: builtin/read-tree.c:130
+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:132
+msgid "3-way merge in presence of adds and removes"
+msgstr "fusión en 3-vías en presencia de adiciones y remociones"
+
+#: builtin/read-tree.c:134
+msgid "same as -m, but discard unmerged entries"
+msgstr "igual que -m, pero descarta entradas sin fusionar"
+
+#: builtin/read-tree.c:135
+msgid "<subdirectory>/"
+msgstr "<subdirectorio>/"
+
+#: builtin/read-tree.c:136
+msgid "read the tree into the index under <subdirectory>/"
+msgstr "lea el árbol en el índice bajo <subdirectorio>/"
+
+#: builtin/read-tree.c:139
+msgid "update working tree with merge result"
+msgstr "actualiza el árbol de trabajo con el resultado de la fusión"
+
+#: builtin/read-tree.c:141
+msgid "gitignore"
+msgstr "gitignore"
+
+#: builtin/read-tree.c:142
+msgid "allow explicitly ignored files to be overwritten"
+msgstr "permitir sobrescritura de archivos explícitamente ignorados"
+
+#: builtin/read-tree.c:145
+msgid "don't check the working tree after merging"
+msgstr "no revisar el árbol de trabajo tras fusionar"
+
+#: builtin/read-tree.c:146
+msgid "don't update the index or the work tree"
+msgstr "no actualizar el índice o el árbol de trabajo"
+
+#: builtin/read-tree.c:148
+msgid "skip applying sparse checkout filter"
+msgstr "saltar aplicado de filtro de sparse checkout"
+
+#: builtin/read-tree.c:150
+msgid "debug unpack-trees"
+msgstr "debug de árboles-desempacados"
+
+#: builtin/rebase--helper.c:8
+msgid "git rebase--helper [<options>]"
+msgstr "git rebase--helper [<opciones>]"
+
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "mantener commits vacíos"
+
+#: builtin/rebase--helper.c:25
+msgid "continue rebase"
+msgstr "continuar rebase"
+
+#: builtin/rebase--helper.c:27
+msgid "abort rebase"
+msgstr "abortar rebase"
+
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "generar script de rebase"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "ids de commits cortos en la lista de pendientes"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "expandir ids de commits en la lista de pendientes"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "revisar la lista de pendientes"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "saltar los picks innecesarios"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "reorganizar líneas fixup/squash"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "insertar comando exec en la lista de pendientes"
+
+#: builtin/receive-pack.c:30
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <git-dir>"
+
+#: builtin/receive-pack.c:840
+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 ""
+"Por defecto, actualizar la rama actual en un repositorio no vacío\n"
+"está denegado, porque eso haría el índice y el árbol de trabajo "
+"inconsistentes\n"
+"con lo que ya se ha hecho push, y requeriría 'git reset --hard' para "
+"arreglar\n"
+"el árbol de trabajo con HEAD.\n"
+"\n"
+"Puede configurar la variable de configuración 'receive.denyCurrentBranch'\n"
+"\"ignore\" o \"warn\" en el repositorio remoto para permitir\n"
+"su rama actual; Sin embargo, esto no se recomienda a menos que usted\n"
+"se haya organizado para actualizar su árbol de trabajo para que coincida con "
+"lo que\n"
+"enviará con el push de otra manera.\n"
+"\n"
+"Para suprimir este mensaje y mantener el comportamiento predeterminado,\n"
+"configure 'receive.denyCurrentBranch' a 'refuse'."
+
+#: builtin/receive-pack.c:860
+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 ""
+"Por defecto, borrar la rama actual está prohibido, porque el siguiente\n"
+"'git clone' no resultara en ningún archivo revisado, causando confusión.\n"
+"\n"
+"Se puede configurar la variable 'receive.denyDeleteCurrent' a 'warn' o "
+"'ignore'\n"
+"en el repositorio remoto para permitir borrar la rama actual.\n"
+"con o sin mensaje de advertencia.\n"
+"\n"
+"Para suprimir este mensaje, puede configurarlo en 'refuse'."
+
+#: builtin/receive-pack.c:1933
+msgid "quiet"
+msgstr "tranquilo"
+
+#: builtin/receive-pack.c:1947
+msgid "You must specify a directory."
+msgstr "Se tiene que especificar un directorio."
+
+#: builtin/reflog.c:531 builtin/reflog.c:536
+#, c-format
+msgid "'%s' is not a valid timestamp"
+msgstr "'%s' no es una marca de tiempo válida"
+
+#: builtin/remote.c:13
+msgid "git remote [-v | --verbose]"
+msgstr "git remote [-v | --verbose]"
+
+#: builtin/remote.c:14
+msgid ""
+"git remote add [-t <branch>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <name> <url>"
+msgstr ""
+"git remote add [-t <rama>] [-m <master>] [-f] [--tags | --no-tags] [--"
+"mirror=<fetch|push>] <nombre> <url>"
+
+#: builtin/remote.c:15 builtin/remote.c:35
+msgid "git remote rename <old> <new>"
+msgstr "git remote rename <viejo> <nuevo>"
+
+#: builtin/remote.c:16 builtin/remote.c:40
+msgid "git remote remove <name>"
+msgstr "git remote remove <nombre>"
+
+#: builtin/remote.c:17 builtin/remote.c:45
+msgid "git remote set-head <name> (-a | --auto | -d | --delete | <branch>)"
+msgstr "git remote set-head <nombre> (-a | --auto | -d | --delete | <rama>)"
+
+#: builtin/remote.c:18
+msgid "git remote [-v | --verbose] show [-n] <name>"
+msgstr "git remote [-v | --verbose] show [-n] <nombre>"
+
+#: builtin/remote.c:19
+msgid "git remote prune [-n | --dry-run] <name>"
+msgstr "git remote prune [-n | --dry-run] <nombre>"
+
+#: builtin/remote.c:20
+msgid ""
+"git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]"
+msgstr ""
+"git remote [-v | --verbose] update [-p | --prune] [(<grupo> | <remoto>)...]"
+
+#: builtin/remote.c:21
+msgid "git remote set-branches [--add] <name> <branch>..."
+msgstr "git remote set-branches [--add] <nombre> <rama>..."
+
+#: builtin/remote.c:22 builtin/remote.c:71
+msgid "git remote get-url [--push] [--all] <name>"
+msgstr "git remote get-url [--push] [--all] <nombre>"
+
+#: builtin/remote.c:23 builtin/remote.c:76
+msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]"
+msgstr "git remote set-url [--push] <nombre> <nuevo-url> [<viejo-url>]"
+
+#: builtin/remote.c:24 builtin/remote.c:77
+msgid "git remote set-url --add <name> <newurl>"
+msgstr "git remote set-url --add <nombre> <nuevo-url>"
+
+#: builtin/remote.c:25 builtin/remote.c:78
+msgid "git remote set-url --delete <name> <url>"
+msgstr "git remote set-url --delete <nombre> <url>"
+
+#: builtin/remote.c:30
+msgid "git remote add [<options>] <name> <url>"
+msgstr "git remote add [<opciones>] <nombre> <url>"
+
+#: builtin/remote.c:50
+msgid "git remote set-branches <name> <branch>..."
+msgstr "git remote set-branches <nombre> <rama>..."
+
+#: builtin/remote.c:51
+msgid "git remote set-branches --add <name> <branch>..."
+msgstr "git remote set-branches --add <nombre> <rama>..."
+
+#: builtin/remote.c:56
+msgid "git remote show [<options>] <name>"
+msgstr "git remote show [<opciones>] <nombre>"
+
+#: builtin/remote.c:61
+msgid "git remote prune [<options>] <name>"
+msgstr "git remote prune [<opciones>] <nombre>"
+
+#: builtin/remote.c:66
+msgid "git remote update [<options>] [<group> | <remote>]..."
+msgstr "git remote update [<opciones>] [<grupo> | <remoto>]..."
+
+#: builtin/remote.c:95
+#, c-format
+msgid "Updating %s"
+msgstr "Actualizando %s"
+
+#: builtin/remote.c:127
+msgid ""
+"--mirror is dangerous and deprecated; please\n"
+"\t use --mirror=fetch or --mirror=push instead"
+msgstr ""
+"Usar --mirror es peligroso y está desaprobado;\n"
+"\t usa más bien --mirror=fetch o --mirror=push"
+
+#: builtin/remote.c:144
+#, c-format
+msgid "unknown mirror argument: %s"
+msgstr "argumento mirror desconocido: %s"
+
+#: builtin/remote.c:160
+msgid "fetch the remote branches"
+msgstr "realizar fetch a las ramas remotas"
+
+#: builtin/remote.c:162
+msgid "import all tags and associated objects when fetching"
+msgstr "importar todos los tags y objetos asociados cuando realiza el fetch"
+
+#: builtin/remote.c:165
+msgid "or do not fetch any tag at all (--no-tags)"
+msgstr "o no realziar fetch a ningún tag (--no-tags)"
+
+#: builtin/remote.c:167
+msgid "branch(es) to track"
+msgstr "rama(s) para rastrear"
+
+#: builtin/remote.c:168
+msgid "master branch"
+msgstr "rama master"
+
+#: builtin/remote.c:169
+msgid "push|fetch"
+msgstr "push|fetch"
+
+#: builtin/remote.c:170
+msgid "set up remote as a mirror to push to or fetch from"
+msgstr ""
+"configurar remote como mirror para realizar push o desde el cual realizar "
+"fetch"
+
+#: builtin/remote.c:182
+msgid "specifying a master branch makes no sense with --mirror"
+msgstr "especificar una rama master no tiene sentido con --mirror"
+
+#: builtin/remote.c:184
+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:191 builtin/remote.c:631
+#, c-format
+msgid "remote %s already exists."
+msgstr "remoto %s ya existe."
+
+#: builtin/remote.c:195 builtin/remote.c:635
+#, c-format
+msgid "'%s' is not a valid remote name"
+msgstr "'%s' no es un nombre remoto válido"
+
+#: builtin/remote.c:235
+#, c-format
+msgid "Could not setup master '%s'"
+msgstr "No se pudo configurar master '%s'"
+
+#: builtin/remote.c:337
+#, c-format
+msgid "Could not get fetch map for refspec %s"
+msgstr "No se pudo realizar el fetch al mapa para refspec %s"
+
+#: builtin/remote.c:438 builtin/remote.c:446
+msgid "(matching)"
+msgstr "(concordando)"
+
+#: builtin/remote.c:450
+msgid "(delete)"
+msgstr "(eliminar)"
+
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
+#, c-format
+msgid "No such remote: %s"
+msgstr "No existe el remoto: %s"
+
+#: builtin/remote.c:641
+#, 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:661
+#, c-format
+msgid ""
+"Not updating non-default fetch refspec\n"
+"\t%s\n"
+"\tPlease update the configuration manually if necessary."
+msgstr ""
+"No se actualizan refspec de fetch no predeterminada\n"
+"\t%s\n"
+"\tPor favor actualice la configuración manualmente si es necesario."
+
+#: builtin/remote.c:697
+#, c-format
+msgid "deleting '%s' failed"
+msgstr "borrando '%s' falló"
+
+#: builtin/remote.c:731
+#, c-format
+msgid "creating '%s' failed"
+msgstr "creando '%s' falló"
+
+#: builtin/remote.c:796
+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] ""
+"Nota: Una rama fuera de la jerarquía refs/remotes/ no fue removida;\n"
+"para borrarla, use:"
+msgstr[1] ""
+"Nota: Algunas ramas fuera de la jerarquía refs/remotes/ no fueron "
+"removidas;\n"
+"para borrarlas, use:"
+
+#: builtin/remote.c:810
+#, c-format
+msgid "Could not remove config section '%s'"
+msgstr "No se pudo borrar la sección de configuración '%s'"
+
+#: builtin/remote.c:911
+#, c-format
+msgid " new (next fetch will store in remotes/%s)"
+msgstr " nuevo (siguiente fetch se guardará en remotes/%s)"
+
+#: builtin/remote.c:914
+msgid " tracked"
+msgstr " rastreada"
+
+#: builtin/remote.c:916
+msgid " stale (use 'git remote prune' to remove)"
+msgstr " viejo ( use 'git remote prune' para remover)"
+
+#: builtin/remote.c:918
+msgid " ???"
+msgstr " ???"
+
+#: builtin/remote.c:959
+#, c-format
+msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
+msgstr "invalido branch.%s.merge; no se puede rebasar en > 1 rama"
+
+#: builtin/remote.c:967
+#, c-format
+msgid "rebases interactively onto remote %s"
+msgstr "rebasa interactivamente en remoto %s"
+
+#: builtin/remote.c:968
+#, c-format
+msgid "rebases onto remote %s"
+msgstr "rebasa sobre el remoto %s"
+
+#: builtin/remote.c:971
+#, c-format
+msgid " merges with remote %s"
+msgstr " se fusiona con remoto %s"
+
+#: builtin/remote.c:974
+#, c-format
+msgid "merges with remote %s"
+msgstr "fusiona con remoto %s"
+
+#: builtin/remote.c:977
+#, c-format
+msgid "%-*s and with remote %s\n"
+msgstr "%-*s y con el remoto %s\n"
+
+#: builtin/remote.c:1020
+msgid "create"
+msgstr "crear"
+
+#: builtin/remote.c:1023
+msgid "delete"
+msgstr "borrar"
+
+#: builtin/remote.c:1027
+msgid "up to date"
+msgstr "actualizado"
+
+#: builtin/remote.c:1030
+msgid "fast-forwardable"
+msgstr "puede realizar fast-forward"
+
+#: builtin/remote.c:1033
+msgid "local out of date"
+msgstr "desactualizado local"
+
+#: builtin/remote.c:1040
+#, c-format
+msgid " %-*s forces to %-*s (%s)"
+msgstr " %-*s fuerza a %-*s (%s)"
+
+#: builtin/remote.c:1043
+#, c-format
+msgid " %-*s pushes to %-*s (%s)"
+msgstr " %-*s publica a %-*s (%s)"
+
+#: builtin/remote.c:1047
+#, c-format
+msgid " %-*s forces to %s"
+msgstr " %-*s fuerza a %s"
+
+#: builtin/remote.c:1050
+#, c-format
+msgid " %-*s pushes to %s"
+msgstr " %-*s publica a %s"
+
+#: builtin/remote.c:1118
+msgid "do not query remotes"
+msgstr "no consultar remotos"
+
+#: builtin/remote.c:1145
+#, c-format
+msgid "* remote %s"
+msgstr "* remoto %s"
+
+#: builtin/remote.c:1146
+#, c-format
+msgid " Fetch URL: %s"
+msgstr " URL para obtener: %s"
+
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
+msgid "(no URL)"
+msgstr "(sin URL)"
+
+#. TRANSLATORS: the colon ':' should align
+#. with the one in " Fetch URL: %s"
+#. translation.
+#.
+#: builtin/remote.c:1161 builtin/remote.c:1163
+#, c-format
+msgid " Push URL: %s"
+msgstr " URL para publicar: %s"
+
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
+#, c-format
+msgid " HEAD branch: %s"
+msgstr " Rama HEAD: %s"
+
+#: builtin/remote.c:1165
+msgid "(not queried)"
+msgstr "(no consultado)"
+
+#: builtin/remote.c:1167
+msgid "(unknown)"
+msgstr "(desconocido)"
+
+#: builtin/remote.c:1171
+#, c-format
+msgid ""
+" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
+msgstr ""
+" HEAD en rama ( HEAD remoto es ambiguo, puede ser uno de los siguientes):\n"
+
+#: builtin/remote.c:1183
+#, c-format
+msgid " Remote branch:%s"
+msgid_plural " Remote branches:%s"
+msgstr[0] " Rama remota:%s"
+msgstr[1] " Ramas remotas:%s"
+
+#: builtin/remote.c:1186 builtin/remote.c:1212
+msgid " (status not queried)"
+msgstr " (estado no consultado)"
+
+#: builtin/remote.c:1195
+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:1203
+msgid " Local refs will be mirrored by 'git push'"
+msgstr " Las referencias locales serán reflejadas por 'git push'"
+
+#: builtin/remote.c:1209
+#, 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:1230
+msgid "set refs/remotes/<name>/HEAD according to remote"
+msgstr "configurar refs/remotes/<nombre>/HEAD de acuerdo al remoto"
+
+#: builtin/remote.c:1232
+msgid "delete refs/remotes/<name>/HEAD"
+msgstr "borrar refs/remotos/<nombre>/HEAD"
+
+#: builtin/remote.c:1247
+msgid "Cannot determine remote HEAD"
+msgstr "No se puede determinar el HEAD remoto"
+
+#: builtin/remote.c:1249
+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:1259
+#, c-format
+msgid "Could not delete %s"
+msgstr "No se pudo borrar %s"
+
+#: builtin/remote.c:1267
+#, c-format
+msgid "Not a valid ref: %s"
+msgstr "No es un ref válido: %s"
+
+#: builtin/remote.c:1269
+#, c-format
+msgid "Could not setup %s"
+msgstr "No se pudo configurar %s"
+
+#: builtin/remote.c:1287
+#, c-format
+msgid " %s will become dangling!"
+msgstr " %s será colgado!"
+
+#: builtin/remote.c:1288
+#, c-format
+msgid " %s has become dangling!"
+msgstr " %s ha sido colgado!"
+
+#: builtin/remote.c:1298
+#, c-format
+msgid "Pruning %s"
+msgstr "Recortando %s"
+
+#: builtin/remote.c:1299
+#, c-format
+msgid "URL: %s"
+msgstr "URL: %s"
+
+#: builtin/remote.c:1315
+#, c-format
+msgid " * [would prune] %s"
+msgstr " * [ejecutará prune] %s"
+
+#: builtin/remote.c:1318
+#, c-format
+msgid " * [pruned] %s"
+msgstr " * [prune realizado] %s"
+
+#: builtin/remote.c:1363
+msgid "prune remotes after fetching"
+msgstr "recortar remotos tras realizar fetch"
+
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
+#, c-format
+msgid "No such remote '%s'"
+msgstr "No existe el remoto '%s'"
+
+#: builtin/remote.c:1442
+msgid "add branch"
+msgstr "agregar rama"
+
+#: builtin/remote.c:1449
+msgid "no remote specified"
+msgstr "no hay remotos especificados"
+
+#: builtin/remote.c:1466
+msgid "query push URLs rather than fetch URLs"
+msgstr "consultar URLs de push en lugar de URLs de fetch"
+
+#: builtin/remote.c:1468
+msgid "return all URLs"
+msgstr "retornar todos los URLs"
+
+#: builtin/remote.c:1496
+#, c-format
+msgid "no URLs configured for remote '%s'"
+msgstr "no hay URLs configurados para remoto '%s'"
+
+#: builtin/remote.c:1522
+msgid "manipulate push URLs"
+msgstr "manipular URLs de push"
+
+#: builtin/remote.c:1524
+msgid "add URL"
+msgstr "agregar URL"
+
+#: builtin/remote.c:1526
+msgid "delete URLs"
+msgstr "borrar URLs"
+
+#: builtin/remote.c:1533
+msgid "--add --delete doesn't make sense"
+msgstr "--add --delete no tiene sentido"
+
+#: builtin/remote.c:1572
+#, c-format
+msgid "Invalid old URL pattern: %s"
+msgstr "Patrón de URL viejo inválido: %s"
+
+#: builtin/remote.c:1580
+#, c-format
+msgid "No such URL found: %s"
+msgstr "No se encontró URL: %s"
+
+#: builtin/remote.c:1582
+msgid "Will not delete all non-push URLs"
+msgstr "No borrará todos los URLs de no-push"
+
+#: builtin/remote.c:1598
+msgid "be verbose; must be placed before a subcommand"
+msgstr "ser verboso; tiene que ser agregado antes de un subcomando"
+
+#: builtin/remote.c:1629
+#, c-format
+msgid "Unknown subcommand: %s"
+msgstr "Sub-comando desconocido: %s"
+
+#: builtin/repack.c:18
+msgid "git repack [<options>]"
+msgstr "git repack [<opciones>]"
+
+#: builtin/repack.c:23
+msgid ""
+"Incremental repacks are incompatible with bitmap indexes. Use\n"
+"--no-write-bitmap-index or disable the pack.writebitmaps configuration."
+msgstr ""
+"Re empaquetados incrementales son incompatibles con índices bitmap. Use \n"
+"--no-write-bitmap-index o deshabilite la configuración pack.writebitmaps."
+
+#: builtin/repack.c:168
+msgid "pack everything in a single pack"
+msgstr "empaquetar todo en un único paquete"
+
+#: builtin/repack.c:170
+msgid "same as -a, and turn unreachable objects loose"
+msgstr "lo mismo que -a, y pierde objetos inaccesibles"
+
+#: builtin/repack.c:173
+msgid "remove redundant packs, and run git-prune-packed"
+msgstr "remover paquetes redundantes, y ejecutar git-prune-packed"
+
+#: builtin/repack.c:175
+msgid "pass --no-reuse-delta to git-pack-objects"
+msgstr "pasar --no-reuse-delta a git-pack-objects"
+
+#: builtin/repack.c:177
+msgid "pass --no-reuse-object to git-pack-objects"
+msgstr "pasar --no-reuse-object a git-pack-objects"
+
+#: builtin/repack.c:179
+msgid "do not run git-update-server-info"
+msgstr "no ejecutar git-update-server-info"
+
+#: builtin/repack.c:182
+msgid "pass --local to git-pack-objects"
+msgstr "pasar --local a git-pack-objects"
+
+#: builtin/repack.c:184
+msgid "write bitmap index"
+msgstr "escribir un índice de bitmap"
+
+#: builtin/repack.c:185
+msgid "approxidate"
+msgstr "aproxime"
+
+#: builtin/repack.c:186
+msgid "with -A, do not loosen objects older than this"
+msgstr "con -A, no perder objetos más antiguos que este"
+
+#: builtin/repack.c:188
+msgid "with -a, repack unreachable objects"
+msgstr "con -a, re empaquetar objetos inalcanzables "
+
+#: builtin/repack.c:190
+msgid "size of the window used for delta compression"
+msgstr "tamaño de la ventana usado para la compresión delta"
+
+#: builtin/repack.c:191 builtin/repack.c:197
+msgid "bytes"
+msgstr "bytes"
+
+#: builtin/repack.c:192
+msgid "same as the above, but limit memory size instead of entries count"
+msgstr ""
+"lo mismo que arriba, pero limita el tamaño de memoria en lugar de contar "
+"entradas"
+
+#: builtin/repack.c:194
+msgid "limits the maximum delta depth"
+msgstr "limita la profundidad máxima del delta"
+
+#: builtin/repack.c:196
+msgid "limits the maximum number of threads"
+msgstr "limita el número máximo de hilos"
+
+#: builtin/repack.c:198
+msgid "maximum size of each packfile"
+msgstr "tamaño máximo de cada paquete"
+
+#: builtin/repack.c:200
+msgid "repack objects in packs marked with .keep"
+msgstr "re-empaquetar objetos en paquetes marcados con .keep"
+
+#: builtin/repack.c:210
+msgid "cannot delete packs in a precious-objects repo"
+msgstr "no se pueden borrar paquetes en un repositorio de objetos-preciosos"
+
+#: builtin/repack.c:214
+msgid "--keep-unreachable and -A are incompatible"
+msgstr "--keep-unreachable y -A son incompatibles"
+
+#: builtin/repack.c:406 builtin/worktree.c:146
+#, c-format
+msgid "failed to remove '%s'"
+msgstr "falló al remover '%s'"
+
+#: builtin/replace.c:20
+msgid "git replace [-f] <object> <replacement>"
+msgstr "git replace [-f] <objeto> <remplazo>"
+
+#: builtin/replace.c:21
+msgid "git replace [-f] --edit <object>"
+msgstr "git replace [-f] --edit <objeto>"
+
+#: builtin/replace.c:22
+msgid "git replace [-f] --graft <commit> [<parent>...]"
+msgstr "git replace [-f] --graft <commit> [<padre>...]"
+
+#: builtin/replace.c:23
+msgid "git replace -d <object>..."
+msgstr "git replace -d <objeto>..."
+
+#: builtin/replace.c:24
+msgid "git replace [--format=<format>] [-l [<pattern>]]"
+msgstr "git replace [--format=<formato>] [-l [<patrón>]]"
+
+#: builtin/replace.c:331 builtin/replace.c:369 builtin/replace.c:397
+#, c-format
+msgid "Not a valid object name: '%s'"
+msgstr "Nombre de objeto no válido: '%s'"
+
+#: builtin/replace.c:361
+#, c-format
+msgid "bad mergetag in commit '%s'"
+msgstr "mal mergetag en commit '%s'"
+
+#: builtin/replace.c:363
+#, c-format
+msgid "malformed mergetag in commit '%s'"
+msgstr "mergetag mal formado en commit '%s'"
+
+#: builtin/replace.c:374
+#, c-format
+msgid ""
+"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 "
+"en lugar de --graft"
+
+#: builtin/replace.c:407
+#, c-format
+msgid "the original commit '%s' has a gpg signature."
+msgstr "el commit original '%s' tiene una firma gpg."
+
+#: builtin/replace.c:408
+msgid "the signature will be removed in the replacement commit!"
+msgstr "la firma será removida en el commit de reemplazo!"
+
+#: builtin/replace.c:414
+#, c-format
+msgid "could not write replacement commit for: '%s'"
+msgstr "no se pudo escribir el commit de reemplazo: '%s'"
+
+#: builtin/replace.c:438
+msgid "list replace refs"
+msgstr "listar replace refs "
+
+#: builtin/replace.c:439
+msgid "delete replace refs"
+msgstr "borrar replace refs"
+
+#: builtin/replace.c:440
+msgid "edit existing object"
+msgstr "editar objeto existente"
+
+#: builtin/replace.c:441
+msgid "change a commit's parents"
+msgstr "cambiar un padre de commit"
+
+#: builtin/replace.c:442
+msgid "replace the ref if it exists"
+msgstr "reemplazar el ref si este existe"
+
+#: builtin/replace.c:443
+msgid "do not pretty-print contents for --edit"
+msgstr "no se puede imprimir contenidos para --edit"
+
+#: builtin/replace.c:444
+msgid "use this format"
+msgstr "usar este formato"
+
+#: builtin/rerere.c:13
+msgid "git rerere [clear | forget <path>... | status | remaining | diff | gc]"
+msgstr "git rerere [clear | forget <ruta>... | status | remaining | diff | gc]"
+
+#: builtin/rerere.c:59
+msgid "register clean resolutions in index"
+msgstr "registrar resoluciones limpias en el índice"
+
+#: builtin/reset.c:29
+msgid ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+msgstr ""
+"git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"
+
+#: builtin/reset.c:30
+msgid "git reset [-q] [<tree-ish>] [--] <paths>..."
+msgstr "git reset [-q] [<árbol-ismo>] [--] <rutas>..."
+
+#: builtin/reset.c:31
+msgid "git reset --patch [<tree-ish>] [--] [<paths>...]"
+msgstr "git reset --patch [<árbol-ismo>] [--] [<rutas>...]"
+
+#: builtin/reset.c:37
+msgid "mixed"
+msgstr "mezclado"
+
+#: builtin/reset.c:37
+msgid "soft"
+msgstr "suave"
+
+#: builtin/reset.c:37
+msgid "hard"
+msgstr "duro"
+
+#: builtin/reset.c:37
+msgid "merge"
+msgstr "fusionar"
+
+#: builtin/reset.c:37
+msgid "keep"
+msgstr "mantener"
+
+#: builtin/reset.c:78
+msgid "You do not have a valid HEAD."
+msgstr "No hay un HEAD válido"
+
+#: builtin/reset.c:80
+msgid "Failed to find tree of HEAD."
+msgstr "Falló al encontrar el HEAD del árbol"
+
+#: builtin/reset.c:86
+#, c-format
+msgid "Failed to find tree of %s."
+msgstr "Falló al encontrar árbol de %s."
+
+#: builtin/reset.c:113
+#, c-format
+msgid "HEAD is now at %s"
+msgstr "HEAD está ahora en %s"
+
+#: builtin/reset.c:197
+#, c-format
+msgid "Cannot do a %s reset in the middle of a merge."
+msgstr "no se puede realziar un reset %s en medio de una fusión."
+
+#: builtin/reset.c:297
+msgid "be quiet, only report errors"
+msgstr "ser silencioso, solo reportar errores"
+
+#: builtin/reset.c:299
+msgid "reset HEAD and index"
+msgstr "reiniciar HEAD e index"
+
+#: builtin/reset.c:300
+msgid "reset only HEAD"
+msgstr "reiniciar solo HEAD"
+
+#: builtin/reset.c:302 builtin/reset.c:304
+msgid "reset HEAD, index and working tree"
+msgstr "reiniciar HEAD, índice y árbol de trabajo"
+
+#: builtin/reset.c:306
+msgid "reset HEAD but keep local changes"
+msgstr "reiniciar HEAD pero mantener cambios locales"
+
+#: builtin/reset.c:312
+msgid "record only the fact that removed paths will be added later"
+msgstr ""
+"grabar solo el hecho de que las rutas removidas serán agregadas después"
+
+#: builtin/reset.c:329
+#, 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:337
+#, c-format
+msgid "Failed to resolve '%s' as a valid tree."
+msgstr "Falló al resolver '%s' como un árbol válido."
+
+#: builtin/reset.c:346
+msgid "--patch is incompatible with --{hard,mixed,soft}"
+msgstr "--patch es incompatible con --{hard,mixed,soft}"
+
+#: builtin/reset.c:355
+msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
+msgstr ""
+"--mixed con rutas ha sido deprecado; use 'git reset -- <rutas>' en cambio."
+
+#: builtin/reset.c:357
+#, c-format
+msgid "Cannot do %s reset with paths."
+msgstr "No se puede hacer un reset %s con rutas."
+
+#: builtin/reset.c:367
+#, 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:371
+msgid "-N can only be used with --mixed"
+msgstr "-N sólo puede ser usada con --mixed"
+
+#: builtin/reset.c:388
+msgid "Unstaged changes after reset:"
+msgstr "Cambios fuera del área de stage tras el reset:"
+
+#: builtin/reset.c:394
+#, 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:398
+msgid "Could not write new index file."
+msgstr "No se puede escribir un nuevo archivo índice."
+
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "filtrado de objetos requiere --objects"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "valor disperso inválido: '%s'"
+
+#: builtin/rev-list.c:442
+msgid "rev-list does not support display of notes"
+msgstr "rev-list no soporta mostrar notas"
+
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "no se puede combinar --use-bitmap-index con objetos de filtrado"
+
+#: builtin/rev-parse.c:402
+msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
+msgstr "git rev-parse --parseopt [<opciones>] -- [<args>...]"
+
+#: builtin/rev-parse.c:407
+msgid "keep the `--` passed as an arg"
+msgstr "mantener el `--` pasado como un arg"
+
+#: builtin/rev-parse.c:409
+msgid "stop parsing after the first non-option argument"
+msgstr "detener análisis tras el primer argumento que no es opción"
+
+#: builtin/rev-parse.c:412
+msgid "output in stuck long form"
+msgstr "salida en formulario largo de atasco"
+
+#: builtin/rev-parse.c:545
+msgid ""
+"git rev-parse --parseopt [<options>] -- [<args>...]\n"
+" or: git rev-parse --sq-quote [<arg>...]\n"
+" or: git rev-parse [<options>] [<arg>...]\n"
+"\n"
+"Run \"git rev-parse --parseopt -h\" for more information on the first usage."
+msgstr ""
+"git rev-parse --parseopt [<opciones>] -- [<args>...]\n"
+" 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 "
+"uso."
+
+#: builtin/revert.c:23
+msgid "git revert [<options>] <commit-ish>..."
+msgstr "git revert [<opciones>] <commit-ish>..."
+
+#: builtin/revert.c:24
+msgid "git revert <subcommand>"
+msgstr "git revert <subcomando>"
+
+#: builtin/revert.c:29
+msgid "git cherry-pick [<options>] <commit-ish>..."
+msgstr "git cherry-pick [<opciones>] <commit-ish>..."
+
+#: builtin/revert.c:30
+msgid "git cherry-pick <subcommand>"
+msgstr "git cherry-pick <subcomando>"
+
+#: builtin/revert.c:90
+#, c-format
+msgid "%s: %s cannot be used with %s"
+msgstr "%s: %s no puede ser usado con %s"
+
+#: builtin/revert.c:99
+msgid "end revert or cherry-pick sequence"
+msgstr "finalizar secuencia revert o cherry-pick"
+
+#: builtin/revert.c:100
+msgid "resume revert or cherry-pick sequence"
+msgstr "resumir secuencia revert o cherry-pick"
+
+#: builtin/revert.c:101
+msgid "cancel revert or cherry-pick sequence"
+msgstr "cancelar secuencia revert o cherry-pick"
+
+#: builtin/revert.c:102
+msgid "don't automatically commit"
+msgstr "no realizar commit de forma automática"
+
+#: builtin/revert.c:103
+msgid "edit the commit message"
+msgstr "editar el mensaje de commit"
+
+#: builtin/revert.c:106
+msgid "parent-number"
+msgstr "número-de-padre"
+
+#: builtin/revert.c:107
+msgid "select mainline parent"
+msgstr "seleccionar el padre principal"
+
+#: builtin/revert.c:109
+msgid "merge strategy"
+msgstr "estrategia de fusión"
+
+#: builtin/revert.c:110
+msgid "option"
+msgstr "opción"
+
+#: builtin/revert.c:111
+msgid "option for merge strategy"
+msgstr "opción para estrategia de fusión"
+
+#: builtin/revert.c:120
+msgid "append commit name"
+msgstr "adjuntar el nombre del commit"
+
+#: builtin/revert.c:122
+msgid "preserve initially empty commits"
+msgstr "preservar commits iniciales vacíos"
+
+#: builtin/revert.c:123
+msgid "allow commits with empty messages"
+msgstr "permitir commits con mensajes vacíos"
+
+#: builtin/revert.c:124
+msgid "keep redundant, empty commits"
+msgstr "mantener commits redundantes, vacíos"
+
+#: builtin/revert.c:214
+msgid "revert failed"
+msgstr "falló al revertir"
+
+#: builtin/revert.c:227
+msgid "cherry-pick failed"
+msgstr "cherry-pick falló"
+
+#: builtin/rm.c:18
+msgid "git rm [<options>] [--] <file>..."
+msgstr "git rm [<opciones>] [--] <archivo>..."
+
+#: builtin/rm.c:206
+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] ""
+"El siguiente archivo tiene contenido en stage diferente al archivo\n"
+"y a HEAD:"
+msgstr[1] ""
+"los siguientes archivos tienen contenido diferente a los mismos\n"
+"y a HEAD:"
+
+#: builtin/rm.c:211
+msgid ""
+"\n"
+"(use -f to force removal)"
+msgstr ""
+"\n"
+"(usa -f para forzar su eliminación)"
+
+#: builtin/rm.c:215
+msgid "the following file has changes staged in the index:"
+msgid_plural "the following files have changes staged in the index:"
+msgstr[0] "el siguiente archivo tiene cambios en stage en el índice:"
+msgstr[1] "los siguientes archivos tienen cambios en stage en el índice:"
+
+#: builtin/rm.c:219 builtin/rm.c:228
+msgid ""
+"\n"
+"(use --cached to keep the file, or -f to force removal)"
+msgstr ""
+"\n"
+"(usa --cached para conservar el archivo, o -f para forzar su eliminación)"
+
+#: builtin/rm.c:225
+msgid "the following file has local modifications:"
+msgid_plural "the following files have local modifications:"
+msgstr[0] "el siguiente archivo tiene modificaciones locales:"
+msgstr[1] "los siguientes archivos tienen modificaciones locales:"
+
+#: builtin/rm.c:243
+msgid "do not list removed files"
+msgstr "no listar archivos removidos"
+
+#: builtin/rm.c:244
+msgid "only remove from the index"
+msgstr "solo remover del índice"
+
+#: builtin/rm.c:245
+msgid "override the up-to-date check"
+msgstr "sobrescribir el check de actualizado"
+
+#: builtin/rm.c:246
+msgid "allow recursive removal"
+msgstr "permitir remover de forma recursiva"
+
+#: builtin/rm.c:248
+msgid "exit with a zero status even if nothing matched"
+msgstr "salir con estado cero incluso si nada coincide"
+
+#: builtin/rm.c:307
+#, c-format
+msgid "not removing '%s' recursively without -r"
+msgstr "no removiendo '%s' de manera recursiva sin -r"
+
+#: builtin/rm.c:346
+#, c-format
+msgid "git rm: unable to remove %s"
+msgstr "git rm: no es posible remover %s"
+
+#: builtin/rm.c:369
+#, c-format
+msgid "could not remove '%s'"
+msgstr "no se pudo remover '%s'"
+
+#: builtin/send-pack.c:19
+msgid ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all and explicit <ref> specification are mutually exclusive."
+msgstr ""
+"git send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-"
+"receive-pack>] [--verbose] [--thin] [--atomic] [<host>:]<directory> "
+"[<ref>...]\n"
+" --all y especificaciones <ref> explícitas son mutuamente exclusivas."
+
+#: builtin/send-pack.c:162
+msgid "remote name"
+msgstr "nombre remoto"
+
+#: builtin/send-pack.c:176
+msgid "use stateless RPC protocol"
+msgstr "usar protocolo RPC sin estado"
+
+#: builtin/send-pack.c:177
+msgid "read refs from stdin"
+msgstr "leer refs de stdin"
+
+#: builtin/send-pack.c:178
+msgid "print status from remote helper"
+msgstr "mostrar status del remote helper"
+
+#: builtin/shortlog.c:14
+msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
+msgstr "git shortlog [<opciones>] [<rango-de-revisión>] [[--] [<ruta>...]]"
+
+#: builtin/shortlog.c:263
+msgid "Group by committer rather than author"
+msgstr "Agrupar por committer en lugar de autor"
+
+#: builtin/shortlog.c:265
+msgid "sort output according to the number of commits per author"
+msgstr "ordenar salida de acuerdo al número de commits por autor"
+
+#: builtin/shortlog.c:267
+msgid "Suppress commit descriptions, only provides commit count"
+msgstr "Suprimir descripción de commits, solo proveer cuenta de commits"
+
+#: builtin/shortlog.c:269
+msgid "Show the email address of each author"
+msgstr "Mostrar la dirección de correo de cada autor"
+
+#: builtin/shortlog.c:270
+msgid "w[,i1[,i2]]"
+msgstr "w[,i1[,i2]]"
+
+#: builtin/shortlog.c:271
+msgid "Linewrap output"
+msgstr "Salida de línea"
+
+#: builtin/show-branch.c:12
+msgid ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+msgstr ""
+"git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
+"\t\t[--current] [--color[=<when>] | --no-color] [--sparse]\n"
+"\t\t[--more=<n> | --list | --independent | --merge-base]\n"
+"\t\t[--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"
+
+#: builtin/show-branch.c:16
+msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
+
+#: builtin/show-branch.c:376
+#, c-format
+msgid "ignoring %s; cannot handle more than %d ref"
+msgid_plural "ignoring %s; cannot handle more than %d refs"
+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:530
+#, c-format
+msgid "no matching refs with %s"
+msgstr "no hay refs que concuerden con %s"
+
+#: builtin/show-branch.c:626
+msgid "show remote-tracking and local branches"
+msgstr "mostrar ramas locales y de rastreo remoto"
+
+#: builtin/show-branch.c:628
+msgid "show remote-tracking branches"
+msgstr "mostrar ramas de rastreo remoto"
+
+#: builtin/show-branch.c:630
+msgid "color '*!+-' corresponding to the branch"
+msgstr "color '*!+-' correspondiendo a la rama"
+
+#: builtin/show-branch.c:632
+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:634
+msgid "synonym to more=-1"
+msgstr "sinónimo de más=-1"
+
+#: builtin/show-branch.c:635
+msgid "suppress naming strings"
+msgstr "suprimir strings de nombre"
+
+#: builtin/show-branch.c:637
+msgid "include the current branch"
+msgstr "incluir la rama actual"
+
+#: builtin/show-branch.c:639
+msgid "name commits with their object names"
+msgstr "nombrar commits con sus nombres de objeto"
+
+#: builtin/show-branch.c:641
+msgid "show possible merge bases"
+msgstr "mostrar bases de fusión posibles"
+
+#: builtin/show-branch.c:643
+msgid "show refs unreachable from any other ref"
+msgstr "mostrar refs inalcanzables por ningún otro ref"
+
+#: builtin/show-branch.c:645
+msgid "show commits in topological order"
+msgstr "mostrar commits en orden topológico"
+
+#: builtin/show-branch.c:648
+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:650
+msgid "show merges reachable from only one tip"
+msgstr "mostrar fusiones alcanzables solo por una punta"
+
+#: builtin/show-branch.c:652
+msgid "topologically sort, maintaining date order where possible"
+msgstr "orden topológico, manteniendo el orden de fechas donde sea posible"
+
+#: builtin/show-branch.c:655
+msgid "<n>[,<base>]"
+msgstr "<n>[,<base>]"
+
+#: builtin/show-branch.c:656
+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:690
+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:714
+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:717
+msgid "--reflog option needs one branch name"
+msgstr "opción --reflog necesita un nombre de rama"
+
+#: builtin/show-branch.c:720
+#, 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:724
+#, c-format
+msgid "no such ref %s"
+msgstr "no existe el ref %s"
+
+#: builtin/show-branch.c:808
+#, 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:812
+#, c-format
+msgid "'%s' is not a valid ref."
+msgstr "'%s' no es una ref válida."
+
+#: builtin/show-branch.c:815
+#, c-format
+msgid "cannot find commit %s (%s)"
+msgstr "no se puede encontrar el commit %s (%s)"
+
+#: builtin/show-ref.c:10
+msgid ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<pattern>...]"
+msgstr ""
+"git show-ref [-q | --quiet] [--verify] [--head] [-d | --dereference] [-s | --"
+"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [<patrón>...]"
+
+#: builtin/show-ref.c:11
+msgid "git show-ref --exclude-existing[=<pattern>]"
+msgstr "git show-ref --exclude-existing[=<patrón>]"
+
+#: builtin/show-ref.c:159
+msgid "only show tags (can be combined with heads)"
+msgstr "solo mostrar tags (puede ser combinado con heads)"
+
+#: builtin/show-ref.c:160
+msgid "only show heads (can be combined with tags)"
+msgstr "solo mostrar heads (puede ser combinado con tags)"
+
+#: builtin/show-ref.c:161
+msgid "stricter reference checking, requires exact ref path"
+msgstr "revisar referencias más estrictamente, requiere ruta de ref exacta"
+
+#: builtin/show-ref.c:164 builtin/show-ref.c:166
+msgid "show the HEAD reference, even if it would be filtered out"
+msgstr "mostrar la referencia de HEAD, incluso si se filtrara"
+
+#: builtin/show-ref.c:168
+msgid "dereference tags into object IDs"
+msgstr "tags de deferencia en IDs de objeto"
+
+#: builtin/show-ref.c:170
+msgid "only show SHA1 hash using <n> digits"
+msgstr "solo mostrar hash SHA1 usando <n> dígitos"
+
+#: builtin/show-ref.c:174
+msgid "do not print results to stdout (useful with --verify)"
+msgstr "no mostrar resultados en stdout (útil con --verify)"
+
+#: builtin/show-ref.c:176
+msgid "show refs from stdin that aren't in local repository"
+msgstr "mostrar refs de stdin que no están en el repositorio local"
+
+#: builtin/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:36
+msgid "skip and remove all lines starting with comment character"
+msgstr ""
+"saltar y borrar todas las líneas que comienzan con un carácter de comentario"
+
+#: builtin/stripspace.c:39
+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:34 builtin/submodule--helper.c:1332
+#, c-format
+msgid "No such ref: %s"
+msgstr "No existe ref: %s"
+
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
+#, c-format
+msgid "Expecting a full ref name, got %s"
+msgstr "Se esperaba un nombre de ref completo, se obtuvo %s"
+
+#: builtin/submodule--helper.c:81
+#, c-format
+msgid "cannot strip one component off url '%s'"
+msgstr "no se puede quitar un componente del url '%s'"
+
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
+msgid "alternative anchor for relative paths"
+msgstr "ancho alternativo para rutas relativas"
+
+#: builtin/submodule--helper.c:375
+msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper list [--prefix=<ruta>] [<ruta>...]"
+
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
+#, 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:464
+#, c-format
+msgid ""
+"could not lookup 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:475
+#, 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:479
+#, 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:489
+#, 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:496
+#, 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:518
+msgid "Suppress output for initializing a submodule"
+msgstr "suprime la salida para inicializar un submódulo"
+
+#: builtin/submodule--helper.c:523
+msgid "git submodule--helper init [<path>]"
+msgstr "git submodule--helper init [<ruta>]"
+
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
+#, 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:626
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "No pudo resolver ref de HEAD dentro del submódulo '%s'"
+
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "falló al recursar en el submódulo '%s'"
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "Suprimir output del estado del submódulo "
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Usar el commit guardado en el índice en lugar del guardado en el submódulo "
+"HEAD"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "recursar en submódulos anidados"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<ruta>...]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <ruta>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
+#, c-format
+msgid "submodule '%s' cannot add alternate: %s"
+msgstr "submódulo '%s' no puede agregar alterno: %s"
+
+#: builtin/submodule--helper.c:835
+#, c-format
+msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
+msgstr "Valor '%s' para submodule.alternateErrorStrategy no es reconocido"
+
+#: builtin/submodule--helper.c:842
+#, c-format
+msgid "Value '%s' for submodule.alternateLocation is not recognized"
+msgstr "Valor '%s' para submodule.alternateLocation no es reconocido"
+
+#: builtin/submodule--helper.c:864
+msgid "where the new submodule will be cloned to"
+msgstr "a donde el nuevo submódulo será clonado"
+
+#: builtin/submodule--helper.c:867
+msgid "name of the new submodule"
+msgstr "nombre del nuevo submódulo"
+
+#: builtin/submodule--helper.c:870
+msgid "url where to clone the submodule from"
+msgstr "url de dónde clonar el submódulo"
+
+#: builtin/submodule--helper.c:876
+msgid "depth for shallow clones"
+msgstr "profundidad para clones superficiales"
+
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
+msgid "force cloning progress"
+msgstr "forzar el proceso de clonado"
+
+#: builtin/submodule--helper.c:884
+msgid ""
+"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
+"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
+msgstr ""
+"git submodule--helper clone [--prefix=<ruta>] [--quiet] [--reference "
+"<repositorio>] [--name <nombre>] [--depth <profundidad>] --url <url> --path "
+"<ruta>"
+
+#: builtin/submodule--helper.c:915
+#, c-format
+msgid "clone of '%s' into submodule path '%s' failed"
+msgstr "clon de '%s' en la ruta de submódulo '%s' falló"
+
+#: builtin/submodule--helper.c:930
+#, 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:995
+#, c-format
+msgid "Submodule path '%s' not initialized"
+msgstr "Ruta de submódulo '%s' no inicializada"
+
+#: builtin/submodule--helper.c:999
+msgid "Maybe you want to use 'update --init'?"
+msgstr "Tal vez quiere usar 'update --init'?"
+
+#: builtin/submodule--helper.c:1028
+#, c-format
+msgid "Skipping unmerged submodule %s"
+msgstr "Saltando submódulo %s no fusionado"
+
+#: builtin/submodule--helper.c:1057
+#, c-format
+msgid "Skipping submodule '%s'"
+msgstr "Saltando submódulo '%s'"
+
+#: builtin/submodule--helper.c:1190
+#, c-format
+msgid "Failed to clone '%s'. Retry scheduled"
+msgstr "Falló al clonar '%s'. Reintento programado"
+
+#: builtin/submodule--helper.c:1201
+#, c-format
+msgid "Failed to clone '%s' a second time, aborting"
+msgstr "Falló al clonar '%s' una segunda vez, abortando"
+
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
+msgid "path into the working tree"
+msgstr "ruta hacia el árbol de trabajo"
+
+#: builtin/submodule--helper.c:1234
+msgid "path into the working tree, across nested submodule boundaries"
+msgstr ""
+"ruta hacia el árbol de trabajo, a través de extremos de submódulos anidados"
+
+#: builtin/submodule--helper.c:1238
+msgid "rebase, merge, checkout or none"
+msgstr "rebase, merge, checkout o none"
+
+#: builtin/submodule--helper.c:1242
+msgid "Create a shallow clone truncated to the specified number of revisions"
+msgstr "Crea un clon superficial truncado al número especificado de revisión"
+
+#: builtin/submodule--helper.c:1245
+msgid "parallel jobs"
+msgstr "trabajos paralelos"
+
+#: builtin/submodule--helper.c:1247
+msgid "whether the initial clone should follow the shallow recommendation"
+msgstr "si el clon inicial debe seguir la recomendación superficial"
+
+#: builtin/submodule--helper.c:1248
+msgid "don't print cloning progress"
+msgstr "no mostrar el progreso de clonado"
+
+#: builtin/submodule--helper.c:1255
+msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
+msgstr "git submodule--helper update_clone [--prefix=<ruta>] [<ruta>...]"
+
+#: builtin/submodule--helper.c:1268
+msgid "bad value for update parameter"
+msgstr "mal valor para parámetro update"
+
+#: builtin/submodule--helper.c:1336
+#, c-format
+msgid ""
+"Submodule (%s) branch configured to inherit branch from superproject, but "
+"the superproject is not on any branch"
+msgstr ""
+"Rama de submódulo (%s) configurada para heredar rama del superproyecto, "
+"pero el superproyecto no está en ninguna rama"
+
+#: builtin/submodule--helper.c:1452
+msgid "recurse into submodules"
+msgstr "recurrir a submódulos"
+
+#: builtin/submodule--helper.c:1458
+msgid "git submodule--helper embed-git-dir [<path>...]"
+msgstr "git submodule--helper embed-git-dir [<ruta>...]"
+
+#: builtin/submodule--helper.c:1517
+#, c-format
+msgid "%s doesn't support --super-prefix"
+msgstr "%s no soporta --super-prefix"
+
+#: builtin/submodule--helper.c:1523
+#, c-format
+msgid "'%s' is not a valid submodule--helper subcommand"
+msgstr "'%s' no es un comando submodule--helper valido"
+
+#: builtin/symbolic-ref.c:8
+msgid "git symbolic-ref [<options>] <name> [<ref>]"
+msgstr "git symbolic-ref [<opciones>] <nombre> [<referencia>]"
+
+#: builtin/symbolic-ref.c:9
+msgid "git symbolic-ref -d [-q] <name>"
+msgstr "git symbolic-ref -d [-q] <nombre>"
+
+#: builtin/symbolic-ref.c:40
+msgid "suppress error message for non-symbolic (detached) refs"
+msgstr "suprimir mensajes de error para refs no simbólicos (desacoplados)"
+
+#: builtin/symbolic-ref.c:41
+msgid "delete symbolic ref"
+msgstr "eliminar referencia simbólica"
+
+#: builtin/symbolic-ref.c:42
+msgid "shorten ref output"
+msgstr "salida de referencia más corta"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason"
+msgstr "razón"
+
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
+msgid "reason of the update"
+msgstr "razón de la actualización"
+
+#: builtin/tag.c:24
+msgid ""
+"git tag [-a | -s | -u <key-id>] [-f] [-m <msg> | -F <file>] <tagname> "
+"[<head>]"
+msgstr ""
+"git tag [-a | -s | -u <id-de-clave>] [-f] [-m <mensaje> | -F <archivo>] "
+"<nombre-de-tag> [<head>]"
+
+#: builtin/tag.c:25
+msgid "git tag -d <tagname>..."
+msgstr "git tag -d <nombre-de-tag>..."
+
+#: builtin/tag.c:26
+msgid ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <object>]\n"
+"\t\t[--format=<format>] [--[no-]merged [<commit>]] [<pattern>...]"
+msgstr ""
+"git tag -l [-n[<num>]] [--contains <commit>] [--no-contains <commit>] [--"
+"points-at <objeto>]\n"
+"\t\t[--format=<formato>] [--[no-]merged [<commit>]] [<patrón>...]"
+
+#: builtin/tag.c:28
+msgid "git tag -v [--format=<format>] <tagname>..."
+msgstr "git tag -v [--format=<formato>] <nombre-de-tag>..."
+
+#: builtin/tag.c:86
+#, c-format
+msgid "tag '%s' not found."
+msgstr "tag '%s' no encontrado."
+
+#: builtin/tag.c:102
+#, c-format
+msgid "Deleted tag '%s' (was %s)\n"
+msgstr "Etiqueta '%s' eliminada (era %s)\n"
+
+#: builtin/tag.c:131
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be ignored.\n"
+msgstr ""
+"\n"
+"Escribe un mensaje para la tag:\n"
+" %s\n"
+"Las líneas que comienzan con '%c' serán ignoradas.\n"
+
+#: builtin/tag.c:135
+#, c-format
+msgid ""
+"\n"
+"Write a message for tag:\n"
+" %s\n"
+"Lines starting with '%c' will be kept; you may remove them yourself if you "
+"want to.\n"
+msgstr ""
+"\n"
+"Escribe un mensaje para la tag:\n"
+" %s\n"
+"Las líneas que comienzan con '%c' serán conservadas; puedes eliminarlas por "
+"ti mismo si quieres hacerlo.\n"
+
+#: builtin/tag.c:189
+msgid "unable to sign the tag"
+msgstr "incapaz de firmar tag"
+
+#: builtin/tag.c:191
+msgid "unable to write tag file"
+msgstr "incapaz de escribir el archivo de tag"
+
+#: builtin/tag.c:215
+msgid "bad object type."
+msgstr "tipo de objeto erróneo."
+
+#: builtin/tag.c:261
+msgid "no tag message?"
+msgstr "¿Sin mensaje de tag?"
+
+#: builtin/tag.c:268
+#, 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:376
+msgid "list tag names"
+msgstr "listar nombres de tags"
+
+#: builtin/tag.c:378
+msgid "print <n> lines of each tag message"
+msgstr "imprimir <n> líneas de cada mensaje de tag"
+
+#: builtin/tag.c:380
+msgid "delete tags"
+msgstr "eliminar tags"
+
+#: builtin/tag.c:381
+msgid "verify tags"
+msgstr "verificar tags"
+
+#: builtin/tag.c:383
+msgid "Tag creation options"
+msgstr "Opciones de creación de tags"
+
+#: builtin/tag.c:385
+msgid "annotated tag, needs a message"
+msgstr "tags anotadas necesitan un mensaje"
+
+#: builtin/tag.c:387
+msgid "tag message"
+msgstr "mensaje de tag"
+
+#: builtin/tag.c:389
+msgid "annotated and GPG-signed tag"
+msgstr "tag anotado y firmado con GPG"
+
+#: builtin/tag.c:393
+msgid "use another key to sign the tag"
+msgstr "usar otra clave para firmar el tag"
+
+#: builtin/tag.c:394
+msgid "replace the tag if exists"
+msgstr "remplazar tag si existe"
+
+#: builtin/tag.c:395 builtin/update-ref.c:368
+msgid "create a reflog"
+msgstr "crear un reflog"
+
+#: builtin/tag.c:397
+msgid "Tag listing options"
+msgstr "Opciones de listado de tag"
+
+#: builtin/tag.c:398
+msgid "show tag list in columns"
+msgstr "mostrar lista de tags en columnas"
+
+#: builtin/tag.c:399 builtin/tag.c:401
+msgid "print only tags that contain the commit"
+msgstr "mostrar solo tags que contienen el commit"
+
+#: builtin/tag.c:400 builtin/tag.c:402
+msgid "print only tags that don't contain the commit"
+msgstr "mostrar solo tags que no contienen el commit"
+
+#: builtin/tag.c:403
+msgid "print only tags that are merged"
+msgstr "sólo imprimir las tags que están fusionadas"
+
+#: builtin/tag.c:404
+msgid "print only tags that are not merged"
+msgstr "sólo imprimir las tags que no están fusionadas"
+
+#: builtin/tag.c:409
+msgid "print only tags of the object"
+msgstr "sólo imprimir tags de el objeto"
+
+#: builtin/tag.c:453
+msgid "--column and -n are incompatible"
+msgstr "--column y -n son incompatibles"
+
+#: builtin/tag.c:475
+msgid "-n option is only allowed in list mode"
+msgstr "opción -n solo es permitida en modo lista"
+
+#: builtin/tag.c:477
+msgid "--contains option is only allowed in list mode"
+msgstr "opción --contains solo es permitido en modo lista"
+
+#: builtin/tag.c:479
+msgid "--no-contains option is only allowed in list mode"
+msgstr "opción --no-contains solo es permitida en modo lista"
+
+#: builtin/tag.c:481
+msgid "--points-at option is only allowed in list mode"
+msgstr "opción --points-at solo es permitida en modo lista"
+
+#: builtin/tag.c:483
+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:494
+msgid "only one -F or -m option is allowed."
+msgstr "sólo se permite una de las opciones, -m ó -F."
+
+#: builtin/tag.c:513
+msgid "too many params"
+msgstr "demasiados parámetros"
+
+#: builtin/tag.c:519
+#, c-format
+msgid "'%s' is not a valid tag name."
+msgstr "'%s' no es un nombre de tag válido."
+
+#: builtin/tag.c:524
+#, c-format
+msgid "tag '%s' already exists"
+msgstr "el tag '%s' ya existe"
+
+#: builtin/tag.c:554
+#, c-format
+msgid "Updated tag '%s' (was %s)\n"
+msgstr "Etiqueta '%s' actualizada (era %s)\n"
+
+#: builtin/unpack-objects.c:494
+msgid "Unpacking objects"
+msgstr "Desempaquetando objetos"
+
+#: builtin/update-index.c:82
+#, c-format
+msgid "failed to create directory %s"
+msgstr "fallo al crear directorio %s"
+
+#: builtin/update-index.c:88
+#, c-format
+msgid "failed to stat %s"
+msgstr "fallo al iniciar %s"
+
+#: builtin/update-index.c:98
+#, c-format
+msgid "failed to create file %s"
+msgstr "fallo al crear el archivo %s"
+
+#: builtin/update-index.c:106
+#, c-format
+msgid "failed to delete file %s"
+msgstr "fallo al eliminar el archivo %s"
+
+#: builtin/update-index.c:113 builtin/update-index.c:219
+#, c-format
+msgid "failed to delete directory %s"
+msgstr "fallo al eliminar directorio %s"
+
+#: builtin/update-index.c:138
+#, c-format
+msgid "Testing mtime in '%s' "
+msgstr "Probando mtime en '%s' "
+
+#: 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: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: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: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: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: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:220
+msgid " OK"
+msgstr " OK"
+
+#: builtin/update-index.c:579
+msgid "git update-index [<options>] [--] [<file>...]"
+msgstr "git update-index [<opciones>] [--] [<archivo>...]"
+
+#: builtin/update-index.c:936
+msgid "continue refresh even when index needs update"
+msgstr ""
+"continuar refresh (Actualización) incluso cuando el índice necesita "
+"actualización"
+
+#: builtin/update-index.c:939
+msgid "refresh: ignore submodules"
+msgstr "refresh: ignora submódulos"
+
+#: builtin/update-index.c:942
+msgid "do not ignore new files"
+msgstr "no ignorar archivos nuevos"
+
+#: builtin/update-index.c:944
+msgid "let files replace directories and vice-versa"
+msgstr "permitir que archivos remplacen directorios y vice-versa"
+
+#: builtin/update-index.c:946
+msgid "notice files missing from worktree"
+msgstr "avisar de archivos faltando en el árbol de trabajo"
+
+#: builtin/update-index.c:948
+msgid "refresh even if index contains unmerged entries"
+msgstr "ejecutar refresh incluso si el índice contiene entradas sin cambios"
+
+#: builtin/update-index.c:951
+msgid "refresh stat information"
+msgstr "refresh información de estado"
+
+#: builtin/update-index.c:955
+msgid "like --refresh, but ignore assume-unchanged setting"
+msgstr "como --refresh, pero ignora configuración assume-unchanged"
+
+#: builtin/update-index.c:959
+msgid "<mode>,<object>,<path>"
+msgstr "<modo>,<objeto>,<ruta>"
+
+#: builtin/update-index.c:960
+msgid "add the specified entry to the index"
+msgstr "agregar la entrada especificada al índice"
+
+#: builtin/update-index.c:969
+msgid "mark files as \"not changing\""
+msgstr "marcar archivos como \"not changing\""
+
+#: builtin/update-index.c:972
+msgid "clear assumed-unchanged bit"
+msgstr "limpiar bit assumed-unchanged"
+
+#: builtin/update-index.c:975
+msgid "mark files as \"index-only\""
+msgstr "marcar archivos como \"index-only\""
+
+#: builtin/update-index.c:978
+msgid "clear skip-worktree bit"
+msgstr "limpiar bit skip-worktree"
+
+#: builtin/update-index.c:981
+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:983
+msgid "remove named paths even if present in worktree"
+msgstr ""
+"remover rutas nombradas incluso si están presentes en el árbol de trabajo"
+
+#: builtin/update-index.c:985
+msgid "with --stdin: input lines are terminated by null bytes"
+msgstr "con --stdin: las lineas de entrada son terminadas con bytes nulos"
+
+#: builtin/update-index.c:987
+msgid "read list of paths to be updated from standard input"
+msgstr "leer la lista de rutas para ser actualizada desde standard input"
+
+#: builtin/update-index.c:991
+msgid "add entries from standard input to the index"
+msgstr "agregar entradas de standard input al índice"
+
+#: builtin/update-index.c:995
+msgid "repopulate stages #2 and #3 for the listed paths"
+msgstr "repoblar stages #2 y #3 para las rutas listadas"
+
+#: builtin/update-index.c:999
+msgid "only update entries that differ from HEAD"
+msgstr "solo actualizar entradas que difieren de HEAD"
+
+#: builtin/update-index.c:1003
+msgid "ignore files missing from worktree"
+msgstr "ignorar archivos faltantes en el árbol de trabajo"
+
+#: builtin/update-index.c:1006
+msgid "report actions to standard output"
+msgstr "reportar acciones por standard output"
+
+#: builtin/update-index.c:1008
+msgid "(for porcelains) forget saved unresolved conflicts"
+msgstr "(para porcelanas) olvidar conflictos sin resolver guardados"
+
+#: builtin/update-index.c:1012
+msgid "write index in this format"
+msgstr "escribir índice en este formato"
+
+#: builtin/update-index.c:1014
+msgid "enable or disable split index"
+msgstr "activar o desactivar índice dividido"
+
+#: builtin/update-index.c:1016
+msgid "enable/disable untracked cache"
+msgstr "habilitar o deshabilitar caché no rastreado"
+
+#: builtin/update-index.c:1018
+msgid "test if the filesystem supports untracked cache"
+msgstr "probar si el filesystem soporta caché no rastreado"
+
+#: builtin/update-index.c:1020
+msgid "enable untracked cache without testing the filesystem"
+msgstr "habilitar caché no rastreado sin probar el filesystem"
+
+#: builtin/update-index.c:1022
+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:1024
+msgid "enable or disable file system monitor"
+msgstr "activar o desactivar monitor de sistema de archivos"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "marcar archivos como válidos para fsmonitor"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "limpia el bit de validación fsmonitor"
+
+#: builtin/update-index.c:1127
+msgid ""
+"core.splitIndex is set to false; remove or change it, if you really want to "
+"enable split index"
+msgstr ""
+"core.splitIndex está configurado en false; remuévelo o cámbialo, si "
+"realmente quieres habilitar el índice partido"
+
+#: builtin/update-index.c:1136
+msgid ""
+"core.splitIndex is set to true; remove or change it, if you really want to "
+"disable split index"
+msgstr ""
+"core.splitIndex está configurado en true; remuévelo o cámbialo, si realmente "
+"quieres deshabilitar el índice partido"
+
+#: builtin/update-index.c:1147
+msgid ""
+"core.untrackedCache is set to true; remove or change it, if you really want "
+"to disable the untracked cache"
+msgstr ""
+"core.untrackedCache está configurado en true; remuévelo o cámbialo, si "
+"realmente quieres deshabilitar el chaché no rastreado"
+
+#: builtin/update-index.c:1151
+msgid "Untracked cache disabled"
+msgstr "Caché no rastreado deshabilitado"
+
+#: builtin/update-index.c:1159
+msgid ""
+"core.untrackedCache is set to false; remove or change it, if you really want "
+"to enable the untracked cache"
+msgstr ""
+"core.untrackedCache está configurado en false; remuévelo o cámbialo, si "
+"realmente quieres habilitar el caché no rastreado"
+
+#: builtin/update-index.c:1163
+#, c-format
+msgid "Untracked cache enabled for '%s'"
+msgstr "Caché no rastreado habilitado para '%s'"
+
+#: builtin/update-index.c:1171
+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:1175
+msgid "fsmonitor enabled"
+msgstr "fsmonitor activado"
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor está configurado; remuévelo si realmente quieres deshabilitar "
+"el fsmonitor"
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr "fsmonitor desactivado"
+
+#: builtin/update-ref.c:10
+msgid "git update-ref [<options>] -d <refname> [<old-val>]"
+msgstr "git update-ref [<opciones>] -d <nombre-referencia> [<valor-anterior>]"
+
+#: builtin/update-ref.c:11
+msgid "git update-ref [<options>] <refname> <new-val> [<old-val>]"
+msgstr ""
+"git update-ref [<opciones>] <nombre-referencia> <valor-nuevo> [<valor-"
+"anterior>]"
+
+#: builtin/update-ref.c:12
+msgid "git update-ref [<options>] --stdin [-z]"
+msgstr "git update-ref [<opciones>] --stdin [-z]"
+
+#: builtin/update-ref.c:363
+msgid "delete the reference"
+msgstr "eliminar la referencia"
+
+#: builtin/update-ref.c:365
+msgid "update <refname> not the one it points to"
+msgstr "actualiza <refname> no a lo que apunta"
+
+#: builtin/update-ref.c:366
+msgid "stdin has NUL-terminated arguments"
+msgstr "stdin tiene argumentos terminados en NUL"
+
+#: builtin/update-ref.c:367
+msgid "read updates from stdin"
+msgstr "lee actualizaciones 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 "actualiza los archivos info desde cero"
+
+#: builtin/verify-commit.c:18
+msgid "git verify-commit [-v | --verbose] <commit>..."
+msgstr "git verify-commit [-v | --verbose] <commit>..."
+
+#: builtin/verify-commit.c:73
+msgid "print commit contents"
+msgstr "imprimir contenido del commit"
+
+#: builtin/verify-commit.c:74 builtin/verify-tag.c:38
+msgid "print raw gpg status output"
+msgstr "muestra la salida de status gpg en formato raw"
+
+#: builtin/verify-pack.c:55
+msgid "git verify-pack [-v | --verbose] [-s | --stat-only] <pack>..."
+msgstr "git verify-pack [-v | --verbose] [-s | --stat-only] <paquete>..."
+
+#: builtin/verify-pack.c:65
+msgid "verbose"
+msgstr "verboso"
+
+#: builtin/verify-pack.c:67
+msgid "show statistics only"
+msgstr "solo mostrar estadísticas"
+
+#: builtin/verify-tag.c:19
+msgid "git verify-tag [-v | --verbose] [--format=<format>] <tag>..."
+msgstr "git verify-tag [-v | --verbose] [--format=<formato>] <tag>..."
+
+#: builtin/verify-tag.c:37
+msgid "print tag contents"
+msgstr "imprimir contenido del tag"
+
+#: builtin/worktree.c:17
+msgid "git worktree add [<options>] <path> [<branch>]"
+msgstr "git worktree add [<opciones>] <ruta> [<rama>]"
+
+#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<opciones>]"
+
+#: builtin/worktree.c:19
+msgid "git worktree lock [<options>] <path>"
+msgstr "git worktree lock [<opciones>] <ruta>"
+
+#: builtin/worktree.c:20
+msgid "git worktree prune [<options>]"
+msgstr "git worktree prune [<opciones>]"
+
+#: builtin/worktree.c:21
+msgid "git worktree unlock <path>"
+msgstr "git worktree unlock <ruta>"
+
+#: builtin/worktree.c:58
+#, c-format
+msgid "Removing worktrees/%s: not a valid directory"
+msgstr "Removiendo el worktrees/%s: no es un directorio válido"
+
+#: builtin/worktree.c:64
+#, c-format
+msgid "Removing worktrees/%s: gitdir file does not exist"
+msgstr "Removiendo worktrees/%s: archivo gitdir no existe"
+
+#: builtin/worktree.c:69 builtin/worktree.c:78
+#, c-format
+msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
+msgstr "Removiendo worktrees/%s: no es posible leer el archivo gitdir (%s)"
+
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Removiendo árboles de trabajo/%s: lectura corta (se esperan %<PRIuMAX> "
+"bytes, %<PRIuMAX> leídos)"
+
+#: builtin/worktree.c:96
+#, c-format
+msgid "Removing worktrees/%s: invalid gitdir file"
+msgstr "Removiendo worktrees/%s: archivo gitdir inválido"
+
+#: builtin/worktree.c:112
+#, c-format
+msgid "Removing worktrees/%s: gitdir file points to non-existent location"
+msgstr ""
+"Removiendo worktrees/%s: archivo gitdir apunta a una ubicación no existente"
+
+#: builtin/worktree.c:159
+msgid "report pruned working trees"
+msgstr "reporta árboles de trabajo recortados"
+
+#: builtin/worktree.c:161
+msgid "expire working trees older than <time>"
+msgstr "expirar árboles de trabajo más viejos a <tiempo>"
+
+#: builtin/worktree.c:236
+#, c-format
+msgid "'%s' already exists"
+msgstr "'%s' ya existe"
+
+#: builtin/worktree.c:267
+#, c-format
+msgid "could not create directory of '%s'"
+msgstr "no se pudo crear directorio de '%s'"
+
+#: builtin/worktree.c:306
+#, c-format
+msgid "Preparing %s (identifier %s)"
+msgstr "Preparando %s (identificador %s)"
+
+#: builtin/worktree.c:368
+msgid "checkout <branch> even if already checked out in other worktree"
+msgstr ""
+"hacer checkout a <rama> incluso si ya ha hecho checkout en otro árbol de "
+"trabajo"
+
+#: builtin/worktree.c:370
+msgid "create a new branch"
+msgstr "crear una nueva rama"
+
+#: builtin/worktree.c:372
+msgid "create or reset a branch"
+msgstr "crear o restablecer una rama"
+
+#: builtin/worktree.c:374
+msgid "populate the new working tree"
+msgstr "popular el nuevo árbol de trabajo"
+
+#: builtin/worktree.c:375
+msgid "keep the new working tree locked"
+msgstr "mantener el nuevo árbol de trabajo bloqueado"
+
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "configurando modo tracking (mirar git-branch(1))"
+
+#: builtin/worktree.c:380
+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:388
+msgid "-b, -B, and --detach are mutually exclusive"
+msgstr "-b, -B, y --detach son mutuamente exclusivas"
+
+#: builtin/worktree.c:453
+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:553
+msgid "reason for locking"
+msgstr "razón para bloquear"
+
+#: builtin/worktree.c:565 builtin/worktree.c:598
+#, c-format
+msgid "'%s' is not a working tree"
+msgstr "'%s' no es un árbol de trabajo"
+
+#: builtin/worktree.c:567 builtin/worktree.c:600
+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:572
+#, c-format
+msgid "'%s' is already locked, reason: %s"
+msgstr "'%s' ya está bloqueado; razón: %s"
+
+#: builtin/worktree.c:574
+#, c-format
+msgid "'%s' is already locked"
+msgstr "'%s' ya está bloqueado"
+
+#: builtin/worktree.c:602
+#, c-format
+msgid "'%s' is not locked"
+msgstr "'%s' no está bloqueado"
+
+#: builtin/write-tree.c:14
+msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]"
+msgstr "git write-tree [--missing-ok] [--prefix=<prefijo>/]"
+
+#: builtin/write-tree.c:27
+msgid "<prefix>/"
+msgstr "<prefijo>/"
+
+#: builtin/write-tree.c:28
+msgid "write tree object for a subdirectory <prefix>"
+msgstr "escribir objeto de árbol para un subdirectorio <prefijo>"
+
+#: builtin/write-tree.c:31
+msgid "only useful for debugging"
+msgstr "sólo útil para depurar"
+
+#: upload-pack.c:24
+msgid "git upload-pack [<options>] <dir>"
+msgstr "git upload-pack [<opciones>] <directorio>"
+
+#: upload-pack.c:1041
+msgid "quit after a single request/response exchange"
+msgstr "sale después de un intercambio petición/respuesta único"
+
+#: upload-pack.c:1043
+msgid "exit immediately after initial ref advertisement"
+msgstr "salir inmediatamente tras el anuncio inicial de ref"
+
+#: upload-pack.c:1045
+msgid "do not try <directory>/.git/ if <directory> is no Git directory"
+msgstr "no intente <directorio>/.git/ si <directorio> no es un directorio Git"
+
+#: upload-pack.c:1047
+msgid "interrupt transfer after <n> seconds of inactivity"
+msgstr "interrumpir transferencia tras <n> segundos de inactividad"
+
+#: credential-cache--daemon.c:222
+#, c-format
+msgid ""
+"The permissions on your socket directory are too loose; other\n"
+"users may be able to read your cached credentials. Consider running:\n"
+"\n"
+"\tchmod 0700 %s"
+msgstr ""
+"Los permisos en su directorio de socket son demasiado flojos; otros\n"
+"usuarios pueden leer sus credenciales almacenadas en caché. Considere "
+"ejecutar:\n"
+"\n"
+"\tchmod 0700 %s"
+
+#: credential-cache--daemon.c:271
+msgid "print debugging messages to stderr"
+msgstr "mostrar mensajes de debug en stderr"
+
+#: git.c:15
+msgid ""
+"'git help -a' and 'git help -g' list available subcommands and some\n"
+"concept guides. See 'git help <command>' or 'git help <concept>'\n"
+"to read about a specific subcommand or concept."
+msgstr ""
+"'git help -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"
+"para leer sobre un subcomando o concepto específico."
+
+#: http.c:339
+#, c-format
+msgid "negative value for http.postbuffer; defaulting to %d"
+msgstr "valor negativo para http.postbuffer; poniendo el default a %d"
+
+#: http.c:360
+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:369
+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:1791
+#, c-format
+msgid ""
+"unable to update url base from redirection:\n"
+" asked for: %s\n"
+" redirect: %s"
+msgstr ""
+"no puede actualizar la base de url de la redirección:\n"
+" preguntaba por: %s\n"
+" redireccionamiento: %s"
+
+#: remote-curl.c:324
+#, c-format
+msgid "redirecting to %s"
+msgstr "redirigiendo a %s"
+
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "args"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "filtrado de objeto"
+
+#: common-cmds.h:9
+msgid "start a working area (see also: git help tutorial)"
+msgstr "comienza un área de trabajo (ver también: git help tutorial)"
+
+#: common-cmds.h:10
+msgid "work on the current change (see also: git help everyday)"
+msgstr "trabaja en los cambios actuales (ver también: git help everyday)"
+
+#: common-cmds.h:11
+msgid "examine the history and state (see also: git help revisions)"
+msgstr "examina el historial y el estado (ver también: git help revisions)"
+
+#: common-cmds.h:12
+msgid "grow, mark and tweak your common history"
+msgstr "crece, marca y ajusta tu historial comun"
+
+#: common-cmds.h:13
+msgid "collaborate (see also: git help workflows)"
+msgstr "colabora (mira también: git help workflows)"
+
+#: common-cmds.h:17
+msgid "Add file contents to the index"
+msgstr "Agrega contenido de carpetas al indice"
+
+#: common-cmds.h:18
+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"
+
+#: common-cmds.h:19
+msgid "List, create, or delete branches"
+msgstr "Lista, crea, o borra ramas"
+
+#: common-cmds.h:20
+msgid "Switch branches or restore working tree files"
+msgstr "Cambia ramas o restaura los archivos de tu árbol de trabajo"
+
+#: common-cmds.h:21
+msgid "Clone a repository into a new directory"
+msgstr "Clona un repositorio dentro de un nuevo directorio"
+
+#: common-cmds.h:22
+msgid "Record changes to the repository"
+msgstr "Graba los cambios en tu repositorio"
+
+#: common-cmds.h:23
+msgid "Show changes between commits, commit and working tree, etc"
+msgstr "Muestra los cambios entre commits, commit y árbol de trabajo, etc"
+
+#: common-cmds.h:24
+msgid "Download objects and refs from another repository"
+msgstr "Descarga objetos y referencias de otro repositorio"
+
+#: common-cmds.h:25
+msgid "Print lines matching a pattern"
+msgstr "Imprime las líneas que concuerdan con el patron"
+
+#: common-cmds.h:26
+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"
+
+#: common-cmds.h:27
+msgid "Show commit logs"
+msgstr "Muestra los logs de los commits"
+
+#: common-cmds.h:28
+msgid "Join two or more development histories together"
+msgstr "Junta dos o mas historiales de desarrollo juntos"
+
+#: common-cmds.h:29
+msgid "Move or rename a file, a directory, or a symlink"
+msgstr "Mueve o cambia el nombre a archivos, directorios o enlaces simbolicos"
+
+#: common-cmds.h:30
+msgid "Fetch from and integrate with another repository or a local branch"
+msgstr "Realiza un fetch e integra con otro repositorio o rama local"
+
+#: common-cmds.h:31
+msgid "Update remote refs along with associated objects"
+msgstr "Actualiza referencias remotas junto con sus objetos asociados"
+
+#: common-cmds.h:32
+msgid "Reapply commits on top of another base tip"
+msgstr "Vuelve a aplicar commits en la punta de otra rama"
+
+#: common-cmds.h:33
+msgid "Reset current HEAD to the specified state"
+msgstr "Reinicia el HEAD actual a un estado especifico"
+
+#: common-cmds.h:34
+msgid "Remove files from the working tree and from the index"
+msgstr "Borra archivos del árbol de trabajo y del indice"
+
+#: common-cmds.h:35
+msgid "Show various types of objects"
+msgstr "Muestra varios tipos de objetos"
+
+#: common-cmds.h:36
+msgid "Show the working tree status"
+msgstr "Muestra el estado del árbol de trabajo"
+
+#: common-cmds.h:37
+msgid "Create, list, delete or verify a tag object signed with GPG"
+msgstr "Crea, lista, borra o verifica un tag de objeto firmado con GPG"
+
+#: parse-options.h:145
+msgid "expiry-date"
+msgstr "fecha de expiración"
+
+#: parse-options.h:160
+msgid "no-op (backward compatibility)"
+msgstr "no-op (compatibilidad con versiones anteriores)"
+
+#: parse-options.h:238
+msgid "be more verbose"
+msgstr "ser mas verboso"
+
+#: parse-options.h:240
+msgid "be more quiet"
+msgstr "ser mas discreto"
+
+#: parse-options.h:246
+msgid "use <n> digits to display SHA-1s"
+msgstr "usa <n> digitos para mostrar SHA-1s"
+
+#: rerere.h:40
+msgid "update the index with reused conflict resolution if possible"
+msgstr ""
+"actualizar el índice con la resolución de conflictos reutilizada si es "
+"posible"
+
+#: git-bisect.sh:54
+msgid "You need to start by \"git bisect start\""
+msgstr "Debes iniciar con \"git bisect start\""
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:60
+msgid "Do you want me to do it for you [Y/n]? "
+msgstr "¿Quieres que lo haga por ti [Y/n]?"
+
+#: git-bisect.sh:121
+#, sh-format
+msgid "unrecognised option: '$arg'"
+msgstr "opción no reconocida: '$arg'"
+
+#: git-bisect.sh:125
+#, sh-format
+msgid "'$arg' does not appear to be a valid revision"
+msgstr "'$arg' no parece ser una revisión válida"
+
+#: git-bisect.sh:154
+msgid "Bad HEAD - I need a HEAD"
+msgstr "Mal HEAD - Necesito un HEAD"
+
+#: git-bisect.sh:167
+#, sh-format
+msgid ""
+"Checking out '$start_head' failed. Try 'git bisect reset <valid-branch>'."
+msgstr ""
+"Error al comprobar '$start_head'. Intente 'git bisect reset <rama-válida>'."
+
+#: git-bisect.sh:177
+msgid "won't bisect on cg-seek'ed tree"
+msgstr "no se bisectará en un árbol con cg-seek"
+
+#: git-bisect.sh:181
+msgid "Bad HEAD - strange symbolic ref"
+msgstr "Mal HEAD - ref simbólico extraño"
+
+#: git-bisect.sh:233
+#, sh-format
+msgid "Bad bisect_write argument: $state"
+msgstr "Mal argumento bisect_write: $state"
+
+#: git-bisect.sh:246
+#, sh-format
+msgid "Bad rev input: $arg"
+msgstr "Mala entrada rev: $arg"
+
+#: git-bisect.sh:265
+#, sh-format
+msgid "Bad rev input: $bisected_head"
+msgstr "Mala entrada rev: $bisected_head"
+
+#: git-bisect.sh:274
+#, sh-format
+msgid "Bad rev input: $rev"
+msgstr "Mala entrada rev: $rev"
+
+#: git-bisect.sh:283
+#, sh-format
+msgid "'git bisect $TERM_BAD' can take only one argument."
+msgstr "'git bisect $TERM_BAD' solo puede tomar un argumento."
+
+#: git-bisect.sh:306
+#, sh-format
+msgid "Warning: bisecting only with a $TERM_BAD commit."
+msgstr "Peligro: bisectando solo con un $TERM_BAD commit."
+
+#. TRANSLATORS: Make sure to include [Y] and [n] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-bisect.sh:312
+msgid "Are you sure [Y/n]? "
+msgstr "¿Estás seguro [Y/n]?"
+
+#: git-bisect.sh:324
+#, sh-format
+msgid ""
+"You need to give me at least one $bad_syn and one $good_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"Tiene que dar al menos un $bad_syn y un $good_syn revision.\n"
+"(Puede ver \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)"
+
+#: git-bisect.sh:327
+#, sh-format
+msgid ""
+"You need to start by \"git bisect start\".\n"
+"You then need to give me at least one $good_syn and one $bad_syn revision.\n"
+"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
+msgstr ""
+"Tiene que comenzar por \"git bisect start\".\n"
+"Después tiene que entregar al menos un $good_syn y un $bad_syn revision.\n"
+"(Puede usar \"git bisect $bad_syn\" y \"git bisect $good_syn\" para eso.)"
+
+#: git-bisect.sh:398 git-bisect.sh:512
+msgid "We are not bisecting."
+msgstr "No estamos bisectando."
+
+#: git-bisect.sh:405
+#, sh-format
+msgid "'$invalid' is not a valid commit"
+msgstr "'$invalid' no es un commit válido"
+
+#: git-bisect.sh:414
+#, sh-format
+msgid ""
+"Could not check out original HEAD '$branch'.\n"
+"Try 'git bisect reset <commit>'."
+msgstr ""
+"No se pudo revisar el HEAD original '$branch'.\n"
+"Intente 'git bisect reset <commit>'."
+
+#: git-bisect.sh:422
+msgid "No logfile given"
+msgstr "Ningún logfile proporcionado"
+
+#: git-bisect.sh:423
+#, sh-format
+msgid "cannot read $file for replaying"
+msgstr "no se puede leer $file para reproducir"
+
+#: git-bisect.sh:444
+msgid "?? what are you talking about?"
+msgstr "?? ¿De qué estás hablando?"
+
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "bisect falló: no se proveyó comando"
+
+#: git-bisect.sh:458
+#, sh-format
+msgid "running $command"
+msgstr "ejecutando $command"
+
+#: git-bisect.sh:465
+#, 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:491
+msgid "bisect run cannot continue any more"
+msgstr "bisect no puede seguir continuando"
+
+#: git-bisect.sh:497
+#, sh-format
+msgid ""
+"bisect run failed:\n"
+"'bisect_state $state' exited with error code $res"
+msgstr ""
+"bisect falló:\n"
+"'bisect_state $state' salió con código de error $res"
+
+#: git-bisect.sh:504
+msgid "bisect run success"
+msgstr "bisect exitoso"
+
+#: git-bisect.sh:533
+#, sh-format
+msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
+msgstr ""
+"Comando inválido: actualmente se encuentra en un bisect $TERM_BAD/$TERM_GOOD"
+
+#: git-bisect.sh:567
+msgid "no terms defined"
+msgstr "no hay términos definidos"
+
+#: git-bisect.sh:584
+#, sh-format
+msgid ""
+"invalid argument $arg for 'git bisect terms'.\n"
+"Supported options are: --term-good|--term-old and --term-bad|--term-new."
+msgstr ""
+"argumento inválido $arg para 'git bisect terms'.\n"
+"Las opciones soportadas son: --term-good|--term-old and --term-bad|--term-"
+"new."
+
+#: git-merge-octopus.sh:46
+msgid ""
+"Error: Your local changes to the following files would be overwritten by "
+"merge"
+msgstr ""
+"Error: Sus cambios locales de los siguientes archivos serán sobrescritos por "
+"la fusión"
+
+#: git-merge-octopus.sh:61
+msgid "Automated merge did not work."
+msgstr "Fusión automatizada no funcionó."
+
+#: git-merge-octopus.sh:62
+msgid "Should not be doing an octopus."
+msgstr "No debería hacer un pulpo"
+
+#: git-merge-octopus.sh:73
+#, sh-format
+msgid "Unable to find common commit with $pretty_name"
+msgstr "No es posible encontrar commit común con $pretty_name"
+
+#: git-merge-octopus.sh:77
+#, sh-format
+msgid "Already up to date with $pretty_name"
+msgstr "Ya actualizado con $pretty_name"
+
+#: git-merge-octopus.sh:89
+#, sh-format
+msgid "Fast-forwarding to: $pretty_name"
+msgstr "Realizando fast-forward a: $pretty_name"
+
+#: git-merge-octopus.sh:97
+#, sh-format
+msgid "Trying simple merge with $pretty_name"
+msgstr "Intentando fusión simple con $pretty_name"
+
+#: git-merge-octopus.sh:102
+msgid "Simple merge did not work, trying automatic merge."
+msgstr "Fusión simple no funcionó, intentando fusión automática."
+
+#: git-rebase.sh:58
+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 ""
+"Resuelva todos los conflictos manualmente ya sea con \n"
+"\"git add/rm <archivo_conflictivo>\", luego ejecute \"git rebase --continue"
+"\".\n"
+"Si prefiere saltar este parche, ejecute \"git rebase --skip\" .\n"
+"Para abortar y regresar al estado previo al \"git rebase\", ejecute \"git "
+"rebase --abort\"."
+
+#: git-rebase.sh:160 git-rebase.sh:402
+#, sh-format
+msgid "Could not move back to $head_name"
+msgstr "No se puede regresar a $head_name"
+
+#: git-rebase.sh:171
+msgid "Applied autostash."
+msgstr "Autostash aplicado."
+
+#: git-rebase.sh:174
+#, sh-format
+msgid "Cannot store $stash_sha1"
+msgstr "No se puede almacenar $stash_sha1"
+
+#: git-rebase.sh:214
+msgid "The pre-rebase hook refused to rebase."
+msgstr "El hook pre-rebase rechazó el rebase."
+
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Parece que 'git am' está en progreso. No se puede rebasar."
+
+#: git-rebase.sh:363
+msgid "No rebase in progress?"
+msgstr "No hay rebase en progreso?"
+
+#: git-rebase.sh:374
+msgid "The --edit-todo action can only be used during interactive rebase."
+msgstr ""
+"La acción --edit-todo sólo puede ser usada al rebasar interactivamente."
+
+#: git-rebase.sh:381
+msgid "Cannot read HEAD"
+msgstr "No se puede leer el HEAD"
+
+#: git-rebase.sh:384
+msgid ""
+"You must edit all merge conflicts and then\n"
+"mark them as resolved using git add"
+msgstr ""
+"Tienes que editar todos los conflictos de fusion y luego\n"
+"marcarlos como resueltos usando git add"
+
+#: git-rebase.sh:424
+#, sh-format
+msgid ""
+"It seems that there is already a $state_dir_base directory, and\n"
+"I wonder if you are in the middle of another rebase. If that is the\n"
+"case, please try\n"
+"\t$cmd_live_rebase\n"
+"If that is not the case, please\n"
+"\t$cmd_clear_stale_rebase\n"
+"and run me again. I am stopping in case you still have something\n"
+"valuable there."
+msgstr ""
+"Parece que ya hay un directorio $state_dir_base, y\n"
+"me pregunto si está en medio de otro rebase. Si ese es el \n"
+"caso, por favor intente\n"
+"\t$cmd_live_rebase\n"
+"Si no es el caso, por favor\n"
+"\t$cmd_clear_stale_rebase\n"
+"y ejecúteme nuevamente. Me estoy deteniendo en caso de que tenga\n"
+"algo de valor ahí."
+
+#: git-rebase.sh:480
+#, sh-format
+msgid "invalid upstream '$upstream_name'"
+msgstr "upstream inválido '$upstream_name'"
+
+#: git-rebase.sh:504
+#, sh-format
+msgid "$onto_name: there are more than one merge bases"
+msgstr "$onto_name: hay más de una base de fusión"
+
+#: git-rebase.sh:507 git-rebase.sh:511
+#, sh-format
+msgid "$onto_name: there is no merge base"
+msgstr "$onto_name: no hay base de fusión"
+
+#: git-rebase.sh:516
+#, sh-format
+msgid "Does not point to a valid commit: $onto_name"
+msgstr "No apunta a un commit válido: $onto_name"
+
+#: git-rebase.sh:542
+#, sh-format
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "fatal: no existe la rama/commit: '$branch_name'"
+
+#: git-rebase.sh:575
+msgid "Cannot autostash"
+msgstr "No se puede ejecutar autostash"
+
+#: git-rebase.sh:580
+#, sh-format
+msgid "Created autostash: $stash_abbrev"
+msgstr "Autostash creado: $stash_abbrev"
+
+#: git-rebase.sh:584
+msgid "Please commit or stash them."
+msgstr "Por favor, confírmalos o salvaguárdalos."
+
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD está actualizado"
+
+#: git-rebase.sh:609
+#, sh-format
+msgid "Current branch $branch_name is up to date."
+msgstr "La rama actual $branch_name está actualizada."
+
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD está actualizado, rebase forzado."
+
+#: git-rebase.sh:619
+#, sh-format
+msgid "Current branch $branch_name is up to date, rebase forced."
+msgstr "Rama actual $branch_name está actualizada, rebase forzado."
+
+#: git-rebase.sh:631
+#, sh-format
+msgid "Changes from $mb to $onto:"
+msgstr "Cambios desde $mb a $onto:"
+
+#: git-rebase.sh:640
+msgid "First, rewinding head to replay your work on top of it..."
+msgstr ""
+"Primero, rebobinando head para reproducir tu trabajo en la cima de él..."
+
+#: git-rebase.sh:650
+#, sh-format
+msgid "Fast-forwarded $branch_name to $onto_name."
+msgstr "Avance rápido de $branch_name a $onto_name."
+
+#: git-stash.sh:61
+msgid "git stash clear with parameters is unimplemented"
+msgstr "git stash clear con parámetros no está implementado"
+
+#: git-stash.sh:108
+msgid "You do not have the initial commit yet"
+msgstr "Aún no tienes un commit inicial."
+
+#: git-stash.sh:123
+msgid "Cannot save the current index state"
+msgstr "No se puede guardar el estado actual del índice"
+
+#: git-stash.sh:138
+msgid "Cannot save the untracked files"
+msgstr "No se pueden guardar los archivos no rastreados"
+
+#: git-stash.sh:158 git-stash.sh:171
+msgid "Cannot save the current worktree state"
+msgstr "No se puede guardar el estado actual del árbol de trabajo"
+
+#: git-stash.sh:175
+msgid "No changes selected"
+msgstr "Sin cambios seleccionados"
+
+#: git-stash.sh:178
+msgid "Cannot remove temporary index (can't happen)"
+msgstr "No se puede remover el índice temporal (no puede suceder)"
+
+#: git-stash.sh:191
+msgid "Cannot record working tree state"
+msgstr "No se puede grabar el estado del árbol de trabajo"
+
+#: git-stash.sh:229
+#, sh-format
+msgid "Cannot update $ref_stash with $w_commit"
+msgstr "No se puede actualizar $ref_stash con $w_commit"
+
+#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "error: opción desconocida para 'stash pus': $option"
+
+#: git-stash.sh:295
+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"
+
+#: git-stash.sh:303
+msgid "No local changes to save"
+msgstr "No hay cambios locales para guardar"
+
+#: git-stash.sh:308
+msgid "Cannot initialize stash"
+msgstr "No se puede inicializar stash"
+
+#: git-stash.sh:312
+msgid "Cannot save the current status"
+msgstr "No se puede guardar el estado actual"
+
+#: git-stash.sh:313
+#, sh-format
+msgid "Saved working directory and index state $stash_msg"
+msgstr "Directorio de trabajo guardado y estado de índice $stash_msg"
+
+#: git-stash.sh:341
+msgid "Cannot remove worktree changes"
+msgstr "No se pueden remover cambios del árbol de trabajo"
+
+#: git-stash.sh:489
+#, sh-format
+msgid "unknown option: $opt"
+msgstr "opción desconocida: $opt"
+
+#: git-stash.sh:502
+msgid "No stash entries found."
+msgstr "No se encontraron entradas de stash."
+
+#: git-stash.sh:509
+#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr "Se especificaron demasiadas revisiones: $REV"
+
+#: git-stash.sh:524
+#, sh-format
+msgid "$reference is not a valid reference"
+msgstr "$reference no es una referencia válida"
+
+#: git-stash.sh:552
+#, sh-format
+msgid "'$args' is not a stash-like commit"
+msgstr "'$args' no es un commit estilo stash"
+
+#: git-stash.sh:563
+#, sh-format
+msgid "'$args' is not a stash reference"
+msgstr "'$args' no es una referencia stash"
+
+#: git-stash.sh:571
+msgid "unable to refresh index"
+msgstr "incapaz de refrescar el índice"
+
+#: git-stash.sh:575
+msgid "Cannot apply a stash in the middle of a merge"
+msgstr "No se puede aplicar un stash en medio de una fusión"
+
+#: git-stash.sh:583
+msgid "Conflicts in index. Try without --index."
+msgstr "Conflictos en índice. Intente sin --index."
+
+#: git-stash.sh:585
+msgid "Could not save index tree"
+msgstr "No se puede guardar el índice del árbol"
+
+#: git-stash.sh:594
+msgid "Could not restore untracked files from stash entry"
+msgstr "No se pueden restaurar archivos no rastreados de la entrada stash"
+
+#: git-stash.sh:619
+msgid "Cannot unstage modified files"
+msgstr "No se puede sacar de stage archivos modificados"
+
+#: git-stash.sh:634
+msgid "Index was not unstashed."
+msgstr "El índice no fue sacado de stash."
+
+#: git-stash.sh:648
+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."
+
+#: git-stash.sh:657
+#, sh-format
+msgid "Dropped ${REV} ($s)"
+msgstr "Botado ${REV} ($s)"
+
+#: git-stash.sh:658
+#, sh-format
+msgid "${REV}: Could not drop stash entry"
+msgstr "${REV}: No se pudo borrar entrada stash"
+
+#: git-stash.sh:666
+msgid "No branch name specified"
+msgstr "No se especificó el nombre de la rama."
+
+#: git-stash.sh:745
+msgid "(To restore them type \"git stash apply\")"
+msgstr "(Para restaurarlos, escribe \"git stash apply\")"
+
+#: git-submodule.sh:181
+msgid "Relative path can only be used from the toplevel of the working tree"
+msgstr ""
+"La ruta relativa sólo se puede usar desde el nivel superior del árbol de "
+"trabajo"
+
+#: git-submodule.sh:191
+#, sh-format
+msgid "repo URL: '$repo' must be absolute or begin with ./|../"
+msgstr "URL del repositorio: '$repo' debe ser absoluta o iniciar con ./|../"
+
+#: git-submodule.sh:210
+#, sh-format
+msgid "'$sm_path' already exists in the index"
+msgstr "'$sm_path' ya existe en el índice"
+
+#: git-submodule.sh:213
+#, 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:219
+#, sh-format
+msgid ""
+"The following path is ignored by one of your .gitignore files:\n"
+"$sm_path\n"
+"Use -f if you really want to add it."
+msgstr ""
+"La siguiente ruta es ignorada por uno de tus archivos .gitignore:\n"
+"$sm_path\n"
+"Usa -f si en verdad quieres agregarlo."
+
+#: git-submodule.sh:237
+#, sh-format
+msgid "Adding existing repo at '$sm_path' to the index"
+msgstr "Agregar al índice el repositorio existente en '$sm_path'"
+
+#: git-submodule.sh:239
+#, sh-format
+msgid "'$sm_path' already exists and is not a valid git repo"
+msgstr "'$sm_path' ya existe y no es un repositorio git válido"
+
+#: git-submodule.sh:247
+#, sh-format
+msgid "A git directory for '$sm_name' is found locally with remote(s):"
+msgstr ""
+"Se encontró localmente un directorio git para '$sm_name' con el(los) "
+"remoto(s):"
+
+#: git-submodule.sh:249
+#, 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 quiere reusar este directorio git local en lugar de clonar nuevamente de\n"
+" $realrepo\n"
+"use la opción '--force'. Si el directorio git local no es el repositorio "
+"correcto\n"
+"o no está seguro de lo que esto significa, escoja otro nombre con la opción "
+"'--name'."
+
+#: git-submodule.sh:255
+#, sh-format
+msgid "Reactivating local git directory for submodule '$sm_name'."
+msgstr "Reactivar directorio git local para el submódulo '$sm_name'."
+
+#: git-submodule.sh:267
+#, sh-format
+msgid "Unable to checkout submodule '$sm_path'"
+msgstr "No es posible hacer checkout al submódulo '$sm_path'"
+
+#: git-submodule.sh:272
+#, sh-format
+msgid "Failed to add submodule '$sm_path'"
+msgstr "Fallo al agregar el submódulo '$sm_path'"
+
+#: git-submodule.sh:281
+#, sh-format
+msgid "Failed to register submodule '$sm_path'"
+msgstr "Fallo al registrar el submódulo '$sm_path'"
+
+#: git-submodule.sh:342
+#, sh-format
+msgid "Entering '$displaypath'"
+msgstr "Entrando a '$displaypath'"
+
+#: git-submodule.sh:362
+#, sh-format
+msgid "Stopping at '$displaypath'; script returned non-zero status."
+msgstr ""
+"Deteniendo en '$displaypath'; script retornó un status distinto de cero."
+
+#: git-submodule.sh:433
+#, sh-format
+msgid "pathspec and --all are incompatible"
+msgstr "pathspec y --all son incompatibles"
+
+#: git-submodule.sh:438
+#, sh-format
+msgid "Use '--all' if you really want to deinitialize all submodules"
+msgstr "Usa '--all' si realmente quieres des-inicializar todos los submódulos"
+
+#: git-submodule.sh:458
+#, sh-format
+msgid ""
+"Submodule work tree '$displaypath' contains a .git directory\n"
+"(use 'rm -rf' if you really want to remove it including all of its history)"
+msgstr ""
+"El árbol de trabajo del submódulo '$displaypath' contiene un directorio ."
+"git \n"
+"(use 'rm -rf' si realmente quiere removerlo incluyendo todo en su historia)"
+
+#: git-submodule.sh:466
+#, sh-format
+msgid ""
+"Submodule work tree '$displaypath' contains local modifications; use '-f' to "
+"discard them"
+msgstr ""
+"El árbol de trabajo '$displaypath' contiene modificaciones locales; usa '-f' "
+"para descartarlos"
+
+#: git-submodule.sh:469
+#, sh-format
+msgid "Cleared directory '$displaypath'"
+msgstr "Directorio '$displaypath' limpiado"
+
+#: git-submodule.sh:470
+#, sh-format
+msgid "Could not remove submodule work tree '$displaypath'"
+msgstr "No se pudo eliminar el árbol de trabajo del submódulo '$displaypath'"
+
+#: git-submodule.sh:473
+#, sh-format
+msgid "Could not create empty submodule directory '$displaypath'"
+msgstr "No se pudo crear el directorio vacío '$displaypath' para el submódulo"
+
+#: git-submodule.sh:482
+#, sh-format
+msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
+msgstr ""
+"Anulado el registro del submódulo '$name' ($url) para la ruta '$displaypath'"
+
+#: git-submodule.sh:637
+#, 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:647
+#, 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:652
+#, sh-format
+msgid ""
+"Unable to find current ${remote_name}/${branch} revision in submodule path "
+"'$sm_path'"
+msgstr ""
+"No es posible encontrar revisión actual ${remote_name}/${branch} en la ruta "
+"de submódulo '$sm_path'"
+
+#: git-submodule.sh:670
+#, sh-format
+msgid "Unable to fetch in submodule path '$displaypath'"
+msgstr "No es posible realizar fetch en la ruta de submódulo '$displaypath'"
+
+#: git-submodule.sh:676
+#, sh-format
+msgid ""
+"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
+"Direct fetching of that commit failed."
+msgstr ""
+"Fetch realizado en ruta de submódulo '$displaypath', pero no contenía $sha1. "
+"Fetch directo del commit falló."
+
+#: git-submodule.sh:683
+#, 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:684
+#, sh-format
+msgid "Submodule path '$displaypath': checked out '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': check out realizado a '$sha1'"
+
+#: git-submodule.sh:688
+#, sh-format
+msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
+msgstr ""
+"No se posible ejecutar rebase a '$sha1' en la ruta de submódulo "
+"'$displaypath'"
+
+#: git-submodule.sh:689
+#, sh-format
+msgid "Submodule path '$displaypath': rebased into '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': rebasada en '$sha1'"
+
+#: git-submodule.sh:694
+#, sh-format
+msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
+msgstr "Incapaz de fusionar '$sha1' en la ruta '$displaypath' del submódulo"
+
+#: git-submodule.sh:695
+#, sh-format
+msgid "Submodule path '$displaypath': merged in '$sha1'"
+msgstr "Ruta de submódulo '$displaypath': fusionada en '$sha1'"
+
+#: git-submodule.sh:700
+#, 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:701
+#, sh-format
+msgid "Submodule path '$displaypath': '$command $sha1'"
+msgstr "Ruta de submódulo '$displaypath': '$command $sha1'"
+
+#: git-submodule.sh:732
+#, sh-format
+msgid "Failed to recurse into submodule path '$displaypath'"
+msgstr "Falló al recurrir en la ruta de submódulo '$displaypath'"
+
+#: git-submodule.sh:828
+msgid "The --cached option cannot be used with the --files option"
+msgstr "La opción --cached no puede ser usada con la opción --files"
+
+#: git-submodule.sh:880
+#, sh-format
+msgid "unexpected mode $mod_dst"
+msgstr "modo $mod_dst inesperado"
+
+#: git-submodule.sh:900
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_src"
+msgstr " Advertencia: $display_name no contiene el commit $sha1_src"
+
+#: git-submodule.sh:903
+#, sh-format
+msgid " Warn: $display_name doesn't contain commit $sha1_dst"
+msgstr " Advertencia: $display_name no contiene el commit $sha1_dst"
+
+#: git-submodule.sh:906
+#, sh-format
+msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
+msgstr ""
+"Advertencia: $display_name no contiene los commits $sha1_src y $sha1_dst"
+
+#: git-submodule.sh:1077
+#, sh-format
+msgid "Synchronizing submodule url for '$displaypath'"
+msgstr "Sincronizando url de submódulo para '$displaypath'"
+
+#: git-parse-remote.sh:89
+#, sh-format
+msgid "See git-${cmd}(1) for details."
+msgstr "Véase git-${cmd}(1) para más detalles."
+
+#: git-rebase--interactive.sh:140
+#, sh-format
+msgid "Rebasing ($new_count/$total)"
+msgstr "Rebasando ($new_count/$total)"
+
+#: git-rebase--interactive.sh:156
+msgid ""
+"\n"
+"Commands:\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
+"\n"
+"These lines can be re-ordered; they are executed from top to bottom.\n"
+msgstr ""
+"\n"
+"Comandos:\n"
+" p, pick = usar commit\n"
+" r, reword = usar commit, pero editar el mensaje\n"
+" e, edit = usar commit, pero detener para enmendar\n"
+" s, squash = usar commit, pero unirlo al commit previo\n"
+" f, fixup = como \"squash\", pero descartar el mensaje del commit en el log\n"
+" x, exec = ejecutar comando (el resto de la línea) usando un shell\n"
+" d, drop = borrar commit\n"
+"\n"
+"Estas líneas pueden ser re-ordenadas; son ejecutadas desde arriba hacia "
+"abajo.\n"
+
+#: git-rebase--interactive.sh:171
+msgid ""
+"\n"
+"Do not remove any line. Use 'drop' explicitly to remove a commit.\n"
+msgstr ""
+"\n"
+"No eliminar ninguna línea. Usa 'drop' explícitamente para borrar un commit \n"
+
+#: git-rebase--interactive.sh:175
+msgid ""
+"\n"
+"If you remove a line here THAT COMMIT WILL BE LOST.\n"
+msgstr ""
+"\n"
+"Si remueves una línea aquí EL COMMIT SE PERDERÁ.\n"
+
+#: git-rebase--interactive.sh:211
+#, 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 ""
+"Puede enmendar el commit ahora, con\n"
+"\n"
+"\tgit commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Una vez que esté satisfecho con los cambios, ejecute\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:236
+#, sh-format
+msgid "$sha1: not a commit that can be picked"
+msgstr "$sha1: no es un commit que pueda ser cogido"
+
+#: git-rebase--interactive.sh:275
+#, sh-format
+msgid "Invalid commit name: $sha1"
+msgstr "Nombre de commit inválido: $sha1"
+
+#: git-rebase--interactive.sh:317
+msgid "Cannot write current commit's replacement sha1"
+msgstr "No se puede escribir el remplazo sha1 del commit actual"
+
+#: git-rebase--interactive.sh:369
+#, sh-format
+msgid "Fast-forward to $sha1"
+msgstr "Avance rápido a $sha1"
+
+#: git-rebase--interactive.sh:371
+#, sh-format
+msgid "Cannot fast-forward to $sha1"
+msgstr "No se puede realizar avance rápido a $sha1"
+
+#: git-rebase--interactive.sh:380
+#, sh-format
+msgid "Cannot move HEAD to $first_parent"
+msgstr "No se puede mover HEAD a $first_parent"
+
+#: git-rebase--interactive.sh:385
+#, sh-format
+msgid "Refusing to squash a merge: $sha1"
+msgstr "Rehusando a ejecutar squash en fusión: $sha1"
+
+#: git-rebase--interactive.sh:400
+#, sh-format
+msgid "Error redoing merge $sha1"
+msgstr "Error rehaciendo fusión $sha1"
+
+#: git-rebase--interactive.sh:408
+#, sh-format
+msgid "Could not pick $sha1"
+msgstr "No se pudo coger $sha1"
+
+#: git-rebase--interactive.sh:417
+#, sh-format
+msgid "This is the commit message #${n}:"
+msgstr "Este es el mensaje del commit #${n}:"
+
+#: git-rebase--interactive.sh:422
+#, sh-format
+msgid "The commit message #${n} will be skipped:"
+msgstr "El mensaje del commit #${n} será ignorado:"
+
+#: git-rebase--interactive.sh:433
+#, 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--interactive.sh:442
+#, sh-format
+msgid "Cannot write $fixup_msg"
+msgstr "No se puede escribir $fixup_msg"
+
+#: git-rebase--interactive.sh:445
+msgid "This is a combination of 2 commits."
+msgstr "Esto es una combinación de 2 commits."
+
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
+#, sh-format
+msgid "Could not apply $sha1... $rest"
+msgstr "No se puede aplicar $sha1... $rest"
+
+#: git-rebase--interactive.sh:560
+#, 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 deba resolver el "
+"problema antes\n"
+"de que sea capaz de reformular el commit."
+
+#: git-rebase--interactive.sh:575
+#, sh-format
+msgid "Stopped at $sha1_abbrev... $rest"
+msgstr "Detenido en $sha1_abbrev... $rest"
+
+#: git-rebase--interactive.sh:590
+#, sh-format
+msgid "Cannot '$squash_style' without a previous commit"
+msgstr "no se puede '$squash_style' sin un commit previo"
+
+#: git-rebase--interactive.sh:632
+#, sh-format
+msgid "Executing: $rest"
+msgstr "Ejecutando: $rest"
+
+#: git-rebase--interactive.sh:640
+#, sh-format
+msgid "Execution failed: $rest"
+msgstr "Ejecución fallida: $rest"
+
+#: git-rebase--interactive.sh:642
+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--interactive.sh:644
+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--interactive.sh:657
+#, 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"
+"Realice un commit o stash con los cambios y, a continuación, ejecute\n"
+"\n"
+"\tgit rebase --continue"
+
+#: git-rebase--interactive.sh:668
+#, sh-format
+msgid "Unknown command: $command $sha1 $rest"
+msgstr "Comando desconocido: $command $sha1 $rest"
+
+#: git-rebase--interactive.sh:669
+msgid "Please fix this using 'git rebase --edit-todo'."
+msgstr "Por favor, corrige esto usando 'git rebase --edit-todo'."
+
+#: git-rebase--interactive.sh:704
+#, sh-format
+msgid "Successfully rebased and updated $head_name."
+msgstr "$head_name rebasado y actualizado satisfactoriamente."
+
+#: git-rebase--interactive.sh:728
+msgid "could not detach HEAD"
+msgstr "No se puede desacoplar HEAD"
+
+#: git-rebase--interactive.sh:763
+msgid "Could not remove CHERRY_PICK_HEAD"
+msgstr "No se pudo remover CHERRY_PICK_HEAD"
+
+#: git-rebase--interactive.sh:768
+#, 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 ""
+"Tiene cambios en el área de stage de su árbol de trabajo.\n"
+"Si estos cambios están destinados a \n"
+"ser aplastados en el commit previo, ejecute:\n"
+"\n"
+" git commit --amend $gpg_sign_opt_quoted\n"
+"\n"
+"Si estos están destinados a ir en un nuevo commit, ejecute:\n"
+"\n"
+" git commit $gpg_sign_opt_quoted\n"
+"\n"
+"En ambos casos, cuando termine, continue con:\n"
+"\n"
+" git rebase --continue\n"
+
+#: git-rebase--interactive.sh:785
+msgid "Error trying to find the author identity to amend commit"
+msgstr ""
+"Error tratando de encontrar la identidad del autor para remediar el commit "
+
+#: git-rebase--interactive.sh:790
+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--interactive.sh:795 git-rebase--interactive.sh:799
+msgid "Could not commit staged changes."
+msgstr "No se pudo realizar el commit con los cambios en el área de stage"
+
+#: git-rebase--interactive.sh:827
+msgid ""
+"\n"
+"You are editing the todo file of an ongoing interactive rebase.\n"
+"To continue rebase after editing, run:\n"
+" git rebase --continue\n"
+"\n"
+msgstr ""
+"\n"
+"Esta editando el archivo TODO de un rebase interactivo.\n"
+"Para continuar el rebase después de editar, ejecute:\n"
+" git rebase --continue\n"
+"\n"
+
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
+msgid "Could not execute editor"
+msgstr "No se pudo ejecutar el editor"
+
+#: git-rebase--interactive.sh:848
+#, sh-format
+msgid "Could not checkout $switch_to"
+msgstr "No se pudo actualizar el árbol de trabajo a $switch_to"
+
+#: git-rebase--interactive.sh:853
+msgid "No HEAD?"
+msgstr "¿Sin HEAD?"
+
+#: git-rebase--interactive.sh:854
+#, sh-format
+msgid "Could not create temporary $state_dir"
+msgstr "No se pudo crear $state_dir temporalmente"
+
+#: git-rebase--interactive.sh:856
+msgid "Could not mark as interactive"
+msgstr "No se pudo marcar como interactivo"
+
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
+msgid "Could not init rewritten commits"
+msgstr "No se puede inicializar los commits reescritos"
+
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "No se pudo generar lista de pendientes"
+
+#: git-rebase--interactive.sh:973
+#, 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--interactive.sh:978
+msgid ""
+"\n"
+"However, if you remove everything, the rebase will be aborted.\n"
+"\n"
+msgstr ""
+"\n"
+"Como sea, si se remueve todo, el rebase sera abortado.\n"
+"\n"
+
+#: git-rebase--interactive.sh:985
+msgid "Note that empty commits are commented out"
+msgstr "Tenga en cuenta que los commits vacíos están comentados"
+
+#: git-sh-setup.sh:89 git-sh-setup.sh:94
+#, sh-format
+msgid "usage: $dashless $USAGE"
+msgstr "uso: $dashless $USAGE"
+
+#: git-sh-setup.sh:190
+#, sh-format
+msgid "Cannot chdir to $cdup, the toplevel of the working tree"
+msgstr ""
+"No se puede aplicar chdir a $cdup, el nivel máximo del árbol de trabajo"
+
+#: git-sh-setup.sh:199 git-sh-setup.sh:206
+#, sh-format
+msgid "fatal: $program_name cannot be used without a working tree."
+msgstr "fatal: $program_name no puede ser usado sin un árbol de trabajo."
+
+#: git-sh-setup.sh:220
+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:223
+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:226
+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:229
+#, 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:242
+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:245
+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:248
+#, 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:252
+msgid "Additionally, your index contains uncommitted changes."
+msgstr "Adicionalmente, tu índice contiene cambios que no están en un commit."
+
+#: git-sh-setup.sh:372
+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:377
+msgid "Unable to determine absolute path of git directory"
+msgstr "Incapaz de determinar la ruta absoluta del directorio git"
+
+#. TRANSLATORS: you can adjust this to align "git add -i" status menu
+#: git-add--interactive.perl:196
+#, perl-format
+msgid "%12s %12s %s"
+msgstr "%12s %12s %s"
+
+#: git-add--interactive.perl:197
+msgid "staged"
+msgstr "rastreado"
+
+#: git-add--interactive.perl:197
+msgid "unstaged"
+msgstr "no rastreado"
+
+#: git-add--interactive.perl:246 git-add--interactive.perl:271
+msgid "binary"
+msgstr "binario"
+
+#: git-add--interactive.perl:255 git-add--interactive.perl:309
+msgid "nothing"
+msgstr "nada"
+
+#: git-add--interactive.perl:291 git-add--interactive.perl:306
+msgid "unchanged"
+msgstr "sin cambios"
+
+#: git-add--interactive.perl:602
+#, perl-format
+msgid "added %d path\n"
+msgid_plural "added %d paths\n"
+msgstr[0] "agregada %d ruta\n"
+msgstr[1] "agregadas %d rutas\n"
+
+#: git-add--interactive.perl:605
+#, perl-format
+msgid "updated %d path\n"
+msgid_plural "updated %d paths\n"
+msgstr[0] "actualizada %d ruta\n"
+msgstr[1] "actualizadas %d rutas\n"
+
+#: git-add--interactive.perl:608
+#, perl-format
+msgid "reverted %d path\n"
+msgid_plural "reverted %d paths\n"
+msgstr[0] "revertida %d ruta\n"
+msgstr[1] "revertidas %d rutas\n"
+
+#: git-add--interactive.perl:611
+#, perl-format
+msgid "touched %d path\n"
+msgid_plural "touched %d paths\n"
+msgstr[0] "touch hecho a %d ruta\n"
+msgstr[1] "touch hecho a %d rutas\n"
+
+#: git-add--interactive.perl:620
+msgid "Update"
+msgstr "Actualizar"
+
+#: git-add--interactive.perl:632
+msgid "Revert"
+msgstr "Revertir"
+
+#: git-add--interactive.perl:655
+#, perl-format
+msgid "note: %s is untracked now.\n"
+msgstr "nota: %s no es rastreado ahora.\n"
+
+#: git-add--interactive.perl:666
+msgid "Add untracked"
+msgstr "Agregar no rastreados"
+
+#: git-add--interactive.perl:672
+msgid "No untracked files.\n"
+msgstr "No hay archivos sin rastrear.\n"
+
+#: git-add--interactive.perl:985
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for staging."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"inmediatamente para el área de stage."
+
+#: git-add--interactive.perl:988
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for stashing."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"inmediatamente para aplicar stash."
+
+#: git-add--interactive.perl:991
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for unstaging."
+msgstr ""
+"Si el parche aplica limpiamente, el hunk editado sera marcado\n"
+"inmediatamente para sacar del área de stage."
+
+#: git-add--interactive.perl:994 git-add--interactive.perl:1003
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for applying."
+msgstr ""
+"Si el parche aplica de forma limpia, el hunk editado sera marcado \n"
+"inmediatamente para aplicar."
+
+#: git-add--interactive.perl:997 git-add--interactive.perl:1000
+msgid ""
+"If the patch applies cleanly, the edited hunk will immediately be\n"
+"marked for discarding."
+msgstr ""
+"Si el parche aplica de forma limpia, el hunk editado sera marcado\n"
+"inmediatamente para descarte."
+
+#: git-add--interactive.perl:1013
+#, perl-format
+msgid "failed to open hunk edit file for writing: %s"
+msgstr "fallo al abrir el archivo de adición del hunk para escritura: %s"
+
+#: git-add--interactive.perl:1014
+msgid "Manual hunk edit mode -- see bottom for a quick guide.\n"
+msgstr "Modo de edición manual de hunk -- vea abajo para una guía rápida.\n"
+
+#: git-add--interactive.perl:1020
+#, perl-format
+msgid ""
+"---\n"
+"To remove '%s' lines, make them ' ' lines (context).\n"
+"To remove '%s' lines, delete them.\n"
+"Lines starting with %s will be removed.\n"
+msgstr ""
+"---\n"
+"Para remover '%s' líneas, haga de ellas líneas ' ' (contexto).\n"
+"Para remover '%s' líneas, bórrelas.\n"
+"Lineas comenzando con %s serán removidas.\n"
+
+#. TRANSLATORS: 'it' refers to the patch mentioned in the previous messages.
+#: git-add--interactive.perl:1028
+msgid ""
+"If it does not apply cleanly, you will be given an opportunity to\n"
+"edit again. If all lines of the hunk are removed, then the edit is\n"
+"aborted and the hunk is left unchanged.\n"
+msgstr ""
+"Si esto no aplica de manera limpia, se le da la oportunidad de \n"
+"editar nuevamente. Si todas las líneas del hunk son removidas, entonces \n"
+"la edición es abortada y el hunk queda sin cambios.\n"
+
+#: git-add--interactive.perl:1042
+#, perl-format
+msgid "failed to open hunk edit file for reading: %s"
+msgstr "fallo al abrir el archivo de edición del hunk para lectura: %s"
+
+#. TRANSLATORS: do not translate [y/n]
+#. The program will only accept that input
+#. at this point.
+#. Consider translating (saying "no" discards!) as
+#. (saying "n" for "no" discards!) if the translation
+#. of the word "no" does not start with n.
+#: git-add--interactive.perl:1134
+msgid ""
+"Your edited hunk does not apply. Edit again (saying \"no\" discards!) [y/n]? "
+msgstr ""
+"Tu hunk editado no aplica. Editar nuevamente (decir \"no\" descarta!) [y/n]? "
+
+#: git-add--interactive.perl:1143
+msgid ""
+"y - stage this hunk\n"
+"n - do not stage this hunk\n"
+"q - quit; do not stage this hunk or any of the remaining ones\n"
+"a - stage this hunk and all later hunks in the file\n"
+"d - do not stage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar stage a este hunk\n"
+"n - no aplicar stage a este hunk\n"
+"q - quit; no aplicar stage a este hunk o ninguno de los restantes\n"
+"a - aplicar stage a este hunk y a todos los posteriores en el archivo \n"
+"d - no aplicar stage a este hunk o a ninguno de los posteriores en este "
+"archivo"
+
+#: git-add--interactive.perl:1149
+msgid ""
+"y - stash this hunk\n"
+"n - do not stash this hunk\n"
+"q - quit; do not stash this hunk or any of the remaining ones\n"
+"a - stash this hunk and all later hunks in the file\n"
+"d - do not stash this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar stash a este hunk\n"
+"n - no aplicar stash a este hunk\n"
+"q - quit; no aplicar stash a este hunk o a ninguno de los restantes\n"
+"a - aplicar stash a este hunk y a todos los posteriores en el archivo\n"
+"d - no aplicar stash a este hunk o ninguno de los posteriores en el archivo"
+
+#: git-add--interactive.perl:1155
+msgid ""
+"y - unstage this hunk\n"
+"n - do not unstage this hunk\n"
+"q - quit; do not unstage this hunk or any of the remaining ones\n"
+"a - unstage this hunk and all later hunks in the file\n"
+"d - do not unstage this hunk or any of the later hunks in the file"
+msgstr ""
+"y - sacar desde hunk del área de stage\n"
+"n - no sacar este hunk del area de stage\n"
+"q - quit; no sacar del area de stage este hunk o ninguno de los restantes\n"
+"a - sacar del area de stage este hunk y todos los posteriores en el archivo\n"
+"d - no sacar del area de stage este hunk o ninguno de los posteriores en el "
+"archivo"
+
+#: git-add--interactive.perl:1161
+msgid ""
+"y - apply this hunk to index\n"
+"n - do not apply this hunk to index\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar este hunk al indice\n"
+"n - no aplicar este hunk al indice\n"
+"q - quit; no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunko ninguno de los posteriores en el archivo"
+
+#: git-add--interactive.perl:1167
+msgid ""
+"y - discard this hunk from worktree\n"
+"n - do not discard this hunk from worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - descartar este hunk del árbol de trabajo\n"
+"n - no descartar este hunk del árbol de trabajo\n"
+"q - quit; no descartar este hunk o ninguno de los que restantes\n"
+"a - descartar este hunk y todos los posteriores en este archivo\n"
+"d - no descartar este hunk o ninguno de los posteriores en el archivo"
+
+#: git-add--interactive.perl:1173
+msgid ""
+"y - discard this hunk from index and worktree\n"
+"n - do not discard this hunk from index and worktree\n"
+"q - quit; do not discard this hunk or any of the remaining ones\n"
+"a - discard this hunk and all later hunks in the file\n"
+"d - do not discard this hunk or any of the later hunks in the file"
+msgstr ""
+"y - descartar este hunk del índice y el árbol de trabajo\n"
+"n - no descartar este hunk del índice ni el árbol de trabajo\n"
+"q - quit; no descartar este hunk o ninguno de los que quedan\n"
+"a - descartar este hunk y todos los posteriores en este archivo\n"
+"d - no descartar este hunk o ninguno posterior en el archivo"
+
+#: git-add--interactive.perl:1179
+msgid ""
+"y - apply this hunk to index and worktree\n"
+"n - do not apply this hunk to index and worktree\n"
+"q - quit; do not apply this hunk or any of the remaining ones\n"
+"a - apply this hunk and all later hunks in the file\n"
+"d - do not apply this hunk or any of the later hunks in the file"
+msgstr ""
+"y - aplicar este hunk al indice y al árbol de trabajo\n"
+"n - no aplicar este hunk al indice y al árbol de trabajo\n"
+"q - quit; no aplicar este hunk o ninguno de los restantes\n"
+"a - aplicar este hunk y todos los posteriores en el archivo\n"
+"d - no aplicar este hunk o ninguno de los siguientes en este archivo"
+
+#: git-add--interactive.perl:1188
+msgid ""
+"g - select a hunk to go to\n"
+"/ - search for a hunk matching the given regex\n"
+"j - leave this hunk undecided, see next undecided hunk\n"
+"J - leave this hunk undecided, see next hunk\n"
+"k - leave this hunk undecided, see previous undecided hunk\n"
+"K - leave this hunk undecided, see previous hunk\n"
+"s - split the current hunk into smaller hunks\n"
+"e - manually edit the current hunk\n"
+"? - print help\n"
+msgstr ""
+"g - selecciona un hunk a donde ir\n"
+"/ - buscar un hunk que concuerde el regex\n"
+"j - dejar este hunk por definir, ver siguiente hunk por definir\n"
+"J - dejar este hunk por definir, ver siguiente hunk\n"
+"k - dejar este hunk por definir, ver hunk previo por definir\n"
+"K - dejar este hunk por definir, ver hunk previo\n"
+"s - dividir el hunk actual en hunks mas pequeños\n"
+"e - editar manualmente el hunk actual\n"
+"? - imprimir ayuda\n"
+
+#: git-add--interactive.perl:1219
+msgid "The selected hunks do not apply to the index!\n"
+msgstr "Los hunks seleccionados no aplican al índice!\n"
+
+#: git-add--interactive.perl:1220
+msgid "Apply them to the worktree anyway? "
+msgstr "Aplicarlos al árbol de trabajo de todas maneras?"
+
+#: git-add--interactive.perl:1223
+msgid "Nothing was applied.\n"
+msgstr "Nada fue aplicado.\n"
+
+#: git-add--interactive.perl:1234
+#, perl-format
+msgid "ignoring unmerged: %s\n"
+msgstr "ignorando lo no fusionado: %s\n"
+
+#: git-add--interactive.perl:1243
+msgid "Only binary files changed.\n"
+msgstr "Solo cambiaron archivos binarios.\n"
+
+#: git-add--interactive.perl:1245
+msgid "No changes.\n"
+msgstr "Sin cambios.\n"
+
+#: git-add--interactive.perl:1253
+msgid "Patch update"
+msgstr "Actualización del parche"
+
+#: git-add--interactive.perl:1305
+#, perl-format
+msgid "Stage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar stage al cambio de modo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1306
+#, perl-format
+msgid "Stage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar stage al borrado [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1307
+#, perl-format
+msgid "Stage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar stage a este hunk [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1310
+#, perl-format
+msgid "Stash mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar stash al cambio de modo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1311
+#, perl-format
+msgid "Stash deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar stash al borrado [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1312
+#, perl-format
+msgid "Stash this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar stash a este hunk [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1315
+#, perl-format
+msgid "Unstage mode change [y,n,q,a,d,/%s,?]? "
+msgstr "Sacar cambio de modo del stage [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1316
+#, perl-format
+msgid "Unstage deletion [y,n,q,a,d,/%s,?]? "
+msgstr "Sacar borrado del stage [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1317
+#, perl-format
+msgid "Unstage this hunk [y,n,q,a,d,/%s,?]? "
+msgstr "Sacar este hunk del stage [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1320
+#, perl-format
+msgid "Apply mode change to index [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar cambio de modo al índice [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1321
+#, perl-format
+msgid "Apply deletion to index [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar borrado al índice [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1322
+#, perl-format
+msgid "Apply this hunk to index [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar este hunk al índice [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1325
+#, perl-format
+msgid "Discard mode change from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar cambio de modo del árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1326
+#, perl-format
+msgid "Discard deletion from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar borrado del árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1327
+#, perl-format
+msgid "Discard this hunk from worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar este hunk del árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1330
+#, perl-format
+msgid "Discard mode change from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descartar cambio de modo del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1331
+#, perl-format
+msgid "Discard deletion from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Descartar borrado del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1332
+#, perl-format
+msgid "Discard this hunk from index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Descartar este hunk del índice y el árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1335
+#, perl-format
+msgid "Apply mode change to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr ""
+"Aplicar cambio de modo para el índice y el árbol de trabajo [y,n,q,a,d,/"
+"%s,?]? "
+
+#: git-add--interactive.perl:1336
+#, perl-format
+msgid "Apply deletion to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar borrado al índice y al árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1337
+#, perl-format
+msgid "Apply this hunk to index and worktree [y,n,q,a,d,/%s,?]? "
+msgstr "Aplicar este hunk al índice y árbol de trabajo [y,n,q,a,d,/%s,?]? "
+
+#: git-add--interactive.perl:1440
+msgid "go to which hunk (<ret> to see more)? "
+msgstr "A que hunk ir (<enter> para ver mas)?"
+
+#: git-add--interactive.perl:1442
+msgid "go to which hunk? "
+msgstr "A que hunk ir?"
+
+#: git-add--interactive.perl:1451
+#, perl-format
+msgid "Invalid number: '%s'\n"
+msgstr "Numero invalido: '%s'\n"
+
+#: git-add--interactive.perl:1456
+#, perl-format
+msgid "Sorry, only %d hunk available.\n"
+msgid_plural "Sorry, only %d hunks available.\n"
+msgstr[0] "Lo siento, solo %d hunk disponible.\n"
+msgstr[1] "Lo siento, solo %d hunks disponibles.\n"
+
+#: git-add--interactive.perl:1482
+msgid "search for regex? "
+msgstr "buscar para regexp?"
+
+#: git-add--interactive.perl:1495
+#, perl-format
+msgid "Malformed search regexp %s: %s\n"
+msgstr "regexp para la búsqueda mal formado %s: %s\n"
+
+#: git-add--interactive.perl:1505
+msgid "No hunk matches the given pattern\n"
+msgstr "No hay hunks que concuerden con el patrón entregado.\n"
+
+#: git-add--interactive.perl:1517 git-add--interactive.perl:1539
+msgid "No previous hunk\n"
+msgstr "No el anterior hunk\n"
+
+#: git-add--interactive.perl:1526 git-add--interactive.perl:1545
+msgid "No next hunk\n"
+msgstr "No el siguiente hunk\n"
+
+#: git-add--interactive.perl:1553
+#, perl-format
+msgid "Split into %d hunk.\n"
+msgid_plural "Split into %d hunks.\n"
+msgstr[0] "Cortar en %d hunk.\n"
+msgstr[1] "Cortar en %d hunks.\n"
+
+#: git-add--interactive.perl:1605
+msgid "Review diff"
+msgstr "Revisión de diff"
+
+#. TRANSLATORS: please do not translate the command names
+#. 'status', 'update', 'revert', etc.
+#: git-add--interactive.perl:1624
+msgid ""
+"status - show paths with changes\n"
+"update - add working tree state to the staged set of changes\n"
+"revert - revert staged set of changes back to the HEAD version\n"
+"patch - pick hunks and update selectively\n"
+"diff - view diff between HEAD and index\n"
+"add untracked - add contents of untracked files to the staged set of "
+"changes\n"
+msgstr ""
+"status - muestra las rutas con cambios\n"
+"update - agrega 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 "
+"versión HEAD\n"
+"patch - selecciona los hunks y actualiza de forma selectiva\n"
+"diff - mirar la diff entre HEAD y el indice\n"
+"add untracked - agrega contenidos de archivos no rastreados al grupo de "
+"cambios del area de stage\n"
+
+#: git-add--interactive.perl:1641 git-add--interactive.perl:1646
+#: git-add--interactive.perl:1649 git-add--interactive.perl:1656
+#: git-add--interactive.perl:1660 git-add--interactive.perl:1666
+msgid "missing --"
+msgstr "falta --"
+
+#: git-add--interactive.perl:1662
+#, perl-format
+msgid "unknown --patch mode: %s"
+msgstr "modo --patch desconocido: %s"
+
+#: git-add--interactive.perl:1668 git-add--interactive.perl:1674
+#, perl-format
+msgid "invalid argument %s, expecting --"
+msgstr "argumento invalido %s, se esperaba --"
+
+#: git-send-email.perl:126
+msgid "local zone differs from GMT by a non-minute interval\n"
+msgstr "la zona local difiere de GMT por un intervalo de cero minutos\n"
+
+#: git-send-email.perl:133 git-send-email.perl:139
+msgid "local time offset greater than or equal to 24 hours\n"
+msgstr "el offset del tiempo local es mayor o igual a 24 horas\n"
+
+#: git-send-email.perl:207 git-send-email.perl:213
+msgid "the editor exited uncleanly, aborting everything"
+msgstr "el editor se cerro inapropiadamente, abortando todo"
+
+#: git-send-email.perl:290
+#, perl-format
+msgid ""
+"'%s' contains an intermediate version of the email you were composing.\n"
+msgstr ""
+"'%s' contiene una versión intermedia del correo que se estaba generando.\n"
+
+#: git-send-email.perl:295
+#, perl-format
+msgid "'%s.final' contains the composed email.\n"
+msgstr "'%s.final' contiene el email generado.\n"
+
+#: git-send-email.perl:313
+msgid "--dump-aliases incompatible with other options\n"
+msgstr "--dump-aliases no es compatible con otras opciones.\n"
+
+#: git-send-email.perl:378 git-send-email.perl:629
+msgid "Cannot run git format-patch from outside a repository\n"
+msgstr "No se puede ejecutar git format-patch desde fuera del repositorio.\n"
+
+#: git-send-email.perl:447
+#, perl-format
+msgid "Unknown --suppress-cc field: '%s'\n"
+msgstr "campo --suppress-cc desconocido: '%s'\n"
+
+#: git-send-email.perl:476
+#, perl-format
+msgid "Unknown --confirm setting: '%s'\n"
+msgstr "Configuración --confirm desconocida: '%s'\n"
+
+#: git-send-email.perl:504
+#, perl-format
+msgid "warning: sendmail alias with quotes is not supported: %s\n"
+msgstr "peligro: alias de sendmail con comillas no es soportado: %s\n"
+
+#: git-send-email.perl:506
+#, perl-format
+msgid "warning: `:include:` not supported: %s\n"
+msgstr "peligro: `:include:` no soportado: %s\n"
+
+#: git-send-email.perl:508
+#, perl-format
+msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
+msgstr "Advertencia: redirección `/file` o `|pipe` no soportada : %s\n"
+
+#: git-send-email.perl:513
+#, perl-format
+msgid "warning: sendmail line is not recognized: %s\n"
+msgstr "Advertencia: línea sendmail no reconocida: %s\n"
+
+#: git-send-email.perl:595
+#, 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 ""
+"Archivo '%s' existe pero podría ser el rango de commits \n"
+"para producir los parches. Por favor elimina la ambigüedad...\n"
+"\n"
+" * Diciendo \"./%s\" si se quiere decir un archivo; o\n"
+" * Agregando la opción --format-patch si se quiere decir un rango.\n"
+
+#: git-send-email.perl:616
+#, perl-format
+msgid "Failed to opendir %s: %s"
+msgstr "Fallo al abrir directorio %s: %s"
+
+#: git-send-email.perl:640
+#, perl-format
+msgid ""
+"fatal: %s: %s\n"
+"warning: no patches were sent\n"
+msgstr ""
+"fatal: %s: %s\n"
+"peligro: no se mandaron parches\n"
+
+#: git-send-email.perl:651
+msgid ""
+"\n"
+"No patch files specified!\n"
+"\n"
+msgstr ""
+"\n"
+"No se especificaron parches!\n"
+"\n"
+
+#: git-send-email.perl:664
+#, perl-format
+msgid "No subject line in %s?"
+msgstr "No hay línea de subject en %s?"
+
+#: git-send-email.perl:674
+#, perl-format
+msgid "Failed to open for writing %s: %s"
+msgstr "Fallo al abrir para escritura %s: %s"
+
+#: git-send-email.perl:684
+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 ""
+"Lineas que comienzan en \"GIT:\" seran removidas.\n"
+"Considere incluir un diffstat global o una tabla de contenidos\n"
+"para el parche que esta escribiendo.\n"
+"\n"
+"Limpiar el contenido de body si usted no desea mandar un resumen.\n"
+
+#: git-send-email.perl:707
+#, perl-format
+msgid "Failed to open %s.final: %s"
+msgstr "Fallo al abrir %s.final: %s"
+
+#: git-send-email.perl:710
+#, perl-format
+msgid "Failed to open %s: %s"
+msgstr "Fallo al abrir %s: %s"
+
+#: git-send-email.perl:745
+msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
+msgstr ""
+"Campos Para/Cc/Bcc no han sido interpretados todavía, han sido ignorados\n"
+
+#: git-send-email.perl:754
+msgid "Summary email is empty, skipping it\n"
+msgstr "Archivo de resumen esta vacío, saltando al siguiente\n"
+
+#. TRANSLATORS: please keep [y/N] as is.
+#: git-send-email.perl:786
+#, perl-format
+msgid "Are you sure you want to use <%s> [y/N]? "
+msgstr "Esta seguro de que desea usar <%s> [y/N]?"
+
+#: git-send-email.perl:815
+msgid ""
+"The following files are 8bit, but do not declare a Content-Transfer-"
+"Encoding.\n"
+msgstr ""
+"Los siguientes archivos son 8bit, pero no declaran un Content-Transfer-"
+"Encoding.\n"
+
+#: git-send-email.perl:820
+msgid "Which 8bit encoding should I declare [UTF-8]? "
+msgstr "Que codificación de 8bit debería declarar [UTF-8]?"
+
+#: git-send-email.perl:828
+#, 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 ""
+"Rehusando mandar el parche porque\n"
+"\t%s\n"
+"tiene el template '*** SUBJECT HERE ***'. Agrega --force si realmente lo "
+"deseas mandar.\n"
+
+#: git-send-email.perl:847
+msgid "To whom should the emails be sent (if anyone)?"
+msgstr "A quien se deben mandar los correos (si existe)?"
+
+#: git-send-email.perl:865
+#, perl-format
+msgid "fatal: alias '%s' expands to itself\n"
+msgstr "fatal: alias '%s' se expande a si mismo\n"
+
+#: git-send-email.perl:877
+msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
+msgstr ""
+"que id de mensaje sera usado como En-Respuesta-Para en el primer email (si "
+"existe alguno)?"
+
+#: git-send-email.perl:929 git-send-email.perl:937
+#, perl-format
+msgid "error: unable to extract a valid address from: %s\n"
+msgstr "error: no es posible extraer una dirección valida de %s\n"
+
+#. TRANSLATORS: Make sure to include [q] [d] [e] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:941
+msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
+msgstr "Que hacer con esta dirección? ([q]salir|[d]botar|[e]ditar):"
+
+#: git-send-email.perl:1262
+#, perl-format
+msgid "CA path \"%s\" does not exist"
+msgstr "ruta CA \"%s\" no existe"
+
+#: git-send-email.perl:1337
+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 ""
+"La lista Cc ha sido expandida por direcciones adicionales\n"
+"encontradas en el mensaje de commit parchado.. Por defecto\n"
+"send-email se muestra antes de mandar cualquier cada vez que esto sucede.\n"
+"Este comportamiento is controlado por el valor de configuración sendemail."
+"confirm.\n"
+"\n"
+"Para mas información, corre 'git sen-email --help'.\n"
+"Para mantener el comportamiento actual, pero evitar este mensaje,\n"
+"corre 'git config --global sendemail.confirm auto'.\n"
+"\n"
+
+#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
+#. translation. The program will only accept English input
+#. at this point.
+#: git-send-email.perl:1352
+msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
+msgstr "Mandar este email? ([y]si||[n]o|[q]salir|[a]todo):"
+
+#: git-send-email.perl:1355
+msgid "Send this email reply required"
+msgstr "Necesitas mandar esta respuesta de email"
+
+#: git-send-email.perl:1381
+msgid "The required SMTP server is not properly defined."
+msgstr "El servidor SMTP no esta definido adecuadamente."
+
+#: git-send-email.perl:1428
+#, perl-format
+msgid "Server does not support STARTTLS! %s"
+msgstr "Servidor no soporta STARTTLS! %s"
+
+#: git-send-email.perl:1433 git-send-email.perl:1437
+#, perl-format
+msgid "STARTTLS failed! %s"
+msgstr "fallo de STARTTLS! %s"
+
+#: git-send-email.perl:1447
+msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
+msgstr ""
+"No es posible inicializar SMTP adecuadamente. Verificar config y usar ---"
+"smtp-debug."
+
+#: git-send-email.perl:1465
+#, perl-format
+msgid "Failed to send %s\n"
+msgstr "Fallo al enviar %s\n"
+
+#: git-send-email.perl:1468
+#, perl-format
+msgid "Dry-Sent %s\n"
+msgstr "Dry-Sent %s\n"
+
+#: git-send-email.perl:1468
+#, perl-format
+msgid "Sent %s\n"
+msgstr "Enviado %s\n"
+
+#: git-send-email.perl:1470
+msgid "Dry-OK. Log says:\n"
+msgstr "Dry-OK. Log dice:\n"
+
+#: git-send-email.perl:1470
+msgid "OK. Log says:\n"
+msgstr "OK. Log dice:\n"
+
+#: git-send-email.perl:1482
+msgid "Result: "
+msgstr "Resultado:"
+
+#: git-send-email.perl:1485
+msgid "Result: OK\n"
+msgstr "Resultado: OK\n"
+
+#: git-send-email.perl:1498
+#, perl-format
+msgid "can't open file %s"
+msgstr "no se puede abrir el archivo %s"
+
+#: git-send-email.perl:1545 git-send-email.perl:1565
+#, perl-format
+msgid "(mbox) Adding cc: %s from line '%s'\n"
+msgstr "(mbox) Agregando cc: %s de línea '%s'\n"
+
+#: git-send-email.perl:1551
+#, perl-format
+msgid "(mbox) Adding to: %s from line '%s'\n"
+msgstr "(mbox) Agregando para: %s de la línea '%s'\n"
+
+#: git-send-email.perl:1599
+#, perl-format
+msgid "(non-mbox) Adding cc: %s from line '%s'\n"
+msgstr "(non-mbox) Agregando cc: %s de la línea '%s'\n"
+
+#: git-send-email.perl:1624
+#, perl-format
+msgid "(body) Adding cc: %s from line '%s'\n"
+msgstr "(body) Agregando cc: %s de la línea '%s'\n"
+
+#: git-send-email.perl:1730
+#, perl-format
+msgid "(%s) Could not execute '%s'"
+msgstr "(%s) no se pudo ejecutar '%s'"
+
+#: git-send-email.perl:1737
+#, perl-format
+msgid "(%s) Adding %s: %s from: '%s'\n"
+msgstr "(%s) Agregando %s: %s de: '%s'\n"
+
+#: git-send-email.perl:1741
+#, perl-format
+msgid "(%s) failed to close pipe to '%s'"
+msgstr "(%s) fallo al cerrar el pipe para '%s'"
+
+#: git-send-email.perl:1768
+msgid "cannot send message as 7bit"
+msgstr "no se puede mandar mensaje como 7bit"
+
+#: git-send-email.perl:1776
+msgid "invalid transfer encoding"
+msgstr "codificación de transferencia invalida"
+
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
+#, perl-format
+msgid "unable to open %s: %s\n"
+msgstr "no es posible abrir %s: %s\n"
+
+#: git-send-email.perl:1817
+#, perl-format
+msgid "%s: patch contains a line longer than 998 characters"
+msgstr "%s: el parche contiene una línea con mas de 998 caracteres"
+
+#: git-send-email.perl:1833
+#, 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:1837
+#, perl-format
+msgid "Do you really want to send %s? [y|N]: "
+msgstr "Realmente deseas mandar %s?[y|N]"
+
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "los strings vacíos como pathspecs serán inválidas en las próximas "
+#~ "versiones. por favor use . si quería hacer coincidir todas las rutas"
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "No se pudo abrir '%s' para escritura"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "no se pudo truncar '%s'"
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "no se pudo finalizar '%s'"
+
+#~ msgid "could not close %s"
+#~ msgstr "no se pudo cerrar %s"
+
+#~ msgid "Copied a misnamed branch '%s' away"
+#~ msgstr "Copiada una rama mal llamada '%s' afuera"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "No tiene sentido crear 'HEAD' manualmente"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "No se sabe como clonar %s"
+
+#~ msgid "show ignored files"
+#~ msgstr "mostrar archivos ignorados"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s no es un objeto '%s' válido"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "No se sabe como extraer de %s"
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "'$term' no es un término válido"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "error: opción desconocida para 'stash save': $option\n"
+#~ " Esto provee un mensaje , use git stash save -- '$option'"
+
+#~ msgid "Failed to recurse into submodule path '$sm_path'"
+#~ msgstr "Falló al recurrir en la ruta de submódulo '$sm_path'"
+
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) no toma argumentos"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "estrategia de actualización de submódulo no soportada para submódulo '%s'"
+
+#~ msgid "change upstream info"
+#~ msgstr "cambie info de upstream"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Si querías hacer que '%s' rastree '%s', haz esto:\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "nombre base"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "anteponer el nombre base del proyecto padre a la salida"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Peligro: falta el SHA-1 o no es un commit en la siguiente línea:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Peligro: el comando no es reconocido en la siguiente línea:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "O puedes abortar el rebasamiento con 'git rebase --abort'."
diff --git a/po/fr.po b/po/fr.po
index cb45f57..3aa1e3c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1,7 +1,7 @@
# French translations for Git.
-# Copyright (C) 2015 Jean-Noël Avila <jn.avila@free.fr>
+# Copyright (C) 2018 Jean-Noël Avila <jn.avila@free.fr>
# This file is distributed under the same license as the Git package.
-# Jean-Noël Avila <jn.avila@free.fr>, 2016.
+# Jean-Noël Avila <jn.avila@free.fr>, 2018.
# Sébastien Helleu <flashcode@flashtux.org>, 2013.
#
# French translations of common Git words used in this file:
@@ -50,6 +50,7 @@
# to prune | éliminer
# to push | pousser
# to rebase | rebaser
+# trailers | lignes terminales
# repository | dépôt
# remote | distante (ou serveur distant)
# revision | révision
@@ -73,8 +74,8 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-23 04:35+0200\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-07 18:53+0100\n"
"Last-Translator: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language-Team: Jean-Noël Avila <jn.avila@free.fr>\n"
"Language: fr\n"
@@ -83,37 +84,37 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n<=1 ?0 : 1;\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "astuce: %.*s\n"
-#: advice.c:86
+#: advice.c:90
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:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr "Impossible de valider car vous avez des fichiers non fusionnés."
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr "Impossible de fusionner car vous avez des fichiers non fusionnés."
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr "Impossible de tirer car vous avez des fichiers non fusionnés."
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr "Impossible d'annuler car vous avez des fichiers non fusionnés."
-#: advice.c:96
+#: advice.c:100
#, 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:104
+#: advice.c:108
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."
@@ -121,23 +122,23 @@
"Corrigez-les puis lancez 'git add/rm <fichier>'\n"
"si nécessaire pour marquer la résolution et valider."
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "Abandon à cause de conflit non résolu."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Vous n'avez pas terminé votre fusion (MERGE_HEAD existe)."
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "Veuillez valider vos changements avant de fusionner."
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "Abandon à cause d'une fusion non terminée."
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -179,89 +180,89 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "option d'ignorance d'espace non reconnue '%s'"
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached et --3way ne peuvent pas être utilisés ensemble."
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "--3way hors d'un dépôt"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "--index hors d'un dépôt"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "--cached hors d'un dépôt"
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Impossible de préparer la regexp d'horodatage %s"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec a retourné %d pour l'entrée : %s"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "nom de fichier du patch introuvable à la ligne %d"
-#: apply.c:967
+#: apply.c:942
#, 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:973
+#: apply.c:948
#, 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:974
+#: apply.c:949
#, 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:979
+#: apply.c:954
#, 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:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "mode invalide dans la ligne %d : %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "lignes d'entête inconsistantes %d et %d"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recomptage : ligne inattendue : %.*s"
-#: apply.c:1567
+#: apply.c:1542
#, 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:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -276,83 +277,83 @@
"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:1600
+#: apply.c:1575
#, 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:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "le nouveau fichier dépend de contenus anciens"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "le fichier supprimé a encore du contenu"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "patch corrompu à la ligne %d"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "le nouveau fichier %s dépend de contenus anciens"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "le fichier supprimé %s a encore du contenu"
-#: apply.c:1848
+#: apply.c:1841
#, 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:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "patch binaire corrompu à la ligne %d : %.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "patch binaire non reconnu à la ligne %d"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch totalement incompréhensible à la ligne %d"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "ouverture ou lecture de %s impossible"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "début de ligne invalide : '%c'"
-#: apply.c:3052
+#: apply.c:3055
#, 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:3064
+#: apply.c:3067
#, 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:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -361,331 +362,331 @@
"pendant la recherche de :\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "données de patch binaire manquantes pour '%s'"
-#: apply.c:3100
+#: apply.c:3103
#, 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:3146
+#: apply.c:3149
#, 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:3156
+#: apply.c:3159
#, 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:3164
+#: apply.c:3167
#, 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:3182
+#: apply.c:3185
#, 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:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "le patch binaire ne s'applique par correctement à '%s'"
-#: apply.c:3201
+#: apply.c:3204
#, 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:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "le patch a échoué : %s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "extraction de %s impossible"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "échec de la lecture de %s"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "lecture depuis '%s' au-delà d'un lien symbolique"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "le chemin %s a été renommé/supprimé"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s : n'existe pas dans l'index"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s : ne correspond pas à l'index"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"le dépôt n'a pas les blobs nécessaires pour un retour à une fusion à 3 "
"points."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Retour à une fusion à 3 points…\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "impossible de lire le contenu actuel de '%s'"
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Echec du retour à une fusion à 3 points…\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Patch %s appliqué avec des conflits.\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Patch %s appliqué proprement.\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "le patch de suppression laisse un contenu dans le fichier"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s : type erroné"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s est de type %o, mais %o attendu"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "chemin invalide '%s'"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s : existe déjà dans l'index"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s : existe déjà dans la copie de travail"
-#: apply.c:3941
+#: apply.c:3945
#, 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:3946
+#: apply.c:3950
#, 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:3966
+#: apply.c:3970
#, 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:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s : le patch ne s'applique pas"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "Vérification du patch %s..."
-#: apply.c:4076
+#: apply.c:4080
#, 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:4083
+#: apply.c:4087
#, 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:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "l'information de sha1 est manquante ou inutilisable (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "échec de make_cache_entry pour le chemin '%s'"
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "impossible d'ajouter %s à l'index temporaire"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "impossible d'écrire l'index temporaire dans %s"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "suppression de %s dans l'index impossible"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "patch corrompu pour le sous-module %s"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "stat du fichier nouvellement créé '%s' impossible"
-#: apply.c:4292
+#: apply.c:4296
#, 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:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "ajout de l'élément de cache %s impossible"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "échec de l'écriture dans '%s'"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "fermeture du fichier '%s'"
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "écriture du fichier '%s' mode %o impossible"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Patch %s appliqué proprement."
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "erreur interne"
-#: apply.c:4522
+#: apply.c:4526
#, 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:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "troncature du nom de fichier .rej en %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "impossible d'ouvrir %s"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Section n°%d appliquée proprement."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "Section n°%d rejetée."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "Chemin '%s' non traité."
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "entrée non reconnue"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "lecture du fichier d'index impossible"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "ouverture impossible du patch '%s' :%s"
-#: apply.c:4860
+#: apply.c:4864
#, 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:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, 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:4874
+#: apply.c:4878
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Impossible d'écrire le nouveau fichier d'index"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "chemin"
@@ -698,7 +699,7 @@
msgid "apply changes matching the given path"
msgstr "appliquer les modifications qui correspondent au chemin donné"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "num"
@@ -752,7 +753,7 @@
msgstr ""
"construire un index temporaire fondé sur l'information de l'index embarqué"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "les chemins sont séparés par un caractère NUL"
@@ -760,7 +761,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "s'assurer d'au moins <n> lignes de correspondance de contexte"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "action"
@@ -790,9 +793,9 @@
msgid "allow overlapping hunks"
msgstr "accepter les recouvrements de sections"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "mode verbeux"
@@ -806,7 +809,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "ne pas se fier au compte de lignes dans les en-têtes de section"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "racine"
@@ -833,108 +836,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <dépôt> [--exec <commande>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "le chemin '%s' ne correspond à aucun fichier"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "fmt"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "format d'archive"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "préfixe"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "préfixer chaque chemin de fichier dans l'archive"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "fichier"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "écrire l'archive dans ce fichier"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "lire .gitattributes dans le répertoire de travail"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "afficher les fichiers archivés sur stderr"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "stockage seulement"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "compression rapide"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "compression efficace"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "afficher les formats d'archive supportés"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "dépôt"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
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:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "commande"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "chemin vers la commande distante git-upload-archive"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Option --remote inattendue"
-#: archive.c:452
+#: archive.c:470
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:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Option --output inattendue"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Format d'archive inconnu '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argument non supporté pour le format '%s' : -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s n'est pas un nom valide d'attribut"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -942,22 +945,22 @@
"Les motifs de négation sont ignorés dans les attributs git\n"
"Utilisez '\\!' pour un point d'exclamation littéral."
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Contenu mal cité dans le fichier '%s' : %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Impossible de pousser la bissection plus loin !\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "%s n'est pas un nom de commit valide"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -966,7 +969,7 @@
"La base de fusion %s est mauvaise.\n"
"Cela signifie que le bogue été corrigé entre %s et [%s].\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -975,7 +978,7 @@
"La base de fusion %s est nouvelle.\n"
"La propriété a changé entre %s et [%s].\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -984,7 +987,7 @@
"La base de fusion %s est %s.\n"
"Ceci signifie que le premier commit '%s' est entre %s et [%s].\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -995,7 +998,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:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1007,36 +1010,36 @@
"et %s.\n"
"On continue tout de même."
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bissection : une base de fusion doit être testée\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "une révision %s est nécessaire"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "impossible de créer le fichier '%s'"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "impossible de lire le fichier '%s'"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "impossible de lire les références de bissection"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s était à la fois %s et %s\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1045,7 +1048,7 @@
"Aucun commit testable n'a été trouvé\n"
"Peut-être avez-vous démarré avec un mauvais paramètre de chemin ?\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1055,7 +1058,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -1076,10 +1079,10 @@
"--reverse et --first-parent ensemble nécessitent la spécification d'un "
"dernier commit"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "échec de la préparation du parcours des révisions"
@@ -1120,50 +1123,53 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+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."
+"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."
+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."
+"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."
+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."
+"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."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "La branche '%s' est paramétrée pour suivre la branche locale '%s'."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+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 "
+"La branche '%s' est paramétrée pour suivre la référence distante '%s' en "
"rebasant."
#: branch.c:105
#, 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 "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'."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"La branche %s est paramétrée pour suivre la référence locale %s en rebasant."
+"La branche '%s' est paramétrée pour suivre la référence locale '%s' en "
+"rebasant."
#: branch.c:110
#, 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 "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'."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1174,33 +1180,33 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Pas de suivi : information ambiguë pour la référence %s"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' n'est pas un nom de branche valide."
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Une branche nommée '%s' existe déjà."
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Impossible de forcer la mise à jour de la branche courante."
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"Impossible de paramétrer le suivi de branche ; le point de départ '%s' n'est "
"pas une branche."
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "la branche amont demandée '%s' n'existe pas"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1220,27 +1226,27 @@
"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:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Nom d'objet invalide : '%s'."
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Nom d'objet ambigu : '%s'."
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Point d'embranchement invalide : '%s'."
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' est déjà extrait dans '%s'"
-#: branch.c:366
+#: branch.c:382
#, 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"
@@ -1255,7 +1261,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "en-tête non reconnu : %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "impossible d'ouvrir '%s'"
@@ -1264,56 +1271,56 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Le dépôt ne dispose pas des commits prérequis suivants :"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Le colis contient cette référence :"
msgstr[1] "Le colis contient ces %d références :"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Le colis enregistre l'historique complet."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Le colis exige cette référence :"
msgstr[1] "Le colis exige ces %d références :"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Impossible de créer des objets groupés"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "les objets groupés ont disparu"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list a disparu"
-#: bundle.c:356
+#: bundle.c:363
#, 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:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "argument non reconnu : %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Refus de créer un colis vide."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "impossible de créer '%s'"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "l'index de groupe a disparu"
@@ -1322,8 +1329,8 @@
msgid "invalid color value: %.*s"
msgstr "Valeur invalide de couleur : %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "impossible d'analyser %s"
@@ -1333,7 +1340,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s n'est pas un commit !"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1345,7 +1352,7 @@
"variable de configuration i18n.commitencoding à l'encodage utilisé par votre "
"projet.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "plus de mémoire"
@@ -1444,85 +1451,90 @@
msgid "failed to expand user dir in: '%s'"
msgstr "impossible d'étendre le répertoire utilisateur dans : '%s'"
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' pour '%s' n'est pas un horodatage valide"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "niveau de compression zlib incorrect %d"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "mode invalide pour la création d'objet : %s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "niveau de compression du paquet %d"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr "lecture de la configuration de ligne de commande impossible"
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr "erreur inconnue pendant la lecture des fichiers de configuration"
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s invalide : '%s'"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"valeur '%s' de core.untrackedCache inconnue ; utilisation de 'keep' par "
"défaut"
-#: config.c:2111
+#: config.c:2162
#, 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:2122
+#: config.c:2187
#, 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:2124
+#: config.c:2189
#, 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:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s a des valeurs multiples"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "échec de fstat sur %s"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "impossible de régler '%s' à '%s'"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "impossible de désinitialiser '%s'"
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "L'hôte distant a fermé la connexion lors du contact initial"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1534,19 +1546,19 @@
"Veuillez vérifier que vous avez les droits d'accès\n"
"et que le dépôt existe."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Vérification de la connectivité"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Impossible de lancer 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "impossible d'écrire dans la rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "impossible de fermer l'entrée standard du rev-list"
@@ -1653,33 +1665,41 @@
msgid "failed to read orderfile '%s'"
msgstr "impossible de lire le fichier de commande '%s'"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "Détection de renommage inexact en cours"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "le commutateur '%s' a besoin d'une valeur"
-#: diff.c:125
+#: diff.c:152
#, 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:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Paramètre dirstat inconnu '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"le paramètre de couleur de déplacement doit être parmi 'no', 'default', "
+"'zebra', 'dimmed_zebra', 'plain'"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
"Valeur inconnue pour la variable de configuration 'diff.submodule' : '%s'"
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1688,20 +1708,20 @@
"Erreurs dans la variable de configuration 'diff.dirstat' :\n"
"%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "l'application de diff externe a disparu, arrêt à %s"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check et -s sont mutuellement exclusifs"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow a besoin d'une spécification de chemin unique"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1710,24 +1730,24 @@
"Impossible d'analyser le paramètre de l'option --dirstat/-X :\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Impossible d'analyser le paramètre de l'option --submodule : '%s'"
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"détection de renommage inexact annulée à cause d'un trop grand nombre de "
"fichiers."
-#: diff.c:4719
+#: diff.c:5449
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:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1735,207 +1755,218 @@
"vous souhaitez peut-être régler la variable %s à au moins %d et réessayer le "
"commande."
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "echec de l'obtention d'information de kernel"
-#: dir.c:2067
+#: dir.c:2219
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:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "impossible de créer les répertoires pour %s"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "impossible de migrer le répertoire git de '%s' vers '%s'"
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+"suggestion : en attente de la fermeture du fichier par votre éditeur de "
+"texte…%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Filtrage du contenu"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "impossible de stat le fichier '%s'"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack : list courte attendue"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack : ACK/NACK attendu, EOF reçu"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "erreur distante : %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack : ACK/NACK attendu, '%s' reçu"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc nécessite multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "ligne de superficiel invalide : %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ligne de fin de superficiel invalide : %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "objet non trouvé : %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "Erreur dans l'objet : %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "Pas de superficiel trouvé : %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "superficiel/non superficiel attendu, %s trouvé"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "réponse %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "commit invalide %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "abandon"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "fait"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "%s trouvé (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Marquage de %s comme terminé"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "%s déjà possédé (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack : impossible de dupliquer le démultiplexeur latéral"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "erreur de protocole : mauvais entête de paquet"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack : impossible de dupliquer %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "échec de %s"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "erreur dans le démultiplexer latéral"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "Le serveur ne supporte les clients superficiels"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "Le serveur supporte multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "Le serveur support no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "Le serveur supporte multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "Le serveur supporte side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "Le serveru supporte side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Le serveur supporte allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Le serveur supporte allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "Le serveur support ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "La version du serveur est %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "Le receveur ne gère pas --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Le receveur ne gère pas --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "Le receveur ne gère pas --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "pas de commit commun"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack : échec de le récupération."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "pas de HEAD distante correspondante"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "référence distante inconnue %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, 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é"
@@ -1948,7 +1979,7 @@
msgid "could not create temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "impossible d'écrire la signature détachée dans '%s'"
@@ -1958,17 +1989,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "couleur invalide '%.*s' ignorée dans log.graphColors"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s' : lecture de %s impossible"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "échec du stat de '%s'"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "'%s' : lecture tronquée"
@@ -2008,13 +2039,13 @@
#: help.c:363
#, c-format
msgid "Continuing under the assumption that you meant '%s'."
-msgstr "Continuons en supposant que vous avez voulu dire '%s'<"
+msgstr "Continuons en supposant que vous avez voulu dire '%s'."
#: help.c:368
#, 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'<"
+"Continuons dans %0.1f secondes en supposant que vous avez voulu dire '%s'."
#: help.c:376
#, c-format
@@ -2039,12 +2070,12 @@
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -2112,12 +2143,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "le nom n'est constitué que de caractères interdits : %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "format de date invalide : %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "impossible de combiner des types multiples de filtre d'objets"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "expression de filtre invalide : '%s'"
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2136,87 +2176,87 @@
"un processus git peut avoir planté :\n"
"supprimez le fichier manuellement pour poursuivre."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Impossible de créer '%s.lock' : %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "impossible de lire le cache"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "impossible d'écrire le nouveau fichier d'index"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(mauvais commit)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "échec de addinfo_cache pour le chemin '%s'"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "erreur de construction des arbres"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "impossible de créer le chemin '%s' %s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": peut-être un conflit D/F ?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "refus de perdre le fichier non suivi '%s'"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "impossible de lire l'objet %s '%s'"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob attendu pour %s '%s'"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "échec à l'ouverture de '%s' : %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "échec à la création du lien symbolique '%s' : %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "ne sait pas traiter %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Échec à l'exécution de la fusion interne"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "Impossible d'ajouter %s à la base de données"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2225,7 +2265,7 @@
"CONFLIT (%s/suppression) : %s supprimé dans %s et %s dans %s. Version %s de "
"%s laissée dans l'arbre."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2234,7 +2274,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:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2243,7 +2283,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:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2252,20 +2292,20 @@
"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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "renommage"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "renommé"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, 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:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2274,141 +2314,146 @@
"CONFLIT (renommage/renommage) : Renommage de \"%s\"->\"%s\" dans la branche "
"\"%s\" et renommage \"%s\"->\"%s\" dans \"%s\"%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (laissé non résolu)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Renommage de %s en %s et de %s en %s à la place"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"CONFLIT (renommage/ajout) : Renommage de %s->%s dans %s. %s ajouté dans %s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Ajout de %s fusionné"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Ajout plutôt comme %s"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "impossible de lire l'objet %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "l'objet %s n'est pas un blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "modification"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "modifié"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "contenu"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "ajout/ajout"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "%s sauté (fusion identique à l'existant)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Fusion automatique de %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "sous-module"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "CONFLIT (%s) : Conflit de fusion dans %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Suppression de %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "fichier/répertoire"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "répertoire/fichier"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "Ajout de %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Index sale : fusion impossible (sales : %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "Déjà à jour !"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "échec de fusion des arbres %s et %s"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Fusion :"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, 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:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "la fusion n'a pas retourné de commit"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Impossible d'analyser l'objet '%s'"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Impossible d'écrire l'index."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2419,7 +2464,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:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Vous n'avez pas terminé votre fusion de notes (%s existe)."
@@ -2447,16 +2492,31 @@
msgid "Bad %s value: '%s'"
msgstr "Mauvaise valeur de %s : '%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "impossible d'analyser l'objet : %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
+
+#: packfile.c:1683
+#, 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:1687
+#, 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.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "usage : %s"
@@ -2464,17 +2524,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " ou : %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
@@ -2483,7 +2543,7 @@
msgid "malformed object name '%s'"
msgstr "nom d'objet malformé '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Impossible de rendre %s inscriptible pour le groupe"
@@ -2562,25 +2622,16 @@
"%s : le spécificateur magique de chemin n'est pas supporté par cette "
"commande : %s"
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"les chaines de caractères vides comme spécificateurs de chemin seront "
-"invalides dans les prochaines versions. Veuillez utiliser . à la place pour "
-"correspondre à tous le chemins"
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "le chemin '%s' est au-delà d'un lien symbolique"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "impossible d'analyser le format --pretty"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2589,7 +2640,7 @@
"version d'index renseignée, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2598,52 +2649,53 @@
"GIT_INDEX_VERSION est renseigné, mais la valeur est invalide.\n"
"Utilisation de la version %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "impossible de fermer '%s'"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "stat impossible de '%s'"
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "impossible d'ouvrir le répertoire git : %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "échec lors de l'unlink : %s"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Impossible d'ouvrir '%s' en écriture"
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr "mises à jour des références interdites en environnement de quarantaine"
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "Impossible de supprimer la référence %s : %s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "impossible de supprimer les références : %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "impossible de supprimer la référence %s"
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "Impossible de supprimer la référence %s : %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "impossible de supprimer les références : %s"
+
# à priori on parle d'une branche ici
-#: ref-filter.c:35 wt-status.c:1811
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "disparue"
@@ -2662,157 +2714,157 @@
msgid "ahead %d, behind %d"
msgstr "en avance de %d, en retard de %d"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "format attendu : %%(color:<couleur>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "couleur non reconnue : %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Valeur entière attendue refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Valeur entière attendue refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "argument %%(%s) non reconnu : %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) n'accepte pas d'argument"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) n'accepte pas d'argument"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) n'accepte pas d'argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "argument %%(trailers) inconnu : %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "valeur positive attendue contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "argument %%(contents) non reconnu : %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "valeur positive attendue objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "argument %%(objectname) non reconnu : %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "format attendu : %%(align:<largeur>,<position>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "position non reconnue : %s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "largeur non reconnue : %s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "argument %%(align) non reconnu : %s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "valeur positive attendue avec l'atome %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "argument %%(if) non reconnu : %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "nom de champ malformé %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "nom de champ inconnu : %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format : atome %%(if) utilisé sans un atome %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format : atome %%(then) utilisé sans un atome %%(if)"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format : atome %%(then) utilisé plus d'une fois"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atome %%(then) utilisé après %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(if)"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format : atome %%(else) utilisé sans un atome %%(then)"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format : atome %%(else) utilisé plus d'une fois"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format : atome %%(end) utilisé sans atome correspondant"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "Chaîne de formatage mal formée %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(aucune branche, rebasage de %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(aucune branche, bisect a démarré sur %s)"
@@ -2820,7 +2872,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD détachée sur %s)"
@@ -2828,140 +2880,140 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD détachée depuis %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(aucune branche)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "objet manquant %s pour %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "echec de parse_object_buffer sur %s pour %s"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "objet malformé à '%s'"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "réf avec un nom cassé %s ignoré"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "réf cassé %s ignoré"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atome %%(end) manquant"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "nom d'objet malformé %s"
-#: remote.c:747
+#: remote.c:780
#, 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:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s suit habituellement %s, pas %s"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s suit à la fois %s et %s"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "Erreur interne"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD ne pointe pas sur une branche"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "pas de branche '%s'"
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "aucune branche amont configurée pour la branche '%s'"
-#: remote.c:1698
+#: remote.c:1729
#, 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:1713
+#: remote.c:1744
#, 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:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "la branche '%s' n'a aucune branche distante de poussée"
-#: remote.c:1736
+#: remote.c:1767
#, 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:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "la poussée n'a pas de destination (push.default vaut 'nothing')"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
"impossible de résoudre une poussée 'simple' pour une destination unique"
-#: remote.c:2076
+#: remote.c:2106
#, 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:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (utilisez \"git branch --unset-upstream\" pour corriger)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "Votre branche est à jour avec '%s'.\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (utilisez \"git push\" pour publier vos commits locaux)\n"
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2973,11 +3025,11 @@
"Votre branche est en retard sur '%s' de %d commits, et peut être mise à jour "
"en avance rapide.\n"
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (utilisez \"git pull\" pour mettre à jour votre branche locale)\n"
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2992,47 +3044,57 @@
"Votre branche et '%s' ont divergé,\n"
"et ont %d et %d commits différents chacune respectivement.\n"
-#: remote.c:2117
+#: remote.c:2147
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"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "votre branche actuelle semble cassée"
-#: revision.c:2190
+#: revision.c:2271
#, 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:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent est incompatible avec --bisect"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "échec de l'ouverture de /dev/null"
-#: send-pack.c:151
+#: run-command.c:1188
+#, 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:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "impossible d'analyser l'état de dépaquetage distant : %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "le dépaquetage a échoué : %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "impossible de signer le certificat de poussée"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "Le receveur ne gère pas les poussées avec --signed"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -3040,32 +3102,32 @@
"pas d'envoi de certificat de poussée car le receveur ne gère pas les "
"poussées avec --signed"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "Le receveur ne gère pas les poussées avec --atomic"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "Le receveur ne gère pas les options de poussées"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revert"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Action inconnue : %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -3073,7 +3135,7 @@
"après résolution des conflits, marquez les chemins corrigés\n"
"avec 'git add <chemins>' ou 'git rm <chemins>'"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3083,42 +3145,43 @@
"avec 'git add <chemins>' ou 'git rm <chemins>'\n"
"puis validez le résultat avec 'git commit'"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "impossible de verrouiller '%s'"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "impossible d'écrire dans '%s'"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "impossible d'écrire la fin de ligne dans '%s'"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "échec lors de la finalisation de '%s'."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "impossible de lire '%s'"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "vos modifications locales seraient écrasées par %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "validez vos modifications ou les remiser pour continuer."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s : avance rapide"
@@ -3126,20 +3189,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Impossible d'écrire le nouveau fichier index"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "impossible de résoudre le commit HEAD\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "impossible de résoudre le commit HEAD"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "impossible de mettre à jour l'arbre de cache\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "impossible de mettre à jour l'arbre de cache"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3168,17 +3231,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "impossible d'analyser le commit %s\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "impossible d'analyser le commit parent %s\n"
+msgid "could not parse commit %s"
+msgstr "impossible d'analyser le commit %s"
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "impossible d'analyser le commit parent %s"
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3189,7 +3252,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3200,232 +3263,243 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "Ceci est la combinaison de %d commits."
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "une HEAD est nécessaire à la correction"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "Impossible de lire HEAD"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "impossible de lire le message de validation de HEAD"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "impossible d'écrire '%s'"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Ceci est le premier message de validation :"
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "impossible de lire le message de validation de %s"
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "Ceci est le message de validation numéro %d :"
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Le message de validation %d sera ignoré :"
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "commande inconnue : %d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "votre fichier d'index n'est pas fusionné."
-#: sequencer.c:973
+#: sequencer.c:986
#, 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:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "le commit %s n'a pas de parent %d"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
"une branche principale a été spécifiée mais le commit %s n'est pas une "
"fusion."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s : impossible d'analyser le commit parent %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "impossible de renommer '%s' en '%s'"
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "impossible d'annuler %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "impossible d'appliquer %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "l'ensemble de commits spécifié est vide"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s : échec à la lecture de l'index"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s : échec du rafraîchissement de l'index"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s n'accepte pas d'argument : '%s'"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argument manquant pour %s"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ligne %d invalide : %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "'%s' impossible avec le commit précédent"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "impossible de lire '%s'."
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "feuille d'instruction inutilisable : '%s'"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "aucun commit analysé."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "impossible de picorer pendant l'annulation d'un commit."
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "impossible d'annuler un commit pendant un picorage."
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "clé invalide : %s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "valeur invalide pour %s : %s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "feuille d'options malformée : %s"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "un picorage ou un retour est déjà en cours"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "essayez \"git cherry-pick (--continue|--quit|-- abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "impossible de créer le répertoire de séquenceur '%s'"
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "impossible de verrouiller HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "aucun picorage ou retour en cours"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "impossible de résoudre HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr "impossible d'abandonner depuis une branche non encore créée"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "impossible d'ouvrir '%s'"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "impossible de lire '%s' : %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "fin de fichier inattendue"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, 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:1658
+#: sequencer.c:1691
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:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "impossible de lire HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "impossible de copier '%s' vers '%s'"
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "impossible de lire l'index"
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3440,11 +3514,11 @@
"git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
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:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3461,17 +3535,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Autoremisage appliqué.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "impossible de stocker %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3482,57 +3556,57 @@
"Vos modifications sont à l'abri dans la remise.\n"
"Vous pouvez lancer \"git stash pop\" ou \"git stash drop\" à tout moment.\n"
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "arrêt à %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "commande inconnue %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "impossible de lire orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "impossible de lire 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "impossible de mettre à jour %s"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "impossible de mettre à jour HEAD sur %s"
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "impossible de rebaser : vous avez des modifications non indexées."
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "impossible de supprimer CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "impossible de corriger un commit non-existant"
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "fichier invalide : '%s'"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "contenu invalide : '%s'"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3542,24 +3616,97 @@
"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:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s : impossible de picorer un %s"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s : mauvaise révision"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "impossible d'annuler en tant que commit initial"
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script : options non gérées"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script : erreur lors de la préparation des révisions"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "liste à faire inutilisable : '%s'"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"paramètre non reconnu %s pour l'option rebase.missingCommitsCheck. Ignoré."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Attention : certains commits ont pu être accidentellement supprimés.\n"
+"Commits supprimés (du plus jeune au plus vieux) :\n"
+
+#: sequencer.c:2702
+#, 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 ""
+"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
+"commit.\n"
+"\n"
+"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
+"d'avertissements.\n"
+"Les comportements disponibles sont : ignore, warn, error.\n"
+"\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
+"rebase --continue'.\n"
+"Ou vous pouvez abandonner le rebasage avec 'git rebase --abort'.\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "impossible d'ouvrir '%s' en écriture"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "impossible d'analyser le commit '%s'"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "le script a déjà été réarrangé."
+
#: setup.c:171
#, c-format
msgid ""
@@ -3592,34 +3739,34 @@
"Utilisez '--' pour séparer les chemins des révisions, comme ceci :\n"
"'git <commande> [<révision>...] -- [<chemin>...]'"
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Version attendue du dépôt git <= %d, %d trouvée"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "extensions de dépôt inconnues trouvées :"
-#: setup.c:810
+#: setup.c:811
#, 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:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Impossible de revenir au répertoire de travail courant"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "Impossible d'accéder au répertoire de travail courant"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "Impossible de modifié en '%s'"
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3630,7 +3777,7 @@
"Arrêt à la limite du système de fichiers (GIT_DISCOVERY_ACROSS_FILESYSTEM "
"n'est pas activé)."
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3640,58 +3787,43 @@
"Le propriétaire des fichiers doit toujours avoir les droits en lecture et "
"écriture."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "le chemin '%s' n'existe pas"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"extraire le dépôt de référence '%s' comme une extraction liée n'est pas "
"encore supporté."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "le dépôt de référence '%s' n'est pas un dépôt local."
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "le dépôt de référence '%s' est superficiel"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "le dépôt de référence '%s' est greffé"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset avant la fin du fichier paquet (.idx cassé ?)"
-
-#: sha1_file.c:2729
-#, 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 ?)"
-
-#: sha1_file.c:2733
-#, 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é ?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "le SHA1 court %s est ambigu"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "Les candidats sont :"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3716,67 +3848,72 @@
"message\n"
"en lançant \"git config advice.objectNameWarning false\""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"Modification impossible de .gitmodules non fusionné, résolvez les conflits "
"d'abord"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Impossible de trouver une section où path=%s dans .gitmodules"
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Impossible de mettre à jour l'élément %s de .gitmodules"
# ici %s est un chemin
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Impossible de supprimer l'élément de .gitmodules pour %s"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "échec de la mise en index du .gitmodules mis à jour"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "dans le sous-module '%s' non populé"
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Le chemin '%s' est dans le sous-module '%.*s'"
-#: submodule.c:1337
+#: submodule.c:833
+#, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Échec de résolution de HEAD comme référence valide."
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s' n'est pas reconnu comme dépôt git"
-#: submodule.c:1475
+#: submodule.c:1508
#, 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:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "impossible de lancer 'git status' dans le sous-module '%s'"
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "le sous-module '%s' a un index sale"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3784,18 +3921,18 @@
"relocate_gitdir pour le sous-module '%s' avec plus d'un arbre de travail "
"n'est pas supporté"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "impossible de trouve le nom pour le sous-module '%s'"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "impossible de créer le répertoire '%s'"
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3806,79 +3943,83 @@
"'%s' sur\n"
"'%s'\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "récursion impossible dans le sous-module '%s'"
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "impossible de démarrer ls-files dans .."
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG : le chemin renvoyé ne correspond pas à cwd ?"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree a renvoyé un code de retour inattendu %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "les valeurs négatives ne sont pas permises pour submodule.fetchJobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "Valeur invalide pour %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "échec de la commande trailer '%s'"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "valeur inconnue '%s' pour la clé '%s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "plus d'un %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "symbole vide dans la ligne de fin '%.*s'"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "impossible de lire le fichier d'entrée '%s'"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "Impossible de lire depuis l'entrée standard"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "stat impossible de %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "%s n'est pas un fichier régulier"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "le fichier %s n'est pas inscriptible par l'utilisateur"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "impossible de créer un fichier temporaire"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "impossible de renommer un fichier temporaire en %s"
@@ -3893,7 +4034,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport : option de profondeur invalide '%s'"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3902,7 +4043,7 @@
"Les chemins suivant de sous-module contiennent des modifications\n"
"qui ne peuvent être trouvées sur aucun distant :\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3929,11 +4070,11 @@
"pour les pousser vers un serveur distant.\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "Abandon."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "impossible de lire la réf %s"
@@ -3950,11 +4091,11 @@
msgid "empty filename in tree entry"
msgstr "nom de fichier vide dans une entrée de l'arbre"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "fichier arbre trop court"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3965,7 +4106,7 @@
"%%sVeuillez valider ou remiser vos modifications avant de basculer de "
"branche."
-#: unpack-trees.c:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3975,7 +4116,7 @@
"l'extraction :\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3985,7 +4126,7 @@
"fusion :\n"
"%%sVeuillez valider ou remiser vos modifications avant la fusion."
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3995,7 +4136,7 @@
"fusion :\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -4004,7 +4145,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%sVeuillez valider ou remiser vos modifications avant %s."
-#: unpack-trees.c:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -4013,7 +4154,7 @@
"Vos modifications locales aux fichiers suivants seraient écrasées par %s :\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -4023,7 +4164,7 @@
"contenus :\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -4033,7 +4174,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -4042,7 +4183,7 @@
"Les fichiers suivants non suivis seraient effacés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4052,7 +4193,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -4061,7 +4202,7 @@
"Les fichiers suivants non suivis seraient effacés par la fusion :\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4071,7 +4212,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4080,7 +4221,7 @@
"Les fichiers suivants non suivis seraient effacés par %s :\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4091,7 +4232,7 @@
"l'extraction :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant de basculer de branche."
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4101,7 +4242,7 @@
"Les fichiers suivants non suivis seraient écrasés par l'extraction :\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4111,7 +4252,7 @@
"la fusion :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant la fusion."
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4120,7 +4261,7 @@
"Les fichiers suivants non suivis seraient écrasés par la fusion :\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4130,7 +4271,7 @@
"%s :\n"
"%%sVeuillez renommer ou effacer ces fichiers avant %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4139,22 +4280,22 @@
"Les fichiers suivants non suivis seraient écrasés par %s :\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "L'entrée '%s' surcharge avec '%s'. Affectation impossible."
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"Mise à jour d'extraction creuse impossible : les entrées suivantes ne sont "
"pas à jour :\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4165,7 +4306,7 @@
"jour par l'extraction creuse :\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4176,7 +4317,7 @@
"à jour par extraction creuse :\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4185,19 +4326,12 @@
"Mise à jour impossible pour le sous-module :\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "Abandon\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-"stratégie de mise à jour de sous-module non supportée pour le sous-module "
-"'%s'"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "Extraction des fichiers"
@@ -4240,13 +4374,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "impossible d'ouvrir '%s' en lecture/écriture"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "impossible d'ouvrir '%s' en écriture"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "impossible d'ouvrir '%s' en lecture"
@@ -4260,276 +4389,266 @@
msgid "unable to get current working directory"
msgstr "impossible d'accéder au répertoire de travail courant"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "Impossible d'écrire dans %s"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "impossible de fermer %s"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Chemins non fusionnés :"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (utilisez \"git reset %s <fichier>...\" pour désindexer)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (utilisez \"git rm --cached <fichier>...\" pour désindexer)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (utilisez \"git add <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" si nécessaire pour marquer comme "
"résolu)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (utilisez \"git rm <fichier>...\" pour marquer comme résolu)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "Modifications qui seront validées :"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "Modifications qui ne seront pas validées :"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add <fichier>...\" pour mettre à jour ce qui sera validé)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (utilisez \"git add/rm <fichier>...\" pour mettre à jour ce qui sera "
"validé)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (utilisez \"git checkout -- <fichier>...\" pour annuler les modifications "
"dans la copie de travail)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (valider ou annuler le contenu non suivi ou modifié dans les sous-modules)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (utilisez \"git %s <fichier>...\" pour inclure dans ce qui sera validé)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "supprimé des deux côtés :"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "ajouté par nous :"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "supprimé par eux :"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "ajouté par eux :"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "supprimé par nous :"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "ajouté de deux côtés :"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "modifié des deux côtés :"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "nouveau fichier :"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "copié :"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "supprimé :"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "modifié :"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "renommé :"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "modif. type :"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "inconnu :"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "non fusionné :"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "nouveaux commits, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "contenu modifié, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "contenu non suivi, "
-#: wt-status.c:821
+#: wt-status.c:824
#, 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:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "Sous-modules modifiés mais non mis à jour :"
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "Changements du sous-module à valider :"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"Ne touchez pas à la ligne ci-dessus\n"
+"Ne touchez pas à la ligne ci-dessus.\n"
"Tout ce qui suit sera éliminé."
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "Vous avez des chemins non fusionnés."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (réglez les conflits puis lancez \"git commit\")"
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (utilisez \"git merge --abort\" pour annuler la fusion)"
-#: wt-status.c:1059
+#: wt-status.c:1063
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:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " (utilisez \"git commit\" pour terminer la fusion)"
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr "Vous êtes au milieu d'une session am."
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "Le patch actuel est vide."
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (réglez les conflits puis lancez \"git am --continue\")"
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (utilisez \"git am --skip\" pour sauter ce patch)"
-#: wt-status.c:1083
+#: wt-status.c:1087
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (utilisez \"git am --abort\" pour restaurer la branche d'origine)"
-#: wt-status.c:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo est manquant."
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "Aucune commande réalisée."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Dernière commande effectuée (%d commande effectuée) :"
msgstr[1] "Dernières commandes effectuées (%d commandes effectuées) :"
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " (voir plus dans le fichier %s)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "Aucune commande restante."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Prochaine commande à effectuer (%d commande restante) :"
msgstr[1] "Prochaines commandes à effectuer (%d commandes restantes) :"
-#: wt-status.c:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (utilisez \"git rebase --edit-todo\" pour voir et éditer)"
-#: wt-status.c:1259
+#: wt-status.c:1264
#, 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:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "Vous êtes en train de rebaser."
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (réglez les conflits puis lancez \"git rebase --continue\")"
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (utilisez \"git rebase --skip\" pour sauter ce patch)"
-#: wt-status.c:1282
+#: wt-status.c:1287
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:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git rebase --continue\")"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4537,128 +4656,128 @@
"Vous êtes actuellement en train de fractionner un commit pendant un rebasage "
"de la branche '%s' sur '%s'."
-#: wt-status.c:1297
+#: wt-status.c:1302
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:1300
+#: wt-status.c:1305
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:1304
+#: wt-status.c:1309
#, 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:1309
+#: wt-status.c:1314
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:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (utilisez \"git commit --amend\" pour corriger le commit actuel)"
-#: wt-status.c:1314
+#: wt-status.c:1319
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:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Vous êtes actuellement en train de picorer le commit %s."
-#: wt-status.c:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (réglez les conflits puis lancez \"git cherry-pick --continue\")"
-#: wt-status.c:1332
+#: wt-status.c:1337
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:1334
+#: wt-status.c:1339
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:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Vous êtes actuellement en train de rétablir le commit %s."
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (réglez les conflits puis lancez \"git revert --continue\")"
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (tous les conflits sont réglés : lancez \"git revert --continue\")"
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (utilisez \"git revert --abort\" pour annuler le rétablissement)"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, 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:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "Vous êtes en cours de bissection."
-#: wt-status.c:1371
+#: wt-status.c:1376
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:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "Sur la branche "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "rebasage interactif en cours ; sur "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "rebasage en cours ; sur "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "HEAD détachée sur "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "HEAD détachée depuis "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "Actuellement sur aucun branche."
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "Validation initiale"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "Aucun commit"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "Fichiers non suivis"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "Fichiers ignorés"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4670,32 +4789,32 @@
"oublier d'ajouter les nouveaux fichiers par vous-même (voir 'git help "
"status')."
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "Fichiers non suivis non affichés%s"
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr " (utilisez -u pour afficher les fichiers non suivis)"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "Aucune modification"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, 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:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "aucune modification ajoutée à la validation\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4704,67 +4823,67 @@
"aucune modification ajoutée à la validation mais des fichiers non suivis "
"sont présents (utilisez \"git add\" pour les suivre)\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, 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:1658
+#: wt-status.c:1663
#, 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:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "rien à valider\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, 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:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "rien à valider, la copie de travail est propre\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
-msgstr "Encore aucun commit sur "
+msgstr "Encore aucun commit sur "
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (aucune branche)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "derrière "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "devant "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "Impossible de %s : vous avez des modifications non indexées."
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "de plus, votre index contient des modifications non validées."
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s impossible : votre index contient des modifications non validées."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "échec lors de l'unlink de '%s'"
@@ -4773,126 +4892,131 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<options>] [--] <chemin>..."
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "état de diff inattendu %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "échec de la mise à jour des fichiers"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "suppression de '%s'\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr "Modifications non indexées après rafraîchissement de l'index :"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Impossible de lire l'index"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Impossible d'ouvrir '%s' en écriture."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "Impossible d'écrire le patch"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "échec de l'édition du patch"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "Stat de '%s' impossible"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "Patch vide. Abandon."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "Impossible d'appliquer '%s'"
-#: builtin/add.c:249
+#: builtin/add.c:271
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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "simuler l'action"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "sélection interactive"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "sélection interactive des sections"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "édition du diff actuel et application"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "permettre l'ajout de fichiers ignorés"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "mettre à jour les fichiers suivis"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+"renormaliser les fins de lignes (EOL) des fichiers suivis (implique -u)"
+
+#: builtin/add.c:300
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:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr "ajouter les modifications de tous les fichiers suivis et non suivis"
-#: builtin/add.c:281
+#: builtin/add.c:304
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:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "ne pas ajouter, juste rafraîchir l'index"
-#: builtin/add.c:284
+#: builtin/add.c:307
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:285
+#: builtin/add.c:308
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:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "outrepasser le bit exécutable pour les fichiers listés"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "avertir lors de l'ajout d'un dépôt embarqué"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4923,155 +5047,155 @@
"\n"
"Référez-vous à \"git help submodule\" pour plus d'information."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "dépôt git embarqué ajouté : %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Utilisez -f si vous voulez réellement les ajouter.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "échec de l'ajout de fichiers"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "-A et -u sont mutuellement incompatibles"
-#: builtin/add.c:401
+#: builtin/add.c:424
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:405
+#: builtin/add.c:428
#, 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:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Rien de spécifié, rien n'a été ajouté.\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Vous vouliez sûrement dire 'git add .' ?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "fichier d'index corrompu"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "impossible d'analyser le script author"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' a été effacé par le crochet applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Ligne en entrée malformée : '%s'."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Impossible de copier les notes de '%s' vers '%s'"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "échec de fseek"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "impossible d'analyser le patch '%s'"
-#: builtin/am.c:842
+#: builtin/am.c:855
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:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "horodatage invalide"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "ligne de Date invalide"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "décalage horaire invalide"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "Échec de détection du format du patch."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "échec de la création du répertoire '%s'"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "Échec de découpage des patchs."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "impossible d'écrire le fichier d'index"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, 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:1172
+#: builtin/am.c:1161
#, 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:1173
+#: 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:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Le patch actuel est vide."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ligne d'identification invalide : %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "impossible d'analyser le commit %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
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:1588
+#: builtin/am.c:1552
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:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -5079,38 +5203,38 @@
"Avez-vous édité le patch à la main ?\n"
"Il ne s'applique pas aux blobs enregistrés dans son index."
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "Retour à un patch de la base et fusion à 3 points..."
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Échec d'intégration des modifications."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "git write-tree a échoué à écrire un arbre"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "application à un historique vide"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "échec de l'écriture de l'objet commit"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "impossible de continuer : %s n'existe pas."
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"impossible d'être interactif sans entrée standard connectée à un terminal."
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "Le corps de la validation est :"
@@ -5118,35 +5242,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
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:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Index sale : impossible d'appliquer des patchs (sales : %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Application de %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "Pas de changement -- Patch déjà appliqué."
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "le patch a échoué à %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "La copie du patch qui a échoué se trouve dans : %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5157,7 +5281,7 @@
"introduit les mêmes changements ; vous pourriez avoir envie de sauter ce "
"patch."
-#: builtin/am.c:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -5170,17 +5294,17 @@
"Vous pouvez lancer 'git rm' sur un fichier \"supprimé par eux\" pour "
"accepter son état."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "Impossible d'analyser l'objet '%s'."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "échec du nettoyage de l'index"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5188,136 +5312,135 @@
"Vous semblez avoir déplacé la HEAD depuis le dernier échec de 'am'.\n"
"Pas de retour à ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Valeur invalide pour --patch-format : %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<options>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<options>] (--continue | --quit | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "exécution interactive"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "option historique -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "permettre de revenir à une fusion à 3 points si nécessaire"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "être silencieux"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "ajouter une ligne Signed-off-by au message de validation"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "recoder en utf-8 (par défaut)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "passer l'option -k à git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "passer l'option -b à git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "passer l'option -m à git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
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:2241
+#: builtin/am.c:2204
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:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "retirer tout le contenu avant la ligne des ciseaux"
-#: 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:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "le passer jusqu'à git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "format de présentation des patchs"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
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:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "continuer à appliquer les patchs après résolution d'un conflit"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "synonymes de --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "sauter le patch courant"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr ""
"restaurer la branche originale et abandonner les applications de patch."
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "mentir sur la date de validation"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "utiliser l'horodatage actuel pour la date d'auteur"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "id-clé"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "signer les commits avec GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(utilisation interne pour git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5325,17 +5448,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:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "échec à la lecture de l'index"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, 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:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5344,7 +5467,7 @@
"Répertoire abandonné %s trouvé.\n"
"Utilisez \"git am --abort\" pour le supprimer."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
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 "
@@ -5384,21 +5507,72 @@
msgid "git archive: expected a flush"
msgstr "git archive : vidage attendu"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect --helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <terme-pour-mauvais> <terme-pour-bon>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' n'est pas un terme valide"
+
+#: builtin/bisect--helper.c:50
+#, 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:60
+#, 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:71
+msgid "please use two different terms"
+msgstr "veuillez utiliser deux termes différents"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "impossible d'ouvrir le fichier BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "effectuer 'git bisect next'"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "écrire les termes dans .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "vérifier l'état de la bissection"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "vérifier si des révisions sont attendues"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "mettre à jour BISECT_HEAD au lieu d'extraire le commit actuel"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms exige deux arguments"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state ne supporte aucun argument"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
-msgstr "git blame [<options>] [<options-de-révision>] [<rev>] [--] <fichier>"
+msgstr "git blame [<options>] [<rev-opts>] [<rev>] [--] <fichier>"
#: builtin/blame.c:32
msgid "<rev-opts> are documented in git-rev-list(1)"
@@ -5465,7 +5639,7 @@
#: builtin/blame.c:682
msgid "Show author email instead of name (Default: off)"
-msgstr "Afficher l'courriel de l'auteur au lieu du nom (Défaut : désactivé)"
+msgstr "Afficher le courriel de l'auteur au lieu du nom (Défaut : désactivé)"
#: builtin/blame.c:683
msgid "Ignore whitespace differences"
@@ -5537,7 +5711,7 @@
#: builtin/blame.c:928
msgid "Blaming lines"
-msgstr "Assignation de blâme au lignes"
+msgstr "Assignation de blâme aux lignes"
#: builtin/branch.c:27
msgid "git branch [<options>] [-r | -a] [--merged | --no-merged]"
@@ -5557,14 +5731,19 @@
"git branch [<options>] (-m | -M) [<ancienne-branche>] <nouvelle-branche>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr ""
+"git branch [<options>] (-c | -C) [<ancienne-branche>] <nouvelle-branche>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<options>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<options>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5573,7 +5752,7 @@
"suppression de la branche '%s' qui a été fusionnée dans\n"
" '%s', mais pas dans HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5582,12 +5761,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:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Impossible de rechercher l'objet commit pour '%s'"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5596,93 +5775,116 @@
"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:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Échec de la mise à jour du fichier de configuration"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "impossible d'utiliser -a avec -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "Impossible de rechercher l'objet commit pour HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Impossible de supprimer la branche '%s' extraite dans '%s'"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "branche de suivi '%s' non trouvée."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "branche '%s' non trouvée."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Erreur lors de la suppression de la branche de suivi '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Erreur lors de la suppression de la branche '%s'"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, 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:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Branche %s supprimée (précédemment %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "impossible d'analyser la chaîne de format"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "La branche %s est en cours de rebasage sur %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "La branche %s est en cours de bissection sur %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+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:473
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:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Nom de branche invalide : '%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "Échec de renommage de la branche"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Échec de copie de la branche"
+
+#: builtin/branch.c:517
+#, 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:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "Renommage d'un branche mal nommée '%s'"
+msgstr "Renommage d'une branche mal nommée '%s'"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, 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:506
+#: builtin/branch.c:535
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:522
+#: builtin/branch.c:537
+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:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5693,176 +5895,184 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "Options génériques"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
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:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "supprimer les messages d'information"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "régler le mode de suivi (voir git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "modifier l'information amont"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "ne pas utiliser"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "amont"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "modifier l'information amont"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "Désactiver l'information amont"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "utiliser la coloration dans la sortie"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "agir sur les branches de suivi distantes"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "afficher seulement les branches qui contiennent le commit"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "afficher seulement les branches qui ne contiennent pas le commit"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "Actions spécifiques à git-branch :"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "afficher à la fois les branches de suivi et les branches locales"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "supprimer une branche totalement fusionnée"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "supprimer une branche (même non fusionnée)"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr "déplacer/renommer une branche et son reflog"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr "déplacer/renommer une branche, même si la cible existe"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "copier une branche et son reflog"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "copier une branche, même si la cible existe"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "afficher les noms des branches"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "créer le reflog de la branche"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "éditer la description de la branche"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "forcer la création, le déplacement/renommage, ou la suppression"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "afficher seulement les branches qui sont fusionnées"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "afficher seulement les branches qui ne sont pas fusionnées"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "afficher les branches en colonnes"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "clé"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "nom du champ servant à trier"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "objet"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "afficher seulement les branches de l'objet"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "le tri et le filtrage sont non-sensibles à la casse"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format à utiliser pour la sortie"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Échec de résolution de HEAD comme référence valide."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "HEAD non trouvée sous refs/heads !"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "--column et --verbose sont incompatibles"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "le nom de branche est requis"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "Impossible de décrire une HEAD détachée"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "impossible d'éditer la description de plus d'une branche"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Aucun commit sur la branche '%s'."
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "Aucune branche nommée '%s'."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "trop de branches pour une opération de renommage"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "trop de branches pour une opération de copie"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "trop de branches pour spécifier une branche amont"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "trop d'arguments pour une opération de renommage"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "trop d'arguments pour spécifier une branche amont"
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5870,59 +6080,43 @@
"impossible de spécifier une branche amont de HEAD par %s qui ne pointe sur "
"aucune branche."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "pas de branche '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "la branche '%s' n'existe pas"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "trop de branches pour désactiver un amont"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "trop d'arguments pour désactiver un amont"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
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:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "La branche '%s' n'a aucune information de branche amont"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "créer manuellement 'HEAD' n'a pas de sens"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"les options -a et -r de 'git branch' n'ont pas de sens avec un nom de branche"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"l'option --set-upstream est obsolète et va disparaître. Utilisez plutôt --"
-"track ou --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Si vous vouliez que '%s' suive '%s', faites ceci :\n"
-"\n"
+"l'option '--set-upstream' est obsolète. Utilisez '--track' ou '--set-"
+"upstream-to' à la place."
#: builtin/bundle.c:45
#, c-format
@@ -5937,7 +6131,7 @@
msgid "Need a repository to unbundle."
msgstr "Le dépaquetage d'un colis requiert un dépôt."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5945,7 +6139,7 @@
"git cat-file (-t [--allow-unknow-type] | -s [--allow-unknow-type] | -e | -p "
"| <type> | --textconv | --filters) [--path=<chemin>] <objet>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5953,66 +6147,66 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<type> peut être : blob, tree, commit ou tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "afficher le type de l'objet"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "afficher la taille de l'objet"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
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:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "afficher avec mise en forme le contenu de l'objet"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
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:566
+#: builtin/cat-file.c:568
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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "utiliser un chemin spécifique pour --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
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:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "bufferiser la sortie de --batch"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
"afficher l'information et le contenu des objets passés en entrée standard"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
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:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"suivre les liens symbolique internes à la copie de travail (utilisé avec --"
"batch ou --batch-check)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "montrer tous les objets avec --batch ou --batch-check"
@@ -6041,7 +6235,7 @@
msgstr ""
"terminer les enregistrements en entrée et en sortie par un caractère NUL"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "supprimer l'état d'avancement"
@@ -6098,164 +6292,164 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<options>] [--] [<fichier>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr "stage doit valoir entre 1 et 3, ou all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "extraire tous les fichiers présents dans l'index"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "forcer l'écrasement des fichiers existants"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
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:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "ne pas extraire les nouveaux fichiers"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "mettre à jour l'information de stat dans le fichier d'index"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr "lire la liste des chemins depuis l'entrée standard"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "écrire le contenu dans des fichiers temporaires"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "chaîne"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr "lors de la création de fichiers, préfixer par <chaîne>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "copier les fichiers depuis l'index nommé"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<options>] <branche>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<options>] [<branche>] -- <fichier>..."
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "le chemin '%s' n'a pas notre version"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "le chemin '%s' n'a pas leur version"
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, 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:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "le chemin '%s' n'a pas les versions nécessaires"
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "chemin '%s' : impossible de fusionner"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Impossible d'ajouter le résultat de fusion pour '%s'"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, 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:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' ne peut pas être utilisé avec %s"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, 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:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "le chemin '%s' n'est pas fusionné"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr "vous devez d'abord résoudre votre index courant"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Impossible de faire un reflog pour '%s' : %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD est maintenant sur"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "impossible de mettre à jour HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "Déjà sur '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Basculement et remise à zéro de la branche '%s'\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Basculement sur la nouvelle branche '%s'\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Basculement sur la branche '%s'\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " ... et %d en plus.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6278,7 +6472,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6307,162 +6501,162 @@
"git branch <nouvelle-branche> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "erreur interne lors du parcours des révisions"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "La position précédente de HEAD était sur"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr "Vous êtes sur une branche qui doit encore naître"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "une seule référence attendue, %d fournies."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "référence invalide : %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "la référence n'est pas un arbre : %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "impossible d'utiliser des chemins avec un basculement de branches"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, 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:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' ne peut pas être utilisé avec '%s'"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, 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:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "branche"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "créer et extraire une nouvelle branche"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "créer/réinitialiser et extraire une branche"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "créer un reflog pour une nouvelle branche"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "détacher la HEAD au commit nommé"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "paramétrer les coordonnées de branche amont pour une nouvelle branche"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "nouvelle branche"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "nouvelle branche sans parent"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "extraire notre version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "extraire leur version pour les fichiers non fusionnés"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "forcer l'extraction (laisser tomber les modifications locales)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr "effectuer une fusion à 3 points avec la nouvelle branche"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "mettre à jour les fichiers ignorés (par défaut)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "style"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "style de conflit (merge (fusion) ou diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
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:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "réessayer d'interpréter 'git checkout <branche-inexistante>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "forcer l'affichage de l'état d'avancement"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B et --orphan sont mutuellement exclusifs"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "--track requiert un nom de branche"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "Nom de branche manquant ; essayez -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "spécification de chemin invalide"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, 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 être créée depuis."
+"'%s' n'est pas un commit et une branche '%s' ne peut pas en être créée depuis"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, 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:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6501,7 +6695,7 @@
msgid "failed to remove %s"
msgstr "échec de la suppression de %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6514,7 +6708,7 @@
"foo - sélectionner un élément par un préfixe unique\n"
" - (vide) ne rien sélectionner\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6535,38 +6729,38 @@
"* - choisir tous les éléments\n"
" - (vide) terminer la sélection\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hein (%s) ?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "Entrez les motifs à ignorer>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ATTENTION : Impossible de trouver les éléments correspondant à : %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr "Sélectionner les éléments à supprimer"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Supprimer %s [y/N] ? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Au revoir.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6584,63 +6778,64 @@
"help - cet écran\n"
"? - aide pour la sélection en ligne"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Commandes ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "Et maintenant ?"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
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:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "Plus de fichier à nettoyer, sortie."
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "ne pas afficher les noms des fichiers supprimés"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "forcer"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "nettoyage interactif"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "supprimer les répertoires entiers"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "motif"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "ajouter <motif> aux règles ignore"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "supprimer les fichiers ignorés, aussi"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "supprimer seulement les fichiers ignorés"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "-x et -X ne peuvent pas être utilisés ensemble"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6648,7 +6843,7 @@
"clean.requireForce positionné à true et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clean.c:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6656,145 +6851,147 @@
"clean.requireForce à true par défaut et ni -i, -n ou -f fourni ; refus de "
"nettoyer"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<options>] [--] <dépôt> [<répertoire>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "ne pas créer d'extraction"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "créer un dépôt nu"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "créer un dépôt miroir (implique dépôt nu)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "pour cloner depuis un dépôt local"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "ne pas utiliser de liens durs locaux, toujours copier"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "régler comme dépôt partagé"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "spécificateur de chemin"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "initialiser les sous-modules dans le clone"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "nombre de sous-modules clonés en parallèle"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "répertoire-modèle"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "répertoire depuis lequel les modèles vont être utilisés"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "dépôt de référence"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "utiliser seulement --reference pour cloner"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "nom"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "utiliser <nom> au lieu de 'origin' pour suivre la branche amont"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "extraire <branche> au lieu de la HEAD du répertoire distant"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "chemin vers git-upload-pack sur le serveur distant"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "profondeur"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "créer un clone superficiel de cette profondeur"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "heure"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "créer un clone superficiel depuis une date spécifique"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "révision"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
"approfondir l'historique d'un clone superficiel en excluant une révision"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "cloner seulement une branche, HEAD ou --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-"ne pas cloner les tags et indiquer au récupérations futures de ne pas le "
+"ne pas cloner les tags et indiquer aux récupérations futures de ne pas le "
"faire"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "tous les sous-modules clonés seront superficiels"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "séparer le répertoire git de la copie de travail"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "clé=valeur"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "régler la configuration dans le nouveau dépôt"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "n'utiliser que des adresses IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "n'utiliser que des adresses IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6802,42 +6999,42 @@
"Aucun nom de répertoire n'a pu être deviné\n"
"Veuillez spécifier un répertoire dans la ligne de commande"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, 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:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "échec à l'ouverture de '%s'"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s existe et n'est pas un répertoire"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "échec du stat de %s\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "échec de la création du lien '%s'"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "échec de la copie vers '%s'"
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "fait.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6847,102 +7044,102 @@
"Vous pouvez inspecter ce qui a été extrait avec 'git status'\n"
"et réessayer l'extraction avec 'git checkout -f HEAD'\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Impossible de trouver la branche distante '%s' à cloner."
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "le serveur distant n'a pas envoyé tous les objets nécessaires"
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "impossible de mettre à jour %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
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:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "impossible d'extraire la copie de travail"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "impossible d'écrire les paramètres dans le fichier de configuration"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "impossible de remballer pour nettoyer"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "impossible de unlinker le fichier temporaire alternates"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "Trop d'arguments."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Vous devez spécifier un dépôt à cloner."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "les options --bare et --origin %s sont incompatibles."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare et --separate-git-dir sont incompatibles."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "le dépôt '%s' n'existe pas"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "la profondeur %s n'est pas un entier positif"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, 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:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "la copie de travail '%s' existe déjà."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, 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:967
+#: builtin/clone.c:971
#, 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:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Clonage dans le dépôt nu '%s'\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Clonage dans '%s'...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6950,42 +7147,37 @@
"clone --recursive n'est pas compatible avec à la fois --reference et --"
"reference-if-able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
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:1069
+#: builtin/clone.c:1073
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:1071
+#: builtin/clone.c:1075
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:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "le dépôt source est superficiel, option --local ignorée"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local est ignoré"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Je ne sais pas cloner %s"
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, 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:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "Vous semblez avoir cloné un dépôt vide."
@@ -7129,61 +7321,61 @@
"Puis \"git cherry-pick --continue\" continuera le picorage \n"
"des commits restants.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "échec du dépaquetage de l'objet arbre HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "impossible de créer l'index temporaire"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "échec de l'ajout interactif"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "impossible de mettre à jour l'index temporaire"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Impossible de mettre à jour l'arbre de cache principal"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "impossible d'écrire le fichier new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "impossible de faire une validation partielle pendant une fusion."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "impossible de faire une validation partielle pendant un picorage."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "impossible de lire l'index"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "impossible d'écrire le fichier d'index temporaire"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "entête d'auteur manquant dans le commit '%s'"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "le commit '%s' a une ligne d'auteur malformée"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "paramètre --author mal formé"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -7191,38 +7383,38 @@
"impossible de sélectionner un caractère de commentaire\n"
"qui n'est pas utilisé dans le message de validation actuel"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "impossible de rechercher le commit %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, 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:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "impossible de lire le journal depuis l'entrée standard"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "impossible de lire le fichier de journal '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "impossible de lire SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "impossible de lire MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "impossible d'écrire le modèle de commit"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7237,7 +7429,7 @@
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7252,7 +7444,7 @@
"\t%s\n"
"et essayez à nouveau.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7262,7 +7454,7 @@
"commençant par '%c' seront ignorées, et un message vide abandonne la "
"validation.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7273,150 +7465,159 @@
"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:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sAuteur : %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sDate : %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sValidateur : %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Impossible de lire l'index"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "Erreur lors de la construction des arbres"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, 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:1068
+#: builtin/commit.c:1076
#, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Mode de fichier ignoré invalide '%s'"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Mode de fichier non suivi invalide '%s'"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "--long et -z sont incompatibles"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
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:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "Il n'y a rien à corriger."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Vous êtes en pleine fusion -- impossible de corriger (amend)."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
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:1168
+#: builtin/commit.c:1189
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:1178
+#: builtin/commit.c:1199
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:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "L'option -m ne peut pas être combinée avec -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
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:1205
+#: builtin/commit.c:1226
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:1207
+#: builtin/commit.c:1228
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:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Mode de nettoyage invalide %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "Spécifier des chemins avec l'option -a n'a pas de sens."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "afficher l'état avec concision"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "afficher l'information de branche"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "afficher l'information de remisage"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "version"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "sortie pour traitement automatique"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "afficher l'état en format long (par défaut)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "terminer les éléments par NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "mode"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"afficher les fichiers non suivis, \"mode\" facultatif : all (tous), normal, "
"no. (Défaut : all)"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "afficher les fichiers ignorés"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"afficher les fichiers ignorés, \"mode\" facultatif : traditional "
+"(traditionnel), matching (correspondant), no. (Défaut : traditional)"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "quand"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7424,201 +7625,211 @@
"ignorer les modifications dans les sous-modules, \"quand\" facultatif : all "
"(tous), dirty (sale), untracked (non suivi). (Défaut : all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "afficher les fichiers non suivis en colonnes"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+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:1469
msgid "couldn't look up newly created commit"
msgstr "impossible de retrouver le commit nouvellement créé"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr "impossible d'analyser le commit nouvellement créé"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "impossible de résoudre HEAD après création du commit"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "HEAD détachée"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (commit racine)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "supprimer le résumé après une validation réussie"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "afficher les diff dans le modèle de message de validation"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "Options du message de validation"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "lire le message depuis un fichier"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "auteur"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "remplacer l'auteur pour la validation"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "date"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "remplacer la date pour la validation"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "message"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "message de validation"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "commit"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "réutiliser et éditer le message du commit spécifié"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "réutiliser le message du commit spécifié"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"utiliser un message au format autosquash pour corriger le commit spécifié"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
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:1599
+#: builtin/commit.c:1630
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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "ajouter une entrée Signed-off-by :"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "utiliser le fichier de modèle spécifié"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "forcer l'édition du commit"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "défaut"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "comment éliminer les espaces et les commentaires # du message"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "inclure l'état dans le modèle de message de validation"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "signer la validation avec GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "Valider les options des contenus"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "valider tous les fichiers modifiés"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "ajouter les fichiers spécifiés à l'index pour la validation"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "ajouter des fichiers en mode interactif"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "ajouter les modifications en mode interactif"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "valider seulement les fichiers spécifiés"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "éviter d'utiliser les crochets pre-commit et commit-msg"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "afficher ce qui serait validé"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "corriger la validation précédente"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "éviter d'utiliser le crochet post-rewrite"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "accepter d'enregistrer une modification vide"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "accepter d'enregistrer une modification avec un message vide"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "impossible d'analyser le commit HEAD"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Fichier MERGE_HEAD corrompu (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "impossible de lire MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "impossible de lire le message de validation : %s"
-#: builtin/commit.c:1747
-#, 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:1752
+#: builtin/commit.c:1778
#, 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:1800
+#: builtin/commit.c:1783
+#, 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:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7632,142 +7843,146 @@
msgid "git config [<options>]"
msgstr "git config [<options>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "Emplacement du fichier de configuration"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "utiliser les fichier de configuration global"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "utiliser le fichier de configuration du système"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "utiliser le fichier de configuration du dépôt"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "utiliser le fichier de configuration spécifié"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "lire la configuration depuis l'objet blob fourni"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "Action"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "obtenir la valeur : nom [regex-de-valeur]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "obtenir toutes les valeurs : clé [regex-de-valeur]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "obtenir les valeur pour la regexp : regex-de-nom [regex-de-valeur]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "obtenir la valeur spécifique pour l'URL : section[.var] URL"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
"remplacer toutes les variables correspondant : nom valeur [regex-de-valeur]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "ajouter une nouvelle variable : nom valeur"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "supprimer une variable : nom [regex-de-valeur]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "supprimer toutes les correspondances nom [regex-de-valeur]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "renommer une section : ancien-nom nouveau-nom"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "supprimer une section : nom"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "afficher tout"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "ouvrir un éditeur"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "trouver la couleur configurée : slot [par défaut]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "trouver le réglage de la couleur : slot [stdout-est-tty]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "Type"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "la valeur est \"true\" (vrai) ou \"false\" (faux)"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "la valeur est un nombre décimal"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "la valeur est --bool ou --int"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "la valeur est un chemin (vers un fichier ou un répertoire)"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "la valeur est une date d'expiration"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "Autre"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "terminer les valeurs avec un caractère NUL"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "n'afficher que les noms de variable"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "respecter les directives d'inclusion lors de la recherche"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"afficher l'origine de la configuration (fichier, entrée standard, blob, "
"ligne de commande)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "impossible de lire la valeur de couleur par défaut"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7782,16 +7997,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local ne peut être utilisé qu'à l'intérieur d'un dépôt git"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "création impossible du fichier de configuration '%s'"
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7800,75 +8015,67 @@
"impossible de surcharger des valeurs multiples avec une seule valeur\n"
" Utilisez une regexp, --add ou --replace-all pour modifier %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "affiche les tailles dans un format humainement lisible"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<options>] <commit ou apparenté>*"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<options>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "tête"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "léger"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "annoté"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "l'étiquette annotée %s n'est pas disponible"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "l'étiquette annotée %s n'a pas de nom embarqué"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "l'étiquette '%s' est en fait '%s'"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "%s n'est pas un nom d'objet valide"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s n'est pas un objet '%s' valide"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "aucune étiquette ne correspond parfaitement à '%s'"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "recherche de la description de %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Pas de correspondance exacte sur des réfs ou des étiquettes, recherche par "
+"describe\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "recherche terminée à %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7877,7 +8084,7 @@
"Aucune étiquette annotée ne peut décrire '%s'.\n"
"Cependant, il existe des étiquettes non-annotées : essayez avec --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7886,12 +8093,12 @@
"Aucune étiquette ne peut décrire '%s'.\n"
"Essayez --always, ou créez des étiquettes."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "%lu commits parcourus\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7901,77 +8108,92 @@
"affichées\n"
"abandon de la recherche à %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "décrire %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "%s n'est pas un nom d'objet valide"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s n'est ni un commit ni un blob"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "rechercher l'étiquette qui suit le commit"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "déboguer la stratégie de recherche sur stderr"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "utiliser n'importe quelle référence"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "utiliser n'importe quelle étiquette, même non-annotée"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "toujours utiliser le format long"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "ne suivre que le premier parent"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "n'afficher que les correspondances exactes"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
"considérer uniquement les <n> étiquettes le plus récentes (défaut : 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "ne considérer que les étiquettes correspondant à <motif>"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "ne pas considérer les étiquettes correspondant à <motif>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "afficher les objets commits abrégés en dernier recours"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "marque"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "ajouter <marque> si la copie de travail est sale (défaut : \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
"ajouter <marque> si la copie de travail est cassée (défaut : \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "--long et --abbrev=0 sont incompatibles"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "aucun nom trouvé, impossible de décrire quoi que ce soit."
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty est incompatible avec la spécification de commits ou assimilés"
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken est incompatible avec les commits ou assimilés"
@@ -7980,26 +8202,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "'%s' : n'est pas un fichier régulier ni un lien symbolique"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "option invalide : %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "Ce n'est pas un dépôt git !"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "objet spécifié '%s' invalide."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "plus de deux blobs spécifiés : '%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "objet non géré '%s' spécifié."
@@ -8008,27 +8230,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<options>] [<commit> [<commit>]] [--] [<chemin>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "échec : %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "lecture du lien symbolique %s impossible"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "impossible de lire le fichier symlink %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, 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:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -8036,53 +8258,53 @@
"les formats de diff combinés ('-c' et '--cc') ne sont pas supportés\n"
"dans le mode de diff de répertoire ('-d' et '--dir-diff')."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "les deux fichiers sont modifiés : '%s' et '%s'."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "le fichier dans l'arbre de travail a été laissé."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "des fichiers temporaires existent dans '%s'."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "vous pourriez souhaiter les nettoyer ou les récupérer."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "utiliser `diff.guitool` au lieu de `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "réalise un diff de répertoire complet"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "ne pas confirmer avant de lancer l'outil de diff"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "utiliser les liens symboliques en mode de diff de répertoire"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<outil>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "utiliser l'outil de diff spécifié"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "afficher une liste des outils de diff utilisables avec `--tool`"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -8090,19 +8312,19 @@
"provoque la fin de 'git-difftool' si l'outil de diff invoqué renvoie un code "
"non-nul"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<commande>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "spécifier une commande personnalisée pour visualiser les différences"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "pas d'<outil> spécifié pour --tool=<outil>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "pas de <commande> spécifié pour --extcmd=<commande>"
@@ -8110,146 +8332,146 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [options-de-liste-de-révisions]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "afficher la progression après <n> objets"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "sélectionner la gestion des étiquettes signées"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
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:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Enregistrer les marques dans ce fichier"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "importer les marques depuis ce fichier"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
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:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Afficher l'arbre complet pour chaque commit"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Utiliser la fonction \"done\" pour terminer le flux"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Sauter l'affichage de données de blob"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "spécificateur de référence"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
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:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "anonymise la sortie"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<options>] <groupe>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<options>] [(<dépôt> | <groupe>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<options>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "récupérer depuis tous les dépôts distants"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "ajouter à .git/FETCH_HEAD au lieu de l'écraser"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "chemin vers lequel télécharger le paquet sur le poste distant"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "forcer l'écrasement de la branche locale"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "récupérer depuis plusieurs dépôts distants"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "récupérer toutes les étiquettes et leurs objets associés"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "ne pas récupérer toutes les étiquettes (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "nombre de sous-modules récupérés en parallèle"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "à la demande"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "conserver le paquet téléchargé"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "permettre la mise à jour de la référence HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "approfondir l'historique d'un clone superficiel"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
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:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "convertir en un dépôt complet"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "répertoire"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "préfixer ceci à la sortie du chemin du sous-module"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -8257,91 +8479,91 @@
"par défaut pour la récupération récursive de sous-modules (priorité plus "
"basse que les fichiers de config)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "accepter les références qui mettent à jour .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "correspondance de référence"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "spécifier une correspondance de référence pour la récupération"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "impossible de trouver la référence HEAD distante"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, 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:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "objet %s non trouvé"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[à jour]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[rejeté]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "impossible de récupérer dans la branche actuelle"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[mise à jour de l'étiquette]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "impossible de mettre à jour la référence locale"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[nouvelle étiquette]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[nouvelle branche]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[nouvelle référence]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "mise à jour forcée"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "pas en avance rapide"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, 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:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
"%s rejeté parce que les racines superficielles ne sont pas mises à jour"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "Depuis %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8350,55 +8572,50 @@
"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:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s sera en suspens)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s est devenu en suspens)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[supprimé]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(aucun(e))"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Refus de récupérer dans la branche courant %s d'un dépôt non nu"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "La valeur \"%2$s\" de l'option \"%1$s\" est invalide pour %3$s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "L'option \"%s\" est ignorée pour %s\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Je ne sais pas récupérer depuis %s"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "Récupération de %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Impossible de récupérer %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8406,40 +8623,40 @@
"Aucun dépôt distant spécifié. Veuillez spécifier une URL ou un nom\n"
"distant depuis lesquels les nouvelles révisions devraient être récupérées."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "Vous devez spécifier un nom d'étiquette."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "Une profondeur négative dans --deepen n'est pas supportée"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen et --depth sont mutuellement exclusifs"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth et --unshallow ne peuvent pas être utilisés ensemble"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
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:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all n'accepte pas d'argument de dépôt"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
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:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "distant ou groupe distant inexistant : %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
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 "
@@ -8451,23 +8668,23 @@
msgstr ""
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <fichier>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
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:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "alias pour --log (obsolète)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "texte"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "utiliser <texte> comme début de message"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "fichier d'où lire"
@@ -8507,102 +8724,106 @@
msgid "show only <n> matched refs"
msgstr "n'afficher que <n> références correspondant"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "respecter les couleurs de formatage"
+
+#: builtin/for-each-ref.c:43
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:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "afficher seulement les références qui sont fusionnées"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
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:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "afficher seulement les références qui contiennent le commit"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "afficher seulement les références qui ne contiennent pas le commit"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Vérification des répertoires d'objet"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<options>] [<objet>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "afficher les objets inaccessibles"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "afficher les objets en suspens"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "afficher les étiquettes"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "signaler les nœuds racines"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
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:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "considérer les reflogs comme nœuds tête (par défaut)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "inspecter aussi les objets pack et alternatifs"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "ne vérifier que la connectivité"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "activer une vérification plus strict"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "écrire les objets en suspens dans .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "afficher la progression"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "afficher les noms étendus pour les objets inaccessibles"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Vérification des objets"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<options>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Échec du stat de %s : %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "impossible de faire un stat de %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8618,47 +8839,47 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "éliminer les objets non référencés"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "être plus consciencieux (durée de traitement allongée)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "activer le mode auto-gc"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
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:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "impossible de lire la valeur de gc.logexpiry %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, 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:410
+#: builtin/gc.c:411
#, 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:411
+#: builtin/gc.c:412
#, 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:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8666,7 +8887,7 @@
"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:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8677,12 +8898,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<options>] [-e] <motif> [<révision>...] [[--] <chemin>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep : échec de création du fil: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "nombre de fils spécifié invalide (%d) pour %s"
@@ -8691,258 +8912,250 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "pas de support des fils, ignore %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "impossible de lire l'arbre (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, 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:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "l'option '%c' attend un valeur numérique"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
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:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "rechercher dans les contenus non gérés par git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "rechercher dans les fichiers suivis et non-suivis"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "ignorer les fichiers spécifiés via '.gitignore'"
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "rechercher récursivement dans chaque sous-module"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "nom de base"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "préfixer le nom de base du projet parent à la sortie"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "afficher les lignes qui ne correspondent pas"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "correspondance insensible à la casse"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "rechercher les motifs aux séparateurs de mots"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "traiter les fichiers binaires comme texte"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "ne pas chercher les motifs dans les fichiers binaires"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr "traiter les fichiers binaires avec les filtres textconv"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "descendre au plus de <profondeur> dans l'arborescence"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "utiliser des expressions régulières étendues POSIX"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "utiliser des expressions régulières basiques POSIX (par défaut)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "interpréter les motifs comme de chaînes fixes"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "utiliser des expressions régulières compatibles avec Perl"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "afficher les numéros de ligne"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "ne pas pas afficher les noms de fichier"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "afficher les noms de fichier"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr "afficher les noms de fichiers relativement au répertoire de base"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "n'afficher que les noms de fichiers au lieu des lignes correspondant"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "synonyme pour --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr "n'afficher que les noms des fichiers sans correspondance"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "imprimer une caractère NUL après le noms de fichier"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr "afficher le nombre de correspondances au lieu des lignes correspondant"
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "mettre en évidence les correspondances"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr ""
"imprimer une ligne vide entre les correspondances de fichiers différents"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
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:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "afficher <n> lignes de contexte avant et après les correspondances"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "afficher <n> lignes de contexte avant les correspondances"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "afficher <n> lignes de contexte après les correspondances"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "utiliser <n> fils de travail"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "raccourci pour -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
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:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "afficher la fonction contenante"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "lire les motifs depuis fichier"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "rechercher <motif>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "combiner les motifs spécifiés par -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr ""
"indiquer des correspondances avec le code de sortie mais sans rien afficher"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
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:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "afficher l'arbre d'analyse pour le motif grep"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "pagineur"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "afficher les fichiers correspondant dans le pagineur"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "permettre l'appel de grep(1) (ignoré par ce build)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "aucun motif fourni."
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
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:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "impossible de résoudre la révision : %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "nombre de fils spécifié invalide (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "pas de support des fils, ignore --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
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:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "option non supportée avec --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
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:1316
+#: builtin/grep.c:1090
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:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "--cached et des arbres sont fournis en même temps."
@@ -9035,12 +9248,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "la version d'emacsclient '%d' est trop ancienne (<22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "échec de l'exécution de '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -9049,7 +9262,7 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel non supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -9058,353 +9271,353 @@
"'%s' : chemin pour l'utilitaire de visualisation de manuel supporté.\n"
"Veuillez utiliser plutôt 'man.<outil>.cmd'."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s' : visualiseur de manuel inconnu."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "aucun visualiseur de manuel n'a pris en charge la demande"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "aucun visualiseur de 'info' n'a pris en charge la demande"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Définition des attributs par chemin"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git de tous les jours avec à peu près 20 commandes"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Un glossaire Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Spécifie les fichiers non-suivis à ignorer intentionnellement"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Définition des propriétés de sous-module"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Spécification des révisions et portées pour Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
"Une introduction pratique à Git (pour les versions 1.5.1 et supérieures)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Un aperçu des flux de travail recommandés avec Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Les guides Git populaires sont : \n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s\" est un alias de `%s'"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' est un alias de '%s'"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "usage : %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "impossible d'ouvrir %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "type d'objet non correspondant à %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "objet attendu non reçu %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "objet %s : type attendu %s, reçu %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, 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:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "fin de fichier prématurée"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "erreur de lecture sur l'entrée"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "plus d'octets utilisés que disponibles"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "le paquet dépasse la taille maximale permise"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "impossible de créer '%s'"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "impossible d'ouvrir le fichier paquet '%s'"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "la signature du paquet ne correspond pas"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "la version de paquet %<PRIu32> non supportée"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, 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:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "la décompression (inflate) a retourné %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
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:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "l'objet delta de base est hors limite"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "type d'objet inconnu %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "impossible de lire (pread) le fichier paquet"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "grave incohérence dans la décompression (inflate)"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "COLLISION SHA1 TROUVÉE AVEC %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "impossible de lire %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "impossible de lire l'information existante de l'objet %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "impossible de lire l'objet existant %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "objet blob invalide %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "%s invalide"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Erreur dans l'objet"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "échec d'application du delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Réception d'objets"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Indexation d'objets"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "le paquet est corrompu (SHA1 ne correspond pas)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "impossible d'obtenir le statut (fstat) du fichier paquet"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "le paquet est invalide à la fin"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "confusion extrême dans parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Résolution des deltas"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "impossible de créer le fil : %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "confusion extrême"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, 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:1282
+#: builtin/index-pack.c:1283
#, 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:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "impossible de compresser l'objet ajouté (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "l'objet local %s est corrompu"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "erreur en fermeture du fichier paquet"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "impossible d'écrire le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "impossible de fermer le fichier \"keep\" '%s'"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "impossible de stocker le fichier paquet"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "impossible de stocker le fichier d'index"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "mauvais pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Impossible d'ouvrir le fichier paquet existant '%s'"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, 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:1602
+#: builtin/index-pack.c:1603
#, 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:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "longueur chaînée = %d : %lu objet"
msgstr[1] "longueur chaînée = %d : %lu objets"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "le nom de fichier paquet '%s' ne se termine pas par '.pack'"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "mauvais %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin ne peut pas être utilisé sans --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "--stdin requiert un dépôt git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "--verify sans nom de fichier paquet donné"
@@ -9536,134 +9749,174 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbole>[(=|:)<valeur>])...] [<fichier>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "éditer les fichiers sur place"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "éliminer les lignes de fin vides"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "où placer les nouvelles lignes terminales"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "action si les lignes terminales existent déjà"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "action si les lignes terminales manquent"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "éliminer les lignes terminales vides"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "ne pas appliquer les règles de la configuration"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "joindre les valeurs continuées avec des caractères blancs"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "paramètres d'analyse"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "ligne de fin"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "ligne(s) de fin à ajouter"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer n'a aucune signification avec --only-input"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "aucun fichier en entrée pour l'éditon sur place"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<options>] [<plage de révisions>] [[--] <chemin>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<options>] <objet>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "option --decorate invalide : %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "supprimer la sortie des différences"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "afficher la source"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "Utiliser le fichier de correspondance de mail"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "décorer seulement les références correspondant à <motif>"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "ne pas décorer les références correspondant à <motif>"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "décorer les options"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr ""
"Traiter seulement l'intervalle de lignes n,m du fichier en commençant le "
"compte à 1"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "Sortie finale : %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s : fichier incorrect"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "Impossible de lire l'objet %s"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "Type inconnu : %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "format.headers sans valeur"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "le nom du répertoire de sortie est trop long"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "Impossible d'ouvrir le fichier correctif %s"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "Exactement une plage nécessaire."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "Ceci n'est pas une plage."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "La lettre de motivation doit être au format courriel"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to aberrant : %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<options>] [<depuis> | <plage de révisions>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "Deux répertoires de sortie ?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "Commit inconnu %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Impossible de résoudre '%s' comme une référence valide."
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "Impossible de trouver la base de fusion exacte."
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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"
@@ -9676,221 +9929,230 @@
"ou vous pouvez spécifier le commit de base par --base=<id-du-commit-de-base> "
"manuellement."
-#: builtin/log.c:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "Impossible de trouver la base de fusion exacte"
-#: builtin/log.c:1315
+#: builtin/log.c:1326
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:1319
+#: builtin/log.c:1330
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:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "impossible d'obtenir l'id du patch"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr "utiliser [PATCH n/m] même avec un patch unique"
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "utiliser [PATCH] même avec des patchs multiples"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "afficher les patchs sur la sortie standard"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "générer une lettre de motivation"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
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:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "utiliser <sfx> au lieu de '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
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:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "marquer la série comme une Nième réédition"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "utiliser [RFC PATCH] au lieu de [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "utiliser [<préfixe>] au lieu de [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "stocker les fichiers résultats dans <répertoire>"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "ne pas retirer/ajouter [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "ne pas imprimer les diffs binaires"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "écrire une empreinte à zéro dans l'entête From"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr "ne pas inclure un patch correspondant à un commit amont"
-#: builtin/log.c:1462
+#: builtin/log.c:1475
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:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "Communication"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "en-tête"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
-msgstr "ajouter l'en-tête d'courriel"
+msgstr "ajouter l'en-tête de courriel"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "courriel"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "ajouter l'en-tête \"To:\""
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "ajouter l'en-tête \"Cc:\""
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
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:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "id-message"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "répondre dans le premier message à <id-message>"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "limite"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "attacher le patch"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "patch à l'intérieur"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr ""
"activer l'enfilage de message, styles : shallow (superficiel), deep (profond)"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "signature"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "ajouter une signature"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "commit-de-base"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "Ajouter un arbre prérequis à la série de patchs"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "ajouter une signature depuis un fichier"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "ne pas afficher les noms de fichiers des patchs"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr ""
+"afficher la barre de progression durant la phase de génération des patchs"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "ligne d'identification invalide : %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "-n et -k sont mutuellement exclusifs."
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc et -k sont mutuellement exclusifs."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "--name-only n'a pas de sens"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "--name-status n'a pas de sens"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "--check n'a pas de sens"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "sortie standard, ou répertoire, lequel ?"
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "Impossible de créer le répertoire '%s'"
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "lecture du fichier de signature '%s' impossible"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Génération des patchs"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "Échec de création des fichiers en sortie"
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<branche_amont> [<head> [<limite>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9908,96 +10170,100 @@
#: builtin/ls-files.c:519
msgid "use lowercase letters for 'assume unchanged' files"
-msgstr "utiliser des minuscules pour les fichier 'assumés inchangés'"
+msgstr "utiliser des minuscules pour les fichiers 'assumés inchangés'"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "utiliser des minuscules pour les fichiers 'fsmonitor clean'"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "afficher les fichiers mis en cache dans la sortie (défaut)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "afficher les fichiers supprimés dans la sortie"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "afficher les fichiers modifiés dans la sortie"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "afficher les autres fichiers dans la sortie"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "afficher les fichiers ignorés dans la sortie"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr "afficher les nom des objets indexés dans la sortie"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
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:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "afficher seulement les noms des répertoires 'other'"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "afficher les fins de lignes des fichiers"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "ne pas afficher les répertoires vides"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "afficher les fichiers non fusionnés dans la sortie"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "afficher l'information resolv-undo"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "sauter les fichiers correspondant au motif"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "les motifs d'exclusion sont lus depuis <fichier>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
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:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "ajouter les exclusions git standard"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
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:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
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:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "arbre ou apparenté"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
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:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "afficher les données de débogage"
@@ -10092,181 +10358,185 @@
msgid "empty mbox: '%s'"
msgstr "mbox vide : '%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<options>] [<commit>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "le commutateur `m' a besoin d'une valeur"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Impossible de trouver la stratégie de fusion '%s'.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Les stratégies disponibles sont :"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Les stratégies personnalisées sont :"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "afficher un diffstat à la fin de la fusion"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(synonyme de --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
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:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "effectuer une validation si la fusion réussit (défaut)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "éditer le message avant la validation"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "autoriser l'avance rapide (défaut)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "abandonner si l'avance rapide n'est pas possible"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "stratégie"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "stratégie de fusion à utiliser"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "option=valeur"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "option pour la stratégie de fusion sélectionnée"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
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:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "abandonner la fusion en cours"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "continuer la fusion en cours"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "permettre la fusion d'historiques sans rapport"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "vérifier le crochet commit-msg"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "impossible de lancer le remisage."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "échec du remisage"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "pas un objet valide : %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree a échoué"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (rien à compresser)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Validation compressée -- HEAD non mise à jour\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, 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:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' ne pointe pas sur un commit"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Mauvaise chaîne branch.%s.mergeoptions : %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
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:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Options inconnue pour merge-recursive : -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "impossible d'écrire %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "Impossible de lire depuis '%s'"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, 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:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -10283,70 +10553,70 @@
"Les lignes commençant par '%c' seront ignorées, et un message vide\n"
"abandonne la validation.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "Message de validation vide."
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "Merveilleux.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, 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:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "Pas de branche courante."
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "Pas de branche distante pour la branche courante."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
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:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Pas de branche de suivi pour %s depuis %s"
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Mauvaise valeur '%s' dans l'environnement '%s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "pas possible de fusionner ceci dans %s : %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "pas possible de fusionner ceci"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "--abort n'accepte pas d'argument"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
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:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "--continue ne supporte aucun argument"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
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:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10354,7 +10624,7 @@
"Vous n'avez pas terminé votre fusion (MERGE_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10362,114 +10632,114 @@
"Vous n'avez pas terminé votre picorage (CHERRY_PICK_HEAD existe).\n"
"Veuillez valider vos modifications avant de pouvoir fusionner."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
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:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "Vous ne pouvez pas combiner --squash avec --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
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:1225
+#: builtin/merge.c:1254
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:1227
+#: builtin/merge.c:1256
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:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - pas possible de fusionner ceci"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
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:1268
+#: builtin/merge.c:1297
#, 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."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, 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."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "La validation %s n'a pas de signature GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, 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"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "refus de fusionner des historiques sans relation"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "Déjà à jour."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "Mise à jour %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Essai de fusion vraiment triviale dans l'index...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "Non.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "Déjà à jour. Ouais !"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "Pas possible d'avancer rapidement, abandon."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Retour de l'arbre à l'original...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Essai de la stratégie de fusion %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, 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:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "La fusion avec la stratégie %s a échoué.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Utilisation de %s pour préparer la résolution à la main.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10495,23 +10765,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <référence> [<validation>]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "afficher tous les ancêtres communs"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr "trouver les ancêtres pour une fusion simple à n points"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "afficher les révisions inaccessibles depuis les autres"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "est le premier ancêtre de l'autre ?"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "trouver où <validation> a divergé du reflog de <référence>"
@@ -10611,7 +10881,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "Le répertoire %s est dans l'index et pourtant aucun sous-module ?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Veuillez indexer vos modifications de .gitmodules ou les remiser pour "
@@ -10630,68 +10900,68 @@
msgid "skip move/rename errors"
msgstr "sauter les erreurs de déplacement/renommage"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "la destination '%s' n'est pas un répertoire"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Vérification du renommage de '%s' en '%s'\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "mauvaise source"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "impossible de déplacer un répertoire dans lui-même"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "impossible de déplacer un répertoire sur un fichier"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "le répertoire source est vide"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "pas sous le contrôle de version"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "la destination existe"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "écrasement de '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Impossible d'écraser"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "multiples sources pour la même destination"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "le répertoire de destination n'existe pas"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, source=%s, destination=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Renommage de %s en %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "le renommage de '%s' a échoué"
@@ -10794,8 +11064,8 @@
msgstr "git notes [--ref <références-notes>] remove [<objet>...]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <références-notes>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <référence-notes>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10884,19 +11154,19 @@
msgid "the note contents have been left in %s"
msgstr "le contenu de la note a été laissé dans %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "impossible de lire '%s'"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "impossible d'ouvrir ou lire '%s'"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "impossible de résoudre '%s' comme une référence valide."
@@ -10924,47 +11194,47 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "trop de paramètres"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "pas de note trouvée pour l'objet %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "contenu de la note sous forme de chaîne"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "contenu de la note dans un fichier"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "réutiliser et éditer l'objet de note spécifié"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "réutiliser l'objet de note spécifié"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "permettre de stocker une note vide"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "remplacer les notes existantes"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10973,30 +11243,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:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Écrasement des notes existantes pour l'objet %s\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Suppression de la note pour l'objet %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "lire les objets depuis l'entrée standard"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
"charger la configuration de réécriture pour <commande> (implique --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "pas assez de paramètres"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -11005,12 +11275,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:540
+#: builtin/notes.c:541
#, 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:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -11019,52 +11289,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:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "échec de la suppression de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "échec de la suppression de la référence NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "échec de la suppression de la copie de travail 'git notes merge'"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "échec de la lecture de la référence NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "impossible de trouver le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "impossible d'analyser le commit de NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "échec de la résolution de NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "impossible de finaliser la fusion de notes"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "stratégie de fusion de notes inconnue %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Options générales"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Options de fusion"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -11072,47 +11342,47 @@
"résoudre les conflits de notes en utilisant la stratégie donnée (manual/ours/"
"theirs/union/cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Validation des notes non fusionnées"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "finaliser la fusion de notes en validant les notes non fusionnées"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Abandon de la résolution de fusion des notes"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "abandonner la fusion de notes"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort et -s/--strategy sont mutuellement incompatibles"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "vous devez spécifier une référence de notes à fusionner"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "-s/--strategy inconnu : %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, 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:865
+#: builtin/notes.c:866
#, 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:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -11123,235 +11393,243 @@
"valide le résultat avec 'git notes merges --commit', ou abandonnez la fusion "
"avec 'git notes merge --abort'.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "L'objet %s n'a pas de note\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
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:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "lire les noms d'objet depuis l'entrée standard"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "ne pas supprimer, afficher seulement"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "afficher les notes éliminées"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "références-notes"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "utiliser les notes depuis <références-notes>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "sous-commande inconnue : %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [options...] [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [options...] base-name [< <liste-références> | < <liste-"
"objets>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "erreur de compression (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
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:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "Écriture des objets"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
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:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "Compression des objets"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "valeur invalide pour --missing"
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "version d'index non supportée %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "mauvaise version d'index '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "ne pas afficher la barre de progression"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "afficher la barre de progression"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "afficher la barre de progression durant la phase d'écrite des objets"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "similaire à --all-progress quand la barre de progression est affichée"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
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:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "taille maximum de chaque fichier paquet en sortie"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorer les objets empruntés à un autre magasin d'objets"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "ignorer les objets empaquetés"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "limiter la fenêtre d'empaquetage par objets"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
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:2899
+#: builtin/pack-objects.c:2958
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:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "réutiliser les deltas existants"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "réutiliser les objets existants"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "utiliser les objets OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
msgid "use threads when searching for best delta matches"
msgstr ""
"utiliser des fils lors de la recherche pour une meilleurs correspondance des "
"deltas"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "ne pas créer un paquet vide"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "lire les paramètres de révision depuis l'entrée standard"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
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:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr "inclure les objets accessibles depuis toute référence"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
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:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "inclure les objets référencés par l'index"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "afficher l'empaquetage sur la sortie standard"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
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:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "garder les objets inaccessibles"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "empaqueter les objets inaccessibles détachés"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "dépaqueter les objets inaccessibles plus récents que <heure>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "créer des paquets légers"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr "créer des paquets permettant des récupérations superficielles"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "ignorer les paquets qui ont un fichier .keep"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "niveau de compression du paquet"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr "ne pas cacher les validations par greffes"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
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:2948
+#: builtin/pack-objects.c:3007
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:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "gestion des objets manquants"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "Décompte des objets"
@@ -11367,17 +11645,17 @@
msgid "prune loose refs (default)"
msgstr "éliminer les références perdues (défaut)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Suppression des objets dupliqués"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <heure>] [--] [<head>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <heure>] [--] [<head>…]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11400,40 +11678,40 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "contrôler la récupération récursive dans les sous-modules"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "Options relatives à la fusion"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr "incorporer les modifications en rebasant plutôt qu'en fusionnant"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "autoriser l'avance rapide"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "remiser avant et réappliquer après le rebasage automatiquement"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "Options relatives au rapatriement"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "nombre de sous-modules tirés en parallèle"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Valeur invalide pour pull.ff : %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -11441,14 +11719,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:401
+#: builtin/pull.c:417
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:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11456,7 +11734,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:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11468,44 +11746,44 @@
"configuration\n"
"pour la branche actuelle, vous devez spécifier la branche avec la commande."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Vous n'êtes actuellement sur aucune branche."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Veuillez spécifier sur quelle branche vous souhaiter rebaser."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Veuillez spécifier une branche avec laquelle fusionner."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "Référez-vous à git-pull(1) pour de plus amples détails."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<distant>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<branche>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Pas d'information de suivi distant pour la branche actuelle."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Si vous souhaitez indiquer l'information de suivi distant pour cette "
"branche, vous pouvez le faire avec :"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11515,29 +11793,29 @@
"'%s'\n"
"du serveur distant, mais cette référence n'a pas été récupérée."
-#: builtin/pull.c:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "--verify-signatures est ignoré pour un rebasage"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "l'option --[no-]autostash n'est valide qu'avec --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:873
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:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "tirer avec un rebasage"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "veuillez les valider ou les remiser."
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11548,7 +11826,7 @@
"avance rapide de votre copie de travail\n"
"depuis le commit %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11565,15 +11843,15 @@
"$ git reset --hard\n"
"pour régénérer."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "Impossible de fusionner de multiples branches sur une tête vide."
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "Impossible de rebaser sur de multiples branches."
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
"impossible de rebaser avec des modifications de sous-modules enregistrées "
@@ -11583,15 +11861,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<options>] [<dépôt> [<spécification-de-référence>...]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "raccourci d'étiquette sans <étiquette>"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "--delete accepte seulement des noms entiers de références cibles"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11600,7 +11878,7 @@
"Pour choisir l'option de manière permanente, voir push.default dans 'git "
"help config'."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11625,7 +11903,7 @@
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11640,7 +11918,7 @@
"\n"
" git push %s HEAD:<nom-de-la-branche-amont>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11654,13 +11932,13 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
"La branche courante %s a de multiples branches amont, impossible de pousser."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11671,14 +11949,14 @@
"pas une branche amont de votre branche courante '%s', sans me dire\n"
"quoi pousser pour mettre à jour quelle branche amont."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Vous n'avez pas spécifié de spécifications de référence à pousser, et push."
"default est \"nothing\"."
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11693,7 +11971,7 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11708,7 +11986,7 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11726,13 +12004,13 @@
"Voir la 'Note à propos des avances rapides' dans 'git push --help' pour plus "
"d'information."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
"Les mises à jour ont été rejetées car l'étiquette existe déjà dans la "
"branche distante."
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11744,22 +12022,22 @@
"pointer\n"
"vers un objet qui n'est pas un commit, sans utiliser l'option '--force'.\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "Poussée vers %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "impossible de pousser des références vers '%s'"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "mauvais dépôt '%s'"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11781,113 +12059,113 @@
"\n"
" git push <nom>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "--all et --tags sont incompatibles"
-#: builtin/push.c:390
+#: builtin/push.c:392
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:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "--mirror et --tags sont incompatibles"
-#: builtin/push.c:396
+#: builtin/push.c:398
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:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "--all et --mirror sont incompatibles"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "dépôt"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "pousser toutes les références"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "refléter toutes les références"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "supprimer les références"
-#: builtin/push.c:528
+#: builtin/push.c:540
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
"pousser les étiquettes (ne peut pas être utilisé avec --all ou --mirror)"
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "forcer les mises à jour"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "nom de référence>:<attendu"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
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:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "contrôler la poussée récursive des sous-modules"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "utiliser un empaquetage léger"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "recevoir le programme d'empaquetage"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "définir la branche amont pour git pull/status"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "éliminer les références locales supprimées"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "éviter d'utiliser le crochet pre-push"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr "pousser les étiquettes manquantes mais pertinentes"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "signer la poussée avec GPG"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "demande une transaction atomique sur le serveur distant"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "spécifique au serveur"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "option à transmettre"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete est incompatible avec --all, --mirror et --tags"
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "--delete n'a pas de sens sans aucune référence"
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr ""
"les options de poussée ne peuvent pas contenir de caractères de nouvelle "
@@ -11972,19 +12250,51 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase-helper [<options>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "garder les validations vides"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "continuer le rebasage"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "abandonner le rebasage"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "créer les script de rebasage"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "raccourcir les identifiants de commits dans la liste à-faire"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "étendre les identifiants de commit dans la liste à-faire"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "vérifier la liste à-faire"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "éviter les commandes de picorage non nécessaires"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "réarranger les lignes fixup/squash"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "insérer les commandes exec dans la liste à-faire"
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <répertoire-git>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -12014,7 +12324,7 @@
"Pour éliminer ce message et conserver le comportement par défaut,\n"
"réglez « receive.denyCurrentBranch » à 'refuse'."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -12042,12 +12352,7 @@
msgid "You must specify a directory."
msgstr "Vous devez spécifier un répertoire."
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' pour '%s' n'est pas un horodatage valide"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' n'est pas un horodatage valide"
@@ -12193,12 +12498,12 @@
"spécifier les branches à suivre n'a de sens qu'avec des miroirs de "
"rapatriement"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "la distante %s existe déjà."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' n'est pas un nom valide de distante"
@@ -12223,17 +12528,17 @@
msgid "(delete)"
msgstr "(supprimer)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Distante inconnue : %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, 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:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -12244,17 +12549,17 @@
"\t%s\n"
"\tVeuillez mettre à jour la configuration manuellement si nécessaire."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "échec de suppression de '%s'"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "échec de création de '%s'"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -12269,113 +12574,113 @@
"supprimées ;\n"
"pour les supprimer, utilisez :"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Impossible de supprimer la section de configuration '%s'"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " nouveau (le prochain rapatriement (fetch) stockera dans remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " suivi"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " dépassé (utilisez 'git remote prune' pour supprimer)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, 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:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "rebase de manière interactive sur la distante %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "rebase sur la distante %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " fusionne avec la distante %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "fusionne avec la distante %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s et avec la distante %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "créer"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "supprimer"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "à jour"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "peut être mis à jour en avance rapide"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "le local n'est pas à jour"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s force vers %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s pousse vers %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s force vers %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s pousse vers %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "ne pas interroger les distantes"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* distante %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL de rapatriement : %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(pas d'URL)"
@@ -12383,25 +12688,25 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL push : %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Branche HEAD : %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(non demandé)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(inconnu)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
@@ -12409,162 +12714,162 @@
" Branche HEAD (la HEAD distante est ambiguë, peut être l'une des "
"suivantes) :\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Branche distante :%s"
msgstr[1] " Branches distantes :%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (état non demandé)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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:1202
+#: builtin/remote.c:1203
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:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "définir refs/remotes/<nom>/HEAD selon la distante"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "supprimer refs/remotes/<nom>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Impossible de déterminer la HEAD distante"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
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:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "Impossible de supprimer %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "Référence non valide : %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "Impossible de paramétrer %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s se retrouvera en suspens !"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s se retrouve en suspens !"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Élimination de %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL : %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [serait éliminé] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [éliminé] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "éliminer les distants après le rapatriement"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Pas de serveur remote '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "ajouter une branche"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "pas de serveur distant spécifié"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
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:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "retourner toutes les URLs"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "aucune URL configurée pour le dépôt distant '%s'"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "manipuler les URLs push"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "ajouter une URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "supprimer des URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete n'a aucun sens"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Motif d'URL ancien invalide : %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Pas d'URL trouvée : %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Pas de suppression de toutes les URLs non-push"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "être verbeux : doit être placé avant une sous-commande"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Sous-commande inconnue : %s"
@@ -12663,7 +12968,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable et -A sont incompatibles"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "échec de la suppression de '%s'"
@@ -12797,123 +13102,136 @@
msgid "keep"
msgstr "keep"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "Vous n'avez pas une HEAD valide."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Impossible de trouver l'arbre pour HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Impossible de trouver l'arbre pour %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD est maintenant à %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, 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:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "être silencieux, afficher seulement les erreurs"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "réinitialiser HEAD et l'index"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "réinitialiser seulement HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "réinitialiser HEAD, l'index et la copie de travail"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "réinitialiser HEAD mais garder les changements locaux"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
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:320
+#: builtin/reset.c:329
#, 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:328
+#: builtin/reset.c:337
#, 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:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch est incompatible avec --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
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:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Impossible de faire un \"%s reset\" avec des chemins."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, 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:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N ne peut être utilisé qu'avec --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Modifications non indexées après reset :"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, 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:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "Impossible d'écrire le nouveau fichier d'index."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "le filtrage d'objet exige --objects"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "valeur invalide de 'sparse' '%s'"
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "rev-list ne supporte l'affichage des notes"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "impossible de combiner --use-bitmap-index avec le filtrage d'objet"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<arguments>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "garder le `--` passé en argument"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "arrêt de l'analyse après le premier argument qui n'est pas une option"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "sortie en forme longue fixée"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -13005,11 +13323,11 @@
msgid "keep redundant, empty commits"
msgstr "garder les validations redondantes, vides"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "revert a échoué"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "le picorage a échoué"
@@ -13079,17 +13397,17 @@
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:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "pas de suppression récursive de '%s' sans -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm : impossible de supprimer %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "impossible de supprimer '%s'"
@@ -13127,29 +13445,29 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<options>] [<intervalle-révisions>] [[--] [<chemin>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Grouper par validateur plutôt que par auteur"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "trier la sortie sur le nombre de validations par auteur"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
"Supprimer les descriptions de validation, fournit seulement le nombre de "
"validations"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Afficher l'adresse courriel de chaque auteur"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Couper les lignes"
@@ -13358,35 +13676,35 @@
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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "Référence inexistante : %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Nom de référence complet attendu, %s obtenu"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "impossible de supprimer un composant de l'URL '%s'"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "ancre alternative pour les chemins relatifs"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, 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:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13395,86 +13713,116 @@
"impossible de trouver la configuration '%s'. Ce dépôt est considéré comme "
"son propre amont d'autorité."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, 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:410
+#: builtin/submodule--helper.c:479
#, 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:420
+#: builtin/submodule--helper.c:489
#, 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:427
+#: builtin/submodule--helper.c:496
#, 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:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "Supprimer la sortie lors de l'initialisation d'un sous-module"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<chemin>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper <nom> <chemin>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, 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:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "récursion impossible dans le sous-module '%s'"
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "supprimer la sortie d'état du sous-module"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Utiliser le commit stocké dans l'index au lieu de celui stocké dans la HEAD "
+"du sous-module"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "parcourir récursivement les sous-modules"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<chemin>...]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper <nom> <chemin>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, 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:604
+#: builtin/submodule--helper.c:835
#, 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:611
+#: builtin/submodule--helper.c:842
#, 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:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "emplacement où le sous-module sera cloné"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "nom du nouveau sous-module"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "URL depuis laquelle cloner le sous-module"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "profondeur de l'historique des clones superficiels"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "forcer l'affichage de la progression du clonage"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13482,83 +13830,83 @@
"git submodule--helper clone [--prefix=<chemin>] [--quiet] [--reference "
"<dépôt>] [--name <nom>] [--depth <profondeur>] --url <url> --path <chemin>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, 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:699
+#: builtin/submodule--helper.c:930
#, 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:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Le chemin de sous-module '%s' n'est pas initialisé"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "Vous voudriez sûrement utiliser 'update --init' ?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Sous-module non fusionné %s non traité"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Sous-module '%s' non traité"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Impossible de cloner '%s'. Réessai prévu"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, 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:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "chemin dans la copie de travail"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
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:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "valeurs possibles : rebase, merge, checkout ou none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
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:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "jobs parallèles"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
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:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "ne pas afficher la progression du clonage"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<chemin>] [<chemin>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "valeur invalide pour la mise à jour du paramètre"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13567,20 +13915,20 @@
"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:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "parcourir récursivement les sous-modules"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<chemin>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s ne gère pas --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' n'est pas une sous-commande valide de submodule--helper"
@@ -13593,24 +13941,24 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <nom>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"supprimer le message d'erreur pour une référence non symbolique (détachée)"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "supprimer la référence symbolique"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "raccourcir l'affichage de la référence"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "raison"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "raison de la mise à jour"
@@ -13640,17 +13988,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <nométiquette>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "étiquette '%s' non trouvée."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Étiquette '%s' supprimée (elle était sur %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13663,7 +14011,7 @@
" %s\n"
"Les lignes commençant par '%c' seront ignorées.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13678,143 +14026,143 @@
"Les lignes commençant par '%c' seront gardées ; vous pouvez les retirer vous-"
"même si vous le souhaitez.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "impossible de signer l'étiquette"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "impossible d'écrire le fichier d'étiquettes"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "mauvais type d'objet."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "pas de message pour l'étiquette ?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, 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:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "afficher les noms des étiquettes"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "affiche <n> lignes de chaque message d'étiquette"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "supprimer des étiquettes"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "vérifier des étiquettes"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Options de création de l'étiquette"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "étiquette annotée, nécessite un message"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "message pour l'étiquette"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "étiquette annotée et signée avec GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "utiliser une autre clé pour signer l'étiquette"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "remplacer l'étiquette si elle existe"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "créer un reflog"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Options d'affichage des étiquettes"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "afficher la liste des étiquettes sous forme de colonnes"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "afficher seulement les étiquettes qui contiennent la validation"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "afficher seulement les étiquettes qui ne contiennent pas la validation"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "afficher seulement les étiquettes qui sont fusionnées"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "afficher seulement les étiquettes qui ne sont pas fusionnées"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "afficher seulement les étiquettes de l'objet"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column et -n sont incompatibles"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "l'option -n est autorisée seulement en mode de liste"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode de liste"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "l'option --contains est autorisée seulement en mode liste"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
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:500
+#: builtin/tag.c:483
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:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "une seule option -F ou -m est autorisée."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "trop de paramètres"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' n'est pas un nom d'étiquette valide."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "l'étiquette '%s' existe déjà"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Étiquette '%s' mise à jour (elle était sur %s)\n"
@@ -13823,198 +14171,215 @@
msgid "Unpacking objects"
msgstr "Dépaquetage des objets"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "échec de la création du répertoire %s"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "échec du stat de %s"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "échec de la création du fichier %s"
-#: builtin/update-index.c:104
+#: 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:111 builtin/update-index.c:217
+#: 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:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Test du mtime dans '%s' "
-#: builtin/update-index.c:150
+#: 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:163
+#: 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:176
+#: 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:187
+#: 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:198
+#: 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:211
+#: 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:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<options>] [--] [<fichier>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
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:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "rafraîchir : ignorer les sous-modules"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "ne pas ignorer les nouveaux fichiers"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "laisser les fichiers remplacer des répertoires et vice-versa"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "aviser des fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
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:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "rafraîchir l'information de stat"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "comme --refresh, mais en ignorant l'option assume-unchanged"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<mode>, <objet>, <chemin>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "ajouter l'élément spécifié dans l'index"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "marquer les fichiers comme \"non changeants\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "mettre à zéro le bit supposé-non-modifié"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "marquer les fichiers comme \"index seulement\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "mettre à zéro le bit sauter-la-copie-de travail"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
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:971
+#: builtin/update-index.c:983
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:973
+#: builtin/update-index.c:985
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:975
+#: builtin/update-index.c:987
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:979
+#: builtin/update-index.c:991
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:983
+#: builtin/update-index.c:995
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:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "mettre à jour seulement les éléments qui diffèrent de HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "ignorer les fichiers manquants dans la copie de travail"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "afficher les actions sur la sortie standard"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(pour porcelaines) oublier les conflits sauvés et non résolus"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "écrire l'index dans ce format"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "activer ou désactiver l'index divisé"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "activer ou désactiver le cache de non-suivis"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
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:1008
+#: builtin/update-index.c:1020
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:1108
+#: builtin/update-index.c:1022
+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:1024
+msgid "enable or disable file system monitor"
+msgstr ""
+"activer ou désactiver la surveillance du système de fichier (fsmonitor)"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "marquer les fichiers comme valides pour fsmonitor"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "effacer le bit de validité fsmonitor"
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -14022,7 +14387,7 @@
"core.splitIndex est réglé à false ; supprimez-le ou changez-le si vous "
"souhaitez vraiment activer l'index coupé"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -14030,7 +14395,7 @@
"core.splitIndex est réglé à vrai ; supprimez-le ou changez-le si vous "
"souhaitez vraiment désactiver l'index coupé"
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -14038,11 +14403,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:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "Le cache non suivi est désactivé"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -14050,11 +14415,32 @@
"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:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Le cache non suivi est activé pour '%s'"
+#: builtin/update-index.c:1171
+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:1175
+msgid "fsmonitor enabled"
+msgstr "fsmonitor activé"
+
+#: builtin/update-index.c:1178
+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:1182
+msgid "fsmonitor disabled"
+msgstr "fsmonitor désactivé"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<options>] -d <nom-référence> [<ancienne-valeur>]"
@@ -14069,19 +14455,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<options>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "supprimer la référence"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "mettre à jour <nomréférence> et non la référence pointée par lui"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "l'entrée standard a des arguments qui se terminent par NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "lire les mises à jour depuis l'entrée standard"
@@ -14125,128 +14511,150 @@
msgid "print tag contents"
msgstr "afficher le contenu de l'étiquette"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<options>] <chemin> [<branche>]"
-#: builtin/worktree.c:17
-msgid "git worktree list [<options>]"
-msgstr "git worktree prune [<options>]"
-
#: builtin/worktree.c:18
+msgid "git worktree list [<options>]"
+msgstr "git worktree list [<options>]"
+
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<options>] <chemin>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<options>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <chemin>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Suppression de worktrees/%s : répertoire invalide"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Suppression de worktrees/%s : le fichier gitdir n'existe pas"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
"Suppression de worktrees/%s : echec de la lecture du fichier gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Suppression de worktrees/%s: lecture trop courte ( %<PRIuMAX> octets "
+"attendus, %<PRIuMAX> octets lus)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Suppression de worktrees/%s : fichier gitdir invalide"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
"Suppression de worktrees/%s : le fichier gitdir point sur un endroit "
"inexistant"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "afficher les arbres de travail éliminés"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr "faire expirer les arbres de travail plus vieux que <temps>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "'%s' existe déjà"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "impossible de créer le répertoire de '%s'"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Préparation de %s (identifiant %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
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:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "créer une nouvelle branche"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "créer ou réinitialiser une branche"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "remplissage de la nouvelle copie de travail"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "conserver le verrou sur le nouvel arbre de travail"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "régler le mode de suivi (voir git-branch(1))"
+
+#: builtin/worktree.c:380
+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:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B et --detach sont mutuellement exclusifs"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+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:553
msgid "reason for locking"
msgstr "raison du verrouillage"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' n'est pas une copie de travail"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
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:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' est déjà verrouillé, car '%s'"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' est déjà verrouillé"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' n'est pas verrouillé"
@@ -14267,7 +14675,7 @@
msgid "only useful for debugging"
msgstr "seulement utile pour le débogage"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<options>] <répertoire>"
@@ -14289,7 +14697,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "interrompre le transfert après <n> secondes d'inactivité"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14302,7 +14710,7 @@
"\n"
" chmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "afficher les messages de debug sur stderr"
@@ -14316,21 +14724,21 @@
"quelques concepts. Voir 'git help <commande>' ou 'git help <concept>'\n"
"pour en lire plus à propos d'une commande spécifique ou d'un concept."
-#: http.c:337
+#: http.c:339
#, 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:358
+#: http.c:360
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:367
+#: http.c:369
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:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -14346,6 +14754,14 @@
msgid "redirecting to %s"
msgstr "redirection vers %s"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "args"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "filtrage d'objet"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "démarrer une zone de travail (voir aussi : git help tutorial)"
@@ -14525,27 +14941,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "Mauvais argument pour bisect_write : $state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Mauvaise révision en entrée : $arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Mauvaise révision en entrée : $bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Mauvaise révision en entrée : $rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' n'accepte qu'un seul argument."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Attention : bissection avec seulement une validation $TERM_BAD."
@@ -14553,11 +14969,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "Confirmez-vous [Y/n] ? "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14568,7 +14984,7 @@
"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
"pour cela.)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14581,16 +14997,16 @@
"(Vous pouvez utiliser \"git bisect $bad_syn\" et \"git bisect $good_syn\" "
"pour cela.)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "Pas de bissection en cours."
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' n'est pas une validation valide"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14599,25 +15015,29 @@
"Échec d'extraction de la HEAD d'origine '$branch'.\n"
"Essayez 'git bisect reset <commit>'."
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "Pas de fichier de log donné"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "impossible de lire $file pour rejouer"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? de quoi parlez-vous ?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "la bissection a échoué : aucune commande fournie."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "lancement de $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14626,11 +15046,11 @@
"la bissection a échoué :\n"
"le code retour $res de '$command' est < 0 ou >= 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "la bissection ne peut plus continuer"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14639,41 +15059,22 @@
"la bissection a échoué :\n"
"'bisect_state $state' a retourné le code erreur $res"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "succès de la bissection"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "veuillez utiliser deux termes différents"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term' n'est pas un terme valide"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "impossible d'utiliser la commande incluse '$term' comme terme"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "impossible de modifier la signification du terme '$term'"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Commande invalide : vous êtes actuellement dans une bissection $TERM_BAD/"
"$TERM_GOOD."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "aucun terme défini"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14706,7 +15107,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Déjà à jour avec $pretty_name"
#: git-merge-octopus.sh:89
@@ -14725,53 +15126,55 @@
#: git-rebase.sh:58
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"
-"\"."
+"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 ""
-"Lorsque vous aurez résolu ce problème, lancez \"git rebase --continue\".\n"
-"Si vous préférez sauter ce patch, lancez \"git rebase --skip\" à la place.\n"
-"Pour extraire la branche d'origine et stopper le rebasage, lancez \"git "
-"rebase --abort\"."
+"Résolvez tous les conflits manuellement, marquez-les comme résolus avec\n"
+"\"git add/rm <fichier en conflit>\", puis lancez \"git rebase --continue\".\n"
+"Si vous préférez sauter ce commit, lancez \"git rebase --skip\". Pour "
+"arrêter\n"
+"et revenir à l'état antérieur à la commande, lancez \"git rebase --abort\"."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Impossible de revenir à $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Autoremisage appliqué."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Impossible de stocker $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Le crochet pre-rebase a refusé de rebaser."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "Il semble que git-am soit en cours. Impossible de rebaser."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Il semble que 'git-am' soit en cours. Impossible de rebaser."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Pas de rebasage en cours ?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
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."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Impossible de lire HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14779,7 +15182,7 @@
"Vous devez éditer tous les conflits de fusion et\n"
"les marquer comme résolus avec git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14801,229 +15204,226 @@
"chose\n"
"d'important ici."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "invalide $upstream_name en amont"
+msgid "invalid upstream '$upstream_name'"
+msgstr "invalide '$upstream_name' en amont"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name : il y a plus d'une base de fusion"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name : il n'y a pas de base de fusion"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Ne pointe pas sur une validation valide : $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "fatal : pas de branche : $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "fatal : pas de branche ou commit '$branch_name'"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "Autoremisage impossible"
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Autoremisage créé : $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "Veuillez les valider ou les remiser."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD est à jour."
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "La branche courante $branch_name est à jour."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD est à jour, rebasage forcé."
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "La branche courante $branch_name est à jour, rebasage forcé."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Changements de $mb sur $onto :"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-"Premièrement, rembobinons head pour rejouer votre travail par-dessus..."
+"Rembobinage préalable de head pour pouvoir rejouer votre travail par-"
+"dessus..."
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name mise à jour en avance rapide sur $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear avec des paramètres n'est pas implémenté"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "Vous n'avez pas encore la validation initiale"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "Impossible de sauver l'état courant de l'index"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "Impossible de sauver les fichiers non-suivis"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "Impossible de sauver l'état courant de la copie de travail"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "Aucun changement sélectionné"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "Impossible de supprimer l'index temporaire (ne peut pas se produire)"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "Impossible d'enregistrer l'état de la copie de travail"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Impossible de mettre à jour $ref_stash avec $w_commit"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"erreur: option inconnue pour 'stash save': $option\n"
-" Pour fournir un message, utilisez git stash save -- '$option'"
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "erreur : option inconnue pour 'stash push' : $option"
+
+#: git-stash.sh:295
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"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "Pas de modifications locales à sauver"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "Impossible d'initialiser le remisage"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "Impossible de sauver l'état courant"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Copie de travail et état de l'index sauvegardés dans $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "Impossible de supprimer les changements de la copie de travail"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "option inconnue : $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "Aucune entrée de remisage trouvée."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Trop de révisions spécifiées : $REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference n'est pas une référence valide"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' n'est pas une validation de type remisage"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' n'est pas une référence de remisage"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "impossible de rafraîchir l'index"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Impossible d'appliquer un remisage en cours de fusion"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "Conflits dans l'index. Essayez sans --index."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "Impossible de sauvegarder l'arbre d'index"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr ""
"Impossible de restaurer les fichiers non-suivis depuis l'entrée de remisage"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "Impossible de désindexer les fichiers modifiés"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "L'index n'a pas été sorti de remise."
-#: git-stash.sh:633
+#: git-stash.sh:648
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."
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} supprimé ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Impossible de supprimer l'élément de stash"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "Aucune branche spécifiée"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(Pour les restaurer tapez \"git stash apply\")"
@@ -15177,19 +15577,19 @@
"Le sous-module '$name' ($url) n'est pas enregistré pour le chemin "
"'$displaypath'"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, 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:648
+#: git-submodule.sh:647
#, 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:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -15198,12 +15598,12 @@
"Impossible de trouver la révision courante ${remote_name}/${branch} dans le "
"chemin de sous-module '$sm_path'"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Impossible de rapatrier dans le chemin de sous-module '$displaypath'"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -15212,88 +15612,83 @@
"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:684
+#: git-submodule.sh:683
#, 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:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$sha1' extrait"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, 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:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : rebasé dans '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, 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:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Chemin de sous-module '$displaypath' : fusionné dans '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, 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:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Chemin de sous-module '$displaypath' : '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Échec de parcours dans le chemin du sous-module '$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "L'option --cached ne peut pas être utilisée avec l'option --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "mode $mod_dst inattendu"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Attention : $display_name ne contient pas la validation $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Attention : $display_name ne contient pas la validation $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Attention : $display_name ne contient pas les validations $sha1_src et "
"$sha1_dst"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synchronisation de l'URL sous-module pour '$displaypath'"
@@ -15312,22 +15707,22 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Commandes :\n"
-" p, pick = picorer le commit\n"
-" r, reword = picorer le commit, mais reformuler son message\n"
-" e, edit = picorer le commit, mais s'arrêter pour le modifier\n"
-" s, squash = prendre le commit, mais le fusionner avec le précédent\n"
+" p, pick = utiliser le commit\n"
+" r, reword = utiliser le commit, mais reformuler son message\n"
+" e, edit = utiliser le commit, mais s'arrêter pour le modifier\n"
+" s, squash = utiliser le commit, mais le fusionner avec le précédent\n"
" f, fixup = comme \"squash\", mais en éliminant son message\n"
" x, exec = lancer la commande (reste de la ligne) dans un shell\n"
" d, drop = supprimer le commit\n"
@@ -15404,49 +15799,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "Refus d'écraser un commit de fusion: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Erreur lors de la réapplication de la fusion $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "Impossible de picorer $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Ceci est le ${n}ième message de validation :"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Le message de validation ${n} sera ignoré :"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Impossible d'écrire $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Ceci est la combinaison de 2 commits."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Impossible d'appliquer $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15463,31 +15858,31 @@
"le\n"
"problème avant de pouvoir reformuler le message du commit."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Arrêté à $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "'$squash_style' impossible avec le commit précédent"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Exécution : $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "L'exécution a échoué : $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
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--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15498,7 +15893,7 @@
"git rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15513,95 +15908,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Commande inconnue : $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Veuillez corriger ceci en utilisant 'git rebase --edit-todo'."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Rebasage et mise à jour de $head_name avec succès."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Impossible d'éviter les commandes de picorage non nécessaires"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Attention : le SHA-1 manque ou n'est pas un commit dans la ligne suivante :\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "Impossible de détacher HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Attention : certains commits ont pu être accidentellement supprimés.\n"
-"Commits supprimés (du plus jeune au plus vieux) :"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Pour éviter ce message, utilisez \"drop\" pour supprimer explicitement un "
-"commit.\n"
-"\n"
-"Utilisez 'git config rebase.missingCommitsCheck' pour changer le niveau "
-"d'avertissements.\n"
-"Les comportements disponibles sont : ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Paramètre non reconnu $check_level pour l'option rebase.missingCommitsCheck. "
-"Ignoré."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Vous pouvez corriger ceci avec 'git rebase --edit-todo' puis lancez 'git "
-"rebase --continue'."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Impossible de supprimer CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15632,12 +15961,12 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
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--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15645,11 +15974,11 @@
"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--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "impossible de valider les modifications indexées."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15664,40 +15993,44 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Impossible de lancer l'éditeur"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Impossible d'extraire $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "Pas de HEAD ?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Impossible de créer un répertoire temporaire $state_dir"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "Impossible de marquer comme interactif"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "Impossible d'initialiser les commits réécrits"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Impossible de générer la liste à-faire"
+
+#: git-rebase--interactive.sh:973
#, 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--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15707,7 +16040,7 @@
"Cependant, si vous effacez tout, le rebasage sera annulé.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Veuillez noter que les commits vides sont en commentaire"
@@ -16304,63 +16637,63 @@
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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "l'éditeur est sorti en erreur, abandon total"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, 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:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' contient le courriel composé.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases est incompatible avec d'autres options\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
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:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Champ de --suppress-cc inconnu : '%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Paramètre de --confirm inconnu : '%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, 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:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "attention : `:include:` n'est pas supporté : %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, 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:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "attention : ligne sendmail non reconnue : %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -16375,12 +16708,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:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Échec à l'ouverture du répertoire %s : %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -16389,7 +16722,7 @@
"fatal : %s : %s\n"
"attention : aucun patch envoyé\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -16399,17 +16732,17 @@
"Aucun fichier patch spécifié !\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Ligne de sujet non trouvée dans %s ?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Impossible d'ouvrir %s en écriture : %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -16423,32 +16756,32 @@
"\n"
"Effacez le corps si vous ne souhaitez pas envoyer un résumé.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Échec à l'ouverture de %s.final : %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Échec à l'ouverture de %s : %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
"Les champs To/CC/Bcc ne sont pas encore interprétés, ils ont été ignorés\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "Le courriel de résumé etant vide, il a été ignoré\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, 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:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -16456,11 +16789,11 @@
"Les fichiers suivants sont 8bit mais ne déclarent pas de champs Content-"
"Transfer-Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Quel encodage 8bit doit être déclaré [UTF8] ? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -16473,22 +16806,22 @@
"a un sujet modèle '*** SUBJECT HERE ***'. Passez --force is vous souhaitez "
"vraiment envoyer.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
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:870
+#: git-send-email.perl:865
#, 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:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "erreur : impossible d'extraire une adresse valide depuis : %s\n"
@@ -16496,16 +16829,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:944
+#: git-send-email.perl:941
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:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "le chemin vers la CA \"%s\" n'existe pas"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16532,134 +16865,233 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Envoyer ce courriel ? ([y]es|[n]o|[q]uit|[a]ll) : "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "Une réponse est nécessaire"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
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:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Le serveur ne supporte pas STARTTLS ! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "echec de STARTTLS ! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
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:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "échec de l'envoi de %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Envoi simulé de %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "%s envoyé\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "Simulation OK. Le journal indique :\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "OK. Le journal indique :\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "Résultat : "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "Résultat : OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "impossible d'ouvrir le fichier %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, 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:1534
+#: git-send-email.perl:1551
#, 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:1582
+#: git-send-email.perl:1599
#, 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:1605
+#: git-send-email.perl:1624
#, 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:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Impossible d'exécuter '%s'"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Ajout de %s : %s depuis : '%s'\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) échec de la fermeture du pipe vers '%s'"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "impossible d'envoyer un message comme 7bit"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "codage de transfert invalide"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "impossible d'ouvrir %s :%s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s : le patch contient une ligne plus longue que 998 caractères"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Souhaitez-vous réellement envoyer %s ?[y|N] : "
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "les chaines de caractères vides comme spécificateurs de chemin seront "
+#~ "invalides dans les prochaines versions. Veuillez utiliser . à la place "
+#~ "pour correspondre à tous le chemins"
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "impossible d'ouvrir '%s' en écriture"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "impossible de tronquer '%s'"
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "impossible de finir '%s'"
+
+#~ msgid "could not write to %s"
+#~ msgstr "Impossible d'écrire dans %s"
+
+#~ msgid "could not close %s"
+#~ msgstr "impossible de fermer %s"
+
+#~ msgid "Copied a misnamed branch '%s' away"
+#~ msgstr "Copie d'une branche mal nommée '%s'"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "créer manuellement 'HEAD' n'a pas de sens"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "Je ne sais pas cloner %s"
+
+#~ msgid "show ignored files"
+#~ msgstr "afficher les fichiers ignorés"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s n'est pas un objet '%s' valide"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "Je ne sais pas récupérer depuis %s"
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "'$term' n'est pas un terme valide"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "erreur: option inconnue pour 'stash save': $option\n"
+#~ " Pour fournir un message, utilisez git stash save -- '$option'"
+
+#~ msgid "Failed to recurse into submodule path '$sm_path'"
+#~ msgstr "Échec de parcours dans le chemin du sous-module '$sm_path'"
+
+#~ msgid "%%(trailers) does not take arguments"
+#~ msgstr "%%(trailers) n'accepte pas d'argument"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "stratégie de mise à jour de sous-module non supportée pour le sous-module "
+#~ "'%s'"
+
+#~ msgid "change upstream info"
+#~ msgstr "modifier l'information amont"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Si vous vouliez que '%s' suive '%s', faites ceci :\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "nom de base"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "préfixer le nom de base du projet parent à la sortie"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Attention : le SHA-1 manque ou n'est pas un commit dans la ligne "
+#~ "suivante :\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Attention : la commande n'est pas reconnue dans le ligne suivante :\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr ""
+#~ "Ou bien vous pouvez abandonner le rebasage avec 'git rebase --abort'."
+
#~ msgid "Could not open file '%s'"
#~ msgstr "impossible d'ouvrir le fichier '%s'"
@@ -16766,9 +17198,6 @@
#~ msgid "git merge [<options>] <msg> HEAD <commit>"
#~ msgstr "git merge [<options>] <message> HEAD <commit>"
-#~ msgid "'%s' is not a commit"
-#~ msgstr "'%s' n'est pas une validation"
-
#~ msgid "cannot open file '%s'"
#~ msgstr "impossible d'ouvrir le fichier '%s'"
@@ -16818,9 +17247,6 @@
#~ "(utilisez 'rm -rf' si vous voulez vraiment le supprimer en incluant tout "
#~ "son historique)"
-#~ msgid "Could not write to %s"
-#~ msgstr "Impossible d'écrire dans %s"
-
#~ msgid "Error wrapping up %s."
#~ msgstr "Erreur lors de l'emballage de %s."
@@ -17087,9 +17513,6 @@
#~ "Reporter les validations locales sur le sommet mis à jour d'une branche "
#~ "amont"
-#~ msgid "unable to parse format"
-#~ msgstr "impossible d'analyser le format"
-
#~ msgid "improper format entered align:%s"
#~ msgstr "format non convenable align:%s"
@@ -17318,9 +17741,6 @@
#~ msgid "no files added"
#~ msgstr "aucun fichier ajouté"
-#~ msgid "force creation (when already exists)"
-#~ msgstr "forcer la création (même si la cible existe)"
-
#~ msgid "slot"
#~ msgstr "emplacement"
diff --git a/po/git.pot b/po/git.pot
index 4669c5a..e36d187 100644
--- a/po/git.pot
+++ b/po/git.pot
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,59 +18,59 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr ""
-#: advice.c:86
+#: advice.c:90
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
-#: advice.c:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr ""
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr ""
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
-#: advice.c:96
+#: advice.c:100
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
-#: advice.c:104
+#: advice.c:108
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:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr ""
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr ""
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr ""
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr ""
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -96,82 +96,82 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr ""
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr ""
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr ""
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr ""
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr ""
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr ""
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr ""
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr ""
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr ""
-#: apply.c:967
+#: apply.c:942
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
-#: apply.c:973
+#: apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
-#: apply.c:974
+#: apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
-#: apply.c:979
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr ""
-#: apply.c:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr ""
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr ""
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr ""
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr ""
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -182,401 +182,401 @@
msgstr[0] ""
msgstr[1] ""
-#: apply.c:1600
+#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr ""
-#: apply.c:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr ""
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr ""
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr ""
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr ""
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr ""
-#: apply.c:1848
+#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr ""
-#: apply.c:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr ""
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr ""
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr ""
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr ""
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr ""
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr ""
-#: apply.c:3052
+#: apply.c:3055
#, 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:3064
+#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr ""
-#: apply.c:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr ""
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr ""
-#: apply.c:3100
+#: apply.c:3103
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
-#: apply.c:3146
+#: apply.c:3149
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
-#: apply.c:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr ""
-#: apply.c:3164
+#: apply.c:3167
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr ""
-#: apply.c:3182
+#: apply.c:3185
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr ""
-#: apply.c:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr ""
-#: apply.c:3201
+#: apply.c:3204
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
-#: apply.c:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr ""
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr ""
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr ""
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr ""
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr ""
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr ""
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr ""
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr ""
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr ""
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr ""
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr ""
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr ""
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr ""
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr ""
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr ""
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr ""
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr ""
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr ""
-#: apply.c:3941
+#: apply.c:3945
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr ""
-#: apply.c:3946
+#: apply.c:3950
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr ""
-#: apply.c:3966
+#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr ""
-#: apply.c:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr ""
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr ""
-#: apply.c:4076
+#: apply.c:4080
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr ""
-#: apply.c:4083
+#: apply.c:4087
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr ""
-#: apply.c:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr ""
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr ""
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr ""
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr ""
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr ""
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr ""
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr ""
-#: apply.c:4292
+#: apply.c:4296
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr ""
-#: apply.c:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr ""
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr ""
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr ""
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr ""
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr ""
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr ""
-#: apply.c:4522
+#: apply.c:4526
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr ""
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr ""
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr ""
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr ""
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr ""
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr ""
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr ""
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr ""
-#: apply.c:4860
+#: apply.c:4864
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] ""
msgstr[1] ""
-#: apply.c:4874
+#: apply.c:4878
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr ""
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr ""
@@ -589,7 +589,7 @@
msgid "apply changes matching the given path"
msgstr ""
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr ""
@@ -641,7 +641,7 @@
msgid "build a temporary index based on embedded index information"
msgstr ""
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr ""
@@ -649,7 +649,9 @@
msgid "ensure at least <n> lines of context match"
msgstr ""
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr ""
@@ -677,9 +679,9 @@
msgid "allow overlapping hunks"
msgstr ""
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr ""
@@ -691,7 +693,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr ""
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr ""
@@ -716,150 +718,150 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr ""
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr ""
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr ""
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr ""
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr ""
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr ""
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr ""
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr ""
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr ""
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr ""
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr ""
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr ""
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr ""
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr ""
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr ""
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr ""
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr ""
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr ""
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr ""
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr ""
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr ""
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr ""
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr ""
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr ""
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr ""
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr ""
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr ""
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr ""
-#: bisect.c:732
+#: bisect.c:744
#, 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:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr ""
-#: bisect.c:742
+#: bisect.c:754
#, 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:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -867,7 +869,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr ""
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -875,43 +877,43 @@
"We continue anyway."
msgstr ""
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr ""
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr ""
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr ""
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr ""
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr ""
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr ""
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -921,7 +923,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -940,10 +942,10 @@
msgid "--reverse and --first-parent together require specified latest commit"
msgstr ""
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr ""
@@ -978,42 +980,42 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+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."
+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."
+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."
+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."
+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."
+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."
+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."
+msgid "Branch '%s' set up to track local ref '%s'."
msgstr ""
#: branch.c:119
@@ -1025,31 +1027,31 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr ""
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr ""
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr ""
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr ""
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr ""
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1061,27 +1063,27 @@
"\"git push -u\" to set the upstream config as you push."
msgstr ""
-#: branch.c:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr ""
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr ""
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr ""
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr ""
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr ""
@@ -1096,7 +1098,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr ""
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr ""
@@ -1105,56 +1108,56 @@
msgid "Repository lacks these prerequisite commits:"
msgstr ""
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr ""
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] ""
msgstr[1] ""
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr ""
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr ""
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr ""
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr ""
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr ""
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr ""
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr ""
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr ""
@@ -1163,8 +1166,8 @@
msgid "invalid color value: %.*s"
msgstr ""
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr ""
@@ -1174,14 +1177,14 @@
msgid "%s %s is not a commit!"
msgstr ""
-#: commit.c:1511
+#: commit.c:1524
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
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr ""
@@ -1267,79 +1270,84 @@
msgid "failed to expand user dir in: '%s'"
msgstr ""
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr ""
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr ""
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr ""
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr ""
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr ""
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr ""
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr ""
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
-#: config.c:2111
+#: config.c:2162
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr ""
-#: config.c:2122
+#: config.c:2187
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr ""
-#: config.c:2124
+#: config.c:2189
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr ""
-#: config.c:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr ""
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr ""
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr ""
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr ""
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr ""
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1347,19 +1355,19 @@
"and the repository exists."
msgstr ""
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr ""
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr ""
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr ""
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr ""
@@ -1460,277 +1468,292 @@
msgid "failed to read orderfile '%s'"
msgstr ""
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr ""
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr ""
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr ""
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr ""
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr ""
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr ""
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr ""
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr ""
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr ""
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr ""
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
-#: diff.c:4719
+#: diff.c:5449
msgid "only found copies from modified paths due to too many files."
msgstr ""
-#: diff.c:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr ""
-#: dir.c:2067
+#: dir.c:2219
msgid "Untracked cache is disabled on this system or location."
msgstr ""
-#: dir.c:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr ""
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr ""
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr ""
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr ""
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr ""
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr ""
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr ""
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr ""
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr ""
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr ""
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr ""
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr ""
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr ""
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr ""
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr ""
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr ""
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr ""
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr ""
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr ""
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr ""
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr ""
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr ""
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr ""
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr ""
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr ""
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr ""
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr ""
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr ""
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr ""
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr ""
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr ""
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr ""
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr ""
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr ""
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr ""
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr ""
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr ""
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr ""
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr ""
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr ""
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr ""
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr ""
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr ""
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
@@ -1743,7 +1766,7 @@
msgid "could not create temporary file"
msgstr ""
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr ""
@@ -1753,17 +1776,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr ""
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr ""
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr ""
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr ""
@@ -1826,12 +1849,12 @@
msgid "git version [<options>]"
msgstr ""
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr ""
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -1884,12 +1907,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr ""
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr ""
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr ""
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr ""
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -1901,265 +1933,270 @@
"remove the file manually to continue."
msgstr ""
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr ""
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr ""
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr ""
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr ""
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr ""
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr ""
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr ""
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr ""
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ""
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr ""
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr ""
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr ""
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr ""
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr ""
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr ""
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr ""
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr ""
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, 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:1098
+#: merge-recursive.c:1122
#, 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:1105
+#: merge-recursive.c:1129
#, 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:1110
+#: merge-recursive.c:1134
#, 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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr ""
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr ""
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr ""
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
"\"->\"%s\" in \"%s\"%s"
msgstr ""
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr ""
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr ""
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr ""
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr ""
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr ""
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr ""
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr ""
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr ""
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr ""
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr ""
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr ""
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr ""
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr ""
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr ""
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr ""
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr ""
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, c-format
msgid "CONFLICT (%s): There is a directory with name %s in %s. Adding %s as %s"
msgstr ""
-#: merge-recursive.c:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr ""
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
msgstr ""
-#: merge-recursive.c:1939
+#: merge-recursive.c:1962
+msgid "Already up to date!"
+msgstr ""
+
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr ""
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr ""
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] ""
msgstr[1] ""
-#: merge-recursive.c:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr ""
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr ""
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr ""
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2167,7 +2204,7 @@
"commit/abort the previous merge before you start a new notes merge."
msgstr ""
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr ""
@@ -2195,16 +2232,30 @@
msgid "Bad %s value: '%s'"
msgstr ""
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr ""
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr ""
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr ""
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr ""
+
#: parse-options.c:573
msgid "..."
msgstr ""
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr ""
@@ -2212,17 +2263,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr ""
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr ""
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr ""
@@ -2231,7 +2282,7 @@
msgid "malformed object name '%s'"
msgstr ""
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr ""
@@ -2302,80 +2353,75 @@
msgid "%s: pathspec magic not supported by this command: %s"
msgstr ""
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr ""
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr ""
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr ""
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr ""
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr ""
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr ""
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr ""
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr ""
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr ""
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr ""
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr ""
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr ""
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr ""
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr ""
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr ""
@@ -2394,157 +2440,157 @@
msgid "ahead %d, behind %d"
msgstr ""
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr ""
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr ""
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr ""
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr ""
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr ""
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr ""
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr ""
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
+msgid "unknown %%(trailers) argument: %s"
msgstr ""
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr ""
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr ""
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr ""
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr ""
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr ""
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr ""
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr ""
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr ""
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr ""
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr ""
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr ""
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr ""
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr ""
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr ""
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr ""
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr ""
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr ""
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr ""
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr ""
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr ""
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr ""
@@ -2552,7 +2598,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr ""
@@ -2560,137 +2606,137 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr ""
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr ""
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr ""
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr ""
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr ""
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr ""
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr ""
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr ""
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr ""
-#: remote.c:747
+#: remote.c:780
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr ""
-#: remote.c:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr ""
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr ""
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr ""
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr ""
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr ""
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr ""
-#: remote.c:1698
+#: remote.c:1729
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr ""
-#: remote.c:1713
+#: remote.c:1744
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr ""
-#: remote.c:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr ""
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr ""
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr ""
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr ""
-#: remote.c:2076
+#: remote.c:2106
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr ""
-#: remote.c:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr ""
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr ""
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr ""
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2698,11 +2744,11 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr ""
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2713,125 +2759,133 @@
msgstr[0] ""
msgstr[1] ""
-#: remote.c:2117
+#: remote.c:2147
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr ""
-#: revision.c:2190
+#: revision.c:2271
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr ""
-#: revision.c:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr ""
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr ""
-#: send-pack.c:151
+#: run-command.c:1188
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+
+#: send-pack.c:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr ""
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr ""
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr ""
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr ""
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr ""
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr ""
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr ""
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr ""
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr ""
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr ""
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr ""
-#: sequencer.c:282
+#: sequencer.c:284
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:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr ""
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr ""
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr ""
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr ""
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr ""
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr ""
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr ""
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr ""
@@ -2839,20 +2893,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr ""
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
msgstr ""
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
msgstr ""
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -2869,17 +2923,17 @@
" git rebase --continue\n"
msgstr ""
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr ""
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
+msgid "could not parse commit %s"
msgstr ""
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr ""
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2887,7 +2941,7 @@
"\t%.*s"
msgstr ""
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2895,229 +2949,240 @@
"\t%.*s"
msgstr ""
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr ""
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr ""
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr ""
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr ""
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr ""
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr ""
-#: sequencer.c:872
-#, c-format
-msgid "could not read commit message of %s"
-msgstr ""
-
-#: sequencer.c:879
-#, c-format
-msgid "This is the commit message #%d:"
-msgstr ""
-
#: sequencer.c:884
#, c-format
+msgid "could not read commit message of %s"
+msgstr ""
+
+#: sequencer.c:891
+#, c-format
+msgid "This is the commit message #%d:"
+msgstr ""
+
+#: sequencer.c:896
+#, c-format
msgid "The commit message #%d will be skipped:"
msgstr ""
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr ""
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr ""
-#: sequencer.c:973
+#: sequencer.c:986
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr ""
-#: sequencer.c:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr ""
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr ""
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr ""
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr ""
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr ""
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr ""
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr ""
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr ""
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr ""
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr ""
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr ""
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr ""
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr ""
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr ""
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr ""
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr ""
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr ""
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr ""
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr ""
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr ""
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr ""
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr ""
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr ""
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr ""
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr ""
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr ""
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr ""
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr ""
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr ""
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr ""
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr ""
-#: sequencer.c:1647
+#: sequencer.c:1680
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr ""
-#: sequencer.c:1658
+#: sequencer.c:1691
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr ""
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr ""
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr ""
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr ""
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3127,11 +3192,11 @@
"\n"
msgstr ""
-#: sequencer.c:1862
+#: sequencer.c:1902
msgid "and made changes to the index and/or the working tree\n"
msgstr ""
-#: sequencer.c:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3142,17 +3207,17 @@
"\n"
msgstr ""
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr ""
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr ""
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3160,81 +3225,141 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr ""
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr ""
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr ""
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr ""
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr ""
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr ""
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr ""
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr ""
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr ""
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr ""
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr ""
-#: sequencer.c:2218
+#: sequencer.c:2260
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:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr ""
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr ""
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr ""
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr ""
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr ""
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr ""
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr ""
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+
+#: sequencer.c:2702
+#, 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 ""
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr ""
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr ""
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr ""
+
#: setup.c:171
#, c-format
msgid ""
@@ -3258,96 +3383,82 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr ""
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr ""
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr ""
-#: setup.c:810
+#: setup.c:811
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr ""
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr ""
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr ""
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr ""
-#: setup.c:1081
+#: setup.c:1083
#, 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:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr ""
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr ""
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr ""
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr ""
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr ""
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr ""
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr ""
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr ""
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr ""
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr ""
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3360,81 +3471,86 @@
"running \"git config advice.objectNameWarning false\""
msgstr ""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
-#: submodule.c:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr ""
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ""
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr ""
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr ""
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr ""
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr ""
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr ""
-#: submodule.c:1337
+#: submodule.c:833
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr ""
+
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr ""
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr ""
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr ""
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr ""
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr ""
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr ""
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr ""
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3442,79 +3558,83 @@
"'%s'\n"
msgstr ""
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr ""
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr ""
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr ""
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr ""
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr ""
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr ""
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr ""
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr ""
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr ""
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr ""
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr ""
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr ""
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr ""
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr ""
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr ""
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr ""
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr ""
@@ -3529,14 +3649,14 @@
msgid "transport: invalid depth option '%s'"
msgstr ""
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr ""
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3552,11 +3672,11 @@
"\n"
msgstr ""
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr ""
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr ""
@@ -3573,107 +3693,99 @@
msgid "empty filename in tree entry"
msgstr ""
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr ""
-#: unpack-trees.c:105
-#, 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:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
-"%%s"
+"%%sPlease commit your changes or stash them before you switch branches."
msgstr ""
-#: unpack-trees.c:110
+#: unpack-trees.c:109
#, 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."
+"Your local changes to the following files would be overwritten by checkout:\n"
+"%%s"
msgstr ""
#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
-"%%s"
+"%%sPlease commit your changes or stash them before you merge."
msgstr ""
-#: unpack-trees.c:115
+#: unpack-trees.c:114
#, 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."
+"Your local changes to the following files would be overwritten by merge:\n"
+"%%s"
msgstr ""
#: unpack-trees.c:117
#, 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:119
+#, c-format
+msgid ""
+"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr ""
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, 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:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:131
-#, 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:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
-"%%s"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:136
+#: unpack-trees.c:135
#, c-format
msgid ""
-"The following untracked working tree files would be removed by %s:\n"
-"%%sPlease move or remove them before you %s."
+"The following untracked working tree files would be removed by merge:\n"
+"%%s"
msgstr ""
#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
-"%%s"
+"%%sPlease move or remove them before you %s."
msgstr ""
-#: unpack-trees.c:143
+#: unpack-trees.c:140
#, 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 ""
#: unpack-trees.c:145
@@ -3681,50 +3793,58 @@
msgid ""
"The following untracked working tree files would be overwritten by "
"checkout:\n"
-"%%s"
+"%%sPlease move or remove them before you switch branches."
msgstr ""
-#: unpack-trees.c:148
+#: unpack-trees.c:147
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by merge:\n"
-"%%sPlease move or remove them before you merge."
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
+"%%s"
msgstr ""
#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
-"%%s"
+"%%sPlease move or remove them before you merge."
msgstr ""
-#: unpack-trees.c:153
+#: unpack-trees.c:152
#, c-format
msgid ""
-"The following untracked working tree files would be overwritten by %s:\n"
-"%%sPlease move or remove them before you %s."
+"The following untracked working tree files would be overwritten by merge:\n"
+"%%s"
msgstr ""
#: unpack-trees.c:155
#, 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:157
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr ""
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr ""
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3732,7 +3852,7 @@
"%s"
msgstr ""
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3740,24 +3860,19 @@
"%s"
msgstr ""
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr ""
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr ""
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr ""
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr ""
@@ -3800,13 +3915,8 @@
msgid "could not open '%s' for reading and writing"
msgstr ""
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr ""
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr ""
@@ -3820,384 +3930,374 @@
msgid "unable to get current working directory"
msgstr ""
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr ""
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr ""
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr ""
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr ""
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr ""
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr ""
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr ""
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr ""
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr ""
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr ""
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr ""
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr ""
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr ""
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr ""
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr ""
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr ""
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr ""
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr ""
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr ""
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr ""
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr ""
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr ""
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr ""
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr ""
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr ""
-#: wt-status.c:821
+#: wt-status.c:824
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr ""
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr ""
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr ""
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr ""
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr ""
-#: wt-status.c:1059
+#: wt-status.c:1063
msgid "All conflicts fixed but you are still merging."
msgstr ""
-#: wt-status.c:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr ""
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr ""
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr ""
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr ""
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1083
+#: wt-status.c:1087
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr ""
-#: wt-status.c:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr ""
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr ""
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] ""
msgstr[1] ""
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr ""
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr ""
-#: wt-status.c:1238
+#: wt-status.c:1243
#, 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:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr ""
-#: wt-status.c:1259
+#: wt-status.c:1264
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr ""
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr ""
-#: wt-status.c:1282
+#: wt-status.c:1287
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr ""
-#: wt-status.c:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1297
+#: wt-status.c:1302
msgid "You are currently splitting a commit during a rebase."
msgstr ""
-#: wt-status.c:1300
+#: wt-status.c:1305
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr ""
-#: wt-status.c:1304
+#: wt-status.c:1309
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr ""
-#: wt-status.c:1309
+#: wt-status.c:1314
msgid "You are currently editing a commit during a rebase."
msgstr ""
-#: wt-status.c:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr ""
-#: wt-status.c:1314
+#: wt-status.c:1319
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr ""
-#: wt-status.c:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr ""
-#: wt-status.c:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
-#: wt-status.c:1334
+#: wt-status.c:1339
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr ""
-#: wt-status.c:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr ""
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr ""
-#: wt-status.c:1364
+#: wt-status.c:1369
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr ""
-#: wt-status.c:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr ""
-#: wt-status.c:1371
+#: wt-status.c:1376
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr ""
-#: wt-status.c:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr ""
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr ""
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr ""
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr ""
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr ""
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr ""
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr ""
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr ""
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr ""
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr ""
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4205,93 +4305,93 @@
"new files yourself (see 'git help status')."
msgstr ""
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr ""
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr ""
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr ""
-#: wt-status.c:1646
+#: wt-status.c:1651
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
-#: wt-status.c:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr ""
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr ""
-#: wt-status.c:1655
+#: wt-status.c:1660
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr ""
-#: wt-status.c:1658
+#: wt-status.c:1663
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr ""
-#: wt-status.c:1664
+#: wt-status.c:1669
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
-#: wt-status.c:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr ""
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr ""
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr ""
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr ""
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr ""
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr ""
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr ""
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr ""
@@ -4300,122 +4400,126 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr ""
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr ""
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr ""
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr ""
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr ""
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr ""
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr ""
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr ""
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr ""
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr ""
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr ""
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr ""
-#: builtin/add.c:249
+#: builtin/add.c:271
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr ""
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr ""
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr ""
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr ""
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr ""
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr ""
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr ""
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr ""
+
+#: builtin/add.c:300
msgid "record only the fact that the path will be added later"
msgstr ""
-#: builtin/add.c:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr ""
-#: builtin/add.c:281
+#: builtin/add.c:304
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr ""
-#: builtin/add.c:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr ""
-#: builtin/add.c:284
+#: builtin/add.c:307
msgid "just skip files which cannot be added because of errors"
msgstr ""
-#: builtin/add.c:285
+#: builtin/add.c:308
msgid "check if - even missing - files are ignored in dry run"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr ""
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr ""
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr ""
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4433,185 +4537,185 @@
"See \"git help submodule\" for more information."
msgstr ""
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr ""
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr ""
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr ""
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr ""
-#: builtin/add.c:401
+#: builtin/add.c:424
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
-#: builtin/add.c:405
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr ""
-#: builtin/add.c:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr ""
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr ""
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr ""
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr ""
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr ""
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr ""
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr ""
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr ""
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr ""
-#: builtin/am.c:842
+#: builtin/am.c:855
msgid "Only one StGIT patch series can be applied at once"
msgstr ""
-#: builtin/am.c:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr ""
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr ""
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr ""
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr ""
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr ""
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr ""
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr ""
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr ""
-#: builtin/am.c:1172
+#: builtin/am.c:1161
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr ""
-#: builtin/am.c:1173
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
-#: builtin/am.c:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr ""
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr ""
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr ""
-#: builtin/am.c:1586
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr ""
-#: builtin/am.c:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr ""
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr ""
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr ""
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr ""
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr ""
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr ""
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr ""
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr ""
@@ -4619,42 +4723,42 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr ""
-#: builtin/am.c:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr ""
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr ""
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr ""
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr ""
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr ""
-#: builtin/am.c:1915
+#: builtin/am.c:1879
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:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -4662,172 +4766,171 @@
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr ""
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr ""
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr ""
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr ""
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr ""
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr ""
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr ""
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr ""
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr ""
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr ""
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr ""
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr ""
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr ""
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr ""
-#: builtin/am.c:2238
+#: builtin/am.c:2201
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr ""
-#: builtin/am.c:2241
+#: builtin/am.c:2204
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
-#: builtin/am.c:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr ""
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr ""
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr ""
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr ""
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr ""
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr ""
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr ""
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr ""
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr ""
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr ""
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr ""
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr ""
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr ""
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr ""
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr ""
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr ""
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr ""
-#: builtin/am.c:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr ""
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr ""
@@ -4865,18 +4968,69 @@
msgid "git archive: expected a flush"
msgstr ""
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr ""
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr ""
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr ""
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr ""
+
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr ""
+
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr ""
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr ""
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr ""
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr ""
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr ""
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr ""
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr ""
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr ""
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr ""
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr ""
@@ -5029,124 +5183,149 @@
msgstr ""
#: builtin/branch.c:31
-msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
msgstr ""
#: builtin/branch.c:32
+msgid "git branch [<options>] [-r | -a] [--points-at]"
+msgstr ""
+
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr ""
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr ""
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, 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:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr ""
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, 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:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr ""
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr ""
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr ""
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr ""
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr ""
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr ""
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr ""
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr ""
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr ""
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr ""
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr ""
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr ""
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+msgid "cannot copy the current branch while not on any."
+msgstr ""
+
+#: builtin/branch.c:473
msgid "cannot rename the current branch while not on any."
msgstr ""
-#: builtin/branch.c:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr ""
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr ""
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr ""
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr ""
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr ""
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr ""
-#: builtin/branch.c:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr ""
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+msgid "Branch is copied, but update of config-file failed"
+msgstr ""
+
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5154,225 +5333,220 @@
"Lines starting with '%c' will be stripped.\n"
msgstr ""
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr ""
-#: builtin/branch.c:557
+#: builtin/branch.c:588
msgid "show hash and subject, give twice for upstream branch"
msgstr ""
-#: builtin/branch.c:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr ""
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr ""
-#: builtin/branch.c:561
-msgid "change upstream info"
+#: builtin/branch.c:592
+msgid "do not use"
msgstr ""
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr ""
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr ""
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr ""
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr ""
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr ""
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr ""
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr ""
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr ""
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr ""
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr ""
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr ""
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr ""
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr ""
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr ""
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr ""
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr ""
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr ""
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr ""
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr ""
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr ""
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr ""
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr ""
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr ""
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr ""
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr ""
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr ""
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr ""
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr ""
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr ""
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr ""
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr ""
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr ""
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr ""
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr ""
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr ""
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr ""
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
msgstr ""
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
msgstr ""
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr ""
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr ""
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr ""
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
msgstr ""
-#: builtin/branch.c:743
+#: builtin/branch.c:789
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
-#: builtin/branch.c:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr ""
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr ""
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
-msgstr ""
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
#: builtin/bundle.c:45
@@ -5388,75 +5562,75 @@
msgid "Need a repository to unbundle."
msgstr ""
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
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:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
msgstr ""
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr ""
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr ""
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr ""
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr ""
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr ""
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr ""
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr ""
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr ""
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr ""
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr ""
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr ""
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr ""
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr ""
@@ -5484,7 +5658,7 @@
msgid "terminate input and output records by a NUL character"
msgstr ""
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr ""
@@ -5541,160 +5715,160 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr ""
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr ""
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr ""
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
msgid "no warning for existing files and files not in index"
msgstr ""
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr ""
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr ""
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr ""
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr ""
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr ""
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr ""
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr ""
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr ""
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr ""
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr ""
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr ""
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr ""
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr ""
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr ""
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr ""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr ""
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr ""
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr ""
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr ""
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr ""
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr ""
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr ""
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr ""
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr ""
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr ""
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr ""
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5709,7 +5883,7 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5726,160 +5900,160 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr ""
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr ""
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr ""
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr ""
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr ""
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr ""
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr ""
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr ""
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr ""
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr ""
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr ""
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr ""
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr ""
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr ""
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr ""
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr ""
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr ""
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr ""
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr ""
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr ""
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr ""
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr ""
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr ""
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr ""
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
msgid "do not check if another worktree is holding the given ref"
msgstr ""
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr ""
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr ""
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr ""
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr ""
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr ""
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr ""
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr ""
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5915,7 +6089,7 @@
msgid "failed to remove %s"
msgstr ""
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -5924,7 +6098,7 @@
" - (empty) select nothing\n"
msgstr ""
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -5937,38 +6111,38 @@
" - (empty) finish selecting\n"
msgstr ""
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr ""
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr ""
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr ""
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr ""
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr ""
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr ""
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -5979,386 +6153,384 @@
"? - help for prompt selection"
msgstr ""
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr ""
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr ""
-#: builtin/clean.c:828
+#: builtin/clean.c:832
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] ""
msgstr[1] ""
-#: builtin/clean.c:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr ""
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr ""
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr ""
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr ""
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr ""
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr ""
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr ""
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr ""
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr ""
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr ""
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
msgstr ""
-#: builtin/clean.c:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr ""
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr ""
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr ""
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr ""
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr ""
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr ""
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr ""
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr ""
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr ""
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr ""
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr ""
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr ""
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr ""
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr ""
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr ""
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr ""
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr ""
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr ""
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr ""
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr ""
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr ""
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr ""
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr ""
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr ""
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr ""
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr ""
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr ""
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr ""
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr ""
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr ""
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr ""
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr ""
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr ""
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr ""
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr ""
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr ""
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr ""
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr ""
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr ""
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr ""
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
msgstr ""
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr ""
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr ""
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr ""
-#: builtin/clone.c:719
+#: builtin/clone.c:721
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr ""
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr ""
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr ""
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr ""
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr ""
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr ""
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr ""
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr ""
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr ""
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr ""
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr ""
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr ""
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr ""
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr ""
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr ""
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr ""
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr ""
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr ""
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr ""
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr ""
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr ""
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr ""
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr ""
@@ -6461,98 +6633,98 @@
"the remaining commits.\n"
msgstr ""
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr ""
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr ""
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr ""
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr ""
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr ""
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr ""
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr ""
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr ""
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr ""
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr ""
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr ""
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr ""
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr ""
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr ""
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr ""
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr ""
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr ""
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr ""
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr ""
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr ""
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr ""
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -6562,7 +6734,7 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -6572,14 +6744,14 @@
"and try again.\n"
msgstr ""
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, 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:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -6587,341 +6759,357 @@
"An empty message aborts the commit.\n"
msgstr ""
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr ""
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr ""
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr ""
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr ""
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr ""
-#: builtin/commit.c:1068
+#: builtin/commit.c:1076
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr ""
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr ""
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr ""
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
msgid "Using both --reset-author and --author does not make sense"
msgstr ""
-#: builtin/commit.c:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr ""
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr ""
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr ""
-#: builtin/commit.c:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr ""
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr ""
-#: builtin/commit.c:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr ""
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr ""
-#: builtin/commit.c:1205
+#: builtin/commit.c:1226
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
-#: builtin/commit.c:1207
+#: builtin/commit.c:1228
msgid "No paths with --include/--only does not make sense."
msgstr ""
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr ""
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr ""
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr ""
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr ""
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr ""
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr ""
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr ""
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr ""
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr ""
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr ""
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
-#: builtin/commit.c:1360
-msgid "show ignored files"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
msgstr ""
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr ""
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr ""
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr ""
+
+#: builtin/commit.c:1469
msgid "couldn't look up newly created commit"
msgstr ""
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr ""
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr ""
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr ""
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr ""
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr ""
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr ""
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr ""
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr ""
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr ""
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr ""
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr ""
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr ""
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr ""
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr ""
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr ""
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr ""
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
msgid "use autosquash formatted message to squash specified commit"
msgstr ""
-#: builtin/commit.c:1599
+#: builtin/commit.c:1630
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr ""
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr ""
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr ""
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr ""
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr ""
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr ""
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr ""
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr ""
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr ""
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr ""
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr ""
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr ""
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr ""
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr ""
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr ""
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr ""
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr ""
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr ""
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr ""
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr ""
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr ""
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr ""
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr ""
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr ""
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr ""
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr ""
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr ""
+
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6932,139 +7120,143 @@
msgid "git config [<options>]"
msgstr ""
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr ""
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr ""
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr ""
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr ""
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr ""
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr ""
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr ""
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr ""
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr ""
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr ""
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr ""
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr ""
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr ""
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr ""
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr ""
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr ""
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr ""
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr ""
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr ""
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr ""
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr ""
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr ""
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr ""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr ""
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr ""
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr ""
-#: builtin/config.c:83
-msgid "Other"
-msgstr ""
-
#: builtin/config.c:84
-msgid "terminate values with NUL byte"
+msgid "value is an expiry date"
msgstr ""
#: builtin/config.c:85
-msgid "show variable names only"
+msgid "Other"
msgstr ""
#: builtin/config.c:86
-msgid "respect include directives on lookup"
+msgid "terminate values with NUL byte"
msgstr ""
#: builtin/config.c:87
+msgid "show variable names only"
+msgstr ""
+
+#: builtin/config.c:88
+msgid "respect include directives on lookup"
+msgstr ""
+
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr ""
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7074,185 +7266,190 @@
"#\temail = %s\n"
msgstr ""
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr ""
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr ""
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr ""
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr ""
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr ""
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr ""
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr ""
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr ""
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr ""
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr ""
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr ""
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr ""
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr ""
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr ""
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr ""
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr ""
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
msgstr ""
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr ""
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr ""
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr ""
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr ""
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr ""
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr ""
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr ""
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr ""
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr ""
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr ""
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr ""
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr ""
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr ""
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr ""
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr ""
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr ""
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr ""
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr ""
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr ""
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr ""
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr ""
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr ""
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr ""
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr ""
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr ""
@@ -7261,26 +7458,26 @@
msgid "'%s': not a regular file or symlink"
msgstr ""
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr ""
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr ""
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr ""
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr ""
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr ""
@@ -7289,97 +7486,97 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr ""
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr ""
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr ""
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr ""
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr ""
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr ""
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr ""
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr ""
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr ""
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr ""
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr ""
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr ""
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr ""
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr ""
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr ""
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr ""
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr ""
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr ""
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr ""
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr ""
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr ""
@@ -7387,325 +7584,320 @@
msgid "git fast-export [rev-list-opts]"
msgstr ""
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr ""
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr ""
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr ""
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr ""
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr ""
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr ""
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr ""
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr ""
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr ""
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr ""
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr ""
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr ""
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr ""
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr ""
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr ""
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr ""
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr ""
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr ""
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr ""
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr ""
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr ""
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr ""
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr ""
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "prune remote-tracking branches no longer on remote"
msgstr ""
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr ""
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr ""
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr ""
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr ""
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr ""
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
msgid "deepen history of shallow repository based on time"
msgstr ""
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr ""
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr ""
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr ""
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr ""
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr ""
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr ""
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr ""
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr ""
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr ""
-#: builtin/fetch.c:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr ""
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr ""
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr ""
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr ""
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr ""
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr ""
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr ""
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr ""
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr ""
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr ""
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr ""
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr ""
-#: builtin/fetch.c:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr ""
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr ""
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, 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:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr ""
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr ""
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr ""
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr ""
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr ""
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr ""
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr ""
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr ""
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr ""
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
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:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr ""
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr ""
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr ""
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr ""
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr ""
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr ""
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr ""
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr ""
@@ -7714,23 +7906,23 @@
"git fmt-merge-msg [-m <message>] [--log[=<n>] | --no-log] [--file <file>]"
msgstr ""
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
msgid "populate log with at most <n> entries from shortlog"
msgstr ""
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr ""
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr ""
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr ""
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr ""
@@ -7770,101 +7962,105 @@
msgid "show only <n> matched refs"
msgstr ""
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr ""
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr ""
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr ""
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr ""
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr ""
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr ""
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr ""
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr ""
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr ""
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr ""
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr ""
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr ""
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr ""
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr ""
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr ""
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr ""
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr ""
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr ""
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr ""
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr ""
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr ""
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr ""
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr ""
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr ""
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -7874,49 +8070,49 @@
"%s"
msgstr ""
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr ""
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr ""
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr ""
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr ""
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr ""
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr ""
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr ""
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
msgstr ""
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -7925,12 +8121,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr ""
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr ""
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr ""
@@ -7939,249 +8135,241 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr ""
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr ""
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, c-format
msgid "unable to grep from object of type %s"
msgstr ""
-#: builtin/grep.c:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr ""
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr ""
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr ""
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr ""
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr ""
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr ""
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr ""
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr ""
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr ""
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr ""
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr ""
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr ""
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr ""
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr ""
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr ""
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr ""
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr ""
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr ""
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr ""
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr ""
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr ""
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr ""
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr ""
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr ""
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr ""
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr ""
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr ""
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr ""
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr ""
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr ""
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
msgid "show filename only once above matches from same file"
msgstr ""
-#: builtin/grep.c:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr ""
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr ""
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr ""
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr ""
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr ""
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr ""
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr ""
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr ""
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr ""
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr ""
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr ""
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
msgid "show only matches from files that match all patterns"
msgstr ""
-#: builtin/grep.c:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr ""
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr ""
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr ""
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr ""
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr ""
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
msgid "--no-index or --untracked cannot be used with revs"
msgstr ""
-#: builtin/grep.c:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr ""
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr ""
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr ""
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr ""
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr ""
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr ""
-#: builtin/grep.c:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr ""
@@ -8270,370 +8458,370 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr ""
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr ""
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr ""
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr ""
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr ""
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr ""
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr ""
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr ""
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr ""
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr ""
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr ""
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr ""
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr ""
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr ""
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr ""
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr ""
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
+msgid "'%s' is aliased to '%s'"
msgstr ""
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr ""
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr ""
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr ""
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr ""
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr ""
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr ""
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr ""
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr ""
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr ""
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr ""
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr ""
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr ""
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr ""
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr ""
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr ""
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr ""
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr ""
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr ""
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr ""
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr ""
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr ""
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr ""
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr ""
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr ""
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr ""
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr ""
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr ""
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr ""
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr ""
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr ""
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr ""
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr ""
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr ""
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr ""
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr ""
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr ""
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr ""
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr ""
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr ""
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr ""
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr ""
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr ""
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr ""
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr ""
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr ""
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr ""
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr ""
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr ""
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr ""
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] ""
msgstr[1] ""
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr ""
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr ""
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr ""
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr ""
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr ""
@@ -8759,350 +8947,398 @@
"<token>[(=|:)<value>])...] [<file>...]"
msgstr ""
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr ""
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr ""
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr ""
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr ""
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr ""
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr ""
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr ""
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr ""
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr ""
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr ""
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr ""
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr ""
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr ""
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr ""
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr ""
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr ""
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr ""
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr ""
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr ""
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr ""
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr ""
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr ""
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr ""
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr ""
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr ""
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr ""
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr ""
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr ""
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr ""
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr ""
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr ""
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr ""
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr ""
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr ""
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr ""
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr ""
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr ""
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr ""
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr ""
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr ""
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr ""
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr ""
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr ""
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr ""
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr ""
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr ""
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr ""
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr ""
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr ""
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr ""
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr ""
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr ""
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr ""
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr ""
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr ""
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr ""
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr ""
-#: builtin/log.c:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr ""
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr ""
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr ""
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr ""
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr ""
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr ""
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr ""
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr ""
-#: builtin/log.c:1472
+#: builtin/log.c:1485
msgid "set From address to <ident> (or committer ident if absent)"
msgstr ""
-#: builtin/log.c:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr ""
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr ""
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr ""
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr ""
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr ""
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr ""
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr ""
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr ""
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr ""
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr ""
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr ""
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr ""
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr ""
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr ""
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr ""
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr ""
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr ""
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr ""
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr ""
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr ""
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr ""
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr ""
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr ""
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr ""
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9121,90 +9357,94 @@
msgstr ""
#: builtin/ls-files.c:521
-msgid "show cached files in the output (default)"
+msgid "use lowercase letters for 'fsmonitor clean' files"
msgstr ""
#: builtin/ls-files.c:523
-msgid "show deleted files in the output"
+msgid "show cached files in the output (default)"
msgstr ""
#: builtin/ls-files.c:525
-msgid "show modified files in the output"
+msgid "show deleted files in the output"
msgstr ""
#: builtin/ls-files.c:527
-msgid "show other files in the output"
+msgid "show modified files in the output"
msgstr ""
#: builtin/ls-files.c:529
+msgid "show other files in the output"
+msgstr ""
+
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr ""
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr ""
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
msgid "show files on the filesystem that need to be removed"
msgstr ""
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr ""
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr ""
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr ""
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr ""
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr ""
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr ""
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr ""
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr ""
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr ""
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr ""
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr ""
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
msgid "if any <file> is not in the index, treat this as an error"
msgstr ""
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr ""
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr ""
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr ""
@@ -9292,176 +9532,180 @@
msgid "empty mbox: '%s'"
msgstr ""
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr ""
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr ""
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr ""
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr ""
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr ""
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr ""
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr ""
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "do not show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr ""
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr ""
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr ""
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr ""
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr ""
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr ""
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr ""
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr ""
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
msgid "verify that the named commit has a valid GPG signature"
msgstr ""
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr ""
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr ""
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr ""
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr ""
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr ""
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr ""
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr ""
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr ""
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr ""
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr ""
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr ""
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr ""
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr ""
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr ""
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr ""
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr ""
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr ""
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr ""
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr ""
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr ""
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr ""
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
-#: builtin/merge.c:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -9471,185 +9715,185 @@
"the commit.\n"
msgstr ""
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr ""
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr ""
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr ""
-#: builtin/merge.c:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr ""
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr ""
-#: builtin/merge.c:893
+#: builtin/merge.c:915
msgid "No default upstream defined for the current branch."
msgstr ""
-#: builtin/merge.c:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr ""
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr ""
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, c-format
msgid "not something we can merge in %s: %s"
msgstr ""
-#: builtin/merge.c:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr ""
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr ""
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr ""
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr ""
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr ""
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr ""
-#: builtin/merge.c:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr ""
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr ""
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr ""
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr ""
-#: builtin/merge.c:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr ""
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
msgid "Can merge only exactly one commit into empty head"
msgstr ""
-#: builtin/merge.c:1268
+#: builtin/merge.c:1297
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr ""
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr ""
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr ""
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr ""
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr ""
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr ""
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr ""
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr ""
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr ""
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr ""
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr ""
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr ""
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr ""
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr ""
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr ""
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr ""
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -9674,23 +9918,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr ""
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr ""
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr ""
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr ""
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr ""
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr ""
@@ -9788,7 +10032,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr ""
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
@@ -9805,68 +10049,68 @@
msgid "skip move/rename errors"
msgstr ""
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr ""
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr ""
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr ""
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr ""
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr ""
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr ""
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr ""
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr ""
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr ""
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr ""
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr ""
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr ""
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr ""
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr ""
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr ""
@@ -9961,7 +10205,7 @@
msgstr ""
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
msgstr ""
#: builtin/notes.c:37
@@ -10051,19 +10295,19 @@
msgid "the note contents have been left in %s"
msgstr ""
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr ""
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr ""
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr ""
@@ -10091,185 +10335,185 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr ""
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr ""
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr ""
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr ""
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr ""
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr ""
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr ""
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr ""
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr ""
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr ""
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr ""
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr ""
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr ""
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr ""
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr ""
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr ""
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, 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:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr ""
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr ""
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr ""
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr ""
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr ""
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr ""
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr ""
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr ""
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
msgstr ""
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr ""
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr ""
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr ""
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr ""
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr ""
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr ""
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr ""
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr ""
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr ""
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10277,218 +10521,226 @@
"abort'.\n"
msgstr ""
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr ""
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr ""
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr ""
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr ""
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr ""
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr ""
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr ""
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr ""
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr ""
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr ""
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr ""
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr ""
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr ""
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr ""
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr ""
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr ""
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr ""
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr ""
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr ""
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
msgid "write the pack index file in the specified idx format version"
msgstr ""
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr ""
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr ""
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr ""
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr ""
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
msgid "limit pack window by memory in addition to object limit"
msgstr ""
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2958
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr ""
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr ""
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr ""
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr ""
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
msgid "use threads when searching for best delta matches"
msgstr ""
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr ""
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr ""
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
msgid "limit the objects to those that are not yet packed"
msgstr ""
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr ""
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr ""
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr ""
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr ""
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
msgid "include tag objects that refer to objects to be packed"
msgstr ""
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr ""
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr ""
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr ""
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr ""
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr ""
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr ""
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr ""
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
msgid "use a bitmap index if available to speed up counting objects"
msgstr ""
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr ""
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr ""
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr ""
@@ -10504,16 +10756,16 @@
msgid "prune loose refs (default)"
msgstr ""
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr ""
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr ""
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
msgstr ""
#: builtin/prune.c:106
@@ -10537,57 +10789,57 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr ""
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr ""
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr ""
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr ""
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr ""
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr ""
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr ""
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr ""
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr ""
-#: builtin/pull.c:401
+#: builtin/pull.c:417
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr ""
-#: builtin/pull.c:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr ""
-#: builtin/pull.c:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -10595,69 +10847,69 @@
"for your current branch, you must specify a branch on the command line."
msgstr ""
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr ""
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr ""
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr ""
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr ""
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr ""
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr ""
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, 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:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr ""
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr ""
-#: builtin/pull.c:848
+#: builtin/pull.c:873
msgid "Updating an unborn branch with changes added to the index."
msgstr ""
-#: builtin/pull.c:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr ""
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr ""
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -10665,7 +10917,7 @@
"commit %s."
msgstr ""
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -10676,15 +10928,15 @@
"to recover."
msgstr ""
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr ""
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr ""
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr ""
@@ -10692,21 +10944,21 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr ""
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr ""
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr ""
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr ""
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -10721,7 +10973,7 @@
"%s"
msgstr ""
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -10731,7 +10983,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr ""
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -10740,12 +10992,12 @@
" git push --set-upstream %s %s\n"
msgstr ""
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr ""
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -10753,12 +11005,12 @@
"to update which remote branch."
msgstr ""
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -10766,7 +11018,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -10774,7 +11026,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -10783,33 +11035,33 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr ""
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr ""
-#: builtin/push.c:275
+#: builtin/push.c:277
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:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr ""
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr ""
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr ""
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -10822,112 +11074,112 @@
" git push <name>\n"
msgstr ""
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr ""
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr ""
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr ""
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr ""
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr ""
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr ""
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr ""
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr ""
-#: builtin/push.c:528
+#: builtin/push.c:540
msgid "push tags (can't be used with --all or --mirror)"
msgstr ""
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr ""
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr ""
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr ""
-#: builtin/push.c:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr ""
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr ""
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr ""
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr ""
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr ""
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr ""
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr ""
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr ""
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr ""
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr ""
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr ""
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr ""
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr ""
@@ -11006,19 +11258,51 @@
msgid "git rebase--helper [<options>]"
msgstr ""
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr ""
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr ""
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr ""
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr ""
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr ""
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr ""
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr ""
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr ""
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr ""
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -11035,7 +11319,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr ""
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -11055,12 +11339,7 @@
msgid "You must specify a directory."
msgstr ""
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr ""
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr ""
@@ -11196,12 +11475,12 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr ""
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr ""
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr ""
@@ -11224,17 +11503,17 @@
msgid "(delete)"
msgstr ""
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr ""
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr ""
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11242,17 +11521,17 @@
"\tPlease update the configuration manually if necessary."
msgstr ""
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr ""
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr ""
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11262,113 +11541,113 @@
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr ""
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr ""
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr ""
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr ""
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr ""
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr ""
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr ""
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr ""
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr ""
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr ""
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr ""
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr ""
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr ""
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr ""
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr ""
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr ""
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr ""
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr ""
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr ""
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr ""
-#: builtin/remote.c:1144
-#, c-format
-msgid "* remote %s"
-msgstr ""
-
#: builtin/remote.c:1145
#, c-format
+msgid "* remote %s"
+msgstr ""
+
+#: builtin/remote.c:1146
+#, c-format
msgid " Fetch URL: %s"
msgstr ""
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr ""
@@ -11376,184 +11655,184 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr ""
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr ""
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr ""
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr ""
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr ""
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr ""
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] ""
msgstr[1] ""
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr ""
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr ""
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr ""
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr ""
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr ""
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr ""
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr ""
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr ""
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr ""
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr ""
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr ""
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr ""
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr ""
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr ""
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr ""
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr ""
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr ""
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr ""
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr ""
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr ""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr ""
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr ""
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr ""
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr ""
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr ""
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr ""
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr ""
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr ""
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr ""
@@ -11648,7 +11927,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr ""
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr ""
@@ -11778,119 +12057,132 @@
msgid "keep"
msgstr ""
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr ""
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr ""
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr ""
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr ""
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr ""
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr ""
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr ""
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr ""
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr ""
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr ""
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr ""
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr ""
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr ""
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr ""
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr ""
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr ""
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr ""
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr ""
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr ""
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr ""
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr ""
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr ""
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr ""
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr ""
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr ""
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr ""
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr ""
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr ""
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -11976,11 +12268,11 @@
msgid "keep redundant, empty commits"
msgstr ""
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr ""
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr ""
@@ -12042,17 +12334,17 @@
msgid "exit with a zero status even if nothing matched"
msgstr ""
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr ""
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr ""
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr ""
@@ -12085,27 +12377,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr ""
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr ""
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr ""
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr ""
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr ""
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr ""
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr ""
@@ -12297,215 +12589,243 @@
msgid "prepend comment character and space to each line"
msgstr ""
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr ""
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr ""
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr ""
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr ""
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ""
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr ""
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:479
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:489
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr ""
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:496
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr ""
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr ""
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr ""
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr ""
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr ""
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr ""
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr ""
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr ""
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr ""
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:842
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr ""
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr ""
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr ""
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr ""
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr ""
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr ""
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr ""
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr ""
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr ""
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr ""
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr ""
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr ""
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr ""
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr ""
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr ""
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
msgid "path into the working tree, across nested submodule boundaries"
msgstr ""
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr ""
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr ""
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr ""
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
msgid "whether the initial clone should follow the shallow recommendation"
msgstr ""
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr ""
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr ""
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, 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:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr ""
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr ""
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr ""
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr ""
@@ -12518,23 +12838,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr ""
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr ""
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr ""
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr ""
@@ -12559,17 +12879,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr ""
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr ""
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr ""
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -12578,7 +12898,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr ""
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -12588,142 +12908,142 @@
"want to.\n"
msgstr ""
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr ""
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr ""
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr ""
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr ""
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr ""
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr ""
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr ""
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr ""
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr ""
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr ""
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr ""
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr ""
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr ""
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr ""
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr ""
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr ""
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr ""
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr ""
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr ""
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr ""
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr ""
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr ""
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr ""
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr ""
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr ""
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr ""
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr ""
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr ""
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr ""
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr ""
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr ""
@@ -12732,217 +13052,250 @@
msgid "Unpacking objects"
msgstr ""
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr ""
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr ""
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr ""
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr ""
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr ""
-#: builtin/update-index.c:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr ""
-#: builtin/update-index.c:150
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr ""
-#: builtin/update-index.c:163
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr ""
-#: builtin/update-index.c:176
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr ""
-#: builtin/update-index.c:187
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr ""
-#: builtin/update-index.c:198
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr ""
-#: builtin/update-index.c:211
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr ""
-#: builtin/update-index.c:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr ""
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr ""
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr ""
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr ""
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr ""
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr ""
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr ""
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr ""
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr ""
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr ""
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr ""
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr ""
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr ""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr ""
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr ""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr ""
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
msgid "add to index only; do not add content to object database"
msgstr ""
-#: builtin/update-index.c:971
+#: builtin/update-index.c:983
msgid "remove named paths even if present in worktree"
msgstr ""
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr ""
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
msgid "read list of paths to be updated from standard input"
msgstr ""
-#: builtin/update-index.c:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr ""
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr ""
-#: builtin/update-index.c:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr ""
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr ""
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr ""
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr ""
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr ""
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr ""
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr ""
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr ""
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr ""
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+msgid "write out the index even if is not flagged as changed"
+msgstr ""
+
+#: builtin/update-index.c:1024
+msgid "enable or disable file system monitor"
+msgstr ""
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr ""
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr ""
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
msgstr ""
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
msgstr ""
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1147
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:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr ""
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
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:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr ""
+#: builtin/update-index.c:1171
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1175
+msgid "fsmonitor enabled"
+msgstr ""
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr ""
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr ""
@@ -12955,19 +13308,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr ""
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr ""
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr ""
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr ""
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr ""
@@ -13011,122 +13364,141 @@
msgid "print tag contents"
msgstr ""
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr ""
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr ""
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr ""
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr ""
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr ""
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr ""
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr ""
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr ""
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr ""
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr ""
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr ""
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr ""
-#: builtin/worktree.c:205
-#, c-format
-msgid "'%s' already exists"
-msgstr ""
-
#: builtin/worktree.c:236
#, c-format
+msgid "'%s' already exists"
+msgstr ""
+
+#: builtin/worktree.c:267
+#, c-format
msgid "could not create directory of '%s'"
msgstr ""
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr ""
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
msgid "checkout <branch> even if already checked out in other worktree"
msgstr ""
-#: builtin/worktree.c:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr ""
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr ""
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr ""
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr ""
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr ""
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr ""
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr ""
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr ""
+
+#: builtin/worktree.c:553
msgid "reason for locking"
msgstr ""
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr ""
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr ""
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr ""
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr ""
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr ""
@@ -13147,7 +13519,7 @@
msgid "only useful for debugging"
msgstr ""
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr ""
@@ -13167,7 +13539,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr ""
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13176,7 +13548,7 @@
"\tchmod 0700 %s"
msgstr ""
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr ""
@@ -13187,20 +13559,20 @@
"to read about a specific subcommand or concept."
msgstr ""
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr ""
-#: http.c:358
+#: http.c:360
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr ""
-#: http.c:367
+#: http.c:369
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr ""
-#: http.c:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13213,6 +13585,14 @@
msgid "redirecting to %s"
msgstr ""
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr ""
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr ""
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr ""
@@ -13385,27 +13765,27 @@
msgid "Bad bisect_write argument: $state"
msgstr ""
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr ""
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr ""
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr ""
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr ""
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
@@ -13413,18 +13793,18 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr ""
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -13432,91 +13812,76 @@
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr ""
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr ""
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr ""
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr ""
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr ""
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr ""
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr ""
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr ""
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr ""
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr ""
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr ""
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr ""
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr ""
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr ""
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr ""
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr ""
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr ""
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr ""
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -13544,7 +13909,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr ""
#: git-merge-octopus.sh:89
@@ -13563,53 +13928,54 @@
#: git-rebase.sh:58
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"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr ""
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr ""
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr ""
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr ""
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
msgstr ""
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr ""
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr ""
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr ""
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr ""
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -13622,223 +13988,221 @@
"valuable there."
msgstr ""
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
+msgid "invalid upstream '$upstream_name'"
msgstr ""
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr ""
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr ""
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr ""
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
msgstr ""
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr ""
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr ""
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr ""
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr ""
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr ""
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr ""
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr ""
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr ""
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr ""
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr ""
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr ""
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr ""
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr ""
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr ""
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr ""
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr ""
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr ""
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr ""
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
+#: git-stash.sh:281
#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
+msgid "error: unknown option for 'stash push': $option"
msgstr ""
-#: git-stash.sh:281
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr ""
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr ""
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr ""
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr ""
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr ""
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr ""
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr ""
-#: git-stash.sh:494
-#, sh-format
-msgid "Too many revisions specified: $REV"
-msgstr ""
-
#: git-stash.sh:509
#, sh-format
+msgid "Too many revisions specified: $REV"
+msgstr ""
+
+#: git-stash.sh:524
+#, sh-format
msgid "$reference is not a valid reference"
msgstr ""
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr ""
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr ""
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr ""
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr ""
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr ""
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr ""
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr ""
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr ""
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr ""
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
msgstr ""
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr ""
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr ""
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr ""
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr ""
@@ -13969,110 +14333,105 @@
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr ""
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr ""
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr ""
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
"Direct fetching of that commit failed."
msgstr ""
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr ""
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr ""
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr ""
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr ""
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr ""
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr ""
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr ""
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr ""
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr ""
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr ""
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr ""
@@ -14091,13 +14450,13 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -14160,49 +14519,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr ""
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr ""
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr ""
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr ""
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr ""
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr ""
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr ""
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr ""
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14212,31 +14571,31 @@
"you are able to reword the commit."
msgstr ""
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr ""
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr ""
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr ""
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr ""
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr ""
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -14244,7 +14603,7 @@
msgstr ""
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -14254,79 +14613,29 @@
"\tgit rebase --continue"
msgstr ""
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr ""
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr ""
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr ""
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr ""
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr ""
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr ""
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14344,21 +14653,21 @@
" git rebase --continue\n"
msgstr ""
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
msgid "Error trying to find the author identity to amend commit"
msgstr ""
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
msgstr ""
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr ""
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14367,47 +14676,51 @@
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr ""
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr ""
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr ""
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr ""
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr ""
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr ""
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr ""
+
+#: git-rebase--interactive.sh:973
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] ""
msgstr[1] ""
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr ""
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr ""
@@ -14914,60 +15227,60 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr ""
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr ""
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr ""
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr ""
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr ""
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr ""
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr ""
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr ""
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr ""
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr ""
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr ""
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr ""
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -14977,36 +15290,36 @@
" * Giving --format-patch option if you mean a range.\n"
msgstr ""
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr ""
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr ""
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr ""
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr ""
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr ""
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -15015,41 +15328,41 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr ""
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr ""
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr ""
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr ""
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr ""
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr ""
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr ""
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr ""
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -15058,20 +15371,20 @@
"want to send.\n"
msgstr ""
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr ""
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr ""
-#: git-send-email.perl:882
+#: git-send-email.perl:877
msgid "Message-ID to be used as In-Reply-To for the first email (if any)? "
msgstr ""
-#: git-send-email.perl:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr ""
@@ -15079,16 +15392,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:944
+#: git-send-email.perl:941
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr ""
-#: git-send-email.perl:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr ""
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -15105,128 +15418,128 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr ""
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr ""
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr ""
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr ""
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr ""
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
-#: git-send-email.perl:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr ""
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr ""
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr ""
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr ""
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr ""
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1534
+#: git-send-email.perl:1551
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1582
+#: git-send-email.perl:1599
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1605
+#: git-send-email.perl:1624
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr ""
-#: git-send-email.perl:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr ""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr ""
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr ""
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr ""
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr ""
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr ""
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr ""
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 6c7d896..9c0ffa5 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -1,10 +1,12 @@
# Git Korean translation
-# Copyright (C) 2015-2017 Changwoo Ryu and contributors
+# Copyright (C) 2015-2018 git Korean translation contributors
# This file is distributed under the same license as the Git package.
#
# Contributors:
-# Hyunjun Kim <yoloseem AT users.noreply.github.com>, 2015.
-# Changwoo Ryu <cwryu@debian.org>, 2015-2017.
+# Hyunjun Kim <yoloseem@users.noreply.github.com>, 2015.
+# Changwoo Ryu <cwryu@debian.org>, 2015-2018.
+# Sihyeon Jang <uneedsihyeon@gmail.com>, 2018.
+# Gwan-gyeong Mun <elongbug@gmail.com>, 2018.
#
# - 작업자는 위 Contributors 목록에 추가해 주세요.
# - 번역하면서 80컬럼을 넘어가지 않도록 해 주세요.
@@ -32,10 +34,11 @@
# | committer | 커미터 |
# | conflict | 충돌 |
# | fast-forward | 정방향 진행 |
-# | head | 헤드 |
-# | hook | 훅 |
-# | history | (커밋) 내역 |
+# | fsmonitor | 파일 시스템 모니터 |
# | Git | 깃 |
+# | head | 헤드 |
+# | hook | 후크 |
+# | history | (커밋) 내역 |
# | log | 기록 |
# | merge | 병합 |
# | note | 노트 |
@@ -58,8 +61,8 @@
msgstr ""
"Project-Id-Version: git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-01 12:26+0900\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-08 10:09+0900\n"
"Last-Translator: Changwoo Ryu <cwryu@debian.org>\n"
"Language-Team: Git Korean translation <http://github.com/changwoo/git-l10n-"
"ko>\n"
@@ -68,38 +71,39 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.5\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "힌트: %.*s\n"
-#: advice.c:86
+#: advice.c:90
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "병합하지 않은 파일이 있으므로, 커밋 빼오기를 할 수 없습니다."
-#: advice.c:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr "병합하지 않은 파일이 있으므로, 커밋할 수 없습니다."
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr "병합하지 않은 파일이 있으므로, 병합할 수 없습니다."
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr "병합하지 않은 파일이 있으므로, 풀을 할 수 없습니다."
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr "병합하지 않은 파일이 있으므로, 되돌리기를 할 수 없습니다."
-#: advice.c:96
+#: advice.c:100
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "병합하지 않은 파일이 있으므로, %s 할 수 없습니다."
-#: advice.c:104
+#: advice.c:108
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."
@@ -107,23 +111,23 @@
"작업 폴더에서 문제를 바로잡은 다음, 'git add/rm <파일>'을 적절히\n"
"사용해 해결 표시하고 커밋하십시오."
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "해결하지 못한 충돌 때문에 끝납니다."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "병합 작업을 다 마치지 않았습니다 (MERGE_HEAD 파일이 있습니다)."
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "병합하기 전에 변경 사항을 커밋하십시오."
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "병합을 마치지 못했기 때문에 끝납니다."
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -141,7 +145,7 @@
"주의: '%s' 체크아웃하기.\n"
"\n"
"지금 'HEAD가 분리된' 상태입니다. 이 상태에서는 여기저기 돌아보고,\n"
-"실험적으로 바꾼고 커밋하더라도, 체크아웃할 수 잇는 다른 브랜치에\n"
+"실험적으로 바꾸고 커밋하더라도, 체크아웃할 수 있는 다른 브랜치에\n"
"영향을 미치지 않고 변경 사항을 잃어버릴 수 있습니다.\n"
"\n"
"커밋을 유지하는 브랜치를 새로 만드려면, (지금이든 나중이든) 체크아웃\n"
@@ -160,86 +164,86 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "알 수 없는 공백 무시 옵션 '%s'"
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject 및 --3way 옵션은 같이 쓸 수 없습니다."
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached 및 --3way 옵션은 같이 쓸 수 없습니다."
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "저장소 밖에서 --3way 옵션 사용"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "저장소 밖에서 --index 옵션 사용"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "저장소 밖에서 --cached 옵션 사용"
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "타임스탬프 정규식을 준비할 수 없습니다 (%s)"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec()에서 다음 입력에 대해 %d번을 리턴했습니다: %s"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "패치의 %d번 줄에 파일 이름을 찾을 수 없습니다"
-#: apply.c:967
+#: apply.c:942
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr ""
"git apply: 잘못된 git-diff - %2$d번 줄에서 /dev/null을 기대했지만, '%1$s'이"
"(가) 왔습니다"
-#: apply.c:973
+#: apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr ""
"git apply: 잘못된 git-diff - %d번 줄에 새 파일 이름이 올바르지 않습니다"
-#: apply.c:974
+#: apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr ""
"git apply: 잘못된 git-diff - %d번 줄에 예전 파일 이름이 올바르지 않습니다"
-#: apply.c:979
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: 잘못된 git-diff - %d번 줄에서 /dev/null을 기대했습니다"
-#: apply.c:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "%d번 줄에 잘못된 모드: %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "일관성 없는 헤더 줄 %d번 및 %d번"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: 예상치 못한 줄: %.*s"
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "%d번 줄에 헤더 없는 패치 부분: %.*s"
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -251,81 +255,81 @@
"경로 이름 부분에서 %d개를 제거라 때 git diff 헤더에 파일 이름 정보가 없습니"
"다. (%d번 줄)"
-#: apply.c:1600
+#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 헤더에 파일 이름 정보가 없습니다 (%d번 줄)"
-#: apply.c:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "새 파일이 예전 내용에 의존합니다"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "삭제한 파일에 아직 내용이 들어 있습니다"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "패치가 %d번 줄에서 망가졌습니다"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "새 파일 %s이(가) 예전 내용에 의존합니다"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "삭제한 파일 %s이(가) 아직 내용이 들어 있습니다"
-#: apply.c:1848
+#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 경고: %s 파일의 내용이 비어 있지만 삭제되지 않았습니다"
-#: apply.c:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "%d번 줄에 바이너리 패치가 손상되었습니다: %.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "%d번 줄에 바이너리 패치가 이해할 수 없습니다"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "%d번 줄에 쓰레기 데이터만 있는 패치"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "%s을(를) 열거나 읽을 수 없습니다"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "줄 시작이 잘못됨: '%c'"
-#: apply.c:3052
+#: apply.c:3055
#, 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:3064
+#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "컨텍스트가 (%ld/%ld)로 줄어듭니다. (%d번 줄에서 적용)"
-#: apply.c:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -334,319 +338,319 @@
"다음을 검색하던 중:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "'%s'에 대한 바이너리 패치 데이터가 없습니다"
-#: apply.c:3100
+#: apply.c:3103
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr ""
"반대 헝크가 없으면 '%s'에 대한 바이너리 패치를 반대로 적용할 수 없습니다"
-#: apply.c:3146
+#: apply.c:3149
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr ""
"전체 인덱스 라인이 없으면 '%s'에 대한 바이너리 패치를 적용할 수 없습니다"
-#: apply.c:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "패치가 '%s'(%s)에 적용되지만, 현재 내용과 일치하지 않습니다."
-#: apply.c:3164
+#: apply.c:3167
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "패치는 빈 '%s'에 적용되지만, 현재 비어 있지 않습니다"
-#: apply.c:3182
+#: apply.c:3185
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "'%2$s'에 대한 필요한 %1$s 포스트이미지를 읽을 수 없습니다"
-#: apply.c:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "바이너리 패치를 '%s'에 적용할 수 없습니다"
-#: apply.c:3201
+#: apply.c:3204
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr ""
"'%s'에 대한 바이너리 패치가 올바르지 않은 결과를 만듭니다. (기대한 값 %s, 실"
"제 %s)"
-#: apply.c:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "패치 실패: %s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "%s을(를) 가져올 수 없습니다"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "%s을(를) 읽는데 실패했습니다"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "심볼릭 링크 뒤에 있는 '%s' 읽기"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "%s 경로가 이름이 바뀌었거나 삭제되었습니다"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: 인덱스에 없습니다"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: 인덱스와 맞지 않습니다"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "3-방향 병합으로 대신합니다...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "'%s'의 현재 내용을 읽을 수 없습니다"
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "3-방향 병합으로 대신하는데 실패했습니다...\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "패치를 '%s'에 충돌이 있는 상태로 적용.\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "패치를 '%s'에 패치 문제 없이 적용.\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "제거하는 패치 다음에 파일 내용이 남았습니다"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: 잘못된 종류"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s의 종류가 %o이지만 %o이(가) 되어야 합니다"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "잘못된 경로 '%s'"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s: 이미 인덱스에 있습니다"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: 이미 작업 디렉터리에 있습니다"
-#: apply.c:3941
+#: apply.c:3945
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s의 새 모드(%1$o)가 예전 모드(%3$o)와 다릅니다"
-#: apply.c:3946
+#: apply.c:3950
#, 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:3966
+#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "영향 받는 '%s' 파일이 심볼릭 링크 뒤에 있습니다"
-#: apply.c:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: 패치를 적용하지 않습니다"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "%s 패치를 확인하는 중입니다..."
-#: apply.c:4076
+#: apply.c:4080
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "sha1 정보가 없거나 %s 하위 모듈에서 쓸 수 없습니다"
-#: apply.c:4083
+#: apply.c:4087
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s에 대한 모드 변경이지만, 현재 HEAD에 없습니다"
-#: apply.c:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 정보가 없거나 쓸 수 없습니다 (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "경로 '%s'에 대해 make_cache_entry 실패"
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "임시 인덱스에 %s 항목을 추가할 수 없습니다"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "임시 인덱스를 %s에 쓸 수 없습니다"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "인덱스에서 %s을(를) 제거할 수 없습니다"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "하위 모듈 %s에 대해 손상된 패치"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "새로 만든 파일 '%s'에 대해 stat()할 수 없습니다"
-#: apply.c:4292
+#: apply.c:4296
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "새로 만든 파일 '%s'에 대해 예비 저장소를 만들 수 없습니다"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "%s에 대해 캐시 항목을 추가할 수 없습니다"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "'%s'에 쓰는데 실패했습니다"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "'%s' 파일을 닫는 중입니다"
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "'%s' 파일에 쓸 수 없습니다 ('%o' 모드)"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "%s 패치 깔끔하게 적용."
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "내부 오류"
-#: apply.c:4522
+#: apply.c:4526
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
msgstr[0] "%%s 패치를 (%d개 거부) 적용..."
-#: apply.c:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "truncating .rej 파일 이름을 '%.*s.rej'(으)로 자름"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "%s을(를) 열 수 없습니다"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "패치 부위 #%d 깔끔하게 적용."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "패치 부위 #%d 거부됨."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "패치 '%s' 건너뜀."
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "인식할 수 없는 입력"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "인덱스 파일을 읽을 수 없습니다"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "'%s' 패치를 열 수 없습니다: %s"
-#: apply.c:4860
+#: apply.c:4864
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "공백 오류 %d개를 넘어갑니다"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d번 줄에서 공백 오류를 추가합니다."
-#: apply.c:4874
+#: apply.c:4878
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
msgstr[0] "공백 오류를 바로잡은 뒤에 %d번 줄 적용."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "새 인덱스 파일에 쓸 수 없습니다"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "경로"
@@ -659,7 +663,7 @@
msgid "apply changes matching the given path"
msgstr "주어진 경로에 해당하는 변경 사항을 적용합니다"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "개수"
@@ -711,7 +715,7 @@
msgid "build a temporary index based on embedded index information"
msgstr "내장 인덱스 정보를 사용해 임시 인덱스를 만듭니다"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "경로를 NUL 문자로 구분합니다"
@@ -719,7 +723,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "최소한 <n>줄이 컨텍스트와 일치하는지 확인합니다"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "동작"
@@ -747,9 +753,9 @@
msgid "allow overlapping hunks"
msgstr "패치 부분이 겹쳐도 허용합니다"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "자세히 표시"
@@ -761,7 +767,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "패치 부분의 헤더의 줄 수를 신용하지 않습니다"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "최상위"
@@ -788,108 +794,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <저장소> [--exec <명령>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "'%s' 경로명세가 어떤 파일과도 일치하지 않습니다"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "형식"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "압축 형식"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "접두어"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "아카이브의 각 경로 이름의 앞에 지정한 경로를 붙입니다"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "파일"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "아카이브를 이 파일에 씁니다"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "작업 폴더의 .gitattributes를 읽습니다"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "아카이브에 포함된 파일을 표준오류로 표시합니다"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "저장만 하기"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "더 빠르게 압축"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "더 작게 압축"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "지원하는 압축 형식의 목록을 표시합니다"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "저장소"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "원격 저장소 <저장소>에서 아카이브를 가져옵니다"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "명령"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "원격 git-upload-archive 명령의 경로"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "예상치 못한 옵션 --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "--exec 옵션은 --remote 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "예상치 못한 옵션 --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "알 수 없는 아카이브 형식 '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "'%s' 형식에서는 지원하지 않는 인자: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s은(는) 올바른 속성 이름이 아닙니다"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -897,22 +903,22 @@
"git attributes에서 반대 패턴은 무시됩니다.\n"
"앞에 느낌표를 쓰려면 '\\!'를 사용하십시오."
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "'%s' 파일 안에 잘못된 따옴표가 붙은 내용: %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "더 이상 이등분할 수 없습니다!\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "올바른 커밋 이름이 아닙니다 (%s)"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -921,7 +927,7 @@
"%s 병합 베이스가 비정상입니다.\n"
"버그가 %s 및 [%s] 사이에서 고쳐졌다는 뜻입니다.\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -930,7 +936,7 @@
"%s 병합 베이스가 새롭습니다.\n"
"속성이 %s 및 [%s] 사이에서 변경되었습니다.\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -939,7 +945,7 @@
"%s 병합 베이스가 %s입니다.\n"
"처음 '%s' 커밋이 %s 및 [%s] 사이라는 뜻입니다.\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -950,7 +956,7 @@
"git bisect 명령은 이 경우에는 올바르게 동작하지 않습니다.\n"
"%s 및 %s 리비전을 잘못 쓴 것 아닙니까?\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -961,45 +967,45 @@
"그러므로 처음 %s 커밋이 %s 및 %s 사이에 있는지 확신할 수 없습니다.\n"
"어쨌든 계속합니다."
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "이등분: 병합 베이스를 시험해야 합니다\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "하나의 %s 리비전이 필요합니다"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "'%s' 파일을 만들 수 없습니다"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "'%s' 파일을 읽을 수 없습니다"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "이등분 레퍼런스 읽기에 실패했습니다"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s은(는) %s 및 %s 모두에 해당됩니다\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr ""
"시험 가능한 커밋이 없습니다.\n"
-"잘못도니 경로 파라미터로 시작하지 않았습니까?\n"
+"잘못된 경로 파라미터로 시작하지 않았습니까?\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1008,7 +1014,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -1027,10 +1033,10 @@
msgstr ""
"--reverse 및 --first-parent 옵션을 같이 쓰면 최근 커밋을 지정해야 합니다"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "리비전 walk 준비가 실패했습니다"
@@ -1071,48 +1077,52 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었"
-"습니다."
+"'%s' 브랜치가 리베이스를 통해 리모트의 '%s' 브랜치를 ('%s'에서) 따라가도록 설"
+"정되었습니다."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "%s 브랜치가 리모트의 %s 브랜치를 (%s에서) 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr ""
+"'%s' 브랜치가 리모트의 '%s' 브랜치를 ('%s'에서) 따라가도록 설정되었습니다."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
+msgid "Branch '%s' set up to track local branch '%s' by rebasing."
msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 브랜치를 따라가도록 설정되었습니다."
+"'%s' 브랜치가 리베이스를 통해 리모트의 '%s' 브랜치를 따라가도록 설정되었습니"
+"다."
#: branch.c:99
#, c-format
-msgid "Branch %s set up to track local branch %s."
-msgstr "%s 브랜치가 %s 브랜치를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "'%s' 브랜치가 '%s' 브랜치를 따라가도록 설정되었습니다."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
msgstr ""
-"%s 브랜치가 리베이스를 통해 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
+"'%s' 브랜치가 리베이스를 통해 리모트의 '%s' 레퍼런스를 따라가도록 설정되었습"
+"니다."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "%s 브랜치가 리모트의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "'%s' 브랜치가 리모트의 '%s' 레퍼런스를 따라가도록 설정되었습니다."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"%s 브랜치가 리베이스를 통해 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
+"'%s' 브랜치가 리베이스를 통해 로컬의 '%s' 레퍼런스를 따라가도록 설정되었습니"
+"다."
#: branch.c:110
#, c-format
-msgid "Branch %s set up to track local ref %s."
-msgstr "%s 브랜치가 로컬의 %s 레퍼런스를 따라가도록 설정되었습니다."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "'%s' 브랜치가 로컬의 '%s' 레퍼런스를 따라가도록 설정되었습니다."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1123,32 +1133,32 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr "따라가지 않음: %s 레퍼런스에 대해 애매한 정보"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s'은(는) 올바른 브랜치 이름이 아닙니다."
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "이름이 '%s'인 브랜치가 이미 있습니다."
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "현재 브랜치를 강제로 업데이트할 수 없습니다."
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr ""
"따라가기 정보를 설정할 수 없습니다. 시작 위치 '%s'이(가) 브랜치가 아닙니다."
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "요청한 업스트림 '%s' 브랜치가 없습니다"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1166,27 +1176,27 @@
"새 로컬 브랜치를 거기에 해당하는 리모트 브랜치로 push하려면,\n"
"\"git push -u\"로 push하는 업스트림을 설정할 수 있습니다."
-#: branch.c:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "올바른 오브젝트 이름이 아닙니다: '%s'."
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "애매한 오브젝트 이름: '%s'."
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "올바른 브랜치 위치가 아닙니다: '%s'."
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s'은(는) 이미 '%s' 위치에 받아져 있습니다"
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "작업 폴더 %s의 헤드가 업데이트되지 않았습니다"
@@ -1201,7 +1211,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "인식할 수 없는 헤더: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "'%s'을(를) 열 수 없습니다"
@@ -1210,54 +1221,54 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "저장소에 필수적인 다음 커밋이 없습니다:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "번들에 다음 레퍼런스 %d개가 있습니다:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "번들은 전체 커밋 내역을 기록합니다."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "번들에 다음 레퍼런스 %d개가 필요합니다:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "pack-objects 명령을 실행할 수 없습니다"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "pack-objects 명령이 죽었습니다"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list 명령이 죽었습니다"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "rev-list 옵션에서 '%s' 레퍼런스가 제외되었습니다"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "알 수 없는 인자: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "빈 번들은 만들지 않습니다."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "'%s'을(를) 만들 수 없습니다"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "index-pack 명령이 죽었습니다"
@@ -1266,8 +1277,8 @@
msgid "invalid color value: %.*s"
msgstr "잘못된 색 값: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "parse %s을(를) 파싱할 수 없습니다"
@@ -1277,7 +1288,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s, 커밋이 아닙니다"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1287,7 +1298,7 @@
"메시지를 수정한 다음 커밋을 수정하거나, 설정의 i18n.commitencoding\n"
"변수를 프로젝트가 사용 중인 인코딩으로 맞추십시오.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "메모리 바닥남"
@@ -1373,79 +1384,84 @@
msgid "failed to expand user dir in: '%s'"
msgstr "다음에 사용자 디렉터리 확장에 실패: '%s'"
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%s' 값이 '%s'에 대해 올바른 시각 값이 아닙니다"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "%d번은 올바른 zlib 압축 단계가 아닙니다"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "오브젝트 생성 모드가 올바르지 않습니다: %s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "잘못 묶음 압축 단계 %d"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr "명령행 설정을 파싱할 수 없습니다"
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr "설정 파일을 읽는 중 알 수 없는 오류가 생겼습니다"
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "잘못된 %s: '%s'"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "알 수 없는 core.untrackedCache 값 '%s'; 기본값으로 'keep' 사용"
-#: config.c:2111
+#: config.c:2162
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 값('%d')은 0에서 100 사이여야 합니다"
-#: config.c:2122
+#: config.c:2187
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "명령행 설정에서 '%s'을(를) 설정할 수 없습니다"
-#: config.c:2124
+#: config.c:2189
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "'%2$s' 파일의 %3$d번 줄 '%1$s' 설정 변수가 잘못되었습니다"
-#: config.c:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s은(는) 여러 개 값이 있습니다"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "%s에 대해 fstat 실패"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "'%s'을(를) '%s'(으)로 설정할 수 없습니다"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "'%s' 설정을 지울 수 없습니다"
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "리모트 측이 최초 연결했을 때 연결을 끊었습니다"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1457,19 +1473,19 @@
"올바른 접근 권한이 있는지, 그리고 저장소가 있는지\n"
"확인하십시오."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "연결을 확인하는 중입니다"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "'git rev-list'를 실행할 수 없습니다"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "rev-list 쓰기에 실패했습니다"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "rev-list의 표준입력을 닫는데 실패했습니다"
@@ -1565,31 +1581,39 @@
msgid "failed to read orderfile '%s'"
msgstr "'%s' 순서 파일을 읽는데 실패했습니다"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "부정확한 이름 바꾸기 탐색을 수행하는 중"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "'%s' 옵션에는 값이 필요합니다"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " dirstat 자름 퍼센트 값 '%s' 파싱에 실패했습니다\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 알 수 없는 dirstat 파라미터 '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"옮김 색 설정은 'no', 'default', 'zebra', 'dimmed_zebra', 'plain' 중의 하나입"
+"니다."
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "'diff.submodule' 설정 변수에 알 수 없는 값: '%s'"
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1598,21 +1622,21 @@
"'diff.submodule' 설정 변수에 오류:\n"
"%s'"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "외부 diff 프로그램이 죽음, %s 위치에서 멈춤"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr ""
"\"--name-only, --name-status, --check, -s 옵션 중 하나만 쓸 수 있습니다"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow 옵션에는 정확히 하나의 경로명세가 필요합니다"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1621,226 +1645,235 @@
"--dirstat/-X 옵션 파라미터를 파싱하는데 실패했습니다:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "--submodule 옵션 파라미터 파싱에 실패했습니다: '%s'"
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr "파일이 너무 많아서 부정확한 이름 바꾸기 검색 기능을 건너뜁니다."
-#: diff.c:4719
+#: diff.c:5449
msgid "only found copies from modified paths due to too many files."
msgstr "파일이 너무 많아서 수정한 경로의 복사본만 찾았습니다."
-#: diff.c:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "%s 변수를 최소한 %d(으)로 설정하고 명령을 다시 시도해 보십시오."
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "커널 이름과 정보를 가져오는데 실패했습니다"
-#: dir.c:2067
+#: dir.c:2219
msgid "Untracked cache is disabled on this system or location."
msgstr "이 시스템 또는 위치에서는 추적되지 않는 캐시를 사용하지 않습니다."
-#: dir.c:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "%s에 필요한 디렉터리를 만들 수 없습니다"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 git 디렉터리를 옮겨올 수 없습니다"
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "힌트: 편집기가 파일을 닫기를 기다리는 중입니다...%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "내용 필터링"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "'%s' 파일에 stat을 할 수 없습니다"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: 얕은 목록을 예상함"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ACK/NAK가 와야 하지만, EOF를 받았습니다"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "리모트 오류: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ACK/NAK가 와야 하지만, '%s'을(를) 받았습니다"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 옵션은 multi_ack_detailed가 필요합니다"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "shallow 줄이 잘못됨: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "unshallow 줄이 잘못됨: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "오브젝트가 없습니다: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "오브젝트에 오류: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "shallow가 없습니다: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "shallow/unshallow가 와야 하지만, %s을(를) 받았습니다"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "받음: %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "잘못된 커밋 %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "포기함"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "완료"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "받음: %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "%s 항목을 완료로 표시"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "이미 %s (%s) 있음"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: 사이드밴드 디멀티플렉서를 fork할 수 없습니다"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "프로토콜 오류: 잘못된 묶음 헤더"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: %s 명령을 fork할 수 없습니다"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "%s 실패"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "사이드밴드 디멀티플렉서에 오류"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "서버에서 shallow 클라이언트를 지원하지 않습니다"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "서버에서 multi_ack_detailed를 지원합니다"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "서버에서 no-done을 지원합니다"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "서버에서 multi_ack를 지원합니다"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "서버에서 side-band-64k를 지원합니다"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "서버에서 side-band를 지원합니다"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "서버에서 allow-tip-sha1-in-want를 지원합니다"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "서버에서 allow-reachable-sha1-in-want를 지원합니다"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "서버에서 ofs-delta를 지원합니다"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "서버 버전이 %.*s입니다"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "서버에서 --shallow-signed 옵션을 지원하지 않습니다"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "서버에서 --shallow-exclude 옵션을 지원하지 않습니다"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "서버에서 --deepen 옵션을 지원하지 않습니다"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "공통 커밋 없음"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: 가져오기 실패."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "해당하는 리모트 헤드가 없습니다"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "그런 리모트가 레퍼런스가 없습니다: %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "서버에서 알려지지 않은 %s 오브젝트에 대한 요청을 허용하지 않습니다"
@@ -1853,7 +1886,7 @@
msgid "could not create temporary file"
msgstr "임시 파일을 만들 수 없습니다"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "분리된 서명을 '%s'에 쓰는데 실패했습니다"
@@ -1863,17 +1896,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "log.graphColors에 잘못된 색을 ('%.*s') 무시합니다"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s': %s을(를) 읽을 수 없습니다"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "'%s'에 대해 stat()이 실패했습니다"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "'%s': 읽다가 잘림"
@@ -1939,12 +1972,12 @@
msgid "git version [<options>]"
msgstr "git version [<옵션>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -2009,12 +2042,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "이름이 허용하지 않는 문자로만 이루어져 있습니다: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "시각 형식이 잘못되었습니다: %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "여러 개의 오브젝트 필터 종류는 결합될 수 없습니다"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "잘못된 필터 양식 '%s'"
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2033,87 +2075,87 @@
"저장소에서 깃 프로세스가 전에 이상 종료했을 수도 있습니다:\n"
"수동으로 해당 파일을 제거하고 계속하십시오."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "'%s.lock'을 만들 수 없습니다: %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "캐시를 읽는데 실패했습니다"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "새 인덱스 파일을 쓸 수 없습니다"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(잘못된 커밋)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "'%s' 경로에 대해 addinfo_cache가 실패했습니다"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "트리 빌드에 오류"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "'%s' 경로 만들기에 실패했습니다%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "하위 디렉터리에 공간을 만드려고 %s을(를) 제거합니다\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": 아마도 D/F 충돌?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "'%s' 위치의 추적되지 않는 파일을 잃기를 거부합니다"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "%s '%s' 오브젝트를 읽을 수 없음"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s'에 대해 블롭을 예상"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "'%s'을(를) 여는데 실패: %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "'%s' 심볼릭 링크에 실패: %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "다음을 어떻게 할지 알 수 없습니다: %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "내부 병합 실행에 실패"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "%s을(를) 데이터베이스에 추가할 수 없습니다"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2121,7 +2163,7 @@
msgstr ""
"충돌! (%s/삭제): %s (위치 %s) 및 %s (%s에서) 삭제. %s 버전의 %s 트리에 남음."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2130,7 +2172,7 @@
"충돌! (%s/삭제): %s (위치 %s) 삭제, %s에서 %s(으)로 (위치 %s). %s 버전의 %s "
"트리에 남음."
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2139,7 +2181,7 @@
"충돌! (%s/삭제): %s (위치 %s) 및 %s (위치 %s) 삭제. %s 버전의 %s 트리에 "
"%s(으)로 남음."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2148,20 +2190,20 @@
"충돌! (%s/삭제): %s (위치 %s) 삭제, %s에서 %s(으)로 (위치 %s). %s 버전의 %s "
"트리에 남음 (위치 %s)."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "이름바꾸기"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "이름바꿈"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s은(는) %s에 있는 디렉터리로 %s(으)로 이름을 바꿉니다"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2170,140 +2212,145 @@
"충돌! (이름바꾸기/이름바꾸기): \"%3$s\" 브랜치에서 이름바꾸기 \"%1$s\"->"
"\"%2$s\" \"%6$s\" 브랜치에서 이름 바꾸기 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (해결되지 않음)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, c-format
msgid "CONFLICT (rename/rename): Rename %s->%s in %s. Rename %s->%s in %s"
msgstr ""
"충돌! (rename/rename): 이름 바꾸기 %s->%s (위치 %s). 이름 바꾸기 %s->%s (위"
"치 %s)"
-#: merge-recursive.c:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "대신 이름을 %s에서 %s(으)로 바꾸고 %s에서 %s(으)로 바꿉니다"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "충돌! (rename/add): 이름 바꾸기 %s->%s (위치 %s). %s 추가 (위치 %s)"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "병합된 %s을(를) 추가합니다"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "대신 %s(으)로 추가합니다"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "%s 오브젝트를 읽을 수 없습니다"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "%s 오브젝트는 블롭이 아닙니다"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "수정"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "수정됨"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "내용"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "추가/추가"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "건너뛰기: %s (기존과 같게 병합)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "자동 병합: %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "하위 모듈"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "충돌! (%s): %s에 병합 충돌"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "제거: %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "파일/디렉터리"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "디렉터리/파일"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "추가: %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "변경된 인덱스: 병합할 수 없습니다 (dirty: %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "이미 업데이트 상태입니다!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "%s 및 %s 트리의 병합이 실패했습니다"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "병합:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "과거의 공통 커밋 %u개 발견:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "병합 결과에 커밋이 없습니다"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "'%s' 오브젝트를 파싱할 수 없습니다"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "인덱스를 쓸 수 없습니다."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2314,7 +2361,7 @@
"새로 노트 병합을 시작하기 전에 'git notes merge --commit'\n"
"또는 'git notes merge --abort'로 이전 병합을 커밋/중지하십시오."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "노트 병합 작업을 다 마치지 않았습니다. (%s 있음)"
@@ -2342,16 +2389,30 @@
msgid "Bad %s value: '%s'"
msgstr "잘못된 %s 값: '%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "오브젝트를 파싱할 수 없습니다: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "사용법: %s"
@@ -2359,17 +2420,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " 또는: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-NUM"
@@ -2378,7 +2439,7 @@
msgid "malformed object name '%s'"
msgstr "잘못된 형식의 오브젝트 이름 '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "%s을(를) 그룹에서 쓰기 가능하도록 만들 수 없습니다"
@@ -2450,24 +2511,16 @@
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: 경로명세 지시어가 이 명령어에서 지원하지 않습니다: %s"
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니다. 모"
-"든 경로를 지정하려면 점(.)을 사용하십시오."
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "'%s' 경로명세는 심볼릭 링크 아래에 있습니다"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "--pretty 형식을 파싱할 수 없습니다"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2476,7 +2529,7 @@
"index.version이 설정되었지만, 이 값이 잘못되었습니다.\n"
"%i 버전을 사용합니다"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2485,51 +2538,52 @@
"GIT_INDEX_VERSION이 설정되었지만, 이 값이 잘못되었습니다.\n"
"%i 버전을 사용합니다"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "'%s'을(를) 닫을 수 없습니다"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "'%s'을(를) stat()할 수 없습니다"
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "git 디렉터리를 열 수 없습니다: %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "링크 해제할 수 없습니다: %s"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr "격리된 환경에서 레퍼런스 업데이트가 금지됩니다"
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "레퍼런스를 삭제할 수 없습니다: %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "%s 레퍼런스를 제거할 수 없습니다"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "%s 레퍼런스를 삭제할 수 없습니다: %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "레퍼런스를 삭제할 수 없습니다: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "없음"
@@ -2548,157 +2602,157 @@
msgid "ahead %d, behind %d"
msgstr "%d개 앞, %d개 뒤"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "예상한 형식: %%(color:<색>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "인식할 수 없는 색: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "정수 값이 와야 합니다 refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "정수 값이 와야 합니다 refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "인식할 수 없는 %%(%s) 인자: %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body)에 인자를 받지 않습니다"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject)에 인자를 받지 않습니다"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers)에 인자를 받지 않습니다"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "알 수 없는 %%(trailers) 옵션 인자: %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "'contents:lines=%s'에서 0보다 큰 값이 와야 합니다"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "알 수 없는 %%(contents) 인자: %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "'contents:short=%s'에서 0보다 큰 값이 와야 합니다"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "알 수 없는 %%(objectname) 인자: %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "예상한 형식: %%(align:<너비>,<위치>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "인식할 수 없는 위치:%s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "인식할 수 없는 너비:%s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "인식할 수 없는 %%(align) 인자:%s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "%%(align) 아톰에 너비가 0보다 커야 합니다"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "인식할 수 없는 %%(if) 인자: %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "잘못된 형식의 필드 이름: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "알 수 없는 필드 이름: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "형식: %%(if) 아톰이 %%(then) 아톰 없이 사용되었습니다"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "형식: %%(then) 아톰이 %%(if) 아톰 없이 사용되었습니다"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "형식: %%(then) 아톰이 여러번 사용되었습니다"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "형식: %%(then) 아톰이 %%(else) 뒤에 사용되었습니다"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "형식: %%(else) 아톰이 %%(if) 아톰 없이 사용되었습니다"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "형식: %%(else) 아톰이 %%(then) 아톰 없이 사용되었습니다"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "형식: %%(else) 아톰이 여러번 사용되었습니다"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "형식: %%(end) 아톰이 대응되는 아톰 없이 사용되었습니다"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "잘못된 형식의 문자열 %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(브랜치 없음, %s 리베이스)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(브랜치 없음, 이등분 %s에서 시작)"
@@ -2706,7 +2760,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD %s 위치에서 분리됨)"
@@ -2714,147 +2768,147 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD %s(으)로부터 분리됨)"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(브랜치 없음)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "없는 오브젝트 %s, %s에 대해"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "%s에 parse_object_buffer 실패 (%s에 대해)"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "'%s'에 잘못된 형식의 오브젝트"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "망가진 이름 %s에 레퍼런스를 무시합니다"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "망가진 레퍼런스 %s 무시"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "형식: %%(end) 아톰이 없습니다"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "잘못된 형식의 오브젝트 이름 %s"
-#: remote.c:747
+#: remote.c:780
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "%s 및 %s을(를) 모두 %s에 가져올 수 없습니다"
-#: remote.c:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s은(는) 보통 %s을(를) 추적하고, %s을(를) 추적하지 않습니다"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s은(는) %s 및 %s 모두 추적합니다"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "내부 오류"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD가 브랜치를 가리키지 않습니다"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "그런 브랜치가 없습니다: '%s'"
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "'%s' 브랜치에 대해 업스트림을 설정하지 않았습니다"
-#: remote.c:1698
+#: remote.c:1729
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "업스트림 '%s' 브랜치가 리모트 추적 브랜치로 저장되지 않았습니다"
-#: remote.c:1713
+#: remote.c:1744
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "리모트 '%2$s'의 푸시 대상 '%1$s'에 로컬 추적 브랜치가 없습니다"
-#: remote.c:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "'%s' 브랜치에 푸시 리모트가 없습니다"
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "'%s'에 대한 푸시 레퍼런스명세에 '%s'이(가) 들어 있지 않습니다"
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "푸시의 대상이 없습니다 (push.default가 'nothing'입니다)"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr "하나의 대상에 대해 'simple' 푸시를 처리할 수 없습니다"
-#: remote.c:2076
+#: remote.c:2106
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "현재 브랜치가 '%s' 기반이지만, 업스트림이 없어졌습니다.\n"
-#: remote.c:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (바로잡으려면 \"git branch --unset-upstream\"을 사용하십시오)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "브랜치가 '%s'에 맞게 업데이트된 상태입니다.\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (로컬에 있는 커밋을 제출하려면 \"git push\"를 사용하십시오)\n"
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n"
msgstr[0] "브랜치가 '%s'보다 %d개 커밋 뒤에 있고, 앞으로 돌릴 수 있습니다.\n"
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (로컬 브랜치를 업데이트하려면 \"git pull\"을 사용하십시오)\n"
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2866,79 +2920,88 @@
"현재 브랜치와 '%s'이(가) 갈라졌습니다,\n"
"다른 커밋이 각각 %d개와 %d개 있습니다.\n"
-#: remote.c:2117
+#: remote.c:2147
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr ""
" (리모트의 브랜치를 현재 브랜치로 병합하려면 \"git pull\"을 사용하십시오)\n"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "현재 브랜치가 망가진 것처럼 보입니다"
-#: revision.c:2190
+#: revision.c:2271
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "현재 '%s' 브랜치에 아직 아무 커밋도 없습니다"
-#: revision.c:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 옵션은 --bisect 옵션과 호환되지 않습니다"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "/dev/null 열기 실패"
-#: send-pack.c:151
+#: run-command.c:1188
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"'%s' 후크가 실행 가능하도록 설정되지 않아서, 무시됩니다.\n"
+"이 경고는 `git config advice.ignoredHook false` 명령으로 끌 수 있습니다."
+
+#: send-pack.c:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "리모트 묶음 풀기 상태를 파싱할 수 없습니다: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "리모트 묶음 풀기 실패: %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "푸시 인증서 서명에 실패했습니다"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "받는 쪽에서 --signed 푸시를 지원하지 않습니다"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr ""
"받는 쪽에서 --signed 푸시를 지원하지 않으므로 푸시 인증서를 보내지 않습니다"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "받는 쪽에서 --atomic 푸시를 지원하지 않습니다"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "받는 쪽에서 푸시 옵션을 지원하지 않습니다"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revert"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "알 수 없는 동작: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -2946,7 +3009,7 @@
"이 충돌을 해결한 뒤에, 바로잡은 경로를\n"
"'git add <경로>' 또는 'git rm <경로>'로 표시하십시오"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2956,42 +3019,43 @@
"'git add <경로>' 또는 'git rm <경로>'로 표시하십시오.\n"
"그리고 결과물을 'git commit'으로 커밋하십시오"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "'%s'을(를) 잠글 수 없습니다"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "'%s'에 쓸 수 없습니다"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "'%s'에 줄바꿈을 쓸 수 없습니다"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "'%s' 마치는데 실패했습니다."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "'%s'에서 읽을 수 없습니다"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "변경 사항을 커밋하거나 스태시한 다음 계속하십시오."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: 정방향 진행"
@@ -2999,20 +3063,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: 새 인덱스 파일을 쓸 수 없습니다"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "HEAD 커밋을 처리할 수 없습니다\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "HEAD 커밋을 찾을 수 없습니다"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "캐시 트리를 업데이트할 수 없습니다\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "캐시 트리를 업데이트할 수 없습니다"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3042,17 +3106,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "%s 커밋을 파싱할 수 없습니다\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "%s 이전 커밋을 파싱할 수 없습니다\n"
+msgid "could not parse commit %s"
+msgstr "%s 커밋을 파싱할 수 없습니다"
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "%s 이전 커밋을 파싱할 수 없습니다"
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3063,7 +3127,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3074,230 +3138,241 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "커밋 %d개가 섞인 결과입니다."
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "바로잡으려면 HEAD가 필요합니다"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "HEAD를 읽을 수 없습니다"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "HEAD의 커밋 메시지를 읽을 수 없습니다"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "'%s'을(를) 쓸 수 없습니다"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "1번째 커밋 메시지입니다:"
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "%s의 커밋 메시지를 읽을 수 없습니다"
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "커밋 메시지 #%d번입니다:"
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "커밋 메시지 #%d번을 건너뜁니다:"
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "알 수 없는 명령: %d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "인덱스 파일이 병합되지 않았습니다."
-#: sequencer.c:973
+#: sequencer.c:986
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "%s 커밋은 병합이지만 -m 옵션이 주어지지 않았습니다."
# FIXME: "parent %d" 번호가 무슨 의미?
-#: sequencer.c:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "%s 커밋에 이전 커밋 %d이(가) 없습니다"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "메인라인을 지정했지만 %s 커밋이 병합 커밋이 아닙니다."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: %s 이전 커밋을 파싱할 수 없습니다"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 이름을 바꿀 수 없습니다"
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "다음을 되돌릴(revert) 수 없습니다: %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "다음을 적용할(apply) 수 없습니다: %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "빈 커밋 모음을 건너 뜁니다"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: 인덱스 읽기에 실패했습니다"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: 인덱스 새로 고침에 실패했습니다"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s(은)는 인자를 허용하지 않습니다: '%s'"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "없는 인자, %s에 대해"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "잘못된 줄 %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "이전 커밋 없이 '%s' 수행할 수 없습니다"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "'%s'에서 읽을 수 없습니다."
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "사용 불가능 인스트럭션 시트: '%s'"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "파싱한 커밋이 없습니다."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "되돌리기(revert) 중에 빼오기(cherry-pick)를 할 수 없습니다."
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "빼오기(cherry-pick) 중에 되돌리기(revert)를 할 수 없습니다."
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "잘못된 키: %s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s의 값이 잘못됨: %s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "형식이 잘못된 옵션 시트: '%s'"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "이미 커밋 빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중입니다"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "\"git cherry-pick (--continue | --quit | --abort)\" 명령을 해 보십시오"
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "'%s' 시퀀서 디렉터리를 만들 수 없습니다"
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "HEAD를 잠글 수 없습니다"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "빼오기(cherry-pick) 또는 되돌리기(revert)가 진행 중이지 않습니다"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "HEAD를 구해 올 수 없습니다"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr "새로 만들고 있는 브랜치에서 중지할 수 없습니다"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "'%s'을(를) 열 수 없습니다"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "'%s'을(를) 읽을 수 없습니다: %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "예상치 못하게 파일이 끝났습니다"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "빼오기 전에 저장한 HEAD 파일이('%s') 손상되었습니다"
-#: sequencer.c:1658
+#: sequencer.c:1691
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "HEAD를 옮긴 것 같습니다. 되돌리지 않습니다. HEAD를 확인하십시오!"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "HEAD를 읽을 수 없습니다"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 복사할 수 없습니다"
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "인덱스를 읽을 수 없습니다"
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3312,11 +3387,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
msgid "and made changes to the index and/or the working tree\n"
msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다\n"
-#: sequencer.c:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3333,17 +3408,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "자동 스태시 적용.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "%s을(를) 저장할 수 없습니다"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3354,57 +3429,57 @@
"변경 사항은 스태시 안에 안전하게 들어 있습니다.\n"
"언제든지 \"git stash pop\" 또는 \"git stash drop\"을 실행할 수 있습니다.\n"
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "%s... %.*s 위치에서 멈췄습니다\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "알 수 없는 명령 %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "orig-head를 읽을 수 없습니다"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "'onto'를 읽을 수 없습니다"
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "%s을(를) 업데이트할 수 없습니다"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "HEAD를 %s 위치로 업데이트할 수 없습니다"
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "리베이스할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "없는 커밋을 수정할 수 없습니다"
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
-msgstr "잘못된 키: '%s'"
+msgstr "잘못된 파일: '%s'"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "잘못된 내용: '%s'"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3414,24 +3489,97 @@
"작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n"
"커밋하고 'git rebase --continue' 명령을 다시 실행하십시오."
-#: sequencer.c:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "스테이징한 변경 사항을 커밋할 수 없습니다."
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: %s 커밋을 빼올 수 없습니다"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: 잘못된 리비전"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "최초의 커밋으로 되돌릴 수 없습니다"
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: 처리하지 않은 옵션"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: 리비전 준비 중 오류"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "사용할 수 없는 할 일 목록: %s"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 %s 설정. 무시합니다."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n"
+"버려진 커밋 (최근에서 과거 순서):\n"
+
+#: sequencer.c:2702
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시"
+"오.\n"
+"\n"
+"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니"
+"다.\n"
+"가능한 동작은: ignore, warn, error\n"
+"\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명"
+"령을 실행합니다.\n"
+"또는 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다.\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "'%s' 커밋을 파싱할 수 없습니다"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "스크립트를 이미 재구성했습니다"
+
#: setup.c:171
#, c-format
msgid ""
@@ -3463,34 +3611,34 @@
"경로와 리비전을 구분하려면 다음과 같이 '--'를 사용하십시오:\n"
"'git <명령> [<리비전>...] -- [<파일>...]'"
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "깃 저장소 버전 <= %d 버전을 기대하지만, %d 버전이 발견되었습니다"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "알 수 없는 저장소 확장이 있습니다:"
-#: setup.c:810
+#: setup.c:811
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "(현재 폴더 또는 상위 폴더가) 깃 저장소가 아닙니다: %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "현재 디렉터리로 돌아올 수 없습니다"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "현재 작업 디렉터리를 읽을 수 없습니다"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "'%s' 위치로 이동할 수 없습니다"
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3500,7 +3648,7 @@
"파일 시스템 경계에서 중지합니다. (GIT_DISCOVERY_ACROSS_FILESYSTEM 설정되지 않"
"음)"
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3509,56 +3657,42 @@
"core.sharedRepository 파일모드 값에 (0%.3o) 문제가 있습니다.\n"
"파일의 소유자에 읽기와 쓰기 권한이 있어야 합니다."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "'%s' 경로가 없습니다"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr ""
"레퍼런스 '%s' 저장소를 연결된 체크아웃으로 쓰기는 아직 지원하지 않습니다."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "레퍼런스 '%s' 저장소가 로컬 저장소가 아닙니다."
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "레퍼런스 '%s' 저장소가 얕은 저장소입니다"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "레퍼런스 '%s' 저장소가 붙어 있는 저장소입니다"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "오프셋이 묶음 파일 앞입니다 (망가진 .idx?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "오프셋이 %s의 묶음 인덱스 시작보다 앞입니다 (망가진 인덱스?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "오프셋이 %s의 묶음 인덱스 끝보다 뒤입니다 (망가진 인덱스?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "짧은 SHA1 %s은(는) 여럿에 대응됩니다"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "후보는 다음과 같습니다:"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3580,65 +3714,70 @@
"확인해 보시고 잘못 만들어진 것이면 지우십시오. 이 메시지를 보고 싶지\n"
"않으면 \"git config advice.objectNameWarning false\" 명령을 사용하십시오."
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr ""
"병합하지 않은 .gitmodules를 바꿀 수 없습니다. 병합 충돌을 먼저 해결하십시오"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "경로가 %s일 때 .gitmodules의 섹션을 찾을 수 없습니다"
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr ".gitmodules 항목 %s을(를) 업데이트할 수 없습니다"
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "%s에 대한 .gitmodules 항목을 제거할 수 없습니다"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "업데이트한 .gitmodules를 커밋할 사항으로 표시하는데 실패"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 값에 음수를 쓸 수 없습니다"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "내용이 없는 하위 모듈 '%s'에서"
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "경로명세 '%s'은(는) ''%.*s' 하위 모듈 안에 있습니다"
-#: submodule.c:1337
+#: submodule.c:833
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "서브모듈 항목 '%s'(%s)은(는) %s이고, 커밋이 아닙니다"
+
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다."
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "'%s'은(는) 깃 저장소로 인식되지 않습니다"
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "하위 모듈 '%s'에서 'git status'를 시작할 수 없습니다"
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "하위 모듈 '%s'에서 'git status'를 실행할 수 없습니다"
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "'%s' 하위 모듈에 변경된 인덱스가 있습니다"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3646,18 +3785,18 @@
"여러 개의 작업 폴더가 있는 하위 모듈 '%s'에 대해 relocate_gitdir은 지원하지 "
"않습니다"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "하위 모듈 '%s'의 이름을 찾아볼 수 없습니다"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3668,79 +3807,83 @@
"'%s'에서\n"
"'%s'(으)로\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "재귀적으로 '%s' 하위 모듈에 들어갈 수 없습니다"
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "'..' 안에서 ls-files를 시작할 수 없습니다"
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "버그: 리턴된 경로 문자열이 현재 디렉터리와 맞지 않습니다?"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree가 예상치 못한 코드 %d번을 리턴했습니다"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 값에 음수를 쓸 수 없습니다"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "%s의 값이 올바르지 않습니다"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "트레일러 명령 '%s' 실행 실패"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "알 수 없는 값 '%s', 키 '%s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "%s이(가) 여러개입니다"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "트레일러 '%.*s'에서 빈 트레일러 토큰"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "'%s' 입력 파일을 읽을 수 없습니다"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "표준 입력에서 읽을 수 없습니다"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "%s에 대해 stat()할 수 없습니다"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "'%s' 파일이 일반 파일이 아닙니다"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "사용자가 %s 파일에 쓸 수 없습니다"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "임시 파일을 열 수 없습니다: %s"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "임시 파일 이름을 '%s'(으)로 바꿀 수 없습니다"
@@ -3755,7 +3898,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: 잘못된 깊이 옵션: %s"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3764,7 +3907,7 @@
"다음 하위 모듈 경로에 리모트 어디에도 없는\n"
"변경 사항이 있습니다:\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3791,11 +3934,11 @@
"명령을 시도해 보십시오\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "중지함."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "%s 레퍼런스를 읽을 수 없습니다"
@@ -3812,11 +3955,11 @@
msgid "empty filename in tree entry"
msgstr "트리 엔트리에 빈 파일 이름"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "너무 짧은 트리 파일"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3825,7 +3968,7 @@
"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n"
"%%s브랜치를 전환하기 전에 변경 사항을 커밋하거나 스태시하십시오."
-#: unpack-trees.c:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3834,7 +3977,7 @@
"다음 파일의 로컬 변경 사항을 체크아웃 때문에 덮어 쓰게 됩니다:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3843,14 +3986,14 @@
"다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다:\n"
"%%s병합하기 전에 변경 사항을 커밋하거나 스태시하십시오."
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr "다음 파일의 로컬 변경 사항을 병합 때문에 덮어 쓰게 됩니다."
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3859,7 +4002,7 @@
"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n"
"%%s%s 전에 변경 사항을 커밋하거나 스태시하십시오."
-#: unpack-trees.c:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3868,7 +4011,7 @@
"다음 파일의 로컬 변경 사항을 %s 때문에 덮어 쓰게 됩니다:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3877,7 +4020,7 @@
"다음 디렉터리를 업데이트하면 그 안의 추적하지 않는 파일을 잃어버립니다:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3886,7 +4029,7 @@
"체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n"
"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3895,7 +4038,7 @@
"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3904,7 +4047,7 @@
"병합 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n"
"%%s병합하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3913,7 +4056,7 @@
"병합 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3922,7 +4065,7 @@
"%s 때문에 추적하지 않는 다음 작업 폴더의 파일이 제거됩니다:\n"
"%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3931,7 +4074,7 @@
"%s 때문에 추적하지 않는 다음 작업 폴더 파일이 제거됩니다:\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3941,7 +4084,7 @@
"체크아웃 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
"%%s브랜치를 전환하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3951,7 +4094,7 @@
"체크아웃 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3960,7 +4103,7 @@
"병합 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
"%%s병합하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3969,7 +4112,7 @@
"병합 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3978,7 +4121,7 @@
"%s 때문에 추적하지 않는 다음 작업 폴더의 파일을 덮어씁니다:\n"
"%%s%s 하기 전에 이 파일을 옮기거나 제거하십시오."
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3987,22 +4130,22 @@
"%s 때문에 추적하지 않는 다음 작업 폴더 파일을 덮어씁니다:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "'%s' 항목이 '%s'와(과) 겹칩니다. 묶을 수 없습니다."
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"드문 체크아웃을 업데이트할 수 없습니다. 다음 항목이 최신으로 업데이트되지 않"
"았습니다:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4013,7 +4156,7 @@
"다:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4024,7 +4167,7 @@
"다:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4033,17 +4176,12 @@
"하위 모듈을 업데이트할 수 없습니다:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "중지함\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "하위 모듈 업데이트 전략이 '%s' 하위 모듈에서 지원하지 않습니다"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "파일을 가져옵니다"
@@ -4086,13 +4224,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "읽기와 쓰기용으로 '%s'을(를) 열 수 없습니다"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "'%s'을(를) 쓰기용으로 열 수 없습니다"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "'%s'을(를) 읽기용으로 열 수 없습니다"
@@ -4106,390 +4239,380 @@
msgid "unable to get current working directory"
msgstr "현재 작업 디렉터리를 가져올 수 없습니다"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "%s에 쓸 수 없습니다"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "%s을(를) 닫을 수 없습니다"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "병합하지 않은 경로:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (스테이지 해제하려면 \"git reset %s <파일>...\"을 사용하십시오)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (스테이지 해제하려면 \"git rm --cached <파일>...\"을 사용하십시오)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git add <파일>...\"을 사용하십시오)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (해결했다고 표시하려면 알맞게 \"git add/rm <파일>...\"을 사용하십시오)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (해결했다고 표시하려면 \"git rm <파일>...\"을 사용하십시오)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "커밋할 변경 사항:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "커밋하도록 정하지 않은 변경 사항:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (무엇을 커밋할지 바꾸려면 \"git add <파일>...\"을 사용하십시오)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (무엇을 커밋할지 바꾸려면 \"git add/rm <파일>...\"을 사용하십시오)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (작업 폴더의 변경 사항을 버리려면 \"git checkout -- <파일>...\"을 사용하십"
"시오)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (하위 모듈의 추적되지 않는 파일이나 수정된 내용을 커밋하거나 버리십시오)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (커밋할 사항에 포함하려면 \"git %s <파일>...\"을 사용하십시오)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "양쪽에서 삭제:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "이 쪽에서 추가:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "저 쪽에서 삭제:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "저 쪽에서 추가:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "이 쪽에서 삭제:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "양쪽에서 추가:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "양쪽에서 수정:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "새 파일:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "복사함:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "삭제함:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "수정함:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "이름 바꿈:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "종류 바뀜:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "알 수 없음:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "병합하지 않음:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "새 커밋, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "수정한 내용, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "추적하지 않은 내용, "
-#: wt-status.c:821
+#: wt-status.c:824
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
msgstr[0] "현재 스태시에 %d개 항목이 있습니다"
-#: wt-status.c:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "변경되었지만 업데이트하지 않은 하위 모듈:"
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "커밋할 하위 모듈의 변경 사항:"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"위의 줄을 바꾸지 마십시오.\n"
-"아래 있는 내용은 모두 제거됩니다."
+"위의 줄을 바꾸거나 지우지 마십시오.\n"
+"아래 있는 내용은 모두 무시됩니다."
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "병합하지 않은 경로가 있습니다."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (충돌을 바로잡고 \"git commit\"을 실행하십시오)"
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (병합을 중단하려면 \"git merge --abort\"를 사용하십시오)"
-#: wt-status.c:1059
+#: wt-status.c:1063
msgid "All conflicts fixed but you are still merging."
msgstr "모든 충돌을 바로잡았지만 아직 병합하는 중입니다."
-#: wt-status.c:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " (병합을 마무리하려면 \"git commit\"을 사용하십시오)"
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr "am 세션 중간에 있습니다."
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "현재 패치가 비어 있습니다."
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (충돌을 바로잡은 다음 \"git am --continue\"를 사용하십시오)"
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (이 패치를 건너 뛰려면 \"git am --skip\"을 사용하십시오)"
-#: wt-status.c:1083
+#: wt-status.c:1087
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (원본 브랜치를 복구하려면 \"git am --abort\"를 사용하십시오)"
-#: wt-status.c:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo가 없습니다."
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "완료한 명령 없음."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "최근 완료한 명령 (%d개 명령 완료):"
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " (자세한 정보는 %s 파일 참고)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "명령이 남아있지 않음."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "다음에 할 명령 (%d개 명령 남음):"
-#: wt-status.c:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (보고 편집하려면 \"git rebase --edit-todo\"를 사용하십시오)"
-#: wt-status.c:1259
+#: wt-status.c:1264
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중입니다."
-#: wt-status.c:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "현재 리베이스하는 중입니다."
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (충돌을 바로잡고 \"git rebase --continue\"를 사용하십시오)"
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (이 패치를 건너뛰려면 \"git rebase --skip\"을 사용하십시오)"
-#: wt-status.c:1282
+#: wt-status.c:1287
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (원본 브랜치를 가져오려면 \"git rebase --abort\"를 사용하십시오)"
-#: wt-status.c:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr ""
" (모든 충돌을 바로잡았습니다: \"git rebase --continue\"를 실행하십시오)"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "현재 '%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 분리하는 중입니다."
-#: wt-status.c:1297
+#: wt-status.c:1302
msgid "You are currently splitting a commit during a rebase."
msgstr "현재 리베이스하는 중 커밋을 분리하는 중입니다."
-#: wt-status.c:1300
+#: wt-status.c:1305
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " (작업 폴더가 깨끗해지면, \"git rebase --continue\"를 실행하십시오)"
-#: wt-status.c:1304
+#: wt-status.c:1309
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "'%s' 브랜치를 '%s' 위로 리베이스하는 중 커밋을 편집하는 중입니다."
-#: wt-status.c:1309
+#: wt-status.c:1314
msgid "You are currently editing a commit during a rebase."
msgstr "리베이스 중에 커밋을 편집하는 중입니다."
-#: wt-status.c:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (현재 커밋을 수정하려면 \"git commit --amend\"을 사용하십시오)"
-#: wt-status.c:1314
+#: wt-status.c:1319
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (변경 사항에 만족할 때 \"git rebase --continue\"를 사용하십시오)"
-#: wt-status.c:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "현재 %s 커밋을 뽑아 내고 있습니다."
-#: wt-status.c:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (충돌을 바로잡고 \"git cherry-pick --continue\"를 실행하십시오)"
-#: wt-status.c:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr ""
" (모든 충돌을 바로잡았습니다: \"git cherry-pick --continue\"를 실행하십시오)"
-#: wt-status.c:1334
+#: wt-status.c:1339
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (뽑기 작업을 취소하려면 \"git cherry-pick --abort\"를 사용하십시오)"
-#: wt-status.c:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "현재 %s 커밋을 되돌리는 중입니다."
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (충돌을 바로잡고 \"git revert --continue\"를 실행하십시오)"
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr ""
" (모든 충돌을 바로잡았습니다: \"git revert --continue\"를 실행하십시오)"
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (되돌리기 작업을 취소하려면 \"git revert --abort\"를 사용하십시오)"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "'이등분하는 중입니다. '%s' 브랜치부터 시작."
-#: wt-status.c:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "'이등분하는 중입니다."
-#: wt-status.c:1371
+#: wt-status.c:1376
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (원래 브랜치로 돌아가려면 \"git bisect reset\"을 사용하십시오)"
-#: wt-status.c:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "현재 브랜치 "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "대화형 리베이스 진행 중. 갈 위치는 "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "리베이스 진행 중. 갈 위치는 "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "HEAD가 다음 위치에서 분리: "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "HEAD가 다음으로부터 분리: "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "현재 어떤 브랜치도 사용하지 않음."
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "최초 커밋"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "아직 커밋이 없습니다"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "추적하지 않는 파일"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "무시한 파일"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4500,20 +4623,20 @@
"'status -uno' 옵션을 쓰면 빨라질 수도 있지만, 새 파일을\n"
"직접 찾아서 추가해야 합니다. ('git help status' 참고)"
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "추적하지 않는 파일을 보지 않습니다%s"
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr " (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "변경 사항 없음"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr ""
@@ -4521,12 +4644,12 @@
"\"를\n"
"사용하십시오)\n"
-#: wt-status.c:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "커밋할 변경 사항을 추가하지 않았습니다\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4536,66 +4659,66 @@
"\"git\n"
"add\"를 사용하십시오)\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "커밋할 사항을 추가하지 않았지만 추적하지 않는 파일이 있습니다\n"
-#: wt-status.c:1658
+#: wt-status.c:1663
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr ""
"커밋할 사항 없음 (파일을 만들거나 복사하고 \"git add\"를 사용하면 추적합니"
"다)\n"
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "커밋할 사항 없음\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr ""
"커밋할 사항 없음 (추적하지 않는 파일을 보려면 -u 옵션을 사용하십시오)\n"
-#: wt-status.c:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "커밋할 사항 없음, 작업 폴더 깨끗함\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "아직 커밋이 없습니다, 위치: <"
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (브랜치 없음)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "다음 뒤에: "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "다음 앞에: "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "%s 할 수 없습니다: 스테이징하지 않은 변경 사항이 있습니다."
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "추가로, 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "%s 할 수 없습니다: 인덱스에 커밋하지 않은 변경 사항이 있습니다."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "'%s' 파일 삭제에 실패했습니다"
@@ -4604,122 +4727,126 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<옵션>] [--] <경로명세>..."
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "예상치 못한 diff 상태 %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "파일 업데이트가 실패했습니다"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "'%s' 제거\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr "인덱스를 새로 고친 다음 커밋 표시하지 않은 변경 사항:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "'%s' 파일을 쓰기용으로 열 수 없습니다."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "패치를 쓸 수 없습니다"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "패치 편집에 실패했습니다"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "'%s'을(를) stat()할 수 없습니다"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "빈 패치. 중지."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "'%s'을(를) 적용할 수 없습니다"
-#: builtin/add.c:249
+#: builtin/add.c:271
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "다음 경로는 .gitignore 파일 중 하나 때문에 무시합니다:\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "가짜로 실행"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "대화식으로 고릅니다"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "대화식으로 변경된 부분을 선택합니다"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "현재 diff를 편집하고 적용합니다"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "무시하는 파일의 추가를 허용합니다"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "추적되는 파일을 업데이트합니다"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "추적된 파일의 새줄문자(EOL)를 재 적용합니다 (-u 옵션 포함)"
+
+#: builtin/add.c:300
msgid "record only the fact that the path will be added later"
msgstr "나중에 추가할 것이라는 사실만 기록합니다"
-#: builtin/add.c:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr "추적되고 추적되지 않는 모든 파일의 변경 사항을 추가합니다"
-#: builtin/add.c:281
+#: builtin/add.c:304
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "작업 폴더에서 제거한 경로를 무시합니다 (--no-all과 동일)"
-#: builtin/add.c:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "추가하지 않고 인덱스만 새로 고칩니다"
-#: builtin/add.c:284
+#: builtin/add.c:307
msgid "just skip files which cannot be added because of errors"
msgstr "오류 때문에 추가할 수 없는 파일을 건너뜁니다"
-#: builtin/add.c:285
+#: builtin/add.c:308
msgid "check if - even missing - files are ignored in dry run"
msgstr "가짜로 실행했을 때 파일을 무시하는지 확인합니다"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "목록의 파일에서 실행 가능 비트를 바꿉니다"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "내장 저장소를 추가할 때 경고를 표시합니다"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4749,151 +4876,151 @@
"\n"
"더 자세한 정보는 \"git help submodule\"을 참고하십시오."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "내장 깃 저장소 추가: %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "정말로 추가하려면 -f 옵션을 사용하십시오.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "파일 추가가 실패했습니다"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "-A 및 -u 옵션은 서로 호환되지 않습니다"
-#: builtin/add.c:401
+#: builtin/add.c:424
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr ""
"--ignore-missing 옵션은 --dry-run 옵션과 같이 사용할 경우에만 쓸 수 있습니다."
-#: builtin/add.c:405
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod 파라미터 '%s'은(는) -x 또는 +x 형식이어야 합니다"
-#: builtin/add.c:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "아무 것도 지정하지 않았으므로 아무 것도 추가하지 않습니다.\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "'git add .' 명령을 실행하려고 한 것 아니었습니까?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "인덱스 파일이 손상되었습니다"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "작성자 스크립트를 파싱할 수 없습니다"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
-msgstr "applypatch-msg 훅 때문에 '%s'이(가) 삭제되었습니다."
+msgstr "applypatch-msg 후크 때문에 '%s'이(가) 삭제되었습니다."
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "잘못된 형식의 입력 줄: '%s'."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "'%s'에서 '%s'(으)로 노트를 복사하는데 실패했습니다"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek 실패"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "'%s' 패치를 파싱할 수 없습니다"
-#: builtin/am.c:842
+#: builtin/am.c:855
msgid "Only one StGIT patch series can be applied at once"
msgstr "한번에 하나의 StGIT 패치 시리즈만 적용할 수 있습니다"
-#: builtin/am.c:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "시각이 잘못되었습니다"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "Date 줄이 잘못되었습니다"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "시간대 오프셋이 잘못되었습니다"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "패치 형식 검색이 실패했습니다."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "'%s' 디렉터리 만들기가 실패했습니다"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "패치를 쪼개는데 실패했습니다."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "인덱스 파일을 쓸 수 없습니다"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "이 문제를 해결했을 때 \"%s --continue\"를 실행하십시오."
-#: builtin/am.c:1172
+#: builtin/am.c:1161
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "이 패치를 건너뛰려면, 그 대신 \"%s --skip\"을 실행하십시오."
-#: builtin/am.c:1173
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr ""
"원래 브랜치를 복구하고 패치 적용을 중지하려면 \"%s --abort\"를 실행하십시오."
-#: builtin/am.c:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "패치가 비어 있습니다."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "잘못된 신원 줄: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "%s 커밋을 파싱할 수 없습니다"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "저장소에 3-방향 병합으로 대신할 때 필요한 블롭이 없습니다."
-#: builtin/am.c:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr "인덱스 정보를 사용해 기본 트리를 다시 만듭니다..."
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4901,38 +5028,38 @@
"패치를 직접 편집하셨습니까?\n"
"이 패치는 인덱스에 기록된 블롭에는 적용되지 않습니다."
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "베이스 패치 적용 및 3-방향 병합으로 대신합니다..."
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "변경 사항에서 병합하는데 실패했습니다."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "git write-tree가 트리를 쓰는데 실패했습니다"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "빈 커밋 내역에 대해 적용합니다"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "커밋 오브젝트를 쓰는데 실패했습니다"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "다시 시작할 수 없습니다: %s이(가) 없습니다."
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"터미널에 표준 입력이 연결되지 않은 상태에서 대화형으로 실행할 수 없습니다."
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "커밋 본문은:"
@@ -4940,35 +5067,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "적용? 예[y]/아니오[n]/편집[e]/패치 보기[v]/모두 적용[a]: "
-#: builtin/am.c:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "변경된 인덱스: 패치를 적용할 수 없습니다 (dirty: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "적용하는 중: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "변경 사항 없음 -- 패치가 이미 적용되었습니다."
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "패치가 %s %.*s 위치에서 실패했습니다"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "실패한 패치의 복사본이 다음 위치에 있습니다: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4978,7 +5105,7 @@
"커밋으로 표시할 사항이 남아 있지 않으면, 이미 같은 패치에서 적용된\n"
"경우일 수도 있습니다. 그런 경우에는 이 패치를 건너뛰면 됩니다."
-#: builtin/am.c:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -4989,17 +5116,17 @@
"충돌을 해결한 파일을 'git add'해서 해결했다고 표시해야 합니다.\n"
"파일의 \"저 쪽에서 삭제\"를 받아들이려면 `git rm`을 실행하십시오."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "'%s' 오브젝트를 파싱할 수 없습니다."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "인덱스 지우기에 실패했습니다"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5007,137 +5134,136 @@
"마지막 'am' 실패 이후 HEAD를 옮긴 것 같습니다.\n"
"ORIG_HEAD로 되돌리지 않습니다."
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "--patch-format 옵션에 대해 잘못된 값: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<옵션>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<옵션>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "대화형으로 실행합니다"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "아무 동작도 하지 않습니다 (과거부터 있었던 옵션)"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "필요하면 3-방향 병합으로 대신하도록 허용합니다"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "간략히 표시합니다"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "커밋 메시지에 Signed-off-by 줄을 남깁니다"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "UTF-8 인코딩으로 변환합니다 (기본값)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "git-mailinfo에 -k 옵션을 씁니다"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "git-mailinfo에 -b 옵션을 씁니다"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "git-mailinfo에 -m 옵션을 씁니다"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "mbox 형식에 대해 git-mailsplit에 --keep-cr 옵션을 사용합니다"
-#: builtin/am.c:2241
+#: builtin/am.c:2204
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr ""
"am.keepcr에 무관하게 git-mailsplit에 --keep-cr 옵션을 사용하지 않습니다."
-#: builtin/am.c:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "절취선 앞의 모든 사항을 무시합니다"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "git-apply에 넘깁니다"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "형식"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "패치의 형식"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "패치 실패가 발생했을 때 오류 메시지 대신 사용합니다"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "충돌을 해결한 다음 패치 적용을 계속합니다"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "--continue 옵션과 동일"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "현재 패치 건너뛰기"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr "원래 브랜치를 복구하고 패치 적용 작업을 중지합니다."
# NOTE: 옵션의 의미는 이게 맞다. 원문에서는 사용자가
# --committer-date-is-author-date라는 옵션을 보고 의미를 알 수 있다고 가정하고 있다.
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "커미터 시각을 작성자 시각으로 넣습니다"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "현재 시각을 작성자 시각으로 사용합니다"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "키-ID"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "GPG 서명 커밋"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(git-rebase를 위한 내부 용도)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5145,16 +5271,16 @@
"-b/--binary 옵션은 오랜 시간 동안 아무 동작도 하지 않았으므로, 이\n"
"옵션은 제거될 예정입니다. 이제 사용하지 마십시오."
-#: builtin/am.c:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "인덱스 읽기에 실패했습니다"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "이전 리베이스 디렉터리 %s이(가) 아직 있고 mbox를 지정했습니다."
-#: builtin/am.c:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5163,7 +5289,7 @@
"벗어난 %s 디렉터리가 발견되었습니다.\n"
"제거하려면 \"git am --abort\"를 사용하십시오."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "해소 작업이 진행 중입니다. 다시 시작하지 않습니다."
@@ -5201,18 +5327,69 @@
msgid "git archive: expected a flush"
msgstr "git archive: 파일 끝을 예상함"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <비정상_용어> <정상_용어>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s'은(는) 올바른 용어가 아닙니다."
+
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "내부 명령어 '%s'을(를) 용어로 사용할 수 없습니다"
+
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "용어 '%s'의 의미를 바꿀 수 없습니다"
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr "두 다른 용어를 사용하십시오"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "BISECT_TERMS 파일을 열 수 없습니다"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "'git bisect next'를 수행합니다"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "용어를 .git/BISECT_TERMS에 씁니다"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "이등분 상태를 정리합니다"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "예상된 리비전을 확인합니다"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "현재 커밋을 가져오는 대신 BISECT_HEAD를 업데이트합니다"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms 옵션은 두 인자가 필요합니다"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state 옵션은 인자가 필요하지 않습니다"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<옵션>] [<리비전-옵션>] [<리비전>] [--] <파일>"
@@ -5365,14 +5542,18 @@
msgstr "git branch [<옵션>] (-m | -M) [<과거-브랜치>] <새-브랜치>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<옵션>] (-c | -C) [<과거-브랜치>] <새-브랜치>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<옵션>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<옵션>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5381,7 +5562,7 @@
"'%s' 브랜치를 삭제합니다. 이 브랜치는 '%s'에\n"
" 병합되었지만, HEAD에는 병합되지 않았습니다."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5390,12 +5571,12 @@
"'%s' 브랜치를 삭제하지 않습니다. 이 브랜치는 '%s'에\n"
" 병합되지 않았지만, HEAD에는 병합되었습니다."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "'%s'에 대한 커밋 오브젝트를 찾아볼 수 없습니다"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5404,91 +5585,112 @@
"'%s' 브랜치가 완전히 병합되지 않았습니다.\n"
"정말로 삭제하려면 'git branch -D %s' 명령을 실행하십시오."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "config-file 업데이트가 실패했습니다"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "-a 옵션을 -d 옵션과 같이 쓸 수 없습니다"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "HEAD에 대한 커밋 오브젝트를 찾아볼 수 없습니다"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "'%2$s' 위치에 체크아웃한 '%1$s' 브랜치를 삭제할 수 없습니다"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "리모트 추적 '%s' 브랜치가 없습니다."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "'%s' 브랜치가 없습니다."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "리모트 추적 '%s' 브랜치를 삭제하는데 오류"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "'%s' 브랜치를 삭제하는데 오류"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "리모트 추적 '%s' 브랜치를 삭제합니다. (과거 %s)\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "%s 브랜치 삭제 (과거 %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "포맷 문자열을 파싱할 수 없습니다"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "%s 브랜치를 %s 위치에 리베이스합니다"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "%s 브랜치를 %s 위치에서 bisect합니다"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+msgid "cannot copy the current branch while not on any."
+msgstr "브랜치 위에 없으면서 현재 브랜치를 복사할 수 없습니다."
+
+#: builtin/branch.c:473
msgid "cannot rename the current branch while not on any."
msgstr "브랜치 위에 없으면서 현재 브랜치 이름을 바꿀 수 없습니다."
-#: builtin/branch.c:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "잘못된 브랜치 이름: '%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "브랜치 이름 바꾸기 실패"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "브랜치 복사 실패"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "이름이 잘못된 '%s' 브랜치의 복사본을 만들었습니다"
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "이름이 잘못된 '%s' 브랜치의 이름을 다르게 바꿉니다"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "브랜치 이름을 %s(으)로 바꾸지만, HEAD를 업데이트하지 않습니다!"
-#: builtin/branch.c:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr "브랜치의 이름을 바꾸지만, config-file 업데이트가 실패했습니다"
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+msgid "Branch is copied, but update of config-file failed"
+msgstr "브랜치를 복사했지만, config-file 업데이트가 실패했습니다"
+
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5499,177 +5701,185 @@
" %s\n"
"'%c' 문자로 시작하는 줄은 무시됩니다.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "일반 옵션"
# FIXME: give twice?
-#: builtin/branch.c:557
+#: builtin/branch.c:588
msgid "show hash and subject, give twice for upstream branch"
msgstr "해시와 제목을 표시하고, 업스트림 브랜치에 대한 위치를 표시합니다"
-#: builtin/branch.c:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "여러가지 안내 메시지를 표시하지 않습니다"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "추적 모드를 설정합니다 (git-pull(1) 참고)"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "업스트림 정보를 바꿉니다"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "사용하지 않습니다"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "업스트림"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "업스트림 정보를 바꿉니다"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "업스트림 정보를 해제합니다"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "여러 색으로 출력합니다"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "리모트 추적 브랜치에 대해 동작합니다"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "커밋이 있는 브랜치만 표시합니다"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "커밋이 들어있지 않은 브랜치만 표시합니다"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "특정 git-branch 동작:"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "리모트와 로컬의 브랜치 목록을 모두 표시합니다"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "완전히 병합된 브랜치를 삭제합니다"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "브랜치를 삭제합니다 (병합되지 않았더라도)"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr "브랜치와 그 reflog를 옮기거나 이름을 바꿉니다"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr "대상이 이미 있더라도 브랜치를 옮기거나 이름을 바꿉니다"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "브랜치와 그 reflog를 복사합니다"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "대상이 이미 있더라도 브랜치를 복사합니다"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "브랜치 이름 목록을 표시합니다"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "브랜치의 reflog를 만듭니다"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "브랜치의 설명을 편집합니다"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "강제로 만들고, 옮기거나 이름을 바꾸고, 삭제합니다"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "병합되는 브랜치만 표시합니다"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "병합되지 않는 브랜치만 표시합니다"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "목록을 여러 열로 표시합니다"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "키"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "정렬한 기준이 되는 필드 이름"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "오브젝트"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "해당 오브젝트의 브랜치만 표시합니다"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "정렬과 필터링은 대소문자를 구분하지 않습니다"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "출력에 사용할 형식"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "HEAD를 올바른 레퍼런스로 구해내는데 실패했습니다."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "레퍼런스/헤드 아래에 HEAD가 없습니다!"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "--column 및 --verbose 옵션은 호환되지 않습니다"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "브랜치 이름이 필요합니다"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "분리된 HEAD에 대한 설명을 부여할 수 없습니다"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "여러 브랜치에 대한 설명을 편집할 수 없습니다"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "아직 '%s' 브랜치에 커밋이 없습니다."
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "이름이 '%s'인 브랜치가 없습니다."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "이름 바꾸기 작업에 대해 브랜치가 너무 많습니다"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "복사 작업에 대해 브랜치가 너무 많습니다"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "새 업스트림을 설정하는데 브랜치가 너무 많습니다"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "이름 바꾸기 작업에 대해 인자가 너무 많습니다"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "새 업스트림을 설정하는데 인자가 너무 많습니다"
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5677,58 +5887,43 @@
"HEAD의 업스트림을 %s(으)로 설정할 수 없습니다. 어떤 브랜치도 가리키지 않습니"
"다."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "그런 브랜치가 ('%s') 없습니다"
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "'%s' 브랜치가 없습니다"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "업스트림 설정을 해제하는데 브랜치가 너무 많습니다"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "업스트림 설정을 해제하는데 인자가 너무 많습니다"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr ""
"HEAD의 업스트림 설정을 해제할 수 없습니다. 어떤 브랜치도 가리키지 않습니다."
-#: builtin/branch.c:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "'%s' 브랜치에 업스트림 정보가 없습니다"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "'HEAD'를 수동으로 만드는 건 앞뒤가 맞지 않습니다"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"'git branch'에 대해 -a 및 -r 옵션은 브랜치 이름과 같이 쓰면 앞뒤가 맞지 않습"
"니다"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"--set-upstream 옵션은 더 이상 사용되지 않고 제거될 예정입니다. --track 또는 "
-"--set-upstream-to 옵션을 사용해 보십시오\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"'%s'을(를) 만들고 '%s'을(를) 추적하게 하려면, 다음을 하십시오:\n"
+"'--set-upstream' 옵션은 더 이상 사용되지 않고 제거될 예정입니다. '--track' 또"
+"는 '--set-upstream-to' 옵션을 사용해 보십시오."
#: builtin/bundle.c:45
#, c-format
@@ -5743,7 +5938,7 @@
msgid "Need a repository to unbundle."
msgstr "번들을 해제하려면 저장소가 필요합니다."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5751,7 +5946,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <종류> | --textconv | --filters) [--path=<경로>] <오브젝트>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5759,64 +5954,64 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<종류>는 다음 중 하나가 될 수 있습니다: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "오브젝트 종류를 봅니다"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "오브젝트 크기를 봅니다"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "오류가 없을 때 0을 리턴하고 끝냅니다"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "오브젝트의 내용을 예쁘게 표시합니다"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 textconv를 실행합니다"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "블롭 오브젝트에 대해서는, 오브젝트의 내용에 대해 필터를 실행합니다"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "블롭"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "--textconv/--filters 옵션에 경로를 지정합니다"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "-s 및 -t 옵션이 손상된 오브젝트에 대해 동작하도록 허용합니다"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "--batch 출력에 대해 버퍼링합니다"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr "표준 입력에서 입력된 오브젝트의 정보와 내용을 표시합니다"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "표준 입력에서 입력된 오브젝트의 정보를 표시합니다"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"트리 내부의 심볼릭 링크를 따라갑니다 (--batch 또는 --batch-check와 같이 사용)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "--batch 또는 --batch-check에서 모든 오브젝트를 표시합니다"
@@ -5844,7 +6039,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "NUL 문자를 기준으로 자료 입력 및 출력을 멈춥니다"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "진행 상황 표시를 하지 않습니다"
@@ -5901,160 +6096,160 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<옵션>] [--] [<파일>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr "스테이지는 1에서 3 사이의 값이거나 all이어야 합니다"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "인덱스의 모든 파일을 가져옵니다"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "기존 파일을 강제로 덮어 씁니다"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
msgid "no warning for existing files and files not in index"
msgstr "기존 파일과 인덱스에 없는 파일에 대해 경고하지 않습니다"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "새 파일을 가져오지 않습니다"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "인덱스 파일의 stat 정보를 업데이트합니다"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr "표준 입력에서 경로의 목록을 읽습니다"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "내용을 임시 파일에 씁니다"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "문자열"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr "파일을 만들 때, 앞에 <문자열>을 붙입니다"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "지정한 스테이지에서 파일을 복사해 옵니다"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<옵션>] <브랜치>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<옵션>] [<브랜치>] -- <파일>..."
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "'%s' 경로에 우리쪽 버전이 없습니다"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "'%s' 경로에 상대편 버전이 없습니다"
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "'%s' 경로에 필요한 모든 버전이 없습니다"
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "'%s' 경로에 필요한 버전이 없습니다"
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "'%s' 경로: 병합할 수 없습니다"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "'%s'에 대한 병합 결과를 추가할 수 없습니다"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 옵션은 업데이트하는 경로에서 쓸 수 없습니다"
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 옵션은 %s 옵션과 같이 쓸 수 없습니다"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "경로를 업데이트하고 '%s' 브랜치로 전환하는 일은 동시에 할 수 없습니다."
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "'%s' 경로를 병합하지 않았습니다"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr "현재 인덱스를 먼저 해결해야 합니다"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "'%s'에 대해 reflog할 수 없습니다: %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD의 현재 위치는"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "HEAD를 업데이트할 수 없습니다"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "'%s' 브랜치 리셋\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "이미 '%s'에 있습니다\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "'%s' 브랜치로 전환하고 리셋합니다\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "새로 만든 '%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "'%s' 브랜치로 전환합니다\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 그리고 %d개 더.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6072,7 +6267,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6093,161 +6288,161 @@
" git branch <새-브랜치-이름> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "리비전 walk에 내부 오류"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "이전 HEAD 위치는"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr "현재 위치가 만들 예정인 브랜치에 있습니다"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "하나의 레퍼런스만 지정해야 하지만 %d개를 지정했습니다."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "잘못된 레퍼런스: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "레퍼런스가 트리가 아닙니다: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "브랜치를 전환하는데 경로를 사용할 수 없습니다"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 옵션은 브랜치를 전환할 때 쓸 수 없습니다"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 옵션은 '%s' 옵션과 같이 쓸 수 없습니다"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "브랜치를 커밋이 아닌 '%s'(으)로 전환할 수 없습니다"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "브랜치"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "새 브랜치를 만들고 가져옵니다"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "브랜치를 만들거나 리셋하고 가져옵니다"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "새 브랜치에 대한 reflog를 만듭니다"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "HEAD를 해당 커밋에서 분리합니다"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "새 브랜치에 대한 업스트림 정보를 설정합니다"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "새-브랜치"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "상위 브랜치가 없는 새 브랜치"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "병합되지 않은 파일에 대해 우리쪽 버전을 가져옵니다"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "병합되지 않은 파일에 대해 상대편 버전을 가져옵니다"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "강제로 체크아웃합니다 (로컬에서 수정한 사항을 버립니다)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr "새 브랜치에 대해 3-방향 병합을 수행합니다"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "무시하는 파일을 업데이트합니다 (기본값)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "스타일"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "충돌 스타일 (merge 또는 diff3)"
# FIXME: 의미 불명
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "경로명세를 드문 항목에만 제한하지 않습니다"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "'git checkout <없는-브랜치>'에 대해 추측합니다"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
msgid "do not check if another worktree is holding the given ref"
msgstr "다른 작업폴더에 주어진 레퍼런스가 있는지 확인하지 않습니다"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "강제로 진행 상황을 표시합니다"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B 및 --orphan 옵션은 서로 호환되지 않습니다"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "--track 옵션은 브랜치 이름이 필요합니다"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "브랜치 이름이 없습니다. -b 옵션을 사용해 보십시오"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "경로 명세가 잘못되었습니다"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s'은(는) 커밋이 아니고 여기에서 '%s' 브랜치를 만들 수 없습니다"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach 옵션은 경로 인자를 받지 않습니다 '%s'"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6286,7 +6481,7 @@
msgid "failed to remove %s"
msgstr "%s 제거에 실패했습니다"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6299,7 +6494,7 @@
"foo - 유일한 접두어에 해당하는 항목 선택\n"
" - (빈 입력) 선택하지 않음\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6320,38 +6515,38 @@
"* - 모든 항목 선택\n"
" - (빈 입력) 선택 마침\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "어라라 (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "무시할 패턴을 입력하십시오>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "경고: 다음에 해당하는 항목을 찾을 수 없습니다: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr "삭제할 항목을 선택하십시오"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "%s 제거합니까 [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "끝.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6369,62 +6564,63 @@
"help - 이 화면 표시\n"
"? - 프롬프트 선택 도움말"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** 명령 ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "무엇을 할까요"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "다음 항목을 제거할 예정입니다:"
-#: builtin/clean.c:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "지울 파일이 이제 없으므로 끝냅니다."
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "제거할 파일 이름을 표시하지 않습니다"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "강제"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "대화형 지우기"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "전체 디렉터리 제거"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "패턴"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "규칙을 무시하려면 <패턴>을 추가하십시오"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "무시한 파일도 제거"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "무시한 파일만 제거"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "-x 및 -X 옵션은 같이 쓸 수 없습니다"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6432,7 +6628,7 @@
"clean.requireForce가 true로 설정되었고 -i, -n, -f 옵션 중 하나도 쓰지 않았습"
"니다. 지우지 않습니다"
-#: builtin/clean.c:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6440,142 +6636,144 @@
"clean.requireForce 기본값이 true이고 -i, -n, -f 옵션 중 하나도 쓰지 않았습니"
"다. 지우지 않습니다"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<옵션>] [--] <저장소> [<디렉터리>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "체크아웃을 만들지 않습니다"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "간략한 저장소를 만듭니다"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "미러 저장소를 만듭니다 (간략한 저장소로 취급)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "로컬 저장소에서 복제합니다"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "로컬 하드링크를 사용하지 않고, 항상 복사합니다"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "공유 저장소로 설정합니다"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "경로명세"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "복제한 결과물에서 하위 모듈을 초기화합니다"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "병렬적으로 복제하는 하위모듈 개수"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "서식-디렉터리"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "서식을 사용할 디렉터리 위치"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "레퍼런스 저장소"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "복제할 경우에만 --reference를 사용합니다"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "이름"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "업스트림 추적에 'origin' 대신 <이름>을 사용합니다"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "리모트의 HEAD 대신 <브랜치>를 가져옵니다"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "리모트의 git-upload-pack 경로"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "깊이"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "지정한 깊이의 얕은 복제를 만듭니다"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "시각"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "지정한 시간 이후의 얕은 복제를 만듭니다"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "리비전"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr "리비전을 제외해 얕은 복제의 커밋 내역을 깊게 만듭니다"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "하나의 브랜치만 복제합니다 (HEAD 또는 --branch로 지정)"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "태그를 복제하지 않습니다. 나중에 가져올 때도 태그를 따르지 않습니다."
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "모든 복제한 하위 모듈은 얕은 모듈입니다"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "깃 디렉터리를 작업 폴더와 별개의 위치에 놓습니다"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "키=값"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "새 저장소 안에서 설정합니다"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "IPv4 주소만 사용합니다"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "IPv6 주소만 사용합니다"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6583,42 +6781,42 @@
"디렉터리 이름을 알아낼 수 없습니다.\n"
"명령행에서 디렉터리를 지정하십시오"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "정보: '%s'에 대한 보조 파일을 추가할 수 없습니다: %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "'%s'을(를) 여는데 실패"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "'%s'이(가) 있지만 디렉터리가 아닙니다"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "'%s'에 대해 stat()이 실패했습니다\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "'%s' 링크를 만드는데 실패했습니다"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "파일을 '%s'(으)로 복사하는데 실패했습니다"
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "완료.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6628,99 +6826,99 @@
"'git status' 명령으로 무엇을 체크아웃했는지 살펴볼 수 있고\n"
"'git checkout -f HEAD'로 체크아웃을 다시 할 수 있습니다\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "복제할 리모트의 %s 브랜치를 찾을 수 없습니다."
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "리모트에서 필요한 오브젝트를 모두 보내지 않았습니다"
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "%s을(를) 업데이트할 수 없습니다"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "리모트 HEAD가 없는 레퍼런스를 참고하므로, 체크아웃할 수 없습니다.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "작업 폴더를 체크아웃할 수 없습니다"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "파라미터를 설정 파일에 쓸 수 없습니다"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "정리용으로 repack할 수 없습니다"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "보조 임시 파일을 삭제할 수 없습니다"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "너무 인자가 많습니다."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "복제할 저장소를 지정해야 합니다."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 및 --origin %s 옵션은 호환되지 않습니다."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 및 --separate-git-dir 옵션은 호환되지 않습니다."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "'%s' 저장소가 없습니다"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "깊이가(%s) 0보다 큰 수가 아닙니다"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "대상 경로가('%s') 이미 있고 빈 디렉터리가 아닙니다."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "작업 폴더가('%s') 이미 있습니다."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "'%s'의 앞 디렉터리를 만들 수 없습니다"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "작업 디렉터리를('%s') 만들 수 없습니다"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "간략한 저장소로('%s') 복제합니다...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "'%s'에 복제합니다...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6728,42 +6926,37 @@
"clone --recursive 옵션은 --reference 및 --reference-if-able 옵션을 같이 쓰는 "
"것과 호환되지 않습니다"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr ""
"--depth 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십시오."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-since 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하십"
"시오."
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr ""
"--shallow-exclude 옵션은 로컬 복제에서 무시됩니다. 대신에 'file://'을 사용하"
"십시오."
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "원본 저장소가 얕은 저장소이므로, --local 옵션을 무시합니다"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local 옵션은 무시됩니다"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "%s의 복제 방법을 알지 못합니다"
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "리모트의 %s 브랜치가 업스트림 %s에 없습니다"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "빈 저장소를 복제한 것처럼 보입니다."
@@ -6903,61 +7096,61 @@
"그 다음에 \"git cherry-pick --continue\"를 하면 나머지 커밋에\n"
"대해 커밋 빼오기를 다시 시작합니다.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "HEAD 트리 오브젝트의 묶음을 푸는데 실패했습니다"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "임시 인덱스를 만들 수 없습니다"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "대화형 추가가 실패했습니다"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "임시 인덱스를 업데이트할 수 없습니다"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "주요 캐시 트리를 업데이트하는데 실패했습니다"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "new_index 파일에 쓸 수 없습니다"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "병합하는 중 부분 커밋을 할 수 없습니다."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "커밋 빼오기를 하는 중 부분 커밋을 할 수 없습니다."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "임시 인덱스 파일을 쓸 수 없습니다"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "'%s' 커밋에 작성자 헤더가 없습니다"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "'%s' 커밋의 작성자 헤더 형식이 잘못되었습니다"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "--author 파라미터 형식이 잘못되었습니다"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -6965,38 +7158,38 @@
"현재 커밋 메시지에서 사용되지 않는 주석 문자를\n"
"선택할 수 없습니다"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "%s 커밋을 찾아볼 수 없습니다"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(표준 입력에서 로그 메시지를 읽음)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "표준 입력에서 로그 메시지를 읽을 수 없습니다"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "'%s' 로그 파일을 읽을 수 없습니다"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "SQUASH_MSG를 읽을 수 없습니다"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "MERGE_MSG를 읽을 수 없습니다"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "커밋 서식을 쓸 수 없습니다"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7011,7 +7204,7 @@
"\t%s\n"
"다시 시도하십시오.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7026,7 +7219,7 @@
"\t%s\n"
"다시 시도하십시오.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7035,7 +7228,7 @@
"변경 사항에 대한 커밋 메시지를 입력하십시오. '%c' 문자로 시작하는\n"
"줄은 무시되고, 메시지를 입력하지 않으면 커밋이 중지됩니다.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7046,148 +7239,157 @@
"줄은 보존되니, 필요하면 직접 제거하십시오. 메시지를 입력하지\n"
"않으면 커밋이 중지됩니다.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s작성자: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%s시각: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s커미터: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "인덱스를 읽을 수 없습니다"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "트리를 만드는데 오류"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "메시지를 -m 또는 -F 옵션으로 입력하십시오.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1076
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' 옵션이 '이름 <전자메일>' 형식이 아니고 기존 작성자에도 없습니다"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "무시한 모드가 ('%s') 잘못되었습니다"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "추적되지 않는 파일 모드가 ('%s') 잘못되었습니다"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "--long 및 -z 옵션은 호환되지 않습니다"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
msgid "Using both --reset-author and --author does not make sense"
msgstr "--reset-author 및 --author 옵션을 모두 사용하면 앞뒤가 맞지 않습니다"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "바꿀 사항이 없습니다."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr "병합 중에 있습니다 -- 커밋을 바꿀 수 없습니다."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "커밋 빼오기 중에 있습니다 -- 커밋을 바꿀 수 없습니다."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr "--squash 및 --fixup 옵션은 같이 쓸 수 없습니다"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "-c/-C/-F/--fixup 옵션 중에 하나만 사용할 수 있습니다."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "-m 옵션은 -c/-C/-F/--fixup 옵션과 같이 쓸 수 없습니다."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 옵션은 -C, -c 또는 --amend 옵션과 같이 써야 합니다."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1226
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr ""
"--include/--only/--all/--interactive/--patch 옵션 중 하나만 사용할 수 있습니"
"다."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1228
msgid "No paths with --include/--only does not make sense."
msgstr "경로가 없이 --include/--only 옵션을 쓰면 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "잘못된 정리 모드 %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "-a 옵션과 경로를 같이 사용하면 앞뒤가 맞지 않습니다."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "상태를 간략하게 표시합니다"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "브랜치 정보를 표시합니다"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "스태시 정보를 표시합니다"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "버전"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "컴퓨터가 읽을 수 있는 형식"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "긴 형식으로 상태를 표시합니다 (기본값)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "NUL 문자로 항목을 끝냅니다"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "모드"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"추적되지 않는 파일을 표시합니다. 추가 옵션: all, normal, no (기본값: all)"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "무시되는 파일을 표시합니다"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"무시된 파일을 표시합니다. 추가 옵션: traditional, matching, no. (기본값: "
+"traditional)"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "언제"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7195,198 +7397,207 @@
"하위 모듈의 변경을 무시합니다. 추가 옵션: all, dirty, untracked. (기본값: "
"all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "추적되지 않는 파일의 목록을 여러 열로 표시합니다"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "무시한 모드와 추적되지 않는 파일의 인수가 지원되지 않는 조합입니다"
+
+#: builtin/commit.c:1469
msgid "couldn't look up newly created commit"
msgstr "새로 만든 커밋을 찾아볼 수 없습니다"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr "새로 만든 커밋을 파싱할 수 없습니다"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "커밋을 만든 후 HEAD를 찾을 수 없습니다"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "HEAD 분리됨"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (최상위-커밋)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "성공적인 커밋 후에 요약을 표시하지 않습니다"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "커밋 메시지 서식에 diff를 표시합니다"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "커밋 메시지 옵션"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "파일에서 메시지를 읽습니다"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "작성자"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "커밋의 작성자를 지정합니다"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "시각"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "커밋의 시각을 지정합니다"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "메시지"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "커밋 메시지"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "커밋"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "지정한 커밋의 메시지를 재사용하고 편집합니다"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "지정한 커밋에서 메시지를 재사용합니다"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr "지정한 커밋을 수정하는데 autosquash 형식 메시지를 사용합니다"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
msgid "use autosquash formatted message to squash specified commit"
msgstr "지정한 커밋을 합치는데 autosquash 형식 메시지를 사용합니다"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1630
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "커밋을 내가 작성한 것으로 만듭니다 (-C/-c/--amend와 같이 사용)"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "Signed-off-by: 줄을 추가합니다"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "지정한 서식 파일을 사용합니다"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "커밋 편집을 강제합니다"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "기본값"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "메시지에서 공백과 #주석을 지웁니다"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "커밋 메시지 서식에 상태를 포함합니다"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG 서명 커밋"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "커밋 내용 옵션"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "변경된 파일을 모두 커밋합니다"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "지정한 파일을 커밋할 인덱스에 추가합니다"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "대화형으로 파일을 추가합니다"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "대화형으로 변경 사항을 추가합니다"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "지정한 파일만 커밋합니다"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "커밋 전 후크와 커밋 메시지 후크를 건너뜁니다"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "무엇을 커밋할지 표시합니다"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "바로 앞 커밋을 바꿉니다"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "다시쓰기 후 후크를 건너뜁니다"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "빈 변경 사항을 기록하도록 허용합니다"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "빈 메시지와 같이 변경 사항을 기록하도록 허용합니다"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "HEAD 커밋을 파싱할 수 없습니다"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "손상된 MERGE_HEAD 파일 (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "MERGE_MODE를 읽을 수 없습니다"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "커밋 메시지를 읽을 수 없습니다: %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "커밋을 중지합니다. 커밋 메시지가 비어 있습니다.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "커밋을 중지합니다. 메시지를 편집하지 않았습니다.\n"
+
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7400,139 +7611,143 @@
msgid "git config [<options>]"
msgstr "git config [<옵션>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "설정 파일 위치"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "공통 설정 파일을 사용합니다"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "시스템 설정 파일을 사용합니다"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "저장소 설정 파일을 사용합니다"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "지정한 설정 파일을 사용합니다"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "블롭-id"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "지정한 블롭 오브젝트에서 설정을 읽습니다"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "동작"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "값을 가져옵니다: <이름> [<값-정규식>]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "모든 값을 가져옵니다: <키> [<값-정규식>]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "정규식에 대한 값을 가져옵니다: <이름-정규식> [<값-정규식>]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "<URL>에 특정되는 값을 가져옵니다: <섹션>[.<변수>] <URL>"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr "해당하는 변수를 모두 제거합니다: <이름> <값> [<값-정규식>]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "새 변수를 추가합니다: <이름> <값>"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "변수를 제거합니다: <이름> [<값-정규식>]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "해당하는 항목을 모두 제거합니다: <이름> [<값-정규식>]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "섹션의 이름을 바꿉니다: <옛-이름> <새-이름>"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "섹션을 제거합니다: <이름>"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "전체 목록을 표시합니다"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "편집기를 엽니다"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "설정한 색을 찾습니다: slot [<기본값>]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "색 설정을 찾습니다: slot [<표준출력이-TTY인지-여부>]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "값 종류"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "값이 \"true\" 또는 \"false\"입니다"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "값이 십진수입니다"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "값이 --bool 또는 --int입니다"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "값이 경로(파일 또는 디렉터리 이름)입니다"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "값이 만료 시각입니다"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "기타"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "값을 NUL 바이트로 끝냅니다"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "변수 이름만 표시합니다"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "찾아볼 때 include 지시어를 고려합니다"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "설정의 출처를 표시합니다 (파일, 표준 입력, 블롭, 명령행)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "기본 색 값을 파싱할 수 없습니다"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7547,16 +7762,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local 옵션은 깃 저장소 안에서만 쓸 수 있습니다"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "%s 설정 파일을 만들 수 없습니다"
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7566,75 +7781,65 @@
"%s을(를) 변경하려면 정규식을 쓰거나, --add 또는 --replace-all 옵션을\n"
"사용하십시오."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "사람이 읽기 좋은 형식으로 크기를 표시합니다"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<옵션>] [<커밋-따위>...]"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<옵션>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "head"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "lightweight"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "annotated"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "주석 달린 %s 태그를 사용할 수 없습니다"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "주석 달린 %s 태그에 내장된 이름이 없습니다"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "'%s' 태그가 실제 여기 '%s'입니다"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "올바른 오브젝트 이름이 아닙니다 (%s)"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s은(는) 올바른 '%s' 오브젝트가 아닙니다"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "어떤 태그도 '%s'와(과) 정확히 일치하지 않습니다"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "%s 설명을 위해 검색하는 중\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "어떤 레퍼런스나 태그도 정확히 일치하지 않고, 설명을 검색합니다\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "%s에서 검색 마침\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7643,7 +7848,7 @@
"어떤 주석 달린 태그도 '%s'을(를) 설명하지 않습니다.\n"
"하지만 주석 달리지 않은 태그가 있습니다: --tags 옵션을 해 보십시오."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7652,12 +7857,12 @@
"어떤 태그도 '%s'을(를) 설명할 수 없습니다.\n"
"--always 옵션을 써 보거나, 태그를 만들어 보십시오."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "커밋 %lu개를 가로질렀습니다\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7666,75 +7871,90 @@
"태그를 %i개 넘게 찾았습니다. 가장 최근의 %i개 목록을\n"
"표시합니다. %s 위치에서 검색을 중지합니다.\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "%s 설명합니다\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "올바른 오브젝트 이름이 아닙니다 (%s)"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s(은)는 커밋도 블롭도 아닙니다"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "커밋 다음에 오는 태그를 찾습니다"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "표준 오류에서 검색 전략을 디버깅합니다"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "모든 레퍼런스를 사용합니다"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "모든 태그를, 주석 달리지 않은 태그까지 사용합니다"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "항상 긴 형식을 사용합니다"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "첫 번째 이전 커밋만 따라갑니다"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "정확히 일치하는 항목만 출력합니다"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "<n>개의 가장 최근의 태그만 고려합니다 (기본값: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "<패턴>과 일치하는 태그만 고려합니다"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "<패턴>과 일치하는 태그를 고려하지 않습니다"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "대안으로 요약한 커밋 오브젝트를 표시합니다"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "표시"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "변경된 작업 폴더에 <표시>를 뒤에 붙입니다 (기본값: \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "망가진 작업 폴더에 <표시>를 뒤에 붙입니다 (기본값: \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 옵션은 --abbrev=0 옵션과 호환되지 않습니다"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "이름이 없습니다. 아무것도 설명할 수 없습니다."
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 옵션은 커밋같은 항목과 호환되지 않습니다"
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 옵션은 커밋같은 항목과 호환되지 않습니다"
@@ -7743,26 +7963,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "'%s': 일반 파일이나 심볼릭 링크가 아닙니다"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "잘못된 옵션: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "깃 저장소가 아닙니다"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "잘못된 '%s' 오브젝트가 주어졌습니다."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "두 개보다 많은 블롭이 주어졌습니다: '%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "처리하지 않은 '%s' 오브젝트가 주어졌습니다."
@@ -7771,27 +7991,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<옵션>] [<커밋> [<커밋>]] [--] [<경로>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "실패: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "%s 심볼릭 링크를 읽을 수 없습니다"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "%s 심볼릭 링크 파일을 읽을 수 없습니다"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "%2$s 심볼릭 링크에 대한 %1$s 오브젝트를 읽을 수 없습니다"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7799,72 +8019,72 @@
"컴바인드 diff 형식은 ('-c' 및 '--cc') 디렉터리 diff 모드에서는\n"
"('-d' 및 '--dir-diff') 지원하지 않습니다."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "두 파일이 수정되었습니다: '%s' 및 '%s'."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "작업 폴더가 남겨져 있습니다."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "임시 파일이 '%s'에 있습니다."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "이 파일을 지우거나 복구할 수 있습니다."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "`diff.tool` 대신 `diff.guitool`을 사용하십시오"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "전체 디렉터리 diff를 수행합니다"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "diff 도구를 실행하기 전에 프롬프트를 표시하지 않습니다"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "dir-diff 모드에서 심볼릭 링크를 사용합니다"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<도구>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "지정한 diff 도구를 사용합니다"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "`--tool` 옵션에서 사용할 수 있는 diff 도구 목록을 표시합니다"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr ""
"실행한 diff 도구가 0이 아닌 코드를 리턴하면 'git-difftool'이 끝나게 합니다"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<명령>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "diff를 보는 명령어를 사용자가 지정합니다"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "--tool=<도구> 옵션에 <도구>가 주어지지 않았습니다"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "--extcmd=<명령> 옵션에 <명령>이 주어지지 않았습니다"
@@ -7872,231 +8092,231 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-옵션]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "오브젝트 <n>개 뒤에 진행 상황을 표시합니다"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "서명한 태그의 처리 방식을 선택합니다"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "필터링한 오브젝트에 대한 태그의 처리 방식을 선택합니다"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "이 파일로 표시를 내보냅니다"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "이 파일에서 표시를 가져옵니다"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "태그에 태그붙인 사람이 없을 때 가짜로 만듭니다"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "커밋 마다 전체 트리를 출력합니다"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "스트림을 끝내는데 완료 기능을 사용합니다"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "블롭 데이터의 출력을 건너뜁니다"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "레퍼런스명세"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "레퍼런스명세를 내보낸 레퍼런스에 적용합니다"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "출력을 익명화합니다"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<옵션>] [<저장소> [<레퍼런스명세>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<옵션>] <그룹>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<옵션>] [(<저장소> | <그룹>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<옵션>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "모든 리모트에서 가져옵니다"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "덮어쓰지 말고 .git/FETCH_HEAD에 덧붙입니다"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "리모트 쪽에 묶음을 업로드할 경로"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "로컬 브랜치를 강제로 덮어씁니다"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "여러 리모트에서 가져옵니다"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "모든 태그와 관련 오브젝트를 가져옵니다"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "모든 태그를 가져오지 않습니다 (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "병렬적으로 받아오는 하위모듈 개수"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "prune remote-tracking branches no longer on remote"
msgstr "리모트에 이제 없는 리모트 추적 브랜치를 잘라냅니다"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "주문형"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "하위 모듈 재귀적으로 가져오기 방식을 설정합니다"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "다운로드한 묶음을 보존합니다"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "HEAD 레퍼런스 업데이트를 허용합니다"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "얕은 복제의 커밋 내역을 깊게 만듭니다"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
msgid "deepen history of shallow repository based on time"
msgstr "얕은 복제의 커밋 내역을 시간을 기준으로 깊게 만듭니다"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "완전한 저장소로 전환합니다"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "디렉터리"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "하위 모듈 경로 출력의 앞에 이 디렉터리를 붙입니다"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "하위 모듈을 재귀적으로 가져올 때 기본값 (설정 파일보다 낮은 우선 순위)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr ".git/shallow를 업데이트하는 레퍼런스를 허용합니다"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "레퍼런스맵"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "레퍼런스맵 가져오기를 지정합니다"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "리모트 레퍼런스 HEAD를 찾을 수 없습니다"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "fetch.output 설정에 잘못된 값이 있습니다: %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "%s 오브젝트가 없습니다"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[최신 상태]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[거부됨]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "현재 브랜치에서 가져올 수 없음"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[태그 업데이트]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "로컬 레퍼런스를 업데이트할 수 없습니다"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[새로운 태그]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[새로운 브랜치]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[새로운 레퍼런스]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "강제 업데이트"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "정방향 진행이 아님"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s이(가) 모든 필요한 오브젝트를 보내지 않았습니다\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "얕은 최상위의 업데이트가 허용되지 않으므로 %s을(를) 거부합니다"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "%.*s URL에서\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8105,55 +8325,50 @@
"업데이트할 수 없는 로컬 레퍼런스가 있습니다. 과거 충돌 브랜치를\n"
" 제거하려면 'git remote prune %s' 명령을 실행해 보십시오"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s 레퍼런스가 연결이 끊어지게 됩니다)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s 레퍼런스가 연결이 끊어졌습니다)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[삭제됨]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(없음)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "간략한 저장소가 아닌 저장소의 현재 %s 브랜치로 가져오기를 거절합니다"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "\"%s\" 옵션의 \"%s\" 값은 %s에 대해 올바르지 않습니다"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "\"%s\" 옵션은 '%s'에 대해 무시됩니다\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "'%s'에서 가져오는 방법을 알 수 없습니다"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "%s을(를) 가져오는 중\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "%s을(를) 가져올 수 없습니다"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8161,41 +8376,41 @@
"리모트 저장소를 지정하지 않았습니다. 새 리비전을 가져올 수 있는\n"
"URL이나 리모트 이름을 지정하십시오."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "태그 이름을 지정해야 합니다."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 옵션에 음수 깊이는 지원하지 않습니다"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "-deepen, --depth 옵션 중 하나만 쓸 수 있습니다"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 및 --unshallow 옵션은 같이 쓸 수 없습니다"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr ""
"완전한 저장소에 대해 --unshallow 옵션을 사용하는 건 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 명령에 저장소 인자가 없습니다"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 명령은 레퍼런스명세 인자와 같이 쓰면 앞뒤가 맞지 않습니다"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "그런 리모트나 리모트 그룹이 없습니다: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "그룹을 가져오고 레퍼런스명세를 지정하면 앞뒤가 맞지 않습니다"
@@ -8205,23 +8420,23 @@
msgstr ""
"git fmt-merge-msg [-m <메시지>] [--log[=<n>] | --no-log] [--file <파일>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
msgid "populate log with at most <n> entries from shortlog"
msgstr "shortlog에서 최대 <n>개 로그를 표시합니다"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "--log와 동일 (없어질 예정)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "텍스트"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "<텍스트>를 시작 메시지로 사용합니다"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "읽어들일 파일"
@@ -8261,101 +8476,105 @@
msgid "show only <n> matched refs"
msgstr "<n>개의 해당하는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "포맷 색을 유지합니다"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "주어진 오브젝트를 가리키는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "병합하는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "병합하지 않는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "커밋이 들어 있는 레퍼런스만 표시합니다"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "커밋이 들어 있지 않은 레퍼런스만 표시합니다"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "오브젝트 디렉터리를 확인하는 중입니다"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<옵션>] [<오브젝트>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "접근할 수 없는 오브젝트를 표시합니다"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "연결이 끊어진 오브젝트를 표시합니다"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "태그를 알립니다"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "최상위 노드를 알립니다"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "인덱스 오브젝트 헤드 노드를 만듭니다"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "reflog 헤드 노드를 만듭니다 (기본값)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "묶음과 보조 오브젝트도 만듭니다"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "연결만 확인합니다"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "더 엄격하게 확인합니다"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr ".git/lost-found 안에 연결이 끊어진 오브젝트를 씁니다"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "진행 상황을 표시합니다"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "접근할 수 없는 오브젝트의 이름을 자세히 표시합니다"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "오브젝트를 확인합니다"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<옵션>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "'%s'에 fstat()하는데 실패했습니다: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "'%s'에 stat()할 수 없습니다"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8370,43 +8589,43 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "레퍼런스하지 않는 오브젝트를 잘라냅니다"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "더 자세히 검사합니다 (실행 시간 늘어남)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "자동 가비지컬렉터 모드를 사용합니다"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "이미 가비지컬렉터가 실행 중이더라도 강제로 가비지컬렉터를 실행합니다"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "gc.logexpiry 값을 (%s) 파싱하는데 실패했습니다"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "최적 성능을 위해 백그라운드에서 자동으로 저장소의 묶음을 만듭니다.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "최적 성능을 위해 자동으로 저장소의 묶음을 만듭니다.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "수동 관리 작업은 \"git help gc\" 내용을 참고하십시오.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8414,7 +8633,7 @@
"가비지컬렉터가 이미 '%s' 컴퓨터에서 %<PRIuMAX> PID로 실행 중입니다 (아니면 --"
"force를 사용하십시오)"
-#: builtin/gc.c:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8424,12 +8643,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<옵션>] [-e] <패턴> [<리비전>...] [[--] <경로>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: 스레드를 만드는데 실패했습니다: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "잘못된 스레드 수를 %2$s에 대해 지정했습니다 (%1$d)"
@@ -8438,250 +8657,242 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "스레드 기능이 없습니다. %s 무시"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "트리를 읽을 수 없습니다 (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, c-format
msgid "unable to grep from object of type %s"
msgstr "종류가 %s인 오브젝트에서 grep을 할 수 없습니다"
-#: builtin/grep.c:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "`%c' 옵션에는 숫자 값이 와야 합니다"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr "작업 폴더 대신에 인덱스에서 검색합니다"
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "깃으로 관리하지 않은 내용에서 찾습니다"
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "추적되는 파일과 추적되지 않는 파일 모두에서 검색합니다"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "'.gitignore'로 지정한 파일을 무시합니다"
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "각 하위 모듈에 재귀적으로 검색합니다"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "베이스이름"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "프로젝트의 베이스일므을 출력 앞에 붙입니다"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "일치하지 않는 줄을 표시합니다"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "대소문자 구별하지 않고 비교합니다"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "단어 경계 부분에 대해서만 패턴을 맞춥니다"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "바이너리 파일을 텍스트로 처리합니다"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "바이너리 파일에서 패턴을 맞추지 않습니다"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr "textconv 필터를 사용해 바이너리 파일을 처리합니다"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "최대 <깊이> 단계만큼 내려갑니다"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "POSIX 확장 정규식을 사용합니다"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "기본 POSIX 정규식을 사용합니다 (기본값)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "패턴을 고정 문자열로 해석합니다"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "펄과 호환되는 정규식을 사용합니다"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "줄 번호를 표시합니다"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "파일 이름을 표시하지 않습니다"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "파일 이름을 표시합니다"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr "파일 이름을 최상위 디렉터리 상대 경로로 표시합니다"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "일치하는 줄을 표시하지 않고 파일 이름만 표시합니다"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "--files-with-matches 옵션과 동일"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr "일치하지 않는 파일의 이름만 표시합니다"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "파일 이름 다음에 NUL을 출력합니다"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr "일치하는 줄을 표시하지 않고 일치하는 수를 표시합니다"
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "일치하는 부분을 강조합니다"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr "다른 파일 사이에 일치하는 부분의 사이에 빈 줄을 출력합니다"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
msgid "show filename only once above matches from same file"
msgstr "같은 파일에서 여러 개가 일치하면 파일 이름을 한 번만 표시합니다"
-#: builtin/grep.c:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "일치하는 부분 앞뒤에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "일치하는 부분 앞에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "일치하는 부분 뒤에 컨텍스트를 <n>줄 표시합니다"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "<n>개의 작업 스레드를 사용합니다"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "-C NUM 옵션의 줄임"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr "일치 항목 앞에 함수 이름 줄을 표시합니다"
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "들어 있는 함수를 표시합니다"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "파일에서 패턴을 읽습니다"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "<패턴>과 일치"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "-e 옵션으로 지정한 패턴을 결합합니다"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr "출력하지 않고 일치하는 항목을 exit() 상태 번호로 리턴합니다"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
msgid "show only matches from files that match all patterns"
msgstr "모든 패턴과 일치하는 파일의 일치하는 부분만 표시합니다"
-#: builtin/grep.c:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "grep 표현식에 대한 파싱 트리를 표시합니다"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "페이저"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "일치하는 파일을 페이저 프로그램에서 표시합니다"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "grep(1) 실행을 허용합니다 (이 빌드에서는 무시)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "패턴을 지정하지 않았습니다."
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 또는 --untracked 옵션은 리비전과 같이 쓸 수 없습니다"
-#: builtin/grep.c:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "리비전을 찾아낼 수 없습니다: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "잘못된 스레드 수를 지정했습니다 (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "스레드 기능이 없습니다. --threads 옵션 무시"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 옵션은 작업 폴더에서만 동작합니다"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "--recurse-submodules와 같이 지원하지 않는 옵션입니다."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr ""
"--cached 또는 --untracked 옵션은 --no-index 옵션과 같이 쓸 수 없습니다."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 옵션은 추적되는 내용에 대해 쓸 수 없습니다."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "--cached 옵션과 트리를 모두 지정했습니다."
@@ -8772,12 +8983,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient '%d' 버전은 너무 과거 (< 22) 버전입니다."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "실행 실패: '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -8786,7 +8997,7 @@
"'%s': 지원하지 않는 맨 페이지 보기 프로그램 경로.\n"
"대신에 'man.<도구>.cmd' 옵션을 사용해 보십시오."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -8795,345 +9006,345 @@
"'%s': 지원하지 않는 맨 페이지 보기 프로그램 명령.\n"
"대신에 'man.<도구>.path' 옵션을 사용해 보십시오."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s': 알 수 없는 맨 페이지 보기 프로그램."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "요청을 처리한 맨 페이지 보기 프로그램이 없습니다"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "요청을 처리한 인포 페이지 보기 프로그램이 없습니다"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "경로마다 속성 정의하기"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "매일매일 사용하는 20개 내외의 깃 명령"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "깃 용어 사전"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "의도적으로 추적하지 않는 파일을 무시하게 지정하기"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "하위 모듈 속성 정의하기"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "깃의 리비전 및 범위를 지정하기"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "깃 따라하기 안내서 (버전 1.5.1 이후)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "추천하는 깃 활용 작업 순서의 개요"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "자주 사용하는 깃 안내서는 다음과 같습니다:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 명령은 `%s' 명령의 단축입니다"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 명령은 '%s' 명령의 단축입니다"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "사용법: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "%s을(를) 열 수 없습니다"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "오브젝트 종류가 맞지 않습니다 (%s)"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "예상한 %s 오브젝트를 받지 않았습니다"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "%s 오브젝트: 예상한 종류 %s, 실제 %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "%d 바이트를 채울 수 없습니다"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "너무 빨리 파일이 끝남"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "입력에 읽기 오류"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "있는 바이트보다 더 많이 사용합니다"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "현재 정의된 off_t에 비해 묶음이 너무 큽니다"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "묶음 크기가 최대 허용 크기를 넘었습니다"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "'%s'을(를) 만들 수 없습니다"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "'%s' 묶음 파일을 열 수 없습니다"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "묶음 서명이 맞지 않습니다"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "묶음의 %<PRIu32> 버전을 지원하지 않습니다"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "묶음의 %<PRIuMAX> 오프셋에 잘못된 오브젝트가 있습니다: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "inflate가 %d번을 리턴했습니다"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "델타 베이스 오브젝트에 대해 오프셋 값이 오버플로우"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "델타 베이스 오프셋이 범위를 벗어났습니다"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "알 수 없는 오브젝트 종류 %d번"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "묶음 파일에 대해 pread를 할 수 없습니다"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "심각한 inflate 부조화"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1 충돌이 %s에서 발견되었습니다!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "%s을(를) 읽을 수 없습니다"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "기존 %s 오브젝트 정보를 읽을 수 없습니다"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "기존 %s 오브젝트를 읽을 수 없습니다"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "잘못된 블롭 오브젝트 %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "잘못된 %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "오브젝트에 오류"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s의 모든 하위 오브젝트에 접근할 수 없습니다"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "델타를 적용하는데 실패했습니다"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "오브젝트를 받는 중"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "오브젝트 인덱스를 만드는 중"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "묶음이 손상되었습니다 (SHA1 일치하지 않음)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "묶음 파일에 대해 fstat()할 수 없습니다"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "묶음의 끝에 쓰레기 데이터가 있습니다"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects()에서 극심한 혼란"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "델타를 알아내는 중"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "스레드를 만들 수 없습니다: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "극심한 혼란"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
msgstr[0] "로컬 오브젝트 %d개 마침"
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "%s에 대해 예상치 못한 테일 체크섬 (디스크 손상?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
msgstr[0] "묶음에 알아내지 못한 델타 %d개가 있습니다"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "추가한 오브젝트를 deflate할 수 없습니다 (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "%s 로컬 오브젝트가 손상되었습니다"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "묶음 파일을 닫는데 오류"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "'%s' 보존 파일을 쓸 수 없습니다"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "쓴 '%s' 보존 파일을 닫지 못했습니다"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "묶음 파일을 저장할 수 없습니다"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "인덱스 파일을 저장할 수 없습니다"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "잘못된 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "기존 '%s' 묶음 파일을 열 수 없습니다"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "'%s'에 대한 기존 묶음 idx 파일을 열 수 없습니다"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
msgstr[0] "델타 아님: 오브젝트 %d개"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "체인 길이 = %d: 오브젝트 %lu개"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "'%s' 묶음파일 이름이 '.pack'으로 끝나지 않습니다"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "잘못된 %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 옵션은 --stdin 옵션과 같이 쓸 수 없습니다"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "--stdin 옵션은 깃 저장소가 필요합니다"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "--verify 옵션에 묶음파일 이름을 지정하지 않았습니다"
@@ -9265,132 +9476,172 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <토큰>[(=|:)<"
"값>])...] [<파일>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "파일을 직접 편집합니다"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "빈 트레일러를 잘라냅니다"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "새 트레일러를 놓을 위치"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "트레일러가 이미 있을 때 동작"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "트레일러가 없을 때 동작"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "트레일러만 출력합니다"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "설정 규칙을 적용하지 않습니다"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "공백으로 계속된 값을 연결합니다"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "파싱 옵션 설정"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "트레일러"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "추가할 트레일러"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 옵션과 --only-input 옵션은 앞뒤가 맞지 않습니다"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "파일 직접 편집에 입력 파일을 지정하지 않았습니다"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<옵션>] [<리비전-범위>] [[--] <경로>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<옵션>] <오브젝트>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "잘못된 --decorate 옵션: %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "diff를 출력하지 않습니다"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "소스를 표시합니다"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "메일 맵 파일을 사용합니다"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "<패턴>과 일치하는 레퍼런스만 꾸밉니다"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "<패턴>과 일치하는 레퍼런스를 꾸미지 않습니다"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "꾸미기 옵션"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr "파일에서 n,m 범위의 줄을 처리합니다 (1부터 시작)"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "최종 출력: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 잘못된 파일"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "%s 오브젝트를 읽을 수 없습니다"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "알 수 없는 종류: %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "format.headers 설정에 값이 없음"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "출력 디렉터리의 이름이 너무 깁니다"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "%s 패치 파일을 열 수 없습니다"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "정확히 하나의 범위가 필요합니다."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "범위가 아닙니다."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "커버레터는 전자메일 형식이어야 합니다"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "정신나간 in-reply-to 헤더: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<옵션>] [<시작시각> | <리비전-범위>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "출력 디렉터리가 두개?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "알 수 없는 커밋 %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다."
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "정확한 병합 기준점을 찾을 수 없습니다."
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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"
@@ -9401,218 +9652,226 @@
"아니면 직접 '--base=<기준점-커밋-ID>' 옵션으로 기준점 커밋을 지정할\n"
"수도 있습니다."
-#: builtin/log.c:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "정확한 병합 기준점을 찾는데 실패했습니다"
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr "기준점 커밋은 리비전 목록의 상위 커밋이어야 합니다"
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr "기준점 커밋은 리비전 목록에 들어 있으면 안 됩니다"
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "패치 ID를 알아낼 수 없습니다"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr "하나의 패치에 대해서도 [PATCh n/m]을 붙입니다"
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "여러 개 패치에 대해서도 [PATCH]를 붙입니다"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "패치를 표준 출력으로 표시합니다"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "커버레터를 만듭니다"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr "출력 파일 이름에 간단한 일련 번호를 사용합니다"
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "확장자"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "'.patch' 대신 <확장자>를 사용합니다"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr "패치 번호를 1 대신 <n>에서 시작합니다"
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "시리즈를 N번째 re-roll로 표시합니다"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "[PATCH] 대신 [RFC PATCH]를 사용합니다"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "[PATCH] 대신 [<접두어>]를 사용합니다"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "결과 파일을 <디렉터리>에 저장합니다"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "[PATCH]를 자르거나 추가하지 않습니다"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "바이너리 diff를 만들지 않습니다"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "From 헤더에서 모두 0인 해시를 출력합니다"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr "업스트림에 있는 패치를 포함하지 않습니다"
-#: builtin/log.c:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr "기본값 (패치 + 통계) 대신 패치 형식을 표시합니다"
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "메시징"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "헤더"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "전자메일 헤더"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "전자메일"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "To: 헤더를 추가합니다"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "Cc: 헤더를 추가합니다"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "신원"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "<신원>에서 From 주소를 설정합니다 (없으면 커미터 주소 신원 사용)"
-#: builtin/log.c:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "메시지-ID"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "첫 메일을 <메시지-ID>에 대한 답장 메일로 만듭니다"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "경계"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "패치를 첨부합니다"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "패치를 본문에 포함합니다"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr "메시지에 스레드를 사용, 스타일: shallow, deep"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "서명"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "서명을 추가합니다"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "베이스-커밋"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "전제조건 트리 정보를 패치 시리즈에 추가합니다"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "파일에서 서명을 추가합니다"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "패치 파일 이름을 표시하지 않습니다"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "패치를 만드는 동안 진행률을 표시합니다"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "잘못된 신원 줄: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "-n 및 -k 옵션은 하나만 써야 합니다."
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc 및 -k 옵션은 하나만 써야 합니다."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "--name-only 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "--name-status 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "--check 옵션은 앞뒤가 맞지 않습니다"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "표준 출력이나 디렉터리 중에 하나만 지정해야 합니다."
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "'%s' 디렉터리를 만들 수 없습니다"
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "'%s' 서명 파일을 읽을 수 없습니다"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "패치 생성"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "출력 파일을 만드는데 실패했습니다"
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<업스트림> [<헤드> [<한계값>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9633,90 +9892,94 @@
msgstr "'변경되지 않았다고 가정' 파일에 소문자를 사용합니다"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "'파일 시스템 모니터에 변경되지 않은' 파일에 소문자를 사용합니다"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "출력에 캐시된 파일을 표시합니다 (기본값)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "출력에 삭제된 파일을 표시합니다"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "출력에 수정된 파일을 표시합니다"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "출력에 기타 파일을 표시합니다"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "출력에 무시된 파일을 표시합니다"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr "출력에 커밋 표시된 내용의 오브젝트 이름을 표시합니다"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
msgid "show files on the filesystem that need to be removed"
msgstr "파일 시스템에서 제거해야 하는 파일을 표시합니다"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "기타 디렉터리의 이름만 표시합니다"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "파일의 줄 끝을 표시합니다"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "빈 디렉터리 표시하지 않기"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "출력에 병합하지 않은 파일을 표시합니다"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "resolve-undo 정보를 표시합니다"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "패턴에 일치하는 파일을 건너뜁니다"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "제외할 패턴을 <파일>에서 읽습니다"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr "<파일>에서 추가적인 디렉터리별 제외 패턴을 읽습니다"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "표준 깃 제외 패턴을 추가합니다"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr "최상위 디렉터리 상대 경로로 출력합니다"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "하위 모듈에 재귀적으로 적용"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
msgid "if any <file> is not in the index, treat this as an error"
msgstr "<파일>이 인덱스 안에 없으면 오류로 취급합니다"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "트리-따위"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "<트리-따위> 뒤로 제거한 경로가 있다고 가정합니다"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "디버깅 데이터를 표시합니다"
@@ -9807,177 +10070,181 @@
msgid "empty mbox: '%s'"
msgstr "빈 mbox: '%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<옵션>] [<커밋>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "`m' 옵션에는 값이 필요합니다"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "'%s' 병합 전략을 찾을 수 없습니다.\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "사용 가능한 전략은:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "사용 가능한 사용자 설정 전략은:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "do not show a diffstat at the end of the merge"
msgstr "병합이 끝날 때 diffstat을 표시하지 않습니다"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "병합이 끝날 때 diffstat을 표시합니다"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(--stat 옵션과 동일)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "병합 커밋의 메시지에 shortlog 항목을 (최대 <n>개) 추가합니다"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr "병합하는 대신 하나의 커밋을 만듭니다"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "병합이 성공하면 커밋을 합니다 (기본값)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "커밋 전에 메시지를 편집합니다"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "정방향 진행을 허용합니다 (기본값)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "정방향 진행이 불가능하면 중지합니다"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
msgid "verify that the named commit has a valid GPG signature"
msgstr "지정한 커밋에 올바른 GPG 서명이 있는지 검증합니다"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "전략"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "사용할 병합 전략"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "옵션=값"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "선택한 병합 전략에 대한 옵션"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "병합 커밋 메시지 (정방향이 아닌 병합에 대해)"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "현재 진행 중인 병합을 중지합니다"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "현재 진행 중인 병합을 계속합니다"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "관계 없는 커밋 내역의 병합을 허용합니다"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "커밋 메시지 후크를 검증합니다"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "stash를 실행할 수 없습니다."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "스태시 실패"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "올바른 오브젝트가 아닙니다: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree 실패"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (합칠 내용이 없습니다)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "커밋 합치기 -- HEAD를 업데이트하지 않습니다\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "병합 메시지가 없습니다 -- HEAD를 업데이트하지 않습니다\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s'이(가) 커밋을 가리키지 않습니다"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "잘못된 branch.%s.mergeoptions 문자열: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr "두 개의 헤드 병합 외에는 처리하지 않습니다."
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive에 대해 알 수 없는 옵션: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "%s에 쓸 수 없습니다"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "'%s'에서 읽을 수 없습니다"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr ""
"병합을 커밋하지 않습니다. 병합을 마치려면 'git commit'을 사용하십시오.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -9993,68 +10260,68 @@
"'%c' 문자로 시작하는 줄은 무시되고, 메시지가 비어 있으면 커밋을\n"
"중지합니다.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "빈 커밋 메시지."
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "훌륭합니다.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "자동 병합이 실패했습니다. 충돌을 바로잡고 결과물을 커밋하십시오.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "현재 브랜치가 없습니다."
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "현재 브랜치에 대한 리모트가 없습니다."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
msgid "No default upstream defined for the current branch."
msgstr "현재 브랜치에 대해 기본 업스트림을 지정하지 않았습니다."
-#: builtin/merge.c:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "리모트 %2$s에서 %1$s에 대한 리모트 추적 브랜치가 없습니다"
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "잘못된 값 '%s', 환경 '%s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "%s 안에서 병합할 수 있는 항목이 아닙니다: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "병합할 수 있는 항목이 아닙니다"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "--abort 옵션은 인자를 받지 않습니다"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "중지할 병합 작업이 없습니다. (MERGE_HEAD가 없음)"
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "--continue 옵션은 인자를 받지 않습니다"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "진행 중인 병합 작업이 없습니다. (MERGE_HEAD가 없음)"
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10062,7 +10329,7 @@
"병합을 마치지 않았습니다. (MERGE_HEAD 있음)\n"
"병합하기 전에 변경 사항을 커밋하십시오."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10070,112 +10337,112 @@
"커밋 빼오기를 마치지 않았습니다. (COMMIT_PICK_HEAD 있음)\n"
"병합하기 전에 변경 사항을 커밋하십시오."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "커밋 빼오기를 마치지 않았습니다. (CHERRY_PICK_HEAD 있음)"
-#: builtin/merge.c:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "--squash 옵션을 --no-ff 옵션과 같이 쓸 수 없습니다."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "커밋을 지정하지 않았고 merge.defaultToUpstream를 설정하지 않았습니다."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr "빈 헤드로 커밋을 합치기는 지원하지 않습니다"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "정방향이 아닌 커밋은 빈 헤드에서는 앞뒤가 맞지 않습니다"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 병합할 수 있는 항목이 아닙니다"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
msgid "Can merge only exactly one commit into empty head"
msgstr "빈 헤드에는 정확히 하나의 커밋만 병합할 수 있습니다"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1297
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "%s 커밋에 신뢰하지 않는 (서명자가 %s라고 하는) GPG 서명이 있습니다."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "%s 커밋에 잘못된 (서명자가 %s라고 하는) GPG 서명이 있습니다."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "%s 커밋에 GPG 서명이 없습니다."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "%s 커밋에 %s의 올바른 GPG 서명이 없습니다\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "관계 없는 커밋 내역의 병합을 거부합니다"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "이미 업데이트 상태입니다."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "업데이트 중 %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "아주 간단한 인덱스 내부 병합을 시도합니다...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "아님.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "이미 업데이트 상태입니다. 야호!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "정방향이 불가능하므로, 중지합니다."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "트리를 본래 위치로 되돌립니다...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "병합 전략 %s 시도...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "병합을 처리한 전략이 없습니다.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "전략 %s(으)로 병합이 실패했습니다.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "수동 해결의 준비를 위해 %s 전략을 사용합니다.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "자동 병합이 잘 진행되었습니다. 요청한대로 커밋 전에 중지합니다\n"
@@ -10200,23 +10467,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <레퍼런스> [<커밋>]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "모든 과거 공통 커밋을 출력합니다"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr "하나의 n-방향 병합에 대한 과거 커밋을 찾습니다"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "다른 곳에서 접근 불가능한 리비전 목록을 출력합니다"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "첫번째가 다른 것의 과거 커밋인지 여부?"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "<레퍼런스>의 reflog에서 <커밋>이 분리된 위치를 찾습니다"
@@ -10315,7 +10582,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "%s 디렉터리가 인덱스에 있고 하위 모듈이 없습니다?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "계속하려면 .gitmodules의 변경 사항을 스테이지에 넣거나 스태시 하십시오"
@@ -10332,68 +10599,68 @@
msgid "skip move/rename errors"
msgstr "옮기기/이름 바꾸기 오류를 건너 뜁니다"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "대상이 ('%s') 디렉터리가 아닙니다"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "'%s'을(를) '%s'(으)로 이름 바꾸기합니다\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "잘못된 원본"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "디렉터리를 자기 자신으로 옮길 수 없습니다"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "디렉터리를 파일로 옮길 수 없습니다"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "원본 디렉터리가 비어 있습니다"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "버전 컨트롤 중이 아닙니다"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "대상이 있습니다"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "'%s' 덮어쓰기"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "덮어쓸 수 없습니다"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "동일한 대상에 대해 여러 개 원본"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "대상 디렉터리가 없습니다"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, 원본=%s, 대상=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "이름 바꾸기, '%s'에서 '%s'(으)로\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "'%s'의 이름 바꾸기가 실패했습니다"
@@ -10494,8 +10761,8 @@
msgstr "git notes [--ref <노트-레퍼런스>] remove [<오브젝트>...]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <노트-레퍼런스>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <노트-레퍼런스>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10584,19 +10851,19 @@
msgid "the note contents have been left in %s"
msgstr "노트 내용은 %s에 남습니다"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "'%s'을(를) 읽을 수 없습니다"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "'%s'을(를) 열거나 읽을 수 없습니다"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "'%s'을(를) 올바른 레퍼런스로 알아내는데 실패했습니다."
@@ -10624,47 +10891,47 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "%s에서 노트를 %s 하기를 거부합니다 (refs/notes/ 밖임)"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "파라미터가 너무 많습니다"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "%s 오브젝트에 대해 노트가 없습니다."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "문자열로 노트 내용"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "파일 안에 노트 내용"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "지정한 노트 오브젝트를 재사용하고 편집합니다"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "지정한 노트 오브젝트를 재사용합니다"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "빈 노트 저장을 허용합니다"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "기존 노트를 바꿉니다"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10673,29 +10940,29 @@
"노트를 추가할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트"
"를 덮어쓰려면 '-f' 옵션을 사용하십시오"
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "%s 오브젝트에 대한 기존 노트를 덮어씁니다\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "%s 오브젝트에 대한 노트를 제거합니다\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "표준 입력에서 오브젝트를 읽습니다"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "<명령>에 대한 다시쓰기 설정을 읽어들입니다 (--stdin 옵션 포함)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "파라미터가 너무 적습니다"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10704,12 +10971,12 @@
"노트를 복사할 수 없습니다. %s 오브젝트에 대한 기존 노트가 있습니다. 기존 노트"
"를 덮어쓰려면 '-f' 옵션을 사용하십시오"
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "원본 %s 오브젝트에 대한 노트가 없습니다. 복사할 수 없습니다."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10718,52 +10985,52 @@
"-m/-F/-c/-C 옵션은 'edit' 하위 명령에 대해 사용을 권하지 않습니다.\n"
"대신에 'git notes add -f -m/-F/-c/-C' 명령을 사용하십시오.\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL 레퍼런스 삭제에 실패했습니다"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF 레퍼런스 삭제에 실패했습니다"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "'git notes merge' 작업트리 제거에 실패했습니다"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "NOTES_MERGE_PARTIAL 레퍼런스 읽기에 실패했습니다"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "NOTES_MERGE_PARTIAL에서 커밋을 찾을 수 없습니다."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "NOTES_MERGE_PARTIAL에서 커밋을 파싱할 수 없습니다."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "NOTES_MERGE_REF 알아내기에 실패했습니다"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "노트 병합을 마치는데 실패했습니다"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "알 수 없는 노트 병합 전략 %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "일반 옵션"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "병합 옵션"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10771,46 +11038,46 @@
"주어진 전략을 사용해 노트 충돌을 해결합니다 (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "병합하지 않은 노트 커밋"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "병합하지 않은 노트를 커밋해 노트 병합을 마칩니다"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "노트 병합 해결 중지"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "노트 병합을 중지합니다"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "--commit, --abort, -s/--strategy 옵션을 섞어 쓸 수 없습니다"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "병합할 노트 레퍼런스를 지정해야 합니다"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "알 수 없는 전략(-s/--strategy): %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "%s 위치로 노트 병합이 이미 %s에서 진행중입니다"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "현재 노트 레퍼런스의 (%s) 링크를 저장하는데 실패했습니다."
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10821,223 +11088,231 @@
"merge --commit' 명령으로 커밋하십시오. 또는 'git notes merge --abort' 명령으"
"로 병합을 중지하십시오.\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "%s 오브젝트에 노트가 없습니다\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "없는 노트를 제거하려는 시도를 오류가 아닌 것으로 취급합니다"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "표준 입력에서 오브젝트 이름을 읽습니다"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "제거하지 않고, 보여주기만 합니다"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "잘라낸 노트를 알립니다"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "노트-레퍼런스"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "<노트-레퍼런스>에서 노트를 사용합니다"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<옵션>...] [< <레퍼런스목록> | < <오브젝트목록>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<옵션>...] <베이스이름> [< <레퍼런스목록> | < <오브젝트목록"
">]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "deflate 오류 (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr ""
"배트맵 쓰기를 하지 않습니다. 묶음은 pack.packSizeLimit 값에 따라 쪼개집니다"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "오브젝트 쓰는 중"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "묶음에 들어있지 않은 오브젝트가 있으므로, 비트맵 쓰기를 하지 않습니다"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "오브젝트 압축하는 중"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "--missing의 값이 올바르지 않습니다"
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "지원하지 않는 인덱스 버전 %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "잘못된 인덱스 버전 '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "진행률을 표시하지 않습니다"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "진행률을 표시합니다"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "오브젝트 쓰기 단계에서 진행률을 표시합니다"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "진행률이 표시될 때 --all-progress와 비슷합니다"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "버전[,오프셋]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
msgid "write the pack index file in the specified idx format version"
msgstr "지정한 버전의 인덱스 형식에 따라 묶음 인덱스 파일을 씁니다"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "출력 묶음 파일의 최대 크기"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "보조 오브젝트 저장소에서 빌려온 오브젝트를 무시합니다"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "묶음 오브젝트를 무시합니다"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "묶음 윈도우를 오브젝트 단위로 제한합니다"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
msgid "limit pack window by memory in addition to object limit"
msgstr "묶음 윈도우를 오브젝트 단위에 추가로 메모리 단위로 제한합니다"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2958
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "결과물 묶음에서 허용되는 최대 길이의 델타 체인"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "기존 델타를 재사용합니다"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "기존 오브젝트를 재사용합니다"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "OFS_DELTA 오브젝트를 사용합니다"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
msgid "use threads when searching for best delta matches"
msgstr "최상의 델타 일치를 검색하는데 스레드를 사용합니다"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "빈 묶음 출력을 만들지 않습니다"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "표준 입력에서 리비전 인자를 읽습니다"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
msgid "limit the objects to those that are not yet packed"
msgstr "묶지 않는 오브젝트 수를 제한합니다"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr "모든 레퍼런스에서 접근 가능한 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr "reflog 항목에서 레퍼런스할 수 있는 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "인덱스에서< 레퍼런스하는 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "묶음을 표준 출력으로 출력합니다"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
msgid "include tag objects that refer to objects to be packed"
msgstr "묶음에 들어갈 오브젝트를 레퍼런스하는 태그 오브젝트를 포함합니다"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "접근 불가능 오브젝트를 보존합니다"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "느슨한 접근 불가능 오브젝트를 묶습니다"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "<시각>보다 새로운 접근 불가능 오브젝트의 묶음을 풉니다"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "얇은 묶음을 만듭니다"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr "얕은 가져오기에 적합한 묶음을 만듭니다"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "해당하는 .keep 파일이 있는 묶음을 무시합니다"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "묶음 압축 단계"
# FIXME: graft?
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr "붙어 있는 커밋을 숨기지 않습니다"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
msgid "use a bitmap index if available to speed up counting objects"
msgstr "가능하면 비트맵 인덱스를 사용해 오브젝트 세기 속도를 높입니다"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr "묶음 인덱스와 같이 비트맵 인덱스를 씁니다"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "없는 오브젝트를 처리합니다"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "오브젝트 개수 세는 중"
@@ -11053,17 +11328,17 @@
msgid "prune loose refs (default)"
msgstr "느슨한 레퍼런스를 잘라냅니다 (기본값)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "중복된 오브젝트 제거"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <시각>] [--] [<헤드>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <시각>] [--] [<헤드>...]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11086,51 +11361,51 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<옵션>] [<저장소> [<레퍼런스명세>...]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "하위 모듈 재귀적으로 가져오기 방식을 조정합니다"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "병합 관련 옵션"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr "변경 사항을 적용할 때 병합하는 대신 리베이스합니다"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "정방향 진행을 허용합니다"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "리베이스 전과 후에 stash 및 stash pop을 자동으로 합니다"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "가져오기 관련 옵션"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "병렬적으로 풀을 실행할 하위모듈 개수"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff에 대해 잘못된 값: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "가져온 레퍼런스 중에 리베이스할 대상 후보가 없습니다."
-#: builtin/pull.c:401
+#: builtin/pull.c:417
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "가져온 레퍼런스 중에 병합할 대상 후보가 없습니다."
-#: builtin/pull.c:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11138,7 +11413,7 @@
"보통 이런 경우는 리모트 쪽에는 없는 와일드카드 레퍼런스명세가\n"
"주어졌을 때 일어납니다."
-#: builtin/pull.c:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11149,42 +11424,42 @@
"이 리모트는 현재 브랜치에 대해 기본으로 설정된 리모트가\n"
"아니기 때문에, 명령행에서 브랜치를 지정해야 합니다."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "현재 어떤 브랜치 위에도 있지 않습니다."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "어떤 브랜치를 대상으로 리베이스할지 지정하십시오."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "어떤 브랜치를 대상으로 병합할지 지정하십시오."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "자세한 정보는 git-pull(1) 페이지를 참고하십시오."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<리모트>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<브랜치>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "현재 브랜치에 추적 정보가 없습니다."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "이 브랜치에 대한 추적 정보를 설정하려면 다음과 같이 할 수 있습니다:"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11193,27 +11468,27 @@
"설정에서 리모트의 '%s' 레퍼런스와 병합하도록 지정했지만,\n"
"그런 레퍼런스를 가져오지 않았습니다."
-#: builtin/pull.c:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "리베이스에 대해 --verify-signatures 옵션을 무시합니다"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 옵션은 --rebase 옵션과 같이 써야 합니다."
-#: builtin/pull.c:848
+#: builtin/pull.c:873
msgid "Updating an unborn branch with changes added to the index."
msgstr "만들어지지 않은 브랜치를 인덱스에 추가된 변경 사항으로 업데이트합니다."
-#: builtin/pull.c:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "리베이스로 풀하기"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "커밋하거나 스태시에 넣으십시오."
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11224,7 +11499,7 @@
"작업 폴더를 %s 커밋에서 정방향\n"
"진행합니다."
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11241,15 +11516,15 @@
"$ git reset --hard\n"
"복구됩니다."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "여러 브랜치를 빈 헤드로 병합할 수 없습니다."
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "여러 브랜치로 리베이스할 수 없습니다."
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "로컬에서 기록한 하위 모듈 수정 사항을 이용해 리베이스할 수 없습니다"
@@ -11257,15 +11532,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<옵션>] [<저장소> [<레퍼런스명세>...]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "<태그> 없이 태그 줄임"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "--delete 옵션은 일반 대상 레퍼런스 이름만 받습니다"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11274,7 +11549,7 @@
"어느 한 쪽 옵션만 계속 선택하려면, 'git help config'에서 push.default를 참고"
"하십시오."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11299,7 +11574,7 @@
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11314,7 +11589,7 @@
"\n"
" git push %s HEAD:<name-of-remote-branch>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11328,12 +11603,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "현재 브랜치 %s에 여러 업스트림 브랜치가 있습니다. 푸시를 거절합니다."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11344,13 +11619,13 @@
"'%s' 브랜치의 업스트림이 아닙니다. 어떤 리모트 브랜치에 무엇을\n"
"푸시할지 설정하지 않았습니다."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"푸시할 레퍼런스명세를 지정하지 않았고, push.default 값이 'nothing'입니다."
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11363,7 +11638,7 @@
"자세한 정보는 'git push --help'의 \"Note about fast-forwards' 부분을\n"
"참고하십시오."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11376,7 +11651,7 @@
"자세한 정보는 'git push --help'의 \"Note about fast-forwards' 부분을\n"
"참고하십시오."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11392,11 +11667,11 @@
"자세한 정보는 'git push --help'의 \"Note about fast-forwards' 부분을\n"
"참고하십시오."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "리모트에 태그가 이미 있기 때문에 업데이트가 거부되었습니다."
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11406,22 +11681,22 @@
"레퍼런스를 업데이트하거나, 커밋이 아닌 오브젝트를 가리키도록\n"
"업데이트할 수 없습니다.\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "다음에 푸시: %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "레퍼런스를 '%s'에 푸시하는데 실패했습니다"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "잘못된 저장소 '%s'"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11442,112 +11717,112 @@
"\n"
" git push <name>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "--all 및 --tags 옵션은 호환되지 않습니다"
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr "--all 옵션은 레퍼런스명세와 같이 쓸 수 없습니다"
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 및 --tags 옵션은 호환되지 않습니다"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 옵션은 레퍼런스명세와 같이 쓸 수 없습니다"
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "--all 및 --mirror 옵션은 호환되지 않습니다"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "저장소"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "모든 레퍼런스 푸시하기"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "모든 레퍼런스 미러"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "레퍼런스 삭제"
-#: builtin/push.c:528
+#: builtin/push.c:540
msgid "push tags (can't be used with --all or --mirror)"
msgstr "태그 푸시하기 (--all 또는 --mirror 옵션과 같이 쓸 수 없음)"
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "강제로 업데이트"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "레퍼런스이름>:<예상"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "레퍼런스의 과거 값이 이 값이어야 합니다"
-#: builtin/push.c:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "재귀적 하위 모듈 푸시 방식을 설정합니다"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "얇은 묶음을 사용합니다"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "receive pack 프로그램"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "git pull/status에 대한 업스트림을 설정합니다"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "로컬에서 제거한 레퍼런스를 잘라냅니다"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "푸시 전 후크를 건너뜁니다"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr "빠졌지만 관련된 태그를 푸시합니다"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "푸시에 GPG 서명"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "리모트 쪽에 원자 트랜잭션을 요청합니다"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "서버-전용-옵션"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "전송할 옵션"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 옵션은 --all, --mirror, --tags 옵션과 호환되지 않습니다"
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 옵션은 레퍼런스 없이 앞뒤가 맞지 않습니다"
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr "푸시 옵션에는 줄바꿈 문자가 들어갈 수 없습니다"
@@ -11629,19 +11904,52 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<옵션>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "빈 커밋을 유지합니다"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "리베이스 계속"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "리베이스를 중지합니다"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "리베이스 스크립트를 만듭니다"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "할 일 목록의 커밋 아이디를 줄입니다."
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "할 일 목록의 커밋 아이디를 늘입니다."
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "할 일 목록을 확인합니다"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "불필요한 빼오기를 건너뜁니다"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "fixup/squash 줄 재구성"
+
+# English Text에서는 insert를 사용하지만, 소스코드에는 add로 표현되어 있습니다.
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "할 일 목록에 실행 명령을 추가합니다"
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-dir>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -11668,7 +11976,7 @@
"이 메시지를 보지 않고 기본 동작을 계속 하려면,\n"
"'receive.denyCurrentBranch' 설정 변수를 'refuse'로 설정하십시오."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -11696,12 +12004,7 @@
msgid "You must specify a directory."
msgstr "디렉터리를 지정해야 합니다."
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%s' 값이 '%s'에 대해 올바른 시각 값이 아닙니다"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s'은(는) 올바른 시각 값이 아닙니다"
@@ -11842,12 +12145,12 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "마스터 브랜치를 지정은 fetch 미러에서만 앞뒤가 맞습니다"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "%s 리모트가 이미 있습니다."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s'은(는) 올바른 리모트 이름이 아닙니다"
@@ -11870,17 +12173,17 @@
msgid "(delete)"
msgstr "(삭제)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "그런 리모트가 없습니다: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "설정 섹션을 '%s'에서 '%s'(으)로 바꿀 수 없습니다"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11891,17 +12194,17 @@
"\t%s\n"
"\t필요하면 설정을 수동으로 업데이트하십시오."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "'%s' 삭제가 실패했습니다"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "'%s' 만들기가 실패했습니다"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11913,113 +12216,113 @@
"다.\n"
"삭제하려면 다음을 사용하십시오:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "설정 섹션 '%s'을(를) 제거할 수 없습니다"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 새 항목 (다음 가져오기는 remotes/%s 아래 저장됩니다)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " 추적됨"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " 오래됨 (제거하려면 'git remote prune'을 사용하십시오)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "잘못된 branch.%s.merge 값. 여러 개 브랜치로 리베이스할 수 없습니다"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "리모트 %s 위로 대화식으로 리베이스합니다"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "리모트 %s 위로 리베이스합니다"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " 병합: 리모트 %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "병합: 리모트 %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 그리고 리모트 %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "만들기"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "삭제"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "최신 상태"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "정방향 진행 가능"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "로컬이 뒤떨어짐"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s에서 %-*s(으)로 강제 (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s에서 %-*s(으)로 푸시 (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s에서 %s(으)로 강제"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s에서 %s(으)로 푸시"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "리모트에 질의하지 않습니다"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* 리모트 %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " 가져오기 URL: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(URL 없음)"
@@ -12027,182 +12330,182 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " 푸시 URL: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 브랜치: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(질의하지 않음)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(알 수 없음)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 브랜치 (리모트 HEAD는 애매하고, 다음 중 하나일 수 있습니다):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " 리모트 브랜치:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (상태를 질의하지 않음)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " 'git pull'에 사용할 로컬 브랜치를 설정:"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " 로컬 레퍼런스를 'git push'로 미러링할 예정"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "레퍼런스/리모트/<이름>/HEAD 값을 리모트에 맞게 설정합니다"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "레퍼런스/리모트/<이름>/HEAD 값을 삭제합니다"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "리모트 HEAD를 결정할 수 없습니다"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr ""
"리모트 HEAD 브랜치가 여러개입니다. 다음 중 하나를 명시적으로 지정하십시오:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "%s을(를) 삭제할 수 없습니다"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "올바른 레퍼런스가 아닙니다: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "%s을(를) 설정할 수 없습니다"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s의 연결이 끊어집니다!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s의 연결이 끊어졌습니다!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "잘라냄: %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [잘라낼 예정] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [잘라냄] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "가져온 후에 리모트를 잘라냅니다"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "그런 리모트가 없습니다 ('%s')"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "브랜치를 추가합니다"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "리모트를 지정하지 않았습니다"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "가져오기 URL이 아니라 푸시 URL을 질의합니다"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "모든 URL을 리턴합니다"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "'%s' 리모트에 대한 URL을 설정하지 않았습니다"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "푸시 URL을 지정합니다"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "URL을 추가합니다"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "URL을 삭제합니다"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 옵션을 둘다 쓰면 안 됩니다"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "잘못된 오래전 URL 패턴: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "그런 URL이 없습니다: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "푸시용이 아닌 모든 URL을 삭제하지 않습니다"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "자세히 표시합니다 (하위 명령 앞에 와야 합니다)"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "알 수 없는 하위 명령: %s"
@@ -12300,7 +12603,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 및 -A 옵션은 호환되지 않습니다"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "'%s' 제거에 실패했습니다"
@@ -12432,121 +12735,134 @@
msgid "keep"
msgstr "유지"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "올바른 HEAD가 없습니다."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "HEAD의 트리를 찾는데 실패했습니다."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "%s의 트리를 찾는데 실패했습니다."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD의 현재 위치는 %s입니다"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "병합 중에 %s 리셋을 할 수 없습니다."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "간략히 표시, 오류만 표시합니다"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "HEAD와 인덱스를 리셋합니다"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "HEAD만 리셋합니다"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "HEAD, 인덱스, 작업폴더를 리셋합니다"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "HEAD를 리셋하지만 로컬 변경 사항을 남겨둡니다"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr "제거한 경로를 나중에 추가한다는 사실만 기록합니다"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "'%s'을(를) 올바른 리비전으로 찾는데 실패했습니다."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "'%s'을(를) 올바른 트리로 찾는데 실패했습니다."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 옵션은 --{hard,mixed,soft} 옵션과 호환되지 않습니다"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr ""
"--mixed 옵션을 경로와 같이 쓰기는 제거될 예정입니다. 대신에 'git reset -- <경"
"로>'를 사용하십시오."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "경로와 같이 %s 리셋을 할 수 없습니다."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "%s 리셋은 간략한 저장소에서만 쓸 수 있습니다"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N 옵션은 --mixed 옵션과 같이 써야만 합니다"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "리셋 뒤에 스테이징하지 않은 변경 사항:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "인덱스 파일을 '%s' 리비전으로 리셋할 수 없습니다."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "새 인덱스 파일을 쓸 수 없습니다."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "오브젝트 필터링은 --objects 옵션이 필요합니다"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "잘못된 드문 값 '%s'"
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "rev-list는 노트 표시를 지원하지 않습니다"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "--use-bitmap-index 옵션에 오브젝트 필터링을 결합 할 수 없습니다"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<옵션>] -- [<인자>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "인자로 넘긴 `--`를 유지합니다"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "첫번째 옵션이 아닌 인자 뒤에 파싱을 중지합니다"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "stuck long 형식으로 출력합니다"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12639,11 +12955,11 @@
msgid "keep redundant, empty commits"
msgstr "여분의 빈 커밋을 유지합니다"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "되돌리기 실패"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "cherry-pick 실패"
@@ -12708,17 +13024,17 @@
msgid "exit with a zero status even if nothing matched"
msgstr "아무 것도 일치하지 않으면 상태 0번으로 끝납니다"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "-r 옵션이 없으면 재귀적으로 '%s'을(를) 제거하지 않습니다"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: %s을(를) 제거할 수 없습니다"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "'%s'을(를) 제거할 수 없습니다"
@@ -12755,27 +13071,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<옵션>] [<리비전-범위>] [[--] [<경로>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "작성자가 아닌 커미터로 묶습니다"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "작성자별 커밋 수에 따라 정렬합니다"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "커밋 설명을 생략하고, 커밋 수만 표시합니다"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "작성자의 전자메일 주소를 표시합니다"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "줄바꿈 출력"
@@ -12900,7 +13216,7 @@
#, c-format
msgid "cannot handle more than %d rev."
msgid_plural "cannot handle more than %d revs."
-msgstr[0] "레퍼런스를 %d개보다 많이 처리할 수 없습니다."
+msgstr[0] "리비전을 %d개보다 많이 처리할 수 없습니다."
#: builtin/show-branch.c:812
#, c-format
@@ -12972,35 +13288,35 @@
msgid "prepend comment character and space to each line"
msgstr "각 줄의 앞에 주석 문자와 공백을 붙입니다"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "그런 레퍼런스가 없습니다: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "전체 레퍼런스 이름이 필요하지만, 입력은 %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "'%s' URL 하나의 단계를 잘라낼 수 없습니다"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "상대 경로에 사용할 또다른 기준"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr ".gitmodules에서 하위 모듈 경로 '%s'에 대한 URL이 없습니다"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13008,79 +13324,107 @@
msgstr ""
"'%s' 설정을 찾아볼 수 없습니다. 이 저장소가 자체 업스트림이라고 가정합니다."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "하위 모듈 경로 '%s'에 대한 URL을 등록하는데 실패했습니다"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:479
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "'%3$s' 경로에 대해 '%1$s' (%2$s) 하위 모듈 등록\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:489
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "경고: '%s' 하위 모듈에 대해 커맨드 업데이트 모드가 제안되었습니다\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:496
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "'%s' 하위 모듈에 대해 업데이트 모드 등록이 실패했습니다"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "하위 모듈 초기화에 출력을 하지 않습니다"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<경로>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <경로>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "경로 '%s'에 대해 .gitmodules에 있는 하위모듈 매핑이 없습니다"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "HEAD 레퍼런스를 '%s' 하위 모듈 안에서 찾을 수 없습니다"
+
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "'%s' 하위 모듈에 재귀적으로 적용이 실패했습니다"
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "하위 모듈 상태를 출력하지 않습니다"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "하위 모듈 HEAD에 저장된 커밋 대신 인덱스에 저장된 커밋을 사용합니다"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "내장된 하위 모듈에 재귀적으로 적용"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<경로>...]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <경로>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "'%s' 하위 모듈에 보조 오브젝트를 추가할 수 없습니다: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "submodule.alternateErrorStrategy에 대한 값이('%s') 알 수 없는 값입니다"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:842
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "submodule.alternateLocation에 대한 값이('%s') 알 수 없는 값입니다"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "새 하위 모듈을 복제할 대상 위치"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "새 하위 모듈 이름"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "하위 모듈을 복제해 올 URL"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "얕은 복제에 사용할 깊이"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "복제 진행 상황을 항상 표시합니다"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13088,82 +13432,82 @@
"git submodule--helper clone [--prefix=<경로>] [--quiet] [--reference <저장소"
">] [--name <이름>] [--depth <깊이>] --url <url> --path <경로>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "'%s'에서 하위 모듈 경로 '%s'에 복제하는데 실패했습니다"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "'%s'에 대한 하위 모듈 디렉터리를 가져올 수 없습니다"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "'%s' 하위 모듈 경로가 초기화되지 않았습니다"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "'update --init'을 하려고 한 것 아니었습니까?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "병합하지 하위 모듈 %s 건너뜀"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "하위 모듈 '%s' 건너뜀"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "'%s' 복제하는데 실패했습니다. 재시도 예정"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "두번째 '%s' 복제하는데 실패했습니다. 중지합니다"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "작업 폴더로 가는 경로"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
msgid "path into the working tree, across nested submodule boundaries"
msgstr "작업 폴더로 가는 경로, 내장된 하위 모듈의 경계 통과"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout 또는 none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "지정한 개수의 리비전에서 잘린 얕은 복제를 만듭니다"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "병렬 작업 개수"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "최초 복제가 얕은 복제 추천을 따를지 여부"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "복제 과정을 표시하지 않습니다"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<경로>] [<경로>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "파라미터 업데이트에 값이 잘못되었습니다"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13172,20 +13516,20 @@
"하위 모듈 (%s) 브랜치가 상위 프로젝트 브랜치를 이어받도록 설정되었지만, 상위 "
"프로젝트에 브랜치가 없습니다"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "하위 모듈에 재귀적으로 적용"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<경로>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s에서 --super-prefix 옵션을 지원하지 않습니다"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s'은(는) 올바른 submodule--helper 하위 명령이 아닙니다"
@@ -13198,23 +13542,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <이름>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "심볼이 아닌 (분리된) 레퍼런스에 대해 에러 메시지를 표시하지 않습니다"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "심볼릭 레퍼런스를 삭제합니다"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "레퍼런스 출력을 줄입니다"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "이유"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "업데이트의 이유"
@@ -13244,17 +13588,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<형식>] <태그이름>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "'%s' 태그가 없습니다."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "'%s' 태그 삭제함 (과거 %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13267,7 +13611,7 @@
" %s\n"
"'%c' 문자로 시작하는 줄은 무시됩니다.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13281,142 +13625,142 @@
" %s\n"
"'%c' 문자로 시작하는 줄은 유지됩니다. 제거하려면 직접 지워야 합니다.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "태그에 서명할 수 없습니다"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "태그 파일을 쓸 수 없습니다"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "잘못된 오브젝트 종류."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "태그 메시지 없음?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "태그 메시지가 %s 파일에 남아 있습니다\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "태그 이름 목록을 표시합니다"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "각 태그 메시지의 <n>줄을 표시합니다"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "태그를 삭제합니다"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "태그를 검증합니다"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "태그 만들기 옵션"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "주석 달린 태그, 메시지가 필요합니다"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "태그 메시지"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "주석 달리고 GPG 서명한 태그"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "태그를 서명하는데 지정한 키를 사용합니다"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "태그가 있으면 바꿉니다"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "reflog를 만듭니다"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "태그 목록 보기 옵션"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "태그 목록을 여러 열로 표시합니다"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "해당 커밋이 들어 있는 태그만 표시합니다"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "해당 커밋이 들어 있지 않은 태그만 표시합니다"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "병합된 태그만 표시합니다"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "병합되지 않은 태그만 표시합니다"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "해당 오브젝트의 태그만 표시합니다"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column 및 -n 옵션은 호환되지 않습니다"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "-n 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "--contains 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 및 --no-merged 옵션은 리스트 모드에서만 허용합니다"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "하나의 -F 또는 -m 옵션만 쓸 수 있습니다."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "파라미터가 너무 많습니다"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s'은(는) 올바른 태그 이름이 아닙니다."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "태그 '%s'이(가) 이미 있습니다"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "태그 '%s' 업데이트 (과거 %s)\n"
@@ -13425,186 +13769,203 @@
msgid "Unpacking objects"
msgstr "오브젝트 묶음 푸는 중"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "%s 디렉터리 만들기 실패했습니다"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "%s에 stat()하는데 실패했습니다"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "%s 파일을 만드는데 실패했습니다"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "%s 파일을 삭제하는데 실패했습니다"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "%s 디렉터리를 삭제하는데 실패했습니다"
-#: builtin/update-index.c:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "'%s' 안의 수정 시각을 확인하는 중입니다"
-#: builtin/update-index.c:150
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "새 파일을 추가한 후에 디렉터리 정보가 바뀌지 않았습니다"
-#: builtin/update-index.c:163
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "새 디렉터리를 추가한 후에 디렉터리 정보가 바뀌지 않았습니다"
-#: builtin/update-index.c:176
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "파일을 업데이트한 후에 디렉터리 정보가 바뀌지 않았습니다"
-#: builtin/update-index.c:187
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "하위 디렉터리에 파일을 추가한 후에 디렉터리 정보가 바뀌지 않았습니다"
-#: builtin/update-index.c:198
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "파일을 삭제한 후에 디렉터리 정보가 바뀌지 않았습니다"
-#: builtin/update-index.c:211
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "디렉터리를 삭제한 후에 디렉터리 정보가 바뀌지 않았습니다"
-#: builtin/update-index.c:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " 오케이"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<옵션>] [--] [<파일>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr "인덱스에 업데이트가 필요하더라도 새로 고침을 계속합니다"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "새로 고침: 하위 모듈 무시"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "새 파일을 무시할 수 않습니다"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "디렉터리를 파일로, 또는 그 반대로 바꿀 수 있게 허용합니다"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "작업폴더에서 알림 파일이 없습니다"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr "인덱스에 병합하지 않은 항목이 있어도 새로 고칩니다"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "파일 정보를 새로 고칩니다"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "--refresh와 동일하지만, assume-unchanged 설정을 무시합니다"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<모드>,<오브젝트>,<경로>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "지정한 항목을 인덱스에 추가합니다"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "파일을 \"바꾸지 않음\"으로 표시합니다"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "바꾸지 않음으로 가정 (assumed-unchanged) 비트를 지웁니다"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "파일을 인덱스 전용으로 (\"index-only\") 표시합니다"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "작업폴더 건너뛰기 (skip-worktree) 비트를 지웁니다"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
msgid "add to index only; do not add content to object database"
msgstr ""
"인덱스에만 추가합니다. 내용을 오브젝트 데이터베이스에 추가하지 않습니다"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:983
msgid "remove named paths even if present in worktree"
msgstr "작업 폴더에 있어도 해당 경로를 제거합니다"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "--stdin과 같이 사용: 입력 줄은 NUL 바이트로 끝납니다"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
msgid "read list of paths to be updated from standard input"
msgstr "표준 입력에서 업데이트할 경로의 목록을 읽습니다"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr "표준 입력에서 읽은 항목을 인덱스에 추가합니다"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "경로 목록에 대해 #2 및 #3 스테이징을 다시 합니다"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "HEAD와 다른 항목만 업데이트합니다"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "작업 폴더에 없는 파일을 무시합니다"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "표준 출력에 동작을 알립니다"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "저장한 해결되지 않은 충돌을 무시합니다 (사용자용 명령 용도)"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "인덱스를 이 형식으로 씁니다"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "스플릿 인덱스를 켜거나 끕니다"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "추적하지 않는 캐시 사용을 켜거나 끕니다"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr "파일 시스템이 추적하지 않는 캐시를 지원하는지 검사합니다"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr "파일 시스템 시험 없이 추적하지 않는 캐시를 사용합니다"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+msgid "write out the index even if is not flagged as changed"
+msgstr "변경된 것으로 표시되지 않은 경우에도 인덱스에 씁니다"
+
+#: builtin/update-index.c:1024
+msgid "enable or disable file system monitor"
+msgstr "파일 시스템 모니터를 켜거나 끕니다"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "파일 시스템 모니터링 기능이 변경사항을 확인하는 비트를 파일에 표시합니"
+"다"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "파일 시스템 모니터링 기능이 변경사항을 확인하는 비트를 지웁니다"
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -13612,7 +13973,7 @@
"core.splitIndex 값이 거짓입니다. 정말로 스플릿 인덱스를 사용하려면 이 값을 제"
"거하거나 바꾸십시오."
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -13620,7 +13981,7 @@
"core.splitIndex 값이 참입니다. 정말로 스플릿 인덱스를 사용하지 않으려면 이 값"
"을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13628,11 +13989,11 @@
"core.untrackedCache 값이 참입니다. 정말로 추적하지 않는 캐시를 사용하지 않으"
"려면 이 값을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "추적되지 않는 파일 캐시를 사용하지 않습니다"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13640,11 +14001,32 @@
"core.untrackedCache 값이 거짓입니다. 정말로 추적하지 않는 캐시를 사용하려면 "
"이 값을 제거하거나 바꾸십시오."
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "'%s'에 대해 추적되지 않는 캐시를 사용하지 않습니다"
+#: builtin/update-index.c:1171
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr ""
+"core.fsmonitor가 설정되지 않았습니다. 정말로 파일 시스템 모니터를 사용하려면 "
+"설정하십시오"
+
+#: builtin/update-index.c:1175
+msgid "fsmonitor enabled"
+msgstr "파일 시스템 모니터가 켜졌습니다"
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr ""
+"core.fsmonitor가 설정되어 있습니다. 정말로 파일 시스템 모니터를 사용하지 않으"
+"려면 설정을 제거하십시오"
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr "파일 시스템 모니터가 꺼졌습니다"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<옵션>] -d <레퍼런스이름> [<과거-값>]"
@@ -13657,19 +14039,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<옵션>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "레퍼런스를 삭제합니다"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "<레퍼런스이름>을 가리키지 않는 항목으로 업데이트합니다"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "표준 입력에 NUL로 끝나는 인자가 있습니다"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "표준 입력에서 업데이트를 읽습니다"
@@ -13713,122 +14095,143 @@
msgid "print tag contents"
msgstr "태그 내용 표시"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<옵션>] <경로> [<브랜치>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<옵션>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<옵션>] <경로>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<옵션>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <경로>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "worktrees/%s 제거: 올바른 디렉터리가 아닙나다"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "worktrees/%s 제거: gitdir 파일이 없습니다"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "worktrees/%s 제거: gitdir 파일을 읽을 수 없습니다 (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"작업 트리 제거/%s: 부족하게 읽음 (%<PRIuMAX> 바이트 예상, %<PRIuMAX> 바이트 "
+"읽음)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "worktrees/%s 제거: gitdir 파일이 올바르지 않습니다"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "worktrees/%s 제거: gitdir 파일이 없는 위치를 가리킵니다"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "잘라낸 작업 폴더를 알립니다"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr "<시각>보다 오래 된 작업 폴더를 만료합니다"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "'%s'이(가) 이미 있습니다"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "'%s'의 디렉터리를 만들 수 없습니다"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "%s 준비 중 (ID %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "다른 작업 폴더에서 체크아웃했더라도 <브랜치>를 체크아웃합니다"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "새 브랜치를 만듭니다"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "브랜치를 만들거나 리셋합니다"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "새 작업 폴더를 만듭니다"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "새 작업 폴더를 잠궈 둡니다"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "추적 모드를 설정합니다 (git-branch(1) 참고)"
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "새 브랜치 이름과 리모트 추적 브랜치를 일치 시킵니다"
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B, --detach 옵션 중 하나만 쓸 수 있습니다"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track 옵션은 새로운 브런치가 생성되었을 경우에만 쓸 수 있습니다"
+
+#: builtin/worktree.c:553
msgid "reason for locking"
msgstr "잠그는 이유"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s'은(는) 작업 폴더가 아닙니다"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr "메인 작업 폴더를 잠그거나 잠금 해제할 수 없습니다"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s'은(는) 이미 잠겼습니다. 이유: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "'%s'은(는) 이미 잠겼습니다"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "'%s'은(는) 잠기지 않았습니다"
@@ -13849,7 +14252,7 @@
msgid "only useful for debugging"
msgstr "디버깅 용도로만 사용"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<옵션>] <디렉터리>"
@@ -13870,7 +14273,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "<n>초 동안 반응이 없으면 전송을 중지합니다"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13883,7 +14286,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "디버깅 메시지를 표준오류로 출력합니다"
@@ -13897,21 +14300,21 @@
"목록을 볼 수 있습니다. 특정 하위 명령어나 개념에 대해 읽어 보려면 'git help\n"
"<명령>' 또는 'git help <개념>' 명령을 실행하십시오."
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer이 0보다 작은 값입니다. 기본값 %d"
# HTTP delegation
-#: http.c:358
+#: http.c:360
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "딜리게이션 컨트롤은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다"
-#: http.c:367
+#: http.c:369
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "공개 키 고정은 cURL 7.44.0 앞 버전에서는 지원하지 않습니다"
-#: http.c:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13927,6 +14330,14 @@
msgid "redirecting to %s"
msgstr "%s(으)로 리다이렉트"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "인자"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "오브젝트 필터링"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "작업 공간 시작 (참고: git help tutorial)"
@@ -14101,27 +14512,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "잘못된 bisect_write 인자: $state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "잘못된 리비전 입력: $arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "잘못된 리비전 입력: $bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "잘못된 리비전 입력: $rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' 명령은 하나의 인자만 쓸 수 있습니다."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "경고: 하나의 $TERM_BAD 커밋에 대해서만 이등분."
@@ -14129,11 +14540,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "확실합니까 [Y/n]? "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14142,7 +14553,7 @@
"최소한 하나의 $bad_syn 및 하나의 $good_syn 리비전을 넘겨야 합니다.\n"
"(\"git bisect $bad_syn\" 및 \"git bisect $good_syn\" 명령을 실행하면 됩니다.)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14153,16 +14564,16 @@
"그 다음 최소한 하나의 $good_syn 및 하나의 $bad_syn 리비전을 넘겨야 합니다\n"
"(\"git bisect $bad_syn\" 및 \"git bisect $good_syn\" 명령을 실행하면 됩니다.)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "이등분하는 중입니다."
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid'은(는) 올바른 커밋이 아닙니다"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14171,25 +14582,29 @@
"본래의 HEAD '$branch'을(를) 체크아웃할 수 없습니다.\n"
"'git bisect reset <커밋>'을 해 보십시오"
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "로그 파일이 주어지지 않았습니다"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "다시 재생할 $file 파일을 읽을 수 없습니다"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? 무슨 소리인지 모르겠습니다?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "이등분 실행이 실패했습니다: 주어진 명령어가 없습니다."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "실행: $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14198,11 +14613,11 @@
"이등분 실행이 실패했습니다:\n"
"'$command' 명령에서 상태 코드 '$res'이(가) 0보다 작거나 128보다 큽니다"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "이등분 실행을 계속 할 수 없습니다"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14211,39 +14626,20 @@
"이등분 실행이 실패했습니다:\n"
"'bisect_state $state' 명령에서 상태 코드가 '$res'입니다"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "이등분 실행 성공"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "두 다른 용어를 사용하십시오"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term'이(가) 올바른 용어가 아닙니다"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "내부 명령어 '$term'을(를) 용어로 사용할 수 없습니다"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "용어 '$term'의 의미를 바꿀 수 없습니다"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "잘못된 명령어: 현재 $TERM_BAD/$TERM_GOOD 이등분 중입니다."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "용어를 정의하지 않았습니다"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14273,7 +14669,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "이미 $pretty_name에 업데이트 상태입니다"
#: git-merge-octopus.sh:89
@@ -14292,51 +14688,55 @@
#: git-rebase.sh:58
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"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"이 문제를 해결하면, \"\"git rebase --continue\"를 실행하십시오.\n"
-"이 패치를 건너뛰려면, 대신에 \"git rebase --skip\"을 실행하십시오.\n"
-"원래 브랜치를 체크아웃하고 리베이스를 중지하려면, \"git rebase --abort\"를 실"
-"행하십시오."
+"모든 충돌을 수동으로 해결하고, 모두 \"git add/rm <충돌_파일>\" 명령으로\n"
+"해결했다고 표시하고, \"git rebase --continue\" 명령을 실행하십시오. 이 패치"
+"를\n"
+"건너뛰려면, 대신에 \"git rebase --skip\" 명령을 실행하십시오. 리베이스를\n"
+"중지하고 \"git rebase\" 명령 전의 원래 상태로 돌아가려면, \"git rebase --"
+"abort\"\n"
+"명령을 실행하십시오."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "'$head_name' 위치로 돌아갈 수 없습니다"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "자동스태시 적용."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "\"$stash_sha1\"을(를) 저장할 수 없습니다"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "리베이스 전 후크에서 리베이스를 거부했습니다."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "git-am이 진행 중인 것처럼 보입니다. 리베이스할 수 없습니다."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "'git am'이 진행 중인 것처럼 보입니다. 리베이스할 수 없습니다."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "리베이스가 진행 중이지 않습니다"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "--edit-todo 동작은 대화형 리베이스에서만 사용할 수 있습니다."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "HEAD를 읽을 수 없습니다"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14344,7 +14744,7 @@
"모든 병합 충돌을 편집하고 git add\n"
"명령으로 해결되었다고 표시해야 합니다"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14365,226 +14765,222 @@
"이 명령을 다시 실행하십시오. 중요한 사항이 남아 있을 경우를\n"
"대비해 여기서 멈춥니다."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "잘못된 업스트림 $upstream_name"
+msgid "invalid upstream '$upstream_name'"
+msgstr "잘못된 업스트림 '$upstream_name'"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 여러 개의 병합 베이스가 있습니다"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 병합 베이스가 없습니다"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "올바른 커밋을 가리키지 않습니다: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "치명적 이상: 그런 브랜치가 없습니다: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "치명적 이상: 그런 브랜치/커밋이 없습니다 '$branch_name'"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "자동 스태시를 할 수 없습니다"
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "자동 스태시를 만들었습니다: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "커밋하거나 스태시에 넣으십시오."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD가 최신 상태입니다."
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD가 최신 상태입니다. 강제 리베이스합니다."
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "현재 브랜치가 ($branch_name) 최신 상태입니다. 강제 리베이스합니다."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "변경 사항 '$mb'에서 '$onto'(으)로:"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr "작업 사항을 다시 넣기 위해 먼저 헤드를 뒤로 돌립니다..."
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "$branch_name 브랜치를 $onto_name 위치로 정방향 진행합니다."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 명령을 파라미터와 같이 쓰기는 구현되지 않았습니다"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "아직 최초 커밋이 없습니다"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "현재 인덱스 상태를 저장할 수 없습니다"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "추적하지 않는 파일을 저장할 수 없습니다"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "현재 작업 폴더 상태를 저장할 수 없습니다"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "변경 사항을 선택하지 않았습니다"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "임시 인덱스를 제거할 수 없습니다 (일어날 수 없는 상황)"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "작업 폴더 상태를 기록할 수 없습니다"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "$ref_stash을(를) $w_commit(으)로 업데이트할 수 없습니다"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"오류: 'stash save'에 대해 알 수 없는 옵션: $option\n"
-" 메시지를 넘기려면, 다음과 같이 쓰십시오: git stash save -- '$option'"
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "오류: 'stash push'에 대해 알 수 없는 옵션: $option"
+
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr ""
"--patch 옵션과 --include-untracked 또는 --all 옵션을 동시에 쓸 수 없습니다"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "저장할 로컬 변경 사항이 없습니다"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "스태시를 초기화할 수 없습니다"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "현재 상태를 저장할 수 없습니다"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "작업 폴더와 $stash_msg 인덱스 상태를 저장했습니다"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "작업폴더 변경 사항을 제거할 수 없습니다"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "알 수 없는 옵션: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "스태시 항목이 없습니다."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "너무 많은 리비전을 지정했습니다: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference은(는) 올바른 레퍼런스가 아닙니다"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args'은(는) 스태시 커밋이 아닙니다"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args'은(는) 스태시 레퍼런스가 아닙니다"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "인덱스를 새로 고칠 수 없습니다"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "병합 도중에 스태시를 적용할 수 없습니다"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "인덱스에 충돌. --index 없이 시도해 보십시오."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "인덱스 트리를 저장할 수 없습니다"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr "스태시 항목에서 추적하지 않는 파일을 복구할 수 없습니다"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "수정한 파일을 스테이지에서 뺄 수 없습니다"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "인덱스가 스태시에서 빠졌습니다."
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
msgstr "다시 필요할 때를 대비해 스태시 항목을 보관합니다."
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "${REV} 지움 ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: 스태시 항목을 지울 수 없습니다"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "브랜치 이름을 지정하지 않았습니다"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(복구하려면 \"git stash apply\"를 실행하십시오)"
@@ -14727,17 +15123,17 @@
msgstr ""
"'$name' 하위 모듈이 ($url) '$displaypath' 경로에 대해 등록되지 않았습니다"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "하위 모듈 경로에서 ('$displaypath') 현재 리비전을 찾을 수 없습니다"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "하위 모듈 경로 '$sm_path'에서 가져올 수 없습니다"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14746,12 +15142,12 @@
"하위 모듈 경로 '$sm_path'에서 현재 ${remote_name}/${branch} 리비전을 찾을 수 "
"없습니다"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 가져올 수 없습니다"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14760,82 +15156,77 @@
"'$displaypath' 하위 모듈 경로에서 가져왔지만, $sha1 커밋이 들어있지 않습니"
"다. 이 커밋을 직접 가져오는데 실패했습니다."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 체크아웃할 수 없습니다"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1' 체크아웃"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1'을(를) 리베이스할 수 없습니다"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'(으)로 리베이스"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "하위 모듈 경로 '$displaypath'에서 '$sha1' 병합할 수 없습니다"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$sha1'에서 병합"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "'$command $sha1' 실행이 하위 모듈 경로 '$displaypath'에서 실패했습니다"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "하위 모듈 경로 '$displaypath': '$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "재귀적으로 하위 모듈 경로 '$displaypath'에 들어가는데 실패했습니다"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "--cached 옵션은 --files 옵션과 같이 쓸 수 없습니다"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "예상치 못한 모드 $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 경고: '$display_name'에 '$sha1_src' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 경고: '$display_name'에 '$sha1_dst' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" 경고: '$display_name'에 '$sha1_src' 및 '$sha1_dst' 커밋이 들어있지 않습니다"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "하위 모듈 URL을 '$displaypath'에 대해 동기화"
@@ -14854,13 +15245,13 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -14945,48 +15336,48 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "병합 squash 거부: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "$sha1 병합을 다시 하는데 오류"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "$sha1을 빼오기 할 수 없습니다"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "커밋 메시지 #${n}번입니다:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "#${n}번째 커밋 메시지를 건너뜁니다:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
msgstr[0] "커밋 $count개가 섞인 결과입니다."
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "$fixup_msg를 쓸 수 없습니다"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "커밋 2개가 섞인 결과입니다."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "다음을 적용할(apply) 수 없습니다: $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14999,31 +15390,31 @@
"대부분의 경우 빈 커밋 메시지 때문이거나, 또는 커밋 전 후크가 실패했기\n"
"때문입니다. 커밋 메시지를 수정하기 전에 이 문제를 먼저 해결해야 합니다."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "다음에서 멈춥니다: $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "이전 커밋 없이 '$squash_style' 수행할 수 없습니다"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "실행 중: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "실행 실패: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "그리고 인덱스 그리고/또는 작업 폴더에 변경 사항이 있습니다"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15034,7 +15425,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15049,95 +15440,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "알 수 없는 명령: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "'git rebase --edit-todo' 명령으로 바로잡으십시오."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "성공적으로 리베이스했고 $head_name 업데이트했습니다."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "불필요한 빼오기 명령을 건너뛸 수 없습니다"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"경고: 다음 줄에서 해당 SHA-1이 없거나 커밋이 아닙니다:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"경고: 다음 줄에서 명령어가 무엇인지 알 수 없습니다:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "HEAD는 분리할 수 없습니다"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"경고: 일부 커밋이 의도치 않게 버려졌을 수도 있습니다.\n"
-"버려진 커밋 (최근에서 과거 순서):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"이 메시지를 보지 않으려면, \"drop\"을 사용해 명시적으로 커밋을 제거하십시"
-"오.\n"
-"\n"
-"'git config rebase.missingCommitsCheck' 명령으로 경고 단계를 바꿀 수 있습니"
-"다.\n"
-"가능한 동작은: ignore, warn, error"
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"rebase.missingCommitsCheck 옵션에 대해 인식할 수 없는 $check_level 설정. 무시"
-"합니다."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"'git rebase --edit-todo' 명령으로 바로잡을 수 있고 'git rebase --continue' 명"
-"령을 실행합니다."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "아니면 'git rebase --abort' 명령으로 리베이스를 중지할 수도 있습니다."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "CHERRY_PICK_HEAD를 제거할 수 없습니다"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15168,11 +15493,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
msgid "Error trying to find the author identity to amend commit"
msgstr "커밋을 수정한 작성자 신원을 찾는데 오류"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15180,11 +15505,11 @@
"작업 폴더에 커밋하지 않은 변경 사항이 있습니다. 이 사항을 먼저\n"
"커밋하고 'git rebase --continue' 명령을 다시 실행하십시오."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "스테이징한 변경 사항은 커밋할 수 없습니다."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15198,39 +15523,43 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "편집기를 실행할 수 없습니다"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "$switch_to를 체크아웃할 수 없습니다"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "HEAD가 없습니다?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "임시로 $state_dir 디렉터리를 만들 수 없습니다"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "대화형으로 표시할 수 없습니다."
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "다시 작성된 커밋을 초기화할 수 없습니다"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "할 일 목록을 생성할 수 없습니다"
+
+#: git-rebase--interactive.sh:973
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
msgstr[0] "리베이스 $shortrevisions, $shortonto 위로 (명령 $todocount개)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15240,7 +15569,7 @@
"하지만 모두 제거할 경우, 리베이스를 중지합니다.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "단 빈 커밋은 주석 처리되었습니다."
@@ -15814,60 +16143,60 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "지역 시각 오프셋이 24시간보다 크거나 작습니다\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "편집기가 비정상적으로 끝나서, 모두 중지합니다"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 안에 작성 중이었던 중간 버전의 전자메일이 들어 있습니다.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 안에 작성한 전자메일이 들어 있습니다.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 옵션은 다른 옵션과 호환되지 않습니다\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "저장소 밖에서 git format-patch 명령을 실행할 수 없습니다\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "알 수 없는 --suppress-cc 필드: '%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "알 수 없는 --confirm 설정: '%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "경고: 따옴표가 있는 sendmail 별칭은 지원하지 않습니다: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "경고: `:include:`는 지원하지 않습니다: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "경고: `/file` 또는 `|pipe` 리다이렉션은 지원하지 않습니다: %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "경고: sendmail 줄이 인식되지 않습니다: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -15882,12 +16211,12 @@
" * 파일을 의도했다면 \"./%s\"(이)라고 쓰고, 아니면\n"
" * 범위를 의도했다면 --format-patch 옵션 사용\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "%s에 opendir 실패: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -15896,7 +16225,7 @@
"치명적 오류: %s: %s\n"
"경고: 패치를 보내지 않았습니다\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -15906,17 +16235,17 @@
"패치 파일을 지정하지 않았습니다\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "%s 안에 제목 줄이 없습니다?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "%s에 쓰려고 여는데 실패: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -15930,32 +16259,32 @@
"\n"
"요약을 보내는 게 아니라면 본문 내용을 지우십시오.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "%s.final을 여는데 실패: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "%s을(를) 여는데 실패: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "To/Cc/Bcc 필드가 해석되지 않아서, 무시합니다\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "요약 전자메일이 비어 있어서 넘어갑니다.\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "정말로 <%s>을(를) 사용하시겠습니까 [y/N]? "
# 주의: '8bit'이라고 그대로 쓴다. 메일 encoding 헤더에 쓸 literal을 가리킴
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -15963,11 +16292,11 @@
"다음 파일이 8bit이지만, Content-Transfer-Encoding을 설정하지 않았습니다.\n"
# 주의: '8bit'이라고 그대로 쓴다. 메일 encoding 헤더에 쓸 literal을 가리킴
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "어떤 8bit 인코딩을 선언합니까 [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -15980,20 +16309,20 @@
"제목 서식인 '*** SUBJECT HERE ***'가 들어 있습니다. 정말로 보내려면 --force "
"옵션을 사용하십시오.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "누구에게 전자메일을 보내야 합니까 (보낼 대상이 있다면)?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "치명적 오류: '%s' 별칭은 자기 자신을 가리킵니다\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "오류: 다음에서 올바른 주소를 추출할 수 없습니다: %s\n"
@@ -16001,16 +16330,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:944
+#: git-send-email.perl:941
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "이 주소로 무엇을 하시겠습니까? ([q]끝내기|[d]버리기|[e]편집): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "\"%s\" CA 경로가 없습니다"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16037,130 +16366,181 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "이 전자메일을 보내시겠습니까? ([y]예|[n]아니오|[q]끝내기|[a]모두): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "필요한 전자메일 답장 보냅니다"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr "필요한 SMTP 서버를 제대로 지정하지 않았습니다."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "서버에서 STARTTLS를 지원하지 않습니다! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 실패! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr ""
"SMTP를 제대로 초기화할 수 없습니다. 설정을 확인하고 --smtp-debug 옵션을 사용"
"하십시오."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "%s을(를) 보내는데 실패했습니다\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "%s 보내는 흉내\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "%s 보냄\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "성공 흉내. 기록은:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "성공. 기록은:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "결과: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "결과: 정상\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "%s 파일을 열 수 없습니다"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) cc: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1551
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) to: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1599
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox아님) cc: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1624
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(본문) cc: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) '%s'을 실행할 수 없습니다"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) %s: %s 추가, '%s' 줄에서\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) '%s'(을)를 향한 파이프를 닫는데 실패했습니다"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "메시지를 7비트로 보낼 수 없습니다"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "잘못된 전송 인코딩"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "%s을(를) 열 수 없습니다: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: 패치에 998자보다 더 긴 줄이 들어 있습니다"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "정말로 %s 파일을 보내시겠습니까? [y|N]: "
+
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "경로명세로 빈 문자열을 넣는 일은 다음 릴리스에서 오류로 취급할 예정입니"
+#~ "다. 모든 경로를 지정하려면 점(.)을 사용하십시오."
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "'%s'을(를) 쓰기 용으로 열 수 없습니다"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "'%s' 파일을 자를 수 없습니다"
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "'%s'을(를) 마칠 수 없습니다"
+
+#~ msgid "could not close %s"
+#~ msgstr "%s을(를) 닫을 수 없습니다"
+
+#~ msgid "Copied a misnamed branch '%s' away"
+#~ msgstr "이름이 잘못된 '%s' 브랜치를 복사합니다"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "'HEAD'를 수동으로 만드는 건 앞뒤가 맞지 않습니다"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "%s의 복제 방법을 알지 못합니다"
+
+#~ msgid "show ignored files"
+#~ msgstr "무시되는 파일을 표시합니다"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s은(는) 올바른 '%s' 오브젝트가 아닙니다"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "'%s'에서 가져오는 방법을 알 수 없습니다"
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "'$term'이(가) 올바른 용어가 아닙니다"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "오류: 'stash save'에 대해 알 수 없는 옵션: $option\n"
+#~ " 메시지를 넘기려면, 다음과 같이 쓰십시오: git stash save -- "
+#~ "'$option'"
+
+#~ msgid "Failed to recurse into submodule path '$sm_path'"
+#~ msgstr "재귀적으로 하위 모듈 경로 '$sm_path'에 들어가는데 실패했습니다"
diff --git a/po/ru.po b/po/ru.po
index 75ec68c..9dd5dfb 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,15 +3,15 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Translators:
-# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2017
+# Dimitriy Ryazantcev <DJm00n@mail.ru>, 2014-2018
# insolor, 2014
# insolor, 2014
msgid ""
msgstr ""
"Project-Id-Version: Git Russian Localization Project\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-30 09:20+0000\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-09 10:56+0000\n"
"Last-Translator: Dimitriy Ryazantcev <DJm00n@mail.ru>\n"
"Language-Team: Russian (http://www.transifex.com/djm00n/git-po-ru/language/ru/)\n"
"MIME-Version: 1.0\n"
@@ -20,59 +20,59 @@
"Language: ru\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "подсказка: %.*s\n"
-#: advice.c:86
+#: advice.c:90
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "Невозможно выполнить копирование коммита в текущую ветку, так как у вас имеются не слитые файлы."
-#: advice.c:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr "Невозможно закоммитить, так как у вас имеются не слитые файлы."
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr "Невозможно выполнить слияние, так как у вас имеются не слитые файлы."
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr "Невозможно выполнить получение, так как у вас имеются не слитые файлы."
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr "Невозможно обратить изменения, так как у вас имеются не слитые файлы."
-#: advice.c:96
+#: advice.c:100
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "Невозможно выполнить %s, так как у вас имеются не слитые файлы."
-#: advice.c:104
+#: advice.c:108
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
msgstr "Исправьте их в рабочем каталоге, затем запустите «git add/rm <файл>»,\nчтобы пометить исправление и сделайте коммит."
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "Выход из-за неразрешенного конфликта."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD)."
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "Перед слиянием, выполните коммит ваших изменений."
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "Выход из-за незавершенного слияния."
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -98,82 +98,82 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "неопознанная опция для игнорирования пробелов «%s»"
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject и --3way нельзя использовать одновременно."
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached и --3way нельзя использовать одновременно."
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "--3way вне репозитория"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "--index вне репозитория"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "--cached вне репозитория"
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Не удалось подготовить регулярное выражение для метки времени %s"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec возвратил %d для ввода: %s"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "не удалось найти имя файла в строке патча %d"
-#: apply.c:967
+#: apply.c:942
#, c-format
msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d"
msgstr "git apply: плохой git-diff — ожидалось /dev/null, получено %s на строке %d"
-#: apply.c:973
+#: apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply: плохой git-diff — не согласующееся новое имя файла на строке %d"
-#: apply.c:974
+#: apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply: плохой git-diff — не согласующееся старое имя файла на строке %d"
-#: apply.c:979
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply: плохой git-diff — ожидалось /dev/null на строке %d"
-#: apply.c:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "недопустимый режим %d: %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "противоречивые строки заголовка %d и %d"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: не ожидаемая строка: %.*s"
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "фрагмент изменений без заголовка на строке %d: %.*s"
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname"
@@ -186,70 +186,70 @@
msgstr[2] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
msgstr[3] "заголовок git diff не нашел информацию об имени файла при удалении %d ведущих компонент пути к файлу (строка %d)"
-#: apply.c:1600
+#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "заголовок git diff не содержит информации об имени файла (строка %d)"
-#: apply.c:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "новый файл зависит от старого содержимого"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "удаленный файл все еще имеет содержимое"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "патч поврежден на строке %d"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "новый файл %s зависит от старого содержимого"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "удаленный файл %s все еще имеет содержимое"
-#: apply.c:1848
+#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** предупреждение: файл %s становится пустым, но не удаляется"
-#: apply.c:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "поврежденный двоичный патч на строке %d: %.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "неопознанный двоичный патч на строке %d"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "патч с мусором на строке %d"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "не удалось прочитать символьную ссылку %s"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "не удалось открыть или прочесть %s"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "неправильное начало строки: «%c»"
-#: apply.c:3052
+#: apply.c:3055
#, c-format
msgid "Hunk #%d succeeded at %d (offset %d line)."
msgid_plural "Hunk #%d succeeded at %d (offset %d lines)."
@@ -258,257 +258,257 @@
msgstr[2] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
msgstr[3] "Часть #%d успешно применена на %d (со сдвигом в %d строк)."
-#: apply.c:3064
+#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Контекст сужен до (%ld/%ld), чтобы применить фрагмент на %d строке"
-#: apply.c:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
"%.*s"
msgstr "при поиске:\n%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "пропущены данные двоичного патча для «%s»"
-#: apply.c:3100
+#: apply.c:3103
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "невозможно выполнить reverse-apply для двоичного патча, без обращения изменений блока «%s»"
-#: apply.c:3146
+#: apply.c:3149
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "невозможно применить двоичный патч «%s» без строки с указанной полной версией индекса"
-#: apply.c:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "патч применятся к файлу «%s» (%s), но его текущее содержимое не соотвествует ожидаемому."
-#: apply.c:3164
+#: apply.c:3167
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "патч применяется к пустому файлу «%s», но файл не пустой"
-#: apply.c:3182
+#: apply.c:3185
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "не удалось прочитать необходимую посылку %s для «%s»"
-#: apply.c:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "не удалось применить двоичный патч к «%s»"
-#: apply.c:3201
+#: apply.c:3204
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "после применения двоичного патча для «%s» был получен неправильный результат (ожидалось %s, получено %s)"
-#: apply.c:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "ошибка применения изменений: %s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "не удалось переключить состояние на %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "не удалось прочитать %s"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "чтение из «%s» за символической ссылкой"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "путь %s был переименован/удален"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: нет в индексе"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: не совпадает с индексом"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "в репозитории отсутствует необходимый двоичный объект для отката к трёхходовому слиянию."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Откат к трёхходовому слиянию…\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "не удалось прочитать текущее содержимое «%s»"
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Не удалось откатиться к трёхходовому слиянию…\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Патч применен к «%s» с конфликтами.\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Патч применен к «%s» без ошибок.\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "патч удаления не удалил содержимое файла"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: неправильный тип"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s имеет тип %o, а ожидался %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "неправильный путь «%s»"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s: уже содержится в индексе"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: уже содержится в рабочем каталоге"
-#: apply.c:3941
+#: apply.c:3945
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o)"
-#: apply.c:3946
+#: apply.c:3950
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o) of %s"
msgstr "новый режим доступа (%o) для %s не соответствует старому режиму доступа (%o) для %s"
-#: apply.c:3966
+#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "затронутый файл «%s» находится за символической ссылкой"
-#: apply.c:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: не удалось применить патч"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "Проверка патча %s…"
-#: apply.c:4076
+#: apply.c:4080
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "информация об sha1 отсутствует или бесполезна для подмодуля %s"
-#: apply.c:4083
+#: apply.c:4087
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "изменен режим для %s, который не находится в текущем HEAD"
-#: apply.c:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "информация об sha1 отсутствует или бесполезна (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "сбой make_cache_entry для пути «%s»"
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "не удалось добавить %s во временный индекс"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "не удалось записать временный индкекс в %s"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "не удалось удалить %s из индекса"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "поврежденный патч для подмодуля %s"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "не удалось выполнить stat для созданного файла «%s»"
-#: apply.c:4292
+#: apply.c:4296
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "не удалось создать вспомогательный файл для созданного файла %s"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "не удалось создать запись в кэше для %s"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "не удалось записать в «%s»"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "закрытие файла «%s»"
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "не удалось записать файл «%s» с режимом доступа %o"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Патч %s применен без ошибок."
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "внутренняя ошибка"
-#: apply.c:4522
+#: apply.c:4526
#, c-format
msgid "Applying patch %%s with %d reject..."
msgid_plural "Applying patch %%s with %d rejects..."
@@ -517,45 +517,45 @@
msgstr[2] "Применение патча %%s с %d отказами…"
msgstr[3] "Применение патча %%s с %d отказами…"
-#: apply.c:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "усечение имени .rej файла до %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "не удалось открыть %s"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Блок №%d применен без ошибок."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "Блок №%d отклонен."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "Патч «%s» пропущен."
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "не распознанный ввод"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "не удалось прочитать файл индекса"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "не удалось открыть патч «%s»: %s"
-#: apply.c:4860
+#: apply.c:4864
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
@@ -564,7 +564,7 @@
msgstr[2] "пропущено %d ошибок в пробельных символах"
msgstr[3] "пропущено %d ошибок в пробельных символах"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
@@ -573,7 +573,7 @@
msgstr[2] "%d строк добавили ошибки в пробельных символах."
msgstr[3] "%d строк добавили ошибки в пробельных символах."
-#: apply.c:4874
+#: apply.c:4878
#, c-format
msgid "%d line applied after fixing whitespace errors."
msgid_plural "%d lines applied after fixing whitespace errors."
@@ -582,15 +582,15 @@
msgstr[2] "%d строк добавлено после исправления ошибок в пробелах."
msgstr[3] "%d строки добавлено после исправления ошибок в пробелах."
-#: apply.c:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Не удалось записать новый файл индекса"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "путь"
@@ -603,7 +603,7 @@
msgid "apply changes matching the given path"
msgstr "применять изменения по указанному пути"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "количество"
@@ -655,7 +655,7 @@
msgid "build a temporary index based on embedded index information"
msgstr "построить временный индекс, основанный на встроенной информации об индексе"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "пути, отделённые НУЛЕВЫМ символом"
@@ -663,7 +663,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "удостовериться, что по крайней мере <n> строк контекста совпадают"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "действие"
@@ -691,9 +693,9 @@
msgid "allow overlapping hunks"
msgstr "разрешить перекрывающиеся блоки изменений"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "быть многословнее"
@@ -705,7 +707,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "не доверять количеству строк из заголовка блока изменений"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "корень"
@@ -731,150 +733,150 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <репозиторий> [--exec <команда>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "спецификатор пути «%s» не соответствует ни одному файлу"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "формат"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "формат архива"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "префикс"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "добавлять префикс перед каждым путем файла в архиве"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "файл"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "запись архива в этот файл"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "читать .gitattributes в рабочем каталоге"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "отчет об архивированных файлах в stderr"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "только хранение"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "сжимать быстрее"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "сжимать лучше"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "перечислить поддерживаемые форматы архивов"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "репозиторий"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "получить архив из внешнего <репозитория>"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "команда"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "путь к команде git-upload-archive на машине с внешним репозиторием"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Неожиданная опция --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "Опция --exec может использоваться только вместе с --remote"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Неожиданная опция --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Неизвестный формат архива «%s»"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Аргумент не поддерживается для формата «%s»: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s не является допустимым именем атрибута"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
msgstr "Отрицающие шаблоны в атрибутах git игнорируются.\nИспользуйте «\\!» для буквального использования символа в значении «восклицательный знак»."
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Плохое содержимое файла «%s»: %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Невозможно продолжить бинарный поиск!\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "Недопустимое имя коммита %s"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
"This means the bug has been fixed between %s and [%s].\n"
msgstr "База слияния %s является плохим коммитом.\nЭто значит, что ошибка была исправлена где-то между %s и [%s].\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
"The property has changed between %s and [%s].\n"
msgstr "База слияния %s является новой.\nСвойство было изменено где-то между %s и [%s].\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
"This means the first '%s' commit is between %s and [%s].\n"
msgstr "База слияния %s является %s.\nЭто значит, что «%s» коммит находится где-то между %s и [%s].\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -882,7 +884,7 @@
"Maybe you mistook %s and %s revs?\n"
msgstr "Несколько %s коммитов не являются предками %s коммита.\nВ этом случае git bisect не может работать правильно.\nВозможно, вы перепутали редакции %s и %s местами?\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -890,43 +892,43 @@
"We continue anyway."
msgstr "База слияния между %s и [%s] должно быть пропущена.\nПоэтому мы не можем быть уверены, что первый %s коммит находится между %s и %s.\nНо все же продолжаем поиск."
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Бинарный поиск: база слияния должна быть проверена\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "нужно указать %s редакцию"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "не удалось создать файл «%s»"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "не удалось прочитать файл «%s»"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "сбой при чтении ссылок двоичного поиска"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s была одновременно и %s и %s\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
"Maybe you started with bad path parameters?\n"
msgstr "Тестируемый коммит не найден.\nВозможно, вы начали поиск с указанием неправильного параметра пути?\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -937,7 +939,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -958,10 +960,10 @@
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "при --reverse и --first-parent вместе нужно указывать конкретный последний коммит"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926
-#: builtin/merge.c:360 builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945
+#: builtin/merge.c:369 builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "сбой инициализации прохода по редакциям"
@@ -996,43 +998,43 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Ветка %s отслеживает внешнюю ветку %s из %s перемещением."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s» перемещением."
#: branch.c:94
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s."
-msgstr "Ветка %s отслеживает внешнюю ветку %s из %s."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s'."
+msgstr "Ветка «%s» отслеживает внешнюю ветку «%s» из «%s»."
#: branch.c:98
#, c-format
-msgid "Branch %s set up to track local branch %s by rebasing."
-msgstr "Ветка %s отслеживает локальную ветку %s перемещением."
+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 "Branch '%s' set up to track local branch '%s'."
+msgstr "Ветка «%s» отслеживает локальную ветку «%s»."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Ветка %s отслеживает внешнюю ссылку %s перемещением."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s» перемещением."
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "Ветка %s отслеживает внешнюю ссылку %s."
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "Ветка «%s» отслеживает внешнюю ссылку «%s»."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "Ветка %s отслеживает локальную ссылку %s перемещением."
+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."
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "Ветка «%s» отслеживает локальную ссылку «%s»."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1043,32 +1045,32 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Не отслеживается: неоднозначная информация для ссылки %s"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "«%s» не является действительным именем ветки."
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Ветка с именем «%s» уже существует."
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Не удалось принудительно обновить текущую ветку."
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid ""
"Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "Не удалось настроить информацию отслеживания; стартовая точка «%s» не является веткой."
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "запрошенная ветка вышестоящего репозитория «%s» не существует"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1080,27 +1082,27 @@
"\"git push -u\" to set the upstream config as you push."
msgstr "\nЕсли вы планируете основывать свою работу на вышестоящей ветке, которая уже существует во внешнем репозитории, вам может потребоваться запустить «git fetch» для ее получения.\n\nЕсли вы планируете отправить новую локальную ветку, которая будет отслеживаться, во внешний репозиторий, вам может потребоваться запустить «git push -u» — чтобы сохранить настройку вышестоящего репозитория для отправки."
-#: branch.c:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Недопустимое имя объекта: «%s»."
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Неоднозначное имя объекта: «%s»."
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Недопустимая точка ветки: «%s»."
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "«%s» уже находится на «%s»"
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD рабочего каталога %s не обновлён"
@@ -1115,7 +1117,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "неопознанный заголовок: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "не удалось открыть «%s»"
@@ -1124,7 +1127,7 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "В репозитории отсутствуют необходимые коммиты:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
@@ -1133,11 +1136,11 @@
msgstr[2] "Пакет содержит эти %d ссылок:"
msgstr[3] "Пакет содержит эти %d ссылок:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Пакет содержит полную историю."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
@@ -1146,38 +1149,38 @@
msgstr[2] "Пакет требует эти %d ссылок:"
msgstr[3] "Пакет требует эти %d ссылок:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Не удалось создать объекты пакета"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "критическая ошибка pack-objects"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "критическая ошибка rev-list"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "ссылка «%s» исключена в соответствии с опциями rev-list"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "неопознанный аргумент: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Отклонение создания пустого пакета."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "не удалось создать «%s»"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "критическая ошибка index-pack"
@@ -1186,8 +1189,8 @@
msgid "invalid color value: %.*s"
msgstr "недопустимое значение цвета: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "не удалось разобрать %s"
@@ -1197,14 +1200,14 @@
msgid "%s %s is not a commit!"
msgstr "%s %s не является коммитом!"
-#: commit.c:1511
+#: commit.c:1524
msgid ""
"Warning: commit message did not conform to UTF-8.\n"
"You may want to amend it after fixing the message, or set the config\n"
"variable i18n.commitencoding to the encoding your project uses.\n"
msgstr "Предупреждение: сообщение коммита не соответствует UTF-8.\nВозможно, вы захотите исправить его после исправления сообщения\nили настроить опцию i18n.commitencoding и указать кодировку\nсообщений, которую использует ваш проект.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "память исчерпана"
@@ -1290,79 +1293,84 @@
msgid "failed to expand user dir in: '%s'"
msgstr "сбой разворачивания пути каталога пользователя: «%s»"
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "«%s» для «%s» не является допустимой меткой даты/времени"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "неправильный уровень сжатия zlib %d"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "недопустимый режим создания объекта: %s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "неправильный уровень сжатия пакета %d"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr "не удалось разобрать конфигурацию из командной строки"
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr "произошла неизвестная ошибка при чтении файлов конфигурации"
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Недействительный %s: «%s»"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "неизвестное значение «%s» для core.untrackedCache; использую стандартное значение «keep»"
-#: config.c:2111
+#: config.c:2162
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "значение «%d» для splitIndex.maxPercentChange должно быть от 0 до 100"
-#: config.c:2122
+#: config.c:2187
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "не удалось разобрать «%s» в конфигурации из командной строки"
-#: config.c:2124
+#: config.c:2189
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "неправильная переменная конфигурации «%s» в файле «%s» на строке %d"
-#: config.c:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s имеет несколько значений"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "сбой при выполнении fstat на файле %s"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "не удалось установить «%s» в «%s»"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "не удалось сбросить значение для «%s»"
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "Внешний сервер отсоединился до начала сеанса связи"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1370,19 +1378,19 @@
"and the repository exists."
msgstr "Не удалось прочитать из внешнего репозитория.\n\nУдостоверьтесь, что у вас есть необходимые права доступа\nи репозиторий существует."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Проверка соединения"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Не удалось запустить «git rev-list»"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "сбой записи в rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "сбой закрытия стандартного ввода у rev-list"
@@ -1391,7 +1399,7 @@
msgid ""
"CRLF will be replaced by LF in %s.\n"
"The file will have its original line endings in your working directory."
-msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии."
+msgstr "CRLF будет заменен на LF в %s.\nФайл будет иметь свои оригинальные концы строк в вашей рабочей копии."
#: convert.c:209
#, c-format
@@ -1403,7 +1411,7 @@
msgid ""
"LF will be replaced by CRLF in %s.\n"
"The file will have its original line endings in your working directory."
-msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в рашей рабочей копии."
+msgstr "LF будет заменен на CRLF в %s.\nФайл будет иметь свои оригинальные концы строк в вашей рабочей копии."
#: convert.c:219
#, c-format
@@ -1501,277 +1509,292 @@
msgid "failed to read orderfile '%s'"
msgstr "сбой чтения orderfile «%s»"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "Выполняется неточное определение переименования"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "параметр «%s» требует указания значения"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Сбой разбора величины среза (cut-off) у dirstat «%s»\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr "Неизвестный параметр dirstat: «%s»\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra',"
+" 'plain'"
+msgstr "значение настройки цвета для перемещённых строк должно быть одно из «no» «default», «zebra», «dimmed_zebra», «plain»"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Неизвестное значения для переменной «diff.submodule»: «%s»"
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
"%s"
msgstr "Найдены ошибки в переменной «diff.dirstat»:\n%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "критическая ошибка при внешнем сравнении, останов на %s"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, --check и -s нельзя использовать одновременно"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow требует ровно одного спецификатора пути"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
"%s"
msgstr "Сбой разбора параметра опции --dirstat/-X :\n%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Сбой разбора параметра опции --submodule: «%s»"
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr "неточное определение переименования было пропущено из-за слишком большого количества файлов."
-#: diff.c:4719
+#: diff.c:5449
msgid "only found copies from modified paths due to too many files."
msgstr "найдены только копии из измененных путей из-за слишком большого количества файлов."
-#: diff.c:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "возможно вы захотите установить переменную %s в как минимум значение %d и повторить вызов команды."
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "не удалось получить имя ядра и информацию"
-#: dir.c:2067
+#: dir.c:2219
msgid "Untracked cache is disabled on this system or location."
msgstr "Кэш неотслеживаемых файлов отключен на этой системе или в этом месте."
-#: dir.c:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "не удалось создать каталоги для %s"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "не удалось переместить каталог git с «%s» в «%s»"
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "подсказка: Ожидание, пока вы закроете редактор с файлом…%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Фильтруется содержимое"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "не удалось выполнить stat для файла «%s»"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: ожидается передача списка для получение части"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack: ожидается ACK/NAK, а получено EOF"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "ошибка внешнего репозитория: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack: ожидается ACK/NAK, а получено «%s»"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc требует multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "неправильная строка частичного получения: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "неправильная строка полного получения: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "объект не найден: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "ошибка в объекте: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "частичный клон не найден: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "ожидалось shallow/unshallow, а получено %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "получено %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "недопустимый коммит %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "останавливаю дальнейшие попытки"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "готово"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "получено %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Помечаю %s как завершенный"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "уже есть %s (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: не удалось запустить программу разбора данных"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "ошибка протокола: неправильный заголовок потока"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: не удалось запустить программу %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "%s завершен с ошибкой"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "произошла ошибка в программе разбора данных"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "Сервер не поддерживает клиентов с частичным клонированием"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "Сервер поддерживает multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "Сервер поддерживает no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "Сервер поддерживает multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "Сервер поддерживает side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "Сервер поддерживает side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Сервер поддерживает allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Сервер поддерживает allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "Сервер поддерживает ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "Версия сервера %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "Сервер не поддерживает --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Сервер не поддерживает --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "Сервер не поддерживает --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "не общих коммитов"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: ошибка при получении данных."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "нет соотвествующего внешнего указателя на ветку"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "нет такой внешней ссылки %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "Сервер не поддерживает запрос необъявленного объекта %s"
@@ -1784,7 +1807,7 @@
msgid "could not create temporary file"
msgstr "не удалось создать временный файл"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "сбой записи отсоединенной подписи в «%s»"
@@ -1794,17 +1817,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "игнорирую недопустимый цвет «%.*s» в log.graphColors"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "«%s»: не удалось прочесть %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "не удалось выполнить stat «%s»"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "«%s»: слишком мало данных прочитано"
@@ -1869,12 +1892,12 @@
msgid "git version [<options>]"
msgstr "git version [<options>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s — %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -1929,12 +1952,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "имя состоит только из неразрешенных симоволов: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "неправильный формат даты: %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "невозможно использовать фильтр по нескольким типам объектов"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "недопустимое выражение спецификатора фильтра «%s»"
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -1946,246 +1978,251 @@
"remove the file manually to continue."
msgstr "Не удалось создать «%s.lock»: %s.\n\nПохоже, что другой процесс git запущен в этом репозитории,\nнапример редактор открыт из «git commit». Пожалуйста, убедитесь,\nчто все процессы были завершены и потом попробуйте снова.\nЕсли это не поможет, то возможно процесс git был ранее завершен\nс ошибкой в этом репозитории: \nудалите файл вручную для продолжения."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Не удалось создать «%s.lock»: %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "сбой чтения кэша"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "не удалось записать новый файл индекса"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(плохой коммит)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "сбой addinfo_cache для пути «%s»"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "ошибка при построении деревьев"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "не удалось создать путь «%s»%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "Удаление %s, чтобы освободить место для подкаталогов\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": возможно, конфликт каталогов/файлов?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "отказ потери неотслеживаемого файла в «%s»"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "невозможно прочитать объект %s «%s»"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "ожидается двоичный объект для %s «%s»"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "не удалось открыть «%s»: %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "не удалось создать символьную ссылку «%s»: %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "не понятно, что делать с %06o %s «%s»"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Не удалось запустить внутреннее слияние"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "Не удалось добавить %s в базу данных"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве."
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
"in tree at %s."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и %s в %s. Версия %s из %s оставлена в дереве на %s."
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
"left in tree at %s."
msgstr "КОНФЛИКТ (%s/удаление): %s удалено в %s и от %s до %s в %s. Версия %s из %s оставлена в дереве на %s."
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "переименование"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "переименовано"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s — это каталог в %s, добавляем как %s вместо этого"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename "
"\"%s\"->\"%s\" in \"%s\"%s"
msgstr "КОНФЛИКТ (переименование/переименование): Переименование «%s»→«%s» в ветке «%s» и переименование «%s»→«%s» в ветке «%s»%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (оставлено неразрешенным)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Переименовываю %s в %s и %s в %s вместо этого"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "КОНФЛИКТ (переименование/добавление): Переименование «%s»→«%s» в ветке «%s» и добавление «%s» в ветке «%s»"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Добавление слитого %s"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Добавление вместо этого как %s"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "невозможно прочитать объект «%s»"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "объект %s не является двоичным объектом"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "изменение"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "изменено"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "содержимое"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "добавление/добавление"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Пропуск %s (слиты одинаковые изменения как существующие)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Автослияние %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "подмодуль"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "КОНФЛИКТ (%s): Конфликт слияния в %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Удаление %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "файл/каталог"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "каталог/файл"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "Добавление %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Индекс не пустой: не могу слить (в индексе: %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "Уже обновлено!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "сбой слияния деревьев «%s» и «%s»"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Слияние:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
@@ -2194,27 +2231,27 @@
msgstr[2] "найдено %u общих предков:"
msgstr[3] "найдено %u общих предков:"
-#: merge-recursive.c:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "слияние не вернуло коммит"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Не удалось разобрать объект «%s»"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Не удается записать индекс."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
"Please, use 'git notes merge --commit' or 'git notes merge --abort' to commit/abort the previous merge before you start a new notes merge."
msgstr "Вы не закончили предыдущее слияние заметок (%s существует).\nЗапустите «git notes merge --commit» или «git notes merge --abort» для коммита или отмены предыдущего слияния и запуска нового слияния заметок."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Вы не закончили предыдущее слияние заметок (%s существует)."
@@ -2241,33 +2278,47 @@
msgid "Bad %s value: '%s'"
msgstr "Неправильное значение переменной %s: «%s»"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "не удалось разобрать объект: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
+
#: parse-options.c:573
msgid "..."
msgstr "…"
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "использование: %s"
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " или: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-КОЛИЧЕСТВО"
@@ -2276,7 +2327,7 @@
msgid "malformed object name '%s'"
msgstr "Неправильное имя объекта «%s»"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Не удалось предоставить доступ к %s на запись"
@@ -2347,80 +2398,75 @@
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s: магические слова в спецификаторе пути не поддерживаются командой: %s"
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please"
-" use . instead if you meant to match all paths"
-msgstr "пустые строки как спецификаторы пути будут сделаны недопустимыми в следующих версиях. используйте вместо них «.», что значит соотвествие всем путям"
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "спецификатор пути «%s» находится за символической ссылкой"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "не удалось разобрать формат для --pretty"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
"Using version %i"
msgstr "index.version указан, но значение недействительное.\nИспользую версию %i"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
"Using version %i"
msgstr "GIT_INDEX_VERSION указан, но значение недействительное.\nИспользую версию %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "не удалось закрыть «%s»"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "не удалось выполнить stat для «%s»"
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "не удалось открыть каталог git: %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "не удалось отсоединить: %s"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Не удалось открыть «%s» для записи"
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr "обновление ссылок запрещено в изолированном окружении"
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "не удалось удалить ссылку %s: %s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "не удалось удалить ссылки: %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "не удалось удалить ссылки %s"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "не удалось удалить ссылку %s: %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "не удалось удалить ссылки: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "исчез"
@@ -2439,290 +2485,290 @@
msgid "ahead %d, behind %d"
msgstr "впереди %d, позади %d"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "ожидаемый формат: %%(color:<color>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "неопознанный цвет: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Ожидается целочисленное значение refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Ожидается целочисленное значение refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "неопознанный аргумент %%(%s): %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "параметр %%(body) не принимает аргументы"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "параметр %%(subject) не принимает аргументы"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "параметр %%(trailers) не принимает аргументы"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "неизвестный аргумент для %%(trailers): %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "положительное значение ожидает contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "неопознанный аргумент %%(contents): %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "ожидается положительное значение objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "неопознанный аргумент %%(objectname): %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "ожидаемый формат: %%(align:<width>,<position>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "неопознанная позиция:%s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "неопознанная ширина:%s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "неопознанный аргумент %%(align): %s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "ожидается положительная ширина с указанием частицы %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "неопознанный аргумент %%(if): %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "неправильное имя поля: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "неизвестное имя поля: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "формат: частица %%(if) использована без частицы %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "формат: частица %%(then) использована без частицы %%(if)"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "формат: частица %%(then) использована более одного раза"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "формат: частица %%(then) использована после %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "формат: частица %%(else) использована без частицы %%(if)"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "формат: частица %%(else) использована без частицы %%(then)"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "формат: частица %%(else) использована более одного раза"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "формат: частица %%(end) использована без соответствующей частицы"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "неправильная строка формата %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(нет ветки, перемещение %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(нет ветки, двоичный поиск начат на %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD отделён на %s)"
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD отделён начиная с %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(нет ветки)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "не найден объект %s для %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "сбой при выполнении parse_object_buffer на %s для %s"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "Повреждённый объект «%s»"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "игнорирую ссылку с неправильным именем %s"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "игнорирую неправильную ссылку %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: пропущена частица %%(end)"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "неправильное имя объекта %s"
-#: remote.c:747
+#: remote.c:780
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "Нельзя извлечь одновременно %s и %s в %s"
-#: remote.c:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s обычно отслеживает %s, а не %s"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s отслеживает и %s и %s"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "Внутренняя ошибка"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD не указывает на ветку"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "нет такой ветки: «%s»"
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "вышестоящая ветка не настроена для ветки «%s»"
-#: remote.c:1698
+#: remote.c:1729
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "вышестоящая ветка «%s» не сохранена как отслеживаемая ветка"
-#: remote.c:1713
+#: remote.c:1744
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "назначение для отправки «%s» на внешнем сервере «%s» не имеет локальной отслеживаемой ветки"
-#: remote.c:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "ветка «%s» не имеет внешнего сервера для отправки"
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "спецификаторы пути для отправки «%s» не включают в себя «%s»"
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "отправка не имеет точки назначения (push.default выставлен в «nothing»)"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr "не удалось выполнить «simple» отправку в единственную точку назначения"
-#: remote.c:2076
+#: remote.c:2106
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "Ваша ветка базируется на «%s», но вышестоящий репозиторий исчез.\n"
-#: remote.c:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr "(для исправления запустите «git branch --unset-upstream»)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "Ваша ветка обновлена в соответствии с «%s».\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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"
@@ -2731,11 +2777,11 @@
msgstr[2] "Ваша ветка опережает «%s» на %d коммитов.\n"
msgstr[3] "Ваша ветка опережает «%s» на %d коммитов.\n"
-#: remote.c:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " (используйте «git push», чтобы опубликовать ваши локальные коммиты)\n"
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2745,11 +2791,11 @@
msgstr[2] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
msgstr[3] "Ваша ветка отстает от «%s» на %d коммитов и может быть перемотана вперед.\n"
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " (используйте «git pull», чтобы обновить вашу локальную ветку)\n"
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2762,145 +2808,153 @@
msgstr[2] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
msgstr[3] "Ваша ветка и «%s» разделились\nи теперь имеют %d и %d разных коммитов в каждой соответственно.\n"
-#: remote.c:2117
+#: remote.c:2147
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " (используйте «git pull», чтобы слить внешнюю ветку в вашу)\n"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "похоже, ваша текущая ветка повреждена"
-#: revision.c:2190
+#: revision.c:2271
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "ваша текущая ветка «%s» еще не содержит ни одного коммита"
-#: revision.c:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "опцию --first-parent нельзя использовать одновременно с --bisect"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "сбой открытия /dev/null"
-#: send-pack.c:151
+#: run-command.c:1188
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr "Перехватчик «%s» был проигнорирован, так как он не установлен как исполняемый.\nВы можете отключить это предупреждение с помощью команды «git config advice.ignoredHook false»."
+
+#: send-pack.c:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "не удалось разобрать статус внешней распаковки: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "сбой при внешней распаковке %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "сбой подписания сертификата отправки"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "принимающая сторона не поддерживает отправку с опцией --signed"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support "
"--signed push"
msgstr "не отправляем сертификат для отправки, так как принимающая сторона не поддерживает отправку с опцией --signed"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "принимающая сторона не поддерживает отправку с опцией --atomic"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "принимающая сторона не поддерживает отправку с опциями"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "обратить изменения"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "копировать коммит"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Неизвестное действие: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
"and commit the result with 'git commit'"
msgstr "после разрешения конфликтов, пометьте исправленные пути\nс помощью «git add <пути>» или «git rm <пути>»\nи сделайте коммит с помощью «git commit»"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "не удалось заблокировать «%s»"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "не удалось записать в «%s»"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "не удалось записать eol в «%s»"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "не удалось завершить «%s»."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "не удалось прочитать «%s»"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "ваши локальные изменения будут перезаписаны %s."
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "для продолжения закоммитьте ваши изменения или спрячьте их."
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: перемотка вперед"
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Не удалось записать файл индекса"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "не удалось распознать HEAD коммит\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "не удалось распознать HEAD коммит"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "не удалось обновить дерево кэша\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "не удалось обновить дерево кэша"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -2917,17 +2971,17 @@
" git rebase --continue\n"
msgstr "у вас имеются проиндексированные изменения в рабочем каталоге. Если эти изменения должны быть объеденены с предыдущим коммитом, то запустите:\n\n git commit --amend %s\n\nЕсли же они должны быть помещены в новый коммит, то запустите:\n\n git commit %s\n\nВ любом случае, после того как вы закончите, продолжить перемещение можно выполнив:\n\n git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "не удалось разобрать коммит %s\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "не удалось разобрать родительский коммит %s\n"
+msgid "could not parse commit %s"
+msgstr "не удалось разобрать коммит %s"
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "не удалось разобрать родительский коммит %s"
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -2935,7 +2989,7 @@
"\t%.*s"
msgstr "неожиданная первая строка сообщения уплотнения:\n\n\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -2943,229 +2997,240 @@
"\t%.*s"
msgstr "недопустимая первая строка сообщения уплотнения:\n\n\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "Это объединение %d коммитов."
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "нужен HEAD для исправления"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "не удалось прочитать HEAD"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "не удалось прочитать сообщение коммита текущего HEAD"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "не удалось записать «%s»"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Это 1-е сообщение коммита:"
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "не удалось прочитать сообщение коммита для %s"
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "Это сообщение коммита номер #%d:"
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Сообщение коммита номер #%d будет пропущено:"
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "неизвестная команда: %d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "ваш индекс не слит."
-#: sequencer.c:973
+#: sequencer.c:986
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "коммит %s — это коммит-слияние, но опция -m не указана."
-#: sequencer.c:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "у коммита %s нет предка %d"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "основная ветка указана, но коммит %s не является слиянием."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: не удалось разобрать родительский коммит для %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "не удалось переименовать «%s» в «%s»"
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "не удалось обратить изменения коммита %s… %s"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "не удалось применить коммит %s… %s"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "передан пустой набор коммитов"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: сбой чтения индекса"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: сбой обновления индекса"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "параметр %s не принимает аргументы: «%s»"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "пропущены аргументы для %s"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "неправильная строка %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "нельзя выполнить «%s» без указания предыдущего коммита"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "не удалось прочитать «%s»."
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "пожалуйста исправьте это с помощью «git rebase --edit-todo»."
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "непригодная для использования карта с инструкциями: «%s»"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "коммиты не разобраны."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "нельзя скопировать коммит во время процесса обращения коммита."
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "нельзя обратить изменения коммита во время копирования коммита."
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "недействительный ключ: %s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "неправильное значение %s: %s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "испорченная карта с опциями: «%s»"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "копирование или обращение изменений коммита уже выполняются"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "попробуйте «git cherry-pick (--continue | --quit | --abort)»"
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "не удалось создать каталог для указателя следования коммитов «%s»"
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "не удалось заблокировать HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "копирование или обращение изменений коммита уже выполняются"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "не удалось определить HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr "нельзя отменить изменения с ветки, которая еще не создана"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "не удалось открыть «%s»"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "не удалось прочитать «%s»: %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "неожиданный конец файла"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "сохраненный файл с HEAD перед копированием коммита «%s» поврежден"
-#: sequencer.c:1658
+#: sequencer.c:1691
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "Похоже, что вы переместили HEAD. Перемотка не выполняется, проверьте свой указатель HEAD!"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "не удалось прочитать HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "не удалось скопировать «%s» в «%s»"
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "не удалось прочитать индекс"
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3175,11 +3240,11 @@
"\n"
msgstr "ошибка выполнения: %s\n%sВы можете исправить ошибку, а затем запустить\n\n git rebase --continue\n\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
msgid "and made changes to the index and/or the working tree\n"
msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге\n"
-#: sequencer.c:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3190,17 +3255,17 @@
"\n"
msgstr "успешное выполнение: %s\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n git rebase --continue\n\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Применены автоматически спрятанные изменения.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "не удалось сохранить %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3208,81 +3273,139 @@
"You can run \"git stash pop\" or \"git stash drop\" at any time.\n"
msgstr "Применение автоматически спрятанных изменений вызвало конфликты.\nВаши изменения спрятаны и в безопасности.\nВы можете выполнить «git stash pop» или «git stash drop» в любой момент.\n"
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Остановлено на %s … %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "неизвестная команда %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "не удалось прочитать orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "не удалось прочитать «onto»"
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "не удалось обновить %s"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "не удалось обновить HEAD на %s"
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "не удалось выполнить перемещение коммитов: У вас есть непроиндексированные изменения."
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "не удалось удалить CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "не удалось исправить несуществующий коммит"
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "недопустимый файл: «%s»"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "недопустимое содержимое: «%s»"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
"first and then run 'git rebase --continue' again."
msgstr "\nУ вас имеются незакоммиченные изменения в рабочем каталоге. Сделайте коммит, а затем запустите «git rebase --continue» снова."
-#: sequencer.c:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "не удалось закоммитить проиндексированные изменения."
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: не удалось скопировать коммит %s"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: плохая редакция"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "нельзя возвратить изначальный коммит"
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: не обработанные опции"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: ошибка при обновлении редакций"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "непригодный для использования список дел: «%s»"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "нераспознанная настройка %s для опции rebase.missingCommitsCheck. Игнорирую."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):\n"
+
+#: sequencer.c:2702
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error.\n\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue».\nИли вы можете прервать процесс перемещения, выполнив «git rebase --abort»\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "не удалось открыть «%s» для записи"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "не удалось разобрать коммит «%s»"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "сценарий уже был перестроен."
+
#: setup.c:171
#, c-format
msgid ""
@@ -3306,96 +3429,82 @@
"'git <command> [<revision>...] -- [<file>...]'"
msgstr "неоднозначный аргумент «%s»: является одновременно и редакцией и именем файла.\nИспользуйте «--» для отделения путей от редакций, вот так:\n«git <команда> [<редакция>…] -- [<файл>…]»"
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Ожидаемая версия git репозитория <= %d, а обнаружена %d"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "обнаружены неизвестные расширения репозитория:"
-#: setup.c:810
+#: setup.c:811
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "Не найден git репозитоий (или один из его каталогов): %s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Не удалось вернуться в текущий рабочий каталог"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "Не удалось прочитать текущий рабочий каталог"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "Не удалось изменить на «%s»"
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
"Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set)."
msgstr "Не найден git репозитоий (или один из его каталогов вплоть до точки монтирования %s)\nОстанавливаю поиск на границе файловой системы (так как GIT_DISCOVERY_ACROSS_FILESYSTEM не установлен)."
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
"The owner of files must always have read and write permissions."
msgstr "Проблема со значением режима доступа к файлу core.sharedRepository (0%.3o).\nВладелец файлов должен всегда иметь права на чтение и на запись."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "путь «%s» не существует"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "ссылаемый репозиторий «%s» как связанное состояние, пока не поддерживается."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "ссылаемый репозиторий «%s» не является локальным."
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "ссылаемый репозиторий «%s» является частичным"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "ссылаемый репозиторий «%s» является сращенным"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "сдвиг до конца файла пакета (возможно, повреждён файл .idx?)"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "сдвиг до начала индекса пакета для %s (повреждён индекс?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "сдвиг за пределами индекса пакета для %s (обрезан индекс?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "сокращённый SHA1 идентификатор %s неоднозначен"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "Возможно, вы имели в виду:"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3408,81 +3517,86 @@
"running \"git config advice.objectNameWarning false\""
msgstr "Обычно Git не создает ссылки, оканчивающиеся на 40 шестнадцатеричных\nсимволов, потому, что они будут игнорироваться, когда вы просто\nукажете это 40-символьное шестнадцатеричное число. Такие ссылки\nмогли быть созданы по ошибке. Например, с помощью:\n\n git checkout -b $br $(git rev-parse …)\n\n, если «$br» оказался пустым, то ссылка с 40-символьным\nшестнадцатеричным числом будет создана. Пожалуйста, просмотрите эти\nссылки и, возможно, удалите их. Вы можете отключить это сообщение\nзапустив «git config advice.objectNameWarning false»"
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "Не удалось изменить не слитый .gitmodules, сначала разрешите конфликты"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "Не удалось найти раздел в .gitmodules, где путь равен %s"
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr " Не удалось обновить .gitmodules запись %s"
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Не удалось удалить запись в .gitmodules для %s"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "сбой индексирования обновленного .gitmodules"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "нельзя использовать отприцательные значения для submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "в пустом подмодуле «%s»"
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Спецификатор пути «%s» в подмодуле «%.*s»"
-#: submodule.c:1337
+#: submodule.c:833
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "запись подмодуля «%s» (%s) является %s, а не является коммитом"
+
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Не удалось определить HEAD как действительную ссылку."
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "«%s» не распознан как репозиторий git"
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "не удалось запустить «git status» в подмодуле «%s»"
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "не удалось запустить «git status» в подмодуле «%s»"
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "подмодуль «%s» имеет изменённый индекс"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "relocate_gitdir для подмодуля «%s» с указанием более одного рабочего дерева не поддерживается"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "не удалось запросить имя подмодуля «%s»"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "не удалось создать каталог «%s»"
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3490,79 +3604,83 @@
"'%s'\n"
msgstr "Перемещение каталога git для «%s%s» из\n«%s» в\n«%s»\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "не удалось рекурсивно зайти в подмодуль «%s»"
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "не удалось выполнить stat ls-files в .."
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "ОШИБКА: возвращенная строка не соответсвует cwd?"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree вернул неожиданный код %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "нельзя использовать отрицательные значения для submodule.fetchjobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "неправильное значение %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "сбой при запуске команды завершителя «%s»"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "неизвестное значение «%s» для ключа «%s»"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "больше одного %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "пустая последняя лексема в завершителе «%.*s»"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "не удалось прочитать входной файл «%s»"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "не удалось прочитать из стандартного ввода"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "не удалось выполнить stat для %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "файл %s не является обычным файлом"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "файл %s не доступен на запись пользователю"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "не удалось создать временный файл"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "не удалось переименовать временный файл в %s"
@@ -3577,14 +3695,14 @@
msgid "transport: invalid depth option '%s'"
msgstr "транспорт: неправильный параметр глубины «%s»"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "Подмодули по указанным путям содержат изменения, которые не найдены ни на одном из внешних репозиториев:\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3600,11 +3718,11 @@
"\n"
msgstr "\nПопробуйте выполнить\n\n\tgit push --recurse-submodules=on-demand\n\nили перейти в каталог с помощью команды cd и выполнить\n\n\tgit push\n\nдля их отправки на внешний репозиторий.\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "Прерываю."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "Не удалось прочитать ссылку %s"
@@ -3621,187 +3739,182 @@
msgid "empty filename in tree entry"
msgstr "пустое имя файла в записи дерева"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "слишком короткий файл дерева"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%sPlease commit your changes or stash them before you switch branches."
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%sСделайте коммит или спрячьте ваши изменения перед переключением веток."
-#: unpack-trees.c:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
"%%s"
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при переключении на состояние:\n%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%sPlease commit your changes or stash them before you merge."
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%sСделайте коммит или спрячьте ваши изменения перед слиянием веток."
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
"%%s"
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при слиянии:\n%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%sPlease commit your changes or stash them before you %s."
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%sСделайте коммит или спрячьте ваши изменения перед %s."
-#: unpack-trees.c:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
"%%s"
msgstr "Ваши локальные изменения в указанных файлах будут перезаписаны при %s:\n%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
"%s"
msgstr "Обновление указанных каталогов приведет к потере неотслеживаемых файлов в них:\n%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при переключении на состояние:\n%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при слиянии:\n%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%sПереместите эти файлы или удалите их перед %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут удалены при %s:\n%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by checkout:\n"
"%%sPlease move or remove them before you switch branches."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by checkout:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при переключении на состояние:\n%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%sPlease move or remove them before you merge."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%sПереместите эти файлы или удалите их перед переключением веток."
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при слиянии:\n%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%sPlease move or remove them before you %s."
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%sПереместите эти файлы или удалите их перед %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
"%%s"
msgstr "Указанные неотслеживаемые файлы в рабочем каталоге будут перезаписаны при %s:\n%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Запись «%s» частично совпадает с «%s». Не удалось назначить соответствие."
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr "Не удалось обновить частичное состояние: следующие элементы не последней версии:\n%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout update:\n"
"%s"
msgstr "Указанные файлы из рабочего каталога будут перезаписаны при обновлении частичного состояния:\n%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout update:\n"
"%s"
msgstr "Указанные файлы из рабочего каталога будут удалены при обновлении частичного состояния:\n%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
"%s"
msgstr "Не удолось обновить подмодуль:\n%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "Прерываю\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "стратегия обновления подмодуля не поддерживается подмодулем «%s»"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "Распаковка файлов"
@@ -3844,13 +3957,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "не удалось открыть «%s» для чтения и записи"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "не удалось открыть «%s» для записи"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "не удалось открыть «%s» для чтения"
@@ -3864,145 +3972,135 @@
msgid "unable to get current working directory"
msgstr "не удалось получить текущий рабочий каталог"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "не удалось записать в %s"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "не удалось закрыть %s"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Не слитые пути:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (используйте «git reset %s <файл>…», чтобы убрать из индекса)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (используйте «git rm --cached <файл>…», чтобы убрать из индекса)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (используйте «git add <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (используйте «git add/rm <файл>…», чтобы пометить выбранное разрешение конфликта)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (используйте «git rm <файл>…», чтобы пометить разрешение конфликта)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "Изменения, которые будут включены в коммит:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "Изменения, которые не в индексе для коммита:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (используйте «git add <файл>…», чтобы добавить файл в индекс)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " (используйте «git add/rm <файл>…», чтобы добавить или удалить файл из индекса)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working "
"directory)"
msgstr " (используйте «git checkout -- <файл>…», чтобы отменить изменения\n в рабочем каталоге)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " (сделайте коммит или отмените изменения в неотслеживаемом или измененном содержимом в подмодулях)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " (используйте «git %s <файл>…», чтобы добавить в то, что будет включено в коммит)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "оба удалены:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "добавлено нами:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "удалено ими:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "добавлено ими:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "удалено нами:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "оба добавлены:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "оба изменены:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "новый файл:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "скопировано:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "удалено:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "изменено:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "переименовано:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "изменен тип:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "неизвестно:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "не слитые:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "новые коммиты, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "изменено содержимое, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "неотслеживаемое содержимое, "
-#: wt-status.c:821
+#: wt-status.c:824
#, c-format
msgid "Your stash currently has %d entry"
msgid_plural "Your stash currently has %d entries"
@@ -4011,69 +4109,69 @@
msgstr[2] "У вас сейчас спрятано %d записей"
msgstr[3] "У вас сейчас спрятаны %d записи"
-#: wt-status.c:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "Измененные, но не обновленные подмодули:"
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "Изменения в подмодулях, которые будут закоммичены:"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
-msgstr "Не трогайте строку выше этой.\nВсё, что ниже — будет удалено."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
+msgstr "Не изменяйте или удаляйте строку выше этой.\nВсё, что ниже — будет проигнорировано."
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "У вас есть не слитые пути."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (разрешите конфликты, затем запустите «git commit»)"
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (используйте «git merge --abort», чтобы остановить операцию слияния)"
-#: wt-status.c:1059
+#: wt-status.c:1063
msgid "All conflicts fixed but you are still merging."
msgstr "Все конфликты исправлены, но вы все еще в процессе слияния."
-#: wt-status.c:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " (используйте «git commit», чтобы завершить слияние)"
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr "Вы в процессе сессии am."
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "Текущий патч пустой."
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (разрешите конфликты, затем запустите «git am --continue»)"
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (используйте «git am --skip», чтобы пропустить этот патч)"
-#: wt-status.c:1083
+#: wt-status.c:1087
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " (используйте «git am --abort», чтобы восстановить оригинальную ветку)"
-#: wt-status.c:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo отсутствует."
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "Команды не выполнены."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
@@ -4082,16 +4180,16 @@
msgstr[2] "Последняя команда выполнена (%d команд выполнено):"
msgstr[3] "Последняя команда выполнена (%d команд выполнено):"
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " (смотрите дополнительно в файле %s)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "Команд больше не осталось."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -4100,154 +4198,154 @@
msgstr[2] "Следующая команда для выполнения (%d команд осталось):"
msgstr[3] "Следующая команда для выполнения (%d команд осталось):"
-#: wt-status.c:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " (используйте «git rebase --edit-todo», чтобы просмотреть и изменить)"
-#: wt-status.c:1259
+#: wt-status.c:1264
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "Вы сейчас перемещаете ветку «%s» над «%s»."
-#: wt-status.c:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "Вы сейчас перемещаете ветку."
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (разрешите конфликты, затем запустите «git rebase --continue»)"
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (используйте «git rebase --skip», чтобы пропустить этот патч)"
-#: wt-status.c:1282
+#: wt-status.c:1287
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " (используйте «git rebase --abort», чтобы перейти на оригинальную ветку)"
-#: wt-status.c:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (все конфликты разрешены: запустите «git rebase --continue»)"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "Вы сейчас разделяете коммит при перемещении ветки «%s» над «%s»."
-#: wt-status.c:1297
+#: wt-status.c:1302
msgid "You are currently splitting a commit during a rebase."
msgstr "Вы сейчас разделяете коммит при перемещении ветки."
-#: wt-status.c:1300
+#: wt-status.c:1305
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr "(Как только ваш рабочий каталог будет чистый, запустите «git rebase --continue»)"
-#: wt-status.c:1304
+#: wt-status.c:1309
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "Вы сейчас редактируете коммит при перемещении ветки «%s» над «%s»."
-#: wt-status.c:1309
+#: wt-status.c:1314
msgid "You are currently editing a commit during a rebase."
msgstr "Вы сейчас редактируете коммит при перемещении ветки."
-#: wt-status.c:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " (используйте «git commit --amend», чтобы исправить текущий коммит)"
-#: wt-status.c:1314
+#: wt-status.c:1319
msgid " (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " (используйте «git rebase --continue», когда будете довольны изменениями)"
-#: wt-status.c:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "Вы копируете коммит %s."
-#: wt-status.c:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (разрешите конфликты, затем запустите «git cherry-pick --continue»)"
-#: wt-status.c:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (все конфликты разрешены: запустите «git cherry-pick --continue»)"
-#: wt-status.c:1334
+#: wt-status.c:1339
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " (используйте «git cherry-pick --abort», чтобы отменить копирования коммита)"
-#: wt-status.c:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Вы сейчас обращаете изменения коммита %s."
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (разрешите конфликты, затем запустите «git revert --continue»)"
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (все конфликты разрешены: запустите «git revert --continue»)"
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (используйте «git revert --abort», чтобы отменить операцию обращения изменений коммита)"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "Вы сейчас в процессе двоичного поиска, начатого с ветки «%s»."
-#: wt-status.c:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "Вы сейчас в процессе двоичного поиска."
-#: wt-status.c:1371
+#: wt-status.c:1376
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " (используйте «git bisect reset», чтобы вернуться на исходную ветку)"
-#: wt-status.c:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "На ветке "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "интерактивное перемещение в процессе; над "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "перемещение в процессе; над "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "HEAD отделён на "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "HEAD отделён начиная с "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "Сейчас ни на одной из веток"
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "Начальный коммит"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "Еще нет коммитов"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "Неотслеживаемые файлы"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "Игнорируемые файлы"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4255,93 +4353,93 @@
"new files yourself (see 'git help status')."
msgstr "%.2f секунды занял вывод списка неотслеживаемых файлов. «status -uno» возможно может ускорить это, но будьте внимательны, и не забудьте добавить новые файлы вручную (смотрите «git help status» для подробностей)."
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "Неотслеживаемые файлы не показаны%s"
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr "(используйте опцию «-u», чтобы показать неотслеживаемые файлы)"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "Нет изменений"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, c-format
msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n"
msgstr "нет изменений добавленных для коммита\n(используйте «git add» и/или «git commit -a»)\n"
-#: wt-status.c:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "нет изменений добавленных для коммита\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы (используйте «git add», чтобы отслеживать их)\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "ничего не добавлено в коммит, но есть неотслеживаемые файлы\n"
-#: wt-status.c:1658
+#: wt-status.c:1663
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "нечего коммитить (создайте/скопируйте файлы, затем запустите «git add», чтобы отслеживать их)\n"
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "нечего коммитить\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "нечего коммитить (используйте опцию «-u», чтобы показать неотслеживаемые файлы)\n"
-#: wt-status.c:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "нечего коммитить, нет изменений в рабочем каталоге\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "Еще нет коммитов в"
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (нет ветки)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "позади"
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "впереди "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "не удалось выполнить %s: У вас есть непроиндексированные изменения."
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "к тому же, в вашем индексе есть незакоммиченные изменения."
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "не удалось выполнить %s: В вашем индексе есть незакоммиченные изменения."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "сбой отсоединения «%s»"
@@ -4350,122 +4448,126 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<опции>] [--] <спецификатор-пути>…"
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "неожиданный статус различий %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "сбой при обновлении файлов"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "удалить «%s»\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr "Непроиндексированные изменения после обновления индекса:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Не удалось прочитать индекс"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Не удалось открыть «%s» для записи."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "Не удалось записать патч"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "сбой при редактировании патча"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "Не удалось выполнить stat для «%s»"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "Пустой патч. Операция прервана."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "Не удалось применить «%s»"
-#: builtin/add.c:249
+#: builtin/add.c:271
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "Следующие пути игнорируются одним из ваших файлов .gitignore:\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "пробный запуск"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "интерактивный выбор"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "интерактивный выбор блоков"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "отредактировать текущий файл различий и применить его"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "разрешить добавление игнорируемых иначе файлов"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "обновить отслеживаемые файлы"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "перенормализировать концы строк (EOL) отслеживаемых файлов (подразумевает -u)"
+
+#: builtin/add.c:300
msgid "record only the fact that the path will be added later"
msgstr "записать только факт, что путь будет добавлен позже"
-#: builtin/add.c:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr "добавить изменения из всех отслеживаемых и неотслеживаемых файлов"
-#: builtin/add.c:281
+#: builtin/add.c:304
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "игнорировать пути удаленные из рабочего каталога (тоже, что и --no-all)"
-#: builtin/add.c:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "не добавлять, только обновить индекс"
-#: builtin/add.c:284
+#: builtin/add.c:307
msgid "just skip files which cannot be added because of errors"
msgstr "пропускать файлы, которые не могут быть добавлены из-за ошибок"
-#: builtin/add.c:285
+#: builtin/add.c:308
msgid "check if - even missing - files are ignored in dry run"
msgstr "удостовериться, что даже недостающие файлы будут проигнорированы при пробном запуске"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "переопределить бит выполнения на указанных файлах"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "предупреждать при добавлении встроенного git репозитория"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4483,399 +4585,399 @@
"See \"git help submodule\" for more information."
msgstr "Вы добавили другой репозиторий git внутри текущего репозитория\nКлоны внешнего репозитория не будут содержать внутренний\nрепозиторий и не будут знать как его получить.\nЕсли вы хотели добавить подмодуль, то запустите:\n\n\tgit submodule add <url> %s\n\nЕсли бы добавили этот путь по ошибке, то вы можете удалить его\nиз индекса с помощью:\n\n\tgit rm --cached %s\n\nДля дополнительной информации смотрите «git help submodule»."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "добавление встроенного git репозитория: %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Используйте -f, если вы действительно хотите добавить их.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "ошибка при добавлении файлов"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "-A и -u нельзя использовать одновременно"
-#: builtin/add.c:401
+#: builtin/add.c:424
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "Опция --ignore-missing может использоваться только вместе с --dry-run"
-#: builtin/add.c:405
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "параметр --chmod «%s» должен быть -x или +x"
-#: builtin/add.c:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Ничего не указано, ничего не добавлено.\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Возможно, вы имели в виду «git add .»?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "файл индекса поврежден"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "не удалось разобрать сценарий авторства"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "«%s» был удален перехватчиком applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Неправильная строка ввода: «%s»."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Не удалось скопировать заметку из «%s» в «%s»"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "сбой при выполнении fseek"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "не удалось разобрать патч «%s»"
-#: builtin/am.c:842
+#: builtin/am.c:855
msgid "Only one StGIT patch series can be applied at once"
msgstr "Только серия патчей StGIT может быть применена за раз"
-#: builtin/am.c:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "недопустимая метка даты/времени"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "недопустимая строка даты"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "недопустимое смещение часового пояса"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "Сбой определения формата патча."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "Не удалось разделить патчи на части."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "не удалось записать индекс"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Когда вы устраните эту проблему, запустите «%s --continue»."
-#: builtin/am.c:1172
+#: builtin/am.c:1161
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "Если вы хотите пропустить этот патч, то запустите «%s --skip»."
-#: builtin/am.c:1173
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "Чтобы вернуться на предыдущую ветку и остановить применение изменений, запустите «%s --abort»."
-#: builtin/am.c:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Патч пустой."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "неправильная строка идентификации: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "не удалось разобрать коммит %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "В репозитории отсутствуют двоичные объекты, необходимые для отката к трехходовому слиянию."
-#: builtin/am.c:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr "Использую индекс для реконструкции базового дерева…"
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
msgstr "Вы вручную изменяли патч?\nОн не накладывается без ошибок на двоичные объекты, записанные в его заголовке."
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "Откат к применению изменений к базовому коммиту с помощью трехходового слияния…"
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Не удалось слить изменения."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "git write-tree не удалось записать дерево"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "применение к пустой истории"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "сбой записи объекта коммита"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "нельзя продолжнить: %s не существует "
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "не удалось использовать интерактивное поведение, без stdin подключенного к терминалу."
-#: builtin/am.c:1740
+#: builtin/am.c:1704
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:1750
+#: builtin/am.c:1714
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "Применить? [y] - да/[n] - нет/[e] - редактировать/[v] - просмотреть патч/[a] - применить всё: "
-#: builtin/am.c:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Индекс не пустой: нельзя применять патчи (в индексе: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Применение: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "Нет изменений — Патч уже применен."
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Ошибка применения изменений на %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "Копию изменений, которые не удалось применить, вы можете найти в: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
"already introduced the same changes; you might want to skip this patch."
msgstr "Нет изменений — возможно, вы забыли вызвать «git add»?\nЕсли ничего не осталось для индексации, то, скорее всего, что-то другое уже сделало те же изменения; возможно, вам следует пропустить этот патч."
-#: builtin/am.c:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as such.\n"
"You might run `git rm` on a file to accept \"deleted by them\" for it."
msgstr "У вас есть не слитые пути в индексе.\nВы должны выполнить «git add» для каждого файла с разрешенными конфликтами, чтобы пометить их таковыми.\nВы можете запустить «git rm» с именем файла, чтобы пометить его как «удалено ими»."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "Не удалось разобрать объект «%s»."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "не удалось очистить индекс"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
msgstr "Похоже, что вы переместили HEAD с момента последней ошибки выполнения «am».\nПеремотка на ORIG_HEAD не выполняется"
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Неправильное значение для --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<опции>] [(<mbox> | <Maildir>)…]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<опции>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "запустить в интерактивном режиме"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "историческая опция — ничего не делает"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "разрешить откатиться к трехходовому слиянию, если нужно"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "тихий режим"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "добавить строку Signed-off-by к сообщению коммита"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "перекодировать в utf8 (по умолчанию)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "передать флаг -k в git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "передать флаг -b в git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "передать флаг -m в git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "передать флаг --keep-cr в git-mailsplit для формата mbox"
-#: builtin/am.c:2241
+#: builtin/am.c:2204
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "не передавать --keep-cr флаг в git-mailsplit вне зависимости от am.keepcr"
-#: builtin/am.c:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "обрезать все до строки обрезки"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "передать его в git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145
+#: builtin/pull.c:203 builtin/repack.c:189 builtin/repack.c:193
#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
+#: builtin/tag.c:377 parse-options.h:132 parse-options.h:134
#: parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "формат"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "формат, в котором находятся патчи"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "переопределить сообщение об ошибке, если не удалось наложить изменения"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "продолжить применение изменений после разрешения конфиликта"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "синоним для --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "пропустить текущий патч"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr "восстановить оригинальную ветку и отменить операцию применения изменений."
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "соврать о дате коммитера"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "использовать текущее время как время авторства"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "подписать коммиты с помощью GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(внутреннее использование для git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
msgid ""
"The -b/--binary option has been a no-op for long time, and\n"
"it will be removed. Please do not use it anymore."
msgstr "Опция -b/--binary уже долгое время ничего не делает и будет удалена с следующих версиях Git. Пожалуйста, не используйте ее."
-#: builtin/am.c:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "сбой чтения индекса"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "предыдущий каталог перемещения %s еще существует, но передан mbox."
-#: builtin/am.c:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
"Use \"git am --abort\" to remove it."
msgstr "Найден забытый каталог %s.\nИспользуйте «git am --abort», чтобы удалить его."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Операция разрешения конфликтов не в процессе выполнения, не продолжаем."
@@ -4913,18 +5015,69 @@
msgid "git archive: expected a flush"
msgstr "git archive: ожидался сброс буфера"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <плохое-определение> <хорошее-определение>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "«%s» не является допустимым определением"
+
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "нельзя использовать встроенную команду «%s» как определение"
+
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "нельзя изменить значение определения «%s»"
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr "используйте два разных определения"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "не удалось открыть файл BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "выполнить «git bisect next»"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "записать определения в .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "очистить состояние двоичного поиска"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "проверить ожидаемые редакции"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "обновить BISECT_HEAD вместо перехода на текущий коммит"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms требует указания двух параметров"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state не требует указания параметров"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<опции>] [<опции-редакции>] [<редакция>] [--] <файл>"
@@ -5078,124 +5231,149 @@
msgstr "git branch [<опции>] (-m | -M) [<старая-ветка>] <новая-ветка>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<опции>] (-c | -C) [<старая-ветка>] <новая-ветка>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<опции>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<опции>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
" '%s', but not yet merged to HEAD."
msgstr "удаление ветки «%s», которая была слита с\n «%s», но не слита с HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
" '%s', even though it is merged to HEAD."
msgstr "не удаление ветки «%s», которая еще не слита с\n «%s», хотя уже слита с HEAD."
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Не удалось найти объект коммита для «%s»"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
"If you are sure you want to delete it, run 'git branch -D %s'."
msgstr "Ветка «%s» не слита полностью.\nЕсли вы уверены, что хотите ее удалить, запустите «git branch -D %s»."
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Не удалось обновить файл конфигурации"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "нельзя использовать одновременно ключи -a и -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "Не удалось найти объект коммита для HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "Нельзя удалить ветку «%s» т.к. она активна на «%s»"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "внешняя отслеживаемая ветка «%s» не найдена."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "ветка «%s» не найдена."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Ошибка удаления внешней отслеживаемой ветки «%s»"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Ошибка удаления ветки «%s»"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "Внешняя отслеживаемая ветка %s удалена (была %s).\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Ветка %s удалена (была %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "не удалось разобрать строку формата"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Производится перемещение ветки %s на %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Производится двоичный поиск в ветке %s на %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+msgid "cannot copy the current branch while not on any."
+msgstr "невозможно скопировать текущую ветку, если вы не находитесь ни на одной из веток."
+
+#: builtin/branch.c:473
msgid "cannot rename the current branch while not on any."
msgstr "невозможно переименовать текущую ветку, если вы не находитесь ни на одной из них."
-#: builtin/branch.c:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Недействительное имя ветки: «%s»"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "Сбой переименования ветки"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Сбой копирования ветки"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Создана копия неправильно названной ветки «%s»"
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Переименована неправильно названная ветка «%s»"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "Ветка переименована в %s, но HEAD не обновлен!"
-#: builtin/branch.c:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr "Ветка переименована, но произошел сбой обновления файла конфигурации"
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Ветка скопирована, но произошел сбой обновления файла конфигурации"
+
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5203,226 +5381,221 @@
"Lines starting with '%c' will be stripped.\n"
msgstr "Измените описание для ветки:\n %s\nСтроки, начинающиеся с «%c» будут вырезаны.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "Общие параметры"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
msgid "show hash and subject, give twice for upstream branch"
msgstr "показывать хэш-сумму и тему, укажите дважды для вышестоящей ветки"
-#: builtin/branch.c:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "не выводить информационные сообщения"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "установить режим отслеживания вышестоящей ветки (см. git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "изменить информацию о вышестоящей ветке"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "не используйте"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "вышестоящая"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "изменить информацию о вышестоящей ветке"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "Убрать информацию о вышестоящей ветке"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "использовать цветной вывод"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "выполнить действия на отслеживаемых внешних ветках"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "вывод только веток, которые содержат коммит"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "вывод только веток, которые не содержат коммит"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "Специфичные для git-branch действия:"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "показать список и отслеживаемых и локальных веток"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "удалить полностью слитую ветку"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "удалить ветку (даже никуда не слитую)"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr "переместить/переименовать ветки и ее журнал ссылок"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr "переместить/переименовать ветку, даже если целевое имя уже существует"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "скопировать ветку и её журнал ссылок"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "скопировать ветку, даже если целевое имя уже существует"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "показать список имен веток"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "создать журнал ссылок ветки"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "изменить описание ветки"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "принудительное создание, перемещение или удаление ветки"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "вывод только слитых веток"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "вывод только не слитых веток"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "показать список веток по столбцам"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "ключ"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "имя поля, по которому выполнить сортировку"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "объект"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "вывод только веток, определенного объекта"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "сортировка и фильтрация не зависят от регистра"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "использовать формат для вывода"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Не удалось определить HEAD как действительную ссылку."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "HEAD не найден в refs/heads!"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "--column и --verbose нельзя использовать одновременно"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "требуется имя ветки"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "Нельзя дать описание отделённому HEAD"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "нельзя изменить описание более одной ветки за раз"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Еще нет коммита на ветке «%s»."
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "Нет ветки с именем «%s»."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "слишком много веток для операции переименования"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "слишком много веток для операции копирования"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "слишком много веток для указания новых вышестоящих"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "слишком много аргументов для операции переименования"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "слишком много аргументов для указания новой вышестоящей ветки"
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
msgstr "невозможно установить вышестоящий репозиторий для HEAD на %s, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "нет такой ветки «%s»"
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "ветка «%s» не существует"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "слишком много веток для убирания вышестоящих"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "слишком много аргументов для сброса указания вышестоящей ветки"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "невозможно убрать вышестоящий репозиторий для HEAD, так как он не указывает ни на одну ветку."
-#: builtin/branch.c:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Ветка «%s» не имеет информации о вышестоящей ветке"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "не имеет смысла создавать «HEAD» вручную"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "параметры -a и -r для «git branch» не имеют смысла с указанием имени ветки"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using "
-"--track or --set-upstream-to\n"
-msgstr "Флаг --set-upstream устарел и будет удален в будущем. Вместо него используйте --track или --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr "\nЕсли вы хотите, чтобы «%s» отслеживала «%s», сделайте следующее:\n\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
+msgstr "опция --set-upstream больше не поддерживается. Вместо неё используйте «--track» или «--set-upstream-to»"
#: builtin/bundle.c:45
#, c-format
@@ -5437,75 +5610,75 @@
msgid "Need a repository to unbundle."
msgstr "Требуется репозиторий для распаковки."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
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:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | "
"--filters]"
msgstr "git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<тип> может быть одним из: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "показать тип объекта"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "показать размер объекта"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "выйти с нулевым кодом возврата, если нет ошибки"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "структурированный вывод содержимого объекта"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "запустить texconv на содержимом двоичных объектов "
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "запуск фильтров на содержимом двоичных объектов "
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "двоичный объект"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "использовать определенный путь для --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "разрешить -s и -t работать с повреждёнными объектами"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "буфферировать вывод --batch"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr "показать информацию и содержимое объектов, переданных из стандартного ввода"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "показать информацию об объектах, переданных из стандартного ввода"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "переходить по символьным ссылкам внутри дерева (используется с опциями --batch и --batch-check)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "показать все объекты с опциями --batch или --batch-check"
@@ -5533,7 +5706,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "окончание ввода и вывода записей по НУЛЕВОМУ символу"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "не выводить прогресс выполнения"
@@ -5590,160 +5763,160 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<опции>] [--] [<файл>…]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr "индекс должен быть между 1 и 3 или all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "переключиться на состояние всех файлов из индекса"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "принудительная перезапись существующих файлов"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
msgid "no warning for existing files and files not in index"
msgstr "не выводить предупреждения для существующих и непроиндексированных файлов"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "не создавать новые файлы"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "обновить статистику доступа в файле индекса"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr "прочитать список путей из стандартного ввода"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "записать содержимое во временные файлы"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "строка"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr "добавить спереди <строку> при создании файлов"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "копировать файлы из указанного индекса"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<опции>] <ветка>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<опции>] [<ветка>] -- <файл>…"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "путь «%s» не имеет нашей версии"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "путь «%s» не имеет их версии"
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "путь «%s» не имеет всех необходимых версий"
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "путь «%s» не имеет необходимых версий"
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "путь «%s»: не удалось слить"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Не удалось добавить результат слияния «%s»"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "«%s» нельзя использовать при обновлении путей"
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "«%s» нельзя использовать одновременно с %s"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "Нельзя обновлять пути и переключаться на ветку «%s» одновременно."
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "путь «%s» не слит"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr "сначала нужно разрешить конфликты в вашем текущем индексе"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Не удалось создать журнал ссылок для «%s»: %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD сейчас на"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "не удалось обновить HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Сброс ветки «%s»\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "Уже на «%s»\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Переключение и сброс ветки «%s»\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Переключено на новую ветку «%s»\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Переключено на ветку «%s»\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " … и еще %d.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -5760,7 +5933,7 @@
msgstr[2] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
msgstr[3] "Предупреждение: вы оставляете позади %d коммитов не соединенные ни с одной из ваших веток:\n\n%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -5779,160 +5952,160 @@
msgstr[2] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
msgstr[3] "Если вы хотите сохранить их с помощью создания новой ветки, то сейчас самое время\nсделать это с помощью:\n\n git branch <имя-новой-ветки> %s\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "внутренняя ошибка при хождении по редакциям"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "Предыдущая позиция HEAD была"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr "Вы находитесь на еще не созданной ветке"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "ожидается только одна ссылка, а передано %d."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "неправильная ссылка: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "в дереве нет такой ссылки: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "нельзя использовать пути при переключении веток"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "нельзя использовать «%s» при переключении веток"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "«%s» нельзя использовать одновременно с «%s»"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Нельзя переключить ветку на не коммит «%s»"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "ветка"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "создать и переключиться на новую ветку"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "создать/сбросить и перключиться на новую ветку"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "создать журнал ссылок для новой ветки"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "отсоединить HEAD на указанном коммите"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "установить информацию о вышестоящей ветке для новой ветки"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "новая-ветка"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "новая ветка без родителей"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "переключиться на нашу версию для не слитых файлов"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "переключиться на их версию для не слитых файлов"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "принудительное переключение на состояние (отбрасывает все локальные изменения)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr "выполнить трехходовое слияние с новой веткой"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "обновить игнорируемые файлы (по умолчанию)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "стиль"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "стиль конфликтов слияния (merge или diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "не ограничивать спецификаторы пути только частичными записями"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "пересмотр «git checkout <нет-такой-ветки>»"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
msgid "do not check if another worktree is holding the given ref"
msgstr "не проверять, что другое дерево уже содержит указанную ссылку"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "принудительно выводить прогресс"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B и --orphan нельзя использовать одновременно"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "--track требует имя ветки"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "Пропущено имя ветки; попробуйте -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "недопустимый спецификатор пути"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "«%s» не является коммитом, поэтому невозможно создать из него ветку «%s»"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout: --detach не принимает путь «%s» как аргумент"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -5968,7 +6141,7 @@
msgid "failed to remove %s"
msgstr "сбой удаления %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -5977,7 +6150,7 @@
" - (empty) select nothing\n"
msgstr "Справка по выделению:\n1 - выбрать указанный элемент\nfoo - выбрать элемент с указанным префиксом\n - (пусто) не выбирать ничего\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -5990,38 +6163,38 @@
" - (empty) finish selecting\n"
msgstr "Справка по выделению:\n1 - выбрать один элемент\n3-5 - выбрать диапазон элементов\n2-3,6-9 - выбрать несколько диапазонов\nfoo - выбрать элемент с указанным префиксом\n-… - убрать выделение с указанных элементов\n* - выбрать все элементы\n - (пусто) завершить выделение\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Хм (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "Шаблоны игнорирования ввода>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "ПРЕДУПРЕЖДЕНИЕ: Не удалось найти элементы соответствующие: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr "Укажите элементы для удаления"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Удалить %s [y - да/N - нет]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "До свидания.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6032,15 +6205,15 @@
"? - help for prompt selection"
msgstr "clean - начать очистку\nfilter by pattern - исключить удаление элементов\nselect by numbers - исключить удаление элементов по номерам\nask each - запрашивать подтверждение на удаление каждого элемента (как «rm -i»)\nquit - прекратить очистку\nhelp - этот экран\n? - справка по выделению"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Команды ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "Что теперь"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "Удалить следующие элементы:"
@@ -6048,372 +6221,370 @@
msgstr[2] "Удалить следующие элементы:"
msgstr[3] "Удалить следующие элементы:"
-#: builtin/clean.c:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "Больше нет файлов для очистки, выходим."
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "не выводить имена удаляемых файлов"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "принудительно"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "интерактивная очистка"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "удалить каталоги полностью"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "шаблон"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "добавить <шаблон> в правила игнорирования"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "также удалить игнорируемые файлы"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "удалить только игнорируемые файлы"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "нельзя использовать одновременно -x и -X"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
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:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr "clean.requireForce установлен по умолчанию как true и ни одна из опций -i, -n или -f не указана; отказ очистки"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<опции>] [--] <репозиторий> [<каталог>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "не переключать рабочую копию на HEAD"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "создать голый репозиторий"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "создать зеркало репозитория (включает в себя и параметр bare)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "для клонирования из локального репозитория"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "не использовать жесткие ссылки, всегда копировать файлы"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "настроить как общедоступный репозиторий"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "спецификатор-пути"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "инициализировать подмодули в клоне"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "количество подмодулей, которые будут клонированы парралельно"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "каталог-шаблонов"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "каталог, шаблоны из которого будут использованы"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "ссылаемый репозиторий"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "используйте --reference только при клонировании"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "имя"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "использовать <имя> вместо «origin» для отслеживания вышестоящего репозитория"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "переключиться на <ветку>, вместо HEAD внешнего репозитория"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "путь к git-upload-pack на внешнем репозитории"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "глубина"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "сделать частичный клон указанной глубины"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "время"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "сделать частичный клон до определенного времени"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "редакция"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr "углубить историю частичного клона исключая редакцию"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "клонировать только одну ветку, HEAD или --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "не клонировать метки, а также настроить, чтобы не клонировались и в дальнейшем"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "все склонированные подмодули будут частичными клонами"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "каталог-git"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "разместить каталог git отдельно от рабочей копии"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "ключ=значение"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "установить параметры внутри нового репозитория"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "использовать только IPv4 адреса"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "использовать только IPv6 адреса"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
msgstr "Имя каталога не может быть угадано.\nУкажите имя каталога с помощью параметра командной строки"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "информация: Не удалось добавить альтернативу для «%s»: %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "не удалось открыть «%s»"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s уже существует и не является каталогом"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "не удалось выполнить stat %s\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "не удалось создать ссылку «%s»"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "не удалось копировать файл в «%s»"
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "готово.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
"and retry the checkout with 'git checkout -f HEAD'\n"
-msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены, а повторить попытку переключения на ветку с помощью «git checkout -f HEAD»\n"
+msgstr "Клонирование прошло успешно, но во время переключения состояния произошла ошибка.\nС помощь команды «git status» вы можете просмотреть, какие файлы были обновлены,\nа с помощью «git checkout -f HEAD» можно повторить попытку переключения на ветку \n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "Не удалось найти внешнюю ветку %s для клонирования."
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "внешний репозиторий прислал не все необходимые объекты"
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "не удалось обновить %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "внешний HEAD ссылается на несуществующую ссылку, нельзя переключиться на такую версию.\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "не удалось переключиться на версию в рабочем каталоге"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "не удалось записать параметры в файл конфигурации"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "не удалось выполнить перепаковку для очистки"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "не удалось отсоединить временные альтернативные файлы"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "Слишком много аргументов."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Вы должны указать репозиторий для клонирования."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare и --origin %s нельзя использовать одновременно."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare и --separate-git-dir нельзя использовать одновременно."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "репозиторий «%s» не существует"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "глубина %s не является положительным числом"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "целевой путь «%s» уже существует и не является пустым каталогом."
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "рабочий каталог «%s» уже существует."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "не удалось создать родительские каталоги для «%s»"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "не удалось создать рабочий каталог «%s»"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Клонирование в голый репозиторий «%s»…\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Клонирование в «%s»…\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-"
"if-able"
msgstr "клонирование с параметром --recursive нельзя использовать одновременно ни с --reference, ни с --reference-if-able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth игнорируется на локальных клонах; вместо этого используйте file://."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since игнорируется на локальных клонах; используйте file:// вместо этого."
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude игнорируется на локальных клонах; используйте file:// вместо этого."
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "исходный репозиторий является частичным, --local игнорируется"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local игнорируется"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Не знаю как клонировать %s"
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Внешняя ветка %s не найдена в вышестоящем репозитории %s"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "Похоже, что вы клонировали пустой репозиторий."
@@ -6516,98 +6687,98 @@
"the remaining commits.\n"
msgstr "Если вы хотите пропустит этот коммит, используйте команду:\n\n git reset\n\nПосле этого «git cherry-pick --continue» продолжит копирование оставшихся коммитов.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "сбой распаковки объекта дерева HEAD"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "не удалось создать временный индекс"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "сбой интерактивного добавления"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "не удалось обновить временный индекс"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Сбой при обновлении основного кэша дерева"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "не удалось записать файл new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "нельзя создать частичный коммит во время слияния."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "нельзя создать частичный коммит во время копирования коммита."
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "не удалось прочитать индекс"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "не удалось записать временный файл индекса"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "у коммита «%s» отсутствует автор в заголовке"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "у коммита «%s» строка автора в неправильном формате"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "параметр --author в неправильном формате"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "нельзя выбрать символ комментария, который\nне используется в текущем сообщении коммита"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "не удалось запросить коммит %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(чтение файла журнала из стандартного ввода)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "не удалось прочитать файл журнала из стандартного ввода"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "не удалось прочитать файл журнала «%s»"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "не удалось прочитать SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "не удалось прочитать MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "не удалось записать шаблон описания коммита"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -6617,7 +6788,7 @@
"and try again.\n"
msgstr "\nПохоже, что вы пытаетесь закоммитить слияние.\nЕсли это ошибка, пожалуйста удалите файл\n\t%s\nи попробуйте снова.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -6627,14 +6798,14 @@
"and try again.\n"
msgstr "\nПохоже, что вы пытаетесь закоммитить при копировании коммита.\nЕсли это не так, то удалите файл\n\t%s\nи попробуйте снова.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
"with '%c' will be ignored, and an empty message aborts the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут проигнорированы, а пустое сообщение\nотменяет процесс коммита.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -6642,341 +6813,357 @@
"An empty message aborts the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита для ваших изменений. Строки,\nначинающиеся с «%c» будут оставлены; вы можете удалить их вручную,\nесли хотите. Пустое сообщение отменяет процесс коммита.\n"
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sАвтор: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sДата: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sКоммитер: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Не удалось прочитать индекс"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "Ошибка при построении деревьев"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "Пожалуйста, укажите сообщение, при указании опций -m или -F.\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1076
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr "--author «%s» не в формате «Имя <почта>» и не совпадает с существующим автором"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Недопустимый режим показа игнорируемых файлов «%s»"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Неправильный режим неотслеживаемых файлов «%s»"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "--long и -z нельзя использовать одновременно"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
msgid "Using both --reset-author and --author does not make sense"
msgstr "Указание одновременно опций --reset-author и --author не имеет смысла"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "Нечего исправлять."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr "Вы в процессе слияния — сейчас нельзя исправлять."
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "Вы в процессе копирования коммита — сейчас нельзя исправлять."
-#: builtin/commit.c:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr "Опции --squash и --fixup не могут использоваться одновременно"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "Может использоваться только одна из опций -c/-C/-F/--fixup."
-#: builtin/commit.c:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Опция -m не может использоваться с -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author может использоваться только одновременно с опциями -C, -c или --amend."
-#: builtin/commit.c:1205
+#: builtin/commit.c:1226
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "Может использоваться только одна из опций --include/--only/--all/--interactive/--patch."
-#: builtin/commit.c:1207
+#: builtin/commit.c:1228
msgid "No paths with --include/--only does not make sense."
msgstr "Указание путей каталогов с опциями --include/--only не имеет смысла."
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Неправильное значение режима очистки %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "С опцией -a указание пути не имеет смысла."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "кратко показать статус"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "показать информацию о версии"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "показать информацию о спрятанном"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "версия"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "машиночитаемый вывод"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "показать статус в длинном формате (по умолчанию)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "завершать записи НУЛЕВЫМ байтом"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "режим"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "показать неотслеживаемые файлы, опциональные режимы: all (все), normal (как обычно), no (нет). (По умолчанию: all)"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "показать игнорируемые файлы"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr "показывать игнорируемые файлы, с опциональным режимом: traditional (традиционный), matching (только совпадающие), no (не показывать). (По умолчанию: traditional)"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "когда"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr "игнорировать изменения в подмодулях, опционально когда: all (всегда), dirty (измененные), untracked (неотслеживаемые). (По умолчанию: all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "показать неотслеживаемые файлы по столбцам"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "Неподдерживаемая комбинация аргументов отображения игнорируемых и неотслеживаемых файлов"
+
+#: builtin/commit.c:1469
msgid "couldn't look up newly created commit"
msgstr "нельзя запросить новосозданный коммит"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr "нельзя разобрать новосозданный коммит"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "не удалось найти HEAD после создания коммита"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "отделённый HEAD"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (корневой коммит)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "не выводить сводку после успешного коммита"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "добавить список изменений в шаблон сообщения коммита"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "Опции сообщения коммита"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "прочитать сообщение из файла"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "автор"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "подменить автора коммита"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "дата"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "подменить дату коммита"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "сообщение"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "сообщение коммита"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "коммит"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "использовать и отредактировать сообщение от указанного коммита"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "использовать сообщение указанного коммита"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для исправления указанного коммита"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
msgid "use autosquash formatted message to squash specified commit"
msgstr "использовать форматированное сообщение автоуплотнения для уплотнения указанного коммита"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1630
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "коммит теперь за моим авторством (используется с -C/-c/--amend)"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "добавить Signed-off-by:"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "использовать указанный файл шаблона"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "принудительно редактировать коммит"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "по-умолчанию"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "как удалять пробелы и #комментарии из сообщения коммита"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "включить статус файлов в шаблон сообщения коммита"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "подписать коммит с помощью GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "Опции содержимого коммита"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "закоммитить все измененные файлы"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "добавить указанные файлы в индекс для коммита"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "интерактивное добавление файлов"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "интерактивное добавление изменений"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "закоммитить только указанные файлы"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "пропустить перехватчик pre-commit и commit-msg"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "показать, что будет закоммичено"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "исправить предыдущий коммит"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "пропустить перехватчик post-rewrite"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "разрешить запись пустого коммита"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "разрешить запись изменений с пустым сообщением"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "не удалось разобрать HEAD коммит"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Файл MERGE_HEAD поврежден (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "не удалось прочитать MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "не удалось открыть сообщение коммита: %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Отмена коммита; вы не изменили сообщение.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Отмена коммита из-за пустого сообщения коммита.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Отмена коммита; вы не изменили сообщение.\n"
+
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -6987,139 +7174,143 @@
msgid "git config [<options>]"
msgstr "git config [<опции>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "Размещение файла конфигурации"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "использовать глобальный файл конфигурации"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "использовать системный файл конфигурации"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "использовать файл конфигурации репозитория"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "использовать указанный файл конфигурации"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "идент-двоичн-объекта"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "прочитать настройки из указанного двоичного объекта"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "Действие"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "получить значение: имя [шаблон-значений]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "получить все значения: ключ [шаблон-значений]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "получить значения по шаблону: шаблон-имен [шаблон-значений]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "получить значение, специфичное для URL: раздел[.переменная] URL"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr "заменить все соответствующие переменные: имя значение [шаблон-значений]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "добавить новую переменную: имя значение"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "удалить переменную: имя [шаблон-значений]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "удалить все совпадающие: имя [шаблон-значений]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "переименовать раздел: старое-имя новое-имя"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "удалить раздел: имя"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "показать весь список"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "открыть в редакторе"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "найти настроенный цвет: раздел [по-умолчанию]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "проверить, существует ли настроенный цвет: раздел [stdout-есть-tty]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "Тип"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "значение — это «true» (правда) или «false» (ложь)"
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "значение — это десятичное число"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "значение — это --bool или --int"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "значение — это путь (к файлу или каталогу)"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "значение - это дата окончания срока действия"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "Другое"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "завершать значения НУЛЕВЫМ байтом"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "показывать только имена переменных"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "учитывать директивы include (включения файлов) при запросе"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "показать источник настройки (файл, стандартный ввод, двоичный объект, командная строка)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "не удалось разобрать значение цвета по умолчанию"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7129,185 +7320,190 @@
"#\temail = %s\n"
msgstr "# Это файл конфигурации пользователя Git.\n[user]\n# Пожалуйста, адаптируйте и раскомментируйте следующие строки:\n#\tuser = %s\n#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local можно использовать только внутри git репозитория"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "не удалось создать файл конфигурации %s"
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
" Use a regexp, --add or --replace-all to change %s."
msgstr "нельзя перезаписать несколько значений одним\n Используйте регулярные выражения, параметры --add или --replace-all, чтобы изменить %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "вывод размеров в удобочитаемом для человека виде"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<опции>] [<указатель-коммита>…]"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<опции>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "указатель на ветку"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "легковесный"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "аннотированный"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "аннотированная метка %s не доступна"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "аннотированная метка %s не содержит встроенного названия"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "метка «%s» уже здесь «%s»"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "Недопустимое имя объекта %s"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s не является действительным объектом «%s»"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "нет меток, точно соответствующих «%s»"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "поиск описания для %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "Нет точных совпадений по ссылкам или тегам, ищу описания\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "поиск окончен на %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
"However, there were unannotated tags: try --tags."
msgstr "Нет аннотированных меток, которые могут описать «%s».\nНо имеются неаннотированные метки: попробуйте добавить параметр --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
"Try --always, or create some tags."
msgstr "Нет меток, которые могут описать «%s….\nПопробуйте добавить параметр --always или создать какие-нибудь метки."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "посещено %lu коммитов\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
"gave up search at %s\n"
msgstr "более %i меток найдено; показано последние %i\nостановлен поиск после %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "описать %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Недопустимое имя объекта %s"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s не является коммитом или двоичным объектом"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "поиск метки, которая идет после коммита"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "вывод отладочной информации стратегии поиска на стандартный вывод"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "использовать любую ссылку"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "использовать любую метку, даже неаннотированную"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "всегда использовать длинный формат вывода"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "следовать только за первым родителем"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "выводить только точные совпадения"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "рассматривать последние <n> меток (по умолчанию: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "рассматривать только метки по <шаблону>"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "не учитывать метки, которые соответствуют <шаблону>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "если не найдено, показать сокращенный номер редакции коммита"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "пометка"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "добавить <пометку> при измененном рабочем каталоге (по умолчанию: «-dirty»)"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "добавить <пометку> на повреждённое рабочее дерево (по умолчанию: «-broken»)"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "--long несовместимо с --abbrev=0"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "Имена не найдены, не могу ничего описать."
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty несовместимо с указанием указателей коммитов"
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken несовместимо с указанием указателей коммитов"
@@ -7316,26 +7512,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "«%s»: не является обычным файлом или символьной ссылкой"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "неправильный параметр: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "Не найден git репозитоий"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "передан неправильный объект «%s»."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "передано больше двух двоичных объектов: «%s»"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "передан необработанный объект «%s»."
@@ -7344,97 +7540,97 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<опции>] [<коммит> [<коммит>]] [--] [<путь>…]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "сбой: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "не удалось прочитать символьную ссылку %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "не удалось прочитать файл символьной ссылки %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "не удалось прочитать объект %s для символьной ссылки %s"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
msgstr "комбинированные форматы различий файлов(«-c» и «--cc») не поддерживаются в режиме сравнения каталогов(«-d» и «--dir-diff»)."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "оба файла изменены: «%s» и «%s»."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "рабочий каталог был покинут."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "временные файлы уже находятся в «%s»."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "возможно вы хотите их удалить или восстановить."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "использовать «diff.guitool» вместо «diff.tool»"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "выполнить пофайловое сравнение всего каталога"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "не спрашивать перед запуском утилиты сравнения"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "использовать символьные ссылки в режиме сравнения каталога"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<утилита>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "использовать указанную утилиту сравнения"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "вывести список утилит, которые можно использовать с параметром «--tool»"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit"
" code"
msgstr "выходить из «git-difftool», если вызванная утилита сравнения вернула не нулевой код возврата"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<команда>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "использовать особую команду для просмотра различий"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "не передана <утилита> для --tool=<утилита>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "не передана <команда> для --extcmd=<команда>"
@@ -7442,325 +7638,320 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [опции-rev-list]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "показать прогресс после <n> объектов"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "выбор обработки подписанных меток"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "выбор обработки меток, которыми помечены отфильтрованные объекты"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Записать пометки в этот файл"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Импортировать пометки из этого файла"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "Подделать автора метки, если у метки он отсутствует"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Вывести полное дерево для каждого коммита"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Использовать пометку завершения в конце потока"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Пропустить вывод данных двоичных объектов"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "спецификатор ссылки"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Применить спецификатор ссылки к экспортируемым ссылкам"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "сделать вывод анонимным"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<опции>] <группа>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<опции>] [(<репозиторий> | <группа>)…]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<опции>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "извлечь со всех внешних репозиториев"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "дописать к .git/FETCH_HEAD вместо перезаписи"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "путь к программе упаковки пакета на машине с внешним репозиторием"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "принудительная перезапись локальной ветки"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "извлечь с нескольких внешних репозиториев"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "извлечь все метки и связанные объекты"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "не извлекать все метки (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "количество подмодулей, которые будут скачаны парралельно"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "prune remote-tracking branches no longer on remote"
msgstr "почистить отслеживаемые внешние ветки, которых уже нет на внешнем репозитории"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "по требованию"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "оставить загруженный пакет данных"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "разрешить обновление ссылки HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "улугубить историю частичного клона"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
msgid "deepen history of shallow repository based on time"
msgstr "углубить историю частичного клона основываясь на времени"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "преобразовать в полный репозиторий"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "каталог"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "присоединять это спереди к выводу путей подмодуля"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "настроить по умолчанию рекурсивное извлечение подмодулей (более низкий приоритет, чем файлы конфигурации)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "принимать ссылки, которые обновляют .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "соответствие-ссылок"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "указать соответствие ссылок при извлечении"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "Не удалось найти ссылку HEAD на внешнем репозитории"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "опция fetch.output содержит неправильное значение для %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "объект %s не найден"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[актуально]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[отклонено]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "нельзя извлечь текущую ветку"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[обновление метки]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "не удалось обновить локальную ссылку"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[новая метка]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[новая ветка]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[новая ссылка]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "принудительное обновление"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "без перемотки вперед"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s не отправил все необходимые объекты\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "%s отклонено из-за того, что частичные корни не разрешено обновлять"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "Из %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
" 'git remote prune %s' to remove any old, conflicting branches"
msgstr "не удалось обновить некоторые локальные ссылки; попробуйте запустить «git remote prune %s», чтобы почистить старые, конфликтующие ветки"
-#: builtin/fetch.c:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s будет висящей веткой)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s стала висящей веткой)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[удалено]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(нет)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Отказ получения в текущую ветку %s не голого репозитория"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Неправильное значение «%2$s» для параметра «%1$s» для %3$s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Параметр «%s» игнорируется для %s\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Не знаю как извлечь с %s"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "Извлечение из %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Не удалось извлечь %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "Не указан внешний репозиторий. Укажите URL или имя внешнего репозитория из которого должны извлекаться новые редакции."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "Вам нужно указать имя метки."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "Отрицательная грубина для --deepen не поддерживается"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen и --depth нельзя использовать одновременно"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr "нельзя использовать одновременно --depth и --unshallow"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow не имеет смысла на полном репозитории"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all не принимает имя репозитория как аргумент"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all не имеет смысла при указании спецификаторов ссылок"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Нет такого внешнего репозитория или группы: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Получение группы и указание спецификаций ссылок не имеет смысла"
@@ -7769,23 +7960,23 @@
"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:664
+#: builtin/fmt-merge-msg.c:666
msgid "populate log with at most <n> entries from shortlog"
msgstr "отправить в журнал <n> записей из короткого журнала"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "сокращение для --log (устаревшее)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "текст"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "использовать <текст> как начальное сообщение"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "файл для чтения"
@@ -7825,101 +8016,105 @@
msgid "show only <n> matched refs"
msgstr "показать только <n> совпадающих ссылок"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "использовать цвета из формата"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "вывод только ссылок, которые указывают на переданный объект"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "вывод только слитых ссылок"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "вывод только не слитых ссылок"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "вывод только ссылок, которые содержат коммит"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "вывод только ссылок, которые не содержат коммит"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Проверка каталогов объектов"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<опции>] [<объект>…]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "показать недоступные объекты"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "показать объекты, на которые нет ссылок"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "вывести отчет по меткам"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "вывести отчет по корневым узлам"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "воспринимать объекты в индексе как корневые узлы"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "создать корневые узлы журналов ссылок (по умолчанию)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "также проверять пакеты и альтернативные объекты"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "только проверить соединение"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "использовать более строгую проверку"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "записать объекты на которые нет ссылок в .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "показать прогресс выполнения"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "показать подробные имена для недоступных объектов"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Проверка объектов"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<опции>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Не удалось выполнить fstat %s: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "Не удалось выполнить stat для %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -7929,49 +8124,49 @@
"%s"
msgstr "Последний запуск gc сообщил следующее. Пожалуйста, исправьте ошибку и удалите %s.\nАвтоматическая очистка репозитория не будет производиться, пока этот файл не удалён.\n\n%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "почистить объекты, на которые нет ссылок"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "проверять более внимательно (занимает больше времени)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "включить режим auto-gc"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "принудительно запустить gc, даже есть другая копия gc уже запущена"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Не удалось разобрать значение %s для gc.logexpiry"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "Автоматическая упаковка репозитория в фоне, для оптимальной производительности.\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Автоматическая упаковка репозитория, для оптимальной производительности.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "Смотрите «git help gc» руководства по ручной очистке.\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, 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:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove "
"them."
@@ -7981,12 +8176,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<опции>] [-e] <шаблон> [<редакция>…] [[--] <путь>…]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: сбой создания потока: %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "указано недопустимое количество потоков (%d) для %s"
@@ -7994,249 +8189,241 @@
#. TRANSLATORS: %s is the configuration
#. variable for tweaking threads, currently
#. grep.threads
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "нет поддержки потоков, игнорирование %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "не удалось прочитать дерево (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, c-format
msgid "unable to grep from object of type %s"
msgstr "не удалось выполнить grep из объекта типа %s"
-#: builtin/grep.c:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "параметр «%c» ожидает числовое значение"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr "искать в индексе, а не в рабочем каталоге"
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "искать в содержимом не управляемым git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "искать и в отслеживаемых, и в неотслеживаемых файлах"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "игнорировать файлы указанные в «.gitignore»"
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "рекурсивный поиск по всем подмодулям"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "базовое имя"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "добавить базовое имя проекта спереди ко всему выводимому"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "искать в несовпадающих строках"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "без учета регистра"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "искать совпадения шаблона только на границах слов"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "обработка двоичных файлов как текста"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "не искать совпадения шаблона в двоичных файлах"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr "обрабатываться двоичные файлы с помощью фильтров textconv"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "на глубине максиму <глубина> уровней"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "использовать расширенные регулярные выражения POSIX"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "использовать базовые регулярные выражения POSIX (по умолчанию)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "интерпретировать шаблоны как фиксированные строки"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "использовать Perl-совместимые регулярные выражения"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "вывести номера строк"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "не выводить имена файлов"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "выводить имена файлов"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr "выводить имена файлов относительно каталога репозитория"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "выводить только имена файлов, а не совпадающие строки"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "синоним для --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr "выводить только несовпадающие имена файлов"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "выводить двоичный НОЛЬ после списка имен файлов"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr "выводить количество совпадений, а не совпадающие строки"
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "подсвечивать совпадения"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr "выводить пустую строку после совпадений из разных файлов"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
msgid "show filename only once above matches from same file"
msgstr "выводить имя файла только раз на несколько совпадений в одном файле"
-#: builtin/grep.c:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "показать <n> строк контекста перед и после совпадения"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "показать <n> строк контекста перед совпадением"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "показать <n> строк контекста после совпадения"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "использовать <кол> рабочих потоков"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "тоже, что и -C КОЛИЧЕСТВО"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr "показать строку с именем функции перед совпадением"
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "показать окружающую функцию"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "прочитать шаблоны из файла"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "поиск соответствий с <шаблоном>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "объединить шаблоны указанные с помощью -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr "ничего не выводить, указать на совпадение с помощью кода выхода"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
msgid "show only matches from files that match all patterns"
msgstr "показать только совпадения из файлов в которых совпадают все шаблоны"
-#: builtin/grep.c:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "показать дерево разбора для выражения поиска"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "пейджер"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "показать совпадающие файлы с помощью программы-пейджера"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "разрешить вызов grep(1) (игнорируется в этой сборке)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "не задан шаблон."
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index или --untracked нельзя использовать одновременно с указанием ревизии"
-#: builtin/grep.c:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "не удалось определить редакцию: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "указано неправильное количество потоков (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "нет поддержки потоков, игнорирование --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager работает только в рабочем каталоге"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "опция не поддерживается одновременно с --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached или --untracked нельзя использовать одновременно с --no-index."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard не может использоваться для отслеживаемого содержимого."
-#: builtin/grep.c:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "указано одновременно --cached и дерево."
@@ -8325,105 +8512,105 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "версия emacsclient «%d» слишком старая (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "сбой при запуске «%s»"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
"Please consider using 'man.<tool>.cmd' instead."
msgstr "«%s»: путь для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.cmd»."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
"Please consider using 'man.<tool>.path' instead."
msgstr "«%s»: команда для неподдерживаемой программы просмотра man.\nВместо этого используйте «man.<программа>.path»."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "«%s»: неизвестная программа просмотра man."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "программа просмотра man не обработала запрос"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "программа просмотра info не обработала запрос"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Определение атрибутов для путей файлов или каталогов"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Повседневный Git с 20 командами или около того"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Глоссарий Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Указание специально игнорируемых файлов"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Определение свойств подмодулей"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Указание редакций и диапазонов для Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Учебное введение в Git (для версии 1.5.1 или новее)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Обзор рекомендуемых последовательностей выполняемых действий с Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Основные руководства Git:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "«git %s» — это сокращение для «%s»"
+msgid "'%s' is aliased to '%s'"
+msgstr "«%s» — это сокращение для «%s»"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "использование: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "не удалось открыть %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "несоответствие типа объекта на %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "ожидаемый объект не получен на %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "объект %s: ожидаемый тип %s, получен %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
@@ -8432,73 +8619,73 @@
msgstr[2] "не удалось заполнить %d байтов"
msgstr[3] "не удалось заполнить %d байтов"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "неожиданный конец файла"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "ошибка чтения ввода"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "использовано больше байт, чем было доступно"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "пакет слишком большой для текущего определения off_t"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "размер пакета превышает максимальный допустимый"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "не удалось создать «%s»"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "не удалось открыть файл пакета «%s»"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "несоответствие подписи пакета"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "версия пакета %<PRIu32> не поддерживается"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "пакет содержит плохой объект по смещению %<PRIuMAX>: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "программа сжатия вернула %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "переполнение значения смещения у базового объекта дельты"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "смещение базовой дельты вышло за допустимые пределы"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "неизвестный тип объекта %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "не удалось выполнить pread для файла пакета"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, c-format
msgid "premature end of pack file, %<PRIuMAX> byte missing"
msgid_plural "premature end of pack file, %<PRIuMAX> bytes missing"
@@ -8507,93 +8694,93 @@
msgstr[2] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
msgstr[3] "преждевременное окончание файла пакета, %<PRIuMAX> байтов отсутствует"
-#: builtin/index-pack.c:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "серьезное несоответствие при распаковке"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "НАЙДЕНА КОЛЛИЗИЯ SHA1 С %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "не удалось прочитать %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "не удалось прочитать информацию существующего объекта %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "не удалось прочитать существующий объект %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "неправильный файл двоичного объекта %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "неправильный %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Ошибка в объекте"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "Не все дочерние объекты %s достижимы"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "сбой при применении дельты"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Получение объектов"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Индексирование объектов"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "пакет поврежден (несоответствие SHA1)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "не удалось выполнить fstat для файла пакета"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "файл пакета содержит мусор в конце"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "безумная путаница в parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Определение изменений"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "не удалось создать поток: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "безумная путаница"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, c-format
msgid "completed with %d local object"
msgid_plural "completed with %d local objects"
@@ -8602,12 +8789,12 @@
msgstr[2] "завершено с %d локальными объектами"
msgstr[3] "завершено с %d локальными объектами"
-#: builtin/index-pack.c:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Неожиданная контрольная сумма в конце %s (диск поврежден?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, c-format
msgid "pack has %d unresolved delta"
msgid_plural "pack has %d unresolved deltas"
@@ -8616,54 +8803,54 @@
msgstr[2] "пакет содержит %d неразрешенных дельт"
msgstr[3] "пакет содержит %d неразрешенных дельт"
-#: builtin/index-pack.c:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "нельзя сжать присоединенный объект (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "локальный объект %s поврежден"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "ошибка при закрытии файла пакета"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "не удалось записать файл удержания «%s»"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "не удалось закрыть записанный файл удержания «%s»"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "не удалось сохранить файл пакета"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "не удалось сохранить файл индекса"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "плохой pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Не удалось открыть существующий файл пакета «%s»"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "Не удалось открыть существующий файл индекса для «%s»"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, c-format
msgid "non delta: %d object"
msgid_plural "non delta: %d objects"
@@ -8672,7 +8859,7 @@
msgstr[2] "не дельты: %d объектов"
msgstr[3] "не дельты: %d объектов"
-#: builtin/index-pack.c:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
@@ -8681,26 +8868,26 @@
msgstr[2] "длина цепочки = %d: %lu объектов"
msgstr[3] "длина цепочки = %d: %lu объектов"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "имя пакета «%s» не оканчивается на «.pack»"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "плохой %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin нельзя использовать без --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "опция --stdin требует наличия репозитория git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "--verify без указания имени файла пакета"
@@ -8826,350 +9013,398 @@
"<token>[(=|:)<value>])...] [<file>...]"
msgstr "git interpret-trailers [--in-place] [--trim-empty] [(--trailer <ключ>[(=|:)<значение>])…] [<файл>…]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "редактировать файлы на месте"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "удалять пустые завершители"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "где поместить новый завершитель"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "действие, если завершитель уже существует"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "действие, если завершитель не существует"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "вывести только завершители"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "не применять правила из файла конфигурации"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "объединить значения разделенные пробелом"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "указание опций разбора"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "завершитель"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "завершители для добавления"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer одновременно с --only-input не имеет смысла"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "ничего не передано, для редактирования файлов на месте"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<опции>] [<диапазон-редакций>] [[--] <путь>…]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<опции>] <объект>…"
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "неправильный параметр для --decorate: %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "не выводить различия"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "показать источник"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "Использовать файл соответствия почтовых адресов"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "декорировать только ссылки соответствующие <шаблону>"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "не декорировать ссылки соответствующие <шаблону>"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "опции формата вывода ссылок"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr "Обработать диапазон строк n,m из файла, начиная с 1"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "Финальный вывод: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: плохой файл"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "Не удалось прочитать объект %s"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "Неизвестный тип объекта: %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "в format.headers не указано значение"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "слишком длинное имя выходного каталога"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "Ну удалось открыть файл изменений %s"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "Нужен только один диапазон."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "Не является диапазоном."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "Сопроводительное письмо должно быть в формате электронной почты"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "ошибка в поле in-reply-to: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<опции>] [<начиная-с> | <диапазон-редакций>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "Два выходных каталога?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "Неизвестный коммит %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Не удалось разрешить «%s» как ссылку."
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "Не удалось найти точную базу слияния."
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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 "Не удалось получить вышестоящую ветку. Если вы хотите записать базовый коммит автомитически, то используйте git branch --set-upstream-to для отслеживания внешней ветки.\nИли же вы можете указать базовый коммит указанием --base=<идентификатор-базового-коммита> вручную."
-#: builtin/log.c:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "Не удалось найти точную базу слияния"
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr "базовый коммит должен быть предком списка редакций"
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr "базовый коммит не должен быть в списке редакций"
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "не удалось получить идентификатор патча"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr "выводить [PATCH n/m] даже когда один патч"
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "выводить [PATCH] даже когда несколько патчей"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "выводить патчи на стандартный вывод"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
-msgstr "генерировать сопроводительное письмо"
+msgstr "создать сопроводительное письмо"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr "использовать простую последовательность чисел для имен выходных файлов"
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "суффикс"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "использовать суффикс <суффикс> вместо «.patch»"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr "начать нумерацию патчей с <n>, а не с 1"
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "пометить серию как энную попытку"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Использовать [RFC PATCH] вместо [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Использовать [<префикс>] вместо [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "сохранить результирующие файлы в <каталог>"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "не обрезать/добавлять [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "не выводить двоичные различия"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "выводить нулевую хэш-сумму в заголовке From"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr "не включать патч, если коммит уже есть в вышестоящей ветке"
-#: builtin/log.c:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr "выводить в формате патча, а не в стандартном (патч + статистика)"
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "Передача сообщений"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "заголовок"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "добавить заголовок сообщения"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "почта"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "добавить заголовок To:"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "добавить заголовок Cc:"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "идентификатор"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "установить адрес отправителя на <идентификатор> (или на идентификатор коммитера, если отсутствует)"
-#: builtin/log.c:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "идентификатор-сообщения"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "сделать первое письмо ответом на <идентификатор-сообщения>"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "вложение"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "приложить патч"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "включить патч в текст письма"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr "включить в письмах иерархичность, стили: shallow (частичную), deep (глубокую)"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "подпись"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "добавить подпись"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "базовый коммит"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "добавить информацию о требовании дерева к серии патчей"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "добавить подпись из файла"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "не выводить имена файлов патчей"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "показать прогресс выполнения во создания патчей"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "неправильная строка идентификации: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "-n и -k нельзя использовать одновременно"
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc и -k нельзя использовать одновременно."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "--name-only не имеет смысла"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "--name-status не имеет смысла"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "--check не имеет смысла"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "стандартный вывод или каталог?"
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "Не удалось создать каталог «%s»"
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "не удалось прочитать файл подписи «%s»"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Создание патчей"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "Сбой при создании выходных файлов"
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<вышестоящая-ветка> [<голова> [<ограничение>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> "
@@ -9189,90 +9424,94 @@
msgstr "использовать символы в нижнем регистре для «предположительно без изменений» файлов"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "использовать символы нижнего регистра для файлов «fsmonitor clean»"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "показывать кэшированные файлы при выводе (по умолчанию)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "показывать удаленные файлы при выводе"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "показывать измененные файлы при выводе"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "показывать другие файлы при выводе"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "показывать игнорируемые файлы при выводе"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr "показывать имя индексированного объекта на выводе"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
msgid "show files on the filesystem that need to be removed"
msgstr "показывать файлы в файловой системе, которые должны быть удалены"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "показывать только имена у «других» каталогов"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "показать концы строк файлов"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "не показывать пустые каталоги"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "показывать не слитые файлы на выводе"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "показывать информации о разрешении конфликтов и отмене"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "пропустить файлы, соответствующие шаблону"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "прочитать шаблоны исключения из <файл>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr "прочитать дополнительные покаталожные шаблоны исключения из <файл>"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "добавить стандартные исключения git"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr "выводить пути относительно корневого каталога проекта"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "рекурсивно по подмодулям"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
msgid "if any <file> is not in the index, treat this as an error"
msgstr "если какой-либо <файл> не в индексе, считать это ошибкой"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "указатель-дерева"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "притвориться, что пути удалены, т.к. <указатель-дерева> еще существует"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "показать отладочную информацию"
@@ -9360,176 +9599,180 @@
msgid "empty mbox: '%s'"
msgstr "пустой mbox: «%s»"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<опции>] [<коммит>…]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "при указании параметра «m» требуется указать значение"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Не удалось найти стратегию слияния «%s».\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Доступные стратегии:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Доступные пользовательские стратегии:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "do not show a diffstat at the end of the merge"
msgstr "не выводить статистику изменений после окончания слияния"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "вывести статистику изменений после окончания слияния"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(синоним для --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "добавить (максимум <n>) записей из короткого журнала в сообщение коммита у слияния"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr "создать один коммит, вместо выполнения слияния"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "сделать коммит, если слияние прошло успешно (по умолчанию)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "отредактировать сообщение перед выполнением коммита"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "разрешить перемотку вперед (по умолчанию)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "отменить выполнение слияния, если перемотка вперед невозможна"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
msgid "verify that the named commit has a valid GPG signature"
msgstr "проверить, что указанный коммит имеет верную электронную подпись GPG"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "стратегия"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "используемая стратегия слияния"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "опция=значение"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "опции для выбранной стратегии слияния"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "сообщение коммита для слияния (для слияния без перемотки вперед)"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "отменить выполнение происходящего слияния"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "продолжить выполнение происходящего слияния"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "разрешить слияние несвязанных историй изменений"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "проверить перехватчик commit-msg"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "не удалось выполнить stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "сбой при выполнении stash"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "неправильный объект: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "сбой при выполнении read-tree"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (нечего уплотнять)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Уплотнение коммита — не обновляя HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Нет сообщения слияния — не обновляем HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "«%s» не указывает на коммит"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Неправильная строка branch.%s.mergeoptions: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr "Не обрабатываю ничего, кроме слияния двух указателей на ветки."
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Неизвестный параметр merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "не удалось записать %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "Не удалось прочесть из «%s»"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "Не выполняю коммит слияния; используйте «git commit» для завершения слияния.\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -9539,185 +9782,185 @@
"the commit.\n"
msgstr "Пожалуйста, введите сообщение коммита, для объяснения, зачем нужно\nэто слияние, особенно, если это слияние обновленной вышестоящей\nветки в тематическую ветку.\n\nСтроки, начинающиеся с «%c» будут проигнорированы, а пустое\nсообщение отменяет процесс коммита.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "Пустое сообщение коммита."
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "Прекрасно.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "Не удалось провести автоматическое слияние; исправьте конфликты и сделайте коммит результата.\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "Нет текущей ветки."
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "У текущей ветки нет внешнего репозитория."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
msgid "No default upstream defined for the current branch."
msgstr "Для текущей ветки не указана вышестоящая ветка по умолчанию."
-#: builtin/merge.c:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "Не указана внешняя отслеживаемая ветка для %s на %s"
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Плохое значение «%s» в переменной окружения «%s»"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "не является тем, что можно слить в %s: %s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "не является тем, что можно слить"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "опция --abort не принимает аргументы"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Нет слияния, которое можно отменить (отсутствует файл MERGE_HEAD)."
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "опция --continue не принимает аргументы"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Сейчас не происходит слияние (отсутствует файл MERGE_HEAD)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr "Вы не завершили слияние (присутствует файл MERGE_HEAD).\nВыполните коммит ваших изменений, перед слиянием."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD).\nПожалуйста, закоммитьте ваши изменения, перед слиянием."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "Вы не завершили копирование коммита (присутствует файл CHERRY_PICK_HEAD)."
-#: builtin/merge.c:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "Нельзя использовать одновременно --squash и --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Коммит не указан и параметр merge.defaultToUpstream не установлен."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr "Уплотнение коммита в пустую ветку еще не поддерживается"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "Коммит, не являющийся перемоткой вперед, нет смысла делать в пустую ветку."
-#: builtin/merge.c:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "%s не является тем, что можно слить"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
msgid "Can merge only exactly one commit into empty head"
msgstr "Можно только один коммит в пустую ветку."
-#: builtin/merge.c:1268
+#: builtin/merge.c:1297
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "Коммит %s содержит не доверенную GPG подпись, предположительно от %s."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "Коммит %s содержит плохую GPG подпись, предположительно от %s."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Коммит %s не содержит GPG подпись."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Коммит %s содержит действительную GPG подпись, от %s.\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "отказ слияния несвязанных историй изменений"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "Уже обновлено."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "Обновление %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Попытка тривиального слияния в индексе…\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "Не вышло.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "Уже обновлено. Круто!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "Перемотка вперед невозможна, отмена."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Перемотка дерева к исходному состоянию…\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Попытка слияния с помощью стратегии %s…\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ни одна стратегия слияния не обработала слияние.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Сбой при слиянии с помощью стратегии %s.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Использую %s для подготовки ручного разрешения конфликтов.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "Автоматическое слияние прошло успешно; как и запрашивали, остановлено перед выполнением коммита\n"
@@ -9742,23 +9985,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ссылка> [<коммит>]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "вывести всех общих предков"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr "вывести предков для одного многоходового слияния"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "вывести список редаций, которые не достижимы из друг друга"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "является первым предком второго указанного коммита?"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "найти журнале ссылок <ссылка> где именно <коммит> разветвился"
@@ -9858,7 +10101,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "Каталог %s в индексе и не является подмодулем?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "Чтобы продолжить, проиндексируйте или спрячьте ваши изменения в файле .gitmodules"
@@ -9875,68 +10118,68 @@
msgid "skip move/rename errors"
msgstr "пропускать ошибки при перемещении/переименовании"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "целевой путь «%s» не является каталогом"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Проверка переименования из «%s» в «%s»\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "плохой источник"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "нельзя переместить каталог в самого себя"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "нельзя переместить каталог в файл"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "исходный каталог пуст"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "не под версионным контролем"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "целевой путь уже существует"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "перезапись «%s»"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Не удалось перезаписать"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "несколько источников для одного целевого пути"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "целевой каталог не существует"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, откуда=%s, куда=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Переименование %s в %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "сбой при переименовании «%s»"
@@ -10031,8 +10274,8 @@
msgstr "git notes [--ref <ссылка-на-заметку>] remove [<объект>…]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <ссылка-на-заметку>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <имя-заметки>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10121,19 +10364,19 @@
msgid "the note contents have been left in %s"
msgstr "содержимое заметки осталось в %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "не удалось прочитать «%s»"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "не удалось открыть или прочитать «%s»"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "не удалось разрешить «%s» как ссылку."
@@ -10160,185 +10403,185 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "отказ в перезаписи %s заметок в %s (за пределами refs/notes/)"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "передано слишком много параметров"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "не найдена заметка для объекта %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "текстовое содержимое заметки"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "содержимое заметки в файле"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "использовать и отредактировать указанный объект заметки"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "использовать указанный объект заметки"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "разрешить сохранение пустой заметки"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "заменить существующие заметки"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "Не удалось добавить заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Перезапись существующих заметок у объекта %s\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Удаление заметки у объекта %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "прочитать объекты из стандартного ввода"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "загрузить настройки перезаписи для команды <команда> (включает в себя --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "передано слишком мало параметров"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite"
" existing notes"
msgstr "Не удалось скопировать заметку. Найдена существующая заметка у объекта %s. Используйте параметр «-f» для перезаписи существующих заметок."
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "нет заметок у исходного объекта %s. Нельзя скопировать."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
"Please use 'git notes add -f -m/-F/-c/-C' instead.\n"
msgstr "Опции -m/-F/-c/-C для подкоманды «edit» устарели.\nИспользуйте вместо них «git notes add -f -m/-F/-c/-C».\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "не удалось удалить ссылку NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "не удалось удалить ссылку NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "не удалось удалить рабочий каталог «git notes merge»"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "не удалось прочитать ссылку NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "не удалось найти коммит из NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "не удалось разобрать коммит из NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "не удалось разрешить NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "не удалось завершить слиние заметок"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "неизвестная стратегия слияния заметок %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Общие опции"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Опции слияния"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
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:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Коммит не слитых заметок"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "завершить слияние заметок коммитом не слитых заметок"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Отмена разрешения слияния заметок"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "отменить слияние заметок"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "нельзя использовать одновременно --commit, --abort и -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "вы должны указать ссылку заметки для слияния"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "неизвестный параметр для -s/--strategy: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "слияние заметок в %s уже выполняется на %s"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "не удалось сохранить адрес текущей ссылки на заметку (%s)"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with"
@@ -10346,218 +10589,226 @@
"--abort'.\n"
msgstr "Не удалось автоматически слить заметки. Исправьте конфликты в %s и закоммитьте результат с помощью «git notes merge --commit», или прервите процесс слияния с помощью «git notes merge --abort».\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "У объекта %s нет заметки\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "попытка удаления несуществующей заметки не является ошибкой"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "прочитать имена объектов из стандартного ввода"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "не удалять, только показать список"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "вывести список удаленных заметок"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "ссылка-на-заметку"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "использовать заметку из <ссылка-на-заметку>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "неизвестная подкоманда: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<опции>…] [< <список-ссылок> | < <список-объектов>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr "git pack-objects [<опции>…] <имя-базы> [< <список-ссылок> | < <список-объектов>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "ошибка сжатия (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "отключение записи битовых карт, так как карты были разбиты на части из-за pack.packSizeLimit"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "Запись объектов"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "отключение записи битовых карт, так как некоторые объекты не были упакованы"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "Сжатие объектов"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "недопустимое значение для --missing"
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "неподдерживаемая версия индекса %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "плохая версия индекса «%s»"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "не выводить прогресс выполнения"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "показать прогресс выполнения"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "показать прогресс выполнения во время записи объектов"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "похоже на --all-progress при включенном прогрессе выполнения"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "версия[,смещение]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
msgid "write the pack index file in the specified idx format version"
msgstr "записать файл индекса пакета в указанной версии формата"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "максимальный размер каждого выходного файла пакета"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "игнорировать чужие объекты, взятые из альтернативного хранилища объектов"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "игнорировать упакованные объекты"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "ограничить окно пакета по количеству объектов"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
msgid "limit pack window by memory in addition to object limit"
msgstr "дополнительно к количеству объектов ограничить окно пакета по памяти"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2958
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "максимальная разрешенная длина цепочки дельт в результирующем пакете"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "использовать повторно существующие дельты"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "использовать повторно существующие объекты"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "использовать объекты OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
msgid "use threads when searching for best delta matches"
msgstr "использовать многопоточность при поиске лучших совпадений дельт"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "не создавать пустые выходные пакеты"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "прочитать аргументы редакций из стандартного ввода"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
msgid "limit the objects to those that are not yet packed"
msgstr "ограничиться объектами, которые еще не упакованы"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr "включить объекты, которые достижимы по любой из ссылок"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr "включить объекты, на которые ссылаются записи журнала ссылок"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "включить объекты, на которые ссылается индекс"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "вывести пакет на стандартный вывод"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
msgid "include tag objects that refer to objects to be packed"
msgstr "включить объекты меток, которые ссылаются на упаковываемые объекты"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "сохранять ссылки на недоступные объекты"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "паковать недостижимые объекты"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "распаковать недоступные объекты, которые новее, чем <время>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "создавать тонкие пакеты"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr "создавать пакеты, подходящие для частичных извлечений"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "игнорировать пакеты, рядом с которыми лежит .keep файл"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "уровень сжатия пакета"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr "не скрывать коммиты сращениями"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
msgid "use a bitmap index if available to speed up counting objects"
msgstr "по возможности использовать индекс в битовых картах, для ускорения подсчета объектов"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr "запись индекса в битовых картах вместе с индексом пакета"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "обработка отсутствующих объектов"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "Подсчет объектов"
@@ -10573,17 +10824,17 @@
msgid "prune loose refs (default)"
msgstr "почистить слабые ссылки (по умолчанию)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Удаление дублирующихся объектов"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <время>] [--] [<имя-ветки>…]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <время>] [--] [<ветка>…]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -10606,57 +10857,57 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "управление рекурсивным извлечением подмодулей"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "Опции, связанные со слиянием"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
-msgstr "забрать изменения с помощью перебазирования, а не слияния"
+msgstr "забрать изменения с помощью перемещения, а не слияния"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "разрешить перемотку вперед"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "автоматически выполнять stash/stash pop до и после перемещения"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "Опции, связанные с извлечением изменений"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "количество подмодулей, которые будут получены парралельно"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Неправильное значение для pull.ff: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "Нет претендентов для перемещения среди ссылок, которые вы только что получили."
-#: builtin/pull.c:401
+#: builtin/pull.c:417
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "Нет претендентов для слияния среди ссылок, которые вы только что получили."
-#: builtin/pull.c:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "Обычно это означает, что вы передали спецификацию ссылки с помощью шаблона и этот шаблон ни с чем не совпал на внешнем репозитории."
-#: builtin/pull.c:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -10664,69 +10915,69 @@
"for your current branch, you must specify a branch on the command line."
msgstr "Вы попросили получить изменения со внешнего репозитория «%s», но не указали ветку. Так как это не репозиторий по умолчанию для вашей текущей ветки, вы должны указать ветку в командной строке."
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Вы сейчас ни на одной из веток."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Пожалуйста, укажите на какую ветку вы хотите переместить изменения."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Пожалуйста, укажите с какой веткой вы хотите слить изменения."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "Для дополнительной информации, смотрите git-pull(1)."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<внешний-репозиторий>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<ветка>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "У текущей ветки нет информации об отслеживании."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Если вы хотите указать информацию о отслеживаемой ветке, выполните:"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
"from the remote, but no such ref was fetched."
msgstr "Ваша конфигурация указывает, что нужно слить изменения со ссылкой\n«%s» из внешнего репозитория, но такая ссылка не была получена."
-#: builtin/pull.c:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "игнорирование --verify-signatures при перемещении"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash можно использовать только вместе с --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:873
msgid "Updating an unborn branch with changes added to the index."
msgstr "Обновление еще не начавшейся ветки с изменениями, добавленными в индекс."
-#: builtin/pull.c:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "получение с перемещением"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "сделайте коммит или спрячьте их."
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -10734,7 +10985,7 @@
"commit %s."
msgstr "извлечение обновило указатель на вашу текущую ветку.\nперемотка вашего рабочего каталога\nс коммита %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -10745,15 +10996,15 @@
"to recover."
msgstr "Не удалось перемотать вперёд изменения в вашем рабочем каталоге.\nПосле того, как вы убедитесь, что вы сохранили всё необходимое из вывода\n$ git diff %s\n, запустите\n$ git reset --hard\nдля восстановления исходного состояния."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "Нельзя слить несколько веток в пустой указатель на ветку."
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "Невозможно переместить над несколькими ветками."
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "невозможно выполнить перемещение с записанными локальными изменениями в подмодулях"
@@ -10761,21 +11012,21 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<опции>] [<репозиторий> [<спецификатор-ссылки>…]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "указано сокращение tag, но не указана сама <метка>"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "опция --delete принимает только простые целевые имена ссылок"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
msgstr "\nЧтобы выбрать любую из опций на постоянной основе, смотрите push.default в «git help config»."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -10790,7 +11041,7 @@
"%s"
msgstr "Имя вышестоящей ветки и вашей текущей ветки различаются. Чтобы отправить изменения в вышестоящую ветку на внешнем репозитории, используйте:\n\n git push %s HEAD:%s\n\nЧтобы отправить изменения в ветку с таким же именем на внешнем репозитории, используйте:\n\n git push %s %s\n%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -10800,7 +11051,7 @@
" git push %s HEAD:<name-of-remote-branch>\n"
msgstr "Вы сейчас не находитесь ни на одной из веток.\nЧтобы отправить историю, ведущую к текущему (отделённый HEAD) состоянию, используйте\n\n git push %s HEAD:<имя-внешней-ветки>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -10809,13 +11060,13 @@
" git push --set-upstream %s %s\n"
msgstr "Текущая ветка %s не имеет вышестоящей ветки.\nЧтобы отправить текущую ветку и установить внешнюю ветку как вышестоящую для этой ветки, используйте\n\n git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid ""
"The current branch %s has multiple upstream branches, refusing to push."
msgstr "Ваша текущая ветка %s имеет несколько вышестоящих веток, отказ в отправке изменений."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -10823,11 +11074,11 @@
"to update which remote branch."
msgstr "Вы сейчас отправляете изменения на внешний репозиторий «%s», который не является вышестоящим для вашей текущей ветки «%s», без указания того, что отправлять и в какую внешнюю ветку."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid "You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "Вы не указали спецификацию ссылки для отправки, а push.default указан как «nothing»."
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -10835,7 +11086,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как верхушка вашей текущей ветки\nпозади ее внешней части. Заберите и слейте внешние изменения \n(например, с помощью «git pull …») перед повторной попыткой отправки\nизменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -10843,7 +11094,7 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как верхушка отправляемой ветки\nпозади ее внешней части. Переключитесь на ветку и заберите внешние\nизменения (например, с помощью «git pull …») перед повторной\nпопыткой отправки изменений.\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -10852,33 +11103,33 @@
"See the 'Note about fast-forwards' in 'git push --help' for details."
msgstr "Обновления были отклонены, так как внешний репозиторий содержит\nизменения, которых у вас нет в вашем локальном репозитории.\nОбычно, это связанно с тем, что кто-то уже отправил изменения в \nто же место. Перед повторной отправкой ваших изменений, вам нужно\nзабрать и слить изменения из внешнего репозитория себе\n(например, с помощью «git pull …»).\nДля дополнительной информации, смотрите «Note about fast-forwards»\nв «git push --help»."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Обновления были отклонены, так как метка уже существует во внешнем репозитории."
-#: builtin/push.c:275
+#: builtin/push.c:277
msgid ""
"You cannot update a remote ref that points at a non-commit object,\n"
"or update a remote ref to make it point at a non-commit object,\n"
"without using the '--force' option.\n"
msgstr "Вы не можете обновить внешнюю ссылку, которая указывает на объект, не являющийся коммитом или обновить внешнюю ссылку так, чтобы она указывала на объект, не являющийся коммитом, без указания опции «--force».\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "Отправка в %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "не удалось отправить некоторые ссылки в «%s»"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "плохой репозитория «%s»"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote repository using\n"
@@ -10890,112 +11141,112 @@
" git push <name>\n"
msgstr "Не настроена точка назначения для отправки.\nЛибо укажите URL с помощью командной строки, либо настройте внешний репозиторий с помощью\n\n git remote add <имя> <адрес>\n\nа затем отправьте изменения с помощью имени внешнего репозитория\n\n git push <имя>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "--all и --tags нельзя использовать одновременно"
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr "--all нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "--mirror и --tags нельзя использовать одновременно"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror нельзя использовать вместе со спецификаторами ссылок"
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "--all и --mirror нельзя использовать одновременно"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "репозиторий"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "отправить все ссылки"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "сделать зеркало всех ссылок"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "удалить ссылки"
-#: builtin/push.c:528
+#: builtin/push.c:540
msgid "push tags (can't be used with --all or --mirror)"
msgstr "отправить метки (нельзя использовать вместе с --all или --mirror)"
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "принудительное обновление"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "имя-ссылки>:<ожидается"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "требовать, чтобы старое значение ссылки было ожидаемым"
-#: builtin/push.c:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "управление рекурсивной отправкой подмодулей"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "использовать тонкие пакеты"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "путь к программе упаковки на сервере"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "установить вышестоящую ветку для git pull/status"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "почистить локально удаленные ссылки"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "пропустить перехватчик pre-push"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr "отправить пропущенные, но нужные метки"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "подписать отправку с помощью GPG"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "запросить выполнение атомарной транзакции на внешней стороне"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "зависит-от-сервера"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "передаваемые опции"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete несовместимо с --all, --mirror и --tags"
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "--delete не имеет смысла без указания ссылок"
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr "опции для отправки не должны содержать символы перевода строк"
@@ -11074,19 +11325,51 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<опции>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "оставить пустые коммиты"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "продолжить перемещение"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "остановить перемещение"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "создать сценарий перемещения"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "вывести короткие идентификаторы коммитов в списке действий"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "вывести полные идентификаторы коммитов в списке действий"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "проверить список дел"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "пропустить ненужные команды pick"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "переставить строки fixup/squash"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "вставить команды исполнения коммитов в списке действий"
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <каталог-git>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -11103,7 +11386,7 @@
"'receive.denyCurrentBranch' configuration variable to 'refuse'."
msgstr "По умолчанию, обновлять текущую ветку в репозитории с рабочей\nкопией (не голом) запрещено, так как это сделает состояние индекса\nи рабочего каталога противоречивым, и вам прийдется выполнить\n«git reset --hard», чтобы состояние рабочего каталога снова\nсоответствовало HEAD.\n\nВы можете установить значение опции «receive.denyCurrentBranch»\nв «ignore» или «warn» во внешнем репозитории, чтобы разрешить\nотправку в его текущую ветку; но это не рекомендуется, если только\nвы не намерены обновить его рабочий каталог способом подобным\nвышеописанному.\n\nЧтобы пропустить это сообщение и все равно оставить поведение\nпо умолчанию, установите значение опции «receive.denyCurrentBranch»\nв «refuse»."
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -11123,12 +11406,7 @@
msgid "You must specify a directory."
msgstr "Вы должны указать каталог."
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "«%s» для «%s» не является допустимой меткой даты/времени"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "«%s» не является допустимой меткой даты/времени"
@@ -11264,12 +11542,12 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "указание отслеживаемых веток имеет смысл только при зеркальном извлечении"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "внешний репозиторий %s уже существует"
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "«%s» не является допустимым именем внешнего репозитория."
@@ -11292,17 +11570,17 @@
msgid "(delete)"
msgstr "(удаленная)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Нет такого внешнего репозитория: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Не удалось переименовать секцию конфигурации с «%s» на «%s»"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11310,17 +11588,17 @@
"\tPlease update the configuration manually if necessary."
msgstr "Не обновляю нестандартную спецификатор ссылки для извлечения\n\t%s\n\tПожалуйста, если требуется, обновите конфигурацию вручную."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "не удалось удалить «%s»"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "не удалось создать «%s»"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11332,143 +11610,143 @@
msgstr[2] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
msgstr[3] "Примечание: Некоторые ветки вне иерархии refs/remotes/ не будут удалены;\nчтобы удалить их, используйте:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Не удалось удалить секцию файла конфигурации «%s»"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " новая (следующее извлечение сохранит ее в remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " отслеживается"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " недействительна (используйте «git remote prune», чтобы удалить)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "неправильный параметр конфигурации branch.%s.merge; невозможно переместить более чем над 1 веткой"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "перемещается интерактивно над внешней веткой %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "перемещается над внешней веткой %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " будет слита с внешней веткой %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "будет слита с внешней веткой %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s и с внешней веткой %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "создана"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "удалена"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "уже актуальна"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "возможна перемотка вперед"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "локальная ветка устарела"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s будет принудительно отправлена в %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s будет отправлена в %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s будет принудительно отправлена в %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s будет отправлена в %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "не опрашивать внешние репозитории"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* внешний репозиторий %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL для извлечения: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(нет URL)"
#. TRANSLATORS: the colon ':' should align
#. with the one in " Fetch URL: %s"
#. translation.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL для отправки: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD ветка: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(не запрашивался)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(неизвестно)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD ветка (HEAD внешнего репозитория неоднозначный, может быть одним из):\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -11477,11 +11755,11 @@
msgstr[2] " Внешние ветки:%s"
msgstr[3] " Внешние ветки:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (статус не запрашивался)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
msgid " Local branch configured for 'git pull':"
msgid_plural " Local branches configured for 'git pull':"
msgstr[0] " Локальная ветка, настроенная для «git pull»:"
@@ -11489,11 +11767,11 @@
msgstr[2] " Локальные ветки, настроенные для «git pull»:"
msgstr[3] " Локальные ветки, настроенные для «git pull»:"
-#: builtin/remote.c:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " Локальные ссылки, зеркалируемые с помощью «git push»"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, c-format
msgid " Local ref configured for 'git push'%s:"
msgid_plural " Local refs configured for 'git push'%s:"
@@ -11502,132 +11780,132 @@
msgstr[2] " Локальные ссылки, настроенные для «git push»%s:"
msgstr[3] " Локальные ссылки, настроенные для «git push»%s:"
-#: builtin/remote.c:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "установить refs/remotes/<имя>/HEAD в зависимости от внешнего репозитория"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "удалить refs/remotes/<имя>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Не удалось определить внешний HEAD"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "Несколько внешних HEAD веток. Укажите явно одну из них:"
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "Не удалось удалить %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "Недопустимая ссылка: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "Не удалось настроить %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s будет висящей веткой!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s стала висящей веткой!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Очистка %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [будет удалена] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [удалена] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "почистить внешние репозитории после извлечения"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Нет такого внешнего репозитория «%s»"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "добавить ветку"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "не указан внешний репозиторий"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "запросить URL отправки, вместо URL извлечения"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "вернуть все URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "URL не настроены для внешнего репозитория «%s»"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "управление URL отправки"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "добавить URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "удалить URL"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add нельзя использовать одновременно с --delete"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Неправильный шаблон старого URL: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Не найдены совпадения URL: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Нельзя удалить все URL не-отправки"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "быть многословнее; должно стоять перед подкомандой"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Неизвестная подкоманда: %s"
@@ -11722,7 +12000,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable и -A нельзя использовать одновременно"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "сбой удаления «%s»"
@@ -11852,119 +12130,132 @@
msgid "keep"
msgstr "оставлением"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "У вас нет верного HEAD."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Не удалось найти дерево у HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Не удалось найти дерево у %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD сейчас на %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "Нельзя выполнить сброс в режиме «%s» во время слияния."
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "тихий режим, выводить только ошибки"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "сбросить HEAD и индекс"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "сбросить только HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "сбросить HEAD, индекс и рабочий каталог"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "сбросить HEAD, но оставить локальные изменения"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr "записать только факт того, что удаленные пути будут добавлены позже"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Не удалось распознать «%s» как действительную редакцию."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "Не удалось распознать «%s» как действительное дерево."
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch нельзя использовать одновременно с --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "использование опции --mixed с путями устарело; используйте «git reset -- <пути>» instead."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Нельзя выполнить сброс в режиме «%s» вместе с указанием пути."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "сброс «%s» разрешен только с голым репозиторием"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N можно использовать вместе с --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Непроиндексированные изменения после сброса:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Не удалось сбросить файл индекса на редакцию «%s»."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "Не удалось записать новый файл индекса."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "фильтрация объектов требует указания параметра --objects"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "недопустимое частичное значение «%s»"
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "rev-list не поддерживает отображение заметок"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "нельзя использовать --use-bitmap-index одновременно с фильтрацией объектов"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<опции>] -- [<аргументы>…]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "передавать далее «--» как аргумент"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "остановить разбор после первого аргумента не являющегося опцией"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "выводить аргументы в длинном формате"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12050,11 +12341,11 @@
msgid "keep redundant, empty commits"
msgstr "оставить избыточные, пустые коммиты"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "сбой обращения изменений коммита"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "сбой при копировании коммита"
@@ -12122,17 +12413,17 @@
msgid "exit with a zero status even if nothing matched"
msgstr "выход с нулевым кодом возврата, даже если ничего не найдено"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "не удаляю рекурсивно «%s» без указания опции -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: не удалось удалить %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "не удалось удалить «%s»"
@@ -12163,27 +12454,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<опции>] [<диапазон-редакций>] [[--] [<путь>…]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Группировать по коммитеру, а не по автору"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "отсортировать вывод по количеству коммитов у автора"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Не выводить описания коммитов, а только их количество"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Показать почту каждого из авторов"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Перенос строк на выводе"
@@ -12382,215 +12673,243 @@
msgid "prepend comment character and space to each line"
msgstr "добавить перед каждой строкой символ комметария и пробел"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "Нет такой ссылки: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Ожидалось полное имя ссылки, а получено %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "не удалось обрезать один компонент url «%s»"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "альтернативный символ для относительных путей"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "URL для подмодуля по пути «%s» не найден в .gitmodules"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "не удалось запросить конфигурацию «%s». Предполагаю, что этот репозиторий имеет свой собственный вышестоящий репозиторий."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "Сбой регистрации адреса для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:479
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "Подмодуль «%s» (%s) зарегистрирован по пути «%s»\n"
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:489
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "внимание: предполагаемый режим обновления для подмодуля «%s»\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:496
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "Сбой регистрации режима обновления для пути подмодуля «%s»"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "Не выводить информацию о инициализации подмодуля"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<путь>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <путь>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "не найдено соответствие подмодулей в .gitmodules для пути «%s»"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "не удалось найти HEAD ссылку внутри подмодуля «%s»"
+
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "не удалось перейти вглубь подмодуля «%s»"
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "Не выводить статус подмодуля"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "Использовать коммит хранящийся в индексе вместо коммита хранящегося в HEAD подмодуля"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "проходить вглубь вложенных подмодулей"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<путь>…]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <путь>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "подмодулю «%s» не удалось добавить альтернативу: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateErrorStrategy не рапознано"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:842
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "Значение «%s» для параметра submodule.alternateLocation не рапознано"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "куда должен быть склонирован новый подмодуль"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "имя нового подмодуля"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "url откуда должен был склонирован новый подмодуль"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "глубина для частичного клона"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "принудительно выводить прогресс клонирования"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
msgstr "git submodule--helper clone [--prefix=<путь>] [--quiet] [--reference <репозиторий>] [--name <имя>] [--depth <глубина>] --url <url> --path <путь>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "не удалось клонировать «%s» в подмодуль по пути «%s»"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "не удалось получить каталог для подмодуля «%s»"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Подмодуль по пути «%s» не инициализирован"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "Возможно, вы хотели использовать «update --init»?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Пропуск не слитого подмодуля %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Пропуск подмодуля «%s»"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Не удалось клонировать «%s». Запланирована повторная попытка"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "Не удалось клонировать «%s» со второй попытки, отмена"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "путь в рабочем каталоге"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
msgid "path into the working tree, across nested submodule boundaries"
msgstr "путь в рабочем каталоге, в пределах границ подмодуля"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout или none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "Создать частичный клон, ограниченный указанным количеством редакций"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "параллельные задачи"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "должен ли изначальный процесс клонирования следовать рекомендации о частичности"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "вы выводить прогресс клонирования"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<путь>] [<путь>…]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "плохое значение для параметра update"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, 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:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "рекурсивно по подмодулям"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<путь>…]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s не поддерживает параметр --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "«%s» не является подкомандой submodule--helper"
@@ -12603,23 +12922,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <имя>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "не выводить сообщения об ошибках для несимвольных (отсоединенных) ссылок"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "удалить символьные ссылки"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "укороченный вывод ссылок"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "причина"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "причина обновления"
@@ -12643,17 +12962,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<формат>] <имя-метки>…"
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "метка «%s» не найдена."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Метка «%s» удалена (была %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -12662,7 +12981,7 @@
"Lines starting with '%c' will be ignored.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут проигнорированы.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -12671,142 +12990,142 @@
"Lines starting with '%c' will be kept; you may remove them yourself if you want to.\n"
msgstr "\nВведите сообщение для метки:\n %s\nСтроки, начинающиеся с «%c» будут оставлены; вы можете удалить их вручную, если хотите.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "не удалось подписать метку"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "не удалось записать файл метки"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "неправильный тип объекта"
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "нет описания метки?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Сообщение метки было оставлено в %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "список названий меток"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "печатать <n> строк описания от каждой метки"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "удалить метки"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "проверить метки"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Настройки создания метки"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "для аннотированной метки нужно сообщение"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "описание метки"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "аннотированная и подписанная с помощью GPG метка"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "использовать другой ключ для подписания метки"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "замена метки, если она существует"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "создать журнал ссылок"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Настройки вывода списка меток"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "показать список меток по столбцам"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "вывод только меток, которые содержат коммит"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "вывод только меток, которые не содержат коммит"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "вывод только слитых меток"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "вывод только не слитых меток"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "вывод только меток, определенного объекта"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column и -n нельзя использовать одновременно"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "опцию -n можно использовать только в режиме списка"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "опцию --contains можно использовать только в режиме списка"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "опцию --no-contains можно использовать только в режиме списка"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "опцию --points-at можно использовать только в режиме списка"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "опции --merged и --no-merged можно использовать только в режиме списка"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "-F и -m нельзя использовать одновременно."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "передано слишком много параметров"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "«%s» не является допустимым именем метки."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "метка «%s» уже существует"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Метка «%s» обновлена (была %s)\n"
@@ -12815,217 +13134,250 @@
msgid "Unpacking objects"
msgstr "Распаковка объектов"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "не удалось создать каталог %s"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "не удалось выполнить stat %s"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "не удалось создать файл %s"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "не удалось удалить файл %s"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "не удалось удалить каталог %s"
-#: builtin/update-index.c:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Проверка mtime в «%s» "
-#: builtin/update-index.c:150
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "информация статистики каталога не изменяется после добавления нового файла"
-#: builtin/update-index.c:163
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "информация статистики каталога не изменяется после добавления нового каталога"
-#: builtin/update-index.c:176
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "информация статистики каталога изменяется после добавления нового файла"
-#: builtin/update-index.c:187
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "информация статистики каталога изменяется после добавления нового файла внутри подкаталога"
-#: builtin/update-index.c:198
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "информация статистики каталога не изменяется после удаления файла"
-#: builtin/update-index.c:211
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "информация статистики каталога не изменяется после удаления каталога"
-#: builtin/update-index.c:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<опции>] [--] [<файл>…]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr "продолжить обновление, даже если индекс требует обновления"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "обновление: игнорировать подмодули"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "не игнорировать новые файлы"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "разрешить файлам заменять каталоги и наоборот"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "замечать файлы отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr "обновить, даже если в индексе имеются не слитые записи"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "обновить информацию о статусе файлов"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "как --refresh, но игнорировать настройку assume-unchanged"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<режим доступа>,<объект>,<путь>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "добавить указанную запись в индекс"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "пометить файлы как «не измененные»"
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "убрать пометку assumed-unchanged"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "пометить файлы как «только в индексе»"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "убрать пометку skip-worktree"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
msgid "add to index only; do not add content to object database"
msgstr "только добавить в индекс; не добавлять содержимое в базу данных объектов"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:983
msgid "remove named paths even if present in worktree"
msgstr "удалить указанные пути, даже если они существуют в рабочем каталоге"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "с опцией --stdin: строки на вводе отделяются НУЛЕВЫМ байтом"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
msgid "read list of paths to be updated from standard input"
msgstr "прочитать список обновляемых путей из стандартного ввода"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr "добавить записи из стандартного ввода в индекс"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "заново заполнить индекс #2 и #3 для указанных путей"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "обновить только записи, которые отличаются от HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "игнорировать файлы, отсутствующие в рабочем каталоге"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "вывести выполняемые действия на стандартный вывод"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(для машинной обработки) забыть сохраненные неразрешенные конфликты"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "записать индекс в указанном формате"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "разрешить или запретить раздельный индекс"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "включить/отключить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr "проверить, что файловая система поддерживает кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr "включить кэш неотслеживаемых файлов без проверки файловой системы"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+msgid "write out the index even if is not flagged as changed"
+msgstr "записать индекс, даже если он не помечен как измененный"
+
+#: builtin/update-index.c:1024
+msgid "enable or disable file system monitor"
+msgstr "включить или выключить мониторинг файловой системы"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "пометить файл как действительный в мониторе файловой системы"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "снять пометку действительности мониторе файловой системы"
+
+#: builtin/update-index.c:1127
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:1117
+#: builtin/update-index.c:1136
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:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
msgstr "параметр core.untrackedCache установлен true; удалите или измените его, если вы действительно хотите удалить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "Кэш неотслеживаемых файлов отключен"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want"
" to enable the untracked cache"
msgstr "параметр core.untrackedCache установлен false; удалите или измените его, если вы действительно хотите включить кэш неотслеживаемых файлов"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Кэш неотслеживаемых файлов включен для «%s»"
+#: builtin/update-index.c:1171
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr "параметр core.fsmonitor не установлен; установите его если вы действительно хотите включить мониторинг файловой системы"
+
+#: builtin/update-index.c:1175
+msgid "fsmonitor enabled"
+msgstr "мониторинг файловой системы включён"
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr "параметр core.fsmonitor установлен; удалите его если вы действительно хотите выключить мониторинг файловой системы"
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr "мониторинг файловой системы выключён"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<опции>] -d <имя-ссылки> [<старое-значение>]"
@@ -13038,19 +13390,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<опции>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "удалить ссылку"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "обновить <имя-ссылки> а не то, на что она указывает"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "ввод отделённый НУЛЕВЫМИ символами"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "прочитать обновления из стандартного ввода"
@@ -13094,122 +13446,141 @@
msgid "print tag contents"
msgstr "вывести содержимое метки"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<опции>] <путь> [<ветка>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<опции>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<опции>] <путь>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<опции>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <путь>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Удаление рабочих каталогов/%s: не является каталогом"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Удаление рабочих каталогов/%s: файл gitdir не существует"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Удаление рабочих каталогов/%s: не удалось прочитать файл gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "Удаление рабочего каталога/%s: прочитано мало данных (ожидалось %<PRIuMAX> байт, прочитано %<PRIuMAX>)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Удаление рабочих каталогов/%s: недействительный файл gitdir"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Удаление рабочих каталогов/%s: gitdir указывает на несуществующее расположение"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "вывести список удаленных рабочих каталогов"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr "удалить рабочие каталоги старее чем <дата-окончания>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "«%s» уже существует"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "не удалось создать каталог «%s»"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Подготовка %s (идентификатор %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
msgid "checkout <branch> even if already checked out in other worktree"
msgstr "переключиться на <ветка> даже если она уже активна в другом рабочесм каталоге"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "создать новую ветку"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "создать или перейти на ветку"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "наполнить новый рабочий каталог"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "держать рабочий каталог заблокированным"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "настроить режим отслеживания ветки (смотрите git-branch(1))"
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "пытаться найти соответствие имени новой ветки с именем внешней ветки"
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B и --detach нельзя использовать одновременно"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "--[no-]track можно использовать только когда вы создаёте новую ветку"
+
+#: builtin/worktree.c:553
msgid "reason for locking"
msgstr "причина блокировки"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "«%s» не является рабочим каталогом"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr "Главный рабочий каталог не может быть заблокирован или разблокирован"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "«%s» уже заблокирован, причина: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "«%s» уже заблокирован"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "«%s» не заблокирован"
@@ -13230,7 +13601,7 @@
msgid "only useful for debugging"
msgstr "используется только при отладке"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<опции>] <каталог>"
@@ -13250,7 +13621,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "прервать передачу после <кол> секунд простоя"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13259,7 +13630,7 @@
"\tchmod 0700 %s"
msgstr "Права доступа к вашему каталогу сокетов слишком свободны; друге пользователи могуи читать ваши закэшированные пароли доступа. Обдумайте запуск команды:\n\n\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "вывод отладочных сообщений на stderr"
@@ -13270,20 +13641,20 @@
"to read about a specific subcommand or concept."
msgstr "«git help -а» и «git help -g» выводит список доступных подкоманд и\nнекоторые руководства по темам. Запустите «git help <команда>» или\n«git help <термин>», чтобы прочесть о конкретных подкоманде или теме."
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "отрицательное значение http.postbuffer; использую стандартное значение %d"
-#: http.c:358
+#: http.c:360
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Делегация проверки полномочий не поддерживается с cURL < 7.22.0"
-#: http.c:367
+#: http.c:369
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "Public key pinning не поддерживается с cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13296,6 +13667,14 @@
msgid "redirecting to %s"
msgstr "переадресация на %s"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "аргументы"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "фильтрация объектов"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "создание рабочей области (смотрите также: git help tutorial)"
@@ -13468,27 +13847,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "Плохой аргумент bisect_write: $state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Плохой ввод номера редакции: $arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Плохой ввод номера редакции: $bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Плохой ввод номера редакции: $rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "«git bisect $TERM_BAD» может принимать только один аргумент."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Предупреждение: попытка двоичного поиска с указанием только $TERM_BAD коммита."
@@ -13496,18 +13875,18 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "Вы уверены [Y - да/n - нет]? "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr "Вам нужно передать мне как минимум одну $bad_syn и одну $good_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $bad_syn» и «git bisect $good_syn».)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -13515,91 +13894,76 @@
"(You can use \"git bisect $bad_syn\" and \"git bisect $good_syn\" for that.)"
msgstr "Для начала нужно запустить «git bisect start».\nПосле этого, вам нужно передать мне как минимум одну $good_syn и одну $bad_syn редакцию.\n(Для этого вы можете использовать команды «git bisect $good_syn» и «git bisect $good_syn».)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "Вы сейчас не в процессе бинарного поиска."
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "«$invalid» не является действительным коммитом"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
"Try 'git bisect reset <commit>'."
msgstr "Не удалось перейти на оригинальную ветку HEAD «$branch».\nПопробуйте запустить «git bisect reset <коммит>»."
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "Не передан файл журнала"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "не удалось прочитать $file для повтора изменений"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? вы о чем?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "сбой при выполнении двоичного поиска: не передана команда."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "запускаю $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
"exit code $res from '$command' is < 0 or >= 128"
msgstr "не удалось выполнить двоичный поиск:\nкод завершения $res от «$command» оказался < 0 или >= 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "bisect run больше не может продолжать"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
"'bisect_state $state' exited with error code $res"
msgstr "не удалось выполнить двоичный поиск:\n«bisect_state $state» завершился с кодом ошибки $res"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "bisect run выполнен успешно"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "используйте два разных определения"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "«$term» не является допустимым определением"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "нельзя использовать встроенную команду «$term» как определение"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "нельзя изменить значение определения «$term»"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "Недопустимая команда: вы сейчас находитесь на $TERM_BAD/$TERM_GOOD двоичном поиске."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "определения не заданы"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -13627,7 +13991,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Уже обновлено в соответствии с $pretty_name"
#: git-merge-octopus.sh:89
@@ -13646,52 +14010,53 @@
#: git-rebase.sh:58
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 "Когда вы разрешите этот конфликт, запустите «git rebase --continue».\nЕсли вы хотите пропустить этот патч, то запустите «git rebase --skip».\nЧтобы перейти на оригинальную ветку и остановить перемещение, запустите «git rebase --abort»."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --abort\"."
+msgstr "Разрешите все конфликты вручную, пометьте их разрешёнными с помощью «git add/rm <конфликтующие-файлы>», а затем запустите «git rebase --continue».\nЕсли вы хотите пропустить этот коммит, то запустите «git rebase --skip».\nЧтобы вернуться на состояние до «git rebase», запустите «git rebase --abort»."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Не удалось перейти назад на $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Применены автоматически спрятанные изменения."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Не удалось сохранить $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Перехватчик pre-rebase отказал в перемещении."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "Похоже, git-am выполняется. Перемещение невозможно."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Похоже, что выполняется «git am». Невозможно выполнить перемещение."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Нет перемещения в процессе?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Действие --edit-todo может использоваться только при интерактивном перемещении."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Не удалось прочитать HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
msgstr "Вы должны отредактировать все\nконфликты слияния, а потом пометить\nих как разрешенные с помощью git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -13704,222 +14069,221 @@
"valuable there."
msgstr "Похоже, каталог $state_dir_base уже существует и я предполагаю, что вы в процессе другого перемещения. Если это так, попробуйте\n\t$cmd_live_rebase\nЕсли нет\n\t$cmd_clear_stale_rebase\nи запустите меня снова. Я останавливаюсь, чтобы вы не потеряли что-то важное."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "недействительная вышестоящая ветка $upstream_name"
+msgid "invalid upstream '$upstream_name'"
+msgstr "недействительная вышестоящая ветка «$upstream_name»"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: имеется больше одной базы слияния"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: нет базы слияния"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Не указывает на действительный коммит: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "критическая ошибка: нет такой ветки: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "критическая ошибка: нет такой ветки/коммита «$branch_name»"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "Не удалось автоматически спрятать изменения"
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Изменения автоматически спрятаны: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "Сделайте коммит или спрячьте их."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD уже в актуальном состоянии."
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
-msgstr "Текущая ветка $branch_name уже свежая."
+msgstr "Текущая ветка $branch_name уже в актуальном состоянии."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD уже в актуальном состоянии, принудительное перемещение."
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
-msgstr "Текущая ветка $branch_name уже свежая, принудительное перемещение."
+msgstr "Текущая ветка $branch_name уже в актуальном состоянии, принудительное перемещение."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Изменения от $mb до $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr "Сначала перематываем указатель текущего коммита, чтобы применить ваши изменения поверх него…"
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Перемотана вперед $branch_name до $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash очистка с параметрами не реализована"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "У вас еще нет начального коммита"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "Не удалось сохранить текущее состояние индекса"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "Невозможно сохранить неотслеживаемые файлы"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "Не удалось сохранить текущее состояние рабочего каталога"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "Изменения не выбраны"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "Не удалось удалить временный индекс (не должно случаться)"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "Не удалось записать состояние рабочего каталога"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Не удалось обновить $ref_stash с помощью $w_commit"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr "ошибка: неизвестная опция для «stash save»: $option\n Для предоставления сообщения, используйте git stash save -- «$option»"
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "ошибка: неизвестный параметр для «stash push»: $option"
+
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "Нельзя использовать --patch и --include-untracked или --all одновременно"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "Нет локальных изменений для сохранения"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "Не удалось инициализировать спрятанные изменения"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "Не удалось сохранить текущий статус"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Рабочий каталог и состояние индекса сохранены $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "Не удалось удалить изменения рабочего каталога"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "неизвестная опция: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "Не найдены спрятанные изменения."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Передано слишком много редакций: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference не является действительной ссылкой"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "«$args» не похоже на коммит со спрятанными изменениями"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "«$args» не является ссылкой на спрятанные изменения"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "не удалось обновить индекс"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Нельзя применить спрятанные изменения во время выполнения слияния"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "Конфликты в индексе. Попробуйте без --index."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "Не удалось сохранить дерево индекса"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr "Невозможно восстановить неотслеживаемые файлы из спрятанных изменений"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "Невозможно убрать из индекса измененные файлы"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "Индекс не был извлечён из спрятанных изменений."
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
msgstr "Спрятанные изменения сохранены, на случай если они снова вам понадобятся."
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Отброшено ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Не удалось отбросить запись из спрятанных изменений"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "Не указано имя ветки"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(Чтобы восстановить их, наберите «git stash apply»)"
@@ -14048,110 +14412,105 @@
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Подмодуль «$name» ($url) был снят с регистрации по пути «$displaypath»"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "Не удалось найти текущую редакцию для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
"'$sm_path'"
msgstr "Не удалось найти текущую редакцию ${remote_name}/${branch} для подмодуля по пути «$sm_path»"
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Не удалось выполнить извлечение для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, 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:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переключиться на состояние «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: забрано состояние «$sha1»"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось переместить «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: перемещен над «$sha1»"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "Не удалось выполнить слияние с «$sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Подмодуль по пути «$displaypath»: слито с «$sha1»"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "Сбой выполнения «$command $sha1» для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Подмодуль по пути «$displaypath»: «$command $sha1»"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$displaypath»"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "Опцию --cached нельзя использовать одновременно с опцией --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "неизвестный режим $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммит $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " Предупреждение: $display_name не содержит коммиты $sha1_src и $sha1_dst"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Не удалось выполнить рекурсивно для подмодуля по пути «$sm_path»"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Синхронизация url для подмодуля «$displaypath»"
@@ -14170,16 +14529,16 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\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 = выполнить команду (остаток строки) с помощью командной оболочки\n d, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n"
+msgstr "\nКоманды:\np, pick = использовать коммит\nr, reword = использовать коммит, но изменить сообщение коммита\ne, edit = использовать коммит, но остановиться для внесения правок\ns, squash = использовать коммит, но объединить его с предыдущим коммитом\nf, fixup = как «squash», но отбросить сообщение этого коммита\nx, exec = выполнить команду (остаток строки) с помощью командной оболочки\nd, drop = удалить коммит\n\nЭти строки могут быть перемещены; выполняются по очереди сверху вниз.\n"
#: git-rebase--interactive.sh:171
msgid ""
@@ -14239,27 +14598,27 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "Нельзя уплотнить слияние: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Ошибка при повторении слияния $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "Не удалось взять $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Это сообщение коммита номер #${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Сообщение коммита номер #${n} будет пропущено:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, sh-format
msgid "This is a combination of $count commit."
msgid_plural "This is a combination of $count commits."
@@ -14268,22 +14627,22 @@
msgstr[2] "Это объединение $count коммитов"
msgstr[3] "Это объединение $count коммитов"
-#: git-rebase--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Не удалось записать $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Это объединение 2 коммитов"
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Не удалось применить $sha1… $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -14292,31 +14651,31 @@
"you are able to reword the commit."
msgstr "Не удолось исправить коммит после успешного перехода на $sha1… $rest\nЭто произошло, скорее всего, из-за пустого сообщения коммита или из-за перехватчика перед коммитом. Если же это произошло из-за перехватчика перед коммитом, то вам нужно решить с ним проблему и повторить попытку снова."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Остановлено на $sha1_abbrev… $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "Нельзя сделать «$squash_style» без указания предыдущего коммита"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Выполнение: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "Не удалось выполнить: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "и были сделаны изменения в индексе и/или в рабочем каталоге"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -14324,7 +14683,7 @@
msgstr "Вы можете исправить ошибку, а затем запустить\n\n\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -14334,78 +14693,29 @@
"\tgit rebase --continue"
msgstr "Успешное выполнение: $rest\nно остались изменения в индексе и/или в рабочем каталоге\nСделайте коммит или спрячьте ваши изменения, а затем выполните\n\n\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Неопознанная команда: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Пожалуйста исправьте это с помощью «git rebase --edit-todo»."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
-msgstr "Успешно перебазирован и обновлён $head_name."
+msgstr "Успешно перемещён и обновлён $head_name."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Не удалось пропустить ненужные команды отбора (pick)"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr "Внимание: не найден SHA-1 или он не указывает на коммит. На строке:\n - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr "Внимание: команда не распознана на строке:\n - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "не удалось отделить HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr "Внимание: некоторые коммиты могли быть отброшены по ошибке.\nОтброшенные коммиты (от новых к старым):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr "Для избежания этого сообщения, используйте «drop» чтобы явно удалить коммит.\n\nИспользуйте опцию «git config rebase.missingCommitsCheck» для изменения количества предупреждений.\nВозможные значения: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr "Нераспознанная настройка $check_level для опции rebase.missingCommitsCheck. Игнорирую."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase "
-"--continue'."
-msgstr "Вы можете исправить это с помощью «git rebase --edit-todo», а потом запустив «git rebase --continue»."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Или вы можете отменить процесс перебазирования с помощью «git rebase --abort»."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Не удалось удалить CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -14423,21 +14733,21 @@
" 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--interactive.sh:1105
+#: git-rebase--interactive.sh:785
msgid "Error trying to find the author identity to amend commit"
msgstr "Произошла ошибка при поиске автора для исправления коммита"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:790
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--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "Не удалось закоммитить проиндексированные изменения."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -14446,33 +14756,37 @@
"\n"
msgstr "\nВы сейчас редактируете файл со списком дел для интерактивного перемещения.\nДля продолжения перемещения, после редактирования файла запустите:\n git rebase --continue\n\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Не удалось запустить редактор"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Не удалось перейти на версию $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "Нет указателя HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Не удалось создать временный каталог $state_dir"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "Не удалось пометить как интерактивный"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "Не удалось инициализировать перезаписанные коммиты"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Не удалось сгенерировать список дел"
+
+#: git-rebase--interactive.sh:973
#, sh-format
msgid "Rebase $shortrevisions onto $shortonto ($todocount command)"
msgid_plural "Rebase $shortrevisions onto $shortonto ($todocount commands)"
@@ -14481,14 +14795,14 @@
msgstr[2] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
msgstr[3] "Перемещение $shortrevisions над $shortonto ($todocount команд)"
-#: git-rebase--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
"\n"
msgstr "\nНо если вы удалите все, то процесс перемещения будет будет прерван.\n\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Заметьте, что пустые коммиты закомментированны"
@@ -15007,59 +15321,59 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "локальный сдвиг времени больше или равен 24 часа\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "редактор был завершен с ошибкой, отменяю всё"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid "'%s' contains an intermediate version of the email you were composing.\n"
msgstr "«%s» содержит промежуточную версию письма, которое вы готовите.\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "«%s.final» содержит подготовленное письмо.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases не совместимо с другими опциями\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "Нельзя запускать git format-patch вне репозитория\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Неизвестное поле --suppress-cc: «%s»\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Неизвестный параметр --confirm: «%s»\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "предупреждение: сокращение для sendmail с кавычками не поддерживается: %s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "предупреждение: «:include:» не поддерживается: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "предупреждение: перенаправление «/file» или «|pipe» не поддерживается: %s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "предупреждение: строка sendmail не распознана: %s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -15069,36 +15383,36 @@
" * Giving --format-patch option if you mean a range.\n"
msgstr "Файл «%s» существует, но это также может быть и\nдиапазоном коммитов для которых нужно сделать патчи. \nУстраните неоднозначность…\n\n * Указав \"./%s\" если вы имеете в виду имя файла; или\n * Передав опцию --format-patch если вы имеете в виду диапазон коммитов.\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Не удалось выполнить opendir %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
"warning: no patches were sent\n"
msgstr "критическая ошибка: %s: %s\nпредупреждение: патчи не были отправлены\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
"\n"
msgstr "\nФайл с патчем не указан!\n\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Нет строки с темой в %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Не удалось открыть для записи %s: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -15107,41 +15421,41 @@
"Clear the body content if you don't wish to send a summary.\n"
msgstr "Строки, начинающиеся с «GIT:» будут удалены.\nВозможно будет полезно включить статистику добавлений\nи удалений или таблицу содержимого в патч, который вы пишете.\n\nОчистите содержимое, если вы не хотите отправлять письмо с краткой информацией.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Не удалось открыть %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Не удалось открыть %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "Поля To/Cc/Bcc пока еще не обрабатываются и будут проигнорированы\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "Письмо с краткой информацией пустое, попускаю его\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "Вы уверены, что хотите использовать <%s> [y/N]? "
-#: git-send-email.perl:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
msgstr "Следующие файлы 8 битные, но не содержат Content-Transfer-Encoding.\n"
-#: git-send-email.perl:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Какую 8 битную кодировку нужно указать [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -15149,20 +15463,20 @@
"has the template subject '*** SUBJECT HERE ***'. Pass --force if you really want to send.\n"
msgstr "Отказываюсь отправить, т.к. патч\n\t%s\nсодержит шаблонный заголовок «*** SUBJECT HERE ***». Укажите параметр --force, если вы действительно хотите отправить его.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Кому должны быть отправлены письма (если нужно)?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "критическая ошибка: сокращение «%s» раскрывается само в себя\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "ошибка: не удалось выделить действительный адрес из: %s\n"
@@ -15170,16 +15484,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:944
+#: git-send-email.perl:941
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "Что нужно сделать с этим адресом? ([q] - выход|[d] - отбросить|[e] - редактировать): "
-#: git-send-email.perl:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "путь CA «%s» не существует"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -15196,128 +15510,128 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Отправить это письмо? ([y] - да|[n] - нет|[q] - выход|[a] - все): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "Отправка этого ответа на письмо обязательна"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr "Требуемый SMTP сервер не был правильно объявлен."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Сервер не поддерживает STARTTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "Ошибка STARTTLS! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "Не удалось инициализировать SMTP. Проверьте ваши настройки и попробуйте запустить в параметром --smtp-debug."
-#: git-send-email.perl:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "Не удалось отправить %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Имитация отправки %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "Отправлено %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "Имитация OK. Журнал содержит:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "OK. Журнал содержит:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "Результат: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "Результат: OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "не удалось открыть файл %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1551
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) Добавление to: %s со строки «%s»\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1599
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1624
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) Добавление cc: %s со строки «%s»\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Не удалось выполнить «%s»"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Добавление %s: %s из: «%s»\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) не удалось закрыть поток к «%s»"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "не удалось отправить сообщение в 7 битной кодировке"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "недопустимая кодировка передачи"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "не удалось открыть %s: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: патч содержит строку длиннее чем 998 символов"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Вы действительно хотите отправить %s? [y - да|N - нет]: "
diff --git a/po/sv.po b/po/sv.po
index 48c5765..2dcd3ef 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -1,14 +1,14 @@
# Swedish translations for Git.
-# Copyright (C) 2010-2017 Peter krefting <peter@softwolves.pp.se>
+# Copyright (C) 2010-2018 Peter Krefting <peter@softwolves.pp.se>
# This file is distributed under the same license as the Git package.
-# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
+# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
#
msgid ""
msgstr ""
-"Project-Id-Version: git 2.14.0\n"
+"Project-Id-Version: git 2.16.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-19 22:35+0200\n"
-"PO-Revision-Date: 2017-07-20 22:56+0200\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-09 20:07+0100\n"
"Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n"
"Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
"Language: sv\n"
@@ -16,49 +16,49 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.0.2\n"
+"X-Generator: Gtranslator 2.91.7\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "tips: %.*s\n"
-#: advice.c:86
+#: advice.c:90
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:88
+#: advice.c:92
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:90
+#: advice.c:94
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:92
+#: advice.c:96
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:94
+#: advice.c:98
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:96
+#: advice.c:100
#, 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:104
+#: advice.c:108
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -66,23 +66,23 @@
"Rätta dem i din arbetskatalog och använd sedan \"git add/rm <fil>\"\n"
"som lämpligt för att ange lösning och checka in."
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "Avslutar på grund av olöst konflikgt."
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)."
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "Checka in dina ändringar innan du utför sammanslagningen."
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "Avslutar på grund av ofullbordad sammanslagning."
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -121,82 +121,82 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "okänt alternativ för ignore-whitespace: \"%s\""
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject och --3way kan inte användas samtidigt."
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached och --3way kan inte användas samtidigt."
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "--3way utanför arkiv"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "--index utanför arkiv"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "--cached utanför arkiv"
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "Kan inte förbereda reguljärt uttryck för tidsstämpeln %s"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec returnerade %d för indata: %s"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "kan inte hitta filnamn i patchen på rad %d"
-#: apply.c:967
+#: apply.c:942
#, 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:973
+#: apply.c:948
#, 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:974
+#: apply.c:949
#, 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:979
+#: apply.c:954
#, 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:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "ogiltigt läge på rad %d: %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "huvudet är inkonsekvent mellan rad %d och %d"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount: förväntade rad: %.*s"
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "patch-fragment utan huvud på rad %d: %.*s"
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -212,82 +212,82 @@
"sökvägskomponenter\n"
"tas bort (rad %d)"
-#: apply.c:1600
+#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git-diff-huvudet saknar filnamnsinformation (rad %d)"
-#: apply.c:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "ny fil beror på gammalt innehåll"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "borttagen fil har fortfarande innehåll"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "trasig patch på rad %d"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "nya filen %s beror på gammalt innehåll"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "borttagna filen %s har fortfarande innehåll"
-#: apply.c:1848
+#: apply.c:1841
#, 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:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "trasig binärpatch på rad %d: %.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "binärpatchen på rad %d känns inte igen"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "patch med bara skräp på rad %d"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "kunde inte öppna eller läsa %s"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "felaktig inledning på rad: \"%c\""
-#: apply.c:3052
+#: apply.c:3055
#, 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:3064
+#: apply.c:3067
#, 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:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -296,25 +296,25 @@
"vid sökning efter:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "saknar binära patchdata för \"%s\""
-#: apply.c:3100
+#: apply.c:3103
#, 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:3146
+#: apply.c:3149
#, 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:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
@@ -322,300 +322,300 @@
"patchen appliceras på \"%s\" (%s), som inte motsvarar det nuvarande "
"innehållet."
-#: apply.c:3164
+#: apply.c:3167
#, 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:3182
+#: apply.c:3185
#, 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:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "binärpatchen kan inte tillämpas på \"%s\""
-#: apply.c:3201
+#: apply.c:3204
#, 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:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "patch misslyckades: %s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "kan inte checka ut %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "misslyckades läsa %s"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "läser från \"%s\" som är på andra sidan av en symbolisk länk"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "sökvägen %s har ändrat namn/tagits bort"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: finns inte i indexet"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: motsvarar inte indexet"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr ""
"arkivet saknar objekt som behövs för att falla tillbaka på 3-"
"vägssammanslagning."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Faller tillbaka på trevägssammanslagning...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "kunde inte läsa aktuellt innehåll i \"%s\""
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Misslyckades falla tillbaka på trevägssammanslagning...\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "Applicerade patchen på \"%s\" med konflikter.\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "Tillämpade patchen på \"%s\" rent.\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "patch för borttagning lämnar kvar filinnehåll"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: fel typ"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s har typen %o, förväntade %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "ogiltig sökväg ”%s”"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s: finns redan i indexet"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s: finns redan i arbetskatalogen"
-#: apply.c:3941
+#: apply.c:3945
#, 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:3946
+#: apply.c:3950
#, 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:3966
+#: apply.c:3970
#, 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:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: patchen kan inte tillämpas"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "Kontrollerar patchen %s..."
-#: apply.c:4076
+#: apply.c:4080
#, 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:4083
+#: apply.c:4087
#, 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:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1-informationen saknas eller är oanvändbar (%s)."
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry misslyckades för sökvägen \"%s\""
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "kunde inte lägga till %s till temporärt index"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "kunde inte skriva temporärt index till %s"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "kan inte ta bort %s från indexet"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "trasig patch för undermodulen %s"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "kan inte ta status på nyligen skapade filen \"%s\""
-#: apply.c:4292
+#: apply.c:4296
#, 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:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "kan inte lägga till cachepost för %s"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "misslyckades skriva till \"%s\""
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "stänger filen \"%s\""
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "kan inte skriva filen \"%s\" läge %o"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Tillämpade patchen %s rent."
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "internt fel"
-#: apply.c:4522
+#: apply.c:4526
#, 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:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "trunkerar .rej-filnamnet till %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "kan inte öppna %s"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Stycke %d tillämpades rent."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "Refuserar stycke %d."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "Ignorerar patch \"%s\"."
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "indata känns inte igen"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "kan inte läsa indexfilen"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "kan inte öppna patchen \"%s\": %s"
-#: apply.c:4860
+#: apply.c:4864
#, 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:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, 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:4874
+#: apply.c:4878
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Kunde inte skriva ny indexfil"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "sökväg"
@@ -628,7 +628,7 @@
msgid "apply changes matching the given path"
msgstr "tillämpa ändringar som motsvarar given sökväg"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "antal"
@@ -680,7 +680,7 @@
msgid "build a temporary index based on embedded index information"
msgstr "bygg ett temporärt index baserat på inbyggd indexinformation"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "sökvägar avdelas med NUL-tecken"
@@ -688,7 +688,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "se till att åtminstone <n> rader sammanhang är lika"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "åtgärd"
@@ -716,9 +718,9 @@
msgid "allow overlapping hunks"
msgstr "tillåt överlappande stycken"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "var pratsam"
@@ -730,7 +732,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "lite inte på antalet linjer i styckehuvuden"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "rot"
@@ -757,108 +759,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <arkiv> [--exec <kmd>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "fmt"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "arkivformat"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "prefix"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "lägg till prefix till varje sökväg i arkivet"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "fil"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "skriv arkivet till filen"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "läs .gitattributes i arbetskatalogen"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "rapportera arkiverade filer på standard fel"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "endast spara"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "komprimera snabbare"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "komprimera bättre"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "visa understödda arkivformat"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "arkiv"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "hämta arkivet från fjärrarkivet <arkiv>"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "kommando"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "sökväg till kommandot git-upload-archive på fjärren"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Oväntad flagga --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "Flaggan --exec kan endast användas tillsammans med --remote"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Oväntad flagga --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Okänt arkivformat \"%s\""
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Argumentet stöd inte för formatet \"%s\": -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%-*s är inte ett giltigt namn på attribut"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -866,22 +868,22 @@
"Negativa mönster ignoreras i git-attribut\n"
"Använd '\\!' för att inleda med ett utropstecken."
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "Felaktigt citerat innehåll i filen \"%s\": %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Det finns inte mer att göra \"bisect\" på!\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "Namnet på incheckningen är inte giltigt: %s"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -890,7 +892,7 @@
"Sammanslagningsbasen %s är trasig.\n"
"Det betyder att felet har rättats mellan %s och [%s].\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -899,7 +901,7 @@
"Sammanslagningsbasen %s är ny.\n"
"Egenskapen har ändrats mellan %s och [%s].\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -908,7 +910,7 @@
"Sammanslagningsbasen %s är %s.\n"
"Det betyder att den första \"%s\" incheckningen är mellan %s och [%s].\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -919,7 +921,7 @@
"git bisect kan inte fungera korrekt i detta fall.\n"
"Kanske du skrev fel %s- och %s-revisioner?\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -931,36 +933,36 @@
"%s.\n"
"Vi fortsätter ändå."
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "Bisect: en sammanslagningsbas måste testas\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "en %s-revision behövs"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "kunde inte skapa filen \"%s\""
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "kunde inte läsa filen \"%s\""
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "misslyckades läsa bisect-referenser"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s var både %s och %s\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
@@ -969,7 +971,7 @@
"Ingen testbar incheckning hittades.\n"
"Kanske du startade med felaktiga sökvägsparametrar?\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -979,7 +981,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -1000,10 +1002,10 @@
"--reverse och --first-parent tillsammans kräver att du anger senaste "
"incheckningen"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "misslyckades skapa revisionstraversering"
@@ -1044,45 +1046,50 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
+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."
+"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."
+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."
+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."
+msgid "Branch '%s' set up to track local branch '%s'."
+msgstr "Grenen \"%s\" ställdes in att spåra den lokala grenen \"%s\"."
#: branch.c:104
#, 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."
+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."
#: branch.c:105
#, 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 "Branch '%s' set up to track remote ref '%s'."
+msgstr "Grenen \"%s\" ställdes in att spåra fjärreferensen \"%s\"."
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
+msgid "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"Grenen %s ställdes in att spåra den lokala referensen %s genom ombasering."
+"Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\" genom "
+"ombasering."
#: branch.c:110
#, 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 "Branch '%s' set up to track local ref '%s'."
+msgstr "Grenen \"%s\" ställdes in att spåra den lokala referensen \"%s\"."
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1093,31 +1100,31 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr "Spårar inte: tvetydig information för referensen %s"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "\"%s\" är inte ett giltigt grennamn."
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Det finns redan en gren som heter ”%s”."
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "Kan inte tvinga uppdatering av aktuell gren."
-#: branch.c:218
+#: branch.c:233
#, 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."
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "den efterfrågade uppströmsgrenen \"%s\" finns inte"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1137,27 +1144,27 @@
"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:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Objektnamnet är inte giltigt: \"%s\"."
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Objektnamnet är tvetydigt: \"%s\"."
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Avgreningspunkten är inte giltig: ”%s”."
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "\"%s\" är redan utcheckad på \"%s\""
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "HEAD i arbetskatalogen %s har inte uppdaterats"
@@ -1172,7 +1179,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "okänt huvud: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "kunde inte öppna \"%s\""
@@ -1181,56 +1189,56 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "Arkivet saknar dessa nödvändiga incheckningar:"
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Paketet (bundlen) innehåller denna referens:"
msgstr[1] "Paketet (bundlen) innehåller dessa %d referenser:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Paketet (bundlen) beskriver en komplett historik."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Paketet (bundlen) kräver denna referens:"
msgstr[1] "Paketet (bundlen) kräver dessa %d referenser:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Kunde inte starta pack-objects"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "pack-objects misslyckades"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list dog"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "referensen \"%s\" exkluderas av argumenten till rev-list"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "okänt argument: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Vägrar skapa ett tomt paket (bundle)."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "kan inte skapa \"%s\""
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "index-pack dog"
@@ -1239,8 +1247,8 @@
msgid "invalid color value: %.*s"
msgstr "felaktigt färgvärde: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "kunde inte tolka %s"
@@ -1250,7 +1258,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s är inte en incheckning!"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1260,7 +1268,7 @@
"Uppdatera det efter att ha rättat meddelandet, eller ändra variabeln\n"
"i18n.commitencoding till den teckenkodning som används i ditt projekt.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "minnet slut"
@@ -1353,80 +1361,85 @@
msgid "failed to expand user dir in: '%s'"
msgstr "misslyckades expandera användarkatalog i: \"%s\""
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "felaktigt zlib-komprimeringsgrad %d"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "felaktigt läge för skapande av objekt: %s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "felaktig paketkomprimeringsgrad %d"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr "kan inte tolka kommandoradskonfiguration"
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr "okänt fel uppstod vid läsning av konfigurationsfilerna"
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "Felaktigt %s: \"%s\""
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"okänt värde \"%s\" för core.untrackedCache; använder standardvärdet \"keep\""
-#: config.c:2111
+#: config.c:2162
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "värdet \"%d\" för splitIndex.maxPercentage borde vara mellan 0 och 100"
-#: config.c:2122
+#: config.c:2187
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "kunde inte tolka värdet \"%s\" från kommandoradskonfiguration"
-#: config.c:2124
+#: config.c:2189
#, 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:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s har flera värden"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "fstat misslyckades på %s"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "kunde inte ställa in \"%s\" till \"%s\""
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "kunde inte ta bort inställning för \"%s\""
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "Fjärren lade på vid inledande kontakt"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1440,19 +1453,19 @@
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Kontrollerar konnektivitet"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Kunde inte köra \"git rev-list\""
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "kunde inte skriva till rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "kunde inte stänga rev-list:s standard in"
@@ -1488,50 +1501,108 @@
msgid "in the future"
msgstr "i framtiden"
-#: date.c:122 date.c:129 date.c:136 date.c:143 date.c:149 date.c:156 date.c:167
-#: date.c:175 date.c:180
-msgid "%"
-msgid_plural "%"
-msgstr[0] "%"
-msgstr[1] "%"
+#: date.c:122
+#, c-format
+msgid "%<PRIuMAX> second ago"
+msgid_plural "%<PRIuMAX> seconds ago"
+msgstr[0] "%<PRIuMAX> sekund sedan"
+msgstr[1] "%<PRIuMAX> sekunder sedan"
+
+#: date.c:129
+#, c-format
+msgid "%<PRIuMAX> minute ago"
+msgid_plural "%<PRIuMAX> minutes ago"
+msgstr[0] "%<PRIuMAX> minut sedan"
+msgstr[1] "%<PRIuMAX> minuter sedan"
+
+#: date.c:136
+#, c-format
+msgid "%<PRIuMAX> hour ago"
+msgid_plural "%<PRIuMAX> hours ago"
+msgstr[0] "%<PRIuMAX> timme sedan"
+msgstr[1] "%<PRIuMAX> timmar sedan"
+
+#: date.c:143
+#, c-format
+msgid "%<PRIuMAX> day ago"
+msgid_plural "%<PRIuMAX> days ago"
+msgstr[0] "%<PRIuMAX> dag sedan"
+msgstr[1] "%<PRIuMAX> dagar sedan"
+
+#: date.c:149
+#, c-format
+msgid "%<PRIuMAX> week ago"
+msgid_plural "%<PRIuMAX> weeks ago"
+msgstr[0] "%<PRIuMAX> vecka sedan"
+msgstr[1] "%<PRIuMAX> veckor sedan"
+
+#: date.c:156
+#, 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:167
+#, c-format
+msgid "%<PRIuMAX> year"
+msgid_plural "%<PRIuMAX> years"
+msgstr[0] "%<PRIuMAX> år"
+msgstr[1] "%<PRIuMAX> år"
#. TRANSLATORS: "%s" is "<n> years"
#: date.c:170
-msgid "%s, %"
-msgid_plural "%s, %"
-msgstr[0] "%s. %"
-msgstr[1] "%s. %"
+#, 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:175 date.c:180
+#, c-format
+msgid "%<PRIuMAX> year ago"
+msgid_plural "%<PRIuMAX> years ago"
+msgstr[0] "%<PRIuMAX> år sedan"
+msgstr[1] "%<PRIuMAX> år sedan"
#: diffcore-order.c:24
#, c-format
msgid "failed to read orderfile '%s'"
msgstr "kunde inte läsa orderfilen \"%s\""
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "Utför onöjaktig namnbytesdetektering"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "flaggan \"%s\" behöver ett värde"
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n"
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Okänd dirstat-parameter \"%s\"\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"färginställningen för flyttade block måste vara en av \"no\", \"default\", "
+"\"zebra\", \"dimmed_zebra\", \"plain\""
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\""
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1540,20 +1611,20 @@
"Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n"
"%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "extern diff dog, stannar vid %s"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only, --name-status, -check och -s är ömsesidigt uteslutande"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow kräver exakt en sökvägsangivelse"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1562,228 +1633,237 @@
"Misslyckades tolka argument till flaggan --dirstat/-X;\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\""
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"onöjaktig namnbytesdetektering utfördes inte på grund av för många filer."
-#: diff.c:4719
+#: diff.c:5449
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:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr ""
"du kan sätta variabeln %s till åtminstone %d och försöka kommandot på nytt."
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "misslyckades hämta kärnans namn och information"
-#: dir.c:2067
+#: dir.c:2219
msgid "Untracked cache is disabled on this system or location."
msgstr "Ospårad cache är inaktiverad på systemet eller platsen."
-#: dir.c:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "kunde inte skapa kataloger för %s"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "kunde inte migrera git-katalog från \"%s\" till \"%s\""
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "tips: Väntar på att textredigeringsprogrammet skall stänga filen...%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Filtrerar innehåll"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "kunde inte ta status på filen \"%s\""
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: förväntade grund lista"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-patch: förväntade ACK/NAK, fick EOF"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "fjärrfel: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, 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:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc kräver ”multi_ack_detailed”"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "ogiltig \"shallow\"-rad: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "ogiltig \"unshallow\"-rad: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "objektet hittades inte: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "fel i objekt: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "ingen \"shallow\" hittades: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "förväntade shallow/unshallow, fick %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "fick %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "ogiltig incheckning %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "ger upp"
-#: fetch-pack.c:533 progress.c:235
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "klart"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "fick %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Markerar %s som komplett"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "har redan %s (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-patch: kunde inte grena av sidbandsmultiplexare"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "protokollfel: felaktigt packhuvud"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-patch: kunde inte grena av %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "%s misslyckades"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "fel i sidbands-avmultiplexare"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "Servern stöder inte klienter med grunda arkiv"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "Servern stöder \"multi_ack_detailed\""
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "Servern stöder \"no-done\""
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "Servern stöder \"multi_ack\""
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "Servern stöder \"side-band-64k\""
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "Servern stöder \"side-band\""
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Servern stöder \"allow-tip-sha1-in-want\""
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Servern stöder \"allow-reachable-sha1-in-want\""
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "Servern stöder \"ofs-delta\""
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "Serverversionen är %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "Servern stöder inte --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Servern stöder inte --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "Servern stöder inte --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "inga gemensamma incheckningar"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-patch: hämtning misslyckades."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "inget motsvarande fjärrhuvud"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "ingen sådan fjärreferens: %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, 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"
@@ -1796,7 +1876,7 @@
msgid "could not create temporary file"
msgstr "kunde inte skapa temporära fil"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "misslyckades skriva fristående signatur till \"%s\""
@@ -1806,17 +1886,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "ignorera felaktig färg \"%.*s\" i log.graphColors"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "\"%s\" kunde inte läsa %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "misslyckades ta status på \"%s\""
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "\"%s\": kort läsning"
@@ -1886,12 +1966,12 @@
msgid "git version [<options>]"
msgstr "git version [<flaggor>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -1959,12 +2039,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "namnet består enbart av ej tillåtna tecken: %s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "felaktigt datumformat: %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "flera objektfiltertyper kan inte kombineras"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "ogiltig filterspec-utryck \"%s\""
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -1984,87 +2073,87 @@
"tidigare:\n"
"ta bort filen manuellt för att fortsätta."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Kunde inte skapa \"%s.lock\": %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "misslyckades läsa cachen"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "kunde inte skriva ny indexfil"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(felaktig incheckning)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache misslyckades för sökvägen \"%s\""
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "fel vid byggande av träd"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "misslyckades skapa sökvägen \"%s\"%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": kanske en K/F-konflikt?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "vägrar förlora ospårad fil vid \"%s\""
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "kan inte läsa objektet %s: \"%s\""
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "blob förväntades för %s \"%s\""
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "misslyckades öppna \"%s\": %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "misslyckades skapa symboliska länken \"%s\": %s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "vet inte hur %06o %s \"%s\" skall hanteras"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Misslyckades exekvera intern sammanslagning"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "Kunde inte lägga till %s till databasen"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2073,7 +2162,7 @@
"KONFLIKT (%s/radera): %s raderad i %s och %s i %s. Versionen %s av %s lämnad "
"i trädet."
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2082,7 +2171,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:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2091,7 +2180,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:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2100,20 +2189,20 @@
"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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "namnbyte"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "namnbytt"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, 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:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2122,139 +2211,144 @@
"KONFLIKT (namnbyte/namnbyte): Namnbyte \"%s\"->\"%s\" på grenen \"%s\" "
"namnbyte \"%s\"->\"%s\" i \"%s\"%s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (lämnad olöst)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "Byter namn på %s till %s och %s till %s istället"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "KONFLIKT (namnbyte/tillägg): Namnbyte %s->%s i %s. %s tillagd i %s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Lägger till sammanslagen %s"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Lägger till som %s istället"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "kan inte läsa objektet %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "objektet %s är inte en blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "ändra"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "ändrad"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "innehåll"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "tillägg/tillägg"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "Hoppade över %s (sammanslagen samma som befintlig)"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Slår ihop %s automatiskt"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "undermodul"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "KONFLIKT (%s): Sammanslagningskonflikt i %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Tar bort %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "fil/katalog"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "katalog/fil"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "Lägger till %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "Smutsigt index: kan inte slå ihop (smutsiga: %s)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "Redan à jour!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "sammanslagning av träden %s och %s misslyckades"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Slår ihop:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, 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:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "sammanslagningen returnerade ingen incheckning"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Kunde inte tolka objektet \"%s\""
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Kunde inte skriva indexet."
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2266,7 +2360,7 @@
"att checka in eller avbryta föregående sammanslagning innan du påbörjar en "
"ny antecknings-sammanslagning."
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "Du har inte avslutat antecknings-sammanslagningen (%s finns)."
@@ -2294,16 +2388,30 @@
msgid "Bad %s value: '%s'"
msgstr "Felaktigt värde på %s: \"%s\""
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "kunde inte tolka objektet: %s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "offset före slutet av packfilen (trasig .idx?)"
+
+#: packfile.c:1683
+#, 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:1687
+#, 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.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "användning: %s"
@@ -2311,17 +2419,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " eller: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-TAL"
@@ -2330,7 +2438,7 @@
msgid "malformed object name '%s'"
msgstr "felformat objektnamn \"%s\""
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Kunde inte göra %s skrivbar för gruppen"
@@ -2404,24 +2512,16 @@
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:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
-"utgåva. använd istället . om du vill träffa alla sökvägar"
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "sökvägsangivelsen \"%s\" är på andra sidan av en symbolisk länk"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "kunde inte tolka format för --pretty"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2430,7 +2530,7 @@
"index.version satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2439,51 +2539,52 @@
"GIT_INDEX_VERSION satt, men värdet är ogiltigt.\n"
"Använder version %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "kunde inte stänga \"%s\""
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "kunde inte ta status på \"%s\""
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "kunde inte öppna git-katalog: %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "misslyckades ta bort länken: %s"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Kunde inte öppna \"%s\" för skrivning"
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr "referensuppdateringar förbjudna i karantänmiljö"
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "kunde inte ta bort referensen %s: %s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "kunde inte ta bort referenser: %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "kunde inte ta bort referensen %s"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "kunde inte ta bort referensen %s: %s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "kunde inte ta bort referenser: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "försvunnen"
@@ -2502,157 +2603,157 @@
msgid "ahead %d, behind %d"
msgstr "före %d, bakom %d"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "förväntat format: %%(color:<color>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "okänd färg: %%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "Heltalsvärde förväntades refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "Heltalsvärde förväntades refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "okänt %%(%s)-argument: %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) tar inte argument"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) tar inte argument"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) tar inte argument"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "okänt %%(trailers)-argument: %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "positivt värde förväntat contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "okänt %%(contents)-argument: %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "positivt värde förväntat objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "okänt %%(objectname)-argument: %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "förväntat format: %%(align:<bredd>,<position>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "okänd position:%s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "okänd bredd:%s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "okänt %%(align)-argument: %s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "positiv bredd förväntad med atomen %%(align)"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "okänt %%(if)-argument: %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "felformat fältnamn: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "okänt fältnamn: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "format: atomen %%(if) använd utan en %%(then)-atom"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "format: atomen %%(then) använd utan en %%(if)-atom"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "format: atomen %%(then) använd mer än en gång"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "format: atomen %%(then) använd efter %%(else)"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "format: atomen %%(else) använd utan en %%(if)-atom"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "format: atomen %%(else) använd utan en %%(then)-atom"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "format: atomen %%(else) använd mer än en gång"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "format: atomen %%(end) använd utan motsvarande atom"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "felformad formatsträng %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(ingen gren, ombaserar %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "(ingen gren, \"bisect\" startad på %s)"
@@ -2660,7 +2761,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD frånkopplat vid %s)"
@@ -2668,137 +2769,137 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD frånkopplat från %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(ingen gren)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "objektet %s saknas för %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer misslyckades på %s för %s"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "felformat objekt vid \"%s\""
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "ignorerar referens med trasigt namn %s"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "ignorerar trasig referens %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "format: atomen %%(end) saknas"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "felformat objektnamn %s"
-#: remote.c:747
+#: remote.c:780
#, 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:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s spårar vanligtvis %s, inte %s"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s spårar både %s och %s"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "Internt fel"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD pekar inte på en gren"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "okänd gren: \"%s\""
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "ingen standarduppström angiven för grenen \"%s\""
-#: remote.c:1698
+#: remote.c:1729
#, 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:1713
+#: remote.c:1744
#, 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:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "grenen \"%s\" har ingen fjärr för \"push\""
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "\"push\"-referensspecifikation för \"%s\" innehåller inte \"%s\""
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "\"push\" har inget mål (push.default är \"ingenting\")"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr "\"enkel push\" motsvarar flera olika mål"
-#: remote.c:2076
+#: remote.c:2106
#, 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:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (använd \"git branch --unset-upstream\" för att rätta)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "Din gren är à jour med \"%s\".\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
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:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2808,11 +2909,11 @@
msgstr[1] ""
"Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n"
-#: remote.c:2104
+#: remote.c:2134
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:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2827,46 +2928,55 @@
"Din gren och \"%s\" har divergerat,\n"
"och har %d respektive %d olika incheckningar.\n"
-#: remote.c:2117
+#: remote.c:2147
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"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "din nuvarande gren verkar vara trasig"
-#: revision.c:2190
+#: revision.c:2271
#, 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:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent är inkompatibelt med --bisect"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "misslyckades öppna /dev/null"
-#: send-pack.c:151
+#: run-command.c:1188
+#, 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:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "kunde inte tolka fjärruppackningsstatus: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "fjärruppackning misslyckades: %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "misslyckades underteckna push-certifikatet"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "mottagarsidan stöder inte push med --signed"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2874,32 +2984,32 @@
"sänder inte push-certifikat eftersom mottagarsidan inte stlder push med --"
"signed"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "mottagarsidan stöder inte push med --atomic"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "mottagarsidan stöder inte push-flaggor"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "revert"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Okänd funktion: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -2907,7 +3017,7 @@
"efter att ha löst konflikterna, markera de rättade sökvägarna\n"
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\""
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2917,42 +3027,43 @@
"med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n"
"och checka in resultatet med \"git commit\""
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "kunde inte låsa \"%s\""
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "kunde inte skriva till \"%s\""
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "kunde inte skriva radslut till \"%s\""
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "misslyckades färdigställa \"%s\"."
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "dina lokala ändringar skulle skrivas över av %s."
-#: sequencer.c:360
+#: sequencer.c:362
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:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: snabbspola"
@@ -2960,20 +3071,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s: Kunde inte skriva ny indexfil"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "kunde inte bestämma HEAD:s incheckning\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "kunde inte bestämma HEAD:s incheckning"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "kan inte uppdatera cacheträd\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "kan inte uppdatera cacheträd"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3002,17 +3113,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "kunde inte tolka incheckningen %s\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "kunde inte tolka föräldraincheckningen %s\n"
+msgid "could not parse commit %s"
+msgstr "kunde inte tolka incheckningen %s"
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "kunde inte tolka föräldraincheckningen %s"
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3023,7 +3134,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3034,231 +3145,242 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "Det här är en kombination av %d incheckningar."
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "behöver en HEAD-incheckning att rätta"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "kunde inte läsa HEAD"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "kunde inte läsa HEAD:s incheckningsmeddelande"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "kan inte skriva \"%s\""
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Det här är 1:a incheckningsmeddelandet:"
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "kunde inte läsa incheckningsmeddelande för %s"
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "Det här är incheckningsmeddelande %d:"
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "Incheckningsmeddelande %d kommer hoppas över:"
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "okänt kommando: %d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "din indexfil har inte slagits ihop."
-#: sequencer.c:973
+#: sequencer.c:986
#, 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:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "incheckning %s har inte förälder %d"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "huvudlinje angavs, men incheckningen %s är inte en sammanslagning."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s: kan inte tolka föräldraincheckningen %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "kunde inte byta namn på \"%s\" till \"%s\""
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "kunde inte ångra %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "kunde inte tillämpa %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "den angivna uppsättningen incheckningar är tom"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s: misslyckades läsa indexet"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s: misslyckades uppdatera indexet"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s tar inte argument: \"%s\""
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "argument saknas för %s"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "ogiltig rad %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "kan inte utföra \"%s\" utan en föregående incheckning"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "kunde inte läsa \"%s\"."
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "rätta det med \"git rebase --edit-todo\"."
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "oanvändbart manus: ”%s”"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "inga incheckningar lästes."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "kan inte utföra \"cherry-pick\" under en \"revert\"."
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "kan inte utföra \"revert\" under en \"cherry-pick\"."
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "felaktig nyckel: %s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "felaktigt värde för %s: %s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "trasigt manus: ”%s”"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "en \"cherry-pick\" eller \"revert\" pågår redan"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "kunde inte skapa \"sequencer\"-katalogen \"%s\""
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "kunde inte låsa HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "ingen \"cherry-pick\" eller \"revert\" pågår"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "kan inte bestämma HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
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:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "kan inte öppna \"%s\""
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "kan inte läsa \"%s\": %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "oväntat filslut"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, 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:1658
+#: sequencer.c:1691
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:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "kan inte läsa HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "kunde inte kopiera in \"%s\" till \"%s\""
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "kunde inte läsa indexet"
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3273,11 +3395,11 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
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:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3294,17 +3416,17 @@
"\tgit rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Tillämpade autostash.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "kan inte spara %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3315,57 +3437,57 @@
"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:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Stoppade på %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "okänt kommando %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "kunde inte läsa orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "kunde inte läsa \"onto\""
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "kunde inte uppdatera %s"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "kunde inte uppdatera HEAD till %s"
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "kan inte ombasera: Du har oköade ändringar."
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "kunde inte ta bort CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "kan inte lägga till incheckning som inte finns"
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "ogiltig fil: \"%s\""
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "ogiltigt innehåll: \"%s\""
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3375,24 +3497,99 @@
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: sequencer.c:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "kunde inte checka in köade ändringar."
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: kan inte göra \"cherry-pick\" på typen ”%s”"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: felaktig revision"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "kan inte ångra som första incheckning"
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: flaggor som inte stöds"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: fel när revisioner skulle förberedas"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "oanvändbar todo-lista: %s"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Varning: vissa incheckningar kan av misstag ha tappats.\n"
+"Tappade incheckningar (nyaste först):\n"
+
+#: sequencer.c:2702
+#, 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 ""
+"För att undvika det här meddelandet kan du använda \"drop\" för att "
+"explicit\n"
+"kasta en incheckning.\n"
+"\n"
+"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
+"varningsnivån.\n"
+"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
+"\" (fel).\n"
+"\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
+"continue\".\n"
+"Avbryt ombaseringen med \"git rebase --abort\".\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "kunde inte tolka incheckningen\" %s\""
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "skriptet har redan omordnats."
+
#: setup.c:171
#, c-format
msgid ""
@@ -3426,34 +3623,34 @@
"Använd \"--\" för att skilja sökvägar från revisioner, så här:\n"
"\"git <kommando> [<revision>...] -- [<fil>...]\""
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "Förväntade git-arkivversion <= %d, hittade %d"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "okända arkivutökningar hittades:"
-#: setup.c:810
+#: setup.c:811
#, 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:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Kan inte gå tillbaka till arbetskatalogen (cwd)"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "Kan inte läsa aktuell arbetskatalog"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "Kan inte byta till \"%s\""
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3463,7 +3660,7 @@
"monteringspunkten %s)\n"
"Stoppar vid filsystemsgräns (GIT_DISCOVERY_ACROSS_FILESYSTEM är inte satt)."
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3472,55 +3669,41 @@
"Problem med filläges-värdet i core.sharedRepository (0%.3o).\n"
"Ägaren av filerna måste alltid ha läs- och skrivbehörighet."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "sökvägen \"%s\" finns inte"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "referensarkivet \"%s\" som en länkad utcheckning stöds inte ännu."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "referensarkivet \"%s\" är inte ett lokalt arkiv."
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "referensarkivet \"%s\" är grunt"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "referensarkivet \"%s\" är ympat"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "offset före slutet av packfilen (trasig .idx?)"
-
-#: sha1_file.c:2729
-#, 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?)"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "offset borton slutet av packindex för %s (trunkerat index?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "kort SHA1 %s är tvetydig"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "Kandidaterna är:"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3542,66 +3725,71 @@
"Undersök referenserna och ta kanske bort dem. Stäng av meddelandet\n"
"genom att köra \"git config advice.objectNameWarning false\""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
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:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, 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:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Kunde inte uppdatera .gitmodules-posten %s"
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "Kunde inte ta bort .gitmodules-posten för %s"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "misslyckades köa uppdaterad .gitmodules"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "negativa värden är inte tillåtna för submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "i ej utcheckad undermodul \"%s\""
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Sökvägsangivelsen \"%s\" är i undermodulen \"%.*s\""
-#: submodule.c:1337
+#: submodule.c:833
+#, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "Misslyckades slå upp HEAD som giltig referens."
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "\"%s\" känns inte igen som ett git-arkiv"
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "kunde inte starta \"git status\" i undermodulen \"%s\""
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "kunde inte köra \"git status\" i undermodulen \"%s\""
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "undermodulen \"%s\" har ett smutsigt index"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3609,18 +3797,18 @@
"relocate_gitdir för undermodulen \"%s\", som har mer än en arbetskatalog, "
"stöds ej"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "kunde inte slå upp namnet för undermodulen \"%s\""
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3631,79 +3819,83 @@
"\"%s\" till\n"
"\"%s\"\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "kunde inte rekursera in i undermodulen \"%s\""
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "kunde inte starta ls-files i .."
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG: returnerad sökvägssträng matchar inte cwd?"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree returnerade en oväntad returkod %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "negativa värden är inte tillåtna för submodule.fetchjobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "ogiltigt värde för %s"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "misslyckades utföra \"trailer\"-kommandot \"%s\""
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "okänt värde \"%s\" för nyckeln \"%s\""
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "mer än en %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "tom släpradssymbol i släpraden \"%.*s\""
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "kunde inte läsa indatafilen \"%s\""
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "kunde inte läsa från standard in"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "kunde inte ta status på %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "filen %s är inte en normal fil"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "filen %s är inte skrivbar av användaren"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
-msgstr "kunde inte öppna temporär file"
+msgstr "kunde inte öppna temporär fil"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "kunde inte byta namn på temporär fil till %s"
@@ -3718,7 +3910,7 @@
msgid "transport: invalid depth option '%s'"
msgstr "transport: ogiltig flagga för depth: ”%s”"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3727,7 +3919,7 @@
"Följande undermodulsökvägar innehåller ändringar som\n"
"inte kan hittas av fjärrarna:\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3754,11 +3946,11 @@
"för att sända dem till fjärren.\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "Avbryter."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "Kunde inte läsa referensen %s"
@@ -3775,11 +3967,11 @@
msgid "empty filename in tree entry"
msgstr "tomt filnamn i trädpost"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "trädfil för kort"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3788,7 +3980,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:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3797,7 +3989,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av utcheckning:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3807,7 +3999,7 @@
"sammanslagning:\n"
"%%sChecka in dina ändringar eller använd \"stash\" innan du byter gren."
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3817,7 +4009,7 @@
"sammanslagning:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3826,7 +4018,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:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3835,7 +4027,7 @@
"Dina lokala ändringar av följande filer skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3845,7 +4037,7 @@
"dem:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3854,7 +4046,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:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3863,7 +4055,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av utcheckningen:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3873,7 +4065,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du slår samman."
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3883,7 +4075,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3892,7 +4084,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:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3901,7 +4093,7 @@
"Följande ospårade filer i arbetskatalogen skulle tas bort av \"%s\":\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3912,7 +4104,7 @@
"utcheckningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -3923,7 +4115,7 @@
"utcheckningen:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3933,7 +4125,7 @@
"sammanslagningen:\n"
"%%sFlytta eller ta bort dem innan du byter gren."
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3943,7 +4135,7 @@
"sammanslagningen:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3952,7 +4144,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:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3961,21 +4153,21 @@
"Följande ospårade filer i arbetskatalogen skulle skrivas över av \"%s\":\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "Posten \"%s\" överlappar \"%s\". Kan inte binda."
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
-"Kan inte uppdatera gles utcheckning: följande poster är inte àjour:\n"
+"Kan inte uppdatera gles utcheckning: följande poster är inte à jour:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -3986,7 +4178,7 @@
"utcheckning:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -3997,7 +4189,7 @@
"utcheckning:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4006,17 +4198,12 @@
"Kan inte uppdatera undermodul:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "Avbryter\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "Checkar ut filer"
@@ -4059,13 +4246,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "kunde inte öppna \"%s\" för läsning och skrivning"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "kunde inte öppna \"%s\" för skrivning"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "kunde inte öppna \"%s\" för läsning"
@@ -4079,273 +4261,263 @@
msgid "unable to get current working directory"
msgstr "kan inte hämta aktuell arbetskatalog"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "kunde inte skriva till %s"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "kunde inte stänga %s"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Ej sammanslagna sökvägar:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (använd \"git reset %s <fil>...\" för att ta bort från kö)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (använd \"git rm --cached <fil>...\" för att ta bort från kö)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (använd \"git add <fil>...\" för att ange lösning)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " (använd \"git add/rm <fil>...\" som lämpligt för att ange lösning)"
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " (använd \"git rm <fil>...\" för att ange lösning)"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "Ändringar att checka in:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "Ändringar ej i incheckningskön:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (använd \"git add/rm <fil>...\" för att uppdatera vad som skall checkas in)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (använd \"git checkout -- <fil>...\" för att förkasta ändringar i "
"arbetskatalogen)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (checka in eller förkasta ospårat eller ändrat innehåll i undermoduler)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (använd \"git %s <fil>...\" för att ta med i det som skall checkas in)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "borttaget av bägge:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "tillagt av oss:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "borttaget av dem:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "tillagt av dem:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "borttaget av oss:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "tillagt av bägge:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "ändrat av bägge:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "ny fil:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "kopierad:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "borttagen:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "ändrad:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "namnbytt:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "typbyte:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "okänd:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "osammanslagen:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "nya incheckningar, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "ändrat innehåll, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "ospårat innehåll, "
-#: wt-status.c:821
+#: wt-status.c:824
#, 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:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "Undermoduler ändrade men inte uppdaterade:"
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "Undermodulers ändringar att checka in:"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"Rör inte raden ovan.\n"
-"Allt nedan kommer tas bort."
+"Raden ovan får inte ändras eller tas bort.\n"
+"Allt under den kommer tas bort."
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "Du har ej sammanslagna sökvägar."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (rätta konflikter och kör \"git commit\")"
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " (använd \"git merge --abort\" för att avbryta sammanslagningen)"
-#: wt-status.c:1059
+#: wt-status.c:1063
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:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " (använd \"git commit\" för att slutföra sammanslagningen)"
-#: wt-status.c:1072
+#: wt-status.c:1076
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:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "Aktuell patch är tom."
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " (rätta konflikter och kör sedan \"git am --continue\")"
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " (använd \"git am --skip\" för att hoppa över patchen)"
-#: wt-status.c:1083
+#: wt-status.c:1087
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:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo saknas."
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "Inga kommandon utförda."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Sista kommandot utfört (%d kommando utfört):"
msgstr[1] "Sista kommandot utfört (%d kommandon utfört):"
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " (se fler i filen %s)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "Inga kommandon återstår."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Nästa kommando att utföra (%d kommando återstår):"
msgstr[1] "Följande kommandon att utföra (%d kommandon återstår):"
-#: wt-status.c:1246
+#: wt-status.c:1251
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:1259
+#: wt-status.c:1264
#, 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:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "Du håller på med en ombasering."
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")"
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)"
-#: wt-status.c:1282
+#: wt-status.c:1287
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:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " (alla konflikter rättade: kör \"git rebase --continue\")"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4353,126 +4525,126 @@
"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" "
"ovanpå \"%s\"."
-#: wt-status.c:1297
+#: wt-status.c:1302
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:1300
+#: wt-status.c:1305
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:1304
+#: wt-status.c:1309
#, 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:1309
+#: wt-status.c:1314
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:1312
+#: wt-status.c:1317
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:1314
+#: wt-status.c:1319
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:1324
+#: wt-status.c:1329
#, 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:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " (rätta konflikter och kör sedan \"git cherry-pick --continue\")"
-#: wt-status.c:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " (alla konflikter rättade: kör \"git cherry-pick --continue\")"
-#: wt-status.c:1334
+#: wt-status.c:1339
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:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "Du håller på med att ångra incheckningen %s."
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " (rätta konflikter och kör sedan \"git revert --continue\")"
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " (alla konflikter rättade: kör \"git revert --continue\")"
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " (använd \"git revert --abort\" för att avbryta ångrandet)"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, 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:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "Du håller på med en \"bisect\"."
-#: wt-status.c:1371
+#: wt-status.c:1376
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:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "På grenen "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "interaktiv ombasering pågår; ovanpå "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "ombasering pågår; ovanpå "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "HEAD frånkopplad vid "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "HEAD frånkopplad från "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "Inte på någon gren för närvarande."
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "Första incheckning"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "Inga incheckningar ännu"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "Ospårade filer"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "Ignorerade filer"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4484,32 +4656,32 @@
"lägga till nya filer själv (se \"git help status\")."
# %s är nästa sträng eller tom.
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "Ospårade filer visas ej%s"
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr " (använd flaggan -u för att visa ospårade filer)"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "Inga ändringar"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, 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:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "inga ändringar att checka in\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4518,63 +4690,63 @@
"inget köat för incheckning, men ospårade filer finns (spåra med \"git add"
"\")\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, 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:1658
+#: wt-status.c:1663
#, 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:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "inget att checka in\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, 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:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "inget att checka in, arbetskatalogen ren\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "Inga incheckningar ännu på "
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (ingen gren)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "efter "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "före "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "kan inte %s: Du har oköade ändringar."
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "dessutom innehåller dit index ändringar som inte har checkats in."
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "kan inte %s: Ditt index innehåller ändringar som inte checkats in."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "misslyckades ta bort länken \"%s\""
@@ -4583,122 +4755,126 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<flaggor>] [--] <sökväg>..."
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "diff-status %c förväntades inte"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "misslyckades uppdatera filer"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "ta bort \"%s\"\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr "Oköade ändringar efter att ha uppdaterat indexet:"
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Kunde inte läsa indexet"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Kunde inte öppna \"%s\" för skrivning."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "Kunde inte skriva patch"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "redigering av patch misslyckades"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "Kunde inte ta status på \"%s\""
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "Tom patch. Avbryter."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "Kunde inte tillämpa \"%s\""
-#: builtin/add.c:249
+#: builtin/add.c:271
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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "testkörning"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "plocka interaktivt"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "välj stycken interaktivt"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "redigera aktuell diff och applicera"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "tillåt lägga till annars ignorerade filer"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "uppdatera spårade filer"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "åternormalisera radslut i spårade filer (implicerar -u)"
+
+#: builtin/add.c:300
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:278
+#: builtin/add.c:301
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:281
+#: builtin/add.c:304
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:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "lägg inte till, uppdatera endast indexet"
-#: builtin/add.c:284
+#: builtin/add.c:307
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:285
+#: builtin/add.c:308
msgid "check if - even missing - files are ignored in dry run"
msgstr "se om - även saknade - filer ignoreras i testkörning"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "överstyr exekveringsbiten för angivna filer"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "varna när ett inbyggt arkiv läggs till"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4729,152 +4905,152 @@
"\n"
"Se ”git help submodule” för ytterligare information."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "lägger till inbäddat git-arkiv: %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Använd -f om du verkligen vill lägga till dem.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "misslyckades lägga till filer"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "-A och -u är ömsesidigt inkompatibla"
-#: builtin/add.c:401
+#: builtin/add.c:424
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:405
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "--chmod-parametern \"%s\" måste antingen vara -x eller +x"
-#: builtin/add.c:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "Inget angivet, inget tillagt.\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Kanske menade du att skriva \"git add .\"?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "indexfilen trasig"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "kunde inte tolka författarskript"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "\"%s\" togs bort av kroken applypatch-msg"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Felaktig indatarad: \"%s\"."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\""
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "\"fseek\" misslyckades"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "kunde inte tolka patchen \"%s\""
-#: builtin/am.c:842
+#: builtin/am.c:855
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:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "ogiltig tidsstämpel"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "ogiltig \"Date\"-rad"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "ogiltig tidszons-offset"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "Misslyckades detektera patchformat."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "misslyckades skapa katalogen \"%s\""
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "Misslyckades dela patchar."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "kan inte skriva indexfil"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, 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:1172
+#: builtin/am.c:1161
#, 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:1173
+#: 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:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Patchen är tom."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "ogiltig ident-rad: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "kunde inte tolka incheckningen %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
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:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr "Använder indexinfo för att återskapa ett basträd..."
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4882,39 +5058,39 @@
"Har du handredigerat din patch?\n"
"Den kan inte tillämpas på blobbar som antecknats i dess index."
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr ""
"Faller tillbaka på att patcha grundversionen och trevägssammanslagning..."
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Misslyckades slå ihop ändringarna."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "git write-tree misslyckades skriva ett träd"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "tillämpar på en tom historik"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "kunde inte skriva incheckningsobjekt"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "kan inte återuppta: %s finns inte."
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr ""
"kan inte vara interaktiv om standard in inte är ansluten till en terminal."
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "Incheckningskroppen är:"
@@ -4922,35 +5098,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
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:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "Smutsigt index: kan inte tillämpa patchar (smutsiga: %s)"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Tillämpar: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "Inga ändringar -- Patchen har redan tillämpats."
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Patch misslyckades på %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "En kopia av patchen som misslyckades finns i: %s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -4960,7 +5136,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:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -4972,17 +5148,17 @@
"lösta.\n"
"Du kan köra ”git rm” för att godta ”borttagen av dem” för den."
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "Kan inte tolka objektet ”%s”."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "misslyckades städa upp indexet"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -4990,134 +5166,133 @@
"Du verkar ha flyttat HEAD sedan \"am\" sist misslyckades.\n"
"Återställer inte till ORIG_HEAD"
-#: builtin/am.c:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Felaktigt värde för --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<flaggor>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<flaggor>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "kör interaktivt"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "historisk flagga -- no-op"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "tillåt falla tillbaka på trevägssammanslagning om nödvändigt"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "var tyst"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "lägg till \"Signed-off-by\"-rad i incheckningsmeddelandet"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "koda om till utf8 (standard)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "sänd flaggan -k till git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "sänd flaggan -b till git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "sänd flaggan -m till git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
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:2241
+#: builtin/am.c:2204
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:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "ta bort allting före en saxlinje"
-#: 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:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "sänd det genom git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "format"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "format för patch(ar)"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "överstyr felmeddelanden när patchfel uppstår"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "fortsätt applicera patchar efter att ha löst en konflikt"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "synonymer till --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "hoppa över den aktuella grenen"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr "återställ originalgrenen och avbryt patchningen."
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "ljug om incheckningsdatum"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "använd nuvarande tidsstämpel för författardatum"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "nyckel-id"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "GPG-signera incheckningar"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(används internt av git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5125,16 +5300,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:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "misslyckades läsa indexet"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, 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:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5143,7 +5318,7 @@
"Kvarbliven katalog %s hittades.\n"
"Använd \"git am --abort\" för att ta bort den."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "Lösningsoperation pågår inte, vi återupptar inte."
@@ -5181,18 +5356,69 @@
msgid "git archive: expected a flush"
msgstr "git archive: förväntade en tömning (flush)"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <term-för-fel> <term-för-rätt>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "\"%s\" är inte en giltig term"
+
+#: builtin/bisect--helper.c:50
+#, 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:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "kan inte ändra betydelsen av termen \"%s\""
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr "termerna måste vara olika"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "kunde inte öppna filen BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "utför 'git bisect next'"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "skriv termerna i .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "städar upp bisect-tillstånd"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "kontrollera för förväntade versioner"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "uppdatera BISECT_HEAD istället för att checka ut aktuell incheckning"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms kräver två argument"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state tar inga argument"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<flaggor>] [<rev-flaggor>] [<rev>] [--] <fil>"
@@ -5345,14 +5571,18 @@
msgstr "git branch [<flaggor>] (-m | -M) [<gammal_gren>] <ny_gren>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<flaggor>] (-c | -C) [<gammal_gren>] <ny_gren>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<flaggor>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<flaggor>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5361,7 +5591,7 @@
"tar bort grenen \"%s\" som har slagits ihop med\n"
" \"%s\", men ännu inte slagits ihop med HEAD."
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5370,12 +5600,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:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "Kunde inte slå upp incheckningsobjekt för \"%s\""
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5384,92 +5614,113 @@
"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:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
msgstr "Misslyckades uppdatera konfigurationsfil"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "kan inte ange -a med -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "Kunde inte slå upp incheckningsobjekt för HEAD"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, 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:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "fjärrspårande grenen \"%s\" hittades inte."
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "grenen \"%s\" hittades inte."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Fel vid borttagning av fjärrspårande grenen \"%s\""
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Fel vid borttagning av grenen \"%s\""
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, 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:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Tog bort grenen %s (var %s).\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "kan inte tolka formatsträng"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "Grenen %s ombaseras på %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "Grenen %s är i en \"bisect\" på %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+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:473
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:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Felaktigt namn på gren: \"%s\""
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "Misslyckades byta namn på gren"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Misslyckades kopiera gren"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "Skapade kopia av felaktigt namngiven gren \"%s\""
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Bytte bort namn på en felaktigt namngiven gren \"%s\""
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, 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:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
msgstr "Grenen namnbytt, men misslyckades uppdatera konfigurationsfilen"
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+msgid "Branch is copied, but update of config-file failed"
+msgstr "Grenen kopierades, men misslyckades uppdatera konfigurationsfilen"
+
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5480,235 +5731,227 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "Allmänna flaggor"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
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:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "undertryck informationsmeddelanden"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "ställ in spårningsläge (se git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "ändra uppströmsinformation"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "använd ej"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "uppströms"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "ändra uppströmsinformationen"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "Ta bort uppströmsinformationen"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "använd färgad utdata"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "arbeta på fjärrspårande grenar"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "visa endast grenar som innehåller incheckningen"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "visa endast grenar som inte innehåller incheckningen"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "Specifika git-branch-åtgärder:"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "visa både fjärrspårande och lokala grenar"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "ta bort helt sammanslagen gren"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "ta bort gren (även om inte helt sammanslagen)"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr "flytta/ta bort en gren och dess reflogg"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr "flytta/ta bort en gren, även om målet finns"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "kopiera en gren och dess reflogg"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "kopiera en gren, även om målet finns"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "lista namn på grenar"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "skapa grenens reflogg"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "redigera beskrivning för grenen"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "tvinga skapande, flytt/namnändring, borttagande"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "visa endast sammanslagna grenar"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "visa endast ej sammanslagna grenar"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "visa grenar i spalter"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "nyckel"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "fältnamn att sortera på"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "objekt"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "visa endast grenar för objektet"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "sortering och filtrering skiljer gemener och VERSALER"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "format att använda för utdata"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "Misslyckades slå upp HEAD som giltig referens."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "HEAD hittades inte under refs/heads!"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "--column och --verbose är inkompatibla"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "grennamn krävs"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "Kan inte beskriva frånkopplad HEAD"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "kan inte redigera beskrivning för mer än en gren"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "Inga incheckningar på grenen \"%s\" ännu."
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "Ingen gren vid namnet \"%s\"."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "för många grenar för namnbyte"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "för många grenar för kopiering"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "för många grenar för att byta uppström"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "för många flaggor för namnbyte"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "för många flaggor för att byta uppström"
+
+#: builtin/branch.c:766
#, 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:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "okänd gren \"%s\""
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "grenen \"%s\" finns inte"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "för många grenar för att ta bort uppström"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "för många flaggor för att ta bort uppström"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
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:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "Grenen \"%s\" har ingen uppströmsinformation"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "kan inte skapa \"HEAD\" manuellt"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett "
"grennamn"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
"Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track "
-"eller --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
-"\n"
+"eller --set-upstream-to istället."
#: builtin/bundle.c:45
#, c-format
@@ -5723,7 +5966,7 @@
msgid "Need a repository to unbundle."
msgstr "Behöver ett arkiv för att packa upp ett paket (bundle)."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5731,7 +5974,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <typ> | --textconv | --filters) [--path=<sökväg>] <objekt>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5739,64 +5982,64 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<typ> kan vara en av: blob, tree, commit, tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "visa objekttyp"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "visa objektstorlek"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
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:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "visa objektets innehåll snyggt"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
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:566
+#: builtin/cat-file.c:568
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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "använd specifik sökväg för --textconv/--filters"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
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:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "buffra utdata från --batch"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
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:576
+#: builtin/cat-file.c:578
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:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr ""
"följ symboliska länkar i trädet (använd med --batch eller --batch-check)"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "visa alla objekt med --batch eller --batch-check"
@@ -5824,7 +6067,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "avsluta in- och utdataposter med NUL-tecken"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "undertryck förloppsrapportering"
@@ -5881,160 +6124,160 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<flaggor>] [--] [<fil>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
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:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "checka ut alla filer i indexet"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "tvinga överskrivning av befintliga filer"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
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:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "checka inte ut nya filer"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "uppdatera stat-information i indexfilen"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
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:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "skriv innehåll till temporära filer"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "sträng"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr "när filer skapas, lägg till <sträng> först"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "kopiera ut filer från namngiven etapp"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<flaggor>] <gren>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<flaggor>] [<gren>] -- <fil>..."
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "sökvägen \"%s\" har inte vår version"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "sökvägen \"%s\" har inte deras version"
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, 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:197
+#: builtin/checkout.c:198
#, 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:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "sökväg \"%s\": kan inte slå ihop"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "Kunde inte lägga till sammanslagningsresultat för \"%s\""
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, 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:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "\"%s\" kan inte användas med %s"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, 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:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "sökvägen \"%s\" har inte slagits ihop"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr "du måste lösa ditt befintliga index först"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "Kan inte skapa referenslogg för \"%s\": %s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD är nu på"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "kan inte uppdatera HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Återställ gren \"%s\"\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "Redan på \"%s\"\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "Växlade till och nollställde grenen \"%s\"\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Växlade till en ny gren \"%s\"\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Växlade till grenen \"%s\"\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " ... och %d till.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6057,7 +6300,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6084,161 +6327,161 @@
" git branch <nytt_grennamn> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "internt fel vid genomgång av revisioner (revision walk)"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "Tidigare position för HEAD var"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
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:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "endast en referens förväntades, %d gavs."
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "felaktig referens: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "referensen är inte ett träd: %s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "sökvägar kan inte användas vid byte av gren"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "\"%s\" kan inte användas vid byte av gren"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "\"%s\" kan inte användas med \"%s\""
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "Kan inte växla gren till icke-incheckningen \"%s\""
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "gren"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "skapa och checka ut en ny gren"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "skapa/nollställ och checka ut en gren"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "skapa reflogg för ny gren"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "koppla från HEAD vid namngiven incheckning"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "sätt uppströmsinformation för ny gren"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "ny-gren"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "ny gren utan förälder"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "checka ut vår version för ej sammanslagna filer"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "checka ut deras version för ej sammanslagna filer"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "tvinga utcheckning (kasta bort lokala ändringar)"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
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:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "uppdatera ignorerade filer (standard)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "stil"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "konfliktstil (merge eller diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "begränsa inte sökvägar till endast glesa poster"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "förutspå \"git checkout <gren-saknas>\""
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "tvinga förloppsrapportering"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b, -B och --orphan är ömsesidigt uteslutande"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "--track behöver ett namn på en gren"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "Grennamn saknas; försök med -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "felaktig sökvägsangivelse"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, 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:1272
+#: builtin/checkout.c:1246
#, 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:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6278,7 +6521,7 @@
msgid "failed to remove %s"
msgstr "misslyckades ta bort %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6291,7 +6534,7 @@
"foo - markera post baserad på unikt prefix\n"
" - (tomt) markera ingenting\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6312,38 +6555,38 @@
"* - välj alla poster\n"
" - (tomt) avsluta markering\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Vadå (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "Ange ignoreringsmönster>>"
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "VARNING: Hittar inte poster som motsvarar: %s"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr "Välj poster att ta bort"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Ta bort %s [Y=ja / N=nej]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Hej då.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6361,63 +6604,64 @@
"help - denna skärm\n"
"? - hjälp för kommandoval"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Kommandon ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "Vad nu"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
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:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "Inga fler filer att städa, avslutar."
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "skriv inte ut namn på borttagna filer"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "tvinga"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "städa interaktivt"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "ta bort hela kataloger"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "mönster"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "lägg till <mönster> till ignoreringsregler"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "ta även bort ignorerade filer"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "ta endast bort ignorerade filer"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "-x och -X kan inte användas samtidigt"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6425,7 +6669,7 @@
"clean.requireForce satt till true, men varken -i, -n eller -f angavs; vägrar "
"städa"
-#: builtin/clean.c:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6433,142 +6677,144 @@
"clean.requireForce har standardvärdet true och varken -i, -n eller -f "
"angavs; vägrar städa"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<flaggor>] [--] <arkiv> [<kat>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "skapa inte någon utcheckning"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "skapa ett naket (\"bare\") arkiv"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "skapa ett spegelarkiv (implicerar \"bare\")"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "för att klona från ett lokalt arkiv"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "skapa inte lokala hårda länkar, kopiera alltid"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "skapa som ett delat arkiv"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "sökvägsangivelse"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "initiera undermoduler i klonen"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "antal undermoduler som klonas parallellt"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "mallkatalog"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "katalog att använda mallar från"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "referensarkiv"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "använd --reference endast under kloningen"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "namn"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
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:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "checka ut <gren> istället för fjärrens HEAD"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "sökväg till git-upload-pack på fjärren"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "djup"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "skapa en grund klon på detta djup"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "tid"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "skapa en grund klon från en angiven tidpunkt"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "revision"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr "fördjupa historik för grund klon, exkludera revisionen"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "klona endast en gren, HEAD eller --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
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:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "klonade undermoduler kommer vara grunda"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitkat"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "separera gitkatalogen från arbetskatalogen"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "nyckel=värde"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "ställ in konfiguration i det nya arkivet"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "använd endast IPv4-adresser"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "använd endast IPv6-adresser"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6576,42 +6822,42 @@
"Kunde inte gissa katalognamn.\n"
"Ange en katalog på kommandoraden"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: Kan inte skapa alternativ för \"%s\": %s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "misslyckades öppna \"%s\""
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s finns och är ingen katalog"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "misslyckades ta status på %s\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "misslyckades skapa länken \"%s\""
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "misslyckades kopiera filen till \"%s\""
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "klart.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6621,138 +6867,133 @@
"Du kan inspektera det som checkades ut med \"git status\"\n"
"och försöka checka ut igen med \"git checkout -f HEAD\"\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, 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:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "fjärren sände inte alla nödvändiga objekt"
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "kan inte uppdatera %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
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:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "kunde inte checka ut arbetskatalogen"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "kunde inte skriva parametrar till konfigurationsfilen"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "kan inte packa om för att städa upp"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "kunde inte ta bort temporär \"alternates\"-fil"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "För många argument."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "Du måste ange ett arkiv att klona."
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "flaggorna --bare och --origin %s är inkompatibla."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "flaggorna --bare och --separate-git-dir är inkompatibla."
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "arkivet \"%s\" finns inte"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "djupet %s är inte ett positivt tal"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, 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:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "arbetsträdet \"%s\" finns redan."
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "kunde inte skapa inledande kataloger för \"%s\""
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "kunde inte skapa arbetskatalogen \"%s\""
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "Klonar till ett naket arkiv \"%s\"...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Klonar till \"%s\"...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
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:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth ignoreras i lokala kloningar; använd file:// istället."
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
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:1071
+#: builtin/clone.c:1075
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:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "källarkivet är grunt, ignorerar --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local ignoreras"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "Vet inte hur man klonar %s"
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "Du verkar ha klonat ett tomt arkiv."
@@ -6892,61 +7133,61 @@
"\"git cherry-pick --continue\" kommer därefter att återuppta\n"
"cherry-pick för återstående incheckningar.\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "misslyckades packa upp HEAD:s trädobjekt"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "kunde inte skapa temporär indexfil"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "interaktiv tilläggning misslyckades"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "kan inte uppdatera temporärt index"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "Misslyckades uppdatera huvud-cacheträdet"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "kunde inte skriva filen new_index"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "kan inte utföra en delvis incheckning under en sammanslagning."
-#: builtin/commit.c:461
+#: builtin/commit.c:463
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:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "kan inte läsa indexet"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "kunde inte skriva temporär indexfil"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "incheckningen \"%s\" saknar författarhuvud"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "incheckningen \"%s\" har felformaterat författarhuvud"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "felformad \"--author\"-flagga"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -6954,38 +7195,38 @@
"kunde inte välja ett kommentarstecken som inte använts\n"
"i det befintliga incheckningsmeddelandet"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "kunde inte slå upp incheckningen %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "(läser loggmeddelande från standard in)\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "kunde inte läsa logg från standard in"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "kunde inte läsa loggfilen \"%s\""
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "kunde inte läsa SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "kunde inte läsa MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "kunde inte skriva incheckningsmall"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7000,7 +7241,7 @@
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7015,7 +7256,7 @@
"\t%s\n"
"och försöker igen.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7025,7 +7266,7 @@
"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter "
"incheckningen.\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7036,146 +7277,155 @@
"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:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sFörfattare: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sDatum: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sIncheckare: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Kan inte läsa indexet"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "Fel vid byggande av träd"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, 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:1068
+#: builtin/commit.c:1076
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
msgstr ""
"--author '%s' är inte 'Namn <epost>' och matchar ingen befintlig författare"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Ogiltigt ignorerat läge \"%s\""
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "Ogiltigt läge för ospårade filer: \"%s\""
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "--long och -z är inkompatibla"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
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:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "Du har inget att utöka."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
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:1165
+#: builtin/commit.c:1186
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:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
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:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Flaggan -m kan inte kombineras med -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
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:1205
+#: builtin/commit.c:1226
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:1207
+#: builtin/commit.c:1228
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:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Felaktigt städningsläge %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "Kan inte ange sökvägar med -a."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "visa koncis status"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "visa information om gren"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "visa information om stash"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "version"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "maskinläsbar utdata"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "visa status i långt format (standard)"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "terminera poster med NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "läge"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
-msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)"
+msgstr "visa ospårade filer, valfria lägen: all, normal, no. (Standard: all)"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "visa ignorerade filer"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"visa ignorerade filer, valfria lägen: traditional, matching, no (Standard: "
+"traditional)"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "när"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7183,201 +7433,210 @@
"ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. "
"(Default: all)"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "visa ospårade filer i spalter"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+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:1469
msgid "couldn't look up newly created commit"
msgstr "kunde inte slå upp en precis skapad incheckning"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr "kunde inte tolka en precis skapad incheckning"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "kunde inte bestämma HEAD efter att ha skapat incheckning"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "frånkopplad HEAD"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (rotincheckning)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "undertryck sammanfattning efter framgångsrik incheckning"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "visa diff i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "Alternativ för incheckningsmeddelande"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "läs meddelande från fil"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "författare"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "överstyr författare för incheckningen"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "datum"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "överstyr datum för incheckningen"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "meddelande"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "incheckningsmeddelande"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "incheckning"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "återanvänd och redigera meddelande från angiven incheckning"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "återanvänd meddelande från angiven incheckning"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"använd autosquash-formaterat meddelande för att fixa angiven incheckning"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
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:1599
+#: builtin/commit.c:1630
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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "lägg till Signed-off-by:"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "använd angiven mallfil"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "tvinga redigering av incheckning"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "standard"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "inkludera status i mallen för incheckningsmeddelandet"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG-signera incheckning"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "Alternativ för incheckningens innehåll"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "checka in alla ändrade filer"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "lägg till angivna filer till indexet för incheckning"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "lägg till filer interaktivt"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "lägg till ändringar interaktivt"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "checka endast in angivna filer"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "förbigå pre-commit- och commit-msg-krokar"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "visa vad som skulle checkas in"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "lägg till föregående incheckning"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "förbigå post-rewrite-krok"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "ok att registrera en tom ändring"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "ok att registrera en ändring med tomt meddelande"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "kunde inte tolka HEAD:s incheckning"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Trasig MERGE_HEAD-fil (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "kunde inte läsa MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "kunde inte läsa incheckningsmeddelande: %s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "Avbryter incheckning; meddelandet inte redigerat.\n"
+
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7392,139 +7651,143 @@
msgid "git config [<options>]"
msgstr "git config [<flaggor>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "Konfigurationsfilens plats"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "använd global konfigurationsfil"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "använd systemets konfigurationsfil"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "använd arkivets konfigurationsfil"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "använd angiven konfigurationsfil"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "läs konfiguration från givet blob-objekt"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "Åtgärd"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "hämta värde: namn [värde-reguttr]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "hämta alla värden: nyckel [värde-reguttr]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "hämta värden för reguttr: namn-reguttr [värde-reguttr]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "hämta värde specifikt URL:en: sektion[.var] URL"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr "ersätt alla motsvarande variabler: namn värde [värde-reguttr]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "lägg till en ny variabel: namn värde"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "ta bort en variabel: namn [värde-reguttr]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "ta bort alla träffar: namn [värde-reguttr]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "byt namn på sektion: gammalt-namn nytt-namn"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "ta bort en sektion: namn"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "visa alla"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "öppna textredigeringsprogram"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "hitta den inställda färgen: slot [default]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "hitta färginställningen: slot [stdout-is-tty]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "Typ"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "värdet är \"true\" eller \"false\""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "värdet är ett decimalt tal"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "värdet är --bool eller --int"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "värdet är en sökväg (fil- eller katalognamn)"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "värdet är ett utgångsdatum"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "Andra"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "terminera värden med NUL-byte"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "visa endast variabelnamn"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "respektera inkluderingsdirektiv vid uppslag"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "visa konfigurationskälla (fil, standard in, blob, kommandorad)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "kan inte tolka standardfärgvärde"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7539,16 +7802,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local kan bara användas inuti ett git-arkiv"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "kan inte skapa konfigurationsfilen \"%s\""
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7557,75 +7820,66 @@
"kan inte skriva över flera värden med ett ensamt värde\n"
" Använd en regexp, --add eller --replace-all för att ändra %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "skriv storlekar i människoläsbart format"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<flaggor>] [<incheckning-igt>...]"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<flaggor>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "huvud"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "lättviktig"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "annoterad"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "den annoterade taggen %s inte tillgänglig"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "den annoterade taggen %s har inget inbäddat namn"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "taggen \"%s\" är i verkligheten \"%s\" här"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "Objektnamnet är inte giltigt: %s"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s är inte ett giltigt \"%s\"-objekt"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "ingen tagg motsvarar \"%s\" exakt"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "söker för att beskriva %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr ""
+"Ingen exakt träff mot referenser eller taggar, söker för att beskriva\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "avslutade sökning på %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7634,7 +7888,7 @@
"Inga annoterade taggar kan beskriva \"%s\".\n"
"Det finns dock oannoterade taggar: testa --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7643,12 +7897,12 @@
"Inga taggar kan beskriva \"%s\".\n"
"Testa --always, eller skapa några taggar."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "traverserade %lu incheckningar\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7657,75 +7911,90 @@
"mer än %i taggar hittades; listar de %i senaste\n"
"gav upp sökningen vid %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "beskriva %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Objektnamnet är inte giltigt: %s"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s är varken incheckning eller blob"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "hitta taggen som kommer efter incheckningen"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "felsök sökstrategin på standard fel"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "använd alla referenser"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "använd alla taggar, även oannoterade"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "använd alltid långt format"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "följ endast första föräldern"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "skriv endast ut exakta träffar"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "överväg de <n> nyaste taggarna (standard: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "överväg endast taggar som motsvarar <mönster>"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "överväg inte taggar som motsvarar <mönster>"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "visa förkortade incheckningsobjekt som standard"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "märke"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "lägg till <märke> på lortigt arbetsträd (standard: \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "lägg till <märke> på trasigt arbetsträd (standard: \"-broken\")"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "--long är inkompatibel med --abbrev=0"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "Inga namn hittades, kan inte beskriva något."
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty är inkompatibelt med \"commit-ish\"-värden"
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken är inkompatibelt med \"commit-ish\"-värden"
@@ -7734,26 +8003,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "\"%s\": inte en normal fil eller symbolisk länk"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "ogiltig flagga: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "Inte ett git-arkiv"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "objektet \"%s\" som angavs är felaktigt."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "mer än två blobbar angavs: \"%s\""
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "ej hanterat objekt \"%s\" angavs."
@@ -7763,27 +8032,27 @@
msgstr ""
"git difftool [<flaggor>] [<incheckning> [<incheckning>]] [--] [<sökväg>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "misslyckades: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "kunde inte läsa symboliska länken %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "kunde inte läsa symbolisk länk-fil %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, 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:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7791,53 +8060,53 @@
"kombinerade diff-format (\"-c\" och \"--cc\") stöds inte i\n"
"katalogdiffläge (\"-d\" och \"--dir-diff\")."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "bägge filerna ändrade: \"%s\" och \"%s\"."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "filen i arbetskatalogen lämnades kvar."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "temporära filer finns i \"%s\"."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "du kanske vill städa eller rädda dem."
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "använd \"diff.guitool\" istället för \"diff.tool\""
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "utför diff för hela katalogen"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "fråga inte vid start av diff-verktyg"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "använd symboliska länkar i katalogdiffläge"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<verktyg>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "använd angivet diff-verktyg"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "visa en lista över diff-verktyg som kan användas med ”--tool”"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7845,19 +8114,19 @@
"låt \"git-difftool\" avbryta när ett anropat diff-verktyg ger returvärde "
"skilt från noll"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<kommando>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "ange eget kommando för att visa diffar"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "inget <verktyg> angavs för --tool=<verktyg>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "inget <kommando> angavs för --extcmd=<kommando>"
@@ -7865,143 +8134,143 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-flaggor]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "visa förlopp efter <n> objekt"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "välj hantering av signerade taggar"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "välj hantering av taggar som har taggfiltrerade objekt"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Dump märken till filen"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "Importera märken från filen"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "Fejka taggare när taggen saknar en"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "Skriv ut hela trädet för varje incheckning"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "Använd done-funktionen för att avsluta strömmen"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Hoppa över skrivning av blob-data"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "referensspecifikation"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Applicera referensspecifikation på exporterade referenser"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "anonymisera utdata"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<flaggor>] <grupp>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<flaggor>] [(<arkiv> | <grupp>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<flaggor>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "hämta från alla fjärrar"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
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:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "sökväg till upload pack på fjärren"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "tvinga överskrivning av lokal gren"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "hämta från flera fjärrar"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "hämta alla taggar och associerade objekt"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "hämta inte alla taggar (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "prune remote-tracking branches no longer on remote"
msgstr "rensa fjärrspårande grenar ej längre på fjärren"
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "styr rekursiv hämtning av undermoduler"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "behåll hämtade paket"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "tillåt uppdatering av HEAD-referens"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "fördjupa historik för grund klon"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
msgid "deepen history of shallow repository based on time"
msgstr "fördjupa historik för grund klon baserad på tid"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "konvertera till komplett arkiv"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "kat"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "lägg till i början av undermodulens sökvägsutdata"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -8009,89 +8278,89 @@
"standard för rekursiv hämtning av undermoduler (lägre prioritet än "
"konfigurationsfiler)"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "tar emot referenser som uppdaterar .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "referenskarta"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "ange referenskarta för \"fetch\""
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "Kunde inte hitta fjärr-referensen HEAD"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, 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:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "objektet %s hittades inte"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[àjour]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[refuserad]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "kan inte hämta i aktuell gren"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[uppdaterad tagg]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "kunde inte uppdatera lokal ref"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[ny tagg]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[ny gren]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[ny ref]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "tvingad uppdatering"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "ej snabbspolad"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, 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:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "avvisa %s då grunda rötter inte kan uppdateras"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "Från %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8100,55 +8369,50 @@
"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:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " (%s kommer bli dinglande)"
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s har blivit dinglande)"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[borttagen]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(ingen)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "Vägrar hämta till aktuell gren %s i ett icke-naket arkiv"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Flaggan \"%s\" och värdet \"%s\" är inte giltigt för %s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Flaggan \"%s\" ignoreras för %s\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "Vet inte hur man hämtar från %s"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "Hämtar %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "Kunde inte hämta %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8156,40 +8420,40 @@
"Inget fjärrarkiv angavs. Ange antingen en URL eller namnet på ett\n"
"fjärrarkiv som nya incheckningar skall hämtas från."
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "Du måste ange namnet på en tagg."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "Negativa djup stöds inte i --deepen"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen och --depth är ömsesidigt uteslutande"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth och --unshallow kan inte användas samtidigt"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr "--unshallow kan inte användas på ett komplett arkiv"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all tar inte namnet på ett arkiv som argument"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all kan inte anges med referensspecifikationer"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "Fjärren eller fjärrgruppen finns inte: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "Kan inte hämta från grupp och ange referensspecifikationer"
@@ -8199,23 +8463,23 @@
msgstr ""
"git fmt-merge-msg [-m <meddelande>] [--log[=<n>] | --no-log] [--file <fil>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
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:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "alias för --log (avråds)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "text"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "inled meddelande med <text>"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "fil att läsa från"
@@ -8256,103 +8520,107 @@
msgid "show only <n> matched refs"
msgstr "visa endast <n> träffade refs"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "använd formatfärger"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "visa endast referenser som pekar på objektet"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "visa endast referenser som slagits samman"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "visa endast referenser som ej slagits samman"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "visa endast referenser som innehåller incheckningen"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "visa endast referenser som inte innehåller incheckningen"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Kontrollerar objektkataloger"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<flaggor>] [<objekt>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "visa onåbara objekt"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "visa dinglande objekt"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "rapportera taggar"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "rapportera rotnoder"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "gör indexojekt till huvudnoder"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "gör refloggar till huvudnoder (standard)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "ta även hänsyn till paket och alternativa objekt"
# Vague original, not networking-related, but rather related to the actual
# objects in the database.
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "kontrollera endast konnektivitet"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "aktivera striktare kontroll"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "skriv dinglande objekt i .git/lost-found"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "visa förlopp"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "visa ordrika namn för nåbara objekt"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Kontrollerar objekt"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<flaggor>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Misslyckades ta status (fstat) på %s: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "Kan inte ta status på %s"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8367,43 +8635,43 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "rensa ej refererade objekt"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "var mer grundlig (ökar körtiden)"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "aktivera auto-gc-läge"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
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:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "Kan inte tolka värdet %s för gc.logexpiry"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, 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:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "Packar arkivet automatiskt för optimal prestanda.\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, 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:432
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8411,7 +8679,7 @@
"gc körs redan på maskinen \"%s\" pid %<PRIuMAX> (använd --force om så inte "
"är fallet)"
-#: builtin/gc.c:476
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8422,12 +8690,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<flaggor>] [-e] <mönster> [<rev>...] [[--] <sökväg>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: misslyckades skapa tråd. %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "felaktigt antal trådar angivet (%d) för %s"
@@ -8436,249 +8704,241 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "trådstöd saknas, ignorerar %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "kunde inte läsa träd (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, c-format
msgid "unable to grep from object of type %s"
msgstr "kunde inte \"grep\" från objekt av typen %s"
-#: builtin/grep.c:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "flaggan \"%c\" antar ett numeriskt värde"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr "sök i indexet istället för i arbetskatalogen"
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "sök i innehåll som inte hanteras av git"
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "sök i både spårade och ospårade filer"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "ignorera filer angivna i \".gitignore\""
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "sök varje undermodul rekursivt"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "basnamn"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "lägg till föräldraprojektets basnamn i utdata"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "visa rader som inte träffas"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "skiftlägesokänslig sökning"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "matcha endast mönster vid ordgränser"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "hantera binärfiler som text"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "träffa inte mönster i binärfiler"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr "hantera binärfiler med textconv-filter"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "gå som mest ned <djup> nivåer"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "använd utökade POSIX-reguljära uttryck"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "använd grundläggande POSIX-reguljära uttryck (standard)"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "tolka mönster som fixerade strängar"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "använd Perlkompatibla reguljära uttryck"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "visa radnummer"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "visa inte filnamn"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "visa filnamn"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr "visa filnamn relativa till toppkatalogen"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "visa endast filnamn istället för träffade rader"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "synonym för --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr "visa endast namn på filer utan träffar"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "skriv NUL efter filnamn"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
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:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "ljusmarkera träffar"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr "skriv tomma rader mellan träffar från olika filer"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
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:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "visa <n> rader sammanhang före och efter träffar"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "visa <n> rader sammanhang före träffar"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "visa <n> rader sammanhang efter träffar"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "använd <n> jobbtrådar"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "genväg för -C NUM"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr "visa en rad med funktionsnamnet före träffen"
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "visa den omkringliggande funktionen"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "läs mönster från fil"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "träffa <mönster>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "kombinera mönster som anges med -e"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr "ange träff med slutstatuskod utan utdata"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
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:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "visa analysträd för grep-uttryck"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "bläddrare"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "visa träffade filer i filbläddraren"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "tillåt anropa grep(1) (ignoreras av detta bygge)"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "inget mönster angavs."
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index och --untracked kan inte användas med revisioner"
-#: builtin/grep.c:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "kan inte slå upp revision: %s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "felaktigt antal trådar angivet (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "trådstöd saknas, ignorerar --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager fungerar endast i arbetskatalogen"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "flaggan stöds inte med --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached och --untracked kan inte användas med --no-index."
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
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:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "både --cached och träd angavs."
@@ -8770,12 +9030,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient version \"%d\" för gammal (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "exec misslyckades för \"%s\""
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -8784,7 +9044,7 @@
"\"%s\": sökväg för man-visare som ej stöds.\n"
"Använd \"man.<verktyg>.cmd\" istället."
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -8793,351 +9053,351 @@
"\"%s\": kommando för man-visare som stöds.\n"
"Använd \"man.<verktyg>.path\" istället."
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "\"%s\": okänd man-visare."
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "ingen man-visare hanterade förfrågan"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "ingen info-visare hanterade förfrågan"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Definierar attribut per sökväg"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Git för dagligt bruk i ungefär 20 kommandon"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "En Git-ordlista"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Ange avsiktligen ospårade filer att ignorera"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Ange egenskaper för undermoduler"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Ange versioner och intervall i Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Introduktion till Git (för version 1.5.1 och senare)"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Översikt över rekommenderade arbetsflöden med Git"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "De vanliga Git-vägledningarna är:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "\"git %s\" är ett alias för \"%s\""
+msgid "'%s' is aliased to '%s'"
+msgstr "\"%s\" är ett alias för \"%s\""
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "användning: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "kunde inte öppna %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "objekttyp stämmer inte överens vid %s"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "emottog inte det förväntade objektet %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, 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:270
+#: builtin/index-pack.c:271
#, 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:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "tidigt filslut"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "indataläsfel"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "använde fler byte än tillgängligt"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "paket är större än tillåten maximal storlek"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "kunde inte skapa \"%s\""
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "kan inte öppna paketfilen \"%s\""
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "paketsignatur stämmer inte överens"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "paketversion %<PRIu32> stöds ej"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "paketet har felaktigt objekt vid index %<PRIuMAX>: %s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "inflate returnerade %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "indexvärdespill för deltabasobjekt"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "deltabasindex utanför gränsen"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "okänd objekttyp %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "kan inte utföra \"pread\" på paketfil"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "allvarlig inflate-inkonsekvens"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SHA1-KOLLISION UPPTÄCKT VID %s !"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "kunde inte läsa %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "kan inte läsa information om befintligt objekt %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "kan inte läsa befintligt objekt %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "ogiltigt blob-objekt %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "ogiltigt %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Fel i objekt"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "misslyckades tillämpa delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Tar emot objekt"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Skapar index för objekt"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "paketet är trasigt (SHA1 stämmer inte)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "kan inte utföra \"fstat\" på paketfil"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "paket har skräp i slutet"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "förvirrad bortom vanvett i parse_pack_objects()"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Analyserar delta"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "kunde inte skapa tråd: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "förvirrad bortom vanvett"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "Oväntad svanschecksumma för %s (trasig disk?)"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, 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:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "kunde inte utföra \"deflate\" på tillagt objekt (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "lokalt objekt %s är trasigt"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "fel vid stängning av paketfil"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "kan inte ta skriva \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "akn inte stänga skriven \"keep\"-fil \"%s\""
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "kan inte spara paketfil"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "kan inte spara indexfil"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "felaktig pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "Kan inte öppna befintlig paketfil \"%s\""
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, 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:1602
+#: builtin/index-pack.c:1603
#, 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:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "kedjelängd = %d: %lu objekt"
msgstr[1] "kedjelängd = %d: %lu objekt"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "paketfilnamnet \"%s\" slutar inte med \".pack\""
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "felaktig %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin kan inte användas med --stdin"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "--stdin kräver ett git-arkiv"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "--verify angavs utan paketfilnamn"
@@ -9269,132 +9529,172 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<symbol>[(=|:)<värde>])...] [<fil>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "redigera filer på plats"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "ta bort tomma släprader"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "var nya släprader skall placeras"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "att göra om släprader redan finns"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "att göra om släprader saknas"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "visa endast släprader"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "använd inte regler från konfigurationen"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "slå ihop värden avdelade med blanksteg"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "välj tolkningsalternativ"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "släprad"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "släprad(er) att lägga till"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer med --only-input ger ingen mening"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "ingen indatafil angiven för redigering på plats"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<flaggor>] <objekt>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "ogiltig flagga för --decorate: %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "undertryck diff-utdata"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "visa källkod"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "Använd e-postmappningsfil"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "dekorera endast referenser som motsvarar <mönster>"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "dekorera inte referenser som motsvarar <mönster>"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "dekoreringsflaggor"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr "Behandla radintervallet n,m i filen, med början på 1"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "Slututdata: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: felaktig fil"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "Kunde inte läsa objektet %s"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "Okänd typ: %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "format.headers utan värde"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "namnet på utdatakatalogen är för långt"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "Kan inte öppna patchfilen %s"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "Behöver precis ett intervall."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "Inte ett intervall."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "Omslagsbrevet behöver e-postformat"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "tokigt in-reply-to: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<flaggor>] [<sedan> | <revisionsintervall>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "Två utdatakataloger?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "Okänd incheckning %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "Kunde inte slå upp \"%s\" som en giltig referens."
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "Kunde inte hitta exakt sammanslagningsbas."
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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"
@@ -9405,218 +9705,226 @@
"Eller så kan du ange basincheckning med --base=<bas-inchecknings-id> "
"manuellt."
-#: builtin/log.c:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "Kunde inte hitta exakt sammanslagningsbas"
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr "basincheckningen bör vara förfader till revisionslistan"
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr "basincheckningen bör inte vara i revisionslistan"
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "kan inte hämta patch-id"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
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:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "använd [PATCH] även för flera patchar"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "skriv patcharna på standard ut"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "generera ett följebrev"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr "använd enkel nummersekvens för utdatafilnamn"
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "använd <sfx> istället för \".patch\""
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr "börja numrera patchar på <n> istället för 1"
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "markera serien som N:te försök"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Använd [RFC PATCH] istället för [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Använd [<prefix>] istället för [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "spara filerna i <katalog>"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "ta inte bort eller lägg till [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "skriv inte binära diffar"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "använd hashvärde med nollor i From-huvud"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr "ta inte med patchar som motsvarar en uppströmsincheckning"
-#: builtin/log.c:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr "visa patchformat istället för standard (patch + stat)"
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "E-post"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "huvud"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "lägg till e-posthuvud"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "epost"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "lägg till mottagarhuvud (\"To:\")"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "lägg till kopiehuvud (\"Cc:\")"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "ident"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
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:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "meddelande-id"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "gör det första brevet ett svar till <meddelande-id>"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "gräns"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "bifoga patchen"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "gör patchen ett inline-objekt"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr "aktivera brevtrådning, typer: shallow, deep"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "signatur"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "lägg till signatur"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "basincheckning"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "lägg till förhandskrävd trädinfo i patchserien"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "lägg till signatur från fil"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "visa inte filnamn för patchar"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "visa förloppsindikator medan patchar skapas"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "ogiltig ident-rad: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "-n och -k kan inte användas samtidigt."
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc och -k kan inte användas samtidigt."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "kan inte använda --name-only"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "kan inte använda --name-status"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "kan inte använda --check"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "standard ut, eller katalog, vilken skall det vara?"
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "Kunde inte skapa katalogen \"%s\""
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "kunde inte läsa signaturfil \"%s\""
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Skapar patchar"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "Misslyckades skapa utdatafiler"
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9635,90 +9943,94 @@
msgstr "använd små bokstäver för \"anta oförändrade\"-filer"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "använd små bokstäver för \"fsmonitor clean\"-filer"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "visa cachade filer i utdata (standard)"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "visa borttagna filer i utdata"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "visa modifierade filer i utdata"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "visa andra filer i utdata"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "visa ignorerade filer i utdata"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr "visa köat innehålls objektnamn i utdata"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
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:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "visa endast namn för \"andra\" kataloger"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "visa radslut i filer"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "visa inte tomma kataloger"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "visa ej sammanslagna filer i utdata"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "visa \"resolve-undo\"-information"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "hoppa över filer som motsvarar mönster"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "exkludera mönster som läses från <fil>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "lägg till git:s standardexkluderingar"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr "gör utdata relativ till projektets toppkatalog"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
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:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "träd-igt"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
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:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "visa felsökningsutdata"
@@ -9809,179 +10121,183 @@
msgid "empty mbox: '%s'"
msgstr "tom mbox: ”%s”"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<flaggor>] [<incheckning>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "flaggan \"m\" behöver ett värde"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Tillgängliga strategier är:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "Tillgängliga skräddarsydda strategier är:"
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "visa en diffstat när sammanslagningen är färdig"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(synonym till --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr "skapa en ensam incheckning istället för en sammanslagning"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "utför en incheckning om sammanslagningen lyckades (standard)"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "redigera meddelande innan incheckning"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "tillåt snabbspolning (standard)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "avbryt om snabbspolning inte är möjlig"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "strategi"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "sammanslagningsstrategi att använda"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "alternativ=värde"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "alternativ för vald sammanslagningsstrategi"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "incheckningsmeddelande för (icke snabbspolande) sammanslagning"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "avbryt den pågående sammanslagningen"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "fortsätt den pågående sammanslagningen"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "tillåt sammanslagning av orelaterade historier"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "bekräfta commit-msg-krok"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "kunde köra stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "stash misslyckades"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "inte ett giltigt objekt: %s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree misslyckades"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (inget att platta till)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "Inget sammanslagningsmeddelande -- uppdaterar inte HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "\"%s\" verkar inte peka på en incheckning"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Felaktig branch.%s.mergeoptions-sträng: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr "Hanterar inte något annat än en sammanslagning av två huvuden."
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Felaktig flagga för merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "kunde inte skriva %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "Kunde inte läsa från \"%s\""
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, 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:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -9997,69 +10313,69 @@
"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n"
"avbryter incheckningen.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "Tomt incheckningsmeddelande."
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "Underbart.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, 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:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "Inte på någon gren."
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "Ingen fjärr för aktuell gren."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
msgid "No default upstream defined for the current branch."
msgstr "Ingen standarduppström angiven för aktuell gren."
-#: builtin/merge.c:898
+#: builtin/merge.c:920
#, 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:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "Felaktigt värde \"%s\" i miljövariabeln \"%s\""
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, 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:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "inte något vi kan slå ihop"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "--abort tar inga argument"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning att avbryta (MERGE_HEAD saknas)."
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "--continue tar inga argument"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "Ingen sammanslagning pågår (MERGE_HEAD saknas)."
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10067,7 +10383,7 @@
"Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10075,114 +10391,114 @@
"Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n"
"Checka in dina ändringar innan du slår ihop."
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
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:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "Du kan inte kombinera --squash med --no-ff."
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt."
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
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:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - inte något vi kan slå ihop"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
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:1268
+#: builtin/merge.c:1297
#, 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."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, 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."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Incheckning %s har inte någon GPG-signatur."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "Incheckningen %s har en korrekt GPG-signatur av %s\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "vägrar slå samman orelaterad historik"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "Redan à jour."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "Uppdaterar %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "Försöker riktigt enkel sammanslagning i indexet...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "Nej.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "Redan à jour. Toppen!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "Kan inte snabbspola, avbryter."
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "Återspolar trädet till orört...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Försöker sammanslagningsstrategin %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "Sammanslagning med strategin %s misslyckades.\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Använder %s för att förbereda lösning för hand.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10208,23 +10524,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <ref> [<incheckning>]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "skriv ut alla gemensamma anfäder"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr "hitta anfader för enkel n-vägssammanslagning"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "visa revisioner som inte kan nås från andra"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "är den första anfader till den andra?"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "se var <incheckning> grenades av från referensloggen från <ref>"
@@ -10324,7 +10640,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "Katalogen %s är i indexet och inte en undermodul?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Köa dina ändringar i .gitmodules eller använd \"stash\" för att fortsätta"
@@ -10342,68 +10658,68 @@
msgid "skip move/rename errors"
msgstr "hoppa över fel vid flytt/namnändring"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "destinationen \"%s\" är ingen katalog"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "Kontrollerar namnbyte av \"%s\" till \"%s\"\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "felaktig källa"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "kan inte flytta katalog till sig själv"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "kan inte flytta katalog över fil"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "källkatalogen är tom"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "inte versionshanterad"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "destinationen finns"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "skriver över \"%s\""
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Kan inte skriva över"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "flera källor för samma mål"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "destinationskatalogen finns inte"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, källa=%s, mål=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Byter namn på %s till %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "misslyckades byta namn på \"%s\""
@@ -10505,8 +10821,8 @@
msgstr "git notes [--ref <anteckningsref>] remove [<objekt>...]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <anteckningsref>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <anteckningsref>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10595,19 +10911,19 @@
msgid "the note contents have been left in %s"
msgstr "anteckningens innehåll har lämnats kvar i %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "kunde inte läsa \"%s\""
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "kunde inte öppna eller läsa \"%s\""
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "kunde inte slå upp \"%s\" som en giltig referens."
@@ -10635,47 +10951,47 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "för många parametrar"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "inga anteckningar hittades för objektet %s."
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "anteckningsinnehåll som sträng"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "anteckningsinnehåll i en fil"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "återanvänd och redigera angivet anteckningsobjekt"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "återanvänd angivet anteckningsobjekt"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "tillåt lagra tom anteckning"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "ersätt befintliga anteckningar"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10684,29 +11000,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:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "Skriver över befintliga anteckningar för objektet %s\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "Tar bort anteckning för objektet %s\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "läs objekt från standard in"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "för få parametrar"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10715,12 +11031,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:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "anteckningar på källobjektet %s saknas. Kan inte kopiera."
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10729,52 +11045,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:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades ta bort referensen NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "misslyckades ta bort referensen NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "misslyckades ta bort arbetskatalogen för \"git notes merge\""
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "misslyckades läsa references NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte hitta incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "kunde inte tolka incheckning från NOTES_MERGE_PARTIAL."
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "misslyckades bestämma NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "misslyckades färdigställa sammanslagning av anteckningar"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "okänd sammanslagningsstrategi för anteckningar: %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Allmänna flaggor"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Flaggor för sammanslagning"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10782,48 +11098,48 @@
"läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/"
"cat_sort_uniq)"
-#: builtin/notes.c:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Checkar in ej sammanslagna anteckningar"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
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:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Avbryt lösning av sammanslagning av anteckningar"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "avbryt sammanslagning av anteckningar"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "kan inte blanda --commit, --abort eller -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "måste ange en antecknings-referens att slå ihop"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "okänd -s/--strategy: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, 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:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "misslyckades lagra länk till aktuell anteckningsreferens (%s)"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10834,221 +11150,229 @@
"%s och checka in resultatet med \"git notes merge --commit\", eller avbryt "
"sammanslagningen med \"git notes merge --abort\".\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "Objektet %s har ingen anteckning\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
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:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "läs objektnamn från standard in"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "ta inte bort, bara visa"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "rapportera borttagna anteckningar"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "anteckningar-ref"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "använd anteckningar från <anteckningsref>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "okänt underkommando: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [<flaggor>...] [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [<flaggor>...] <basnamn> [< <reflista> | < <objektlista>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "fel i deflate (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
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:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "Skriver objekt"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
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:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "Komprimerar objekt"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "ogiltigt värde för --missing"
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "indexversionen %s stöds ej"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "felaktig indexversion \"%s\""
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "visa inte förloppsindikator"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "visa förloppsindikator"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "visa förloppsindikator under objektskrivningsfasen"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "som --all-progress när förloppsindikatorn visas"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "version[,offset]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
msgid "write the pack index file in the specified idx format version"
msgstr "skriv paketindexfilen i angiven indexformatversion"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "maximal storlek på varje utdatapaketfil"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "ignorera lånade objekt från alternativa objektlager"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "ignorera packade objekt"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "begränsa paketfönster efter objekt"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
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:2899
+#: builtin/pack-objects.c:2958
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:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "återanvänd befintliga delta"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "återanvänd befintliga objekt"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "använd OFS_DELTA-objekt"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
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:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "försök inte skapa tom paketutdata"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "läs revisionsargument från standard in"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
msgid "limit the objects to those that are not yet packed"
msgstr "begränsa objekt till de som ännu inte packats"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr "inkludera objekt som kan nås från någon referens"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr "inkludera objekt som refereras från referensloggposter"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "inkludera objekt som refereras från indexet"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "skriv paket på standard ut"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
msgid "include tag objects that refer to objects to be packed"
msgstr "inkludera taggobjekt som refererar objekt som skall packas"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "behåll onåbara objekt"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "packa lösa onåbara objekt"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "packa upp onåbara objekt nyare än <tid>"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "skapa tunna paket"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr "skapa packfiler lämpade för grunda hämtningar"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "ignorera paket som har tillhörande .keep-fil"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "komprimeringsgrad för paket"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr "göm inte incheckningar med ympningar (\"grafts\")"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
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:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr "använd bitkartindex tillsammans med packindexet"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "hantering av saknade objekt"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "Räknar objekt"
@@ -11064,17 +11388,17 @@
msgid "prune loose refs (default)"
msgstr "ta bort lösa referenser (standard)"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Tar bort duplicerade objekt"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <tid>] [--] [<huvud>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <tid>] [--] [<huvud>...]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11097,40 +11421,40 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "styrning för rekursiv hämtning av undermoduler"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "Alternativ gällande sammanslagning"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr "inlemma ändringar genom ombasering i stället för sammanslagning"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "tillåt snabbspolning"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "utför automatiskt stash/stash pop före och efter ombasering"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "Alternativ gällande hämtningar"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "antal undermoduler som hämtas parallellt"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Felaktigt värde för pull.ff: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -11138,14 +11462,14 @@
"Det finns ingen kandidat för ombasering bland referenserna du precis har "
"hämtat."
-#: builtin/pull.c:401
+#: builtin/pull.c:417
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:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11153,7 +11477,7 @@
"Det betyder vanligtvis att du använt en jokertecken-refspec som inte\n"
"motsvarade något i fjärränden."
-#: builtin/pull.c:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11164,42 +11488,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:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Du är inte på någon gren för närvarande."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Ange vilken gren du vill ombasera mot."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Ange vilken gren du vill slå samman med."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "Se git-pull(1) för detaljer."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<fjärr>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<gren>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Det finns ingen spårningsinformation för aktuell gren."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "Om du vill ange spårningsinformation för grenen kan du göra det med:"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11208,27 +11532,27 @@
"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:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "ignorera --verify-signatures för ombasering"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash är endast giltig med --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:873
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:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "pull med ombasering"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "checka in eller använd \"stash\" på dem."
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11239,7 +11563,7 @@
"snabbspolar din arbetskatalog från\n"
"incheckningen %s."
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11256,15 +11580,15 @@
"$ git reset --hard\n"
"för att återgå."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "Kan inte slå ihop flera grenar i ett tomt huvud."
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "Kan inte ombasera ovanpå flera grenar."
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "kan inte ombasera med lokalt lagrade ändringar i undermoful"
@@ -11272,15 +11596,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<flaggor>] [<arkiv> [<refspec>...]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "taggförkortning utan <tagg>"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "--delete godtar endast enkla målreferensnamn"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11289,7 +11613,7 @@
"För att välja ett av alternativen permanent, se push.default i \"git help "
"config\"."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11314,7 +11638,7 @@
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11329,7 +11653,7 @@
"\n"
" git push %s HEAD:<namn-på-fjärrgren>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11342,12 +11666,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Den aktuella grenen %s har flera uppströmsgrenar, vägrar sända."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11358,14 +11682,14 @@
"aktuella grenen \"%s\", utan att tala om för mig vad som\n"
"skall sändas för att uppdatera fjärrgrenen."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Du angav inga referensspecifikationer att sända, och push.default är "
"\"nothing\"."
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11377,7 +11701,7 @@
"\"git pull ....\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11389,7 +11713,7 @@
"\"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11403,11 +11727,11 @@
"(t.ex. \"git pull ...\") innan du sänder igen.\n"
"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren."
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11418,22 +11742,22 @@
"pekar på något som inte är en incheckning, utan att använda flaggan\n"
"\"--force\".\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "Sänder till %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "misslyckades sända vissa referenser till \"%s\""
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "felaktigt arkiv \"%s\""
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11454,114 +11778,114 @@
"\n"
" git push <namn>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "--all och --tags är inkompatibla"
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr "--all kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "--mirror och --tags är inkompatibla"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror kan inte kombineras med referensspecifikationer"
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "--all och --mirror är inkompatibla"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "arkiv"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "sänd alla referenser"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "spegla alla referenser"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "ta bort referenser"
-#: builtin/push.c:528
+#: builtin/push.c:540
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:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "tvinga uppdateringar"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "refnamn>:<förvänta"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
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:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "styr rekursiv insändning av undermoduler"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "använd tunna paket"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "program för att ta emot paket"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "ställ in uppström för git pull/status"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "ta bort lokalt borttagna referenser"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "förbigå pre-push-krok"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr "sänd in saknade men relevanta taggar"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "GPG-signera insändningen"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "begär atomiska transaktioner på fjärrsidan"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "serverspecifik"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr ""
"inget att checka in\n"
"flagga att sända"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete är inkompatibel med --all, --mirror och --tags"
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "--delete kan inte användas utan referenser"
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr "push-flaggor kan inte innehålla radbrytning"
@@ -11643,19 +11967,51 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<flaggor>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "behåll tomma incheckningar"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "fortsätt ombasering"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "avbryt ombasering"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "skapa ombaseringsskript"
+
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "förkorta inchecknings-id i todo-listan"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "utöka inchecknings-id i todo-listan"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "kontrollera todo-listan"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "hoppa över onödiga \"pick\"-kommandon"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "ordna om fixup-/squash-rader"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "lägg in exec-kommandon i todo-listan"
+
+#: builtin/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <git-katalog>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -11685,7 +12041,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:858
+#: builtin/receive-pack.c:860
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"
@@ -11714,12 +12070,7 @@
msgid "You must specify a directory."
msgstr "Du måste ange en katalog."
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "\"%s\" för \"%s\" är inte en giltig tidsstämpel"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "\"%s\" är inte en giltig tidsstämpel"
@@ -11860,12 +12211,12 @@
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:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "fjärrarkivet %s finns redan."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "\"%s\" är inte ett giltigt namn på fjärrarkiv"
@@ -11888,17 +12239,17 @@
msgid "(delete)"
msgstr "(ta bort)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Inget sådant fjärrarkiv: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "Kunde inte byta namn på konfigurationssektionen \"%s\" till \"%s\""
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11909,17 +12260,17 @@
"\t%s\n"
"\tUppdatera konfigurationen manuellt om nödvändigt."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "misslyckades ta bort \"%s\""
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "misslyckades skapa \"%s\""
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11933,113 +12284,113 @@
"Observera: Några grenar utanför hierarkin refs/remotes/ togs inte bort;\n"
"för att ta bort dem, använd:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "Kunde inte ta bort konfigurationssektionen \"%s\""
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " ny (nästa hämtning sparar i remotes/%s)"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " spårad"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " förlegad (använd \"git remote prune\" för att ta bort)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, 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:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "ombaseras interaktivt på fjärren %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "ombaseras på fjärren %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " sammanslås med fjärren %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "sammanslås med fjärren %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s och med fjärren %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "skapa"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "ta bort"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "àjour"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "kan snabbspolas"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "lokal föråldrad"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s tvingar till %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s sänder till %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s tvingar till %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s sänder till %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "fråga inte fjärrar"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* fjärr %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " Hämt-URL: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(ingen URL)"
@@ -12047,184 +12398,184 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " Sänd-URL: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD-gren: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(inte förfrågad)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(okänd)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, 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:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
msgstr[0] " Fjärrgren:%s"
msgstr[1] " Fjärrgrenar:%s"
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (status inte förfrågad)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " Lokala referenser speglas av \"git push\""
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "sätt refs/remotes/<namn>/HEAD enligt fjärren"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "ta bort refs/remotes/<namn>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Kan inte bestämma HEAD på fjärren"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
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:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "Kunde inte ta bort %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "Inte en giltig referens: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "Kunde inte ställa in %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s kommer bli dinglande!"
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s har blivit dinglande!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Rensar %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [skulle rensa] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [rensad] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "rensa fjärrar efter hämtning"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Ingen sådan fjärr \"%s\""
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "lägg till gren"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "ingen fjärr angavs"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
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:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "returnera alla URL:er"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "ingen URL:er angivna för fjärren \"%s\""
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "manipulera URL:ar för sändning"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "lägg till URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "ta bort URL:ar"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete ger ingen mening"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Felaktig gammalt URL-mönster: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Ingen sådan URL hittades: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Kommer inte ta bort alla icke-sänd-URL:er"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "var pratsam; måste skrivas före ett underkommando"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Okänt underkommando: %s"
@@ -12322,7 +12673,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable och -A kan inte användas samtidigt"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "misslyckades ta bort \"%s\""
@@ -12455,120 +12806,133 @@
msgid "keep"
msgstr "behåll"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "Du har inte en giltig HEAD."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Kunde inte hitta träder för HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "Kunde inte hitta träder för %s."
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD är nu på %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, 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:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "var tyst, rapportera endast fel"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "återställ HEAD och index"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "återställ endast HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "återställ HEAD, index och arbetskatalog"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "återställ HEAD men behåll lokala ändringar"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
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:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "Kunde inte slå upp \"%s\" som en giltig revision."
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, 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:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch är inkompatibel med --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
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:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "Kan inte göra %s återställning med sökvägar."
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, 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:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N kan endast användas med --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Oköade ändringar efter återställning:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "Kunde inte återställa indexfilen till versionen \"%s\"."
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "Kunde inte skriva ny indexfil."
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "objektfiltrering kräver --objects"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "ogiltigt värde för sparse: \"%s\""
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "rev-list stöder inte visning av anteckningar"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "kan inte kombinera --use-bitmap-index med objektfiltrering"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<options>] -- [<argument>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "behåll \"--\" sänt som argument"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "sluta tolka efter första argument som inte är flagga"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "utdata fast i lång form"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12660,11 +13024,11 @@
msgid "keep redundant, empty commits"
msgstr "behåll redundanta, tomma incheckningar"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "\"revert\" misslyckades"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "\"cherry-pick\" misslyckades"
@@ -12732,17 +13096,17 @@
msgid "exit with a zero status even if nothing matched"
msgstr "avsluta med nollstatus även om inget träffades"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "tar inte bort \"%s\" rekursivt utan -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: kan inte ta bort %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "kunde inte ta bort \"%s\""
@@ -12779,27 +13143,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<flaggor>] [<versionsintervall>] [[--] <sökväg>...]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Gruppera efter incheckare istället för författare"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "sortera utdata enligt antal incheckningar per författare"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Undertryck beskrivningar, visa bara antal incheckningar"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Visa e-postadress för varje författare"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Radbryt utdata"
@@ -12999,35 +13363,35 @@
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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "Ingen sådan referens: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "Förväntade fullt referensnamn, fick %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, 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:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "alternativa ankare för relativa sökvägar"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<sökväg>] [<sökväg>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, 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:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13036,79 +13400,109 @@
"kunde inte slå upp konfigurationen \"%s\". Antar att arkivet är sn eget "
"officiella uppström."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, 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:410
+#: builtin/submodule--helper.c:479
#, 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:420
+#: builtin/submodule--helper.c:489
#, 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:427
+#: builtin/submodule--helper.c:496
#, 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:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "Dölj utdata från initiering av undermodul"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<sökväg>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <sökväg>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, 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:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "misslyckades rekursera in i undermodulen \"%s\""
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "Hindra statusutskrift för undermodul"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Visa incheckning från indexet istället för den som lagrats i undermodulens "
+"HEAD"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "rekursera in i nästlade undermoduler"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quitet] [--cached] [--recursive] [<sökväg>...]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <sökväg>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "undermodulen \"%s\" kan inte lägga till alternativ: %s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, 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:611
+#: builtin/submodule--helper.c:842
#, 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:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "var den nya undermodulen skall klonas till"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "namn på den nya undermodulen"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "URL att klona undermodulen från"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "djup för grunda kloner"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "tvinga kloningsförlopp"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13116,82 +13510,82 @@
"git submodule--helper clone [--prefix=<sökväg>] [--quiet] [--reference "
"<arkvi>] [--name <namn>] [--depth <djup>] --url <url> --path <sökväg>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "misslyckades klona \"%s\" till undermodulsökvägen ”%s”"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "kunde inte få tag i undermodulkatalog för \"%s\""
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "Undermodulsökvägen \"%s\" har inte initierats"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "Kanske menade du att använda \"update --init\"?"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "Hoppar över ej sammanslagen undermodul %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Hoppar över undermodulen \"%s\""
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "Misslyckades klona \"%s\". Nytt försök planlagt"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, 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:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "sökväg inuti arbetskatalogen"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
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:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout eller none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
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:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "parallella jobb"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "om den första klonen skall följa rekommendation för grund kloning"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "skriv inte klonförlopp"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
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:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "felaktigt värde för parametern update"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13200,20 +13594,20 @@
"Undermodulens (%s) gren inställd på att ärva gren från huvudprojektet, men "
"huvudprojektet är inte på någon gren"
-#: builtin/submodule--helper.c:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "rekursera ner i undermoduler"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<sökväg>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s stöder inte --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "\"%s\" är inte ett giltigt underkommando till submodule--helper"
@@ -13226,24 +13620,24 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <namn>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr ""
"undertryck felmeddelanden för icke-symboliska (frånkopplade) referenser"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "ta bort symbolisk referens"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "förkorta ref-utdata"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "skäl"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "skäl till uppdateringen"
@@ -13273,17 +13667,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<format>] <taggnamn>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "taggen \"%s\" hittades inte."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Tog bort tagg \"%s\" (var %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13296,7 +13690,7 @@
" %s\n"
"Rader som inleds med \"%c\" ignoreras.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13311,142 +13705,142 @@
"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n"
"du vill.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "kunde inte signera taggen"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "kunde inte skriva tagg-filen"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "felaktig objekttyp."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "inget taggmeddelande?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "Taggmeddelandet har lämnats i %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "lista taggnamn"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "visa <n> rader från varje taggmeddelande"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "ta bort taggar"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "verifiera taggar"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Alternativ för att skapa taggar"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "annoterad tagg, behöver meddelande"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "taggmeddelande"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "annoterad och GPG-signerad tagg"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "använd annan nyckel för att signera taggen"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "ersätt taggen om den finns"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "skapa en reflog"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Alternativ för listning av taggar"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "lista taggar i spalter"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "visa endast taggar som innehåller incheckningen"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "visa endast taggar som inte innehåller incheckningen"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "visa endast taggar som slagits samman"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "visa endast taggar som ej slagits samman"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "visa endast taggar för objektet"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column och -n är inkompatibla"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "Flaggan -n är endast tillåten i listläge"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "Flaggan --contains är endast tillåten i listläge"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "Flaggan --no-contains är endast tillåten i listläge"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "Flaggan --points-at är endast tillåten i listläge"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
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:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "endast en av flaggorna -F eller -m tillåts."
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "för många parametrar"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "\"%s\" är inte ett giltigt taggnamn."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "taggen \"%s\" finns redan"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Uppdaterad tagg \"%s\" (var %s)\n"
@@ -13455,188 +13849,204 @@
msgid "Unpacking objects"
msgstr "Packar upp objekt"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "misslyckades skapa katalogen %s"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "misslyckades ta status på %s"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "misslyckades skapa filen %s"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "misslyckades ta bort filen %s"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: 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:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Testar mtime i \"%s\" "
-#: builtin/update-index.c:150
+#: 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:163
+#: 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:176
+#: 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:187
+#: 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:198
+#: 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:211
+#: 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:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<flaggor>] [--] [<fil>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr "fortsätt uppdatera även när index inte är àjour"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "refresh: ignorera undermoduler"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "ignorera inte nya filer"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "låt filer ersätta kataloger och omvänt"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "lägg märke till filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr "uppdatera även om indexet innehåller ej sammanslagna poster"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "uppdatera statusinformation"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "som --refresh, men ignorera assume-unchanged-inställning"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<läge>,<objekt>,<sökväg>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "lägg till angiven post i indexet"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "markera filer som \"ändras inte\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "rensa \"assume-unchanged\"-biten"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "markera filer som \"endast index\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "töm \"skip-worktree\"-biten"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
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:971
+#: builtin/update-index.c:983
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:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "med --stdin: indatarader termineras med null-byte"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
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:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr "lägg poster från standard in till indexet"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
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:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "uppdatera endast poster som skiljer sig från HEAD"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "ignorera filer som saknas i arbetskatalogen"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "rapportera åtgärder på standard ut"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(för porslin) glöm sparade olösta konflikter"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "skriv index i detta format"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "aktivera eller inaktivera delat index"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "aktivera/inaktivera ospårad cache"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr "testa om filsystemet stöder ospårad cache"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr "aktivera ospårad cache utan att testa filsystemet"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+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:1024
+msgid "enable or disable file system monitor"
+msgstr "aktivera eller inaktivera filsystemsövervakning"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "markera filer som \"fsmonitor valid\""
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "töm \"fsmonitor valid\"-bit"
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -13644,7 +14054,7 @@
"core.splitIndex är satt till false; ta bort eller ändra det om du verkligen "
"vill aktivera delat index"
-#: builtin/update-index.c:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -13652,7 +14062,7 @@
"core.splitIndex är satt till true; ta bort eller ändra det om du verkligen "
"vill inaktivera delat index"
-#: builtin/update-index.c:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13660,11 +14070,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:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "Ospårad cache är inaktiverad"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13672,11 +14082,29 @@
"core.untrackedCache är satt till false; ta bort eller ändra det om du "
"verkligen vill aktivera den ospårade cachen"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "Ospårad cache är aktiverad för \"%s\""
+#: builtin/update-index.c:1171
+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:1175
+msgid "fsmonitor enabled"
+msgstr "fsmonitor aktiverat"
+
+#: builtin/update-index.c:1178
+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:1182
+msgid "fsmonitor disabled"
+msgstr "fsmonitor inaktiverat"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<flaggor>] -d <refnamn> [<gammaltvärde>]"
@@ -13689,19 +14117,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<flaggor>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "ta bort referensen"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "uppdatera <refnamn> inte det den pekar på"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "standard in har NUL-terminerade argument"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "läs uppdateringar från standard in"
@@ -13745,123 +14173,144 @@
msgid "print tag contents"
msgstr "visa innehåll för tag"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<flaggor>] <sökväg> [<gren>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<flaggor>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<flaggor>] <sökväg>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<flaggor>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <sökväg>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Tar bort worktrees/%s: inte en giltig katalog"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Tar bort worktrees/%s: gitdir-filen existerar inte"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Tar bort worktrees/%s: kan inte läsa gitdir-filen (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr ""
+"Tar bort worktrees/%s: kort läsning (förväntade %<PRIuMAX> byte, läste "
+"%<PRIuMAX>)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Tar bort worktrees/%s: felaktig gitdir-fil"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Tar bort worktrees/%s: gitdir-filen pekar på en ickeexisterande plats"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "rapportera borttagna arbetskataloger"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
msgstr "låt tid gå ut för arbetskataloger äldre än <tid>"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "\"%s\" finns redan"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "kunde inte skapa katalogen \"%s\""
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Förbereder %s (identifieraren %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
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:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "skapa en ny gren"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "skapa eller återställ en gren"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "befolka den nya arbetskatalogen"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "låt arbetskatalogen förbli låst"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "ställ in spårningsläge (se git-branch(1))"
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "försök matcha namn på ny gren mot en fjärrspårande gren"
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b, -B och --detach är ömsesidigt uteslutande"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+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:553
msgid "reason for locking"
msgstr "orsak till lås"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "\"%s\" är inte en arbetskatalog"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr "Huvudarbetskatalogen kan inte låsas eller låsas upp"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "\"%s\" är redan låst, orsak: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "\"%s\" är redan låst"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "\"%s\" är inte låst"
@@ -13882,7 +14331,7 @@
msgid "only useful for debugging"
msgstr "endast användbart vid felsökning"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<flaggor>] <katalog>"
@@ -13902,7 +14351,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "avbryt överföringen efter <n> sekunders inaktivitet"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13915,7 +14364,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "skriv felsökningsmeddelanden på standard fel"
@@ -13929,20 +14378,20 @@
"några konceptvägledningar. Se \"git help <kommando>\" eller \"git help\n"
"<koncept>\" för att läsa mer om specifika underkommandon och koncept."
-#: http.c:337
+#: http.c:339
#, 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:358
+#: http.c:360
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "Delegerad styrning stöds inte av cURL < 7.22.0"
-#: http.c:367
+#: http.c:369
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:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13958,6 +14407,14 @@
msgid "redirecting to %s"
msgstr "omdirigerar till %s"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "argument"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "objektfiltrering"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "starta arbetskatalog (se också: git help tutorial)"
@@ -14133,27 +14590,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "Felaktigt argument till bisect_write: $state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Felaktig rev-indata: $arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Felaktig rev-indata: $bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Felaktig rev-indata: $rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "\"git bisect $TERM_BAD\" kan bara ta ett argument."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr ""
@@ -14162,11 +14619,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "Är du säker [Y=ja/N=nej]? "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14177,7 +14634,7 @@
"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
"detta.)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14190,16 +14647,16 @@
"(Du kan använda \"git bisect $bad_syn\" och \"git bisect $good_syn\" för "
"detta.)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "Vi utför ingen bisect för tillfället."
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "\"$invalid\" är inte en giltig incheckning"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14208,25 +14665,29 @@
"Kunde inte checka ut original-HEAD \"$branch\".\n"
"Försök \"git bisect reset <incheckning>\"."
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "Ingen loggfil angiven"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "kan inte läsa $file för uppspelning"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? vad menar du?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "bisect-körning misslyckades: inget kommando gavs."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "kör $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14235,11 +14696,11 @@
"\"bisect\"-körningen misslyckades:\n"
"felkod $res från \"$command\" är < 0 eller >= 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "\"bisect\"-körningen kan inte fortsätta längre"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14248,40 +14709,21 @@
"\"bisect\"-körningen misslyckades:\n"
"\"bisect_state $state\" avslutades med felkoden $res"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "\"bisect\"-körningen lyckades"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "termerna måste vara olika"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "\"$term\" är inte en giltig term"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "kan inte använda det inbyggda kommandot \"$term\" som term"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "kan inte ändra betydelsen av termen \"$term\""
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr ""
"Ogiltigt kommando: du utför just nu en \"bisect\" med $TERM_BAD/$TERM_GOOD."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "inga termer angivna"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14313,7 +14755,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Redan à jour med $pretty_name"
#: git-merge-octopus.sh:89
@@ -14332,50 +14774,53 @@
#: git-rebase.sh:58
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"
-"\"."
+"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 ""
-"När du har löst problemet kör du \"git rebase --continue\".\n"
-"Om du vill hoppa över patchen kör du istället \"git rebase --skip\".\n"
-"För att återställa originalgrenen och avbryta kör du \"git rebase --abort\"."
+"Lös alla konflikter manuellt, märk dem som lösta med\n"
+"\"git add/rm <filer_i_konflikt>\", kör sedan \"git rebase --continue\".\n"
+"Du kan hoppa över incheckningen istället: kör \"git rebase --skip\".\n"
+"För att avbryta och återgå till där du var före ombaseringen, kör \"git "
+"rebase --abort\"."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Kunde inte flytta tillbaka till $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Tillämpade autostash."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Kan inte spara $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Kroken pre-rebase vägrade ombaseringen."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "Det verkar som en git-am körs. Kan inte ombasera."
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "Det verkar som en \"git am\" körs. Kan inte ombasera."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Ingen ombasering pågår?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "Åtgärden --edit-todo kan endast användas under interaktiv ombasering."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Kan inte läsa HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14383,7 +14828,7 @@
"Du måste redigera alla sammanslagningskonflikter och\n"
"därefter markera dem som lösta med git add"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14404,226 +14849,222 @@
"och kör programmet igen. Jag avslutar ifall du fortfarande har\n"
"något av värde där."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "ogiltig uppström $upstream_name"
+msgid "invalid upstream '$upstream_name'"
+msgstr "ogiltig uppström \"$upstream_name\""
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: mer än en sammanslagningsbas finns"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: ingen sammanslagningsbas finns"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "Peka på en giltig incheckning: $onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "ödesdigert: ingen sådan gren: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "ödesdigert: ingen sådan gren/incheckning: $branch_name"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "Kan inte utföra \"autostash\""
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Skapade autostash: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "Checka in eller använd \"stash\" på dem."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD är à jour."
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "Aktuell gren $branch_name är à jour."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD är à jour, ombasering framtvingad."
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "Aktuell gren $branch_name är à jour, ombasering framtvingad."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Ändringar från $mb till $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr ""
"Först, spolar tillbaka huvudet för att spela av ditt arbete ovanpå det..."
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Snabbspolade $branch_name till $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "\"git stash clear\" med parametrar har inte implementerats"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "Du har inte den första incheckningen ännu"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "Kan inte spara aktuellt tillstånd för indexet"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "Kan inte spara ospårade filer"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "Kan inte spara aktuellt tillstånd för arbetskatalogen"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "Inga ändringar valda"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "Kan inte ta bort temporärt index (kan inte inträffa)"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "Kan inte registrera tillstånd för arbetskatalog"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Kan inte uppdatera $ref_stash med $w_commit"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"fel: felaktig flagga för \"stash save\": $option\n"
-" För att ange ett meddelande, använd git stash save -- \"$option\""
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "fel: okänd flagga för \"stash push\": $option"
+
+#: git-stash.sh:295
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"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "Inga lokala ändringar att spara"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "Kan inte initiera \"stash\""
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "Kan inte spara aktuell status"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Sparade arbetskatalogen och indexstatus $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "Kan inte ta bort ändringar i arbetskatalogen"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "okänd flagga: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "Inga \"stash”-poster hittades."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "För många revisioner angivna: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference är inte en giltig referens"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "\"$args\" är inte en \"stash\"-liknande incheckning"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "\"$args\" är inte en \"stash\"-referens"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "kan inte uppdatera indexet"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Kan inte tillämpa en \"stash\" mitt i en sammanslagning"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "Konflikter i indexet. Testa utan --index."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "Kunde inte spara indexträd"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr "Kunde inte återställa ospårade filer från stash-post"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "Kan inte ta bort ändrade filer ur kön"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "Indexet har inte tagits ur kön."
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
msgstr "Stash-posten behålls ifall du behöver den igen."
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Kastade ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Kunde inte kasta \"stash\"-post"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "Inget grennamn angavs"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(För att återställa dem, skriv \"git stash apply\")"
@@ -14770,17 +15211,17 @@
msgstr ""
"Undermodulen \"$name\" ($url) avregistrerad för sökvägen \"$displaypath\""
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, 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:648
+#: git-submodule.sh:647
#, 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:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14789,12 +15230,12 @@
"Kan inte hitta aktuell revision för ${remote_name}/${branch} i "
"undermodulsökvägen \"$sm_path\""
-#: git-submodule.sh:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Kan inte hämta i undermodulsökväg \"$displaypath\""
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14803,84 +15244,79 @@
"Hämtade i undermodulssökvägen \"$displaypath\", men den innehöll inte $sha1. "
"Direkt hämtning av incheckningen misslyckades."
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, 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:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": checkade ut \"$sha1\""
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "Kan inte ombasera \"$sha1\" i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": ombaserade in i \"$sha1\""
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, 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:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": sammanslagen i \"$sha1\""
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, 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:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Undermodulsökvägen \"$displaypath\": \"$command $sha1\""
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Misslyckades rekursera in i undermodulsökvägen \"$displaypath\""
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "Flaggan --cached kan inte användas med flaggan --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "oväntat läge $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Varning: $display_name innehåller inte incheckningen $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Varning: $display_name innehåller inte incheckningarna $sha1_src och "
"$sha1_dst"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\""
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Synkroniserar undermodul-url för \"$displaypath\""
@@ -14899,27 +15335,27 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
"\n"
"Kommandon:\n"
-" p, pick = använd incheckning\n"
-" r, reword = använd incheckning, men redigera incheckningsmeddelandet\n"
-" e, edit = använd incheckning, men stanna för tillägg\n"
-" s, squash = använd incheckning, men infoga i föregående incheckning\n"
-" f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n"
-" x, exec = kör kommando (resten av raden) i skalet\n"
-" d, drop = ta bort incheckning\n"
+"p, pick = använd incheckning\n"
+"r, reword = använd incheckning, men redigera incheckningsmeddelandet\n"
+"e, edit = använd incheckning, men stanna för tillägg\n"
+"s, squash = använd incheckning, men infoga i föregående incheckning\n"
+"f, fixup = som \"squash\", men förkasta incheckningsmeddelandet\n"
+"x, exec = kör kommando (resten av raden) i skalet\n"
+"d, drop = ta bort incheckning\n"
"\n"
-"Du kan byta ordning på raderna, de utförs uppifrån och ned.\n"
+"Du kan byta ordning på raderna; de utförs uppifrån och ned.\n"
#: git-rebase--interactive.sh:171
msgid ""
@@ -14991,49 +15427,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "Vägrar utföra \"squash\" på en sammanslagning: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "Fel när sammanslagningen $sha1 skulle göras om"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "Kunde inte välja $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "Det här är incheckningsmeddelande ${n}:"
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "Incheckningsmeddelande ${n} kommer hoppas över:"
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Kan inte skriva $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Det här är en kombination av 2 incheckningar."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Kunde inte tillämpa $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15047,31 +15483,31 @@
"pre-commit-kroken misslyckades. Om pre-commit-kroken misslyckades kanske\n"
"du måste lösa problemet innan du kan skriva om incheckningsmeddelandet."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Stoppade på $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, 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--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Kör: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "Körning misslyckades: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "och gjorde ändringar till indexet och/eller arbetskatalogen"
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15082,7 +15518,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15097,96 +15533,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Okänt kommando: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "Rätta det med \"git rebase --edit-todo\"."
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "Lyckades ombasera och uppdatera $head_name."
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "Kunde inte hoppa över onödiga \"pick\"-kommandon"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"Varning: kommandot kändes inte igen på följande rad:\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "kunde inte koppla från HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Varning: vissa incheckningar kan av misstag ha tappats.\n"
-"Tappade incheckningar (nyaste först):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"För att undvika det här meddelandet kan du använda \"drop\" för att "
-"explicit\n"
-"kasta en incheckning.\n"
-"\n"
-"Använd \"git config rebase.missingCommitsCheck\" för att ändra "
-"varningsnivån.\n"
-"Möjliga bettenden är: \"ignore\" (ignorera), \"warn\" (varna), \"error"
-"\" (fel)."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Okänt val $check_level för flaggan rebase.missingCommitsCheck. Ignorerar."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Du kan rätta detta med \"git rebase --edit-todo\" följt av \"git rebase --"
-"continue\"."
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Kunde inte ta bort CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15217,11 +15586,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
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--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15229,11 +15598,11 @@
"Du har ändringar i arbetskatalogen som inte checkats in. Checka in dem\n"
"först och kör sedan \"git rebase --continute\" igen."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "Kunde inte checka in köade ändringar."
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15247,40 +15616,44 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Kunde inte starta textredigerare"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Kunde inte checka ut $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "Inget HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "Kunde inte skapa temporär $state_dir"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "Kunde inte markera som interaktiv"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "Kunde inte initiera omskrivna incheckningar"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Kunde inte skapa todo-lista"
+
+#: git-rebase--interactive.sh:973
#, 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--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15290,7 +15663,7 @@
"Ombaseringen kommer dock att avbrytas om du tar bort allting.\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Observera att tomma incheckningar är utkommenterade"
@@ -15871,61 +16244,61 @@
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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "textredigeringsprogrammet avslutades med fel, avbryter allting"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, 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:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "\"%s.final\" innehåller det skrivna brevet.\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-alias är inkompatibelt med andra flaggor\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
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:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Okänt fält i --suppress-cc: \"%s\"\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Okänd inställning i --confirm: \"%s\"\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, 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:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "varning: \":include:\" stöds inte: %s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, 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:518
+#: git-send-email.perl:513
#, 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:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -15940,12 +16313,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:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Misslyckades utföra opendir %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -15954,7 +16327,7 @@
"ödesdigert: %s: %s\n"
"varning: inga patchar har sänts\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -15964,17 +16337,17 @@
"Inga patchfiler angavs!\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Ingen ärenderad i %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Kunde inte öppna för skrivning %s: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -15988,42 +16361,42 @@
"\n"
"Rensa brevkroppen om du inte vill sända någon sammanfattning.\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Misslyckades öppna %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Misslyckades öppna %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "Fälten To/Cc/Bcc tolkas inte ännu, de har ignorerats\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
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:791
+#: git-send-email.perl:786
#, 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:820
+#: git-send-email.perl:815
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:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "Vilken åttabitarsteckenkodning skall jag ange [UTF-8]? "
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -16036,21 +16409,21 @@
"har mallärendet \"*** SUBJECT HERE ***\". Använd --force om du verkligen "
"vill sända.\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "Till vem skall breven sändas (om någon)?"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "ödesdigert: aliaset \"%s\" expanderar till sig själv\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, 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"
@@ -16058,16 +16431,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:944
+#: git-send-email.perl:941
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:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA-sökvägen \"%s\" finns inte"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16094,124 +16467,124 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Sända brevet? (y=ja, n=nej, q=avsluta, a=alla): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "Svar krävs på frågan \"Sända brevet?\""
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr "Nödvändig SMTP-server har inte angivits korrekt."
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Servern stöder inte SMARTTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS misslyckades! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
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:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "Misslyckades sända %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Test-Sände %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "Sände %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "Test-OK. Loggen säger:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "OK. Loggen säger:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "Resultat: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "Resultat: OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "kan inte öppna filen %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, 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:1534
+#: git-send-email.perl:1551
#, 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:1582
+#: git-send-email.perl:1599
#, 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:1605
+#: git-send-email.perl:1624
#, 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:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Kunde inte köra \"%s\""
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, 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:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) misslyckades stänga röret till \"%s\""
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "kan inte sända brev som sjubitars"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "ogiltig överföringskondning"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "kunde inte öppna %s: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: patchen innehåller en rad längre än 998 tecken"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, perl-format
msgid "Skipping %s with backup suffix '%s'.\n"
msgstr ""
@@ -16219,59 +16592,124 @@
"säkerhetskopior.\n"
#. TRANSLATORS: please keep "[y|N]" as is.
-#: git-send-email.perl:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "Vill du verkligen sända %s? [y=ja, n=nej]: "
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "tomma strängar som sökvägsangivelser kommer bli ogiltiga i en kommande "
+#~ "utgåva. använd istället . om du vill träffa alla sökvägar"
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "kunde inte öppna \"%s\" för skrivning"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "kunde inte trunkera \"%s\""
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "kunde inte avsluta \"%s\""
+
+#~ msgid "could not write to %s"
+#~ msgstr "kunde inte skriva till %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\""
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "kan inte skapa \"HEAD\" manuellt"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "Vet inte hur man klonar %s"
+
+#~ msgid "show ignored files"
+#~ msgstr "visa ignorerade filer"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s är inte ett giltigt \"%s\"-objekt"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "Vet inte hur man hämtar från %s"
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "\"$term\" är inte en giltig term"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "fel: felaktig flagga för \"stash save\": $option\n"
+#~ " För att ange ett meddelande, använd git stash save -- \"$option\""
+
+#~ 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 ""
+#~ "okänd inställning %s för flaggan rebase.missingCommitsCheck. Ignorerar."
+
+#~ msgid "%"
+#~ msgid_plural "%"
+#~ msgstr[0] "%"
+#~ msgstr[1] "%"
+
+#~ msgid "%s, %"
+#~ msgid_plural "%s, %"
+#~ msgstr[0] "%s. %"
+#~ msgstr[1] "%s. %"
+
+#~ msgid "submodule update strategy not supported for submodule '%s'"
+#~ msgstr ""
+#~ "uppdateringsstrategi för undermodul stöds inte för undermodulen \"%s\""
+
+#~ msgid "change upstream info"
+#~ msgstr "ändra uppströmsinformation"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wanted to make '%s' track '%s', do this:\n"
+#~ "\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n"
+#~ "\n"
+
+#~ msgid "basename"
+#~ msgstr "basnamn"
+
+#~ msgid "prepend parent project's basename to output"
+#~ msgstr "lägg till föräldraprojektets basnamn i utdata"
+
+#~ msgid ""
+#~ "Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Varning: SHA-1 saknas eller inte en incheckning på följande rad:\n"
+#~ " - $line"
+
+#~ msgid ""
+#~ "Warning: the command isn't recognized in the following line:\n"
+#~ " - $line"
+#~ msgstr ""
+#~ "Varning: kommandot kändes inte igen på följande rad:\n"
+#~ " - $line"
+
+#~ msgid "Or you can abort the rebase with 'git rebase --abort'."
+#~ msgstr "Eller så kan du avbryta ombaseringen med \"git rebase --abort\"."
+
#~ msgid "Could not open file '%s'"
#~ msgstr "Kunde inte öppna filen \"%s\""
-#~ msgid "%lu second ago"
-#~ msgid_plural "%lu seconds ago"
-#~ msgstr[0] "%lu sekund sedan"
-#~ msgstr[1] "%lu sekunder sedan"
-
-#~ msgid "%lu minute ago"
-#~ msgid_plural "%lu minutes ago"
-#~ msgstr[0] "%lu minut sedan"
-#~ msgstr[1] "%lu minuter sedan"
-
-#~ msgid "%lu hour ago"
-#~ msgid_plural "%lu hours ago"
-#~ msgstr[0] "%lu timme sedan"
-#~ msgstr[1] "%lu timmar sedan"
-
-#~ msgid "%lu day ago"
-#~ msgid_plural "%lu days ago"
-#~ msgstr[0] "%lu dag sedan"
-#~ msgstr[1] "%lu dagar sedan"
-
-#~ msgid "%lu week ago"
-#~ msgid_plural "%lu weeks ago"
-#~ msgstr[0] "%lu vecka sedan"
-#~ msgstr[1] "%lu veckor sedan"
-
-#~ msgid "%lu month ago"
-#~ msgid_plural "%lu months ago"
-#~ msgstr[0] "%lu månad sedan"
-#~ msgstr[1] "%lu månader sedan"
-
-#~ msgid "%lu year"
-#~ msgid_plural "%lu years"
-#~ msgstr[0] "%lu år"
-#~ msgstr[1] "%lu år"
-
-#~ msgid "%s, %lu month ago"
-#~ msgid_plural "%s, %lu months ago"
-#~ msgstr[0] "%s, %lu månad sedan"
-#~ msgstr[1] "%s, %lu månader sedan"
-
-#~ msgid "%lu year ago"
-#~ msgid_plural "%lu years ago"
-#~ msgstr[0] "%lu år sedan"
-#~ msgstr[1] "%lu år sedan"
-
#~ msgid "in %0.1f seconds automatically..."
#~ msgstr "automatiskt om %0.1f sekunder..."
@@ -16373,9 +16811,6 @@
#~ msgid "git merge [<options>] <msg> HEAD <commit>"
#~ msgstr "git merge [<flaggor>] <meddelande> HEAD <incheckning>"
-#~ msgid "'%s' is not a commit"
-#~ msgstr "\"%s\" är inte en incheckning"
-
#~ msgid "cannot open file '%s'"
#~ msgstr "kan inte öppna filen \"%s\""
@@ -16424,9 +16859,6 @@
#~ "\n"
#~ "(använd \"rm -rf\" om du verkligen vill ta bort den och all dess historik)"
-#~ msgid "Could not write to %s"
-#~ msgstr "Kunde inte skriva till %s"
-
#~ msgid "Error wrapping up %s."
#~ msgstr "Fel vid ombrytning av %s."
@@ -16727,9 +17159,6 @@
#~ msgid "Forward-port local commits to the updated upstream head"
#~ msgstr "Framåtanpassa lokala kommandon på uppdaterat uppströmshuvud"
-#~ msgid "unable to parse format"
-#~ msgstr "kan inte tolka formatet"
-
#~ msgid "improper format entered align:%s"
#~ msgstr "felaktigt format angivet align:%s"
@@ -16948,9 +17377,6 @@
#~ msgid "no files added"
#~ msgstr "inga filer har lagts till"
-#~ msgid "force creation (when already exists)"
-#~ msgstr "tvinga skapande (när den redan finns)"
-
#~ msgid "slot"
#~ msgstr "plats"
diff --git a/po/vi.po b/po/vi.po
index 9c9f99b..5bf6f15 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -2,14 +2,14 @@
# Bản dịch tiếng Việt dành cho GIT-CORE.
# This file is distributed under the same license as the git-core package.
# Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012.
-# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017.
+# Trần Ngọc Quân <vnwildman@gmail.com>, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
#
msgid ""
msgstr ""
-"Project-Id-Version: git v2.14.0\n"
+"Project-Id-Version: git v2.16.0\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-07-25 07:06+0700\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-07 08:17+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"
@@ -22,44 +22,44 @@
"X-Poedit-Basepath: ../\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "gợi ý: %.*s\n"
-#: advice.c:86
+#: advice.c:90
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr ""
"Cherry 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:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr ""
"Commit là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr ""
"Merge là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr ""
"Pull là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr ""
"Revert là không thể thực hiện bởi vì bạn có những tập tin chưa được hòa trộn."
-#: advice.c:96
+#: advice.c:100
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr ""
"Nó là 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:104
+#: advice.c:108
msgid ""
"Fix them up in the work tree, and then use 'git add/rm <file>'\n"
"as appropriate to mark resolution and make a commit."
@@ -68,23 +68,23 @@
"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:112
+#: advice.c:116
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:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
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:119
+#: advice.c:123
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:120
+#: advice.c:124
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:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -123,85 +123,85 @@
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:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
msgstr "--reject và --3way không thể dùng cùng nhau."
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached và --3way không thể dùng cùng nhau."
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "--3way ở ngoài một kho chứa"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "--index ở ngoài một kho chứa"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "--cached ở ngoài một kho chứa"
-#: apply.c:836
+#: apply.c:821
#, 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:845
+#: apply.c:830
#, 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:929
+#: apply.c:904
#, 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:967
+#: apply.c:942
#, 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:973
+#: apply.c:948
#, 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:974
+#: apply.c:949
#, 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:979
+#: apply.c:954
#, 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:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "chế độ không hợp lệ trên dòng %d: %s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "phần đầu mâu thuẫn dòng %d và %d"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "chi tiết: dòng không cần: %.*s"
-#: apply.c:1567
+#: apply.c:1542
#, 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:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -213,81 +213,81 @@
"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:1600
+#: apply.c:1575
#, 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:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "tập tin mới phụ thuộc vào nội dung cũ"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "tập tin đã xóa vẫn còn nội dung"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "miếng vá hỏng tại dòng %d"
-#: apply.c:1843
+#: apply.c:1836
#, 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:1845
+#: apply.c:1838
#, 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:1848
+#: apply.c:1841
#, 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:1995
+#: apply.c:1988
#, 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:2032
+#: apply.c:2025
#, 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:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "vá chỉ với “rác” tại dòng %d"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "không thể mở hay đọc %s"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "sai khởi đầu dòng: “%c”"
-#: apply.c:3052
+#: apply.c:3055
#, 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:3064
+#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "Nội dung bị giảm xuống còn (%ld/%ld) để áp dụng mảnh dữ liệu tại %d"
-#: apply.c:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -296,322 +296,322 @@
"trong khi đang tìm kiếm cho:\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, 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:3100
+#: apply.c:3103
#, 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 hunk thành "
"“%s”"
-#: apply.c:3146
+#: apply.c:3149
#, 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:3156
+#: apply.c:3159
#, 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:3164
+#: apply.c:3167
#, 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:3182
+#: apply.c:3185
#, 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:3195
+#: apply.c:3198
#, 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:3201
+#: apply.c:3204
#, 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:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "gặp lỗi khi vá: %s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "không thể lấy ra %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "gặp lỗi khi đọc %s"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "đọc từ “%s” vượt ra ngoài liên kết mềm"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "đường dẫn %s đã bị xóa hoặc đổi tên"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s: không tồn tại trong bảng mục lục"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s: không khớp trong mục lục"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "Đang trở lại hòa trộn “3-đường”…\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, 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:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "Gặp lỗi khi quay trở lại để hòa trộn kiểu “three-way”…\n"
-#: apply.c:3605
+#: apply.c:3609
#, 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:3610
+#: apply.c:3614
#, 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:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "loại bỏ miếng vá để lại nội dung tập tin"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s: sai kiểu"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s có kiểu %o, cần %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "đường dẫn không hợp lệ “%s”"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s: đã có từ trước trong bảng mục lục"
-#: apply.c:3921
+#: apply.c:3925
#, 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:3941
+#: apply.c:3945
#, 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:3946
+#: apply.c:3950
#, 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:3966
+#: apply.c:3970
#, 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:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s: miếng vá không được áp dụng"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "Đang kiểm tra miếng vá %s…"
-#: apply.c:4076
+#: apply.c:4080
#, 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:4083
+#: apply.c:4087
#, 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:4086
+#: apply.c:4090
#, 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:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "make_cache_entry gặp lỗi đối với đường dẫn “%s”"
-#: apply.c:4095
+#: apply.c:4099
#, 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:4105
+#: apply.c:4109
#, 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:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "không thể gỡ bỏ %s từ mục lục"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "miếng vá sai hỏng cho mô-đun-con %s"
-#: apply.c:4284
+#: apply.c:4288
#, 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:4292
+#: apply.c:4296
#, 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:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "không thể thêm mục nhớ đệm cho %s"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "gặp lỗi khi ghi vào “%s”"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "đang đóng tập tin “%s”"
-#: apply.c:4413
+#: apply.c:4417
#, 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:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "Đã áp dụng miếng vá %s một cách sạch sẽ."
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "lỗi nội bộ"
-#: apply.c:4522
+#: apply.c:4526
#, 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:4533
+#: apply.c:4537
#, 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:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "không mở được “%s”"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "Khối nhớ #%d được áp dụng gọn gàng."
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "đoạn dữ liệu #%d bị từ chối."
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "bỏ qua đường dẫn “%s”."
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "không thừa nhận đầu vào"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "không thể đọc tập tin lưu bảng mục lục"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "không thể mở miếng vá “%s”: %s"
-#: apply.c:4860
+#: apply.c:4864
#, 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:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, 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:4874
+#: apply.c:4878
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "Không thể ghi tập tin lưu bảng mục lục mới"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "đường-dẫn"
@@ -624,7 +624,7 @@
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:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "số"
@@ -680,7 +680,7 @@
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:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL"
@@ -688,7 +688,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "đảm bảo rằng có ít nhất <n> dòng nội dung khớp"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "hành động"
@@ -716,9 +718,9 @@
msgid "allow overlapping hunks"
msgstr "cho phép chồng khối nhớ"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "chi tiết"
@@ -731,7 +733,7 @@
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:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "gốc"
@@ -758,108 +760,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <kho> [--exec <lệnh>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "đặc tả đường dẫn “%s” không khớp với bất kỳ tập tin nào"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "định_dạng"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "định dạng lưu trữ"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "tiền_tố"
-#: archive.c:420
+#: archive.c:438
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:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "tập_tin"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "ghi kho lưu vào tập tin này"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "đọc .gitattributes trong thư mục làm việc"
-#: archive.c:425
+#: archive.c:443
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:426
+#: archive.c:444
msgid "store only"
msgstr "chỉ lưu (không nén)"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "nén nhanh hơn"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "nén nhỏ hơn"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "liệt kê các kiểu nén được hỗ trợ"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "kho"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
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:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "lệnh"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "Gặp tùy chọn --remote không cần"
-#: archive.c:452
+#: archive.c:470
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:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "Gặp tùy chọn không cần --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "Không hiểu định dạng “%s”"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "Tham số không được hỗ trợ cho định dạng “%s”: -%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s không phải tên thuộc tính hợp lệ"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -867,22 +869,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:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "nội dung được trích dẫn sai tập tin “%s”: %s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "Chúng tôi không bisect thêm nữa!\n"
-#: bisect.c:708
+#: bisect.c:720
#, 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:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -891,7 +893,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:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -900,7 +902,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:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -909,7 +911,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:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -920,7 +922,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:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -932,36 +934,36 @@
"%s.\n"
"Chúng tôi vẫn cứ tiếp tục."
-#: bisect.c:798
+#: bisect.c:810
#, 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:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "cần một điểm xét duyệt %s"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "không thể tạo tập tin “%s”"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "không thể đọc tập tin “%s”"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "việc đọc tham chiếu bisect gặp lỗi"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s là cả %s và %s\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
@@ -970,7 +972,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:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -979,7 +981,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -998,10 +1000,10 @@
msgstr ""
"--reverse và --first-parent cùng nhau cần chỉ định lần chuyển giao cuối"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
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"
@@ -1042,44 +1044,46 @@
#: branch.c:93
#, c-format
-msgid "Branch %s set up to track remote branch %s from %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s từ %s bằng cách rebase."
+msgid "Branch '%s' set up to track remote branch '%s' from '%s' by rebasing."
+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."
+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."
+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."
+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”."
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "Nhánh %s cài đặt để theo dõi nhánh máy chủ %s bằng cách rebase."
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr ""
+"Nhánh “%s” cài đặt để theo dõi tham chiếu máy chủ “%s” bằng cách rebase."
#: branch.c:105
#, 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."
+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 "Branch '%s' set up to track local ref '%s' by rebasing."
msgstr ""
-"Nhánh %s cài đặt để theo dõi vết tham chiếu nội bộ %s bằng cách rebase."
+"Nhánh “%s” cài đặt để theo dõi tham chiếu nội bộ “%s” bằng cách rebase."
#: branch.c:110
#, 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."
+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"
@@ -1090,33 +1094,33 @@
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:185
+#: 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:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "Đã có nhánh mang tên “%s”."
-#: branch.c:198
+#: 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:218
+#: branch.c:233
#, c-format
msgid "Cannot setup 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:220
+#: branch.c:235
#, 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:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1136,27 +1140,27 @@
"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:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "Không phải tên đối tượng hợp lệ: “%s”."
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "Tên đối tượng chưa rõ ràng: “%s”."
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "Nhánh không hợp lệ: “%s”."
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "“%s” đã được lấy ra tại “%s” rồi"
-#: branch.c:366
+#: branch.c:382
#, 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"
@@ -1171,7 +1175,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "phần đầu không được thừa nhận: %s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "không thể mở “%s”"
@@ -1180,54 +1185,54 @@
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:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "Bó dữ liệu chứa %d tham chiếu:"
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "Lệnh bundle ghi lại toàn bộ lịch sử."
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "Lệnh bundle yêu cầu %d tham chiếu này:"
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "Không thể sản sinh đối tượng gói"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "đối tượng gói đã chết"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list đã chết"
-#: bundle.c:356
+#: bundle.c:363
#, 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:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "đối số không được thừa nhận: %s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "Từ chối tạo một bó dữ liệu trống rỗng."
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "không thể tạo “%s”"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "mục lục gói đã chết"
@@ -1236,8 +1241,8 @@
msgid "invalid color value: %.*s"
msgstr "giá trị màu không hợp lệ: %.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "không thể phân tích cú pháp %s"
@@ -1247,7 +1252,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s không phải là một lần chuyển giao!"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1257,7 +1262,7 @@
"Bạn có lẽ muốn tu bổ nó sau khi sửa lời chú thích, hoặc là đặt biến\n"
"cấu hình i18n.commitencoding thành bảng mã mà dự án của bạn muốn dùng.\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "hết bộ nhớ"
@@ -1345,80 +1350,85 @@
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:1084 config.c:1095
+#: config.c:998
+#, 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:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "mức nén zlib %d là sai"
-#: config.c:1212
+#: config.c:1222
#, 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:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "mức nén gói %d không hợp lệ"
-#: config.c:1564
+#: config.c:1574
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:1894
+#: config.c:1906
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:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "%s không hợp lệ: “%s”"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr ""
"không hiểu giá trị core.untrackedCache “%s”; dùng giá trị mặc định “keep”"
-#: config.c:2111
+#: config.c:2162
#, 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:2122
+#: config.c:2187
#, 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:2124
+#: config.c:2189
#, 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:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s có đa giá trị"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "fstat trên %s gặp lỗi"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "không thể đặt “%s” thành “%s”"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "không thể thôi đặt “%s”"
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "Máy chủ bị treo trên lần tiếp xúc đầu tiên"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1430,19 +1440,19 @@
"Vui lòng chắc chắn là bạn có đủ thẩm quyền truy cập\n"
"và kho chứa đã sẵn có."
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "Đang kiểm tra kết nối"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "Không thể chạy “git rev-list”"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "gặp lỗi khi ghi vào rev-list"
-#: connected.c:102
+#: connected.c:103
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"
@@ -1538,31 +1548,39 @@
msgid "failed to read orderfile '%s'"
msgstr "gặp lỗi khi đọc tập-tin-thứ-tự “%s”"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "Đang thực hiện dò tìm đổi tên không chính xác"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "tùy chọn “%s” yêu cầu một giá trị"
-#: diff.c:125
+#: diff.c:152
#, 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:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " Không hiểu đối số dirstat “%s”\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"cài đặt màu đã di chuyển phải là một trong “no”, “default”, “zebra”, "
+"“dimmed_zebra”, “plain”"
+
+#: diff.c:341
#, 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:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1571,20 +1589,20 @@
"Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n"
"%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "phần mềm diff ở bên ngoài đã chết, dừng tại %s"
-#: diff.c:3427
+#: diff.c:4127
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:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow cần chính xác một đặc tả đường dẫn"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1593,22 +1611,22 @@
"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, 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:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr ""
"nhận thấy đổi tên không chính xác đã bị bỏ qua bởi có quá nhiều tập tin."
-#: diff.c:4719
+#: diff.c:5449
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:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
@@ -1616,207 +1634,216 @@
"bạn có lẽ muốn đặt biến %s của bạn thành ít nhất là %d và thử lại lệnh lần "
"nữa."
-#: dir.c:1948
+#: dir.c:2100
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:2067
+#: dir.c:2219
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:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "không thể tạo thư mục cho %s"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "không thể di cư thư mục git từ “%s” sang “%s”"
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "gợi ý: Chờ trình biên soạn của bạn đóng tập tin…%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "Nội dung lọc"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "không thể lấy thống kê tập tin “%s”"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack: cần danh sách shallow"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
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"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "lỗi máy chủ: %s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, 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:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc cần multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "dòng shallow không hợp lệ: %s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "dòng unshallow không hợp lệ: %s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "Không tìm thấy đối tượng: %s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "lỗi trong đối tượng: %s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "không tìm shallow nào: %s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "cần shallow/unshallow, nhưng lại nhận được %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "nhận %s %d - %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "lần chuyển giao %s không hợp lệ"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "chịu thua"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "xong"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "nhận %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "Đánh dấu %s là đã hoàn thành"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "đã sẵn có %s (%s)"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack: không thể rẽ nhánh sideband demultiplexer"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "lỗi giao thức: phần đầu gói bị sai"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack: không thể rẽ nhánh %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "%s gặp lỗi"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "có lỗi trong sideband demultiplexer"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "Máy chủ không hỗ trợ máy khách shallow"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "Máy chủ hỗ trợ multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "Máy chủ hỗ trợ no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "Máy chủ hỗ trợ multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "Máy chủ hỗ trợ side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "Máy chủ hỗ trợ side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "Máy chủ hỗ trợ allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "Máy chủ hỗ trợ allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "Máy chủ hỗ trợ ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "Phiên bản máy chủ là %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "Máy chủ không hỗ trợ --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "Máy chủ không hỗ trợ --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "Máy chủ không hỗ trợ --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "không có lần chuyển giao chung nào"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack: fetch gặp lỗi."
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "không khớp phần đầu máy chủ"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, 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:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr ""
@@ -1830,7 +1857,7 @@
msgid "could not create temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”"
@@ -1840,17 +1867,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "bỏ qua màu không hợp lệ “%.*s” trong log.graphColors"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "“%s”: không thể đọc %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "gặp lỗi khi lấy thống kê về “%s”"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "“%s”: đọc ngắn"
@@ -1916,12 +1943,12 @@
msgid "git version [<options>]"
msgstr "git version [<các-tùy-chọn>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s: %s - %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -1986,12 +2013,21 @@
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:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "ngày tháng không hợp lệ: %s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "không thể tổ hợp các kiểu lọc nhiều đối tượng"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "biểu thức đặc tả bộ lọc “%s” không hợp lệ"
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2010,87 +2046,87 @@
"một tiến trình git có lẽ đã đổ vỡ khi thực hiện ở kho này trước đó:\n"
"gõ bỏ tập tin một cách thủ công để tiếp tục."
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "Không thể tạo “%s.lock”: %s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "gặp lỗi khi đọc bộ nhớ đệm"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "không thể ghi tập tin lưu bảng mục lục mới"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "(commit sai)\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "addinfo_cache gặp lỗi đối với đường dẫn “%s”"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "gặp lỗi khi xây dựng cây"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, 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:739
+#: merge-recursive.c:763
#, 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:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr ": có lẽ là một xung đột D/F?"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, 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:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "không thể đọc đối tượng %s “%s”"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "đối tượng blob được mong đợi cho %s “%s”"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "gặp lỗi khi mở “%s”: %s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, 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:846
+#: merge-recursive.c:870
#, 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:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "Gặp lỗi khi thực hiện trộn nội bộ"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "Không thể thêm %s vào cơ sở dữ liệu"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2099,7 +2135,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:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2108,7 +2144,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:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2117,7 +2153,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:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2126,20 +2162,20 @@
"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:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "đổi tên"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "đã đổi tên"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, 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:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2148,140 +2184,145 @@
"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:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr " (cần giải quyết)"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
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"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr ""
"XUNG ĐỘT (đổi-tên/thêm): Đổi tên %s->%s trong %s. %s được thêm vào trong %s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "Thêm hòa trộn %s"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "Thay vào đó thêm vào %s"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "không thể đọc đối tượng %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "đối tượng %s không phải là một blob"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "sửa đổi"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "đã sửa"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "nội dung"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "thêm/thêm"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, 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:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "Tự-động-hòa-trộn %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "mô-đun-con"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "XUNG ĐỘT (%s): Xung đột hòa trộn trong %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "Đang xóa %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "tập-tin/thư-mục"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "thư-mục/tập-tin"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "Thêm \"%s\""
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+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)"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "Đã cập nhật rồi!"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, 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:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "Đang trộn:"
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, 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:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "hòa trộn không trả về lần chuyển giao nào"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "Không thể phân tích đối tượng “%s”"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "Không thể ghi bảng mục lục"
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2293,7 +2334,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:280
+#: notes-merge.c:279
#, 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)."
@@ -2323,16 +2364,31 @@
msgid "Bad %s value: '%s'"
msgstr "Giá trị %s sai: “%s”"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "không thể phân tích đối tượng: “%s”"
+#: packfile.c:556
+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:1683
+#, 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:1687
+#, 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.c:573
msgid "..."
msgstr "…"
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "cách dùng: %s"
@@ -2340,17 +2396,17 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " hoặc: %s"
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-SỐ"
@@ -2359,7 +2415,7 @@
msgid "malformed object name '%s'"
msgstr "tên đối tượng dị hình “%s”"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "Không thể làm %s được ghi bởi nhóm"
@@ -2434,24 +2490,16 @@
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:575
-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"
-
-#: pathspec.c:599
+#: pathspec.c:592
#, 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"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "không thể phân tích định dạng --pretty"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2460,7 +2508,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:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2469,51 +2517,52 @@
"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:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "không thể đóng “%s”"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "không thể mở thư mục git: %s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "không thể bỏ liên kết (unlink): “%s”"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "Không thể mở “%s” để ghi"
-#: refs.c:1769
+#: refs.c:1850
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/files-backend.c:1664
-#, 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:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "không thể xóa bỏ tham chiếu: %s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "không thể gỡ bỏ tham chiếu: %s"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, 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:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "không thể xóa bỏ tham chiếu: %s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "đã ra đi"
@@ -2532,157 +2581,157 @@
msgid "ahead %d, behind %d"
msgstr "trước %d, sau %d"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
msgstr "cần định dạng: %%(color:<color>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "không nhận ra màu: %%(màu:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, 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:125
+#: ref-filter.c:133
#, 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:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "đối số không được thừa nhận %%(%s): %s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) không nhận các đối số"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) không nhận các đối số"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) không nhận các đối số"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "không hiểu tham số %%(trailers): %s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, 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:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "đối số không được thừa nhận %%(contents): %s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "cần nội dung mang giá trị dương:shot=%s"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "đối số không được thừa nhận %%(objectname): %s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
msgstr "cần định dạng: %%(align:<width>,<position>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "vị trí không được thừa nhận:%s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "chiều rộng không được thừa nhận:%s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "đối số không được thừa nhận %%(align): %s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, 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:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "đối số không được thừa nhận %%(if): %s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "tên trường dị hình: %.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "không hiểu tên trường: %.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "định dạng: nguyên tử %%(if) được dùng mà không có nguyên tử %%(then)"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, 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:570
+#: ref-filter.c:609
#, 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:572
+#: ref-filter.c:611
#, 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:598
+#: ref-filter.c:637
#, 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:600
+#: ref-filter.c:639
#, 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:602
+#: ref-filter.c:641
#, 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:615
+#: ref-filter.c:654
#, 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:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "chuỗi định dạng dị hình %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "(không nhánh, đang cải tổ %s)"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, 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)"
@@ -2690,7 +2739,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "(HEAD được tách rời tại %s)"
@@ -2698,138 +2747,138 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "(HEAD được tách rời từ %s)"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "(không nhánh)"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "thiếu đối tượng %s cho %s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, 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:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "đối tượng dị hình tại “%s”"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, 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:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "đang lờ đi tham chiếu hỏng %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "định dạng: thiếu nguyên tử %%(end)"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "tên đối tượng dị hình %s"
-#: remote.c:747
+#: remote.c:780
#, 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:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s thường theo dõi %s, không phải %s"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s theo dõi cả %s và %s"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "Lỗi nội bộ"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD không chỉ đến một nhánh nào cả"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "không có nhánh nào như thế: “%s”"
-#: remote.c:1692
+#: remote.c:1723
#, 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:1698
+#: remote.c:1729
#, 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:1713
+#: remote.c:1744
#, 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:1725
+#: remote.c:1756
#, 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:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "đẩy refspecs cho “%s” không bao gồm “%s”"
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "đẩy lên mà không có đích (push.default là “nothing”)"
-#: remote.c:1771
+#: remote.c:1802
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:2076
+#: remote.c:2106
#, 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:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " (dùng \" git branch --unset-upstream\" để sửa)\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+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:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
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:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2838,11 +2887,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:2104
+#: remote.c:2134
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:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2855,48 +2904,57 @@
"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:2117
+#: remote.c:2147
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"
-#: revision.c:2187
+#: revision.c:2268
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:2190
+#: revision.c:2271
#, 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:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent xung khắc với --bisect"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "gặp lỗi khi mở “/dev/null”"
-#: send-pack.c:151
+#: run-command.c:1188
+#, 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“."
+
+#: send-pack.c:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "không thể phân tích tình trạng unpack máy chủ: %s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "máy chủ gặp lỗi unpack: %s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "gặp lỗi khi ký chứng thực đẩy"
-#: send-pack.c:429
+#: send-pack.c:419
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:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
@@ -2904,32 +2962,32 @@
"đừ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:443
+#: send-pack.c:433
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:448
+#: send-pack.c:438
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:216
+#: sequencer.c:218
msgid "revert"
msgstr "hoàn nguyên"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "cherry-pick"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "Không nhận ra thao tác: %d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -2937,7 +2995,7 @@
"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n"
"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -2947,42 +3005,43 @@
"với lệnh “git add <đường_dẫn>” hoặc “git rm <đường_dẫn>”\n"
"và chuyển giao kết quả bằng lệnh “git commit”"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "không thể khóa “%s”"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "không thể ghi vào “%s”"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "không thể ghi eol vào “%s”"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "gặp lỗi khi finalize “%s”"
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "Không thể đọc “%s”."
-#: sequencer.c:356
+#: sequencer.c:358
#, 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:360
+#: sequencer.c:362
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:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s: chuyển-tiếp-nhanh"
@@ -2990,20 +3049,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, 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:491
-msgid "could not resolve HEAD commit\n"
-msgstr "không thể phân giải lần chuyển giao HEAD\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "không thể phân giải lần chuyển giao HEAD"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "không thể cập nhật cây bộ nhớ đệm\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "không thể cập nhật cây bộ nhớ đệm"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3032,17 +3091,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "không thể phân tích lần chuyển giao %s\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "không thể phân tích lần chuyển giao cha mẹ “%s”\n"
+msgid "could not parse commit %s"
+msgstr "không thể phân tích lần chuyển giao %s"
-#: sequencer.c:824
+#: sequencer.c:707
+#, 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:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3053,7 +3112,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3064,233 +3123,244 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, 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:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "cần một HEAD để sửa"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "không thể đọc phần chú thích (message) của HEAD"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "không thể ghi “%s”"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "Đây là chú thích cho lần chuyển giao thứ nhất:"
-#: sequencer.c:872
+#: sequencer.c:884
#, 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:879
+#: sequencer.c:891
#, 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:884
+#: sequencer.c:896
#, 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:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:955
+#: sequencer.c:967
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:973
+#: sequencer.c:986
#, 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:981
+#: sequencer.c:994
#, 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:985
+#: sequencer.c:998
#, c-format
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."
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, 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:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "không thể đổi tên “%s” thành “%s”"
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "không thể hoàn nguyên %s… %s"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "không thể áp dụng miếng vá %s… %s"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "lần chuyển giao trống rỗng đặt là hợp quy cách"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, 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:1186
+#: sequencer.c:1196
#, 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:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s không nhận các đối số: “%s”"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "thiếu đối số cho %s"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "dòng không hợp lệ %d: %.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, 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:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "không thể đọc “%s”."
-#: sequencer.c:1359
+#: sequencer.c:1375
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:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "bảng chỉ thị không thể dùng được: %s"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "không có lần chuyển giao nào được phân tích."
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "không thể cherry-pick trong khi hoàn nguyên."
-#: sequencer.c:1379
+#: sequencer.c:1395
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:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "khóa không đúng: %s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "giá trị cho %s không hợp lệ: %s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "bảng tùy chọn dị hình: “%s”"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "có một thao tác “cherry-pick” hoặc “revert” đang được thực hiện"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1573
#, 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:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "không thể khóa HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
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:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "không thể phân giải HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
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:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "không mở được “%s”"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "không thể đọc “%s”: %s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "gặp kết thúc tập tin đột xuất"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, 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:1658
+#: sequencer.c:1691
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:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "không thể đọc HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "không thể chép “%s” sang “%s”"
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "không thể đọc bảng mục lục"
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3305,11 +3375,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
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:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3326,17 +3396,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "Đã áp dụng autostash.\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "không thử lưu “%s”"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3348,57 +3418,57 @@
"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:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "Dừng lại ở %s… %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "không hiểu câu lệnh %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "không thể đọc orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "không thể đọc “onto”."
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "không thể cập nhật %s"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "không thể cập nhật HEAD thành %s"
-#: sequencer.c:2197
+#: sequencer.c:2239
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:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "không thể xóa bỏ CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2253
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:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "tập tin không hợp lệ: “%s”"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "nội dung không hợp lệ: “%s”"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3408,24 +3478,97 @@
"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:2228
+#: sequencer.c:2270
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:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s: không thể cherry-pick một %s"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s: điểm xét duyệt sai"
-#: sequencer.c:2345
+#: sequencer.c:2387
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:2492
+msgid "make_script: unhandled options"
+msgstr "make_script: các tùy chọn được không xử lý"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script: lỗi chuẩn bị điểm hiệu chỉnh"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "danh sách cần làm không dùng được: “%s”"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr ""
+"không nhận ra cài đặt %s cho tùy chọn rebase.missingCommitsCheck. Nên bỏ qua."
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n"
+"Các lần chuyển giao bị xóa (từ mới đến cũ):\n"
+
+#: sequencer.c:2702
+#, 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 ""
+"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần "
+"chuyển giao.\n"
+"\n"
+"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh "
+"báo.\n"
+"Cánh ứng xử có thể là: ignore, warn, error.\n"
+"\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --"
+"continue”.\n"
+"Hoặc là bạn có thể bãi bỏ việc cải tổ bằng “git rebase --abort”.\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "không thể mở “%s” để ghi"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "không thể phân tích lần chuyển giao “%s”"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "văn lệnh đã sẵn được sắp đặt rồi."
+
#: setup.c:171
#, c-format
msgid ""
@@ -3459,34 +3602,34 @@
"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:504
+#: setup.c:501
#, 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:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "tìm thấy phần mở rộng kho chưa biết:"
-#: setup.c:810
+#: setup.c:811
#, 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:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "Không thể quay lại cwd"
-#: setup.c:1050
+#: setup.c:1052
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:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "Không thể chuyển sang “%s”"
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3496,7 +3639,7 @@
"Dừng tại biên của hệ thống tập tin (GIT_DISCOVERY_ACROSS_FILESYSTEM chưa "
"đặt)."
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3505,56 +3648,41 @@
"Gặp vấn đề với gía 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."
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "đường dẫn “%s” không tồn tại"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "kho tham chiếu “%s” như là lấy ra liên kết vẫn chưa được hỗ trợ."
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "kho tham chiếu “%s” không phải là một kho nội bộ."
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "kho tham chiếu “%s” là nông"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "kho tham chiếu “%s” bị cấy ghép"
-#: sha1_file.c:1245
-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 à?)"
-
-#: sha1_file.c:2729
-#, 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 à?)"
-
-#: sha1_file.c:2733
-#, 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 à?)"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "tóm lược SHA1 %s chưa rõ ràng"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "Các ứng cử là:"
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3578,66 +3706,72 @@
"này\n"
"bằng cách chạy lệnh \"git config advice.objectNameWarning false\""
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
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:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, 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:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "Không thể cập nhật mục .gitmodules %s"
-#: submodule.c:115
+#: submodule.c:141
#, 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:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "gặp lỗi khi tổ chức .gitmodules đã cập nhật"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "Trong mô-đun-con không có gì “%s”"
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "Đặc tả đường dẫn “%s” thì ở trong mô-đun-con “%.*s”"
-#: submodule.c:1337
+#: submodule.c:833
+#, 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:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+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:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "không nhận ra “%s” là một kho git"
-#: submodule.c:1475
+#: submodule.c:1508
#, 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:1488
+#: submodule.c:1521
#, 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:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "mô-đun-con “%s” có mục lục còn bẩn"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
@@ -3645,18 +3779,18 @@
"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:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, 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:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "không thể tạo thư mục “%s”"
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3667,79 +3801,83 @@
"“%s” sang\n"
"“%s”\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "không thể đệ quy vào trong mô-đun-con “%s”"
-#: submodule.c:1992
+#: submodule.c:2023
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:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "LỖI: trả về chuỗi đường dẫn không khớp cwd?"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree trả về mã không như mong đợi %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "không cho phép giá trị âm ở submodule.fetchJobs"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "giá trị cho %s không hợp lệ"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "chạy lệnh kéo theo “%s” gặp lỗi"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "không hiểu giá trị “%s” cho khóa “%s”"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "nhiều hơn một %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "thẻ thừa trống rỗng trong phần thừa “%.*s”"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "không đọc được tập tin đầu vào “%s”"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "không thể đọc từ đầu vào tiêu chuẩn"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "không thể lấy thông tin thống kê về %s"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "\"%s\" không phải là tập tin bình thường"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "tập tin %s người dùng không thể ghi được"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "không thể tạo tập tin tạm thời"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "không thể đổi tên tập tin tạm thời thành %s"
@@ -3754,7 +3892,7 @@
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:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
@@ -3763,7 +3901,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:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3790,11 +3928,11 @@
"để đẩy chúng lên máy phục vụ.\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "Bãi bỏ."
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "Không thể đọc tham chiếu %s"
@@ -3811,11 +3949,11 @@
msgid "empty filename in tree entry"
msgstr "tên tập tin trống rỗng trong mục tin cây"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "tập tin cây quá ngắn"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3826,7 +3964,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:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3836,7 +3974,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3847,7 +3985,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:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3857,7 +3995,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3867,7 +4005,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:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3877,7 +4015,7 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3887,7 +4025,7 @@
"trong nó:\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3897,7 +4035,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:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3907,7 +4045,7 @@
"checkout:\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3917,7 +4055,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:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3927,7 +4065,7 @@
"trộn:\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3936,7 +4074,7 @@
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị gỡ bỏ bởi %s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3945,29 +4083,29 @@
"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:143
-#, 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 ""
-"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
-"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:145
#, 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 ""
+"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
+"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:147
+#, c-format
+msgid ""
+"The following untracked working tree files would be overwritten by "
+"checkout:\n"
"%%s"
msgstr ""
"Các tập tin cây làm việc chưa được theo dõi sau đây sẽ bị ghi đè bởi lệnh "
"checkout:\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3977,7 +4115,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:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -3987,7 +4125,7 @@
"hòa trộn:\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -3997,7 +4135,7 @@
"%s:\n"
"%%sVui lòng di chuyển hay gỡ bỏ chúng trước khi bạn %s."
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4007,21 +4145,21 @@
"%s:\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, 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:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"Không thể cập nhật checkout rải rác: các mục tin sau đây chưa cập nhật:\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4032,7 +4170,7 @@
"nhật checkout rải rác:\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4043,7 +4181,7 @@
"nhật checkout rải rác:\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4052,17 +4190,12 @@
"Không thể cập nhật mô-đun-con:\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "Bãi bỏ\n"
-#: unpack-trees.c:277
-#, c-format
-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”"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "Đang lấy ra các tập tin"
@@ -4105,13 +4238,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "không thể mở “%s” để đọc và ghi"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "không thể mở “%s” để ghi"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "không thể mở “%s” để đọc"
@@ -4125,276 +4253,266 @@
msgid "unable to get current working directory"
msgstr "Không thể lấy thư mục làm việc hiện hành"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "không thể ghi vào %s"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "không thể đóng %s"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "Những đường dẫn chưa được hòa trộn:"
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " (dùng \"git reset %s <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " (dùng \"git rm --cached <tập-tin>…\" để bỏ ra khỏi bệ phóng)"
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " (dùng \"git add <tập-tin>…\" để đánh dấu là cần giải quyết)"
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" như là một cách thích hợp để đánh dấu là "
"cần được giải quyết)"
-#: wt-status.c:189
+#: wt-status.c:187
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:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "Những thay đổi sẽ được chuyển giao:"
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "Các thay đổi chưa được đặt lên bệ phóng để chuyển giao:"
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " (dùng \"git add <tập-tin>…\" để cập nhật những gì sẽ chuyển giao)"
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr ""
" (dùng \"git add/rm <tập-tin>…\" để cập nhật những gì sẽ được chuyển giao)"
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr ""
" (dùng \"git checkout -- <tập-tin>…\" để loại bỏ các thay đổi trong thư mục "
"làm việc)"
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr ""
" (chuyển giao hoặc là loại bỏ các nội dung chưa được theo dõi hay đã sửa "
"chữa trong mô-đun-con)"
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr ""
" (dùng \"git %s <tập-tin>…\" để thêm vào những gì cần được chuyển giao)"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "bị xóa bởi cả hai:"
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "được thêm vào bởi chúng ta:"
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "bị xóa đi bởi họ:"
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "được thêm vào bởi họ:"
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "bị xóa bởi chúng ta:"
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "được thêm vào bởi cả hai:"
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "bị sửa bởi cả hai:"
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "tập tin mới:"
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "đã chép:"
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "đã xóa:"
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "đã sửa:"
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "đã đổi tên:"
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "đổi-kiểu:"
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "không hiểu:"
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "chưa hòa trộn:"
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "lần chuyển giao mới, "
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "nội dung bị sửa đổi, "
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "nội dung chưa được theo dõi, "
-#: wt-status.c:821
+#: wt-status.c:824
#, 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:853
+#: wt-status.c:856
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:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "Những mô-đun-con thay đổi đã được chuyển giao:"
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"Không động đến đường ở trên.\n"
+"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:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "Bạn có những đường dẫn chưa được hòa trộn."
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " (sửa các xung đột rồi chạy \"git commit\")"
-#: wt-status.c:1054
+#: wt-status.c:1058
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:1059
+#: wt-status.c:1063
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:1062
+#: wt-status.c:1066
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:1072
+#: wt-status.c:1076
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:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "Miếng vá hiện tại bị trống rỗng."
-#: wt-status.c:1079
+#: wt-status.c:1083
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:1081
+#: wt-status.c:1085
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:1083
+#: wt-status.c:1087
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:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "thiếu git-rebase-todo"
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "Không thực hiện lệnh nào."
-#: wt-status.c:1219
+#: wt-status.c:1224
#, c-format
msgid "Last command done (%d command done):"
msgid_plural "Last commands done (%d commands done):"
msgstr[0] "Lệnh thực hiện cuối (%d lệnh được thực thi):"
-#: wt-status.c:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " (xem thêm trong %s)"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "Không có lệnh nào còn lại."
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
msgstr[0] "Lệnh cần làm kế tiếp (%d lệnh còn lại):"
-#: wt-status.c:1246
+#: wt-status.c:1251
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:1259
+#: wt-status.c:1264
#, 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:1264
+#: wt-status.c:1269
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:1278
+#: wt-status.c:1283
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:1280
+#: wt-status.c:1285
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:1282
+#: wt-status.c:1287
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:1288
+#: wt-status.c:1293
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:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
@@ -4402,134 +4520,134 @@
"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:1297
+#: wt-status.c:1302
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:1300
+#: wt-status.c:1305
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:1304
+#: wt-status.c:1309
#, 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:1309
+#: wt-status.c:1314
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:1312
+#: wt-status.c:1317
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:1314
+#: wt-status.c:1319
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:1324
+#: wt-status.c:1329
#, 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:1329
+#: wt-status.c:1334
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:1332
+#: wt-status.c:1337
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:1334
+#: wt-status.c:1339
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:1343
+#: wt-status.c:1348
#, 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:1348
+#: wt-status.c:1353
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:1351
+#: wt-status.c:1356
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:1353
+#: wt-status.c:1358
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:1364
+#: wt-status.c:1369
#, 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:1368
+#: wt-status.c:1373
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:1371
+#: wt-status.c:1376
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:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "Trên nhánh "
-#: wt-status.c:1574
+#: wt-status.c:1579
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:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "rebase đang được thực hiện: lên trên "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "HEAD được tách rời tại "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "HEAD được tách rời từ "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "Hiện tại chẳng ở nhánh nào cả."
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "Lần chuyển giao khởi tạo"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "Vẫn chưa chuyển giao"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "Những tập tin chưa được theo dõi"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "Những tập tin bị lờ đi"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4541,32 +4659,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:1633
+#: wt-status.c:1638
#, 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:1635
+#: wt-status.c:1640
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:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "Không có thay đổi nào"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, 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:1649
+#: wt-status.c:1654
#, 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:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
@@ -4575,70 +4693,70 @@
"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:1655
+#: wt-status.c:1660
#, 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:1658
+#: wt-status.c:1663
#, 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:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "không có gì để chuyển giao\n"
-#: wt-status.c:1664
+#: wt-status.c:1669
#, 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:1668
+#: wt-status.c:1673
#, 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:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "Vẫn không thực hiện lệnh chuyển giao nào"
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD (không nhánh)"
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "đằng sau "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "phía trước "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, 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:2317
+#: wt-status.c:2324
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:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr ""
"không thể %s: Mục lục của bạn có chứa các thay đổi chưa được chuyển giao."
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "gặp lỗi khi bỏ liên kết (unlink) “%s”"
@@ -4647,129 +4765,133 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<các-tùy-chọn>] [--] <pathspec>…"
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "trạng thái lệnh diff không như mong đợi %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "Cập nhật tập tin gặp lỗi"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "gỡ bỏ “%s”\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
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:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "Không thể đọc bảng mục lục"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "Không thể mở “%s” để ghi."
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "Không thể ghi ra miếng vá"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "gặp lỗi khi sửa miếng vá"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "Không thể lấy thông tin thống kê về “%s”"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "Miếng vá trống rỗng. Nên bỏ qua."
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "Không thể áp dụng miếng vá “%s”"
-#: builtin/add.c:249
+#: builtin/add.c:271
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:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "chạy thử"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "sửa bằng cách tương tác"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "chọn “hunks” theo kiểu tương tác"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "sửa diff hiện nay và áp dụng nó"
-#: builtin/add.c:275
+#: builtin/add.c:297
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:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "cập nhật các tập tin được theo dõi"
-#: builtin/add.c:277
+#: builtin/add.c:299
+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:300
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:278
+#: builtin/add.c:301
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:281
+#: builtin/add.c:304
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:283
+#: builtin/add.c:306
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:284
+#: builtin/add.c:307
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:285
+#: builtin/add.c:308
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:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
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:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "cảnh báo khi thêm một kho nhúng"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4800,151 +4922,151 @@
"\n"
"Xem \"git help submodule\" để biết thêm chi tiết."
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "thêm cần một kho git nhúng: %s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "Sử dụng tùy chọn -f nếu bạn thực sự muốn thêm chúng vào.\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "thêm tập tin gặp lỗi"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "-A và -u xung khắc nhau"
-#: builtin/add.c:401
+#: builtin/add.c:424
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:405
+#: builtin/add.c:428
#, 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:420
+#: builtin/add.c:443
#, 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:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "Có lẽ ý bạn là “git add .” phải không?\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "tập tin ghi bảng mục lục bị hỏng"
-#: builtin/am.c:413
+#: builtin/am.c:414
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:489
+#: builtin/am.c:498
#, 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:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "Dòng đầu vào dị hình: “%s”."
-#: builtin/am.c:567
+#: builtin/am.c:576
#, 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:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek gặp lỗi"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "không thể phân tích cú pháp “%s”"
-#: builtin/am.c:842
+#: builtin/am.c:855
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:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "dấu thời gian không hợp lệ"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "dòng Ngày tháng không hợp lệ"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "độ lệch múi giờ không hợp lệ"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "Dò tìm định dạng miếng vá gặp lỗi."
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "Gặp lỗi khi chia nhỏ các miếng vá."
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "không thể ghi tập tin lưu mục lục"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "Khi bạn đã phân giải xong trục trặc này, hãy chạy \"%s --continue\"."
-#: builtin/am.c:1172
+#: builtin/am.c:1161
#, 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:1173
+#: 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:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "Miếng vá trống rỗng."
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "dòng thụt lề không hợp lệ: %.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "không thể phân tích lần chuyển giao “%s”"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "Kho thiếu đối tượng blob cần thiết để trở về trên “3-way merge”."
-#: builtin/am.c:1588
+#: builtin/am.c:1552
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:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4952,38 +5074,38 @@
"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:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "Đang trở lại để vá cơ sở và “hòa trộn 3-đường”…"
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "Gặp lỗi khi trộn vào các thay đổi."
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
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"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "áp dụng vào một lịch sử trống rỗng"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "gặp lỗi khi ghi đối tượng chuyển giao"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, 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:1735
+#: builtin/am.c:1699
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"
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "Thân của lần chuyển giao là:"
@@ -4991,37 +5113,37 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
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:1800
+#: builtin/am.c:1764
#, 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:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "Áp dụng: %.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
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:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "Gặp lỗi khi vá tại %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
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"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5032,7 +5154,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:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -5045,17 +5167,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:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "không thể phân tích đối tượng “%s”."
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "gặp lỗi khi dọn bảng mục lục"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
msgid ""
"You seem to have moved HEAD since the last 'am' failure.\n"
"Not rewinding to ORIG_HEAD"
@@ -5063,135 +5185,134 @@
"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:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "Giá trị không hợp lệ cho --patch-format: %s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<các-tùy-chọn>] [(<mbox>|<Maildir>)…]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<các-tùy-chọn>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "chạy kiểu tương tác"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "tùy chọn lịch sử -- không-toán-tử"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
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:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "im lặng"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "Thêm dòng Signed-off-by cho ghi chú của lần chuyển giao"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "chuyển mã thành utf8 (mặc định)"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "chuyển cờ -k cho git-mailinfo"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "chuyển cờ -b cho git-mailinfo"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "chuyển cờ -m cho git-mailinfo"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
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:2241
+#: builtin/am.c:2204
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:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "cắt mọi thứ trước dòng scissors"
-#: 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:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "chuyển nó qua git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "định dạng"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "định dạng (các) miếng vá theo"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
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:2278
+#: builtin/am.c:2241
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:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "đồng nghĩa với --continue"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "bỏ qua miếng vá hiện hành"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
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:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "nói dối về ngày chuyển giao"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
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:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "mã-số-khóa"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "lần chuyển giao ký-GPG"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "(dùng nội bộ cho git-rebase)"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5199,16 +5320,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:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "gặp lỗi đọc bảng mục lục"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, 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:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5217,7 +5338,7 @@
"Tìm thấy thư mục lạc %s.\n"
"Dùng \"git am --abort\" để loại bỏ nó đi."
-#: builtin/am.c:2369
+#: builtin/am.c:2332
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."
@@ -5255,19 +5376,70 @@
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:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <bad_term> <good_term>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, 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:50
+#, 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:60
+#, 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:71
+msgid "please use two different terms"
+msgstr "vui lòng dùng hai thời kỳ khác nhau"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "không thể mở tập tin BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "thực hiện “git bisect next”"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "ghi thời kỳ vào .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "dọn dẹp tình trạng di chuyển nửa bước"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "kiểm tra cho điểm xem xét cần dùng"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr ""
"cập nhật BISECT_HEAD thay vì lấy ra (checking out) lần chuyển giao hiện hành"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms cần hai tham số"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state không nhận đối số"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<các-tùy-chọn>] [<rev-opts>] [<rev>] [--] <tập-tin>"
@@ -5422,14 +5594,18 @@
msgstr "git branch [<các-tùy-chọn>] (-m | -M) [<nhánh-cũ>] <nhánh-mới>"
#: builtin/branch.c:31
+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:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<các-tùy-chọn>] [-r | -a] [--format]"
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5438,7 +5614,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:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5447,12 +5623,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:163
+#: builtin/branch.c:164
#, 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:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5461,91 +5637,112 @@
"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:180
+#: builtin/branch.c:181
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:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "không thể dùng tùy chọn -a với -d"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
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:231
+#: builtin/branch.c:232
#, 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:246
+#: builtin/branch.c:247
#, 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:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "không tìm thấy nhánh “%s”."
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "Gặp lỗi khi đang xóa nhánh theo dõi máy chủ “%s”"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "Gặp lỗi khi xóa bỏ nhánh “%s”"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, 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:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "Nhánh “%s” đã bị xóa (từng là %s)\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "không thể phân tích chuỗi định dạng"
+
+#: builtin/branch.c:450
#, 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:449
+#: builtin/branch.c:454
#, 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:464
+#: builtin/branch.c:471
+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:473
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:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "Tên nhánh không hợp lệ: “%s”"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "Gặp lỗi khi đổi tên nhánh"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "Gặp lỗi khi sao chép nhánh"
+
+#: builtin/branch.c:517
+#, 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:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
msgstr "Đã đổi tên nhánh khuyết danh “%s” đi"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, 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:506
+#: builtin/branch.c:535
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:522
+#: builtin/branch.c:537
+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:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5556,176 +5753,184 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được cắt bỏ.\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "Tùy chọn chung"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
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:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "không xuất các thông tin"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "cài đặt chế độ theo dõi (xem git-pull(1))"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "thay đổi thông tin thượng nguồn"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "không dùng"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "thượng nguồn"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "thay đổi thông tin thượng nguồn"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "Bỏ đặt thông tin thượng nguồn"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "tô màu kết xuất"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "thao tác trên nhánh “remote-tracking”"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
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:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
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:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "Hành động git-branch:"
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "liệt kê cả nhánh “remote-tracking” và nội bộ"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "xóa một toàn bộ nhánh đã hòa trộn"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
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:579
+#: builtin/branch.c:610
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:580
+#: builtin/branch.c:611
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:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "sao chép một nhánh và reflog của nó"
+
+#: builtin/branch.c:613
+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:614
msgid "list branch names"
msgstr "liệt kê các tên nhánh"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "tạo reflog của nhánh"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "sửa mô tả cho nhánh"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "buộc tạo, di chuyển/đổi tên, xóa"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
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:587
+#: builtin/branch.c:620
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:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "liệt kê các nhánh trong các cột"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "khóa"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "tên trường cần sắp xếp"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "đối tượng"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "chỉ hiển thị các nhánh của đối tượng"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
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:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "định dạng sẽ dùng cho đầu ra"
-#: builtin/branch.c:615
-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ệ."
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "không tìm thấy HEAD ở dưới refs/heads!"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "tùy chọn --column và --verbose xung khắc nhau"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "cần chỉ ra tên nhánh"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "Không thể đưa ra mô tả HEAD đã tách rời"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
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:693
+#: builtin/branch.c:730
#, 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:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "Không có nhánh nào có tên “%s”."
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "quá nhiều nhánh dành cho thao tác đổi tên"
+#: builtin/branch.c:748
+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:716
-msgid "too many branches to set new upstream"
-msgstr "quá nhiều nhánh được đặt cho thượng nguồn mới"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "quá nhiều tham số cho thao tác đổi tên"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "quá nhiều tham số để đặt thượng nguồn mới"
+
+#: builtin/branch.c:766
#, c-format
msgid ""
"could not set upstream of HEAD to %s when it does not point to any branch."
@@ -5733,58 +5938,42 @@
"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:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "không có nhánh nào như thế “%s”"
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "chưa có nhánh “%s”"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "quá nhiều nhánh để bỏ đặt thượng nguồn"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "quá nhiều tham số để bỏ đặt thượng nguồn"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
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:749
+#: builtin/branch.c:795
#, 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:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "không hợp lý khi tạo “HEAD” thủ công"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr ""
"hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên "
"nhánh"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"Cờ --set-upstream đã lạc hậu và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-"
-"upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-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"
+"tùy chọn --set-upstream đã không còn được hỗ trợ nữa. Vui lòng dùng “--"
+"track” hoặc “--set-upstream-to” để thay thế."
#: builtin/bundle.c:45
#, c-format
@@ -5799,7 +5988,7 @@
msgid "Need a repository to unbundle."
msgstr "Cần một kho chứa để có thể giải nén một bundle."
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5807,7 +5996,7 @@
"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:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5815,64 +6004,64 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
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:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "hiển thị kiểu đối tượng"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "hiển thị kích thước đối tượng"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
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:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "in nội dung đối tượng dạng dễ đọc"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
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:566
+#: builtin/cat-file.c:568
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:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "blob"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
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:570
+#: builtin/cat-file.c:572
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:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "đệm kết xuất --batch"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr ""
"hiển thị thông tin và nội dung của các đối tượng lấy từ đầu vào tiêu chuẩn"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
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:579
+#: builtin/cat-file.c:581
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:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "hiển thị mọi đối tượng với --batch hay --batch-check"
@@ -5900,7 +6089,7 @@
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:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "chặn các báo cáo tiến trình hoạt động"
@@ -5957,162 +6146,162 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
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:161
+#: builtin/checkout-index.c:159
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:162
+#: builtin/checkout-index.c:160
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:164
+#: builtin/checkout-index.c:162
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:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "không checkout các tập tin mới"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
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:172
+#: builtin/checkout-index.c:170
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:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "ghi nội dung vào tập tin tạm"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "chuỗi"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
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:178
+#: builtin/checkout-index.c:176
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:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<các-tùy-chọn>] <nhánh>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<các-tùy-chọn>] [<nhánh>] -- <tập-tin>…"
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, 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:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, 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:153
+#: builtin/checkout.c:154
#, 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:197
+#: builtin/checkout.c:198
#, 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:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "đường dẫn “%s”: không thể hòa trộn"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, 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:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, 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:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "không được dùng “%s” với %s"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, 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:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "đường dẫn “%s” không được hòa trộn"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
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:628
+#: builtin/checkout.c:637
#, 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:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD hiện giờ tại"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "không thể cập nhật HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "Đặt lại nhánh “%s”\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "Đã sẵn sàng trên “%s”\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, 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:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "Đã chuyển đến nhánh mới “%s”\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "Đã chuyển đến nhánh “%s”\n"
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " … và nhiều hơn %d.\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6131,7 +6320,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6152,164 +6341,164 @@
" git branch <tên_nhánh_mới> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
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:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "Vị trí trước kia của HEAD là"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
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:976
+#: builtin/checkout.c:952
#, 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:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "tham chiếu không hợp lệ: %s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, 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:1084
+#: builtin/checkout.c:1060
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:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, 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:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "“%s” không thể được dùng với “%s”"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, 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:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "nhánh"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "tạo và checkout một nhánh mới"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "tạo/đặt_lại và checkout một nhánh"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "tạo reflog cho nhánh mới"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "rời bỏ HEAD tại lần chuyển giao theo tên"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "đặt thông tin thượng nguồn cho nhánh mới"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "nhánh-mới"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "nhánh không cha mới"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
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:1155
+#: builtin/checkout.c:1130
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:1157
+#: builtin/checkout.c:1132
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:1158
+#: builtin/checkout.c:1133
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:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "cập nhật các tập tin bị bỏ qua (mặc định)"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "kiểu"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "xung đột kiểu (hòa trộn hoặc diff3)"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "không giới hạn đặc tả đường dẫn thành chỉ các mục thưa thớt"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "gợi ý thứ hai \"git checkout <không-nhánh-nào-như-vậy>\""
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
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:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "ép buộc báo cáo tiến triển công việc"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "Các tùy chọn -b, -B và --orphan loại từ lẫn nhau"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "--track cần tên một nhánh"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "Thiếu tên nhánh; hãy thử -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "đường dẫn đã cho không hợp lệ"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, 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:1272
+#: builtin/checkout.c:1246
#, 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:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6348,7 +6537,7 @@
msgid "failed to remove %s"
msgstr "gặp lỗi khi gỡ bỏ %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6361,7 +6550,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:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6382,38 +6571,38 @@
"* - chọn tất\n"
" - (để trống) kết thúc việc chọn\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "Hả (%s)?\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, 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:697
+#: builtin/clean.c:701
#, 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:718
+#: builtin/clean.c:722
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:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "Xóa bỏ “%s” [y/N]? "
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "Tạm biệt.\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6431,62 +6620,63 @@
"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:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** Lệnh ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "Giờ thì sao"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
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:844
+#: builtin/clean.c:848
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:906
+#: builtin/clean.c:910
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:908
+#: builtin/clean.c:912
msgid "force"
msgstr "ép buộc"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "dọn bằng kiểu tương tác"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "gỡ bỏ toàn bộ thư mục"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "mẫu"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "thêm <mẫu> vào trong qui tắc bỏ qua"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "-x và -X không thể dùng cùng nhau"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
msgid ""
"clean.requireForce set to true and neither -i, -n, nor -f given; refusing to "
"clean"
@@ -6494,7 +6684,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:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
@@ -6502,144 +6692,146 @@
"clean.requireForce mặc định được đặt là true và không đưa ra tùy chọn -i, -n "
"mà cũng không -f; từ chối lệnh dọn dẹp (clean)"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<các-tùy-chọn>] [--] <kho> [<t.mục>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "không tạo một checkout"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "tạo kho thuần"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "tạo kho bản sao (ý là kho thuần)"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "để nhân bản từ kho nội bộ"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
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:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "cài đặt đây là kho chia sẻ"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "đặc-tả-đường-dẫn"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "khởi tạo mô-đun-con trong bản sao"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
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:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "thư-mục-mẫu"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
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:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "kho tham chiếu"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "chỉ dùng --reference khi nhân bản"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "tên"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
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:114
+#: builtin/clone.c:115
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:116
+#: builtin/clone.c:117
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:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "độ-sâu"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
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:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "thời-gian"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
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:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "điểm xét duyệt"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
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:124
+#: builtin/clone.c:125
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:126
+#: builtin/clone.c:127
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:128
+#: builtin/clone.c:129
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:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "gitdir"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
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:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "khóa=giá_trị"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
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:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "chỉ dùng địa chỉ IPv4"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "chỉ dùng địa chỉ IPv6"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6647,42 +6839,42 @@
"Không đoán được thư mục tên là gì.\n"
"Vui lòng chỉ định tên một thư mục trên dòng lệnh"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, 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:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "gặp lỗi khi mở “%s”"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, 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:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, 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:445
+#: builtin/clone.c:446
#, 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:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "hoàn tất.\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6692,99 +6884,99 @@
"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 checkout -f HEAD”\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, 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:654
+#: builtin/clone.c:656
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"
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "không thể cập nhật %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
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:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "không thể lấy ra (checkout) cây làm việc"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
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:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "không thể đóng gói để dọn dẹp"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
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:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "Có quá nhiều đối số."
-#: builtin/clone.c:894
+#: builtin/clone.c:898
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:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "tùy chọn --bare và --origin %s xung khắc nhau."
-#: builtin/clone.c:910
+#: builtin/clone.c:914
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:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "kho chứa “%s” chưa tồn tại"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, 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:939
+#: builtin/clone.c:943
#, 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:949
+#: builtin/clone.c:953
#, 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:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, 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:967
+#: builtin/clone.c:971
#, 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:979
+#: builtin/clone.c:983
#, 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:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "Đang nhân bản thành “%s”…\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
@@ -6792,41 +6984,36 @@
"nhân bản --recursive không tương thích với cả hai --reference và --reference-"
"if-able"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
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:1069
+#: builtin/clone.c:1073
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:1071
+#: builtin/clone.c:1075
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:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "kho nguồn là nông, nên bỏ qua --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local bị lờ đi"
-#: builtin/clone.c:1083
-#, c-format
-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"
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, 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:1149
+#: builtin/clone.c:1150
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."
@@ -6977,63 +7164,63 @@
"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"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
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
+#: builtin/commit.c:359
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:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "gặp lỗi khi thêm bằng cách tương"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
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:381
+#: builtin/commit.c:380
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:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
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:459
+#: builtin/commit.c:461
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:461
+#: builtin/commit.c:463
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:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "không đọc được bảng mục lục"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
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:583
+#: builtin/commit.c:587
#, 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:585
+#: builtin/commit.c:589
#, 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:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "đối số cho --author bị dị hình"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
@@ -7041,38 +7228,38 @@
"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:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, 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:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, 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:707
+#: builtin/commit.c:711
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:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "không đọc được tệp nhật ký “%s”"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "không thể đọc SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "không thể đọc MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "không thể ghi mẫu chuyển giao"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7087,7 +7274,7 @@
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7102,7 +7289,7 @@
"\t%s\n"
"và thử lại.\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7113,7 +7300,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:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7125,155 +7312,164 @@
"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:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%sTác giả: %.*s <%.*s>"
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%sNgày tháng: %s"
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%sNgười chuyển giao: %.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "Không đọc được bảng mục lục"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "Gặp lỗi khi xây dựng cây"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, 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:1068
+#: builtin/commit.c:1076
#, 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:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "Chế độ bỏ qua không hợp lệ “%s”"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, 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:1121
+#: builtin/commit.c:1142
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:1151
+#: builtin/commit.c:1172
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:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "Không có gì để mà “tu bổ” cả."
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
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:1165
+#: builtin/commit.c:1186
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:1168
+#: builtin/commit.c:1189
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:1178
+#: builtin/commit.c:1199
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 tùy chọn -c/-C/-F/--fixup"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "Tùy chọn -m không thể được tổ hợp cùng với -c/-C/-F/--fixup."
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
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:1205
+#: builtin/commit.c:1226
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:1207
+#: builtin/commit.c:1228
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:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "Chế độ dọn dẹp không hợp lệ %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "Các đường dẫn với tùy chọn -a không hợp lý."
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "hiển thị trạng thái ở dạng súc tích"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "hiển thị thông tin nhánh"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "hiển thị thông tin về tạm cất"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "phiên bản"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "kết xuất dạng máy-có-thể-đọc"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
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:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "chấm dứt các mục bằng NUL"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "chế độ"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr ""
"hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, "
"normal, no. (Mặc định: all)"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "hiển thị các tập tin ẩn"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr ""
+"hiển thị các tập tin bị bỏ qua, các chế độ tùy chọn: traditional, matching, "
+"no. (Mặc định: traditional)"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "khi"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
@@ -7281,205 +7477,215 @@
"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:1364
+#: builtin/commit.c:1387
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:1440
+#: builtin/commit.c:1406
+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:1469
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"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
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"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+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"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "đã rời khỏi HEAD"
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr " (root-commit)"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
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:1588
+#: builtin/commit.c:1619
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:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "Các tùy chọn ghi chú commit"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "đọc chú thích từ tập tin"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "tác giả"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "ghi đè tác giả cho commit"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "ngày tháng"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "ghi đè ngày tháng cho lần chuyển giao"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "chú thích"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "chú thích của lần chuyển giao"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "lần_chuyển_giao"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
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:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "dùng lại các ghi chú từ lần chuyển giao đã cho"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr ""
"dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
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:1599
+#: builtin/commit.c:1630
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:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "(nên dùng) thêm dòng Signed-off-by:"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "sử dụng tập tin mẫu đã cho"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "ép buộc sửa lần commit"
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "mặc định"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
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"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
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:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "ký lần chuyển giao dùng GPG"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "Các tùy nội dung ghi chú commit"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "chuyển giao tất cả các tập tin có thay đổi"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
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:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "thêm các tập-tin bằng tương tác"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "thêm các thay đổi bằng tương tác"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "chỉ chuyển giao các tập tin đã chỉ ra"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "vòng qua móc (hook) pre-commit và commit-msg"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "hiển thị xem cái gì có thể được chuyển giao"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "“tu bổ” (amend) lần commit trước"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "vòng qua móc (hook) post-rewrite"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "ok để ghi lại một thay đổi trống rỗng"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
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:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "không thể phân tích commit (lần chuyển giao) HEAD"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "Tập tin MERGE_HEAD sai hỏng (%s)"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "không thể đọc MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, 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:1747
+#: builtin/commit.c:1778
+#, 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:1783
#, 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:1752
-#, 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:1800
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7494,141 +7700,145 @@
msgid "git config [<options>]"
msgstr "git config [<các-tùy-chọn>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "Vị trí tập tin cấu hình"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "dùng tập tin cấu hình toàn cục"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "sử dụng tập tin cấu hình hệ thống"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "dùng tập tin cấu hình của kho"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "sử dụng tập tin cấu hình đã cho"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "blob-id"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "đọc cấu hình từ đối tượng blob đã cho"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "Hành động"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "lấy giá-trị: tên [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "lấy tất cả giá-trị: khóa [value-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "lấy giá trị cho regexp: name-regex [value-regex]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "lấy đặc tả giá trị cho URL: phần[.biến] URL"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr "thay thế tất cả các biến khớp mẫu: tên giá-trị [value_regex]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "thêm biến mới: tên giá-trị"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "gỡ bỏ biến: tên [value-regex]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "gỡ bỏ mọi cái khớp: tên [value-regex]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "đổi tên phần: tên-cũ tên-mới"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "gỡ bỏ phần: tên"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "liệt kê tất"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "mở một trình biên soạn"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "tìm cấu hình màu sắc: slot [mặc định]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "tìm các cài đặt về màu sắc: slot [stdout-là-tty]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "Kiểu"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "giá trị là \"true\" hoặc \"false\""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "giá trị ở dạng số thập phân"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "giá trị là --bool hoặc --int"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "giá trị là đường dẫn (tên tập tin hay thư mục)"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "giá trị là một ngày hết hạn"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "Khác"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "chấm dứt giá trị với byte NUL"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "chỉ hiển thị các tên biến"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "tôn trọng kể cà các hướng trong tìm kiếm"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr ""
"hiển thị nguyên gốc của cấu hình (tập tin, đầu vào tiêu chuẩn, blob, dòng "
"lệnh)"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "không thể phân tích giá trị màu mặc định"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7643,16 +7853,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local chỉ có thể được dùng bên trong một kho git"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "không thể tạo tập tin cấu hình “%s”"
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7661,75 +7871,65 @@
"không thể ghi đè nhiều giá trị với một giá trị đơn\n"
" Dùng một biểu thức chính quy, --add hay --replace-all để thay đổi %s."
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "hiển thị kích cỡ theo định dạng dành cho người đọc"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<các-tùy-chọn>] <commit-ish>*"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<các-tùy-chọn>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "phía trước "
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "hạng nhẹ"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "có diễn giải"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "thẻ đã được ghi chú %s không sẵn để dùng"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "thẻ được chú giải %s không có tên nhúng"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "thẻ “%s” đã thực sự ở đây “%s” rồi"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "Không phải tên đối tượng %s hợp lệ"
-
-#: builtin/describe.c:289
-#, 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ệ"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "không có thẻ nào khớp chính xác với “%s”"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "Đang tìm kiếm để mô tả %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "Không có tham chiếu hay thẻ khớp đúng, đang tìm kiếm mô tả\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "việc tìm kiếm đã kết thúc tại %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7738,7 +7938,7 @@
"Không có thẻ được chú giải nào được mô tả là “%s”.\n"
"Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags."
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7747,12 +7947,12 @@
"Không có thẻ có thể mô tả “%s”.\n"
"Hãy thử --always, hoặc tạo một số thẻ."
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "đã xuyên %lu qua lần chuyển giao\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7761,75 +7961,90 @@
"tìm thấy nhiều hơn %i thẻ; đã liệt kê %i cái gần\n"
"đây nhất bỏ đi tìm kiếm tại %s\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "mô tả %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "Không phải tên đối tượng %s hợp lệ"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s không phải là một lần commit cũng không phải blob"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "tìm các thẻ mà nó đến trước lần chuyển giao"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "chiến lược tìm kiếm gỡ lỗi trên đầu ra lỗi chuẩn stderr"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "dùng ref bất kỳ"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "dùng thẻ bất kỳ, cả khi “unannotated”"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "luôn dùng định dạng dài"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "chỉ theo cha mẹ đầu tiên"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "chỉ xuất những gì khớp chính xác"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "coi như <n> thẻ gần đây nhất (mặc định: 10)"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "chỉ cân nhắc đến những thẻ khớp với <mẫu>"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
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:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "hiển thị đối tượng chuyển giao vắn tắt như là fallback"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "dấu"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "thêm <dấu> trên cây thư mục làm việc bẩn (mặc định \"-dirty\")"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
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:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "--long là xung khắc với tùy chọn --abbrev=0"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
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:552
+#: builtin/describe.c:637
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:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken là xung khắc với commit-ishes"
@@ -7838,26 +8053,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "“%s”: không phải tập tin bình thường hay liên kết mềm"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "tùy chọn không hợp lệ: %s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "Không phải là kho git"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "đối tượng đã cho “%s” không hợp lệ."
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "đã cho nhiều hơn hai đối tượng blob: “%s”"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "đã cho đối tượng không thể nắm giữ “%s”."
@@ -7868,27 +8083,27 @@
"git difftool [<các-tùy-chọn>] [<lần_chuyển_giao> [<lần_chuyển_giao>]] [--] "
"<đường-dẫn>…]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "gặp lỗi: %d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "không thể đọc liên kết mềm %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, 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:301
+#: builtin/difftool.c:311
#, 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:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7896,53 +8111,53 @@
"các định dạng diff tổ hợp(“-c” và “--cc”) chưa được hỗ trợ trong\n"
"chế độ diff thư mục(“-d” và “--dir-diff”)."
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "cả hai tập tin đã bị sửa: “%s” và “%s”."
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "cây làm việc ở bên trái."
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "các tập tin tạm đã sẵn có trong “%s”."
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "bạn có lẽ muốn dọn dẹp hay "
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "dùng “diff.guitool“ thay vì dùng “diff.tool“"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "thực hiện một diff toàn thư mục"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
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:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "dùng liên kết mềm trong diff-thư-mục"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<công_cụ>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "dùng công cụ diff đã cho"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "in ra danh sách các công cụ dif cái mà có thẻ dùng với “--tool“"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
@@ -7950,19 +8165,19 @@
"làm cho “git-difftool” thoát khi gọi công cụ diff trả về mã không phải số "
"không"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<lệnh>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "chỉ định một lệnh tùy ý để xem diff"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "chưa đưa ra <công_cụ> cho --tool=<công_cụ>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "chưa đưa ra <lệnh> cho --extcmd=<lệnh>"
@@ -7970,145 +8185,145 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "hiển thị tiến triển sau <n> đối tượng"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "chọn điều khiển của thẻ đã ký"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
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:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "Đổ các đánh dấu này vào tập-tin"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "nhập vào đánh dấu từ tập tin này"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
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:996
+#: builtin/fast-export.c:1012
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:998
+#: builtin/fast-export.c:1014
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:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "Bỏ qua kết xuất của dữ liệu blob"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "refspec"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "Áp dụng refspec cho refs đã xuất"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "kết xuất anonymize"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<các-tùy-chọn>] [<nhóm>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<các-tùy-chọn>] [(<kho> | <nhóm>)…]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<các-tùy-chọn>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "lấy về từ tất cả các máy chủ"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
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:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
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:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "ép buộc ghi đè lên nhánh nội bộ"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "lấy từ nhiều máy chủ cùng lúc"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
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:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "không lấy tất cả các thẻ (--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "số lượng mô-đun-con được lấy đồng thời"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
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:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "khi-cần"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
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:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "giữ lại gói đã tải về"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "cho phép cập nhật th.chiếu HEAD"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "làm sâu hơn lịch sử của bản sao"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
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:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "chuyển đổi hoàn toàn sang kho git"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "tmục"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
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:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
@@ -8116,89 +8331,89 @@
"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:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "chấp nhận tham chiếu cập nhật .git/shallow"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "refmap"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "chỉ ra refmap cần lấy về"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
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:512
+#: builtin/fetch.c:535
#, 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:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "Không tìm thấy đối tượng %s"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[đã cập nhật]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[Bị từ chối]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "không thể fetch (lấy) về nhánh hiện hành"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[cập nhật thẻ]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "không thể cập nhật tham chiếu nội bộ"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[thẻ mới]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[nhánh mới]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[ref (tham chiếu) mới]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "cưỡng bức cập nhật"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "không-phải-chuyển-tiếp-nhanh"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, 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:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "từ chối %s bởi vì các gốc nông thì không được phép cập nhật"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "Từ %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8207,57 +8422,52 @@
"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:921
+#: builtin/fetch.c:944
#, 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:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " (%s đã trở thành không đầu (không được quản lý))"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[đã xóa]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "(không)"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr ""
"Từ chối việc lấy vào trong nhánh hiện tại %s của một kho chứa không phải kho "
"trần (bare)"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "Tùy chọn \"%s\" có giá trị \"%s\" là không hợp lệ cho %s"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "Tùy chọn \"%s\" bị bỏ qua với %s\n"
-#: builtin/fetch.c:1076
-#, c-format
-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"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "Đang lấy “%s” về\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "không thể “%s” về"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
@@ -8265,40 +8475,40 @@
"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:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "Bạn phải định rõ tên thẻ."
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
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:1323
+#: builtin/fetch.c:1344
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:1328
+#: builtin/fetch.c:1349
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:1330
+#: builtin/fetch.c:1351
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:1349
+#: builtin/fetch.c:1364
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:1351
+#: builtin/fetch.c:1366
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:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "không có nhóm máy chủ hay máy chủ như thế: %s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
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ý"
@@ -8309,23 +8519,23 @@
"git fmt-merge-msg [-m <chú_thích>] [--log[=<n>] | --no-log] [--file <tập-"
"tin>]"
-#: builtin/fmt-merge-msg.c:664
+#: builtin/fmt-merge-msg.c:666
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:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "bí danh cho --log (không được dùng)"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "văn bản"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
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:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "tập tin để đọc dữ liệu từ đó"
@@ -8367,101 +8577,105 @@
msgid "show only <n> matched refs"
msgstr "hiển thị chỉ <n> tham chiếu khớp"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "các màu định dạng lưu tâm"
+
+#: builtin/for-each-ref.c:43
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:44
+#: builtin/for-each-ref.c:45
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:45
+#: builtin/for-each-ref.c:46
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:46
+#: builtin/for-each-ref.c:47
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:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "chỉ hiển thị những tham chiếu mà nó không chứa lần chuyển giao"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "Đang kiểm tra các thư mục đối tượng"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<các-tùy-chọn>] [<đối-tượng>…]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "hiển thị các đối tượng không thể đọc được"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "hiển thị các đối tượng không được quản lý"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "báo cáo các thẻ"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "báo cáo node gốc"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "tạo “index objects head nodes”"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "tạo “reflogs head nodes” (mặc định)"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
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:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "chỉ kiểm tra kết nối"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "cho phép kiểm tra hạn chế hơn"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
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:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "hiển thị quá trình"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
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:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "Đang kiểm tra các đối tượng"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<các-tùy-chọn>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "Gặp lỗi khi lấy thông tin thống kê về tập tin %s: %s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "không thể lấy thông tin thống kê về “%s”"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8476,45 +8690,45 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "xóa bỏ các đối tượng không được tham chiếu"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
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:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "bật chế độ auto-gc"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
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:380
+#: builtin/gc.c:381
#, 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:408
+#: builtin/gc.c:409
#, 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:410
+#: builtin/gc.c:411
#, 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:411
+#: builtin/gc.c:412
#, 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:436
+#: builtin/gc.c:437
#, c-format
msgid ""
"gc is already running on machine '%s' pid %<PRIuMAX> (use --force if not)"
@@ -8522,7 +8736,7 @@
"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:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr ""
@@ -8533,12 +8747,12 @@
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:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep: gặp lỗi tạo tuyến (thread): %s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "số tuyến đã cho không hợp lệ (%d) cho %s"
@@ -8547,250 +8761,242 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "không hỗ trợ đa tuyến, bỏ qua %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "không thể đọc cây (%s)"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, 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:912
+#: builtin/grep.c:696
#, 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:999
+#: builtin/grep.c:783
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:1001
+#: builtin/grep.c:785
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:1003
+#: builtin/grep.c:787
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:1005
+#: builtin/grep.c:789
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:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "tìm kiếm đệ quy trong từng mô-đun-con"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "tên cơ sở"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "treo vào trước tên cơ sở cha mẹ của đường dẫn vào kết xuất"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "hiển thị những dòng không khớp với mẫu"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "phân biệt HOA/thường"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "chỉ khớp mẫu tại đường ranh giới từ"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
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:1021
+#: builtin/grep.c:802
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:1024
+#: builtin/grep.c:805
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:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "hạ xuống ít nhất là mức <sâu>"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "dùng biểu thức chính qui POSIX có mở rộng"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
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:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "diễn dịch các mẫu như là chuỗi cố định"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
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:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "hiển thị số của dòng"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "không hiển thị tên tập tin"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "hiển thị các tên tập tin"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
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:1048
+#: builtin/grep.c:829
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:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "đồng nghĩa với --files-with-matches"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
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:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "thêm NUL vào sau tên tập tin"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
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:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "tô sáng phần khớp mẫu"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
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:1062
+#: builtin/grep.c:843
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:1065
+#: builtin/grep.c:846
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:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "hiển thị <n> dòng nội dung trước khớp"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "hiển thị <n> dòng nội dung sau khớp"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "dùng <n> tuyến trình làm việc"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "dạng viết tắt của -C SỐ"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
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:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "hiển thị hàm bao quanh"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "đọc mẫu từ tập-tin"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "match <mẫu>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
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:1097
+#: builtin/grep.c:878
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:1099
+#: builtin/grep.c:880
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:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "hiển thị cây phân tích cú pháp cho biểu thức “grep” (tìm kiếm)"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "dàn trang"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
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:1108
+#: builtin/grep.c:889
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:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "chưa chỉ ra mẫu."
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
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:1211
+#: builtin/grep.c:991
#, 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:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "số tuyến chỉ ra không hợp lệ (%d)"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "không hỗ trợ đa tuyến, bỏ qua --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
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:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "tùy chọn không được hỗ trợ với --recurse-submodules."
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
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:1316
+#: builtin/grep.c:1090
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:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "cả hai --cached và các cây phải được chỉ ra."
@@ -8881,12 +9087,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)."
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "gặp lỗi khi thực thi “%s”"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -8895,7 +9101,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:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -8904,345 +9110,345 @@
"“%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:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "“%s”: không rõ chương trình xem man."
-#: builtin/help.c:354
+#: builtin/help.c:357
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:362
+#: builtin/help.c:365
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:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "Định nghĩa các thuộc tính cho mỗi đường dẫn"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "Mỗi ngày học 20 lệnh Git hay hơn"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Thuật ngữ chuyên môn Git"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "Chỉ định các tập tin không cần theo dõi"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "Định nghĩa thuộc tính mô-đun-con"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "Chỉ định điểm xét duyệt và vùng cho Git"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "Hướng dẫn cách dùng Git ở mức cơ bản (bản 1.5.1 hay mới hơn)"
-#: builtin/help.c:411
+#: builtin/help.c:414
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."
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "Các chỉ dẫn chung về cách dùng Git là:\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "“git %s” được đặt bí danh thành “%s”"
+msgid "'%s' is aliased to '%s'"
+msgstr "“%s” được đặt bí danh thành “%s”"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "cách dùng: %s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "không thể mở %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, 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:225
+#: builtin/index-pack.c:226
#, 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:228
+#: builtin/index-pack.c:229
#, 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:270
+#: builtin/index-pack.c:271
#, 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:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "gặp kết thúc tập tin EOF quá sớm"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "lỗi đọc ở đầu vào"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
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:300
+#: builtin/index-pack.c:301
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:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "gói đã vượt quá cỡ tối đa được phép"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "không thể tạo “%s”"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "không thể mở packfile “%s”"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "chữ ký cho gói không khớp"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "không hỗ trợ phiên bản gói %<PRIu32>"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, 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:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "xả nén trả về %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
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:536
+#: builtin/index-pack.c:537
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:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "không hiểu kiểu đối tượng %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "không thể chạy hàm pread cho tập tin gói"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "sự mâu thuẫn xả nén nghiêm trọng"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "không thể đọc %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, 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:822
+#: builtin/index-pack.c:823
#, 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:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "đối tượng blob không hợp lệ %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "%s không hợp lệ"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "Lỗi trong đối tượng"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, 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:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "gặp lỗi khi áp dụng delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "Đang nhận về các đối tượng"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "Các đối tượng bảng mục lục"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "gói bị sai hỏng (SHA1 không khớp)"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "không thể lấy thông tin thống kê packfile"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "pack có phần thừa ở cuối"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
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:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "Đang phân giải các delta"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "không thể tạo tuyến: %s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "lộn xộn hơn cả điên rồ"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, 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:1282
+#: builtin/index-pack.c:1283
#, 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:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "không thể xả nén đối tượng nối thêm (%d)"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "đối tượng nội bộ %s bị hỏng"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "gặp lỗi trong khi đóng tập tin gói"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "không thể ghi tập tin giữ lại “%s”"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "không thể đóng tập tin giữ lại đã được ghi “%s”"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "không thể lưu tập tin gói"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "không thể lưu trữ tập tin ghi mục lục"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "sai pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, 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:1554
+#: builtin/index-pack.c:1555
#, 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:1602
+#: builtin/index-pack.c:1603
#, 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:1609
+#: builtin/index-pack.c:1610
#, c-format
msgid "chain length = %d: %lu object"
msgid_plural "chain length = %d: %lu objects"
msgstr[0] "chiều dài xích = %d: %lu đối tượng"
-#: builtin/index-pack.c:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "tên tập tin tập tin gói “%s” không được kết thúc bằng đuôi “.pack”"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "%s sai"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
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:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "--stdin cần một kho git"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile"
@@ -9374,132 +9580,172 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer "
"<thẻ>[(=|:)<giá-trị>])…] [<tập-tin>…]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "sửa các tập tin tại chỗ"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
msgstr "bộ dò vết cắt bỏ phần trống rỗng"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "đặt phần đuôi mới ở đâu"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "thao tác khi đã có phần đuôi"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "thao tác khi thiếu phần đuôi"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "chỉ xuất phần đuôi"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "đừng áp dụng các quy tắc cấu hình"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "nối các giá trị khoảng-trắng-liên-tiếp"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "đặt các tùy chọn phân tích cú pháp"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
msgstr "bộ dò vết"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
msgstr "bộ dò vết cần thêm"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer cùng với --only-input không hợp lý"
+
+#: builtin/interpret-trailers.c:127
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:45
+#: builtin/log.c:46
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:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<các-tùy-chọn>] <đối-tượng>…"
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "tùy chọn--decorate không hợp lệ: %s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "chặn mọi kết xuất từ diff"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "hiển thị mã nguồn"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "Sử dụng tập tin ánh xạ thư"
-#: builtin/log.c:150
+#: builtin/log.c:155
+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:157
+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:158
msgid "decorate options"
msgstr "các tùy chọn trang trí"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr "Xử lý chỉ dòng vùng n,m trong tập tin, tính từ 1"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "Kết xuất cuối cùng: %d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: sai tập tin"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "Không thể đọc đối tượng %s"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "Không nhận ra kiểu: %d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "format.headers không có giá trị cụ thể"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "tên của thư mục kết xuất quá dài"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "Không thể mở tập tin miếng vá: %s"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "Cần chính xác một vùng."
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "Không phải là một vùng."
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "“Cover letter” cần cho định dạng thư"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "in-reply-to điên rồ: %s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
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:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "Hai thư mục kết xuất?"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "Không hiểu lần chuyển giao %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, 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:1280
+#: builtin/log.c:1291
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:1284
+#: builtin/log.c:1295
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"
@@ -9510,219 +9756,227 @@
"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:1304
+#: builtin/log.c:1315
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:1315
+#: builtin/log.c:1326
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:1319
+#: builtin/log.c:1330
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:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "không thể lấy mã miếng vá"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
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:1428
+#: builtin/log.c:1441
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:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "hiển thị miếng vá ra đầu ra chuẩn"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "tạo bì thư"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
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:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "sfx"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "sử dụng <sfx> thay cho “.patch”"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
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:1442
+#: builtin/log.c:1455
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:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "Dùng [RFC VÁ] thay cho [VÁ]"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "Dùng [<tiền-tố>] thay cho [VÁ]"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "lưu các tập tin kết quả trong <t.mục>"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "không strip/add [VÁ]"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
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:1458
+#: builtin/log.c:1471
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:1460
+#: builtin/log.c:1473
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:1462
+#: builtin/log.c:1475
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:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "Lời nhắn"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "đầu đề thư"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "thêm đầu đề thư"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "thư điện tử"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "thêm To: đầu đề thư"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "thêm Cc: đầu đề thư"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "thụt lề"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
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:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "message-id"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "dùng thư đầu tiên để trả lời <message-id>"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "ranh giới"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "đính kèm miếng vá"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "dùng miếng vá làm nội dung"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "chữ ký"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "thêm chữ ký"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "lần_chuyển_giao_nền"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
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:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "thêm chữ ký từ một tập tin"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
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:1567
+#: builtin/log.c:1507
+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:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "dòng thụt lề không hợp lệ: %s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "-n và -k loại từ lẫn nhau."
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc và -k xung khắc nhau."
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "--name-only không hợp lý"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "--name-status không hợp lý"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "--check không hợp lý"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "đầu ra chuẩn, hay thư mục, chọn cái nào?"
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "Không thể tạo thư mục “%s”"
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "không thể đọc tập tin chữ ký “%s”"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "Đang tạo các miếng vá"
+
+#: builtin/log.c:1812
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:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<thượng-nguồn> [<đầu> [<giới-hạn>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9745,91 +9999,95 @@
"thay đổi)"
#: builtin/ls-files.c:521
+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:523
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:523
+#: builtin/ls-files.c:525
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:525
+#: builtin/ls-files.c:527
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:527
+#: builtin/ls-files.c:529
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:529
+#: builtin/ls-files.c:531
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:532
+#: builtin/ls-files.c:534
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:534
+#: builtin/ls-files.c:536
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:536
+#: builtin/ls-files.c:538
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:538
+#: builtin/ls-files.c:540
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:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "không hiển thị thư mục rỗng"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
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:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "hiển thị thông tin resolve-undo"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
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:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "mẫu loại trừ được đọc từ <tập tin>"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
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:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "thêm loại trừ tiêu chuẩn kiểu git"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
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:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "đệ quy xuyên qua mô-đun con"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
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:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "tree-ish"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
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:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "hiển thị dữ liệu gỡ lỗi"
@@ -9920,180 +10178,184 @@
msgid "empty mbox: '%s'"
msgstr "mbox trống rỗng: “%s”"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<các-tùy-chọn>] [<commit>…]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "switch “m” yêu cầu một giá trị"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, 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:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "Các chiến lược sẵn sàng là:"
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, 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:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
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:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
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:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "(đồng nghĩa với --stat)"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
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:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
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:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
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:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "sửa chú thích trước khi chuyển giao"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "cho phép chuyển-tiếp-nhanh (mặc định)"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
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:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
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:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "chiến lược"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "chiến lược hòa trộn sẽ dùng"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "tùy_chọn=giá_trị"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
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:223
+#: builtin/merge.c:226
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:227
+#: builtin/merge.c:230
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:229
+#: builtin/merge.c:232
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:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "cho phép hòa trộn lịch sử không liên quan"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "thẩm tra móc (hook) commit-msg"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "không thể chạy stash."
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "lệnh tạm cất gặp lỗi"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, 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:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "read-tree gặp lỗi"
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " (không có gì để squash)"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "Squash commit -- không cập nhật HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, 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:447
+#: builtin/merge.c:455
#, 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:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "Chuỗi branch.%s.mergeoptions sai: %s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
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:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "Không hiểu tùy chọn cho merge-recursive: -X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "không thể ghi %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "Không thể đọc từ “%s”"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, 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:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -10111,71 +10373,71 @@
"rỗng\n"
"sẽ hủy bỏ lần chuyển giao.\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng."
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "Tuyệt vời.\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, 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:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "không phải nhánh hiện hành"
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "Không có máy chủ cho nhánh hiện hành."
-#: builtin/merge.c:893
+#: builtin/merge.c:915
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:898
+#: builtin/merge.c:920
#, 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:945
+#: builtin/merge.c:973
#, 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:1046
+#: builtin/merge.c:1075
#, 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:1080
+#: builtin/merge.c:1109
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:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "--abort không nhận các đối số"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
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:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "--continue không nhận đối số"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
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:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10183,7 +10445,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:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10191,115 +10453,115 @@
"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:1191
+#: builtin/merge.c:1220
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:1200
+#: builtin/merge.c:1229
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:1208
+#: builtin/merge.c:1237
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:1225
+#: builtin/merge.c:1254
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:1227
+#: builtin/merge.c:1256
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:1232
+#: builtin/merge.c:1261
#, 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:1234
+#: builtin/merge.c:1263
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:1268
+#: builtin/merge.c:1297
#, 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."
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, 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."
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "Lần chuyển giao %s không có chữ ký GPG."
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, 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"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
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:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "Đã cập nhật rồi."
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "Đang cập nhật %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, 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:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "Không.\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "Đã cập nhật rồi. Yeeah!"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
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:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, 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:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "Đang thử chiến lược hòa trộn %s…\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, 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:1532
+#: builtin/merge.c:1561
#, 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:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "Sử dụng %s để chuẩn bị giải quyết bằng tay.\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr ""
@@ -10326,23 +10588,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:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "xuất ra tất cả các ông bà, tổ tiên chung"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
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:222
+#: builtin/merge-base.c:224
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:224
+#: builtin/merge-base.c:226
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:226
+#: builtin/merge-base.c:228
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>"
@@ -10441,7 +10703,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "Thư mục “%s” có ở trong chỉ mục mà không có mô-đun con?"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr ""
"Hãy đưa các thay đổi của bạn vào .gitmodules hay tạm cất chúng đi để xử lý"
@@ -10459,68 +10721,68 @@
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:168
+#: builtin/mv.c:167
#, 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:179
+#: builtin/mv.c:178
#, 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:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "nguồn sai"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
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:189
+#: builtin/mv.c:188
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:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "thư mục nguồn là trống rỗng"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "không nằm dưới sự quản lý mã nguồn"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "đích đã tồn tại sẵn rồi"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "đang ghi đè lên “%s”"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "Không thể ghi đè"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "Nhiều nguồn cho cùng một đích"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "thư mục đích không tồn tại"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s, nguồn=%s, đích=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "Đổi tên %s thành %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "gặp lỗi khi đổi tên “%s”"
@@ -10621,8 +10883,8 @@
msgstr "git notes [--ref <notes-ref>] remove [<đối-tượng>…]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <notes-ref>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <notes-ref>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10712,19 +10974,19 @@
msgid "the note contents have been left in %s"
msgstr "nội dung ghi chú còn lại %s"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "không thể đọc “%s”"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "không thể mở hay đọc “%s”"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, 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ệ."
@@ -10752,47 +11014,47 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, 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:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "quá nhiều đối số"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, 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:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "nội dung ghi chú (note) nằm trong một chuỗi"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "nội dung ghi chú (note) nằm trong một tập tin"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
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:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "cho lưu trữ ghi chú trống rỗng"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "thay thế ghi chú trước"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10801,29 +11063,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:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, 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:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, 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:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
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:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "quá ít đối số"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
@@ -10832,12 +11094,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:540
+#: builtin/notes.c:541
#, 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:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10846,52 +11108,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:687
+#: builtin/notes.c:688
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:689
+#: builtin/notes.c:690
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:691
+#: builtin/notes.c:692
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:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "gặp lỗi khi đọc tham chiếu NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
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:715
+#: builtin/notes.c:716
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:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "gặp lỗi khi phân giải NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
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:757
+#: builtin/notes.c:758
#, 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:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "Tùy chọn chung"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "Tùy chọn về hòa trộn"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
msgid ""
"resolve notes conflicts using the given strategy (manual/ours/theirs/union/"
"cat_sort_uniq)"
@@ -10899,48 +11161,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:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "Chuyển giao các note chưa được hòa trộn"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
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:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "bỏ qua hòa trộn các ghi chú (note)"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "không thể trộn lẫn --commit, --abort hay -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
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:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "không hiểu -s/--strategy: %s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, 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:865
+#: builtin/notes.c:866
#, 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:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10951,223 +11213,231 @@
"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:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "Đối tượng %s không có ghi chú (note)\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
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:904
+#: builtin/notes.c:905
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:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "không gỡ bỏ, chỉ hiển thị"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "báo cáo các đối tượng đã prune"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "notes-ref"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "dùng “notes” từ <notes-ref>"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "không hiểu câu lệnh con: %s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects --stdout [các-tùy-chọn…] [< <danh-sách-tham-chiếu> | < "
"<danh-sách-đối-tượng>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
msgstr ""
"git pack-objects [các-tùy-chọn…] <base-name> [< <danh-sách-ref> | < <danh-"
"sách-đối-tượng>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "lỗi giải nén (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
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:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "Đang ghi lại các đối tượng"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
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:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "Đang nén các đối tượng"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "giá trị cho --missing không hợp lệ"
+
+#: builtin/pack-objects.c:2902
#, 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:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "phiên bản mục lục sai “%s”"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "không hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "hiển thị bộ đo tiến trình"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "hiển thị bộ đo tiến triển trong suốt pha ghi đối tượng"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "tương tự --all-progress khi bộ đo tiến trình được xuất hiện"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "phiên bản[,offset]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
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:2889
+#: builtin/pack-objects.c:2948
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:2891
+#: builtin/pack-objects.c:2950
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:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "bỏ qua các đối tượng đóng gói"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
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:2897
+#: builtin/pack-objects.c:2956
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:2899
+#: builtin/pack-objects.c:2958
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:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "dùng lại các delta sẵn có"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "dùng lại các đối tượng sẵn có"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "dùng các đối tượng OFS_DELTA"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
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:2909
+#: builtin/pack-objects.c:2968
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:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr " đọc tham số “revision” từ thiết bị nhập chuẩn"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
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:2916
+#: builtin/pack-objects.c:2975
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:2919
+#: builtin/pack-objects.c:2978
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:2922
+#: builtin/pack-objects.c:2981
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:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "xuất gói ra đầu ra tiêu chuẩn"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
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:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "giữ lại các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "pack mất các đối tượng không thể đọc được"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
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:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "tạo gói nhẹ"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
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:2940
+#: builtin/pack-objects.c:2999
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:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "mức nén gói"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
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:2946
+#: builtin/pack-objects.c:3005
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:2948
+#: builtin/pack-objects.c:3007
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:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "xử lý cho thiếu đối tượng"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "Đang đếm các đối tượng"
@@ -11183,17 +11453,17 @@
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:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "Đang gỡ các đối tượng trùng lặp"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <thời-gian>] [--] [<head>…]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <thời-gian>] [--] [<head>…]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11216,40 +11486,40 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
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:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "Các tùy chọn liên quan đến hòa trộn"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
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:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "cho phép chuyển-tiếp-nhanh"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "tự động stash/stash pop tước và sau tu bổ (rebase)"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "Các tùy chọn liên quan đến lệnh lấy về"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "số lượng mô-đun-con được đẩy lên đồng thời"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "Giá trị không hợp lệ cho pull.ff: %s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
@@ -11257,14 +11527,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:401
+#: builtin/pull.c:417
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:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
@@ -11273,7 +11543,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:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11285,43 +11555,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:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "Hiện tại bạn chẳng ở nhánh nào cả."
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn cải tổ lại."
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "Vui lòng chỉ định nhánh nào bạn muốn hòa trộn vào."
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "Xem git-pull(1) để biết thêm chi tiết."
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<máy chủ>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<nhánh>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "Ở đây không có thông tin theo dõi cho nhánh hiện hành."
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr ""
"Nếu bạn muốn theo dõi thông tin cho nhánh này bạn có thể thực hiện bằng lệnh:"
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11330,29 +11600,29 @@
"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:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "bỏ qua --verify-signatures khi rebase"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "tùy chọn --[no-]autostash chỉ hợp lệ khi dùng với --rebase."
-#: builtin/pull.c:848
+#: builtin/pull.c:873
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:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "pull với rebase"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
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:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11363,7 +11633,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:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11381,15 +11651,15 @@
"$ git reset --hard\n"
"để khôi phục lại."
-#: builtin/pull.c:897
+#: builtin/pull.c:922
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:901
+#: builtin/pull.c:926
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:908
+#: builtin/pull.c:933
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ộ"
@@ -11398,15 +11668,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<các-tùy-chọn>] [<kho-chứa> [<refspec>…]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "dùng tốc ký thẻ không có <thẻ>"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "--delete chỉ chấp nhận các tên tham chiếu dạng thường"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11415,7 +11685,7 @@
"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong “git help "
"config”."
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11440,7 +11710,7 @@
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11455,7 +11725,7 @@
"\n"
" git push %s HEAD:<tên-của-nhánh-máy-chủ>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11469,12 +11739,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "Nhánh hiện tại %s có nhiều nhánh thượng nguồn, từ chối push."
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11486,14 +11756,14 @@
"nhánh hiện tại “%s” của bạn, mà không báo cho tôi biết là cái gì được push\n"
"để cập nhật nhánh máy chủ nào."
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr ""
"Bạn đã không chỉ ra một refspecs nào để đẩy lên, và push.default là \"không "
"là gì cả\"."
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11506,7 +11776,7 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11520,7 +11790,7 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11535,11 +11805,11 @@
"Xem “Note about fast-forwards” trong “git push --help” để có thông tin chi "
"tiết."
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ."
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11551,22 +11821,22 @@
"đối tượng\n"
"không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "Đang đẩy lên %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "gặp lỗi khi đẩy tới một số tham chiếu đến “%s”"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "repository (kho) sai “%s”"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11587,112 +11857,112 @@
"\n"
" git push <tên>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "--all và --tags xung khắc nhau"
-#: builtin/push.c:390
+#: builtin/push.c:392
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:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "--mirror và --tags xung khắc nhau"
-#: builtin/push.c:396
+#: builtin/push.c:398
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:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "--all và --mirror xung khắc nhau"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "kho"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "đẩy tất cả các tham chiếu"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "mirror tất cả các tham chiếu"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "xóa các tham chiếu"
-#: builtin/push.c:528
+#: builtin/push.c:540
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:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "ép buộc cập nhật"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "tên-tham-chiếu>:<cần"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
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:537
+#: builtin/push.c:549
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:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "tạo gói nhẹ"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "chương trình nhận gói"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "đặt thượng nguồn cho git pull/status"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "xén tỉa những tham chiếu bị gỡ bỏ"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "vòng qua móc tiền-đẩy (pre-push)"
-#: builtin/push.c:548
+#: builtin/push.c:560
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:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "ký lần đẩy dùng GPG"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
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:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "đặc-tả-máy-phục-vụ"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "tùy chọn để chuyển giao"
-#: builtin/push.c:568
+#: builtin/push.c:583
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:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "--delete không hợp lý nếu không có bất kỳ tham chiếu nào"
-#: builtin/push.c:589
+#: builtin/push.c:604
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"
@@ -11776,19 +12046,51 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<các-tùy-chọn>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "giữ lại các lần chuyển giao rỗng"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "tiếp tục cải tổ"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "bãi bỏ việc cải tổ"
-#: builtin/receive-pack.c:28
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "tạo văn lệnh rebase"
+
+#: builtin/rebase--helper.c:32
+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--helper.c:34
+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--helper.c:36
+msgid "check the todo list"
+msgstr "kiểm tra danh sách cần làm"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "bỏ qua các lệnh cậy (pick) không cần thiết"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "sắp xếp lại các dòng fixup/squash"
+
+#: builtin/rebase--helper.c:42
+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/receive-pack.c:30
msgid "git receive-pack <git-dir>"
msgstr "git receive-pack <thư-mục-git>"
-#: builtin/receive-pack.c:838
+#: builtin/receive-pack.c:840
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"
@@ -11818,7 +12120,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:858
+#: builtin/receive-pack.c:860
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"
@@ -11847,12 +12149,7 @@
msgid "You must specify a directory."
msgstr "Bạn phải chỉ định thư mục."
-#: builtin/reflog.c:424
-#, 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ệ"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "“%s” không phải là dấu thời gian hợp lệ"
@@ -11993,12 +12290,12 @@
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:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "máy chủ %s đã tồn tại rồi."
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "“%s” không phải tên máy chủ hợp lệ"
@@ -12021,17 +12318,17 @@
msgid "(delete)"
msgstr "(xóa)"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "Không có máy chủ nào như thế: %s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, 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:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -12042,17 +12339,17 @@
"\t%s\n"
"\tXin hãy cập nhật phần cấu hình một cách thủ công nếu thấy cần thiết."
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "gặp lỗi khi xóa “%s”"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "gặp lỗi khi tạo “%s”"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -12064,113 +12361,113 @@
"đi;\n"
"để xóa đi, sử dụng:"
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, 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:910
+#: builtin/remote.c:911
#, 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:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " được theo dõi"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " cũ rích (dùng “git remote prune” để gỡ bỏ)"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, 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:966
+#: builtin/remote.c:967
#, 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:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "thực hiện rebase trên máy chủ %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " hòa trộn với máy chủ %s"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "hòa trộn với máy chủ %s"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s và với máy chủ %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "tạo"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "xóa"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "đã cập nhật"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "có-thể-chuyển-tiếp-nhanh"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "dữ liệu nội bộ đã cũ"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s ép buộc thành %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s đẩy lên thành %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s ép buộc thành %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s đẩy lên thành %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "không truy vấn các máy chủ"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* máy chủ %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " URL để lấy về: %s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(không có URL)"
@@ -12178,181 +12475,181 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " URL để đẩy lên: %s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " Nhánh HEAD: %s"
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "(không yêu cầu)"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "(không hiểu)"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, 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:1182
+#: builtin/remote.c:1183
#, 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:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr " (trạng thái không được yêu cầu)"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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:1202
+#: builtin/remote.c:1203
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:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
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:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "xóa refs/remotes/<tên>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "Không thể xác định được HEAD máy chủ"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
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:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "Không thể xóa bỏ %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "Không phải là tham chiếu hợp lệ: %s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "Không thể cài đặt %s"
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, 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:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s đã trở thành không đầu (không được quản lý)!"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "Đang xén bớt %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL: %s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [nên xén bớt] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [đã bị xén] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "cắt máy chủ sau khi lấy về"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "Không có máy chủ nào có tên “%s”"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "thêm nhánh"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "chưa chỉ ra máy chủ nào"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "truy vấn đẩy URL thay vì lấy"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "trả về mọi URL"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, 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:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "đẩy các “URL” bằng tay"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "thêm URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "xóa URLs"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete không hợp lý"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "Kiểu mẫu URL cũ không hợp lệ: %s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "Không tìm thấy URL như vậy: %s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "Sẽ không xóa những địa chỉ URL không-push"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "chi tiết; phải được đặt trước một lệnh-con"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "Không hiểu câu lệnh con: %s"
@@ -12449,7 +12746,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable và -A xung khắc nhau"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "gặp lỗi khi gỡ bỏ “%s”"
@@ -12583,121 +12880,134 @@
msgid "keep"
msgstr "giữ lại"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "Bạn không có HEAD nào hợp lệ."
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "Gặp lỗi khi tìm cây của HEAD."
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, 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:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD hiện giờ tại %s"
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, 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:286
+#: builtin/reset.c:297
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:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "đặt lại (reset) HEAD và bảng mục lục"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "chỉ đặt lại (reset) HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
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:295
+#: builtin/reset.c:306
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:301
+#: builtin/reset.c:312
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:320
+#: builtin/reset.c:329
#, 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:328
+#: builtin/reset.c:337
#, 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:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch xung khắc với --{hard,mixed,soft}"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
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 -- <đường_dẫn>”."
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, 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:358
+#: builtin/reset.c:367
#, 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:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N chỉ được dùng khi có --mixed"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "Những thay đổi được đưa ra khỏi bệ phóng sau khi reset:"
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, 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:389
+#: builtin/reset.c:398
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:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "lọc đối tượng yêu cầu --objects"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "giá trị sparse không hợp lệ “%s”"
+
+#: builtin/rev-list.c:442
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-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "không thể tổ hợp --use-bitmap-index với lọc đối tượng"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<các-tùy-chọn>] -- [<các tham số>…]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "giữ lại “--” chuyển sang làm tham số"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "dừng phân tích sau đối số đầu tiên không có tùy chọn"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "kết xuất trong định dạng gậy dài"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12788,11 +13098,11 @@
msgid "keep redundant, empty commits"
msgstr "giữ lại các lần chuyển giao dư thừa, rỗng"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "hoàn nguyên gặp lỗi"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "cherry-pick gặp lỗi"
@@ -12857,17 +13167,17 @@
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:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "không thể gỡ bỏ “%s” một cách đệ qui mà không có tùy chọn -r"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm: không thể gỡ bỏ %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "không thể gỡ bỏ “%s”"
@@ -12904,27 +13214,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<các-tùy-chọn>] [<vùng-xét-duyệt>] [[--] [<đường-dẫn>…]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "Nhóm theo người chuyển giao thay vì tác giả"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "Hiển thị thư điện tử cho từng tác giả"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "Ngắt dòng khi quá dài"
@@ -13125,35 +13435,35 @@
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:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "Không có tham chiếu nào như thế: %s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, 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:72
+#: builtin/submodule--helper.c:81
#, 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:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
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:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, 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:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
@@ -13162,81 +13472,112 @@
"không thể tìm thấy cấu hình “%s”. Coi rằng kho này là thượng nguồn có quyền "
"sở hữu chính nó."
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, 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:410
+#: builtin/submodule--helper.c:479
#, 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:420
+#: builtin/submodule--helper.c:489
#, 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:427
+#: builtin/submodule--helper.c:496
#, 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:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
msgstr "Chặn kết xuất cho khởi tạo một mô-đun-con"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [</đường/dẫn>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name </đường/dẫn>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, 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:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, 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:653
+#, 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:677
+msgid "Suppress submodule status output"
+msgstr "Chặn két xuất tình trạng mô-đun-con"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr ""
+"Dùng lần chuyển giao lưu trong mục lục thay cho cái được lưu trong HEAD mô-"
+"đun-con"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "đệ quy vào trong mô-đun-con lồng nhau"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr ""
+"git submodule status [--quiet] [--cached] [--recursive] [</đường/dẫn>…]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name </đường/dẫn>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, 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:604
+#: builtin/submodule--helper.c:835
#, 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:611
+#: builtin/submodule--helper.c:842
#, 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:633
+#: builtin/submodule--helper.c:864
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:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "tên của mô-đun-con mới"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
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:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "chiều sâu lịch sử khi tạo bản sao"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "ép buộc tiến trình nhân bản"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13244,84 +13585,84 @@
"git submodule--helper clone [--prefix=</đường/dẫn>] [--quiet] [--reference "
"<kho>] [--name <tên>] [--depth <sâu>] [--url <url>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "Nhân bản “%s” vào đường dẫn mô-đun-con “%s” gặp lỗi"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, 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:764
+#: builtin/submodule--helper.c:995
#, 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:768
+#: builtin/submodule--helper.c:999
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:793
+#: builtin/submodule--helper.c:1028
#, 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:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "Bỏ qua mô-đun-con “%s”"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, 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:953
+#: builtin/submodule--helper.c:1201
#, 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:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "đường dẫn đến cây làm việc"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
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:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "rebase, merge, checkout hoặc không làm gì cả"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
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:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "công việc đồng thời"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
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:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "đừng in tiến trình nhân bản"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr ""
"git submodule--helper update_clone [--prefix=</đường/dẫn>] [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "giá trị cho tham số cập nhật bị sai"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, c-format
msgid ""
"Submodule (%s) branch configured to inherit branch from superproject, but "
@@ -13330,20 +13671,20 @@
"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:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "đệ quy vào trong mô-đun-con"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [</đường/dẫn>…]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s không hỗ trợ --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, 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ệ"
@@ -13356,23 +13697,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <tên>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "chặn các thông tin lỗi cho các tham chiếu “không-mềm” (bị tách ra)"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "xóa tham chiếu mềm"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
msgstr "làm ngắn kết xuất ref (tham chiếu)"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "lý do"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "lý do cập nhật"
@@ -13402,17 +13743,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<định_dạng>] <tên-thẻ>…"
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "không tìm thấy tìm thấy thẻ “%s”."
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "Thẻ đã bị xóa “%s” (từng là %s)\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13425,7 +13766,7 @@
" %s\n"
"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13440,143 +13781,143 @@
"Những dòng được bắt đầu bằng “%c” sẽ được giữ lại; bạn có thể xóa chúng đi "
"nếu muốn.\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "không thể ký thẻ"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "không thể ghi vào tập tin lưu thẻ"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "kiểu đối tượng sai."
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "không có chú thích gì cho cho thẻ à?"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, 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:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "chỉ liệt kê tên các thẻ"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "hiển thị <n> dòng cho mỗi ghi chú"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "xóa thẻ"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "thẩm tra thẻ"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "Tùy chọn tạo thẻ"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "để chú giải cho thẻ, cần một lời ghi chú"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "phần chú thích cho thẻ"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "thẻ chú giải và ký kiểu GPG"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "dùng kháo khác để ký thẻ"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "thay thế nếu thẻ đó đã có trước"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "tạo một reflog"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "Các tùy chọn liệt kê thẻ"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "hiển thị danh sách thẻ trong các cột"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
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:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
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:425
+#: builtin/tag.c:403
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:426
+#: builtin/tag.c:404
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:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "chỉ hiển thị các thẻ của đối tượng"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column và -n xung khắc nhau"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
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:494
+#: builtin/tag.c:477
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:496
+#: builtin/tag.c:479
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:498
+#: builtin/tag.c:481
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:500
+#: builtin/tag.c:483
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:511
+#: builtin/tag.c:494
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:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "quá nhiều đối số"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "“%s” không phải thẻ hợp lệ."
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "Thẻ “%s” đã tồn tại rồi"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n"
@@ -13585,191 +13926,207 @@
msgid "Unpacking objects"
msgstr "Đang giải nén các đối tượng"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "tạo thư mục \"%s\" gặp lỗi"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "gặp lỗi khi lấy thông tin thống kê về %s"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "gặp lỗi khi tạo tập tin %s"
-#: builtin/update-index.c:104
+#: 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:111 builtin/update-index.c:217
+#: 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:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "Đang kiểm thử mtime trong “%s”"
-#: builtin/update-index.c:150
+#: 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:163
+#: 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:176
+#: 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:187
+#: 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:198
+#: 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:211
+#: 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:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " Đồng ý"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<các-tùy-chọn>] [--] [<tập-tin>…]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
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:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "refresh: lờ đi mô-đun-con"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "không bỏ qua các tập tin mới tạo"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
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:934
+#: builtin/update-index.c:946
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:936
+#: builtin/update-index.c:948
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:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "lấy lại thông tin thống kê"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
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:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<chế_độ>,<đối_tượng>,<đường_dẫn>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
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:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "Đánh dấu các tập tin là \"không thay đổi\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "xóa bít assumed-unchanged (giả định là không thay đổi)"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "đánh dấu các tập tin là “chỉ-đọc”"
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "xóa bít skip-worktree"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
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:971
+#: builtin/update-index.c:983
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:973
+#: builtin/update-index.c:985
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:975
+#: builtin/update-index.c:987
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:979
+#: builtin/update-index.c:991
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:983
+#: builtin/update-index.c:995
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:987
+#: builtin/update-index.c:999
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:991
+#: builtin/update-index.c:1003
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:994
+#: builtin/update-index.c:1006
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:996
+#: builtin/update-index.c:1008
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:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "ghi mục lục ở định dạng này"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "bật/tắt chia cắt bảng mục lục"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "bật/tắt bộ đệm không theo vết"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
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:1008
+#: builtin/update-index.c:1020
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:1108
+#: builtin/update-index.c:1022
+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:1024
+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:1026
+msgid "mark files as fsmonitor valid"
+msgstr "đánh dấu các tập tin là hợp lệ fsmonitor"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "xóa bít hợp lệ fsmonitor"
+
+#: builtin/update-index.c:1127
msgid ""
"core.splitIndex is set to false; remove or change it, if you really want to "
"enable split index"
@@ -13777,7 +14134,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:1117
+#: builtin/update-index.c:1136
msgid ""
"core.splitIndex is set to true; remove or change it, if you really want to "
"disable split index"
@@ -13785,7 +14142,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:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13793,11 +14150,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:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "Nhớ đệm không theo vết bị tắt"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13805,11 +14162,32 @@
"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:1144
+#: builtin/update-index.c:1163
#, 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:1171
+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:1175
+msgid "fsmonitor enabled"
+msgstr "fsmonitor được bật"
+
+#: builtin/update-index.c:1178
+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:1182
+msgid "fsmonitor disabled"
+msgstr "fsmonitor bị tắt"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<các-tùy-chọn>] -d <refname> [<biến-cũ>]"
@@ -13822,19 +14200,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<các-tùy-chọn>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "xóa tham chiếu"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "cập nhật <tên-tham-chiếu> không phải cái nó chỉ tới"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "đầu vào tiêu chuẩn có các đối số được chấm dứt bởi NUL"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "đọc cập nhật từ đầu vào tiêu chuẩn"
@@ -13878,122 +14256,141 @@
msgid "print tag contents"
msgstr "hiển thị nội dung của thẻ"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<các-tùy-chọn>] <đường-dẫn> [<nhánh>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<các-tùy-chọn>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<các-tùy-chọn>] </đường/dẫn>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<các-tùy-chọn>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock </đường/dẫn>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "Gỡ bỏ cây làm việc/%s: không phải là thư mục hợp lệ"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "Gỡ bỏ cây làm việc/%s: không có tập tin gitdir"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "Gỡ bỏ cây làm việc/%s: không thể đọc tập tin gitdir (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "Gỡ bỏ cây làm việc/%s: đọc ngắn (cần %<PRIuMAX> byte, đọc %<PRIuMAX>)"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir không hợp lệ"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "Gỡ bỏ cây làm việc/%s: tập tin gitdir chỉ đến vị trí không tồn tại"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "báo cáo các cây làm việc đã prune"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
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:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "“%s” đã có từ trước rồi"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "không thể tạo thư mục của “%s”"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "Đang chuẩn bị %s (định danh %s)"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
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:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "tạo nhánh mới"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "tạo hay đặt lại một nhánh"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "di chuyển cây làm việc mới"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "giữ cây làm việc mới bị khóa"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "cài đặt chế độ theo dõi (xem git-branch(1))"
+
+#: builtin/worktree.c:380
+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:388
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:479
+#: builtin/worktree.c:453
+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:553
msgid "reason for locking"
msgstr "lý do khóa"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, 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:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
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:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "“%s” đã được khóa rồi, lý do: %s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "“%s” đã được khóa rồi"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "“%s” chưa bị khóa"
@@ -14014,7 +14411,7 @@
msgid "only useful for debugging"
msgstr "chỉ hữu ích khi cần gỡ lỗi"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<các-tùy-chọn>] </đường/dẫn>"
@@ -14034,7 +14431,7 @@
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "ngắt truyền thông sau <n> giây không hoạt động"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -14047,7 +14444,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "in thông tin gỡ lỗi ra đầu ra lỗi tiêu chuẩn"
@@ -14061,20 +14458,20 @@
"hướng dẫn về khái niệm. Xem “git help <lệnh>” hay “git help <khái-niệm>”\n"
"để xem các đặc tả cho lệnh hay khái niệm cụ thể."
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "giá trị âm cho http.postbuffer; mặc định là %d"
-#: http.c:358
+#: http.c:360
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:367
+#: http.c:369
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:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -14090,6 +14487,14 @@
msgid "redirecting to %s"
msgstr "chuyển hướng đến %s"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "các_tham_số"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "lọc đối tượng"
+
#: common-cmds.h:9
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)"
@@ -14266,27 +14671,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "Đối số bisect_write sai: $state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "Đầu vào rev sai: $arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "Đầu vào rev sai: $bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "Đầu vào rev sai: $rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "“git bisect $TERM_BAD” có thể lấy chỉ một đối số."
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao $TERM_BAD."
@@ -14294,11 +14699,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "Bạn có chắc chắn chưa [Y/n]? "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14308,7 +14713,7 @@
"(Bạn có thể sử dụng \"git bisect $bad_syn\" và \"git bisect $good_syn\" cho "
"cái đó.)"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14321,16 +14726,16 @@
"(Bạn có thể sử dụng \"git bisect $bad_syn\" và \"git bisect $good_syn\" cho "
"chúng.)"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "Chúng tôi không bisect."
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "”$invalid” không phải là lần chuyển giao hợp lệ"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14339,25 +14744,29 @@
"Không thể check-out HEAD nguyên thủy của “$branch”.\n"
"Hãy thử “git bisect reset <lần-chuyển-giao>”."
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "Chưa chỉ ra tập tin ghi nhật ký"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "không thể đọc $file để thao diễn lại"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? bạn đang nói gì thế?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "bisect chạy gặp lỗi: không đưa ra lệnh."
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "đang chạy lệnh $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14366,11 +14775,11 @@
"chạy bisect gặp lỗi:\n"
"mã trả về $res từ lệnh “$command” là < 0 hoặc >= 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "bisect không thể tiếp tục thêm được nữa"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14379,39 +14788,20 @@
"chạy bisect gặp lỗi:\n"
"”bisect_state $state” đã thoát ra với mã lỗi $res"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "bisect chạy thành công"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "vui lòng dùng hai thời kỳ khác nhau"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "“$term” không phải là thời kỳ hợp lệ"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "không thể dùng lệnh tích hợp “$term” như là một thời kỳ"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "không thể thay đổi nghĩa của thời kỳ “$term”"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "Lệnh không hợp lệ: bạn hiện đang ở bisect $TERM_BAD/$TERM_GOOD."
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "chưa định nghĩa thời kỳ nào"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14443,7 +14833,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "Đã cập nhật với $pretty_name rồi"
#: git-merge-octopus.sh:89
@@ -14462,56 +14852,57 @@
#: git-rebase.sh:58
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"
-"\"."
+"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 ""
-"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\"."
+"Giải quyết vấn đề này thủ công, hãy đanh dấu chúng đã được giải quyết bằng\n"
+"hãy chạy lệnh \"git add/rm <các_tập_tin_xung_đột>\", sau đó chạy \"git "
+"rebase --continue\".\n"
+"Bạn có thể bỏ qua miếng vá, chạy \"git rebase --skip\".\n"
+"Để bãi bỏ và quay trở lại trạng thái trước \"git rebase\", chạy \"git rebase "
+"--abort\"."
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "Không thể quay trở lại $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "Đã áp dụng autostash."
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "Không thể lưu $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "Móc (hook) pre-rebase từ chối rebase."
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
+#: git-rebase.sh:219
+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ể chạy lệnh "
-"rebase."
+"Hình như đang trong quá trình thực hiện lệnh “git-am”. Không thể rebase."
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "Không có tiến trình rebase nào phải không?"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
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."
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "Không thể đọc HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14519,7 +14910,7 @@
"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"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14540,227 +14931,222 @@
"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."
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "thượng nguồn không hợp lệ $upstream_name"
+msgid "invalid upstream '$upstream_name'"
+msgstr "thượng nguồn không hợp lệ “$upstream_name”"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
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"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
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"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
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"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "nghiêm trọng: không có nhánh như thế: $branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "nghiêm trọng: không có nhánh như thế: “$branch_name”"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "Không thể autostash"
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "Đã tạo autostash: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "Xin hãy chuyển giao hoặc tạm cất (stash) chúng."
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD đã cập nhật."
+
+#: git-rebase.sh:609
#, sh-format
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."
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD hiện đã được cập nhật rồi, bị ép buộc rebase."
+
+#: git-rebase.sh:619
#, sh-format
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."
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "Thay đổi từ $mb thành $onto:"
-#: git-rebase.sh:615
+#: git-rebase.sh:640
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ó…"
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "Chuyển-tiếp-nhanh $branch_name thành $onto_name."
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr ""
"git stash clear với các tham số là chưa được thực hiện (không nhận đối số)"
-#: git-stash.sh:95
+#: git-stash.sh:108
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"
-#: git-stash.sh:110
+#: git-stash.sh:123
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"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "Không thể ghi lại các tập tin chưa theo dõi"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
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"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "Chưa có thay đổi nào được chọn"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "Không thể gỡ bỏ bảng mục lục tạm thời (không thể xảy ra)"
-#: git-stash.sh:178
+#: git-stash.sh:191
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"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "Không thể cập nhật $ref_stash với $w_commit"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-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\""
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "lỗi: không hiểu tùy chọn cho “stash push”: $option"
+
+#: git-stash.sh:295
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."
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "Không có thay đổi nội bộ nào được ghi lại"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "Không thể khởi tạo stash"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "Không thể ghi lại trạng thái hiện hành"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "Đã ghi lại thư mục làm việc và trạng thái mục lục $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "không hiểu tùy chọn: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "Không tìm thấy các mục tạm cất (stash) nào."
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "Chỉ ra quá nhiều điểm xét duyệt: $REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference không phải là tham chiếu hợp lệ"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "“$args” không phải là lần chuyển giao kiểu-stash (cất đi)"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "”$args” không phải tham chiếu đến stash"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "không thể làm tươi mới bảng mục lục"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "Không thể áp dụng một stash ở giữa của quá trình hòa trộn"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "Xung đột trong bảng mục lục. Hãy thử mà không dùng tùy chọn --index."
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "Không thể ghi lại cây chỉ mục"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr "Không thể phục hồi các tập tin chưa theo dõi từ mục cất đi (stash)"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "Không thể bỏ ra khỏi bệ phóng các tập tin đã được sửa chữa"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "Bảng mục lục đã không được bỏ stash."
-#: git-stash.sh:633
+#: git-stash.sh:648
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ó."
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "Đã xóa ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}: Không thể xóa bỏ mục stash"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "Chưa chỉ ra tên của nhánh"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")"
@@ -14912,19 +15298,19 @@
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "Mô-đun-con “$name” ($url) được bỏ đăng ký cho đường dẫn “$displaypath”"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, 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:648
+#: git-submodule.sh:647
#, 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:653
+#: git-submodule.sh:652
#, sh-format
msgid ""
"Unable to find current ${remote_name}/${branch} revision in submodule path "
@@ -14933,12 +15319,12 @@
"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:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "Không thể lấy về trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14947,86 +15333,81 @@
"Đã 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:684
+#: git-submodule.sh:683
#, 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:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: đã checkout “$sha1”"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, 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:690
+#: git-submodule.sh:689
#, 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:695
+#: git-submodule.sh:694
#, 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:696
+#: git-submodule.sh:695
#, 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:701
+#: git-submodule.sh:700
#, 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:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "Đường dẫn mô-đun-con “$displaypath”: “$command $sha1”"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "Gặp lỗi khi đệ quy vào trong đường dẫn mô-đun-con “$displaypath”"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "chế độ không như mong chờ $mod_dst"
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_src"
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " Cảnh báo: $display_name không chứa lần chuyển giao $sha1_dst"
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr ""
" Cảnh báo: $display_name không chứa những lần chuyển giao $sha1_src và "
"$sha1_dst"
-#: git-submodule.sh:1065
-#, sh-format
-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”"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "Url Mô-đun-con đồng bộ hóa cho “$displaypath”"
@@ -15045,13 +15426,13 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\n"
"These lines can be re-ordered; they are executed from top to bottom.\n"
msgstr ""
@@ -15139,48 +15520,48 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "Từ chối squash lần hòa trộn: $sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, 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--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "Không thể lấy ra $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, 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--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, 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--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "Không thể $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "Đây là tổ hợp của 2 lần chuyển giao."
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "Không thể áp dụng $sha1… $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15196,31 +15577,31 @@
"này\n"
"trước khi bạn có thể làm việc lại với lần chuyển giao."
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "Bị dừng tại $sha1_abbrev… $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, 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--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "Thực thi: $rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "Thực thi gặp lỗi: $rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
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--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15231,7 +15612,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15246,96 +15627,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "Lệnh chưa biết: $command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
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--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, 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--interactive.sh:750
-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"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"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"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-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"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "không thể tách rời HEAD"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr ""
-"Cảnh báo: một số lần chuyển giao có lẽ đã bị xóa một cách tình cờ.\n"
-"Các lần chuyển giao bị xóa (từ mới đến cũ):"
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"Để tránh thông báo này, dùng \"drop\" một cách rõ ràng để xóa bỏ một lần "
-"chuyển giao.\n"
-"\n"
-"Dùng “git config rebase.missingCommitsCheck” để thay đổi mức độ của cảnh "
-"báo.\n"
-"Cánh ứng xử có thể là: ignore, warn, error."
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr ""
-"Không thừa nhận cài đặt $check_level for option rebase.missingCommitsCheck. "
-"Nên bỏ qua."
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"Bạn có thể sửa nó bằng “git rebase --edit-todo” và sau đó chạy “git rebase --"
-"continue”."
-
-#: git-rebase--interactive.sh:1055
-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”."
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "Không thể xóa bỏ CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15366,11 +15680,11 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
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--interactive.sh:1110
+#: git-rebase--interactive.sh:790
msgid ""
"You have uncommitted changes in your working tree. Please commit them\n"
"first and then run 'git rebase --continue' again."
@@ -15379,11 +15693,11 @@
"Vui lòng chuyển giao chúng và sau đó chạy lệnh “git rebase --continue” lần "
"nữa."
-#: git-rebase--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
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--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15397,39 +15711,43 @@
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "Không thể thực thi trình biên soạn"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "Không thể checkout $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "Không HEAD?"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, 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--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "Không thể đánh dấu là tương tác"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
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-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "Không thể tạo danh sách cần làm"
+
+#: git-rebase--interactive.sh:973
#, 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--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15438,7 +15756,7 @@
"\n"
"Tuy nhiên, nếu bạn xóa bỏ mọi thứ, việc cải tổ sẽ bị bãi bỏ.\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "Chú ý rằng lần chuyển giao trống rỗng là ghi chú"
@@ -16024,60 +16342,60 @@
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:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
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:291
+#: git-send-email.perl:290
#, 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:296
+#: git-send-email.perl:295
#, 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:314
+#: git-send-email.perl:313
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:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
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:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "Không hiểu trường --suppress-cc: “%s”\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "Không hiểu cài đặt --confirm: “%s”\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, 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:511
+#: git-send-email.perl:506
#, 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:513
+#: git-send-email.perl:508
#, 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:518
+#: git-send-email.perl:513
#, 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:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -16092,12 +16410,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:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "Gặp lỗi khi mở thư mục “%s”: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -16106,7 +16424,7 @@
"nghiêm trọng: %s: %s\n"
"cảnh báo: không có miếng vá nào được gửi đi\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -16116,17 +16434,17 @@
"Chưa chỉ định các tập tin miếng vá!\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "Không có dòng chủ đề trong %s?"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "Gặp lỗi khi mở “%s” để ghi: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -16140,31 +16458,31 @@
"\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:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "Gặp lỗi khi mở %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "Gặp lỗi khi mở “%s”: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
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"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
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:791
+#: git-send-email.perl:786
#, 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:820
+#: git-send-email.perl:815
msgid ""
"The following files are 8bit, but do not declare a Content-Transfer-"
"Encoding.\n"
@@ -16172,11 +16490,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:825
+#: git-send-email.perl:820
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:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -16189,20 +16507,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:852
+#: git-send-email.perl:847
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:870
+#: git-send-email.perl:865
#, 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:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, 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"
@@ -16210,16 +16528,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:944
+#: git-send-email.perl:941
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:1245
+#: git-send-email.perl:1262
#, 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:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16246,134 +16564,244 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "Gửi thư này chứ? ([y]có|[n]không|[q]thoát|[a]tất): "
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "Gửi thư này trả lời yêu cầu"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
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:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "Máy chủ không hỗ trợ STARTTLS! %s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS gặp lỗi! %s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
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:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "Gặp lỗi khi gửi %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "Thử gửi %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "Gửi %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "Dry-OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "OK. Nhật ký nói rằng:\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "Kết quả: "
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "Kết quả: Tốt\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "không thể mở tập tin “%s”"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, 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:1534
+#: git-send-email.perl:1551
#, 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:1582
+#: git-send-email.perl:1599
#, 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:1605
+#: git-send-email.perl:1624
#, 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:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) Không thể thực thi “%s”"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) Đang thêm %s: %s từ: “%s”\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, 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:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "không thể lấy gửi thư dạng 7 bít"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "bảng mã truyền không hợp lệ"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "không thể mở %s: %s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s: miếng vá có chứa dòng dài hơn 998 ký tự"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, 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]: "
+#~ 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 "unable to open '%s' for writing"
+#~ msgstr "không thể mở “%s” để ghi"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "không thể cắt cụt “%s”"
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "không thể hoàn thành “%s”"
+
+#~ msgid "could not write to %s"
+#~ msgstr "không thể ghi vào %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 "show ignored files"
+#~ msgstr "hiển thị các tập tin ẩn"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s không phải là một đối tượng “%s” hợp lệ"
+
+#~ 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 "prepend parent project's basename to output"
+#~ msgstr "treo vào trước tên cơ sở cha mẹ của đường dẫn vào kết xuất"
+
+#~ 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 "%"
#~ msgid_plural "%"
#~ msgstr[0] "%"
@@ -16485,9 +16913,6 @@
#~ msgid "git merge [<options>] <msg> HEAD <commit>"
#~ msgstr "git merge [<các-tùy-chọn>] <tin-nhắn> HEAD <commit>"
-#~ msgid "'%s' is not a commit"
-#~ msgstr "%s không phải là một lần commit (chuyển giao)"
-
#~ msgid "cannot open file '%s'"
#~ msgstr "không thể mở tập tin “%s”"
@@ -16533,9 +16958,6 @@
#~ "(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 "Could not write to %s"
-#~ msgstr "Không thể ghi vào %s"
-
#~ msgid "Error wrapping up %s."
#~ msgstr "Lỗi bao bọc %s."
@@ -16834,9 +17256,6 @@
#~ 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 "unable to parse format"
-#~ msgstr "không thể phân tích định dạng"
-
#~ msgid "improper format entered align:%s"
#~ msgstr "định dạng không đúng chỗ căn chỉnh:%s"
@@ -16971,18 +17390,6 @@
#~ msgid "-b and -B are mutually exclusive"
#~ msgstr "-b và -B loại từ lẫn nhau."
-#~ msgid ""
-#~ "When you have resolved this problem, run \"$cmdline --continue\".\n"
-#~ "If you prefer to skip this patch, run \"$cmdline --skip\" instead.\n"
-#~ "To restore the original branch and stop patching, run \"$cmdline --abort"
-#~ "\"."
-#~ msgstr ""
-#~ "Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --continue\".\n"
-#~ "Nếu bạn có ý định bỏ qua miếng vá, thay vào đó bạn chạy \"$cmdline --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 "
-#~ "\"$cmdline --abort\"."
-
#~ msgid "Patch format $patch_format is not supported."
#~ msgstr "Định dạng miếng vá $patch_format không được hỗ trợ."
@@ -17056,9 +17463,6 @@
#~ msgid "no files added"
#~ msgstr "chưa có tập tin nào được thêm vào"
-#~ msgid "force creation (when already exists)"
-#~ msgstr "ép buộc tạo (khi đã có nhánh cùng tên)"
-
#~ msgid "slot"
#~ msgstr "khe"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 51f5bc9..c3c2408 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -3,6 +3,7 @@
# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com>
# This file is distributed under the same license as the Git package.
# Contributors:
+# - Fangyi Zhou <fangyi.zhou AT yuriko.moe>
# - Jiang Xin <worldhello.net AT gmail.com>
# - Lian Cheng <rhythm.mail AT gmail.com>
# - Ray Chen <oldsharp AT gmail.com>
@@ -121,6 +122,7 @@
# tagger | 打标签者
# topic branch | 主题分支
# track | 跟踪
+# trailer | 尾部署名
# tree | 树（工作区或树对象）
# tree object | 树对象
# tree-ish (also treeish) | 树对象（或可以解析为一树对象）
@@ -136,8 +138,8 @@
msgstr ""
"Project-Id-Version: Git\n"
"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n"
-"POT-Creation-Date: 2017-07-24 21:54+0800\n"
-"PO-Revision-Date: 2017-08-02 08:00+0800\n"
+"POT-Creation-Date: 2018-01-07 07:50+0800\n"
+"PO-Revision-Date: 2018-01-09 09:53+0800\n"
"Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n"
"Language-Team: GitHub <https://github.com/jiangxin/git/>\n"
"Language: zh_CN\n"
@@ -146,37 +148,37 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: advice.c:58
+#: advice.c:62
#, c-format
msgid "hint: %.*s\n"
msgstr "提示：%.*s\n"
-#: advice.c:86
+#: advice.c:90
msgid "Cherry-picking is not possible because you have unmerged files."
msgstr "无法拣选，因为您有未合并的文件。"
-#: advice.c:88
+#: advice.c:92
msgid "Committing is not possible because you have unmerged files."
msgstr "无法提交，因为您有未合并的文件。"
-#: advice.c:90
+#: advice.c:94
msgid "Merging is not possible because you have unmerged files."
msgstr "无法合并，因为您有未合并的文件。"
-#: advice.c:92
+#: advice.c:96
msgid "Pulling is not possible because you have unmerged files."
msgstr "无法拉取，因为您有未合并的文件。"
-#: advice.c:94
+#: advice.c:98
msgid "Reverting is not possible because you have unmerged files."
msgstr "无法回退，因为您有未合并的文件。"
-#: advice.c:96
+#: advice.c:100
#, c-format
msgid "It is not possible to %s because you have unmerged files."
msgstr "无法 %s，因为您有未合并的文件。"
-#: advice.c:104
+#: advice.c:108
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."
@@ -184,23 +186,23 @@
"请在工作区改正文件，然后酌情使用 'git add/rm <文件>' 命令标记\n"
"解决方案并提交。"
-#: advice.c:112
+#: advice.c:116
msgid "Exiting because of an unresolved conflict."
msgstr "因为存在未解决的冲突而退出。"
-#: advice.c:117 builtin/merge.c:1184
+#: advice.c:121 builtin/merge.c:1213
msgid "You have not concluded your merge (MERGE_HEAD exists)."
msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。"
-#: advice.c:119
+#: advice.c:123
msgid "Please, commit your changes before merging."
msgstr "请在合并前先提交您的修改。"
-#: advice.c:120
+#: advice.c:124
msgid "Exiting because of unfinished merge."
msgstr "因为存在未完成的合并而退出。"
-#: advice.c:126
+#: advice.c:130
#, c-format
msgid ""
"Note: checking out '%s'.\n"
@@ -224,7 +226,7 @@
"如果您想要通过创建分支来保留在此状态下所做的提交，您可以通过在检出命令添加\n"
"参数 -b 来实现（现在或稍后）。例如：\n"
"\n"
-" git checkout -b <new-branch-name>\n"
+" git checkout -b <新分支名>\n"
"\n"
#: apply.c:58
@@ -237,82 +239,82 @@
msgid "unrecognized whitespace ignore option '%s'"
msgstr "未能识别的空白字符忽略选项 '%s'"
-#: apply.c:126
+#: apply.c:122
msgid "--reject and --3way cannot be used together."
-msgstr "--reject 和 --3say 不能同时使用。"
+msgstr "--reject 和 --3way 不能同时使用。"
-#: apply.c:128
+#: apply.c:124
msgid "--cached and --3way cannot be used together."
msgstr "--cached 和 --3way 不能同时使用。"
-#: apply.c:131
+#: apply.c:127
msgid "--3way outside a repository"
msgstr "--3way 在一个仓库之外"
-#: apply.c:142
+#: apply.c:138
msgid "--index outside a repository"
msgstr "--index 在一个仓库之外"
-#: apply.c:145
+#: apply.c:141
msgid "--cached outside a repository"
msgstr "--cached 在一个仓库之外"
-#: apply.c:836
+#: apply.c:821
#, c-format
msgid "Cannot prepare timestamp regexp %s"
msgstr "无法准备时间戳正则表达式 %s"
-#: apply.c:845
+#: apply.c:830
#, c-format
msgid "regexec returned %d for input: %s"
msgstr "regexec 返回 %d，输入为：%s"
-#: apply.c:929
+#: apply.c:904
#, c-format
msgid "unable to find filename in patch at line %d"
msgstr "不能在补丁的第 %d 行找到文件名"
-#: apply.c:967
+#: apply.c:942
#, 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:973
+#: apply.c:948
#, c-format
msgid "git apply: bad git-diff - inconsistent new filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致"
-#: apply.c:974
+#: apply.c:949
#, c-format
msgid "git apply: bad git-diff - inconsistent old filename on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致"
-#: apply.c:979
+#: apply.c:954
#, c-format
msgid "git apply: bad git-diff - expected /dev/null on line %d"
msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null"
-#: apply.c:1008
+#: apply.c:983
#, c-format
msgid "invalid mode on line %d: %s"
msgstr "第 %d 行包含无效文件模式：%s"
-#: apply.c:1326
+#: apply.c:1301
#, c-format
msgid "inconsistent header lines %d and %d"
msgstr "不一致的文件头，%d 行和 %d 行"
-#: apply.c:1498
+#: apply.c:1473
#, c-format
msgid "recount: unexpected line: %.*s"
msgstr "recount：意外的行：%.*s"
-#: apply.c:1567
+#: apply.c:1542
#, c-format
msgid "patch fragment without header at line %d: %.*s"
msgstr "第 %d 行的补丁片段没有头信息：%.*s"
-#: apply.c:1587
+#: apply.c:1562
#, c-format
msgid ""
"git diff header lacks filename information when removing %d leading pathname "
@@ -323,82 +325,82 @@
msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）"
-#: apply.c:1600
+#: apply.c:1575
#, c-format
msgid "git diff header lacks filename information (line %d)"
msgstr "git diff 的头信息中缺乏文件名信息（第 %d 行）"
-#: apply.c:1770
+#: apply.c:1763
msgid "new file depends on old contents"
msgstr "新文件依赖旧内容"
-#: apply.c:1772
+#: apply.c:1765
msgid "deleted file still has contents"
msgstr "删除的文件仍有内容"
-#: apply.c:1806
+#: apply.c:1799
#, c-format
msgid "corrupt patch at line %d"
msgstr "补丁在第 %d 行损坏"
-#: apply.c:1843
+#: apply.c:1836
#, c-format
msgid "new file %s depends on old contents"
msgstr "新文件 %s 依赖旧内容"
-#: apply.c:1845
+#: apply.c:1838
#, c-format
msgid "deleted file %s still has contents"
msgstr "删除的文件 %s 仍有内容"
-#: apply.c:1848
+#: apply.c:1841
#, c-format
msgid "** warning: file %s becomes empty but is not deleted"
msgstr "** 警告：文件 %s 成为空文件但并未删除"
-#: apply.c:1995
+#: apply.c:1988
#, c-format
msgid "corrupt binary patch at line %d: %.*s"
msgstr "二进制补丁在第 %d 行损坏：%.*s"
-#: apply.c:2032
+#: apply.c:2025
#, c-format
msgid "unrecognized binary patch at line %d"
msgstr "未能识别的二进制补丁位于第 %d 行"
-#: apply.c:2193
+#: apply.c:2185
#, c-format
msgid "patch with only garbage at line %d"
msgstr "补丁文件的第 %d 行只有垃圾数据"
-#: apply.c:2276
+#: apply.c:2271
#, c-format
msgid "unable to read symlink %s"
msgstr "无法读取符号链接 %s"
-#: apply.c:2280
+#: apply.c:2275
#, c-format
msgid "unable to open or read %s"
msgstr "不能打开或读取 %s"
-#: apply.c:2933
+#: apply.c:2934
#, c-format
msgid "invalid start of line: '%c'"
msgstr "无效的行首字符：'%c'"
-#: apply.c:3052
+#: apply.c:3055
#, 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:3064
+#: apply.c:3067
#, c-format
msgid "Context reduced to (%ld/%ld) to apply fragment at %d"
msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段"
-#: apply.c:3070
+#: apply.c:3073
#, c-format
msgid ""
"while searching for:\n"
@@ -407,319 +409,319 @@
"当查询：\n"
"%.*s"
-#: apply.c:3092
+#: apply.c:3095
#, c-format
msgid "missing binary patch data for '%s'"
msgstr "缺失 '%s' 的二进制补丁数据"
-#: apply.c:3100
+#: apply.c:3103
#, c-format
msgid "cannot reverse-apply a binary patch without the reverse hunk to '%s'"
msgstr "不能反向应用一个缺少到 '%s' 的反向数据块的二进制补丁"
-#: apply.c:3146
+#: apply.c:3149
#, c-format
msgid "cannot apply binary patch to '%s' without full index line"
msgstr "不能在 '%s' 上应用没有完整索引行的二进制补丁"
-#: apply.c:3156
+#: apply.c:3159
#, c-format
msgid ""
"the patch applies to '%s' (%s), which does not match the current contents."
msgstr "补丁应用到 '%s'（%s），但是和当前内容不匹配。"
-#: apply.c:3164
+#: apply.c:3167
#, c-format
msgid "the patch applies to an empty '%s' but it is not empty"
msgstr "补丁应用到空文件 '%s'，但其并非空文件"
-#: apply.c:3182
+#: apply.c:3185
#, c-format
msgid "the necessary postimage %s for '%s' cannot be read"
msgstr "无法读取 '%2$s' 必须的目标文件 %1$s"
-#: apply.c:3195
+#: apply.c:3198
#, c-format
msgid "binary patch does not apply to '%s'"
msgstr "二进制补丁未应用到 '%s'"
-#: apply.c:3201
+#: apply.c:3204
#, c-format
msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)"
msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）"
-#: apply.c:3222
+#: apply.c:3225
#, c-format
msgid "patch failed: %s:%ld"
msgstr "打补丁失败：%s:%ld"
-#: apply.c:3344
+#: apply.c:3347
#, c-format
msgid "cannot checkout %s"
msgstr "不能检出 %s"
-#: apply.c:3392 apply.c:3403 apply.c:3449 setup.c:277
+#: apply.c:3396 apply.c:3407 apply.c:3453 setup.c:277
#, c-format
msgid "failed to read %s"
msgstr "无法读取 %s"
-#: apply.c:3400
+#: apply.c:3404
#, c-format
msgid "reading from '%s' beyond a symbolic link"
msgstr "读取位于符号链接中的 '%s'"
-#: apply.c:3429 apply.c:3669
+#: apply.c:3433 apply.c:3673
#, c-format
msgid "path %s has been renamed/deleted"
msgstr "路径 %s 已经被重命名/删除"
-#: apply.c:3512 apply.c:3683
+#: apply.c:3516 apply.c:3687
#, c-format
msgid "%s: does not exist in index"
msgstr "%s：不存在于索引中"
-#: apply.c:3521 apply.c:3691
+#: apply.c:3525 apply.c:3695
#, c-format
msgid "%s: does not match index"
msgstr "%s：和索引不匹配"
-#: apply.c:3556
+#: apply.c:3560
msgid "repository lacks the necessary blob to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: apply.c:3559
+#: apply.c:3563
#, c-format
msgid "Falling back to three-way merge...\n"
msgstr "回落到三方合并...\n"
-#: apply.c:3575 apply.c:3579
+#: apply.c:3579 apply.c:3583
#, c-format
msgid "cannot read the current contents of '%s'"
msgstr "无法读取 '%s' 的当前内容"
-#: apply.c:3591
+#: apply.c:3595
#, c-format
msgid "Failed to fall back on three-way merge...\n"
msgstr "无法回落到三方合并...\n"
-#: apply.c:3605
+#: apply.c:3609
#, c-format
msgid "Applied patch to '%s' with conflicts.\n"
msgstr "应用补丁到 '%s' 存在冲突。\n"
-#: apply.c:3610
+#: apply.c:3614
#, c-format
msgid "Applied patch to '%s' cleanly.\n"
msgstr "成功应用补丁到 '%s'。\n"
-#: apply.c:3636
+#: apply.c:3640
msgid "removal patch leaves file contents"
msgstr "移除补丁仍留下了文件内容"
-#: apply.c:3708
+#: apply.c:3712
#, c-format
msgid "%s: wrong type"
msgstr "%s：错误类型"
-#: apply.c:3710
+#: apply.c:3714
#, c-format
msgid "%s has type %o, expected %o"
msgstr "%s 的类型是 %o，应为 %o"
-#: apply.c:3860 apply.c:3862
+#: apply.c:3864 apply.c:3866
#, c-format
msgid "invalid path '%s'"
msgstr "无效路径 '%s'"
-#: apply.c:3918
+#: apply.c:3922
#, c-format
msgid "%s: already exists in index"
msgstr "%s：已经存在于索引中"
-#: apply.c:3921
+#: apply.c:3925
#, c-format
msgid "%s: already exists in working directory"
msgstr "%s：已经存在于工作区中"
-#: apply.c:3941
+#: apply.c:3945
#, c-format
msgid "new mode (%o) of %s does not match old mode (%o)"
msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配"
-#: apply.c:3946
+#: apply.c:3950
#, 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:3966
+#: apply.c:3970
#, c-format
msgid "affected file '%s' is beyond a symbolic link"
msgstr "受影响的文件 '%s' 位于符号链接中"
-#: apply.c:3970
+#: apply.c:3974
#, c-format
msgid "%s: patch does not apply"
msgstr "%s：补丁未应用"
-#: apply.c:3985
+#: apply.c:3989
#, c-format
msgid "Checking patch %s..."
msgstr "检查补丁 %s..."
-#: apply.c:4076
+#: apply.c:4080
#, c-format
msgid "sha1 information is lacking or useless for submodule %s"
msgstr "子模组 %s 的 sha1 信息缺失或无效"
-#: apply.c:4083
+#: apply.c:4087
#, c-format
msgid "mode change for %s, which is not in current HEAD"
msgstr "%s 的模式被改变，但它不在当前 HEAD 中"
-#: apply.c:4086
+#: apply.c:4090
#, c-format
msgid "sha1 information is lacking or useless (%s)."
msgstr "sha1 信息缺失或无效（%s）。"
-#: apply.c:4091 builtin/checkout.c:235 builtin/reset.c:138
+#: apply.c:4095 builtin/checkout.c:236 builtin/reset.c:148
#, c-format
msgid "make_cache_entry failed for path '%s'"
msgstr "对路径 '%s' 的 make_cache_entry 操作失败"
-#: apply.c:4095
+#: apply.c:4099
#, c-format
msgid "could not add %s to temporary index"
msgstr "不能在临时索引中添加 %s"
-#: apply.c:4105
+#: apply.c:4109
#, c-format
msgid "could not write temporary index to %s"
msgstr "不能把临时索引写入到 %s"
-#: apply.c:4243
+#: apply.c:4247
#, c-format
msgid "unable to remove %s from index"
msgstr "不能从索引中移除 %s"
-#: apply.c:4278
+#: apply.c:4282
#, c-format
msgid "corrupt patch for submodule %s"
msgstr "子模组 %s 损坏的补丁"
-#: apply.c:4284
+#: apply.c:4288
#, c-format
msgid "unable to stat newly created file '%s'"
msgstr "不能对新建文件 '%s' 调用 stat"
-#: apply.c:4292
+#: apply.c:4296
#, c-format
msgid "unable to create backing store for newly created file %s"
msgstr "不能为新建文件 %s 创建后端存储"
-#: apply.c:4298 apply.c:4442
+#: apply.c:4302 apply.c:4446
#, c-format
msgid "unable to add cache entry for %s"
msgstr "无法为 %s 添加缓存条目"
-#: apply.c:4339
+#: apply.c:4343
#, c-format
msgid "failed to write to '%s'"
msgstr "无法写入 '%s'"
-#: apply.c:4343
+#: apply.c:4347
#, c-format
msgid "closing file '%s'"
msgstr "关闭文件 '%s'"
-#: apply.c:4413
+#: apply.c:4417
#, c-format
msgid "unable to write file '%s' mode %o"
msgstr "不能写文件 '%s' 权限 %o"
-#: apply.c:4511
+#: apply.c:4515
#, c-format
msgid "Applied patch %s cleanly."
msgstr "成功应用补丁 %s。"
-#: apply.c:4519
+#: apply.c:4523
msgid "internal error"
msgstr "内部错误"
-#: apply.c:4522
+#: apply.c:4526
#, 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:4533
+#: apply.c:4537
#, c-format
msgid "truncating .rej filename to %.*s.rej"
msgstr "截短 .rej 文件名为 %.*s.rej"
-#: apply.c:4541 builtin/fetch.c:738 builtin/fetch.c:988
+#: apply.c:4545 builtin/fetch.c:761 builtin/fetch.c:1011
#, c-format
msgid "cannot open %s"
msgstr "不能打开 %s"
-#: apply.c:4555
+#: apply.c:4559
#, c-format
msgid "Hunk #%d applied cleanly."
msgstr "第 #%d 个片段成功应用。"
-#: apply.c:4559
+#: apply.c:4563
#, c-format
msgid "Rejected hunk #%d."
msgstr "拒绝第 #%d 个片段。"
-#: apply.c:4669
+#: apply.c:4673
#, c-format
msgid "Skipped patch '%s'."
msgstr "略过补丁 '%s'。"
-#: apply.c:4677
+#: apply.c:4681
msgid "unrecognized input"
msgstr "未能识别的输入"
-#: apply.c:4696
+#: apply.c:4700
msgid "unable to read index file"
msgstr "无法读取索引文件"
-#: apply.c:4833
+#: apply.c:4837
#, c-format
msgid "can't open patch '%s': %s"
msgstr "不能打开补丁 '%s'：%s"
-#: apply.c:4860
+#: apply.c:4864
#, c-format
msgid "squelched %d whitespace error"
msgid_plural "squelched %d whitespace errors"
msgstr[0] "抑制下仍有 %d 个空白字符误用"
msgstr[1] "抑制下仍有 %d 个空白字符误用"
-#: apply.c:4866 apply.c:4881
+#: apply.c:4870 apply.c:4885
#, c-format
msgid "%d line adds whitespace errors."
msgid_plural "%d lines add whitespace errors."
msgstr[0] "%d 行新增了空白字符误用。"
msgstr[1] "%d 行新增了空白字符误用。"
-#: apply.c:4874
+#: apply.c:4878
#, 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:4890 builtin/add.c:513 builtin/mv.c:299 builtin/rm.c:391
+#: apply.c:4894 builtin/add.c:539 builtin/mv.c:298 builtin/rm.c:390
msgid "Unable to write new index file"
msgstr "无法写入新索引文件"
-#: apply.c:4921 apply.c:4924 builtin/am.c:2257 builtin/am.c:2260
-#: builtin/clone.c:115 builtin/fetch.c:93 builtin/pull.c:187
-#: builtin/submodule--helper.c:304 builtin/submodule--helper.c:629
-#: builtin/submodule--helper.c:632 builtin/submodule--helper.c:973
-#: builtin/submodule--helper.c:976 builtin/submodule--helper.c:1161
+#: apply.c:4921 apply.c:4924 builtin/am.c:2220 builtin/am.c:2223
+#: builtin/clone.c:116 builtin/fetch.c:116 builtin/pull.c:193
+#: builtin/submodule--helper.c:369 builtin/submodule--helper.c:860
+#: builtin/submodule--helper.c:863 builtin/submodule--helper.c:1230
+#: builtin/submodule--helper.c:1233 builtin/submodule--helper.c:1450
#: git-add--interactive.perl:197
msgid "path"
msgstr "路径"
@@ -732,7 +734,7 @@
msgid "apply changes matching the given path"
msgstr "应用与给出路径向匹配的变更"
-#: apply.c:4927 builtin/am.c:2266
+#: apply.c:4927 builtin/am.c:2229
msgid "num"
msgstr "数字"
@@ -784,7 +786,7 @@
msgid "build a temporary index based on embedded index information"
msgstr "创建一个临时索引基于嵌入的索引信息"
-#: apply.c:4956 builtin/checkout-index.c:170 builtin/ls-files.c:515
+#: apply.c:4956 builtin/checkout-index.c:168 builtin/ls-files.c:515
msgid "paths are separated with NUL character"
msgstr "路径以 NUL 字符分隔"
@@ -792,7 +794,9 @@
msgid "ensure at least <n> lines of context match"
msgstr "确保至少匹配 <n> 行上下文"
-#: apply.c:4959 builtin/am.c:2245
+#: apply.c:4959 builtin/am.c:2208 builtin/interpret-trailers.c:95
+#: builtin/interpret-trailers.c:97 builtin/interpret-trailers.c:99
+#: builtin/pack-objects.c:3009
msgid "action"
msgstr "动作"
@@ -820,9 +824,9 @@
msgid "allow overlapping hunks"
msgstr "允许重叠的补丁片段"
-#: apply.c:4976 builtin/add.c:270 builtin/check-ignore.c:21
-#: builtin/commit.c:1340 builtin/count-objects.c:95 builtin/fsck.c:651
-#: builtin/log.c:1877 builtin/mv.c:123 builtin/read-tree.c:125
+#: apply.c:4976 builtin/add.c:292 builtin/check-ignore.c:21
+#: builtin/commit.c:1361 builtin/count-objects.c:96 builtin/fsck.c:640
+#: builtin/log.c:1896 builtin/mv.c:123 builtin/read-tree.c:125
msgid "be verbose"
msgstr "冗长输出"
@@ -834,7 +838,7 @@
msgid "do not trust the line counts in the hunk headers"
msgstr "不信任补丁片段的头信息中的行号"
-#: apply.c:4983 builtin/am.c:2254
+#: apply.c:4983 builtin/am.c:2217
msgid "root"
msgstr "根目录"
@@ -860,108 +864,108 @@
msgid "git archive --remote <repo> [--exec <cmd>] --list"
msgstr "git archive --remote <仓库> [--exec <命令>] --list"
-#: archive.c:333 builtin/add.c:154 builtin/add.c:492 builtin/rm.c:300
+#: archive.c:351 builtin/add.c:176 builtin/add.c:515 builtin/rm.c:299
#, c-format
msgid "pathspec '%s' did not match any files"
msgstr "路径规格 '%s' 未匹配任何文件"
-#: archive.c:418
+#: archive.c:436
msgid "fmt"
msgstr "格式"
-#: archive.c:418
+#: archive.c:436
msgid "archive format"
msgstr "归档格式"
-#: archive.c:419 builtin/log.c:1446
+#: archive.c:437 builtin/log.c:1459
msgid "prefix"
msgstr "前缀"
-#: archive.c:420
+#: archive.c:438
msgid "prepend prefix to each pathname in the archive"
msgstr "为归档中每个路径名加上前缀"
-#: archive.c:421 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:61
-#: builtin/fast-export.c:989 builtin/fast-export.c:991 builtin/grep.c:1080
-#: builtin/hash-object.c:102 builtin/ls-files.c:549 builtin/ls-files.c:552
-#: builtin/notes.c:404 builtin/notes.c:567 builtin/read-tree.c:120
+#: archive.c:439 builtin/blame.c:693 builtin/blame.c:694 builtin/config.c:62
+#: builtin/fast-export.c:1005 builtin/fast-export.c:1007 builtin/grep.c:861
+#: builtin/hash-object.c:102 builtin/ls-files.c:551 builtin/ls-files.c:554
+#: builtin/notes.c:405 builtin/notes.c:568 builtin/read-tree.c:120
#: parse-options.h:153
msgid "file"
msgstr "文件"
-#: archive.c:422 builtin/archive.c:89
+#: archive.c:440 builtin/archive.c:89
msgid "write the archive to this file"
msgstr "归档写入此文件"
-#: archive.c:424
+#: archive.c:442
msgid "read .gitattributes in working directory"
msgstr "读取工作区中的 .gitattributes"
-#: archive.c:425
+#: archive.c:443
msgid "report archived files on stderr"
msgstr "在标准错误上报告归档文件"
-#: archive.c:426
+#: archive.c:444
msgid "store only"
msgstr "只存储"
-#: archive.c:427
+#: archive.c:445
msgid "compress faster"
msgstr "压缩速度更快"
-#: archive.c:435
+#: archive.c:453
msgid "compress better"
msgstr "压缩效果更好"
-#: archive.c:438
+#: archive.c:456
msgid "list supported archive formats"
msgstr "列出支持的归档格式"
-#: archive.c:440 builtin/archive.c:90 builtin/clone.c:105 builtin/clone.c:108
-#: builtin/submodule--helper.c:641 builtin/submodule--helper.c:982
+#: archive.c:458 builtin/archive.c:90 builtin/clone.c:106 builtin/clone.c:109
+#: builtin/submodule--helper.c:872 builtin/submodule--helper.c:1239
msgid "repo"
msgstr "仓库"
-#: archive.c:441 builtin/archive.c:91
+#: archive.c:459 builtin/archive.c:91
msgid "retrieve the archive from remote repository <repo>"
msgstr "从远程仓库（<仓库>）提取归档文件"
-#: archive.c:442 builtin/archive.c:92 builtin/notes.c:488
+#: archive.c:460 builtin/archive.c:92 builtin/notes.c:489
msgid "command"
msgstr "命令"
-#: archive.c:443 builtin/archive.c:93
+#: archive.c:461 builtin/archive.c:93
msgid "path to the remote git-upload-archive command"
msgstr "远程 git-upload-archive 命令的路径"
-#: archive.c:450
+#: archive.c:468
msgid "Unexpected option --remote"
msgstr "未知参数 --remote"
-#: archive.c:452
+#: archive.c:470
msgid "Option --exec can only be used together with --remote"
msgstr "选项 --exec 只能和 --remote 同时使用"
-#: archive.c:454
+#: archive.c:472
msgid "Unexpected option --output"
msgstr "未知参数 --output"
-#: archive.c:476
+#: archive.c:494
#, c-format
msgid "Unknown archive format '%s'"
msgstr "未知归档格式 '%s'"
-#: archive.c:483
+#: archive.c:501
#, c-format
msgid "Argument not supported for format '%s': -%d"
msgstr "参数不支持此格式 '%s'：-%d"
-#: attr.c:214
+#: attr.c:218
#, c-format
msgid "%.*s is not a valid attribute name"
msgstr "%.*s 不是一个有效的属性名"
-#: attr.c:410
+#: attr.c:415
msgid ""
"Negative patterns are ignored in git attributes\n"
"Use '\\!' for literal leading exclamation."
@@ -969,22 +973,22 @@
"负值模版在 git attributes 中被忽略\n"
"当字符串确实要以感叹号开始时，使用 '\\!'。"
-#: bisect.c:447
+#: bisect.c:458
#, c-format
msgid "Badly quoted content in file '%s': %s"
msgstr "文件 '%s' 包含错误的引用格式：%s"
-#: bisect.c:655
+#: bisect.c:666
#, c-format
msgid "We cannot bisect more!\n"
msgstr "我们无法进行更多的二分查找！\n"
-#: bisect.c:708
+#: bisect.c:720
#, c-format
msgid "Not a valid commit name %s"
msgstr "不是一个有效的提交名 %s"
-#: bisect.c:732
+#: bisect.c:744
#, c-format
msgid ""
"The merge base %s is bad.\n"
@@ -993,7 +997,7 @@
"合并基线 %s 是坏的。\n"
"这意味着介于 %s 和 [%s] 之间的 bug 已经被修复。\n"
-#: bisect.c:737
+#: bisect.c:749
#, c-format
msgid ""
"The merge base %s is new.\n"
@@ -1002,7 +1006,7 @@
"合并基线 %s 是新的。\n"
"介于 %s 和 [%s] 之间的属性已经被修改。\n"
-#: bisect.c:742
+#: bisect.c:754
#, c-format
msgid ""
"The merge base %s is %s.\n"
@@ -1011,7 +1015,7 @@
"合并基线 %s 是 %s。\n"
"这意味着第一个 '%s' 提交位于 %s 和 [%s] 之间。\n"
-#: bisect.c:750
+#: bisect.c:762
#, c-format
msgid ""
"Some %s revs are not ancestors of the %s rev.\n"
@@ -1022,7 +1026,7 @@
"这种情况下 git 二分查找无法正常工作。\n"
"您可能弄错了 %s 和 %s 版本？\n"
-#: bisect.c:763
+#: bisect.c:775
#, c-format
msgid ""
"the merge base between %s and [%s] must be skipped.\n"
@@ -1033,36 +1037,36 @@
"所以我们无法确认第一个 %s 提交是否介于 %s 和 %s 之间。\n"
"我们仍旧继续。"
-#: bisect.c:798
+#: bisect.c:810
#, c-format
msgid "Bisecting: a merge base must be tested\n"
msgstr "二分查找中：合并基线必须是经过测试的\n"
-#: bisect.c:849
+#: bisect.c:862
#, c-format
msgid "a %s revision is needed"
msgstr "需要一个 %s 版本"
-#: bisect.c:866 builtin/notes.c:175 builtin/tag.c:256
+#: bisect.c:879 builtin/notes.c:175 builtin/tag.c:234
#, c-format
msgid "could not create file '%s'"
msgstr "不能创建文件 '%s'"
-#: bisect.c:917
+#: bisect.c:930
#, c-format
msgid "could not read file '%s'"
msgstr "不能读取文件 '%s'"
-#: bisect.c:947
+#: bisect.c:960
msgid "reading bisect refs failed"
msgstr "读取二分查找引用失败"
-#: bisect.c:967
+#: bisect.c:979
#, c-format
msgid "%s was both %s and %s\n"
msgstr "%s 同时为 %s 和 %s\n"
-#: bisect.c:975
+#: bisect.c:987
#, c-format
msgid ""
"No testable commit found.\n"
@@ -1071,7 +1075,7 @@
"没有发现可测试的提交。\n"
"可能您在运行时使用了错误的路径参数？\n"
-#: bisect.c:994
+#: bisect.c:1006
#, c-format
msgid "(roughly %d step)"
msgid_plural "(roughly %d steps)"
@@ -1081,7 +1085,7 @@
#. TRANSLATORS: the last %s will be replaced with "(roughly %d
#. steps)" translation.
#.
-#: bisect.c:1000
+#: bisect.c:1012
#, 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"
@@ -1100,10 +1104,10 @@
msgid "--reverse and --first-parent together require specified latest commit"
msgstr "--reverse 和 --first-parent 共用，需要指定最新的提交"
-#: blame.c:1797 bundle.c:164 ref-filter.c:1919 sequencer.c:1166
-#: sequencer.c:2328 builtin/commit.c:1058 builtin/log.c:356 builtin/log.c:907
-#: builtin/log.c:1357 builtin/log.c:1683 builtin/log.c:1926 builtin/merge.c:360
-#: builtin/shortlog.c:177
+#: blame.c:1797 bundle.c:169 ref-filter.c:1981 sequencer.c:1177
+#: sequencer.c:2370 builtin/commit.c:1066 builtin/log.c:364 builtin/log.c:918
+#: builtin/log.c:1368 builtin/log.c:1697 builtin/log.c:1945 builtin/merge.c:369
+#: builtin/shortlog.c:191
msgid "revision walk setup failed"
msgstr "版本遍历设置失败"
@@ -1141,43 +1145,43 @@
#: 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。"
+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。"
+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。"
+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 "Branch '%s' set up to track local branch '%s'."
+msgstr "分支 '%s' 设置为跟踪本地分支 '%s'。"
#: branch.c:104
#, c-format
-msgid "Branch %s set up to track remote ref %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪远程引用 %s。"
+msgid "Branch '%s' set up to track remote ref '%s' by rebasing."
+msgstr "分支 '%s' 设置为使用变基来跟踪远程引用 '%s'。"
#: branch.c:105
#, c-format
-msgid "Branch %s set up to track remote ref %s."
-msgstr "分支 %s 设置为跟踪远程引用 %s。"
+msgid "Branch '%s' set up to track remote ref '%s'."
+msgstr "分支 '%s' 设置为跟踪远程引用 '%s'。"
#: branch.c:109
#, c-format
-msgid "Branch %s set up to track local ref %s by rebasing."
-msgstr "分支 %s 设置为使用变基来跟踪本地引用 %s。"
+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。"
+msgid "Branch '%s' set up to track local ref '%s'."
+msgstr "分支 '%s' 设置为跟踪本地引用 '%s'。"
#: branch.c:119
msgid "Unable to write upstream branch configuration"
@@ -1188,31 +1192,31 @@
msgid "Not tracking: ambiguous information for ref %s"
msgstr "未跟踪：引用 %s 有歧义"
-#: branch.c:185
+#: branch.c:189
#, c-format
msgid "'%s' is not a valid branch name."
msgstr "'%s' 不是一个有效的分支名称。"
-#: branch.c:190
+#: branch.c:208
#, c-format
msgid "A branch named '%s' already exists."
msgstr "一个分支名 '%s' 已经存在。"
-#: branch.c:198
+#: branch.c:213
msgid "Cannot force update the current branch."
msgstr "无法强制更新当前分支。"
-#: branch.c:218
+#: branch.c:233
#, c-format
msgid "Cannot setup tracking information; starting point '%s' is not a branch."
msgstr "无法设置跟踪信息；起始点 '%s' 不是一个分支。"
-#: branch.c:220
+#: branch.c:235
#, c-format
msgid "the requested upstream branch '%s' does not exist"
msgstr "请求的上游分支 '%s' 不存在"
-#: branch.c:222
+#: branch.c:237
msgid ""
"\n"
"If you are planning on basing your work on an upstream\n"
@@ -1230,27 +1234,27 @@
"如果您正计划推送一个能与对应远程分支建立跟踪的新的本地分支，\n"
"您可能需要使用 \"git push -u\" 推送分支并配置和上游的关联。"
-#: branch.c:265
+#: branch.c:280
#, c-format
msgid "Not a valid object name: '%s'."
msgstr "不是一个有效的对象名：'%s'。"
-#: branch.c:285
+#: branch.c:300
#, c-format
msgid "Ambiguous object name: '%s'."
msgstr "歧义的对象名：'%s'。"
-#: branch.c:290
+#: branch.c:305
#, c-format
msgid "Not a valid branch point: '%s'."
msgstr "无效的分支点：'%s'。"
-#: branch.c:344
+#: branch.c:359
#, c-format
msgid "'%s' is already checked out at '%s'"
msgstr "'%s' 已经检出到 '%s'"
-#: branch.c:366
+#: branch.c:382
#, c-format
msgid "HEAD of working tree %s is not updated"
msgstr "工作区 %s 的 HEAD 指向没有被更新"
@@ -1265,7 +1269,8 @@
msgid "unrecognized header: %s%s (%d)"
msgstr "未能识别的包头：%s%s (%d)"
-#: bundle.c:88 sequencer.c:1344 sequencer.c:1770 builtin/commit.c:778
+#: bundle.c:88 sequencer.c:1360 sequencer.c:1807 sequencer.c:2637
+#: sequencer.c:2663 sequencer.c:2754 sequencer.c:2856 builtin/commit.c:782
#, c-format
msgid "could not open '%s'"
msgstr "不能打开 '%s'"
@@ -1274,56 +1279,56 @@
msgid "Repository lacks these prerequisite commits:"
msgstr "仓库中缺少这些必备的提交："
-#: bundle.c:186
+#: bundle.c:193
#, c-format
msgid "The bundle contains this ref:"
msgid_plural "The bundle contains these %d refs:"
msgstr[0] "这个包中含有这个引用："
msgstr[1] "这个包中含有 %d 个引用："
-#: bundle.c:193
+#: bundle.c:200
msgid "The bundle records a complete history."
msgstr "这个包记录一个完整历史。"
-#: bundle.c:195
+#: bundle.c:202
#, c-format
msgid "The bundle requires this ref:"
msgid_plural "The bundle requires these %d refs:"
msgstr[0] "这个包需要这个引用："
msgstr[1] "这个包需要 %d 个引用："
-#: bundle.c:254
+#: bundle.c:261
msgid "Could not spawn pack-objects"
msgstr "不能生成 pack-objects 进程"
-#: bundle.c:265
+#: bundle.c:272
msgid "pack-objects died"
msgstr "pack-objects 终止"
-#: bundle.c:307
+#: bundle.c:314
msgid "rev-list died"
msgstr "rev-list 终止"
-#: bundle.c:356
+#: bundle.c:363
#, c-format
msgid "ref '%s' is excluded by the rev-list options"
msgstr "引用 '%s' 被 rev-list 选项排除"
-#: bundle.c:446 builtin/log.c:173 builtin/log.c:1589 builtin/shortlog.c:282
+#: bundle.c:453 builtin/log.c:181 builtin/log.c:1604 builtin/shortlog.c:296
#, c-format
msgid "unrecognized argument: %s"
msgstr "未能识别的参数：%s"
-#: bundle.c:454
+#: bundle.c:461
msgid "Refusing to create empty bundle."
msgstr "不能创建空包。"
-#: bundle.c:466
+#: bundle.c:473
#, c-format
msgid "cannot create '%s'"
msgstr "不能创建 '%s'"
-#: bundle.c:494
+#: bundle.c:501
msgid "index-pack died"
msgstr "index-pack 终止"
@@ -1332,8 +1337,8 @@
msgid "invalid color value: %.*s"
msgstr "无效的颜色值：%.*s"
-#: commit.c:41 sequencer.c:1582 builtin/am.c:420 builtin/am.c:456
-#: builtin/am.c:1469 builtin/am.c:2107
+#: commit.c:41 sequencer.c:1614 builtin/am.c:421 builtin/am.c:465
+#: builtin/am.c:1434 builtin/am.c:2069
#, c-format
msgid "could not parse %s"
msgstr "不能解析 %s"
@@ -1343,7 +1348,7 @@
msgid "%s %s is not a commit!"
msgstr "%s %s 不是一个提交!"
-#: commit.c:1511
+#: commit.c:1524
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"
@@ -1353,7 +1358,7 @@
"您可以通过修补提交来改正提交说明，或者将配置变量 i18n.commitencoding\n"
"设置为您项目所用的字符编码。\n"
-#: compat/obstack.c:406 compat/obstack.c:408
+#: compat/obstack.c:405 compat/obstack.c:407
msgid "memory exhausted"
msgstr "内存耗尽"
@@ -1439,79 +1444,84 @@
msgid "failed to expand user dir in: '%s'"
msgstr "无法扩展 '%s' 中的用户目录"
-#: config.c:1084 config.c:1095
+#: config.c:998
+#, c-format
+msgid "'%s' for '%s' is not a valid timestamp"
+msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
+
+#: config.c:1094 config.c:1105
#, c-format
msgid "bad zlib compression level %d"
msgstr "错误的 zlib 压缩级别 %d"
-#: config.c:1212
+#: config.c:1222
#, c-format
msgid "invalid mode for object creation: %s"
msgstr "无效的对象创建模式：%s"
-#: config.c:1368
+#: config.c:1378
#, c-format
msgid "bad pack compression level %d"
msgstr "错误的打包压缩级别 %d"
-#: config.c:1564
+#: config.c:1574
msgid "unable to parse command-line config"
msgstr "无法解析命令行中的配置"
-#: config.c:1894
+#: config.c:1906
msgid "unknown error occurred while reading the configuration files"
msgstr "在读取配置文件时遇到未知错误"
-#: config.c:2064
+#: config.c:2093
#, c-format
msgid "Invalid %s: '%s'"
msgstr "无效 %s：'%s'"
-#: config.c:2085
+#: config.c:2136
#, c-format
msgid "unknown core.untrackedCache value '%s'; using 'keep' default value"
msgstr "未知的 core.untrackedCache 取值 '%s'，使用默认值 'keep'"
-#: config.c:2111
+#: config.c:2162
#, c-format
msgid "splitIndex.maxPercentChange value '%d' should be between 0 and 100"
msgstr "splitIndex.maxPercentChange 的取值 '%d' 应该介于 0 和 100 之间"
-#: config.c:2122
+#: config.c:2187
#, c-format
msgid "unable to parse '%s' from command-line config"
msgstr "无法解析命令行配置中的 '%s'"
-#: config.c:2124
+#: config.c:2189
#, c-format
msgid "bad config variable '%s' in file '%s' at line %d"
msgstr "在文件 '%2$s' 的第 %3$d 行发现错误的配置变量 '%1$s'"
-#: config.c:2183
+#: config.c:2248
#, c-format
msgid "%s has multiple values"
msgstr "%s 有多个取值"
-#: config.c:2517 config.c:2745
+#: config.c:2591 config.c:2808
#, c-format
msgid "fstat on %s failed"
msgstr "对 %s 调用 fstat 失败"
-#: config.c:2635
+#: config.c:2698
#, c-format
msgid "could not set '%s' to '%s'"
msgstr "不能设置 '%s' 为 '%s'"
-#: config.c:2637 builtin/remote.c:775
+#: config.c:2700 builtin/remote.c:776
#, c-format
msgid "could not unset '%s'"
msgstr "不能取消设置 '%s'"
-#: connect.c:50
+#: connect.c:52
msgid "The remote end hung up upon initial contact"
msgstr "远端在连接发起时即挂断"
-#: connect.c:52
+#: connect.c:54
msgid ""
"Could not read from remote repository.\n"
"\n"
@@ -1522,19 +1532,19 @@
"\n"
"请确认您有正确的访问权限并且仓库存在。"
-#: connected.c:63 builtin/fsck.c:191 builtin/prune.c:141
+#: connected.c:64 builtin/fsck.c:183 builtin/prune.c:141
msgid "Checking connectivity"
msgstr "检查连接中"
-#: connected.c:75
+#: connected.c:76
msgid "Could not run 'git rev-list'"
msgstr "不能执行 'git rev-list'"
-#: connected.c:95
+#: connected.c:96
msgid "failed write to rev-list"
msgstr "无法写入 rev-list"
-#: connected.c:102
+#: connected.c:103
msgid "failed to close rev-list's stdin"
msgstr "无法关闭 rev-list 的标准输入"
@@ -1639,33 +1649,40 @@
msgid "failed to read orderfile '%s'"
msgstr "无法读取排序文件 '%s'"
-#: diffcore-rename.c:536
+#: diffcore-rename.c:535
msgid "Performing inexact rename detection"
msgstr "正在进行非精确的重命名探测"
-#: diff.c:63
+#: diff.c:74
#, c-format
msgid "option '%s' requires a value"
msgstr "选项 '%s' 需要一个值"
# 译者：注意保持前导空格
-#: diff.c:125
+#: diff.c:152
#, c-format
msgid " Failed to parse dirstat cut-off percentage '%s'\n"
msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n"
# 译者：注意保持前导空格
-#: diff.c:130
+#: diff.c:157
#, c-format
msgid " Unknown dirstat parameter '%s'\n"
msgstr " 未知的 dirstat 参数 '%s'\n"
-#: diff.c:282
+#: diff.c:281
+msgid ""
+"color moved setting must be one of 'no', 'default', 'zebra', 'dimmed_zebra', "
+"'plain'"
+msgstr ""
+"代码移动的颜色设置必须是 'no'、'default'、'zebra'、'dimmed_zebra' 或 'plain'"
+
+#: diff.c:341
#, c-format
msgid "Unknown value for 'diff.submodule' config variable: '%s'"
msgstr "配置变量 'diff.submodule' 未知的取值：'%s'"
-#: diff.c:342
+#: diff.c:401
#, c-format
msgid ""
"Found errors in 'diff.dirstat' config variable:\n"
@@ -1674,20 +1691,20 @@
"发现配置变量 'diff.dirstat' 中的错误：\n"
"%s"
-#: diff.c:3101
+#: diff.c:3799
#, c-format
msgid "external diff died, stopping at %s"
msgstr "外部 diff 退出，停止在 %s"
-#: diff.c:3427
+#: diff.c:4127
msgid "--name-only, --name-status, --check and -s are mutually exclusive"
msgstr "--name-only、--name-status、--check 和 -s 是互斥的"
-#: diff.c:3517
+#: diff.c:4215
msgid "--follow requires exactly one pathspec"
msgstr "--follow 明确要求只跟一个路径规格"
-#: diff.c:3680
+#: diff.c:4381
#, c-format
msgid ""
"Failed to parse --dirstat/-X option parameter:\n"
@@ -1696,226 +1713,235 @@
"无法解析 --dirstat/-X 选项的参数：\n"
"%s"
-#: diff.c:3694
+#: diff.c:4395
#, c-format
msgid "Failed to parse --submodule option parameter: '%s'"
msgstr "无法解析 --submodule 选项的参数：'%s'"
-#: diff.c:4716
+#: diff.c:5446
msgid "inexact rename detection was skipped due to too many files."
msgstr "因为文件太多，略过不严格的重命名检查。"
-#: diff.c:4719
+#: diff.c:5449
msgid "only found copies from modified paths due to too many files."
msgstr "因为文件太多，只在修改的路径中查找拷贝。"
-#: diff.c:4722
+#: diff.c:5452
#, c-format
msgid ""
"you may want to set your %s variable to at least %d and retry the command."
msgstr "您可能想要将变量 %s 设置为至少 %d 并再次执行此命令。"
-#: dir.c:1948
+#: dir.c:2100
msgid "failed to get kernel name and information"
msgstr "无法获得内核名称和信息"
-#: dir.c:2067
+#: dir.c:2219
msgid "Untracked cache is disabled on this system or location."
msgstr "缓存未跟踪文件在本系统或位置中被禁用。"
-#: dir.c:2846 dir.c:2851
+#: dir.c:3002 dir.c:3007
#, c-format
msgid "could not create directories for %s"
msgstr "不能为 %s 创建目录"
-#: dir.c:2876
+#: dir.c:3032
#, c-format
msgid "could not migrate git directory from '%s' to '%s'"
msgstr "不能从 '%s' 迁移 git 目录到 '%s'"
-#: entry.c:281
+#: editor.c:61
+#, c-format
+msgid "hint: Waiting for your editor to close the file...%c"
+msgstr "提示：等待您的编辑器关闭文件...%c"
+
+#: entry.c:177
+msgid "Filtering content"
+msgstr "过滤内容"
+
+#: entry.c:435
#, c-format
msgid "could not stat file '%s'"
msgstr "不能对文件 '%s' 调用 stat"
-#: fetch-pack.c:251
+#: fetch-pack.c:252
msgid "git fetch-pack: expected shallow list"
msgstr "git fetch-pack：应为 shallow 列表"
-#: fetch-pack.c:263
+#: fetch-pack.c:264
msgid "git fetch-pack: expected ACK/NAK, got EOF"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 EOF"
-#: fetch-pack.c:282 builtin/archive.c:63
+#: fetch-pack.c:283 builtin/archive.c:63
#, c-format
msgid "remote error: %s"
msgstr "远程错误：%s"
-#: fetch-pack.c:283
+#: fetch-pack.c:284
#, c-format
msgid "git fetch-pack: expected ACK/NAK, got '%s'"
msgstr "git fetch-pack：应为 ACK/NAK，却得到 '%s'"
-#: fetch-pack.c:335
+#: fetch-pack.c:336
msgid "--stateless-rpc requires multi_ack_detailed"
msgstr "--stateless-rpc 需要 multi_ack_detailed"
-#: fetch-pack.c:421
+#: fetch-pack.c:422
#, c-format
msgid "invalid shallow line: %s"
msgstr "无效的 shallow 信息：%s"
-#: fetch-pack.c:427
+#: fetch-pack.c:428
#, c-format
msgid "invalid unshallow line: %s"
msgstr "无效的 unshallow 信息：%s"
-#: fetch-pack.c:429
+#: fetch-pack.c:430
#, c-format
msgid "object not found: %s"
msgstr "对象未找到：%s"
-#: fetch-pack.c:432
+#: fetch-pack.c:433
#, c-format
msgid "error in object: %s"
msgstr "对象中出错：%s"
-#: fetch-pack.c:434
+#: fetch-pack.c:435
#, c-format
msgid "no shallow found: %s"
msgstr "未发现 shallow：%s"
-#: fetch-pack.c:437
+#: fetch-pack.c:438
#, c-format
msgid "expected shallow/unshallow, got %s"
msgstr "应为 shallow/unshallow，却得到 %s"
-#: fetch-pack.c:476
+#: fetch-pack.c:477
#, c-format
msgid "got %s %d %s"
msgstr "得到 %s %d %s"
-#: fetch-pack.c:490
+#: fetch-pack.c:491
#, c-format
msgid "invalid commit %s"
msgstr "无效提交 %s"
-#: fetch-pack.c:523
+#: fetch-pack.c:524
msgid "giving up"
msgstr "放弃"
-#: fetch-pack.c:533 progress.c:237
+#: fetch-pack.c:534 progress.c:229
msgid "done"
msgstr "完成"
-#: fetch-pack.c:545
+#: fetch-pack.c:546
#, c-format
msgid "got %s (%d) %s"
msgstr "得到 %s (%d) %s"
-#: fetch-pack.c:591
+#: fetch-pack.c:592
#, c-format
msgid "Marking %s as complete"
msgstr "标记 %s 为完成"
-#: fetch-pack.c:775
+#: fetch-pack.c:777
#, c-format
msgid "already have %s (%s)"
msgstr "已经有 %s（%s）"
-#: fetch-pack.c:813
+#: fetch-pack.c:815
msgid "fetch-pack: unable to fork off sideband demultiplexer"
msgstr "fetch-pack：无法派生 sideband 多路输出"
-#: fetch-pack.c:821
+#: fetch-pack.c:823
msgid "protocol error: bad pack header"
msgstr "协议错误：坏的包头"
-#: fetch-pack.c:877
+#: fetch-pack.c:879
#, c-format
msgid "fetch-pack: unable to fork off %s"
msgstr "fetch-pack：无法派生进程 %s"
-#: fetch-pack.c:893
+#: fetch-pack.c:895
#, c-format
msgid "%s failed"
msgstr "%s 失败"
-#: fetch-pack.c:895
+#: fetch-pack.c:897
msgid "error in sideband demultiplexer"
msgstr "sideband 多路输出出错"
-#: fetch-pack.c:922
+#: fetch-pack.c:924
msgid "Server does not support shallow clients"
msgstr "服务器不支持 shalllow 客户端"
-#: fetch-pack.c:926
+#: fetch-pack.c:928
msgid "Server supports multi_ack_detailed"
msgstr "服务器支持 multi_ack_detailed"
-#: fetch-pack.c:929
+#: fetch-pack.c:931
msgid "Server supports no-done"
msgstr "服务器支持 no-done"
-#: fetch-pack.c:935
+#: fetch-pack.c:937
msgid "Server supports multi_ack"
msgstr "服务器支持 multi_ack"
-#: fetch-pack.c:939
+#: fetch-pack.c:941
msgid "Server supports side-band-64k"
msgstr "服务器支持 side-band-64k"
-#: fetch-pack.c:943
+#: fetch-pack.c:945
msgid "Server supports side-band"
msgstr "服务器支持 side-band"
-#: fetch-pack.c:947
+#: fetch-pack.c:949
msgid "Server supports allow-tip-sha1-in-want"
msgstr "服务器支持 allow-tip-sha1-in-want"
-#: fetch-pack.c:951
+#: fetch-pack.c:953
msgid "Server supports allow-reachable-sha1-in-want"
msgstr "服务器支持 allow-reachable-sha1-in-want"
-#: fetch-pack.c:961
+#: fetch-pack.c:963
msgid "Server supports ofs-delta"
msgstr "服务器支持 ofs-delta"
-#: fetch-pack.c:968
+#: fetch-pack.c:970
#, c-format
msgid "Server version is %.*s"
msgstr "服务器版本 %.*s"
-#: fetch-pack.c:974
+#: fetch-pack.c:976
msgid "Server does not support --shallow-since"
msgstr "服务器不支持 --shallow-since"
-#: fetch-pack.c:978
+#: fetch-pack.c:980
msgid "Server does not support --shallow-exclude"
msgstr "服务器不支持 --shallow-exclude"
-#: fetch-pack.c:980
+#: fetch-pack.c:982
msgid "Server does not support --deepen"
msgstr "服务器不支持 --deepen"
-#: fetch-pack.c:991
+#: fetch-pack.c:993
msgid "no common commits"
msgstr "没有共同的提交"
-#: fetch-pack.c:1003
+#: fetch-pack.c:1005
msgid "git fetch-pack: fetch failed."
msgstr "git fetch-pack：获取失败。"
-#: fetch-pack.c:1165
+#: fetch-pack.c:1167
msgid "no matching remote head"
msgstr "没有匹配的远程分支"
-#: fetch-pack.c:1187
+#: fetch-pack.c:1189
#, c-format
msgid "no such remote ref %s"
msgstr "没有这样的远程引用 %s"
-#: fetch-pack.c:1190
+#: fetch-pack.c:1192
#, c-format
msgid "Server does not allow request for unadvertised object %s"
msgstr "服务器不允许请求未公开的对象 %s"
@@ -1928,7 +1954,7 @@
msgid "could not create temporary file"
msgstr "不能创建临时文件"
-#: gpg-interface.c:213
+#: gpg-interface.c:214
#, c-format
msgid "failed writing detached signature to '%s'"
msgstr "无法将分离式签名写入 '%s'"
@@ -1938,17 +1964,17 @@
msgid "ignore invalid color '%.*s' in log.graphColors"
msgstr "忽略 log.graphColors 中无效的颜色 '%.*s'"
-#: grep.c:1981
+#: grep.c:2017
#, c-format
msgid "'%s': unable to read %s"
msgstr "'%s'：无法读取 %s"
-#: grep.c:1998 builtin/clone.c:403 builtin/diff.c:81 builtin/rm.c:134
+#: grep.c:2034 builtin/clone.c:404 builtin/diff.c:81 builtin/rm.c:134
#, c-format
msgid "failed to stat '%s'"
msgstr "对 '%s' 调用 stat 失败"
-#: grep.c:2009
+#: grep.c:2045
#, c-format
msgid "'%s': short read"
msgstr "'%s'：读取不完整"
@@ -2006,19 +2032,23 @@
msgid_plural ""
"\n"
"The most similar commands are"
-msgstr[0] "\n最相似的命令是"
-msgstr[1] "\n最相似的命令是"
+msgstr[0] ""
+"\n"
+"最相似的命令是"
+msgstr[1] ""
+"\n"
+"最相似的命令是"
#: help.c:395
msgid "git version [<options>]"
msgstr "git version [<选项>]"
-#: help.c:456
+#: help.c:462
#, c-format
msgid "%s: %s - %s"
msgstr "%s：%s - %s"
-#: help.c:460
+#: help.c:466
msgid ""
"\n"
"Did you mean this?"
@@ -2085,12 +2115,21 @@
msgid "name consists only of disallowed characters: %s"
msgstr "姓名中仅包含禁用字符：%s"
-#: ident.c:416 builtin/commit.c:612
+#: ident.c:416 builtin/commit.c:616
#, c-format
msgid "invalid date format: %s"
msgstr "无效的日期格式：%s"
-#: lockfile.c:152
+#: list-objects-filter-options.c:30
+msgid "multiple object filter types cannot be combined"
+msgstr "不能混用多种对象过滤类型"
+
+#: list-objects-filter-options.c:41 list-objects-filter-options.c:68
+#, c-format
+msgid "invalid filter-spec expression '%s'"
+msgstr "无效的 filter-spec 表达式 '%s'"
+
+#: lockfile.c:151
#, c-format
msgid ""
"Unable to create '%s.lock': %s.\n"
@@ -2108,87 +2147,87 @@
"可能之前有一个 git 进程在这个仓库中异常退出：\n"
"手动删除这个文件再继续。"
-#: lockfile.c:160
+#: lockfile.c:159
#, c-format
msgid "Unable to create '%s.lock': %s"
msgstr "不能创建 '%s.lock'：%s"
-#: merge.c:41
+#: merge.c:74
msgid "failed to read the cache"
msgstr "无法读取缓存"
-#: merge.c:96 builtin/am.c:1980 builtin/am.c:2015 builtin/checkout.c:377
-#: builtin/checkout.c:591 builtin/clone.c:753
+#: merge.c:128 builtin/am.c:1943 builtin/am.c:1977 builtin/checkout.c:379
+#: builtin/checkout.c:600 builtin/clone.c:754
msgid "unable to write new index file"
msgstr "无法写新的索引文件"
-#: merge-recursive.c:210
+#: merge-recursive.c:235
msgid "(bad commit)\n"
msgstr "（坏提交）\n"
-#: merge-recursive.c:232 merge-recursive.c:240
+#: merge-recursive.c:257 merge-recursive.c:265
#, c-format
msgid "addinfo_cache failed for path '%s'"
msgstr "为路径 '%s' addinfo_cache 失败"
-#: merge-recursive.c:304
+#: merge-recursive.c:329
msgid "error building trees"
msgstr "无法创建树"
-#: merge-recursive.c:728
+#: merge-recursive.c:752
#, c-format
msgid "failed to create path '%s'%s"
msgstr "无法创建路径 '%s'%s"
-#: merge-recursive.c:739
+#: merge-recursive.c:763
#, c-format
msgid "Removing %s to make room for subdirectory\n"
msgstr "删除 %s 以便为子目录留出空间\n"
-#: merge-recursive.c:753 merge-recursive.c:772
+#: merge-recursive.c:777 merge-recursive.c:796
msgid ": perhaps a D/F conflict?"
msgstr "：可能是一个目录/文件冲突？"
-#: merge-recursive.c:762
+#: merge-recursive.c:786
#, c-format
msgid "refusing to lose untracked file at '%s'"
msgstr "拒绝丢弃 '%s' 中的未跟踪文件"
-#: merge-recursive.c:804 builtin/cat-file.c:36
+#: merge-recursive.c:828 builtin/cat-file.c:37
#, c-format
msgid "cannot read object %s '%s'"
msgstr "不能读取对象 %s '%s'"
-#: merge-recursive.c:806
+#: merge-recursive.c:830
#, c-format
msgid "blob expected for %s '%s'"
msgstr "%s '%s' 应为数据对象"
-#: merge-recursive.c:830
+#: merge-recursive.c:854
#, c-format
msgid "failed to open '%s': %s"
msgstr "无法打开 '%s'：%s"
-#: merge-recursive.c:841
+#: merge-recursive.c:865
#, c-format
msgid "failed to symlink '%s': %s"
msgstr "无法创建符号链接 '%s'：%s"
-#: merge-recursive.c:846
+#: merge-recursive.c:870
#, c-format
msgid "do not know what to do with %06o %s '%s'"
msgstr "不知道如何处理 %06o %s '%s'"
-#: merge-recursive.c:986
+#: merge-recursive.c:1010
msgid "Failed to execute internal merge"
msgstr "无法执行内部合并"
-#: merge-recursive.c:990
+#: merge-recursive.c:1014
#, c-format
msgid "Unable to add %s to database"
msgstr "不能添加 %s 至对象库"
-#: merge-recursive.c:1093
+#: merge-recursive.c:1117
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2197,7 +2236,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本被保留。"
-#: merge-recursive.c:1098
+#: merge-recursive.c:1122
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2206,7 +2245,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本被保留。"
-#: merge-recursive.c:1105
+#: merge-recursive.c:1129
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s in %s. Version %s of %s left "
@@ -2215,7 +2254,7 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %5$s 中被 %4$s。%7$s 的 %6$s 版"
"本保留在 %8$s 中。"
-#: merge-recursive.c:1110
+#: merge-recursive.c:1134
#, c-format
msgid ""
"CONFLICT (%s/delete): %s deleted in %s and %s to %s in %s. Version %s of %s "
@@ -2224,20 +2263,20 @@
"冲突（%1$s/删除）：%2$s 在 %3$s 中被删除，在 %6$s 中的 %5$s 被 %4$s。%8$s 的 "
"%7$s 版本保留在 %9$s 中。"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "rename"
msgstr "重命名"
-#: merge-recursive.c:1144
+#: merge-recursive.c:1168
msgid "renamed"
msgstr "重命名"
-#: merge-recursive.c:1201
+#: merge-recursive.c:1225
#, c-format
msgid "%s is a directory in %s adding as %s instead"
msgstr "%s 是 %s 中的一个目录而以 %s 为名被添加"
-#: merge-recursive.c:1226
+#: merge-recursive.c:1250
#, c-format
msgid ""
"CONFLICT (rename/rename): Rename \"%s\"->\"%s\" in branch \"%s\" rename \"%s"
@@ -2246,139 +2285,144 @@
"冲突（重命名/重命名）：在分支 \"%3$s\" 中重命名 \"%1$s\"->\"%2$s\"，在分支 "
"\"%6$s\" 中重命名 \"%4$s\"->\"%5$s\"%7$s"
-#: merge-recursive.c:1231
+#: merge-recursive.c:1255
msgid " (left unresolved)"
msgstr "（留下未解决）"
-#: merge-recursive.c:1293
+#: merge-recursive.c:1317
#, 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:1326
+#: merge-recursive.c:1350
#, c-format
msgid "Renaming %s to %s and %s to %s instead"
msgstr "而是重命名 %s 至 %s，以及 %s 至 %s"
-#: merge-recursive.c:1529
+#: merge-recursive.c:1553
#, c-format
msgid "CONFLICT (rename/add): Rename %s->%s in %s. %s added in %s"
msgstr "冲突（重命名/添加）：在 %3$s 中重命名 %1$s->%2$s。在 %5$s 中添加 %4$s"
-#: merge-recursive.c:1544
+#: merge-recursive.c:1568
#, c-format
msgid "Adding merged %s"
msgstr "添加合并后的 %s"
-#: merge-recursive.c:1551 merge-recursive.c:1781
+#: merge-recursive.c:1575 merge-recursive.c:1805
#, c-format
msgid "Adding as %s instead"
msgstr "而是以 %s 为名添加"
-#: merge-recursive.c:1608
+#: merge-recursive.c:1632
#, c-format
msgid "cannot read object %s"
msgstr "不能读取对象 %s"
-#: merge-recursive.c:1611
+#: merge-recursive.c:1635
#, c-format
msgid "object %s is not a blob"
msgstr "对象 %s 不是一个数据对象"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modify"
msgstr "修改"
-#: merge-recursive.c:1680
+#: merge-recursive.c:1704
msgid "modified"
msgstr "修改"
-#: merge-recursive.c:1690
+#: merge-recursive.c:1714
msgid "content"
msgstr "内容"
-#: merge-recursive.c:1697
+#: merge-recursive.c:1721
msgid "add/add"
msgstr "添加/添加"
-#: merge-recursive.c:1733
+#: merge-recursive.c:1757
#, c-format
msgid "Skipped %s (merged same as existing)"
msgstr "略过 %s（已经做过相同合并）"
-#: merge-recursive.c:1747
+#: merge-recursive.c:1771
#, c-format
msgid "Auto-merging %s"
msgstr "自动合并 %s"
-#: merge-recursive.c:1751 git-submodule.sh:945
+#: merge-recursive.c:1775 git-submodule.sh:932
msgid "submodule"
msgstr "子模组"
-#: merge-recursive.c:1752
+#: merge-recursive.c:1776
#, c-format
msgid "CONFLICT (%s): Merge conflict in %s"
msgstr "冲突（%s）：合并冲突于 %s"
-#: merge-recursive.c:1846
+#: merge-recursive.c:1870
#, c-format
msgid "Removing %s"
msgstr "删除 %s"
-#: merge-recursive.c:1872
+#: merge-recursive.c:1896
msgid "file/directory"
msgstr "文件/目录"
-#: merge-recursive.c:1878
+#: merge-recursive.c:1902
msgid "directory/file"
msgstr "目录/文件"
-#: merge-recursive.c:1884
+#: merge-recursive.c:1909
#, 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:1893
+#: merge-recursive.c:1918
#, c-format
msgid "Adding %s"
msgstr "添加 %s"
-#: merge-recursive.c:1930
-msgid "Already up-to-date!"
+#: merge-recursive.c:1958
+#, c-format
+msgid "Dirty index: cannot merge (dirty: %s)"
+msgstr "脏索引：不能合并（脏文件：%s）"
+
+#: merge-recursive.c:1962
+msgid "Already up to date!"
msgstr "已经是最新的！"
-#: merge-recursive.c:1939
+#: merge-recursive.c:1971
#, c-format
msgid "merging of trees %s and %s failed"
msgstr "无法合并树 %s 和 %s"
-#: merge-recursive.c:2022
+#: merge-recursive.c:2068
msgid "Merging:"
msgstr "合并："
-#: merge-recursive.c:2035
+#: merge-recursive.c:2081
#, c-format
msgid "found %u common ancestor:"
msgid_plural "found %u common ancestors:"
msgstr[0] "发现 %u 个共同祖先："
msgstr[1] "发现 %u 个共同祖先："
-#: merge-recursive.c:2074
+#: merge-recursive.c:2120
msgid "merge returned no commit"
msgstr "合并未返回提交"
-#: merge-recursive.c:2137
+#: merge-recursive.c:2183
#, c-format
msgid "Could not parse object '%s'"
msgstr "不能解析对象 '%s'"
-#: merge-recursive.c:2151 builtin/merge.c:646 builtin/merge.c:793
+#: merge-recursive.c:2197 builtin/merge.c:656 builtin/merge.c:815
msgid "Unable to write index."
msgstr "不能写入索引。"
-#: notes-merge.c:273
+#: notes-merge.c:272
#, c-format
msgid ""
"You have not concluded your previous notes merge (%s exists).\n"
@@ -2389,7 +2433,7 @@
"在开始一个新的注释合并之前，请使用 'git notes merge --commit' 或者 'git "
"notes merge --abort' 来提交/终止前一次合并。"
-#: notes-merge.c:280
+#: notes-merge.c:279
#, c-format
msgid "You have not concluded your notes merge (%s exists)."
msgstr "您尚未结束注释合并（存在 %s）。"
@@ -2417,16 +2461,30 @@
msgid "Bad %s value: '%s'"
msgstr "坏的 %s 值：'%s'"
-#: object.c:240
+#: object.c:239
#, c-format
msgid "unable to parse object: %s"
msgstr "不能解析对象：%s"
+#: packfile.c:556
+msgid "offset before end of packfile (broken .idx?)"
+msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
+
+#: packfile.c:1683
+#, c-format
+msgid "offset before start of pack index for %s (corrupt index?)"
+msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
+
+#: packfile.c:1687
+#, c-format
+msgid "offset beyond end of pack index for %s (truncated index?)"
+msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
+
#: parse-options.c:573
msgid "..."
msgstr "..."
-#: parse-options.c:591
+#: parse-options.c:592
#, c-format
msgid "usage: %s"
msgstr "用法：%s"
@@ -2434,18 +2492,18 @@
#. TRANSLATORS: the colon here should align with the
#. one in "usage: %s" translation.
#.
-#: parse-options.c:597
+#: parse-options.c:598
#, c-format
msgid " or: %s"
msgstr " 或：%s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: parse-options.c:600
+#: parse-options.c:601
#, c-format
msgid " %s"
msgstr " %s"
-#: parse-options.c:634
+#: parse-options.c:640
msgid "-NUM"
msgstr "-数字"
@@ -2454,7 +2512,7 @@
msgid "malformed object name '%s'"
msgstr "非法的对象名 '%s'"
-#: path.c:890
+#: path.c:891
#, c-format
msgid "Could not make %s writable by group"
msgstr "不能设置 %s 为组可写"
@@ -2525,24 +2583,16 @@
msgid "%s: pathspec magic not supported by this command: %s"
msgstr "%s：路径规格神奇前缀不被此命令支持：%s"
-#: pathspec.c:575
-msgid ""
-"empty strings as pathspecs will be made invalid in upcoming releases. please "
-"use . instead if you meant to match all paths"
-msgstr ""
-"在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路径，\n"
-"请代之以 ."
-
-#: pathspec.c:599
+#: pathspec.c:592
#, c-format
msgid "pathspec '%s' is beyond a symbolic link"
msgstr "路径规格 '%s' 位于符号链接中"
-#: pretty.c:963
+#: pretty.c:962
msgid "unable to parse --pretty format"
msgstr "不能解析 --pretty 格式"
-#: read-cache.c:1443
+#: read-cache.c:1472
#, c-format
msgid ""
"index.version set, but the value is invalid.\n"
@@ -2551,7 +2601,7 @@
"设置了 index.version，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:1453
+#: read-cache.c:1482
#, c-format
msgid ""
"GIT_INDEX_VERSION set, but the value is invalid.\n"
@@ -2560,51 +2610,52 @@
"设置了 GIT_INDEX_VERSION，但是取值无效。\n"
"使用版本 %i"
-#: read-cache.c:2308 builtin/merge.c:1019
+#: read-cache.c:2370 sequencer.c:2731 wrapper.c:658 builtin/merge.c:1048
#, c-format
msgid "could not close '%s'"
msgstr "不能关闭 '%s'"
-#: read-cache.c:2383 sequencer.c:1353 sequencer.c:2054
+#: read-cache.c:2442 sequencer.c:1369 sequencer.c:2096
#, c-format
msgid "could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: read-cache.c:2396
+#: read-cache.c:2455
#, c-format
msgid "unable to open git dir: %s"
msgstr "不能打开 git 目录：%s"
-#: read-cache.c:2408
+#: read-cache.c:2467
#, c-format
msgid "unable to unlink: %s"
msgstr "无法删除：%s"
-#: refs.c:622
+#: refs.c:706
#, c-format
msgid "Could not open '%s' for writing"
msgstr "无法打开 '%s' 进行写入"
-#: refs.c:1769
+#: refs.c:1850
msgid "ref updates forbidden inside quarantine environment"
msgstr "在隔离环境中禁止更新引用"
-#: refs/files-backend.c:1664
-#, c-format
-msgid "could not delete reference %s: %s"
-msgstr "无法删除引用 %s：%s"
-
-#: refs/files-backend.c:1667
-#, c-format
-msgid "could not delete references: %s"
-msgstr "无法删除引用：%s"
-
-#: refs/files-backend.c:1676
+#: refs/files-backend.c:1189
#, c-format
msgid "could not remove reference %s"
msgstr "无法删除引用 %s"
-#: ref-filter.c:35 wt-status.c:1811
+#: refs/files-backend.c:1203 refs/packed-backend.c:1524
+#: refs/packed-backend.c:1534
+#, c-format
+msgid "could not delete reference %s: %s"
+msgstr "无法删除引用 %s：%s"
+
+#: refs/files-backend.c:1206 refs/packed-backend.c:1537
+#, c-format
+msgid "could not delete references: %s"
+msgstr "无法删除引用：%s"
+
+#: ref-filter.c:35 wt-status.c:1816
msgid "gone"
msgstr "丢失"
@@ -2623,157 +2674,157 @@
msgid "ahead %d, behind %d"
msgstr "领先 %d，落后 %d"
-#: ref-filter.c:105
+#: ref-filter.c:107
#, c-format
msgid "expected format: %%(color:<color>)"
-msgstr "期望的格式：%%(color:<color>)"
+msgstr "期望的格式：%%(color:<颜色>)"
-#: ref-filter.c:107
+#: ref-filter.c:109
#, c-format
msgid "unrecognized color: %%(color:%s)"
msgstr "未能识别的颜色：%%(color:%s)"
-#: ref-filter.c:121
+#: ref-filter.c:129
#, c-format
msgid "Integer value expected refname:lstrip=%s"
msgstr "期望整数值 refname:lstrip=%s"
-#: ref-filter.c:125
+#: ref-filter.c:133
#, c-format
msgid "Integer value expected refname:rstrip=%s"
msgstr "期望整数值 refname:rstrip=%s"
-#: ref-filter.c:127
+#: ref-filter.c:135
#, c-format
msgid "unrecognized %%(%s) argument: %s"
msgstr "未能识别的 %%(%s) 参数：%s"
-#: ref-filter.c:167
+#: ref-filter.c:184
#, c-format
msgid "%%(body) does not take arguments"
msgstr "%%(body) 不带参数"
-#: ref-filter.c:174
+#: ref-filter.c:191
#, c-format
msgid "%%(subject) does not take arguments"
msgstr "%%(subject) 不带参数"
-#: ref-filter.c:181
+#: ref-filter.c:209
#, c-format
-msgid "%%(trailers) does not take arguments"
-msgstr "%%(trailers) 不带参数"
+msgid "unknown %%(trailers) argument: %s"
+msgstr "未知的 %%(trailers) 参数：%s"
-#: ref-filter.c:200
+#: ref-filter.c:232
#, c-format
msgid "positive value expected contents:lines=%s"
msgstr "期望一个正数 contents:lines=%s"
-#: ref-filter.c:202
+#: ref-filter.c:234
#, c-format
msgid "unrecognized %%(contents) argument: %s"
msgstr "未能识别的 %%(contents) 参数：%s"
-#: ref-filter.c:215
+#: ref-filter.c:247
#, c-format
msgid "positive value expected objectname:short=%s"
msgstr "期望一个正数 objectname:short=%s"
-#: ref-filter.c:219
+#: ref-filter.c:251
#, c-format
msgid "unrecognized %%(objectname) argument: %s"
msgstr "未能识别的 %%(objectname) 参数：%s"
-#: ref-filter.c:246
+#: ref-filter.c:278
#, c-format
msgid "expected format: %%(align:<width>,<position>)"
-msgstr "期望的格式：%%(align:<width>,<position>)"
+msgstr "期望的格式：%%(align:<宽度>,<位置>)"
-#: ref-filter.c:258
+#: ref-filter.c:290
#, c-format
msgid "unrecognized position:%s"
msgstr "未能识别的位置：%s"
-#: ref-filter.c:262
+#: ref-filter.c:294
#, c-format
msgid "unrecognized width:%s"
msgstr "未能识别的宽度：%s"
-#: ref-filter.c:268
+#: ref-filter.c:300
#, c-format
msgid "unrecognized %%(align) argument: %s"
msgstr "未能识别的 %%(align) 参数：%s"
-#: ref-filter.c:272
+#: ref-filter.c:304
#, c-format
msgid "positive width expected with the %%(align) atom"
msgstr "元素 %%(align) 需要一个正数的宽度"
-#: ref-filter.c:287
+#: ref-filter.c:319
#, c-format
msgid "unrecognized %%(if) argument: %s"
msgstr "未能识别的 %%(if) 参数：%s"
-#: ref-filter.c:378
+#: ref-filter.c:409
#, c-format
msgid "malformed field name: %.*s"
msgstr "非法的字段名：%.*s"
-#: ref-filter.c:404
+#: ref-filter.c:435
#, c-format
msgid "unknown field name: %.*s"
msgstr "未知的字段名：%.*s"
-#: ref-filter.c:508
+#: ref-filter.c:547
#, c-format
msgid "format: %%(if) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(if) 元素而没有 %%(then) 元素"
-#: ref-filter.c:568
+#: ref-filter.c:607
#, c-format
msgid "format: %%(then) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(then) 元素而没有 %%(if) 元素"
-#: ref-filter.c:570
+#: ref-filter.c:609
#, c-format
msgid "format: %%(then) atom used more than once"
msgstr "格式：%%(then) 元素用了多次"
-#: ref-filter.c:572
+#: ref-filter.c:611
#, c-format
msgid "format: %%(then) atom used after %%(else)"
msgstr "格式：%%(then) 元素用在了 %%(else) 之后"
-#: ref-filter.c:598
+#: ref-filter.c:637
#, c-format
msgid "format: %%(else) atom used without an %%(if) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(if) 元素"
-#: ref-filter.c:600
+#: ref-filter.c:639
#, c-format
msgid "format: %%(else) atom used without a %%(then) atom"
msgstr "格式：使用了 %%(else) 元素而没有 %%(then) 元素"
-#: ref-filter.c:602
+#: ref-filter.c:641
#, c-format
msgid "format: %%(else) atom used more than once"
msgstr "格式：%%(else) 元素用了多次"
-#: ref-filter.c:615
+#: ref-filter.c:654
#, c-format
msgid "format: %%(end) atom used without corresponding atom"
msgstr "格式：使用了 %%(end) 元素却没有它的对应元素"
-#: ref-filter.c:670
+#: ref-filter.c:709
#, c-format
msgid "malformed format string %s"
msgstr "非法的格式化字符串 %s"
-#: ref-filter.c:1254
+#: ref-filter.c:1313
#, c-format
msgid "(no branch, rebasing %s)"
msgstr "（非分支，正变基 %s）"
-#: ref-filter.c:1257
+#: ref-filter.c:1316
#, c-format
msgid "(no branch, bisect started on %s)"
msgstr "（非分支，二分查找开始于 %s）"
@@ -2781,7 +2832,7 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached at " in wt-status.c
#.
-#: ref-filter.c:1265
+#: ref-filter.c:1324
#, c-format
msgid "(HEAD detached at %s)"
msgstr "（头指针分离于 %s）"
@@ -2789,137 +2840,137 @@
#. TRANSLATORS: make sure this matches "HEAD
#. detached from " in wt-status.c
#.
-#: ref-filter.c:1272
+#: ref-filter.c:1331
#, c-format
msgid "(HEAD detached from %s)"
msgstr "（头指针分离自 %s）"
-#: ref-filter.c:1276
+#: ref-filter.c:1335
msgid "(no branch)"
msgstr "（非分支）"
-#: ref-filter.c:1426 ref-filter.c:1457
+#: ref-filter.c:1488 ref-filter.c:1519
#, c-format
msgid "missing object %s for %s"
msgstr "缺失 %2$s 的对象 %1$s"
-#: ref-filter.c:1429 ref-filter.c:1460
+#: ref-filter.c:1491 ref-filter.c:1522
#, c-format
msgid "parse_object_buffer failed on %s for %s"
msgstr "parse_object_buffer 失败于 %2$s 的 %1$s"
-#: ref-filter.c:1760
+#: ref-filter.c:1822
#, c-format
msgid "malformed object at '%s'"
msgstr "非法的对象于 '%s'"
-#: ref-filter.c:1827
+#: ref-filter.c:1889
#, c-format
msgid "ignoring ref with broken name %s"
msgstr "忽略带有错误名称 %s 的引用"
-#: ref-filter.c:1832
+#: ref-filter.c:1894
#, c-format
msgid "ignoring broken ref %s"
msgstr "忽略损坏的引用 %s"
-#: ref-filter.c:2095
+#: ref-filter.c:2156
#, c-format
msgid "format: %%(end) atom missing"
msgstr "格式：缺少 %%(end) 元素"
-#: ref-filter.c:2176
+#: ref-filter.c:2250
#, c-format
msgid "malformed object name %s"
msgstr "非法的对象名 %s"
-#: remote.c:747
+#: remote.c:780
#, c-format
msgid "Cannot fetch both %s and %s to %s"
msgstr "不能同时获取 %s 和 %s 至 %s"
-#: remote.c:751
+#: remote.c:784
#, c-format
msgid "%s usually tracks %s, not %s"
msgstr "%s 通常跟踪 %s，而非 %s"
-#: remote.c:755
+#: remote.c:788
#, c-format
msgid "%s tracks both %s and %s"
msgstr "%s 同时跟踪 %s 和 %s"
-#: remote.c:763
+#: remote.c:796
msgid "Internal error"
msgstr "内部错误"
-#: remote.c:1680 remote.c:1782
+#: remote.c:1711 remote.c:1813
msgid "HEAD does not point to a branch"
msgstr "HEAD 没有指向一个分支"
-#: remote.c:1689
+#: remote.c:1720
#, c-format
msgid "no such branch: '%s'"
msgstr "没有此分支：'%s'"
-#: remote.c:1692
+#: remote.c:1723
#, c-format
msgid "no upstream configured for branch '%s'"
msgstr "尚未给分支 '%s' 设置上游"
-#: remote.c:1698
+#: remote.c:1729
#, c-format
msgid "upstream branch '%s' not stored as a remote-tracking branch"
msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支"
-#: remote.c:1713
+#: remote.c:1744
#, c-format
msgid "push destination '%s' on remote '%s' has no local tracking branch"
msgstr "推送目标 '%s' 至远程 '%s' 没有本地跟踪分支"
-#: remote.c:1725
+#: remote.c:1756
#, c-format
msgid "branch '%s' has no remote for pushing"
msgstr "分支 '%s' 没有设置要推送的远程服务器"
-#: remote.c:1736
+#: remote.c:1767
#, c-format
msgid "push refspecs for '%s' do not include '%s'"
msgstr "向 '%s' 推送引用规格未包含 '%s'"
-#: remote.c:1749
+#: remote.c:1780
msgid "push has no destination (push.default is 'nothing')"
msgstr "推送无目标（push.default 是 'nothing'）"
-#: remote.c:1771
+#: remote.c:1802
msgid "cannot resolve 'simple' push to a single destination"
msgstr "无法解析 'simple' 推送至一个单独的目标"
-#: remote.c:2076
+#: remote.c:2106
#, c-format
msgid "Your branch is based on '%s', but the upstream is gone.\n"
msgstr "您的分支基于 '%s'，但此上游分支已经不存在。\n"
-#: remote.c:2080
+#: remote.c:2110
msgid " (use \"git branch --unset-upstream\" to fixup)\n"
msgstr " （使用 \"git branch --unset-upstream\" 来修复）\n"
-#: remote.c:2083
+#: remote.c:2113
#, c-format
-msgid "Your branch is up-to-date with '%s'.\n"
+msgid "Your branch is up to date with '%s'.\n"
msgstr "您的分支与上游分支 '%s' 一致。\n"
-#: remote.c:2087
+#: remote.c:2117
#, 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:2093
+#: remote.c:2123
msgid " (use \"git push\" to publish your local commits)\n"
msgstr " （使用 \"git push\" 来发布您的本地提交）\n"
-#: remote.c:2096
+#: remote.c:2126
#, c-format
msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n"
msgid_plural ""
@@ -2928,11 +2979,11 @@
msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n"
# 译者：注意保持前导空格
-#: remote.c:2104
+#: remote.c:2134
msgid " (use \"git pull\" to update your local branch)\n"
msgstr " （使用 \"git pull\" 来更新您的本地分支）\n"
-#: remote.c:2107
+#: remote.c:2137
#, c-format
msgid ""
"Your branch and '%s' have diverged,\n"
@@ -2948,77 +2999,86 @@
"并且分别有 %d 和 %d 处不同的提交。\n"
# 译者：注意保持前导空格
-#: remote.c:2117
+#: remote.c:2147
msgid " (use \"git pull\" to merge the remote branch into yours)\n"
msgstr " （使用 \"git pull\" 来合并远程分支）\n"
-#: revision.c:2187
+#: revision.c:2268
msgid "your current branch appears to be broken"
msgstr "您的当前分支好像被损坏"
-#: revision.c:2190
+#: revision.c:2271
#, c-format
msgid "your current branch '%s' does not have any commits yet"
msgstr "您的当前分支 '%s' 尚无任何提交"
-#: revision.c:2384
+#: revision.c:2465
msgid "--first-parent is incompatible with --bisect"
msgstr "--first-parent 与 --bisect 不兼容"
-#: run-command.c:644
+#: run-command.c:645
msgid "open /dev/null failed"
msgstr "不能打开 /dev/null"
-#: send-pack.c:151
+#: run-command.c:1188
+#, c-format
+msgid ""
+"The '%s' hook was ignored because it's not set as executable.\n"
+"You can disable this warning with `git config advice.ignoredHook false`."
+msgstr ""
+"因为没有将钩子 '%s' 设置为可执行，钩子被忽略。您可以通过\n"
+"配置 `git config advice.ignoredHook false` 来关闭这条警告。"
+
+#: send-pack.c:141
#, c-format
msgid "unable to parse remote unpack status: %s"
msgstr "不能解析远程解包状态：%s"
-#: send-pack.c:153
+#: send-pack.c:143
#, c-format
msgid "remote unpack failed: %s"
msgstr "远程解包失败：%s"
-#: send-pack.c:316
+#: send-pack.c:306
msgid "failed to sign the push certificate"
msgstr "无法为推送证书签名"
-#: send-pack.c:429
+#: send-pack.c:419
msgid "the receiving end does not support --signed push"
msgstr "接收端不支持签名推送"
-#: send-pack.c:431
+#: send-pack.c:421
msgid ""
"not sending a push certificate since the receiving end does not support --"
"signed push"
msgstr "未发送推送证书，因为接收端不支持签名推送"
-#: send-pack.c:443
+#: send-pack.c:433
msgid "the receiving end does not support --atomic push"
msgstr "接收端不支持原子推送"
-#: send-pack.c:448
+#: send-pack.c:438
msgid "the receiving end does not support push options"
msgstr "接收端不支持推送选项"
-#: sequencer.c:216
+#: sequencer.c:218
msgid "revert"
msgstr "还原"
-#: sequencer.c:218
+#: sequencer.c:220
msgid "cherry-pick"
msgstr "拣选"
-#: sequencer.c:220
+#: sequencer.c:222
msgid "rebase -i"
msgstr "rebase -i"
-#: sequencer.c:222
+#: sequencer.c:224
#, c-format
msgid "Unknown action: %d"
msgstr "未知动作：%d"
-#: sequencer.c:279
+#: sequencer.c:281
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'"
@@ -3026,7 +3086,7 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"命令标记修正后的文件"
-#: sequencer.c:282
+#: sequencer.c:284
msgid ""
"after resolving the conflicts, mark the corrected paths\n"
"with 'git add <paths>' or 'git rm <paths>'\n"
@@ -3035,42 +3095,43 @@
"冲突解决完毕后，用 'git add <路径>' 或 'git rm <路径>'\n"
"对修正后的文件做标记，然后用 'git commit' 提交"
-#: sequencer.c:295 sequencer.c:1685
+#: sequencer.c:297 sequencer.c:1718
#, c-format
msgid "could not lock '%s'"
msgstr "不能锁定 '%s'"
-#: sequencer.c:298 sequencer.c:1563 sequencer.c:1690 sequencer.c:1704
+#: sequencer.c:300 sequencer.c:1595 sequencer.c:1723 sequencer.c:1737
+#: sequencer.c:2729 sequencer.c:2800 wrapper.c:656
#, c-format
msgid "could not write to '%s'"
msgstr "不能写入 '%s'"
-#: sequencer.c:302
+#: sequencer.c:304
#, c-format
msgid "could not write eol to '%s'"
msgstr "不能将换行符写入 '%s'"
-#: sequencer.c:306 sequencer.c:1568 sequencer.c:1692
+#: sequencer.c:308 sequencer.c:1600 sequencer.c:1725
#, c-format
msgid "failed to finalize '%s'."
msgstr "无法完成 '%s'。"
-#: sequencer.c:330 sequencer.c:817 sequencer.c:1589 builtin/am.c:258
-#: builtin/commit.c:750 builtin/merge.c:1017
+#: sequencer.c:332 sequencer.c:829 sequencer.c:1621 builtin/am.c:259
+#: builtin/commit.c:754 builtin/merge.c:1046
#, c-format
msgid "could not read '%s'"
msgstr "不能读取 '%s'"
-#: sequencer.c:356
+#: sequencer.c:358
#, c-format
msgid "your local changes would be overwritten by %s."
msgstr "您的本地修改将被%s覆盖。"
-#: sequencer.c:360
+#: sequencer.c:362
msgid "commit your changes or stash them to proceed."
msgstr "提交您的修改或贮藏后再继续。"
-#: sequencer.c:389
+#: sequencer.c:391
#, c-format
msgid "%s: fast-forward"
msgstr "%s：快进"
@@ -3078,20 +3139,20 @@
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
#. "rebase -i".
#.
-#: sequencer.c:472
+#: sequencer.c:477
#, c-format
msgid "%s: Unable to write new index file"
msgstr "%s：无法写入新索引文件"
-#: sequencer.c:491
-msgid "could not resolve HEAD commit\n"
-msgstr "不能解析 HEAD 提交\n"
+#: sequencer.c:496
+msgid "could not resolve HEAD commit"
+msgstr "不能解析 HEAD 提交"
-#: sequencer.c:511
-msgid "unable to update cache tree\n"
-msgstr "不能更新缓存树\n"
+#: sequencer.c:516
+msgid "unable to update cache tree"
+msgstr "不能更新缓存树"
-#: sequencer.c:595
+#: sequencer.c:600
#, c-format
msgid ""
"you have staged changes in your working tree\n"
@@ -3120,17 +3181,17 @@
"\n"
" git rebase --continue\n"
-#: sequencer.c:697
-#, c-format
-msgid "could not parse commit %s\n"
-msgstr "不能解析提交 %s\n"
-
#: sequencer.c:702
#, c-format
-msgid "could not parse parent commit %s\n"
-msgstr "不能解析父提交 %s\n"
+msgid "could not parse commit %s"
+msgstr "不能解析提交 %s"
-#: sequencer.c:824
+#: sequencer.c:707
+#, c-format
+msgid "could not parse parent commit %s"
+msgstr "不能解析父提交 %s"
+
+#: sequencer.c:836
#, c-format
msgid ""
"unexpected 1st line of squash message:\n"
@@ -3141,7 +3202,7 @@
"\n"
"\t%.*s"
-#: sequencer.c:830
+#: sequencer.c:842
#, c-format
msgid ""
"invalid 1st line of squash message:\n"
@@ -3152,230 +3213,241 @@
"\n"
"\t%.*s"
-#: sequencer.c:836 sequencer.c:861
+#: sequencer.c:848 sequencer.c:873
#, c-format
msgid "This is a combination of %d commits."
msgstr "这是一个 %d 个提交的组合。"
-#: sequencer.c:845
+#: sequencer.c:857 sequencer.c:2748
msgid "need a HEAD to fixup"
msgstr "需要一个 HEAD 来修复"
-#: sequencer.c:847
+#: sequencer.c:859
msgid "could not read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:849
+#: sequencer.c:861
msgid "could not read HEAD's commit message"
msgstr "不能读取 HEAD 的提交说明"
-#: sequencer.c:855
+#: sequencer.c:867
#, c-format
msgid "cannot write '%s'"
msgstr "不能写 '%s'"
-#: sequencer.c:864 git-rebase--interactive.sh:445
+#: sequencer.c:876 git-rebase--interactive.sh:446
msgid "This is the 1st commit message:"
msgstr "这是第一个提交说明："
-#: sequencer.c:872
+#: sequencer.c:884
#, c-format
msgid "could not read commit message of %s"
msgstr "不能读取 %s 的提交说明"
-#: sequencer.c:879
+#: sequencer.c:891
#, c-format
msgid "This is the commit message #%d:"
msgstr "这是提交说明 #%d："
-#: sequencer.c:884
+#: sequencer.c:896
#, c-format
msgid "The commit message #%d will be skipped:"
msgstr "提交说明 #%d 将被跳过："
-#: sequencer.c:889
+#: sequencer.c:901
#, c-format
msgid "unknown command: %d"
msgstr "未知命令：%d"
-#: sequencer.c:955
+#: sequencer.c:967
msgid "your index file is unmerged."
msgstr "您的索引文件未完成合并。"
-#: sequencer.c:973
+#: sequencer.c:986
#, c-format
msgid "commit %s is a merge but no -m option was given."
msgstr "提交 %s 是一个合并提交但未提供 -m 选项。"
-#: sequencer.c:981
+#: sequencer.c:994
#, c-format
msgid "commit %s does not have parent %d"
msgstr "提交 %s 没有第 %d 个父提交"
-#: sequencer.c:985
+#: sequencer.c:998
#, c-format
msgid "mainline was specified but commit %s is not a merge."
msgstr "指定了主线，但是提交 %s 不是一个合并提交。"
-#: sequencer.c:991
+#: sequencer.c:1004
#, 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:1012
+#: sequencer.c:1023
#, c-format
msgid "%s: cannot parse parent commit %s"
msgstr "%s：不能解析父提交 %s"
-#: sequencer.c:1075 sequencer.c:1830
+#: sequencer.c:1086 sequencer.c:1867
#, c-format
msgid "could not rename '%s' to '%s'"
msgstr "不能将 '%s' 重命名为 '%s'"
-#: sequencer.c:1126
+#: sequencer.c:1137
#, c-format
msgid "could not revert %s... %s"
msgstr "不能还原 %s... %s"
-#: sequencer.c:1127
+#: sequencer.c:1138
#, c-format
msgid "could not apply %s... %s"
msgstr "不能应用 %s... %s"
-#: sequencer.c:1169
+#: sequencer.c:1180
msgid "empty commit set passed"
msgstr "提供了空的提交集"
-#: sequencer.c:1179
+#: sequencer.c:1190
#, c-format
msgid "git %s: failed to read the index"
msgstr "git %s：无法读取索引"
-#: sequencer.c:1186
+#: sequencer.c:1196
#, c-format
msgid "git %s: failed to refresh the index"
msgstr "git %s：无法刷新索引"
-#: sequencer.c:1306
+#: sequencer.c:1270
+#, c-format
+msgid "%s does not accept arguments: '%s'"
+msgstr "%s 不接受参数：'%s'"
+
+#: sequencer.c:1279
+#, c-format
+msgid "missing arguments for %s"
+msgstr "缺少 %s 的参数"
+
+#: sequencer.c:1322
#, c-format
msgid "invalid line %d: %.*s"
msgstr "无效行 %d：%.*s"
-#: sequencer.c:1314
+#: sequencer.c:1330
#, c-format
msgid "cannot '%s' without a previous commit"
msgstr "没有父提交的情况下不能 '%s'"
-#: sequencer.c:1347
+#: sequencer.c:1363 sequencer.c:2525 sequencer.c:2560 sequencer.c:2642
+#: sequencer.c:2668 sequencer.c:2758 sequencer.c:2859
#, c-format
msgid "could not read '%s'."
msgstr "不能读取 '%s'。"
-#: sequencer.c:1359
+#: sequencer.c:1375
msgid "please fix this using 'git rebase --edit-todo'."
msgstr "请用 'git rebase --edit-todo' 来修改。"
-#: sequencer.c:1361
+#: sequencer.c:1377
#, c-format
msgid "unusable instruction sheet: '%s'"
msgstr "不可用的指令清单：'%s'"
-#: sequencer.c:1366
+#: sequencer.c:1382
msgid "no commits parsed."
msgstr "没有解析提交。"
-#: sequencer.c:1377
+#: sequencer.c:1393
msgid "cannot cherry-pick during a revert."
msgstr "不能在回退中执行拣选。"
-#: sequencer.c:1379
+#: sequencer.c:1395
msgid "cannot revert during a cherry-pick."
msgstr "不能在拣选中执行回退。"
-#: sequencer.c:1442
+#: sequencer.c:1462
#, c-format
msgid "invalid key: %s"
msgstr "无效键名：%s"
-#: sequencer.c:1445
+#: sequencer.c:1465
#, c-format
msgid "invalid value for %s: %s"
msgstr "%s 的值无效：%s"
-#: sequencer.c:1502
+#: sequencer.c:1531
#, c-format
msgid "malformed options sheet: '%s'"
msgstr "非法的选项清单：'%s'"
-#: sequencer.c:1540
+#: sequencer.c:1569
msgid "a cherry-pick or revert is already in progress"
msgstr "一个拣选或还原操作已在进行"
-#: sequencer.c:1541
+#: sequencer.c:1570
msgid "try \"git cherry-pick (--continue | --quit | --abort)\""
msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\""
-#: sequencer.c:1544
+#: sequencer.c:1573
#, c-format
msgid "could not create sequencer directory '%s'"
msgstr "不能创建序列目录 '%s'"
-#: sequencer.c:1558
+#: sequencer.c:1588
msgid "could not lock HEAD"
msgstr "不能锁定 HEAD"
-#: sequencer.c:1614 sequencer.c:2188
+#: sequencer.c:1646 sequencer.c:2230
msgid "no cherry-pick or revert in progress"
msgstr "拣选或还原操作并未进行"
-#: sequencer.c:1616
+#: sequencer.c:1648
msgid "cannot resolve HEAD"
msgstr "不能解析 HEAD"
-#: sequencer.c:1618 sequencer.c:1652
+#: sequencer.c:1650 sequencer.c:1685
msgid "cannot abort from a branch yet to be born"
msgstr "不能从尚未建立的分支终止"
-#: sequencer.c:1638 builtin/grep.c:929
+#: sequencer.c:1671 builtin/grep.c:713
#, c-format
msgid "cannot open '%s'"
msgstr "不能打开 '%s'"
-#: sequencer.c:1640
+#: sequencer.c:1673
#, c-format
msgid "cannot read '%s': %s"
msgstr "不能读取 '%s'：%s"
-#: sequencer.c:1641
+#: sequencer.c:1674
msgid "unexpected end of file"
msgstr "意外的文件结束"
-#: sequencer.c:1647
+#: sequencer.c:1680
#, c-format
msgid "stored pre-cherry-pick HEAD file '%s' is corrupt"
msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏"
-#: sequencer.c:1658
+#: sequencer.c:1691
msgid "You seem to have moved HEAD. Not rewinding, check your HEAD!"
msgstr "您好像移动了 HEAD。未能回退，检查您的 HEAD！"
-#: sequencer.c:1795 sequencer.c:2086
+#: sequencer.c:1832 sequencer.c:2128
msgid "cannot read HEAD"
msgstr "不能读取 HEAD"
-#: sequencer.c:1835 builtin/difftool.c:633
+#: sequencer.c:1872 builtin/difftool.c:639
#, c-format
msgid "could not copy '%s' to '%s'"
msgstr "不能拷贝 '%s' 至 '%s'"
-#: sequencer.c:1851
+#: sequencer.c:1891
msgid "could not read index"
msgstr "不能读取索引"
# 译者：注意保持前导空格
-#: sequencer.c:1856
+#: sequencer.c:1896
#, c-format
msgid ""
"execution failed: %s\n"
@@ -3390,11 +3462,11 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1862
+#: sequencer.c:1902
msgid "and made changes to the index and/or the working tree\n"
msgstr "并且修改索引和/或工作区\n"
-#: sequencer.c:1868
+#: sequencer.c:1908
#, c-format
msgid ""
"execution succeeded: %s\n"
@@ -3411,17 +3483,17 @@
" git rebase --continue\n"
"\n"
-#: sequencer.c:1925
+#: sequencer.c:1967
#, c-format
msgid "Applied autostash.\n"
msgstr "已应用 autostash。\n"
-#: sequencer.c:1937
+#: sequencer.c:1979
#, c-format
msgid "cannot store %s"
msgstr "不能存储 %s"
-#: sequencer.c:1940 git-rebase.sh:173
+#: sequencer.c:1982 git-rebase.sh:175
#, c-format
msgid ""
"Applying autostash resulted in conflicts.\n"
@@ -3432,57 +3504,57 @@
"您的修改安全地保存在贮藏区中。\n"
"您可以在任何时候运行 \"git stash pop\" 或 \"git stash drop\"。\n"
-#: sequencer.c:2022
+#: sequencer.c:2064
#, c-format
msgid "Stopped at %s... %.*s\n"
msgstr "停止在 %s... %.*s\n"
-#: sequencer.c:2064
+#: sequencer.c:2106
#, c-format
msgid "unknown command %d"
msgstr "未知命令 %d"
-#: sequencer.c:2094
+#: sequencer.c:2136
msgid "could not read orig-head"
msgstr "不能读取 orig-head"
-#: sequencer.c:2099
+#: sequencer.c:2141 sequencer.c:2745
msgid "could not read 'onto'"
msgstr "不能读取 'onto'"
-#: sequencer.c:2106
+#: sequencer.c:2148
#, c-format
msgid "could not update %s"
msgstr "不能更新 %s"
-#: sequencer.c:2113
+#: sequencer.c:2155
#, c-format
msgid "could not update HEAD to %s"
msgstr "不能更新 HEAD 为 %s"
-#: sequencer.c:2197
+#: sequencer.c:2239
msgid "cannot rebase: You have unstaged changes."
msgstr "不能变基：您有未暂存的变更。"
-#: sequencer.c:2202
+#: sequencer.c:2244
msgid "could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: sequencer.c:2211
+#: sequencer.c:2253
msgid "cannot amend non-existing commit"
msgstr "不能修补不存在的提交"
-#: sequencer.c:2213
+#: sequencer.c:2255
#, c-format
msgid "invalid file: '%s'"
msgstr "无效文件：'%s'"
-#: sequencer.c:2215
+#: sequencer.c:2257
#, c-format
msgid "invalid contents: '%s'"
msgstr "无效内容：'%s'"
-#: sequencer.c:2218
+#: sequencer.c:2260
msgid ""
"\n"
"You have uncommitted changes in your working tree. Please, commit them\n"
@@ -3491,24 +3563,93 @@
"\n"
"您的工作区中有未提交的变更。请先提交然后再次运行 'git rebase --continue'。"
-#: sequencer.c:2228
+#: sequencer.c:2270
msgid "could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: sequencer.c:2308
+#: sequencer.c:2350
#, c-format
msgid "%s: can't cherry-pick a %s"
msgstr "%s：不能拣选一个%s"
-#: sequencer.c:2312
+#: sequencer.c:2354
#, c-format
msgid "%s: bad revision"
msgstr "%s：错误的版本"
-#: sequencer.c:2345
+#: sequencer.c:2387
msgid "can't revert as initial commit"
msgstr "不能作为初始提交回退"
+#: sequencer.c:2492
+msgid "make_script: unhandled options"
+msgstr "make_script：有未能处理的选项"
+
+#: sequencer.c:2495
+msgid "make_script: error preparing revisions"
+msgstr "make_script：准备版本时错误"
+
+#: sequencer.c:2529 sequencer.c:2564
+#, c-format
+msgid "unusable todo list: '%s'"
+msgstr "不可用的待办列表：'%s'"
+
+#: sequencer.c:2615
+#, c-format
+msgid ""
+"unrecognized setting %s for option rebase.missingCommitsCheck. Ignoring."
+msgstr "选项 rebase.missingCommitsCheck 的值 %s 无法识别。已忽略。"
+
+#: sequencer.c:2695
+#, c-format
+msgid ""
+"Warning: some commits may have been dropped accidentally.\n"
+"Dropped commits (newer to older):\n"
+msgstr ""
+"警告：一些提交可能被意外丢弃。\n"
+"丢弃的提交（从新到旧）：\n"
+
+#: sequencer.c:2702
+#, c-format
+msgid ""
+"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
+"\n"
+"Use 'git config rebase.missingCommitsCheck' to change the level of "
+"warnings.\n"
+"The possible behaviours are: ignore, warn, error.\n"
+"\n"
+msgstr ""
+"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
+"\n"
+"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
+"可选值有：ignore、warn、error。\n"
+"\n"
+
+#: sequencer.c:2714
+#, c-format
+msgid ""
+"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
+"continue'.\n"
+"Or you can abort the rebase with 'git rebase --abort'.\n"
+msgstr ""
+"您可以用 'git rebase --edit-todo' 修正，然后执行 'git rebase --continue'。\n"
+"或者您可以用 'git rebase --abort' 终止变基。\n"
+
+#: sequencer.c:2727 sequencer.c:2794 wrapper.c:225 wrapper.c:395
+#: builtin/am.c:779
+#, c-format
+msgid "could not open '%s' for writing"
+msgstr "无法打开 '%s' 进行写入"
+
+#: sequencer.c:2775
+#, c-format
+msgid "could not parse commit '%s'"
+msgstr "不能解析提交 '%s'"
+
+#: sequencer.c:2897
+msgid "the script was already rearranged."
+msgstr "脚本已经重新编排。"
+
#: setup.c:171
#, c-format
msgid ""
@@ -3516,7 +3657,7 @@
"Use 'git <command> -- <path>...' to specify paths that do not exist locally."
msgstr ""
"%s：工作区中无此路径。\n"
-"使用命令 'git <command> -- <path>...' 来指定本地不存在的路径。"
+"使用命令 'git <命令> -- <路径>...' 来指定本地不存在的路径。"
#: setup.c:184
#, c-format
@@ -3527,7 +3668,7 @@
msgstr ""
"有歧义的参数 '%s'：未知的版本或路径不存在于工作区中。\n"
"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"'git <命令> [<版本>...] -- [<文件>...]'"
#: setup.c:252
#, c-format
@@ -3538,36 +3679,36 @@
msgstr ""
"有歧义的参数 '%s'：可同时是版本和文件\n"
"使用 '--' 来分隔版本和路径，例如：\n"
-"'git <command> [<revision>...] -- [<file>...]'"
+"'git <命令> [<版本>...] -- [<文件>...]'"
-#: setup.c:504
+#: setup.c:501
#, c-format
msgid "Expected git repo version <= %d, found %d"
msgstr "期望 git 仓库版本 <= %d，却得到 %d"
-#: setup.c:512
+#: setup.c:509
msgid "unknown repository extensions found:"
msgstr "发现未知的仓库扩展："
-#: setup.c:810
+#: setup.c:811
#, c-format
msgid "Not a git repository (or any of the parent directories): %s"
msgstr "不是一个 git 仓库（或者任何父目录）：%s"
-#: setup.c:812 builtin/index-pack.c:1652
+#: setup.c:813 builtin/index-pack.c:1653
msgid "Cannot come back to cwd"
msgstr "无法返回当前工作目录"
-#: setup.c:1050
+#: setup.c:1052
msgid "Unable to read current working directory"
msgstr "不能读取当前工作目录"
-#: setup.c:1062 setup.c:1068
+#: setup.c:1064 setup.c:1070
#, c-format
msgid "Cannot change to '%s'"
msgstr "不能切换到 '%s'"
-#: setup.c:1081
+#: setup.c:1083
#, c-format
msgid ""
"Not a git repository (or any parent up to mount point %s)\n"
@@ -3576,7 +3717,7 @@
"不是一个 git 仓库（或者向上递归至挂载点 %s 的任何祖先目录）\n"
"停止在文件系统边界（未设置 GIT_DISCOVERY_ACROSS_FILESYSTEM）。"
-#: setup.c:1173
+#: setup.c:1167
#, c-format
msgid ""
"Problem with core.sharedRepository filemode value (0%.3o).\n"
@@ -3585,55 +3726,41 @@
"参数 core.sharedRepository 的文件权限值有错（0%.3o）。\n"
"文件属主必须始终拥有读写权限。"
-#: sha1_file.c:560
+#: sha1_file.c:598
#, c-format
msgid "path '%s' does not exist"
msgstr "路径 '%s' 不存在"
-#: sha1_file.c:586
+#: sha1_file.c:624
#, c-format
msgid "reference repository '%s' as a linked checkout is not supported yet."
msgstr "尚不支持将参考仓库 '%s' 作为一个链接检出。"
-#: sha1_file.c:592
+#: sha1_file.c:630
#, c-format
msgid "reference repository '%s' is not a local repository."
msgstr "参考仓库 '%s' 不是一个本地仓库。"
-#: sha1_file.c:598
+#: sha1_file.c:636
#, c-format
msgid "reference repository '%s' is shallow"
msgstr "参考仓库 '%s' 是一个浅克隆"
-#: sha1_file.c:606
+#: sha1_file.c:644
#, c-format
msgid "reference repository '%s' is grafted"
msgstr "参考仓库 '%s' 已被嫁接"
-#: sha1_file.c:1245
-msgid "offset before end of packfile (broken .idx?)"
-msgstr "偏移量在包文件结束之前（损坏的 .idx？）"
-
-#: sha1_file.c:2729
-#, c-format
-msgid "offset before start of pack index for %s (corrupt index?)"
-msgstr "偏移量在 %s 的包索引开始之前（损坏的索引？）"
-
-#: sha1_file.c:2733
-#, c-format
-msgid "offset beyond end of pack index for %s (truncated index?)"
-msgstr "偏移量越过了 %s 的包索引的结尾（被截断的索引？）"
-
-#: sha1_name.c:419
+#: sha1_name.c:422
#, c-format
msgid "short SHA1 %s is ambiguous"
msgstr "短 SHA1 %s 存在歧义"
-#: sha1_name.c:430
+#: sha1_name.c:433
msgid "The candidates are:"
msgstr "候选者有："
-#: sha1_name.c:589
+#: sha1_name.c:693
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"
@@ -3654,81 +3781,86 @@
"可能需要删除它们。用 \"git config advice.objectNameWarning false\"\n"
"命令关闭本消息通知。"
-#: submodule.c:70 submodule.c:104
+#: submodule.c:96 submodule.c:130
msgid "Cannot change unmerged .gitmodules, resolve merge conflicts first"
msgstr "无法修改未合并的 .gitmodules，先解决合并冲突"
-#: submodule.c:74 submodule.c:108
+#: submodule.c:100 submodule.c:134
#, c-format
msgid "Could not find section in .gitmodules where path=%s"
msgstr "无法在 .gitmodules 中找到 path=%s 的小节"
-#: submodule.c:82
+#: submodule.c:108
#, c-format
msgid "Could not update .gitmodules entry %s"
msgstr "不能更新 .gitmodules 条目 %s"
-#: submodule.c:115
+#: submodule.c:141
#, c-format
msgid "Could not remove .gitmodules entry for %s"
msgstr "无法移除 %s 的 .gitmodules 条目"
-#: submodule.c:126
+#: submodule.c:152
msgid "staging updated .gitmodules failed"
msgstr "将更新后 .gitmodules 添加暂存区失败"
-#: submodule.c:165
-msgid "negative values not allowed for submodule.fetchJobs"
-msgstr "submodule.fetchJobs 不允许为负值"
-
-#: submodule.c:376
+#: submodule.c:312
#, c-format
msgid "in unpopulated submodule '%s'"
msgstr "位于未检出的子模组 '%s'"
-#: submodule.c:407
+#: submodule.c:343
#, c-format
msgid "Pathspec '%s' is in submodule '%.*s'"
msgstr "路径规格 '%s' 在子模组 '%.*s' 中"
-#: submodule.c:1337
+#: submodule.c:833
+#, c-format
+msgid "submodule entry '%s' (%s) is a %s, not a commit"
+msgstr "子模组条目 '%s'（%s）是一个 %s，不是一个提交"
+
+#: submodule.c:1065 builtin/branch.c:648 builtin/submodule--helper.c:1387
+msgid "Failed to resolve HEAD as a valid ref."
+msgstr "无法将 HEAD 解析为有效引用。"
+
+#: submodule.c:1370
#, c-format
msgid "'%s' not recognized as a git repository"
msgstr "无法将 '%s' 识别为一个 git 仓库"
-#: submodule.c:1475
+#: submodule.c:1508
#, c-format
msgid "could not start 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中启动 'git status'"
-#: submodule.c:1488
+#: submodule.c:1521
#, c-format
msgid "could not run 'git status' in submodule '%s'"
msgstr "无法在子模组 '%s' 中执行 'git status'"
-#: submodule.c:1581
+#: submodule.c:1614
#, c-format
msgid "submodule '%s' has dirty index"
msgstr "子模组 '%s' 中有脏索引"
-#: submodule.c:1845
+#: submodule.c:1876
#, c-format
msgid ""
"relocate_gitdir for submodule '%s' with more than one worktree not supported"
msgstr "不支持对有多个工作区的子模组 '%s' 执行 relocate_gitdir"
-#: submodule.c:1857 submodule.c:1913
+#: submodule.c:1888 submodule.c:1944
#, c-format
msgid "could not lookup name for submodule '%s'"
msgstr "不能查询子模组 '%s' 的名称"
-#: submodule.c:1861 builtin/submodule--helper.c:678
-#: builtin/submodule--helper.c:688
+#: submodule.c:1892 builtin/submodule--helper.c:909
+#: builtin/submodule--helper.c:919
#, c-format
msgid "could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: submodule.c:1864
+#: submodule.c:1895
#, c-format
msgid ""
"Migrating git directory of '%s%s' from\n"
@@ -3739,79 +3871,83 @@
"'%s' 迁移至\n"
"'%s'\n"
-#: submodule.c:1948
+#: submodule.c:1979
#, c-format
msgid "could not recurse into submodule '%s'"
msgstr "无法递归进子模组路径 '%s'"
-#: submodule.c:1992
+#: submodule.c:2023
msgid "could not start ls-files in .."
msgstr "无法在 .. 中启动 ls-files"
-#: submodule.c:2012
+#: submodule.c:2043
msgid "BUG: returned path string doesn't match cwd?"
msgstr "BUG：返回的路径和当前路径不匹配？"
-#: submodule.c:2031
+#: submodule.c:2062
#, c-format
msgid "ls-tree returned unexpected return code %d"
msgstr "ls-tree 返回未知返回值 %d"
-#: submodule-config.c:420
+#: submodule-config.c:263
+msgid "negative values not allowed for submodule.fetchjobs"
+msgstr "submodule.fetchjobs 不允许为负值"
+
+#: submodule-config.c:436
#, c-format
msgid "invalid value for %s"
msgstr "%s 的值无效"
-#: trailer.c:241
+#: trailer.c:238
#, c-format
msgid "running trailer command '%s' failed"
msgstr "执行 trailer 命令 '%s' 失败"
-#: trailer.c:474 trailer.c:478 trailer.c:482 trailer.c:536 trailer.c:540
-#: trailer.c:544
+#: trailer.c:485 trailer.c:490 trailer.c:495 trailer.c:549 trailer.c:553
+#: trailer.c:557
#, c-format
msgid "unknown value '%s' for key '%s'"
msgstr "键 '%2$s' 的未知取值 '%1$s'"
-#: trailer.c:526 trailer.c:531 builtin/remote.c:290
+#: trailer.c:539 trailer.c:544 builtin/remote.c:290
#, c-format
msgid "more than one %s"
msgstr "多于一个 %s"
-#: trailer.c:703
+#: trailer.c:730
#, c-format
msgid "empty trailer token in trailer '%.*s'"
msgstr "签名 '%.*s' 的键为空"
-#: trailer.c:723
+#: trailer.c:750
#, c-format
msgid "could not read input file '%s'"
msgstr "不能读取输入文件 '%s'"
-#: trailer.c:726
+#: trailer.c:753
msgid "could not read from stdin"
msgstr "不能自标准输入读取"
-#: trailer.c:950 builtin/am.c:45
+#: trailer.c:1008 builtin/am.c:46
#, c-format
msgid "could not stat %s"
msgstr "不能对 %s 调用 stat"
-#: trailer.c:952
+#: trailer.c:1010
#, c-format
msgid "file %s is not a regular file"
msgstr "文件 %s 不是一个正规文件"
-#: trailer.c:954
+#: trailer.c:1012
#, c-format
msgid "file %s is not writable by user"
msgstr "文件 %s 用户不可写"
-#: trailer.c:966
+#: trailer.c:1024
msgid "could not open temporary file"
msgstr "不能打开临时文件"
-#: trailer.c:1002
+#: trailer.c:1064
#, c-format
msgid "could not rename temporary file to %s"
msgstr "不能重命名临时文件为 %s"
@@ -3826,14 +3962,14 @@
msgid "transport: invalid depth option '%s'"
msgstr "传输：无效的深度选项 '%s'"
-#: transport.c:890
+#: transport.c:904
#, c-format
msgid ""
"The following submodule paths contain changes that can\n"
"not be found on any remote:\n"
msgstr "下列子模组路径所包含的修改在任何远程源中都找不到：\n"
-#: transport.c:894
+#: transport.c:908
#, c-format
msgid ""
"\n"
@@ -3860,11 +3996,11 @@
"以推送至远程。\n"
"\n"
-#: transport.c:902
+#: transport.c:916
msgid "Aborting."
msgstr "正在终止。"
-#: transport-helper.c:1071
+#: transport-helper.c:1074
#, c-format
msgid "Could not read ref %s"
msgstr "不能读取引用 %s"
@@ -3881,11 +4017,11 @@
msgid "empty filename in tree entry"
msgstr "树对象条目中空的文件名"
-#: tree-walk.c:113
+#: tree-walk.c:114
msgid "too-short tree file"
msgstr "太短的树文件"
-#: unpack-trees.c:105
+#: unpack-trees.c:107
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3894,7 +4030,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s请在切换分支前提交或贮藏您的修改。"
-#: unpack-trees.c:107
+#: unpack-trees.c:109
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by checkout:\n"
@@ -3903,7 +4039,7 @@
"您对下列文件的本地修改将被检出操作覆盖：\n"
"%%s"
-#: unpack-trees.c:110
+#: unpack-trees.c:112
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3912,7 +4048,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s请在合并前提交或贮藏您的修改。"
-#: unpack-trees.c:112
+#: unpack-trees.c:114
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by merge:\n"
@@ -3921,7 +4057,7 @@
"您对下列文件的本地修改将被合并操作覆盖：\n"
"%%s"
-#: unpack-trees.c:115
+#: unpack-trees.c:117
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3930,7 +4066,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s请在 %s 之前提交或贮藏您的修改。"
-#: unpack-trees.c:117
+#: unpack-trees.c:119
#, c-format
msgid ""
"Your local changes to the following files would be overwritten by %s:\n"
@@ -3939,7 +4075,7 @@
"您对下列文件的本地修改将被 %s 覆盖：\n"
"%%s"
-#: unpack-trees.c:122
+#: unpack-trees.c:124
#, c-format
msgid ""
"Updating the following directories would lose untracked files in them:\n"
@@ -3948,7 +4084,7 @@
"更新如下目录将会丢失其中未跟踪的文件：\n"
"%s"
-#: unpack-trees.c:126
+#: unpack-trees.c:128
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3957,7 +4093,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s请在切换分支之前移动或删除。"
-#: unpack-trees.c:128
+#: unpack-trees.c:130
#, c-format
msgid ""
"The following untracked working tree files would be removed by checkout:\n"
@@ -3966,7 +4102,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被删除：\n"
"%%s"
-#: unpack-trees.c:131
+#: unpack-trees.c:133
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3975,7 +4111,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:133
+#: unpack-trees.c:135
#, c-format
msgid ""
"The following untracked working tree files would be removed by merge:\n"
@@ -3984,7 +4120,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被删除：\n"
"%%s"
-#: unpack-trees.c:136
+#: unpack-trees.c:138
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -3993,7 +4129,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:138
+#: unpack-trees.c:140
#, c-format
msgid ""
"The following untracked working tree files would be removed by %s:\n"
@@ -4002,7 +4138,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被删除：\n"
"%%s"
-#: unpack-trees.c:143
+#: unpack-trees.c:145
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4012,7 +4148,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s请在切换分支前移动或删除。"
-#: unpack-trees.c:145
+#: unpack-trees.c:147
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by "
@@ -4022,7 +4158,7 @@
"工作区中下列未跟踪的文件将会因为检出操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:148
+#: unpack-trees.c:150
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4031,7 +4167,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s请在合并前移动或删除。"
-#: unpack-trees.c:150
+#: unpack-trees.c:152
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by merge:\n"
@@ -4040,7 +4176,7 @@
"工作区中下列未跟踪的文件将会因为合并操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:153
+#: unpack-trees.c:155
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4049,7 +4185,7 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s请在 %s 前移动或删除。"
-#: unpack-trees.c:155
+#: unpack-trees.c:157
#, c-format
msgid ""
"The following untracked working tree files would be overwritten by %s:\n"
@@ -4058,21 +4194,21 @@
"工作区中下列未跟踪的文件将会因为 %s 操作而被覆盖：\n"
"%%s"
-#: unpack-trees.c:162
+#: unpack-trees.c:164
#, c-format
msgid "Entry '%s' overlaps with '%s'. Cannot bind."
msgstr "条目 '%s' 和 '%s' 重叠。无法合并。"
-#: unpack-trees.c:165
+#: unpack-trees.c:167
#, c-format
msgid ""
-"Cannot update sparse checkout: the following entries are not up-to-date:\n"
+"Cannot update sparse checkout: the following entries are not up to date:\n"
"%s"
msgstr ""
"无法更新稀疏检出：如下条目不是最新：\n"
"%s"
-#: unpack-trees.c:167
+#: unpack-trees.c:169
#, c-format
msgid ""
"The following working tree files would be overwritten by sparse checkout "
@@ -4082,7 +4218,7 @@
"工作区中下列文件将被稀疏检出更新所覆盖：\n"
"%s"
-#: unpack-trees.c:169
+#: unpack-trees.c:171
#, c-format
msgid ""
"The following working tree files would be removed by sparse checkout "
@@ -4092,7 +4228,7 @@
"工作区中下列文件将被稀疏检出更新所删除：\n"
"%s"
-#: unpack-trees.c:171
+#: unpack-trees.c:173
#, c-format
msgid ""
"Cannot update submodule:\n"
@@ -4101,17 +4237,12 @@
"无法更新子模组：\n"
"%s"
-#: unpack-trees.c:248
+#: unpack-trees.c:250
#, c-format
msgid "Aborting\n"
msgstr "终止中\n"
-#: unpack-trees.c:277
-#, c-format
-msgid "submodule update strategy not supported for submodule '%s'"
-msgstr "子模组 %s 不支持子模组更新策略"
-
-#: unpack-trees.c:346
+#: unpack-trees.c:332
msgid "Checking out files"
msgstr "正在检出文件"
@@ -4154,13 +4285,8 @@
msgid "could not open '%s' for reading and writing"
msgstr "无法打开 '%s' 进行读写"
-#: wrapper.c:225 wrapper.c:395 builtin/am.c:766
-#, c-format
-msgid "could not open '%s' for writing"
-msgstr "无法打开 '%s' 进行写入"
-
-#: wrapper.c:227 wrapper.c:397 builtin/am.c:319 builtin/am.c:757
-#: builtin/am.c:849 builtin/merge.c:1014
+#: wrapper.c:227 wrapper.c:397 builtin/am.c:320 builtin/am.c:770
+#: builtin/am.c:862 builtin/merge.c:1043
#, c-format
msgid "could not open '%s' for reading"
msgstr "无法打开 '%s' 进行读取"
@@ -4174,250 +4300,240 @@
msgid "unable to get current working directory"
msgstr "不能获取当前工作目录"
-#: wrapper.c:656
-#, c-format
-msgid "could not write to %s"
-msgstr "不能写入 %s"
-
-#: wrapper.c:658
-#, c-format
-msgid "could not close %s"
-msgstr "不能关闭 %s"
-
-#: wt-status.c:152
+#: wt-status.c:150
msgid "Unmerged paths:"
msgstr "未合并的路径："
# 译者：注意保持前导空格
-#: wt-status.c:179 wt-status.c:206
+#: wt-status.c:177 wt-status.c:204
#, c-format
msgid " (use \"git reset %s <file>...\" to unstage)"
msgstr " （使用 \"git reset %s <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:181 wt-status.c:208
+#: wt-status.c:179 wt-status.c:206
msgid " (use \"git rm --cached <file>...\" to unstage)"
msgstr " （使用 \"git rm --cached <文件>...\" 以取消暂存）"
# 译者：注意保持前导空格
-#: wt-status.c:185
+#: wt-status.c:183
msgid " (use \"git add <file>...\" to mark resolution)"
msgstr " （使用 \"git add <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:187 wt-status.c:191
+#: wt-status.c:185 wt-status.c:189
msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)"
msgstr " （酌情使用 \"git add/rm <文件>...\" 标记解决方案）"
# 译者：注意保持前导空格
-#: wt-status.c:189
+#: wt-status.c:187
msgid " (use \"git rm <file>...\" to mark resolution)"
msgstr " （使用 \"git rm <文件>...\" 标记解决方案）"
-#: wt-status.c:200 wt-status.c:981
+#: wt-status.c:198 wt-status.c:984
msgid "Changes to be committed:"
msgstr "要提交的变更："
-#: wt-status.c:218 wt-status.c:990
+#: wt-status.c:216 wt-status.c:993
msgid "Changes not staged for commit:"
msgstr "尚未暂存以备提交的变更："
# 译者：注意保持前导空格
-#: wt-status.c:222
+#: wt-status.c:220
msgid " (use \"git add <file>...\" to update what will be committed)"
msgstr " （使用 \"git add <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:224
+#: wt-status.c:222
msgid " (use \"git add/rm <file>...\" to update what will be committed)"
msgstr " （使用 \"git add/rm <文件>...\" 更新要提交的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:225
+#: wt-status.c:223
msgid ""
" (use \"git checkout -- <file>...\" to discard changes in working directory)"
msgstr " （使用 \"git checkout -- <文件>...\" 丢弃工作区的改动）"
# 译者：注意保持前导空格
-#: wt-status.c:227
+#: wt-status.c:225
msgid " (commit or discard the untracked or modified content in submodules)"
msgstr " （提交或丢弃子模组中未跟踪或修改的内容）"
# 译者：注意保持前导空格
-#: wt-status.c:239
+#: wt-status.c:237
#, c-format
msgid " (use \"git %s <file>...\" to include in what will be committed)"
msgstr " （使用 \"git %s <文件>...\" 以包含要提交的内容）"
-#: wt-status.c:254
+#: wt-status.c:252
msgid "both deleted:"
msgstr "双方删除："
-#: wt-status.c:256
+#: wt-status.c:254
msgid "added by us:"
msgstr "由我们添加："
-#: wt-status.c:258
+#: wt-status.c:256
msgid "deleted by them:"
msgstr "由他们删除："
-#: wt-status.c:260
+#: wt-status.c:258
msgid "added by them:"
msgstr "由他们添加："
-#: wt-status.c:262
+#: wt-status.c:260
msgid "deleted by us:"
msgstr "由我们删除："
-#: wt-status.c:264
+#: wt-status.c:262
msgid "both added:"
msgstr "双方添加："
-#: wt-status.c:266
+#: wt-status.c:264
msgid "both modified:"
msgstr "双方修改："
-#: wt-status.c:276
+#: wt-status.c:274
msgid "new file:"
msgstr "新文件："
-#: wt-status.c:278
+#: wt-status.c:276
msgid "copied:"
msgstr "拷贝："
-#: wt-status.c:280
+#: wt-status.c:278
msgid "deleted:"
msgstr "删除："
-#: wt-status.c:282
+#: wt-status.c:280
msgid "modified:"
msgstr "修改："
-#: wt-status.c:284
+#: wt-status.c:282
msgid "renamed:"
msgstr "重命名："
-#: wt-status.c:286
+#: wt-status.c:284
msgid "typechange:"
msgstr "类型变更："
-#: wt-status.c:288
+#: wt-status.c:286
msgid "unknown:"
msgstr "未知："
-#: wt-status.c:290
+#: wt-status.c:288
msgid "unmerged:"
msgstr "未合并："
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:372
+#: wt-status.c:370
msgid "new commits, "
msgstr "新提交, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:374
+#: wt-status.c:372
msgid "modified content, "
msgstr "修改的内容, "
# 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字
-#: wt-status.c:376
+#: wt-status.c:374
msgid "untracked content, "
msgstr "未跟踪的内容, "
-#: wt-status.c:821
+#: wt-status.c:824
#, 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:853
+#: wt-status.c:856
msgid "Submodules changed but not updated:"
msgstr "子模组已修改但尚未更新："
-#: wt-status.c:855
+#: wt-status.c:858
msgid "Submodule changes to be committed:"
msgstr "要提交的子模组变更："
-#: wt-status.c:937
+#: wt-status.c:940
msgid ""
-"Do not touch the line above.\n"
-"Everything below will be removed."
+"Do not modify or remove the line above.\n"
+"Everything below it will be ignored."
msgstr ""
-"不要改动上面的一行。\n"
-"下面的所有内容均将被删除。"
+"不要改动或删除上面的一行。\n"
+"其下所有内容都将被忽略。"
-#: wt-status.c:1049
+#: wt-status.c:1053
msgid "You have unmerged paths."
msgstr "您有尚未合并的路径。"
# 译者：注意保持前导空格
-#: wt-status.c:1052
+#: wt-status.c:1056
msgid " (fix conflicts and run \"git commit\")"
msgstr " （解决冲突并运行 \"git commit\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1054
+#: wt-status.c:1058
msgid " (use \"git merge --abort\" to abort the merge)"
msgstr " （使用 \"git merge --abort\" 终止合并）"
-#: wt-status.c:1059
+#: wt-status.c:1063
msgid "All conflicts fixed but you are still merging."
msgstr "所有冲突已解决但您仍处于合并中。"
# 译者：注意保持前导空格
-#: wt-status.c:1062
+#: wt-status.c:1066
msgid " (use \"git commit\" to conclude merge)"
msgstr " （使用 \"git commit\" 结束合并）"
-#: wt-status.c:1072
+#: wt-status.c:1076
msgid "You are in the middle of an am session."
msgstr "您正处于 am 操作过程中。"
-#: wt-status.c:1075
+#: wt-status.c:1079
msgid "The current patch is empty."
msgstr "当前的补丁为空。"
# 译者：注意保持前导空格
-#: wt-status.c:1079
+#: wt-status.c:1083
msgid " (fix conflicts and then run \"git am --continue\")"
msgstr " （解决冲突，然后运行 \"git am --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1081
+#: wt-status.c:1085
msgid " (use \"git am --skip\" to skip this patch)"
msgstr " （使用 \"git am --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1083
+#: wt-status.c:1087
msgid " (use \"git am --abort\" to restore the original branch)"
msgstr " （使用 \"git am --abort\" 恢复原有分支）"
-#: wt-status.c:1214
+#: wt-status.c:1219
msgid "git-rebase-todo is missing."
msgstr "git-rebase-todo 丢失。"
-#: wt-status.c:1216
+#: wt-status.c:1221
msgid "No commands done."
msgstr "没有命令被执行。"
-#: wt-status.c:1219
+#: wt-status.c:1224
#, 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:1230
+#: wt-status.c:1235
#, c-format
msgid " (see more in file %s)"
msgstr " （更多参见文件 %s）"
-#: wt-status.c:1235
+#: wt-status.c:1240
msgid "No commands remaining."
msgstr "未剩下任何命令。"
-#: wt-status.c:1238
+#: wt-status.c:1243
#, c-format
msgid "Next command to do (%d remaining command):"
msgid_plural "Next commands to do (%d remaining commands):"
@@ -4425,169 +4541,169 @@
msgstr[1] "接下来要执行的命令（剩余 %d 条命令）："
# 译者：注意保持前导空格
-#: wt-status.c:1246
+#: wt-status.c:1251
msgid " (use \"git rebase --edit-todo\" to view and edit)"
msgstr " （使用 \"git rebase --edit-todo\" 来查看和编辑）"
-#: wt-status.c:1259
+#: wt-status.c:1264
#, c-format
msgid "You are currently rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作。"
-#: wt-status.c:1264
+#: wt-status.c:1269
msgid "You are currently rebasing."
msgstr "您在执行变基操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1278
+#: wt-status.c:1283
msgid " (fix conflicts and then run \"git rebase --continue\")"
msgstr " （解决冲突，然后运行 \"git rebase --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1280
+#: wt-status.c:1285
msgid " (use \"git rebase --skip\" to skip this patch)"
msgstr " （使用 \"git rebase --skip\" 跳过此补丁）"
# 译者：注意保持前导空格
-#: wt-status.c:1282
+#: wt-status.c:1287
msgid " (use \"git rebase --abort\" to check out the original branch)"
msgstr " （使用 \"git rebase --abort\" 以检出原有分支）"
# 译者：注意保持前导空格
-#: wt-status.c:1288
+#: wt-status.c:1293
msgid " (all conflicts fixed: run \"git rebase --continue\")"
msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）"
-#: wt-status.c:1292
+#: wt-status.c:1297
#, c-format
msgid ""
"You are currently splitting a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时拆分提交。"
-#: wt-status.c:1297
+#: wt-status.c:1302
msgid "You are currently splitting a commit during a rebase."
msgstr "您在执行变基操作时拆分提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1300
+#: wt-status.c:1305
msgid " (Once your working directory is clean, run \"git rebase --continue\")"
msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）"
-#: wt-status.c:1304
+#: wt-status.c:1309
#, c-format
msgid "You are currently editing a commit while rebasing branch '%s' on '%s'."
msgstr "您在执行将分支 '%s' 变基到 '%s' 的操作时编辑提交。"
-#: wt-status.c:1309
+#: wt-status.c:1314
msgid "You are currently editing a commit during a rebase."
msgstr "您在执行变基操作时编辑提交。"
# 译者：注意保持前导空格
-#: wt-status.c:1312
+#: wt-status.c:1317
msgid " (use \"git commit --amend\" to amend the current commit)"
msgstr " （使用 \"git commit --amend\" 修补当前提交）"
# 译者：注意保持前导空格
-#: wt-status.c:1314
+#: wt-status.c:1319
msgid ""
" (use \"git rebase --continue\" once you are satisfied with your changes)"
msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）"
-#: wt-status.c:1324
+#: wt-status.c:1329
#, c-format
msgid "You are currently cherry-picking commit %s."
msgstr "您在执行拣选提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1329
+#: wt-status.c:1334
msgid " (fix conflicts and run \"git cherry-pick --continue\")"
msgstr " （解决冲突并运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1332
+#: wt-status.c:1337
msgid " (all conflicts fixed: run \"git cherry-pick --continue\")"
msgstr " （所有冲突已解决：运行 \"git cherry-pick --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1334
+#: wt-status.c:1339
msgid " (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)"
msgstr " （使用 \"git cherry-pick --abort\" 以取消拣选操作）"
-#: wt-status.c:1343
+#: wt-status.c:1348
#, c-format
msgid "You are currently reverting commit %s."
msgstr "您在执行反转提交 %s 的操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1348
+#: wt-status.c:1353
msgid " (fix conflicts and run \"git revert --continue\")"
msgstr " （解决冲突并运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1351
+#: wt-status.c:1356
msgid " (all conflicts fixed: run \"git revert --continue\")"
msgstr " （所有冲突已解决：运行 \"git revert --continue\"）"
# 译者：注意保持前导空格
-#: wt-status.c:1353
+#: wt-status.c:1358
msgid " (use \"git revert --abort\" to cancel the revert operation)"
msgstr " （使用 \"git revert --abort\" 以取消反转提交操作）"
-#: wt-status.c:1364
+#: wt-status.c:1369
#, c-format
msgid "You are currently bisecting, started from branch '%s'."
msgstr "您在执行从分支 '%s' 开始的二分查找操作。"
-#: wt-status.c:1368
+#: wt-status.c:1373
msgid "You are currently bisecting."
msgstr "您在执行二分查找操作。"
# 译者：注意保持前导空格
-#: wt-status.c:1371
+#: wt-status.c:1376
msgid " (use \"git bisect reset\" to get back to the original branch)"
msgstr " （使用 \"git bisect reset\" 以回到原有分支）"
-#: wt-status.c:1568
+#: wt-status.c:1573
msgid "On branch "
msgstr "位于分支 "
-#: wt-status.c:1574
+#: wt-status.c:1579
msgid "interactive rebase in progress; onto "
msgstr "交互式变基操作正在进行中；至 "
-#: wt-status.c:1576
+#: wt-status.c:1581
msgid "rebase in progress; onto "
msgstr "变基操作正在进行中；至 "
-#: wt-status.c:1581
+#: wt-status.c:1586
msgid "HEAD detached at "
msgstr "头指针分离于 "
-#: wt-status.c:1583
+#: wt-status.c:1588
msgid "HEAD detached from "
msgstr "头指针分离自 "
-#: wt-status.c:1586
+#: wt-status.c:1591
msgid "Not currently on any branch."
msgstr "当前不在任何分支上。"
-#: wt-status.c:1606
+#: wt-status.c:1611
msgid "Initial commit"
msgstr "初始提交"
-#: wt-status.c:1607
+#: wt-status.c:1612
msgid "No commits yet"
msgstr "尚无提交"
-#: wt-status.c:1621
+#: wt-status.c:1626
msgid "Untracked files"
msgstr "未跟踪的文件"
-#: wt-status.c:1623
+#: wt-status.c:1628
msgid "Ignored files"
msgstr "忽略的文件"
-#: wt-status.c:1627
+#: wt-status.c:1632
#, c-format
msgid ""
"It took %.2f seconds to enumerate untracked files. 'status -uno'\n"
@@ -4597,98 +4713,98 @@
"耗费了 %.2f 秒以枚举未跟踪的文件。'status -uno' 也许能提高速度，\n"
"但您需要小心不要忘了添加新文件（参见 'git help status'）。"
-#: wt-status.c:1633
+#: wt-status.c:1638
#, c-format
msgid "Untracked files not listed%s"
msgstr "未跟踪的文件没有列出%s"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1635
+#: wt-status.c:1640
msgid " (use -u option to show untracked files)"
msgstr "（使用 -u 参数显示未跟踪的文件）"
-#: wt-status.c:1641
+#: wt-status.c:1646
msgid "No changes"
msgstr "没有修改"
-#: wt-status.c:1646
+#: wt-status.c:1651
#, 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:1649
+#: wt-status.c:1654
#, c-format
msgid "no changes added to commit\n"
msgstr "修改尚未加入提交\n"
-#: wt-status.c:1652
+#: wt-status.c:1657
#, c-format
msgid ""
"nothing added to commit but untracked files present (use \"git add\" to "
"track)\n"
msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1655
+#: wt-status.c:1660
#, c-format
msgid "nothing added to commit but untracked files present\n"
msgstr "提交为空，但是存在尚未跟踪的文件\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1658
+#: wt-status.c:1663
#, c-format
msgid "nothing to commit (create/copy files and use \"git add\" to track)\n"
msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n"
-#: wt-status.c:1661 wt-status.c:1666
+#: wt-status.c:1666 wt-status.c:1671
#, c-format
msgid "nothing to commit\n"
msgstr "无文件要提交\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1664
+#: wt-status.c:1669
#, c-format
msgid "nothing to commit (use -u to show untracked files)\n"
msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n"
# 译者：中文字符串拼接，可删除前导空格
-#: wt-status.c:1668
+#: wt-status.c:1673
#, c-format
msgid "nothing to commit, working tree clean\n"
msgstr "无文件要提交，干净的工作区\n"
-#: wt-status.c:1780
+#: wt-status.c:1785
msgid "No commits yet on "
msgstr "尚无提交在 "
-#: wt-status.c:1784
+#: wt-status.c:1789
msgid "HEAD (no branch)"
msgstr "HEAD（非分支）"
# 译者：注意保持句尾空格
-#: wt-status.c:1813 wt-status.c:1821
+#: wt-status.c:1818 wt-status.c:1826
msgid "behind "
msgstr "落后 "
-#: wt-status.c:1816 wt-status.c:1819
+#: wt-status.c:1821 wt-status.c:1824
msgid "ahead "
msgstr "领先 "
#. TRANSLATORS: the action is e.g. "pull with rebase"
-#: wt-status.c:2311
+#: wt-status.c:2318
#, c-format
msgid "cannot %s: You have unstaged changes."
msgstr "不能%s：您有未暂存的变更。"
-#: wt-status.c:2317
+#: wt-status.c:2324
msgid "additionally, your index contains uncommitted changes."
msgstr "另外，您的索引中包含未提交的变更。"
-#: wt-status.c:2319
+#: wt-status.c:2326
#, c-format
msgid "cannot %s: Your index contains uncommitted changes."
msgstr "不能%s：您的索引中包含未提交的变更。"
-#: compat/precompose_utf8.c:58 builtin/clone.c:436
+#: compat/precompose_utf8.c:58 builtin/clone.c:437
#, c-format
msgid "failed to unlink '%s'"
msgstr "无法删除 '%s'"
@@ -4697,122 +4813,126 @@
msgid "git add [<options>] [--] <pathspec>..."
msgstr "git add [<选项>] [--] <路径规格>..."
-#: builtin/add.c:82
+#: builtin/add.c:83
#, c-format
msgid "unexpected diff status %c"
msgstr "意外的差异状态 %c"
-#: builtin/add.c:87 builtin/commit.c:292
+#: builtin/add.c:88 builtin/commit.c:291
msgid "updating files failed"
msgstr "更新文件失败"
-#: builtin/add.c:97
+#: builtin/add.c:98
#, c-format
msgid "remove '%s'\n"
msgstr "删除 '%s'\n"
-#: builtin/add.c:151
+#: builtin/add.c:173
msgid "Unstaged changes after refreshing the index:"
msgstr "刷新索引之后尚未被暂存的变更："
-#: builtin/add.c:211 builtin/rev-parse.c:873
+#: builtin/add.c:233 builtin/rev-parse.c:888
msgid "Could not read the index"
msgstr "不能读取索引"
-#: builtin/add.c:222
+#: builtin/add.c:244
#, c-format
msgid "Could not open '%s' for writing."
msgstr "无法打开 '%s' 进行写入。"
-#: builtin/add.c:226
+#: builtin/add.c:248
msgid "Could not write patch"
msgstr "不能生成补丁"
-#: builtin/add.c:229
+#: builtin/add.c:251
msgid "editing patch failed"
msgstr "编辑补丁失败"
-#: builtin/add.c:232
+#: builtin/add.c:254
#, c-format
msgid "Could not stat '%s'"
msgstr "不能对 '%s' 调用 stat"
-#: builtin/add.c:234
+#: builtin/add.c:256
msgid "Empty patch. Aborted."
msgstr "空补丁。异常终止。"
-#: builtin/add.c:239
+#: builtin/add.c:261
#, c-format
msgid "Could not apply '%s'"
msgstr "不能应用 '%s'"
-#: builtin/add.c:249
+#: builtin/add.c:271
msgid "The following paths are ignored by one of your .gitignore files:\n"
msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n"
-#: builtin/add.c:269 builtin/clean.c:907 builtin/fetch.c:110 builtin/mv.c:124
-#: builtin/prune-packed.c:55 builtin/pull.c:201 builtin/push.c:529
-#: builtin/remote.c:1332 builtin/rm.c:242 builtin/send-pack.c:164
+#: builtin/add.c:291 builtin/clean.c:911 builtin/fetch.c:133 builtin/mv.c:124
+#: builtin/prune-packed.c:55 builtin/pull.c:207 builtin/push.c:541
+#: builtin/remote.c:1333 builtin/rm.c:242 builtin/send-pack.c:164
msgid "dry run"
msgstr "演习"
-#: builtin/add.c:272
+#: builtin/add.c:294
msgid "interactive picking"
msgstr "交互式拣选"
-#: builtin/add.c:273 builtin/checkout.c:1162 builtin/reset.c:299
+#: builtin/add.c:295 builtin/checkout.c:1137 builtin/reset.c:310
msgid "select hunks interactively"
msgstr "交互式挑选数据块"
-#: builtin/add.c:274
+#: builtin/add.c:296
msgid "edit current diff and apply"
msgstr "编辑当前差异并应用"
-#: builtin/add.c:275
+#: builtin/add.c:297
msgid "allow adding otherwise ignored files"
msgstr "允许添加忽略的文件"
-#: builtin/add.c:276
+#: builtin/add.c:298
msgid "update tracked files"
msgstr "更新已跟踪的文件"
-#: builtin/add.c:277
+#: builtin/add.c:299
+msgid "renormalize EOL of tracked files (implies -u)"
+msgstr "对已跟踪文件（暗含 -u）重新归一换行符"
+
+#: builtin/add.c:300
msgid "record only the fact that the path will be added later"
msgstr "只记录，该路径稍后再添加"
-#: builtin/add.c:278
+#: builtin/add.c:301
msgid "add changes from all tracked and untracked files"
msgstr "添加所有改变的已跟踪文件和未跟踪文件"
-#: builtin/add.c:281
+#: builtin/add.c:304
msgid "ignore paths removed in the working tree (same as --no-all)"
msgstr "忽略工作区中移除的路径（和 --no-all 相同）"
-#: builtin/add.c:283
+#: builtin/add.c:306
msgid "don't add, only refresh the index"
msgstr "不添加，只刷新索引"
-#: builtin/add.c:284
+#: builtin/add.c:307
msgid "just skip files which cannot be added because of errors"
msgstr "跳过因出错不能添加的文件"
-#: builtin/add.c:285
+#: builtin/add.c:308
msgid "check if - even missing - files are ignored in dry run"
msgstr "检查在演习模式下文件（即使不存在）是否被忽略"
-#: builtin/add.c:286 builtin/update-index.c:952
+#: builtin/add.c:309 builtin/update-index.c:964
msgid "(+/-)x"
msgstr "(+/-)x"
-#: builtin/add.c:286 builtin/update-index.c:953
+#: builtin/add.c:309 builtin/update-index.c:965
msgid "override the executable bit of the listed files"
msgstr "覆盖列表里文件的可执行位"
-#: builtin/add.c:288
+#: builtin/add.c:311
msgid "warn when adding an embedded repository"
msgstr "创建一个嵌入式仓库时给予警告"
-#: builtin/add.c:303
+#: builtin/add.c:326
#, c-format
msgid ""
"You've added another git repository inside your current repository.\n"
@@ -4829,7 +4949,8 @@
"\n"
"See \"git help submodule\" for more information."
msgstr ""
-"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并且不知道该如何获取它。\n"
+"您在当前仓库中添加了另外一个Git仓库。克隆外层的仓库将不包含嵌入仓库的内容，并"
+"且不知道该如何获取它。\n"
"如果您要添加一个子模组，使用：\n"
"\n"
"\tgit submodule add <url> %s\n"
@@ -4840,149 +4961,149 @@
"\n"
"参见 \"git help submodule\" 获取更多信息。"
-#: builtin/add.c:331
+#: builtin/add.c:354
#, c-format
msgid "adding embedded git repository: %s"
msgstr "正在添加嵌入式 git 仓库：%s"
-#: builtin/add.c:349
+#: builtin/add.c:372
#, c-format
msgid "Use -f if you really want to add them.\n"
msgstr "使用 -f 参数如果您确实要添加它们。\n"
-#: builtin/add.c:357
+#: builtin/add.c:380
msgid "adding files failed"
msgstr "添加文件失败"
-#: builtin/add.c:394
+#: builtin/add.c:417
msgid "-A and -u are mutually incompatible"
msgstr "-A 和 -u 选项互斥"
-#: builtin/add.c:401
+#: builtin/add.c:424
msgid "Option --ignore-missing can only be used together with --dry-run"
msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用"
-#: builtin/add.c:405
+#: builtin/add.c:428
#, c-format
msgid "--chmod param '%s' must be either -x or +x"
msgstr "参数 --chmod 取值 '%s' 必须是 -x 或 +x"
-#: builtin/add.c:420
+#: builtin/add.c:443
#, c-format
msgid "Nothing specified, nothing added.\n"
msgstr "没有指定文件，也没有文件被添加。\n"
-#: builtin/add.c:421
+#: builtin/add.c:444
#, c-format
msgid "Maybe you wanted to say 'git add .'?\n"
msgstr "也许您想要执行 'git add .'？\n"
-#: builtin/add.c:426 builtin/check-ignore.c:176 builtin/checkout.c:282
-#: builtin/checkout.c:475 builtin/clean.c:954 builtin/commit.c:351
-#: builtin/mv.c:144 builtin/reset.c:238 builtin/rm.c:272
-#: builtin/submodule--helper.c:244
+#: builtin/add.c:449 builtin/check-ignore.c:176 builtin/checkout.c:281
+#: builtin/checkout.c:484 builtin/clean.c:958 builtin/commit.c:350
+#: builtin/diff-tree.c:114 builtin/mv.c:143 builtin/reset.c:249
+#: builtin/rm.c:271 builtin/submodule--helper.c:311
msgid "index file corrupt"
msgstr "索引文件损坏"
-#: builtin/am.c:413
+#: builtin/am.c:414
msgid "could not parse author script"
msgstr "不能解析作者脚本"
-#: builtin/am.c:489
+#: builtin/am.c:498
#, c-format
msgid "'%s' was deleted by the applypatch-msg hook"
msgstr "'%s' 被 applypatch-msg 钩子删除"
-#: builtin/am.c:530
+#: builtin/am.c:539
#, c-format
msgid "Malformed input line: '%s'."
msgstr "非法的输入行：'%s'。"
-#: builtin/am.c:567
+#: builtin/am.c:576
#, c-format
msgid "Failed to copy notes from '%s' to '%s'"
msgstr "从 '%s' 拷贝注解到 '%s' 时失败"
-#: builtin/am.c:593
+#: builtin/am.c:602
msgid "fseek failed"
msgstr "fseek 失败"
-#: builtin/am.c:777
+#: builtin/am.c:790
#, c-format
msgid "could not parse patch '%s'"
msgstr "无法解析补丁 '%s'"
-#: builtin/am.c:842
+#: builtin/am.c:855
msgid "Only one StGIT patch series can be applied at once"
msgstr "一次只能有一个 StGIT 补丁队列被应用"
-#: builtin/am.c:889
+#: builtin/am.c:903
msgid "invalid timestamp"
msgstr "无效的时间戳"
-#: builtin/am.c:892 builtin/am.c:900
+#: builtin/am.c:908 builtin/am.c:920
msgid "invalid Date line"
msgstr "无效的日期行"
-#: builtin/am.c:897
+#: builtin/am.c:915
msgid "invalid timezone offset"
msgstr "无效的时区偏移值"
-#: builtin/am.c:986
+#: builtin/am.c:1008
msgid "Patch format detection failed."
msgstr "补丁格式探测失败。"
-#: builtin/am.c:991 builtin/clone.c:401
+#: builtin/am.c:1013 builtin/clone.c:402
#, c-format
msgid "failed to create directory '%s'"
msgstr "无法创建目录 '%s'"
-#: builtin/am.c:995
+#: builtin/am.c:1017
msgid "Failed to split patches."
msgstr "无法拆分补丁。"
-#: builtin/am.c:1120 builtin/commit.c:377
+#: builtin/am.c:1146 builtin/commit.c:376
msgid "unable to write index file"
msgstr "无法写入索引文件"
-#: builtin/am.c:1171
+#: builtin/am.c:1160
#, c-format
msgid "When you have resolved this problem, run \"%s --continue\"."
msgstr "当您解决这一问题，执行 \"%s --continue\"。"
-#: builtin/am.c:1172
+#: builtin/am.c:1161
#, c-format
msgid "If you prefer to skip this patch, run \"%s --skip\" instead."
msgstr "如果您想要跳过这一补丁，则执行 \"%s --skip\"。"
-#: builtin/am.c:1173
+#: builtin/am.c:1162
#, c-format
msgid "To restore the original branch and stop patching, run \"%s --abort\"."
msgstr "若要复原至原始分支并停止补丁操作，执行 \"%s --abort\"。"
-#: builtin/am.c:1304
+#: builtin/am.c:1269
msgid "Patch is empty."
msgstr "补丁为空。"
-#: builtin/am.c:1370
+#: builtin/am.c:1335
#, c-format
msgid "invalid ident line: %.*s"
msgstr "无效的身份标识：%.*s"
-#: builtin/am.c:1392
+#: builtin/am.c:1357
#, c-format
msgid "unable to parse commit %s"
msgstr "不能解析提交 %s"
-#: builtin/am.c:1586
+#: builtin/am.c:1550
msgid "Repository lacks necessary blobs to fall back on 3-way merge."
msgstr "仓库缺乏必要的数据对象以进行三方合并。"
-#: builtin/am.c:1588
+#: builtin/am.c:1552
msgid "Using index info to reconstruct a base tree..."
msgstr "使用索引来重建一个（三方合并的）基础目录树..."
-#: builtin/am.c:1607
+#: builtin/am.c:1571
msgid ""
"Did you hand edit your patch?\n"
"It does not apply to blobs recorded in its index."
@@ -4990,37 +5111,37 @@
"您是否曾手动编辑过您的补丁？\n"
"无法应用补丁到索引中的数据对象上。"
-#: builtin/am.c:1613
+#: builtin/am.c:1577
msgid "Falling back to patching base and 3-way merge..."
msgstr "回落到基础版本上打补丁及进行三方合并..."
-#: builtin/am.c:1638
+#: builtin/am.c:1602
msgid "Failed to merge in the changes."
msgstr "无法合并变更。"
-#: builtin/am.c:1662 builtin/merge.c:632
+#: builtin/am.c:1626 builtin/merge.c:642
msgid "git write-tree failed to write a tree"
msgstr "git write-tree 无法写入一树对象"
-#: builtin/am.c:1669
+#: builtin/am.c:1633
msgid "applying to an empty history"
msgstr "正应用到一个空历史上"
-#: builtin/am.c:1682 builtin/commit.c:1767 builtin/merge.c:803
-#: builtin/merge.c:828
+#: builtin/am.c:1646 builtin/commit.c:1798 builtin/merge.c:825
+#: builtin/merge.c:850
msgid "failed to write commit object"
msgstr "无法写提交对象"
-#: builtin/am.c:1715 builtin/am.c:1719
+#: builtin/am.c:1679 builtin/am.c:1683
#, c-format
msgid "cannot resume: %s does not exist."
msgstr "无法继续：%s 不存在。"
-#: builtin/am.c:1735
+#: builtin/am.c:1699
msgid "cannot be interactive without stdin connected to a terminal."
msgstr "标准输入没有和终端关联，不能进行交互式操作。"
-#: builtin/am.c:1740
+#: builtin/am.c:1704
msgid "Commit Body is:"
msgstr "提交内容为："
@@ -5029,35 +5150,35 @@
#. in your translation. The program will only accept English
#. input at this point.
#.
-#: builtin/am.c:1750
+#: builtin/am.c:1714
msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all: "
msgstr "应用？是[y]/否[n]/编辑[e]/查看补丁[v]/应用所有[a]："
-#: builtin/am.c:1800
+#: builtin/am.c:1764
#, c-format
msgid "Dirty index: cannot apply patches (dirty: %s)"
msgstr "脏索引：不能应用补丁（脏文件：%s）"
-#: builtin/am.c:1840 builtin/am.c:1912
+#: builtin/am.c:1804 builtin/am.c:1876
#, c-format
msgid "Applying: %.*s"
msgstr "应用：%.*s"
-#: builtin/am.c:1856
+#: builtin/am.c:1820
msgid "No changes -- Patch already applied."
msgstr "没有变更 —— 补丁已经应用过。"
-#: builtin/am.c:1864
+#: builtin/am.c:1828
#, c-format
msgid "Patch failed at %s %.*s"
msgstr "打补丁失败于 %s %.*s"
-#: builtin/am.c:1870
+#: builtin/am.c:1834
#, c-format
msgid "The copy of the patch that failed is found in: %s"
msgstr "失败的补丁文件副本位于：%s"
-#: builtin/am.c:1915
+#: builtin/am.c:1879
msgid ""
"No changes - did you forget to use 'git add'?\n"
"If there is nothing left to stage, chances are that something else\n"
@@ -5067,7 +5188,7 @@
"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n"
"您也许想要跳过这个补丁。"
-#: builtin/am.c:1922
+#: builtin/am.c:1886
msgid ""
"You still have unmerged paths in your index.\n"
"You should 'git add' each file with resolved conflicts to mark them as "
@@ -5078,150 +5199,149 @@
"您应该对已经冲突解决的每一个文件执行 'git add' 来标记已经完成。 \n"
"你可以对 \"由他们删除\" 的文件执行 `git rm` 命令。"
-#: builtin/am.c:2031 builtin/am.c:2035 builtin/am.c:2047 builtin/reset.c:323
-#: builtin/reset.c:331
+#: builtin/am.c:1993 builtin/am.c:1997 builtin/am.c:2009 builtin/reset.c:332
+#: builtin/reset.c:340
#, c-format
msgid "Could not parse object '%s'."
msgstr "不能解析对象 '%s'。"
-#: builtin/am.c:2083
+#: builtin/am.c:2045
msgid "failed to clean index"
msgstr "无法清空索引"
-#: builtin/am.c:2117
+#: builtin/am.c:2080
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:2180
+#: builtin/am.c:2143
#, c-format
msgid "Invalid value for --patch-format: %s"
msgstr "无效的 --patch-format 值：%s"
-#: builtin/am.c:2213
+#: builtin/am.c:2176
msgid "git am [<options>] [(<mbox> | <Maildir>)...]"
msgstr "git am [<选项>] [(<mbox> | <Maildir>)...]"
-#: builtin/am.c:2214
+#: builtin/am.c:2177
msgid "git am [<options>] (--continue | --skip | --abort)"
msgstr "git am [<选项>] (--continue | --skip | --abort)"
-#: builtin/am.c:2220
+#: builtin/am.c:2183
msgid "run interactively"
msgstr "以交互式方式运行"
-#: builtin/am.c:2222
+#: builtin/am.c:2185
msgid "historical option -- no-op"
msgstr "老的参数 —— 无作用"
-#: builtin/am.c:2224
+#: builtin/am.c:2187
msgid "allow fall back on 3way merging if needed"
msgstr "如果必要，允许使用三方合并。"
-#: builtin/am.c:2225 builtin/init-db.c:484 builtin/prune-packed.c:57
+#: builtin/am.c:2188 builtin/init-db.c:484 builtin/prune-packed.c:57
#: builtin/repack.c:180
msgid "be quiet"
msgstr "静默模式"
-#: builtin/am.c:2227
+#: builtin/am.c:2190
msgid "add a Signed-off-by line to the commit message"
msgstr "在提交说明中添加一个 Signed-off-by 签名"
-#: builtin/am.c:2230
+#: builtin/am.c:2193
msgid "recode into utf8 (default)"
msgstr "使用 utf8 字符集（默认）"
-#: builtin/am.c:2232
+#: builtin/am.c:2195
msgid "pass -k flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -k 参数"
-#: builtin/am.c:2234
+#: builtin/am.c:2197
msgid "pass -b flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -b 参数"
-#: builtin/am.c:2236
+#: builtin/am.c:2199
msgid "pass -m flag to git-mailinfo"
msgstr "向 git-mailinfo 传递 -m 参数"
-#: builtin/am.c:2238
+#: builtin/am.c:2201
msgid "pass --keep-cr flag to git-mailsplit for mbox format"
msgstr "针对 mbox 格式，向 git-mailsplit 传递 --keep-cr 参数"
-#: builtin/am.c:2241
+#: builtin/am.c:2204
msgid "do not pass --keep-cr flag to git-mailsplit independent of am.keepcr"
msgstr "不向 git-mailsplit 传递 --keep-cr 参数，覆盖 am.keepcr 的设置"
-#: builtin/am.c:2244
+#: builtin/am.c:2207
msgid "strip everything before a scissors line"
msgstr "丢弃裁切线前的所有内容"
-#: builtin/am.c:2246 builtin/am.c:2249 builtin/am.c:2252 builtin/am.c:2255
-#: builtin/am.c:2258 builtin/am.c:2261 builtin/am.c:2264 builtin/am.c:2267
-#: builtin/am.c:2273
+#: builtin/am.c:2209 builtin/am.c:2212 builtin/am.c:2215 builtin/am.c:2218
+#: builtin/am.c:2221 builtin/am.c:2224 builtin/am.c:2227 builtin/am.c:2230
+#: builtin/am.c:2236
msgid "pass it through git-apply"
msgstr "传递给 git-apply"
-#: builtin/am.c:2263 builtin/fmt-merge-msg.c:663 builtin/fmt-merge-msg.c:666
-#: builtin/grep.c:1064 builtin/merge.c:202 builtin/pull.c:142
-#: builtin/pull.c:197 builtin/repack.c:189 builtin/repack.c:193
-#: builtin/repack.c:195 builtin/show-branch.c:631 builtin/show-ref.c:169
-#: builtin/tag.c:399 parse-options.h:132 parse-options.h:134
-#: parse-options.h:245
+#: builtin/am.c:2226 builtin/fmt-merge-msg.c:665 builtin/fmt-merge-msg.c:668
+#: builtin/grep.c:845 builtin/merge.c:205 builtin/pull.c:145 builtin/pull.c:203
+#: builtin/repack.c:189 builtin/repack.c:193 builtin/repack.c:195
+#: builtin/show-branch.c:631 builtin/show-ref.c:169 builtin/tag.c:377
+#: parse-options.h:132 parse-options.h:134 parse-options.h:245
msgid "n"
msgstr "n"
-#: builtin/am.c:2269 builtin/branch.c:596 builtin/for-each-ref.c:38
-#: builtin/replace.c:444 builtin/tag.c:434 builtin/verify-tag.c:39
+#: builtin/am.c:2232 builtin/branch.c:629 builtin/for-each-ref.c:38
+#: builtin/replace.c:444 builtin/tag.c:412 builtin/verify-tag.c:39
msgid "format"
msgstr "格式"
-#: builtin/am.c:2270
+#: builtin/am.c:2233
msgid "format the patch(es) are in"
msgstr "补丁的格式"
-#: builtin/am.c:2276
+#: builtin/am.c:2239
msgid "override error message when patch failure occurs"
msgstr "打补丁失败时显示的错误信息"
-#: builtin/am.c:2278
+#: builtin/am.c:2241
msgid "continue applying patches after resolving a conflict"
msgstr "冲突解决后继续应用补丁"
-#: builtin/am.c:2281
+#: builtin/am.c:2244
msgid "synonyms for --continue"
msgstr "和 --continue 同义"
-#: builtin/am.c:2284
+#: builtin/am.c:2247
msgid "skip the current patch"
msgstr "跳过当前补丁"
-#: builtin/am.c:2287
+#: builtin/am.c:2250
msgid "restore the original branch and abort the patching operation."
msgstr "恢复原始分支并终止打补丁操作。"
-#: builtin/am.c:2291
+#: builtin/am.c:2254
msgid "lie about committer date"
msgstr "将作者日期作为提交日期"
-#: builtin/am.c:2293
+#: builtin/am.c:2256
msgid "use current timestamp for author date"
msgstr "用当前时间作为作者日期"
-#: builtin/am.c:2295 builtin/commit.c:1605 builtin/merge.c:233
-#: builtin/pull.c:172 builtin/revert.c:112 builtin/tag.c:414
+#: builtin/am.c:2258 builtin/commit.c:1636 builtin/merge.c:236
+#: builtin/pull.c:178 builtin/revert.c:112 builtin/tag.c:392
msgid "key-id"
msgstr "key-id"
-#: builtin/am.c:2296
+#: builtin/am.c:2259
msgid "GPG-sign commits"
msgstr "使用 GPG 签名提交"
-#: builtin/am.c:2299
+#: builtin/am.c:2262
msgid "(internal use for git-rebase)"
msgstr "（内部使用，用于 git-rebase）"
-#: builtin/am.c:2317
+#: builtin/am.c:2280
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."
@@ -5229,16 +5349,16 @@
"参数 -b/--binary 已经很长时间不做任何实质操作了，并且将被移除。\n"
"请不要再使用它了。"
-#: builtin/am.c:2324
+#: builtin/am.c:2287
msgid "failed to read the index"
msgstr "无法读取索引"
-#: builtin/am.c:2339
+#: builtin/am.c:2302
#, c-format
msgid "previous rebase directory %s still exists but mbox given."
msgstr "之前的变基目录 %s 仍然存在，但却提供了 mbox。"
-#: builtin/am.c:2363
+#: builtin/am.c:2326
#, c-format
msgid ""
"Stray %s directory found.\n"
@@ -5247,7 +5367,7 @@
"发现了错误的 %s 目录。\n"
"使用 \"git am --abort\" 删除它。"
-#: builtin/am.c:2369
+#: builtin/am.c:2332
msgid "Resolve operation not in progress, we are not resuming."
msgstr "解决操作未进行，我们不会继续。"
@@ -5285,18 +5405,69 @@
msgid "git archive: expected a flush"
msgstr "git archive：应有一个 flush 刷新"
-#: builtin/bisect--helper.c:7
+#: builtin/bisect--helper.c:12
msgid "git bisect--helper --next-all [--no-checkout]"
msgstr "git bisect--helper --next-all [--no-checkout]"
-#: builtin/bisect--helper.c:17
+#: builtin/bisect--helper.c:13
+msgid "git bisect--helper --write-terms <bad_term> <good_term>"
+msgstr "git bisect--helper --write-terms <坏-术语> <好-术语>"
+
+#: builtin/bisect--helper.c:14
+msgid "git bisect--helper --bisect-clean-state"
+msgstr "git bisect--helper --bisect-clean-state"
+
+#: builtin/bisect--helper.c:46
+#, c-format
+msgid "'%s' is not a valid term"
+msgstr "'%s' 不是一个有效的术语"
+
+#: builtin/bisect--helper.c:50
+#, c-format
+msgid "can't use the builtin command '%s' as a term"
+msgstr "不能使用内置命令 '%s' 作为术语"
+
+#: builtin/bisect--helper.c:60
+#, c-format
+msgid "can't change the meaning of the term '%s'"
+msgstr "不能修改术语 '%s' 的含义"
+
+#: builtin/bisect--helper.c:71
+msgid "please use two different terms"
+msgstr "请使用两个不同的术语"
+
+#: builtin/bisect--helper.c:78
+msgid "could not open the file BISECT_TERMS"
+msgstr "不能打开文件 BISECT_TERMS"
+
+#: builtin/bisect--helper.c:120
msgid "perform 'git bisect next'"
msgstr "执行 'git bisect next'"
-#: builtin/bisect--helper.c:19
+#: builtin/bisect--helper.c:122
+msgid "write the terms to .git/BISECT_TERMS"
+msgstr "将术语写入 .git/BISECT_TERMS"
+
+#: builtin/bisect--helper.c:124
+msgid "cleanup the bisection state"
+msgstr "清除二分查找状态"
+
+#: builtin/bisect--helper.c:126
+msgid "check for expected revs"
+msgstr "检查预期的版本"
+
+#: builtin/bisect--helper.c:128
msgid "update BISECT_HEAD instead of checking out the current commit"
msgstr "更新 BISECT_HEAD 而非检出当前提交"
+#: builtin/bisect--helper.c:143
+msgid "--write-terms requires two arguments"
+msgstr "--write-terms 需要两个参数"
+
+#: builtin/bisect--helper.c:147
+msgid "--bisect-clean-state requires no arguments"
+msgstr "--bisect-clean-state 不需要参数"
+
#: builtin/blame.c:27
msgid "git blame [<options>] [<rev-opts>] [<rev>] [--] <file>"
msgstr "git blame [<选项>] [<版本选项>] [<版本>] [--] <文件>"
@@ -5449,15 +5620,19 @@
msgstr "git branch [<选项>] (-m | -M) [<旧分支>] <新分支>"
#: builtin/branch.c:31
+msgid "git branch [<options>] (-c | -C) [<old-branch>] <new-branch>"
+msgstr "git branch [<选项>] (-c | -C) [<老分支>] <新分支>"
+
+#: builtin/branch.c:32
msgid "git branch [<options>] [-r | -a] [--points-at]"
msgstr "git branch [<选项>] [-r | -a] [--points-at]"
-#: builtin/branch.c:32
+#: builtin/branch.c:33
msgid "git branch [<options>] [-r | -a] [--format]"
msgstr "git branch [<选项>] [-r | -a] [--format]"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:145
+#: builtin/branch.c:146
#, c-format
msgid ""
"deleting branch '%s' that has been merged to\n"
@@ -5467,7 +5642,7 @@
" '%s'，但未合并到 HEAD。"
# 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长
-#: builtin/branch.c:149
+#: builtin/branch.c:150
#, c-format
msgid ""
"not deleting branch '%s' that is not yet merged to\n"
@@ -5476,12 +5651,12 @@
"并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n"
" 然而却尚未被合并到分支 '%s' 。"
-#: builtin/branch.c:163
+#: builtin/branch.c:164
#, c-format
msgid "Couldn't look up commit object for '%s'"
msgstr "无法查询 '%s' 指向的提交对象"
-#: builtin/branch.c:167
+#: builtin/branch.c:168
#, c-format
msgid ""
"The branch '%s' is not fully merged.\n"
@@ -5490,91 +5665,112 @@
"分支 '%s' 没有完全合并。\n"
"如果您确认要删除它，执行 'git branch -D %s'。"
-#: builtin/branch.c:180
+#: builtin/branch.c:181
msgid "Update of config-file failed"
-msgstr "无法更新 config 文件"
+msgstr "更新配置文件失败"
-#: builtin/branch.c:211
+#: builtin/branch.c:212
msgid "cannot use -a with -d"
msgstr "不能将 -a 和 -d 同时使用"
-#: builtin/branch.c:217
+#: builtin/branch.c:218
msgid "Couldn't look up commit object for HEAD"
msgstr "无法查询 HEAD 指向的提交对象"
-#: builtin/branch.c:231
+#: builtin/branch.c:232
#, c-format
msgid "Cannot delete branch '%s' checked out at '%s'"
msgstr "无法删除检出于 '%2$s' 的分支 '%1$s'。"
-#: builtin/branch.c:246
+#: builtin/branch.c:247
#, c-format
msgid "remote-tracking branch '%s' not found."
msgstr "未能找到远程跟踪分支 '%s'。"
-#: builtin/branch.c:247
+#: builtin/branch.c:248
#, c-format
msgid "branch '%s' not found."
msgstr "分支 '%s' 未发现。"
-#: builtin/branch.c:262
+#: builtin/branch.c:263
#, c-format
msgid "Error deleting remote-tracking branch '%s'"
msgstr "无法删除远程跟踪分支 '%s'"
-#: builtin/branch.c:263
+#: builtin/branch.c:264
#, c-format
msgid "Error deleting branch '%s'"
msgstr "无法删除分支 '%s'"
-#: builtin/branch.c:270
+#: builtin/branch.c:271
#, c-format
msgid "Deleted remote-tracking branch %s (was %s).\n"
msgstr "已删除远程跟踪分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:271
+#: builtin/branch.c:272
#, c-format
msgid "Deleted branch %s (was %s).\n"
msgstr "已删除分支 %s（曾为 %s）。\n"
-#: builtin/branch.c:445
+#: builtin/branch.c:417 builtin/tag.c:58
+msgid "unable to parse format string"
+msgstr "不能解析格式化字符串"
+
+#: builtin/branch.c:450
#, c-format
msgid "Branch %s is being rebased at %s"
msgstr "分支 %s 正被变基到 %s"
-#: builtin/branch.c:449
+#: builtin/branch.c:454
#, c-format
msgid "Branch %s is being bisected at %s"
msgstr "分支 %s 正被二分查找于 %s"
-#: builtin/branch.c:464
+#: builtin/branch.c:471
+msgid "cannot copy the current branch while not on any."
+msgstr "无法拷贝当前分支因为不处于任何分支上。"
+
+#: builtin/branch.c:473
msgid "cannot rename the current branch while not on any."
msgstr "无法重命名当前分支因为不处于任何分支上。"
-#: builtin/branch.c:474
+#: builtin/branch.c:484
#, c-format
msgid "Invalid branch name: '%s'"
msgstr "无效的分支名：'%s'"
-#: builtin/branch.c:491
+#: builtin/branch.c:511
msgid "Branch rename failed"
msgstr "分支重命名失败"
-#: builtin/branch.c:494
+#: builtin/branch.c:513
+msgid "Branch copy failed"
+msgstr "分支拷贝失败"
+
+#: builtin/branch.c:517
+#, c-format
+msgid "Created a copy of a misnamed branch '%s'"
+msgstr "已为错误命名的分支 '%s' 创建了一个副本"
+
+#: builtin/branch.c:520
#, c-format
msgid "Renamed a misnamed branch '%s' away"
-msgstr "重命名掉一个错误命名的旧分支 '%s'"
+msgstr "已将错误命名的分支 '%s' 重命名"
-#: builtin/branch.c:497
+#: builtin/branch.c:526
#, c-format
msgid "Branch renamed to %s, but HEAD is not updated!"
msgstr "分支重命名为 %s，但 HEAD 没有更新！"
-#: builtin/branch.c:506
+#: builtin/branch.c:535
msgid "Branch is renamed, but update of config-file failed"
-msgstr "分支被重命名，但更新 config 文件失败"
+msgstr "分支被重命名，但更新配置文件失败"
-#: builtin/branch.c:522
+#: builtin/branch.c:537
+msgid "Branch is copied, but update of config-file failed"
+msgstr "分支已拷贝，但更新配置文件失败"
+
+#: builtin/branch.c:553
#, c-format
msgid ""
"Please edit the description for the branch\n"
@@ -5585,230 +5781,222 @@
" %s\n"
"以 '%c' 开头的行将被过滤。\n"
-#: builtin/branch.c:555
+#: builtin/branch.c:586
msgid "Generic options"
msgstr "通用选项"
-#: builtin/branch.c:557
+#: builtin/branch.c:588
msgid "show hash and subject, give twice for upstream branch"
msgstr "显示哈希值和主题，若参数出现两次则显示上游分支"
-#: builtin/branch.c:558
+#: builtin/branch.c:589
msgid "suppress informational messages"
msgstr "不显示信息"
-#: builtin/branch.c:559
+#: builtin/branch.c:590
msgid "set up tracking mode (see git-pull(1))"
msgstr "设置跟踪模式（参见 git-pull(1)）"
-#: builtin/branch.c:561
-msgid "change upstream info"
-msgstr "改变上游信息"
+#: builtin/branch.c:592
+msgid "do not use"
+msgstr "不要使用"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "upstream"
msgstr "上游"
-#: builtin/branch.c:563
+#: builtin/branch.c:594
msgid "change the upstream info"
msgstr "改变上游信息"
-#: builtin/branch.c:564
+#: builtin/branch.c:595
msgid "Unset the upstream info"
msgstr "取消上游信息的设置"
-#: builtin/branch.c:565
+#: builtin/branch.c:596
msgid "use colored output"
msgstr "使用彩色输出"
-#: builtin/branch.c:566
+#: builtin/branch.c:597
msgid "act on remote-tracking branches"
msgstr "作用于远程跟踪分支"
-#: builtin/branch.c:568 builtin/branch.c:570
+#: builtin/branch.c:599 builtin/branch.c:601
msgid "print only branches that contain the commit"
msgstr "只打印包含该提交的分支"
-#: builtin/branch.c:569 builtin/branch.c:571
+#: builtin/branch.c:600 builtin/branch.c:602
msgid "print only branches that don't contain the commit"
msgstr "只打印不包含该提交的分支"
-#: builtin/branch.c:574
+#: builtin/branch.c:605
msgid "Specific git-branch actions:"
msgstr "具体的 git-branch 动作："
-#: builtin/branch.c:575
+#: builtin/branch.c:606
msgid "list both remote-tracking and local branches"
msgstr "列出远程跟踪及本地分支"
-#: builtin/branch.c:577
+#: builtin/branch.c:608
msgid "delete fully merged branch"
msgstr "删除完全合并的分支"
-#: builtin/branch.c:578
+#: builtin/branch.c:609
msgid "delete branch (even if not merged)"
msgstr "删除分支（即使没有合并）"
-#: builtin/branch.c:579
+#: builtin/branch.c:610
msgid "move/rename a branch and its reflog"
msgstr "移动/重命名一个分支，以及它的引用日志"
-#: builtin/branch.c:580
+#: builtin/branch.c:611
msgid "move/rename a branch, even if target exists"
msgstr "移动/重命名一个分支，即使目标已存在"
-#: builtin/branch.c:581
+#: builtin/branch.c:612
+msgid "copy a branch and its reflog"
+msgstr "拷贝一个分支和它的引用日志"
+
+#: builtin/branch.c:613
+msgid "copy a branch, even if target exists"
+msgstr "拷贝一个分支，即使目标已存在"
+
+#: builtin/branch.c:614
msgid "list branch names"
msgstr "列出分支名"
-#: builtin/branch.c:582
+#: builtin/branch.c:615
msgid "create the branch's reflog"
msgstr "创建分支的引用日志"
-#: builtin/branch.c:584
+#: builtin/branch.c:617
msgid "edit the description for the branch"
msgstr "标记分支的描述"
-#: builtin/branch.c:585
+#: builtin/branch.c:618
msgid "force creation, move/rename, deletion"
msgstr "强制创建、移动/重命名、删除"
-#: builtin/branch.c:586
+#: builtin/branch.c:619
msgid "print only branches that are merged"
msgstr "只打印已经合并的分支"
-#: builtin/branch.c:587
+#: builtin/branch.c:620
msgid "print only branches that are not merged"
msgstr "只打印尚未合并的分支"
-#: builtin/branch.c:588
+#: builtin/branch.c:621
msgid "list branches in columns"
msgstr "以列的方式显示分支"
-#: builtin/branch.c:589 builtin/for-each-ref.c:39 builtin/tag.c:427
+#: builtin/branch.c:622 builtin/for-each-ref.c:40 builtin/tag.c:405
msgid "key"
msgstr "key"
-#: builtin/branch.c:590 builtin/for-each-ref.c:40 builtin/tag.c:428
+#: builtin/branch.c:623 builtin/for-each-ref.c:41 builtin/tag.c:406
msgid "field name to sort on"
msgstr "排序的字段名"
-#: builtin/branch.c:592 builtin/for-each-ref.c:42 builtin/notes.c:407
-#: builtin/notes.c:410 builtin/notes.c:570 builtin/notes.c:573
-#: builtin/tag.c:430
+#: builtin/branch.c:625 builtin/for-each-ref.c:43 builtin/notes.c:408
+#: builtin/notes.c:411 builtin/notes.c:571 builtin/notes.c:574
+#: builtin/tag.c:408
msgid "object"
msgstr "对象"
-#: builtin/branch.c:593
+#: builtin/branch.c:626
msgid "print only branches of the object"
msgstr "只打印指向该对象的分支"
-#: builtin/branch.c:595 builtin/for-each-ref.c:48 builtin/tag.c:435
+#: builtin/branch.c:628 builtin/for-each-ref.c:49 builtin/tag.c:415
msgid "sorting and filtering are case insensitive"
msgstr "排序和过滤属于大小写不敏感"
-#: builtin/branch.c:596 builtin/for-each-ref.c:38 builtin/tag.c:434
+#: builtin/branch.c:629 builtin/for-each-ref.c:38 builtin/tag.c:413
#: builtin/verify-tag.c:39
msgid "format to use for the output"
msgstr "输出格式"
-#: builtin/branch.c:615
-msgid "Failed to resolve HEAD as a valid ref."
-msgstr "无法将 HEAD 解析为有效引用。"
-
-#: builtin/branch.c:619 builtin/clone.c:728
+#: builtin/branch.c:652 builtin/clone.c:730
msgid "HEAD not found below refs/heads!"
msgstr "HEAD 没有位于 /refs/heads 之下！"
-#: builtin/branch.c:642
+#: builtin/branch.c:675
msgid "--column and --verbose are incompatible"
msgstr "--column 和 --verbose 不兼容"
-#: builtin/branch.c:653 builtin/branch.c:705
+#: builtin/branch.c:690 builtin/branch.c:742 builtin/branch.c:751
msgid "branch name required"
msgstr "必须提供分支名"
-#: builtin/branch.c:681
+#: builtin/branch.c:718
msgid "Cannot give description to detached HEAD"
msgstr "不能向分离头指针提供描述"
-#: builtin/branch.c:686
+#: builtin/branch.c:723
msgid "cannot edit description of more than one branch"
msgstr "不能为一个以上的分支编辑描述"
-#: builtin/branch.c:693
+#: builtin/branch.c:730
#, c-format
msgid "No commit on branch '%s' yet."
msgstr "分支 '%s' 尚无提交。"
-#: builtin/branch.c:696
+#: builtin/branch.c:733
#, c-format
msgid "No branch named '%s'."
msgstr "没有分支 '%s'。"
-#: builtin/branch.c:711
-msgid "too many branches for a rename operation"
-msgstr "为重命名操作提供了太多的分支名"
+#: builtin/branch.c:748
+msgid "too many branches for a copy operation"
+msgstr "为拷贝操作提供了太多的分支名"
-#: builtin/branch.c:716
-msgid "too many branches to set new upstream"
-msgstr "为设置新上游提供了太多的分支名"
+#: builtin/branch.c:757
+msgid "too many arguments for a rename operation"
+msgstr "为重命名操作提供了太多的参数"
-#: builtin/branch.c:720
+#: builtin/branch.c:762
+msgid "too many arguments to set new upstream"
+msgstr "为设置新上游提供了太多的参数"
+
+#: builtin/branch.c:766
#, 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:723 builtin/branch.c:745 builtin/branch.c:766
+#: builtin/branch.c:769 builtin/branch.c:791 builtin/branch.c:807
#, c-format
msgid "no such branch '%s'"
msgstr "没有此分支 '%s'"
-#: builtin/branch.c:727
+#: builtin/branch.c:773
#, c-format
msgid "branch '%s' does not exist"
msgstr "分支 '%s' 不存在"
-#: builtin/branch.c:739
-msgid "too many branches to unset upstream"
-msgstr "为取消上游设置操作提供了太多的分支名"
+#: builtin/branch.c:785
+msgid "too many arguments to unset upstream"
+msgstr "为取消上游设置操作提供了太多的参数"
-#: builtin/branch.c:743
+#: builtin/branch.c:789
msgid "could not unset upstream of HEAD when it does not point to any branch."
msgstr "无法取消 HEAD 的上游设置因为它没有指向一个分支"
-#: builtin/branch.c:749
+#: builtin/branch.c:795
#, c-format
msgid "Branch '%s' has no upstream information"
msgstr "分支 '%s' 没有上游信息"
-#: builtin/branch.c:763
-msgid "it does not make sense to create 'HEAD' manually"
-msgstr "手工创建 'HEAD' 没有意义"
-
-#: builtin/branch.c:769
+#: builtin/branch.c:810
msgid "-a and -r options to 'git branch' do not make sense with a branch name"
msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义"
-#: builtin/branch.c:772
-#, c-format
+#: builtin/branch.c:813
msgid ""
-"The --set-upstream flag is deprecated and will be removed. Consider using --"
-"track or --set-upstream-to\n"
+"the '--set-upstream' option is no longer supported. Please use '--track' or "
+"'--set-upstream-to' instead."
msgstr ""
-"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n"
-
-#: builtin/branch.c:789
-#, c-format
-msgid ""
-"\n"
-"If you wanted to make '%s' track '%s', do this:\n"
-"\n"
-msgstr ""
-"\n"
-"如果你想用 '%s' 跟踪 '%s', 这么做：\n"
-"\n"
+"不再支持选项 '--set-upstream'。请使用 '--track' 或 '--set-upstream-to'。"
#: builtin/bundle.c:45
#, c-format
@@ -5823,7 +6011,7 @@
msgid "Need a repository to unbundle."
msgstr "需要一个仓库来解包。"
-#: builtin/cat-file.c:519
+#: builtin/cat-file.c:521
msgid ""
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <type> | --textconv | --filters) [--path=<path>] <object>"
@@ -5831,7 +6019,7 @@
"git cat-file (-t [--allow-unknown-type] | -s [--allow-unknown-type] | -e | -"
"p | <类型> | --textconv | --filters) [--path=<路径>] <对象>"
-#: builtin/cat-file.c:520
+#: builtin/cat-file.c:522
msgid ""
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
@@ -5839,63 +6027,63 @@
"git cat-file (--batch | --batch-check) [--follow-symlinks] [--textconv | --"
"filters]"
-#: builtin/cat-file.c:557
+#: builtin/cat-file.c:559
msgid "<type> can be one of: blob, tree, commit, tag"
msgstr "<类型> 可以是其中之一：blob、tree、commit、tag"
-#: builtin/cat-file.c:558
+#: builtin/cat-file.c:560
msgid "show object type"
msgstr "显示对象类型"
-#: builtin/cat-file.c:559
+#: builtin/cat-file.c:561
msgid "show object size"
msgstr "显示对象大小"
-#: builtin/cat-file.c:561
+#: builtin/cat-file.c:563
msgid "exit with zero when there's no error"
msgstr "当没有错误时退出并返回零"
-#: builtin/cat-file.c:562
+#: builtin/cat-file.c:564
msgid "pretty-print object's content"
msgstr "美观地打印对象的内容"
-#: builtin/cat-file.c:564
+#: builtin/cat-file.c:566
msgid "for blob objects, run textconv on object's content"
msgstr "对于数据对象，对其内容做文本转换"
-#: builtin/cat-file.c:566
+#: builtin/cat-file.c:568
msgid "for blob objects, run filters on object's content"
msgstr "对于数据对象，对其内容做过滤"
-#: builtin/cat-file.c:567 git-submodule.sh:944
+#: builtin/cat-file.c:569 git-submodule.sh:931
msgid "blob"
msgstr "数据对象"
-#: builtin/cat-file.c:568
+#: builtin/cat-file.c:570
msgid "use a specific path for --textconv/--filters"
msgstr "对于 --textconv/--filters 使用一个特定的路径"
-#: builtin/cat-file.c:570
+#: builtin/cat-file.c:572
msgid "allow -s and -t to work with broken/corrupt objects"
msgstr "允许 -s 和 -t 对损坏的对象生效"
-#: builtin/cat-file.c:571
+#: builtin/cat-file.c:573
msgid "buffer --batch output"
msgstr "缓冲 --batch 的输出"
-#: builtin/cat-file.c:573
+#: builtin/cat-file.c:575
msgid "show info and content of objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息和内容"
-#: builtin/cat-file.c:576
+#: builtin/cat-file.c:578
msgid "show info about objects fed from the standard input"
msgstr "显示从标准输入提供的对象的信息"
-#: builtin/cat-file.c:579
+#: builtin/cat-file.c:581
msgid "follow in-tree symlinks (used with --batch or --batch-check)"
msgstr "跟随树内符号链接（和 --batch 或 --batch-check 共用）"
-#: builtin/cat-file.c:581
+#: builtin/cat-file.c:583
msgid "show all objects with --batch or --batch-check"
msgstr "使用 --batch 或 --batch-check 参数显示所有对象"
@@ -5923,7 +6111,7 @@
msgid "terminate input and output records by a NUL character"
msgstr "输入和输出的记录使用 NUL 字符终结"
-#: builtin/check-ignore.c:20 builtin/checkout.c:1143 builtin/gc.c:357
+#: builtin/check-ignore.c:20 builtin/checkout.c:1118 builtin/gc.c:358
msgid "suppress progress reporting"
msgstr "不显示进度报告"
@@ -5980,161 +6168,161 @@
msgid "git checkout-index [<options>] [--] [<file>...]"
msgstr "git checkout-index [<选项>] [--] [<文件>...]"
-#: builtin/checkout-index.c:145
+#: builtin/checkout-index.c:143
msgid "stage should be between 1 and 3 or all"
msgstr "索引值应该取值 1 到 3 或者 all"
-#: builtin/checkout-index.c:161
+#: builtin/checkout-index.c:159
msgid "check out all files in the index"
msgstr "检出索引区的所有文件"
-#: builtin/checkout-index.c:162
+#: builtin/checkout-index.c:160
msgid "force overwrite of existing files"
msgstr "强制覆盖现有的文件"
-#: builtin/checkout-index.c:164
+#: builtin/checkout-index.c:162
msgid "no warning for existing files and files not in index"
msgstr "存在或不在索引中的文件都没有警告"
-#: builtin/checkout-index.c:166
+#: builtin/checkout-index.c:164
msgid "don't checkout new files"
msgstr "不检出新文件"
-#: builtin/checkout-index.c:168
+#: builtin/checkout-index.c:166
msgid "update stat information in the index file"
msgstr "更新索引中文件的状态信息"
-#: builtin/checkout-index.c:172
+#: builtin/checkout-index.c:170
msgid "read list of paths from the standard input"
msgstr "从标准输入读取路径列表"
-#: builtin/checkout-index.c:174
+#: builtin/checkout-index.c:172
msgid "write the content to temporary files"
msgstr "将内容写入临时文件"
-#: builtin/checkout-index.c:175 builtin/column.c:31
-#: builtin/submodule--helper.c:635 builtin/submodule--helper.c:638
-#: builtin/submodule--helper.c:644 builtin/submodule--helper.c:980
-#: builtin/worktree.c:478
+#: builtin/checkout-index.c:173 builtin/column.c:31
+#: builtin/submodule--helper.c:866 builtin/submodule--helper.c:869
+#: builtin/submodule--helper.c:875 builtin/submodule--helper.c:1237
+#: builtin/worktree.c:552
msgid "string"
msgstr "字符串"
-#: builtin/checkout-index.c:176
+#: builtin/checkout-index.c:174
msgid "when creating files, prepend <string>"
msgstr "在创建文件时，在前面加上 <字符串>"
-#: builtin/checkout-index.c:178
+#: builtin/checkout-index.c:176
msgid "copy out the files from named stage"
msgstr "从指定暂存区中拷出文件"
-#: builtin/checkout.c:26
+#: builtin/checkout.c:27
msgid "git checkout [<options>] <branch>"
msgstr "git checkout [<选项>] <分支>"
-#: builtin/checkout.c:27
+#: builtin/checkout.c:28
msgid "git checkout [<options>] [<branch>] -- <file>..."
msgstr "git checkout [<选项>] [<分支>] -- <文件>..."
-#: builtin/checkout.c:135 builtin/checkout.c:168
+#: builtin/checkout.c:136 builtin/checkout.c:169
#, c-format
msgid "path '%s' does not have our version"
msgstr "路径 '%s' 没有我们的版本"
-#: builtin/checkout.c:137 builtin/checkout.c:170
+#: builtin/checkout.c:138 builtin/checkout.c:171
#, c-format
msgid "path '%s' does not have their version"
msgstr "路径 '%s' 没有他们的版本"
-#: builtin/checkout.c:153
+#: builtin/checkout.c:154
#, c-format
msgid "path '%s' does not have all necessary versions"
msgstr "路径 '%s' 没有全部必须的版本"
-#: builtin/checkout.c:197
+#: builtin/checkout.c:198
#, c-format
msgid "path '%s' does not have necessary versions"
msgstr "路径 '%s' 没有必须的版本"
-#: builtin/checkout.c:214
+#: builtin/checkout.c:215
#, c-format
msgid "path '%s': cannot merge"
msgstr "path '%s'：无法合并"
-#: builtin/checkout.c:231
+#: builtin/checkout.c:232
#, c-format
msgid "Unable to add merge result for '%s'"
msgstr "无法为 '%s' 添加合并结果"
-#: builtin/checkout.c:253 builtin/checkout.c:256 builtin/checkout.c:259
-#: builtin/checkout.c:262
+#: builtin/checkout.c:254 builtin/checkout.c:257 builtin/checkout.c:260
+#: builtin/checkout.c:263
#, c-format
msgid "'%s' cannot be used with updating paths"
msgstr "'%s' 不能在更新路径时使用"
-#: builtin/checkout.c:265 builtin/checkout.c:268
+#: builtin/checkout.c:266 builtin/checkout.c:269
#, c-format
msgid "'%s' cannot be used with %s"
msgstr "'%s' 不能和 %s 同时使用"
-#: builtin/checkout.c:271
+#: builtin/checkout.c:272
#, c-format
msgid "Cannot update paths and switch to branch '%s' at the same time."
msgstr "不能同时更新路径并切换到分支'%s'。"
-#: builtin/checkout.c:342 builtin/checkout.c:349
+#: builtin/checkout.c:341 builtin/checkout.c:348
#, c-format
msgid "path '%s' is unmerged"
msgstr "路径 '%s' 未合并"
-#: builtin/checkout.c:497
+#: builtin/checkout.c:506
msgid "you need to resolve your current index first"
msgstr "您需要先解决当前索引的冲突"
-#: builtin/checkout.c:628
+#: builtin/checkout.c:637
#, c-format
msgid "Can not do reflog for '%s': %s\n"
msgstr "不能对 '%s' 执行 reflog 操作：%s\n"
-#: builtin/checkout.c:669
+#: builtin/checkout.c:678
msgid "HEAD is now at"
msgstr "HEAD 目前位于"
-#: builtin/checkout.c:673 builtin/clone.c:682
+#: builtin/checkout.c:682 builtin/clone.c:684
msgid "unable to update HEAD"
msgstr "不能更新 HEAD"
-#: builtin/checkout.c:677
+#: builtin/checkout.c:686
#, c-format
msgid "Reset branch '%s'\n"
msgstr "重置分支 '%s'\n"
-#: builtin/checkout.c:680
+#: builtin/checkout.c:689
#, c-format
msgid "Already on '%s'\n"
msgstr "已经位于 '%s'\n"
-#: builtin/checkout.c:684
+#: builtin/checkout.c:693
#, c-format
msgid "Switched to and reset branch '%s'\n"
msgstr "切换并重置分支 '%s'\n"
-#: builtin/checkout.c:686 builtin/checkout.c:1075
+#: builtin/checkout.c:695 builtin/checkout.c:1051
#, c-format
msgid "Switched to a new branch '%s'\n"
msgstr "切换到一个新分支 '%s'\n"
-#: builtin/checkout.c:688
+#: builtin/checkout.c:697
#, c-format
msgid "Switched to branch '%s'\n"
msgstr "切换到分支 '%s'\n"
# 译者：注意保持前导空格
-#: builtin/checkout.c:739
+#: builtin/checkout.c:748
#, c-format
msgid " ... and %d more.\n"
msgstr " ... 及其它 %d 个。\n"
-#: builtin/checkout.c:745
+#: builtin/checkout.c:754
#, c-format
msgid ""
"Warning: you are leaving %d commit behind, not connected to\n"
@@ -6155,7 +6343,7 @@
"\n"
"%s\n"
-#: builtin/checkout.c:764
+#: builtin/checkout.c:773
#, c-format
msgid ""
"If you want to keep it by creating a new branch, this may be a good time\n"
@@ -6182,160 +6370,160 @@
" git branch <新分支名> %s\n"
"\n"
-#: builtin/checkout.c:800
+#: builtin/checkout.c:814
msgid "internal error in revision walk"
msgstr "在版本遍历时遇到内部错误"
-#: builtin/checkout.c:804
+#: builtin/checkout.c:818
msgid "Previous HEAD position was"
msgstr "之前的 HEAD 位置是"
-#: builtin/checkout.c:832 builtin/checkout.c:1070
+#: builtin/checkout.c:848 builtin/checkout.c:1046
msgid "You are on a branch yet to be born"
msgstr "您位于一个尚未初始化的分支"
-#: builtin/checkout.c:976
+#: builtin/checkout.c:952
#, c-format
msgid "only one reference expected, %d given."
msgstr "应只有一个引用，却给出了 %d 个"
-#: builtin/checkout.c:1016 builtin/worktree.c:215
+#: builtin/checkout.c:992 builtin/worktree.c:247
#, c-format
msgid "invalid reference: %s"
msgstr "无效引用：%s"
-#: builtin/checkout.c:1045
+#: builtin/checkout.c:1021
#, c-format
msgid "reference is not a tree: %s"
msgstr "引用不是一个树：%s"
-#: builtin/checkout.c:1084
+#: builtin/checkout.c:1060
msgid "paths cannot be used with switching branches"
msgstr "路径不能和切换分支同时使用"
-#: builtin/checkout.c:1087 builtin/checkout.c:1091
+#: builtin/checkout.c:1063 builtin/checkout.c:1067
#, c-format
msgid "'%s' cannot be used with switching branches"
msgstr "'%s' 不能和切换分支同时使用"
-#: builtin/checkout.c:1095 builtin/checkout.c:1098 builtin/checkout.c:1103
-#: builtin/checkout.c:1106
+#: builtin/checkout.c:1071 builtin/checkout.c:1074 builtin/checkout.c:1079
+#: builtin/checkout.c:1082
#, c-format
msgid "'%s' cannot be used with '%s'"
msgstr "'%s' 不能和 '%s' 同时使用"
-#: builtin/checkout.c:1111
+#: builtin/checkout.c:1087
#, c-format
msgid "Cannot switch branch to a non-commit '%s'"
msgstr "不能切换分支到一个非提交 '%s'"
-#: builtin/checkout.c:1144 builtin/checkout.c:1146 builtin/clone.c:113
-#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:328
-#: builtin/worktree.c:330
+#: builtin/checkout.c:1119 builtin/checkout.c:1121 builtin/clone.c:114
+#: builtin/remote.c:166 builtin/remote.c:168 builtin/worktree.c:369
+#: builtin/worktree.c:371
msgid "branch"
msgstr "分支"
-#: builtin/checkout.c:1145
+#: builtin/checkout.c:1120
msgid "create and checkout a new branch"
msgstr "创建并检出一个新的分支"
-#: builtin/checkout.c:1147
+#: builtin/checkout.c:1122
msgid "create/reset and checkout a branch"
msgstr "创建/重置并检出一个分支"
-#: builtin/checkout.c:1148
+#: builtin/checkout.c:1123
msgid "create reflog for new branch"
msgstr "为新的分支创建引用日志"
-#: builtin/checkout.c:1149 builtin/worktree.c:332
+#: builtin/checkout.c:1124 builtin/worktree.c:373
msgid "detach HEAD at named commit"
msgstr "HEAD 从指定的提交分离"
-#: builtin/checkout.c:1150
+#: builtin/checkout.c:1125
msgid "set upstream info for new branch"
msgstr "为新的分支设置上游信息"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new-branch"
msgstr "新分支"
-#: builtin/checkout.c:1152
+#: builtin/checkout.c:1127
msgid "new unparented branch"
msgstr "新的没有父提交的分支"
-#: builtin/checkout.c:1153
+#: builtin/checkout.c:1128
msgid "checkout our version for unmerged files"
msgstr "对尚未合并的文件检出我们的版本"
-#: builtin/checkout.c:1155
+#: builtin/checkout.c:1130
msgid "checkout their version for unmerged files"
msgstr "对尚未合并的文件检出他们的版本"
-#: builtin/checkout.c:1157
+#: builtin/checkout.c:1132
msgid "force checkout (throw away local modifications)"
msgstr "强制检出（丢弃本地修改）"
-#: builtin/checkout.c:1158
+#: builtin/checkout.c:1133
msgid "perform a 3-way merge with the new branch"
msgstr "和新的分支执行三方合并"
-#: builtin/checkout.c:1159 builtin/merge.c:235
+#: builtin/checkout.c:1134 builtin/merge.c:238
msgid "update ignored files (default)"
msgstr "更新忽略的文件（默认）"
-#: builtin/checkout.c:1160 builtin/log.c:1483 parse-options.h:251
+#: builtin/checkout.c:1135 builtin/log.c:1496 parse-options.h:251
msgid "style"
msgstr "风格"
-#: builtin/checkout.c:1161
+#: builtin/checkout.c:1136
msgid "conflict style (merge or diff3)"
msgstr "冲突输出风格（merge 或 diff3）"
-#: builtin/checkout.c:1164
+#: builtin/checkout.c:1139
msgid "do not limit pathspecs to sparse entries only"
msgstr "对路径不做稀疏检出的限制"
-#: builtin/checkout.c:1166
+#: builtin/checkout.c:1141
msgid "second guess 'git checkout <no-such-branch>'"
msgstr "二次猜测'git checkout <无此分支>'"
-#: builtin/checkout.c:1168
+#: builtin/checkout.c:1143
msgid "do not check if another worktree is holding the given ref"
msgstr "不检查指定的引用是否被其他工作区所占用"
-#: builtin/checkout.c:1172 builtin/clone.c:80 builtin/fetch.c:114
-#: builtin/merge.c:232 builtin/pull.c:120 builtin/push.c:544
+#: builtin/checkout.c:1147 builtin/clone.c:81 builtin/fetch.c:137
+#: builtin/merge.c:235 builtin/pull.c:123 builtin/push.c:556
#: builtin/send-pack.c:173
msgid "force progress reporting"
msgstr "强制显示进度报告"
-#: builtin/checkout.c:1203
+#: builtin/checkout.c:1177
msgid "-b, -B and --orphan are mutually exclusive"
msgstr "-b、-B 和 --orphan 是互斥的"
-#: builtin/checkout.c:1220
+#: builtin/checkout.c:1194
msgid "--track needs a branch name"
msgstr "--track 需要一个分支名"
-#: builtin/checkout.c:1225
+#: builtin/checkout.c:1199
msgid "Missing branch name; try -b"
msgstr "缺少分支名；尝试 -b"
-#: builtin/checkout.c:1261
+#: builtin/checkout.c:1235
msgid "invalid path specification"
msgstr "无效的路径规格"
-#: builtin/checkout.c:1268
+#: builtin/checkout.c:1242
#, c-format
msgid "'%s' is not a commit and a branch '%s' cannot be created from it"
msgstr "'%s' 不是一个提交，不能基于它创建分支 '%s'"
-#: builtin/checkout.c:1272
+#: builtin/checkout.c:1246
#, c-format
msgid "git checkout: --detach does not take a path argument '%s'"
msgstr "git checkout：--detach 不能接收路径参数 '%s'"
-#: builtin/checkout.c:1276
+#: builtin/checkout.c:1250
msgid ""
"git checkout: --ours/--theirs, --force and --merge are incompatible when\n"
"checking out of the index."
@@ -6373,7 +6561,7 @@
msgid "failed to remove %s"
msgstr "无法删除 %s"
-#: builtin/clean.c:298 git-add--interactive.perl:572
+#: builtin/clean.c:302 git-add--interactive.perl:572
#, c-format
msgid ""
"Prompt help:\n"
@@ -6386,7 +6574,7 @@
"foo - 通过唯一前缀选择一个选项\n"
" - （空）什么也不选择\n"
-#: builtin/clean.c:302 git-add--interactive.perl:581
+#: builtin/clean.c:306 git-add--interactive.perl:581
#, c-format
msgid ""
"Prompt help:\n"
@@ -6407,38 +6595,38 @@
"* - 选择所有选项\n"
" - （空）结束选择\n"
-#: builtin/clean.c:518 git-add--interactive.perl:547
+#: builtin/clean.c:522 git-add--interactive.perl:547
#: git-add--interactive.perl:552
#, c-format, perl-format
msgid "Huh (%s)?\n"
msgstr "嗯（%s）？\n"
-#: builtin/clean.c:660
+#: builtin/clean.c:664
#, c-format
msgid "Input ignore patterns>> "
msgstr "输入模版以排除条目>> "
-#: builtin/clean.c:697
+#: builtin/clean.c:701
#, c-format
msgid "WARNING: Cannot find items matched by: %s"
msgstr "警告：无法找到和 %s 匹配的条目"
-#: builtin/clean.c:718
+#: builtin/clean.c:722
msgid "Select items to delete"
msgstr "选择要删除的条目"
#. TRANSLATORS: Make sure to keep [y/N] as is
-#: builtin/clean.c:759
+#: builtin/clean.c:763
#, c-format
msgid "Remove %s [y/N]? "
msgstr "删除 %s [y/N]？"
-#: builtin/clean.c:784 git-add--interactive.perl:1616
+#: builtin/clean.c:788 git-add--interactive.perl:1616
#, c-format
msgid "Bye.\n"
msgstr "再见。\n"
-#: builtin/clean.c:792
+#: builtin/clean.c:796
msgid ""
"clean - start cleaning\n"
"filter by pattern - exclude items from deletion\n"
@@ -6456,212 +6644,215 @@
"help - 显示本帮助\n"
"? - 显示如何在提示符下选择的帮助"
-#: builtin/clean.c:819 git-add--interactive.perl:1692
+#: builtin/clean.c:823 git-add--interactive.perl:1692
msgid "*** Commands ***"
msgstr "*** 命令 ***"
-#: builtin/clean.c:820 git-add--interactive.perl:1689
+#: builtin/clean.c:824 git-add--interactive.perl:1689
msgid "What now"
msgstr "请选择"
-#: builtin/clean.c:828
+#: builtin/clean.c:832
msgid "Would remove the following item:"
msgid_plural "Would remove the following items:"
msgstr[0] "将删除如下条目："
msgstr[1] "将删除如下条目："
-#: builtin/clean.c:844
+#: builtin/clean.c:848
msgid "No more files to clean, exiting."
msgstr "没有要清理的文件，退出。"
-#: builtin/clean.c:906
+#: builtin/clean.c:910
msgid "do not print names of files removed"
msgstr "不打印删除文件的名称"
-#: builtin/clean.c:908
+#: builtin/clean.c:912
msgid "force"
msgstr "强制"
-#: builtin/clean.c:909
+#: builtin/clean.c:913
msgid "interactive cleaning"
msgstr "交互式清除"
-#: builtin/clean.c:911
+#: builtin/clean.c:915
msgid "remove whole directories"
msgstr "删除整个目录"
-#: builtin/clean.c:912 builtin/describe.c:452 builtin/describe.c:454
-#: builtin/grep.c:1082 builtin/ls-files.c:546 builtin/name-rev.c:397
-#: builtin/name-rev.c:399 builtin/show-ref.c:176
+#: builtin/clean.c:916 builtin/describe.c:530 builtin/describe.c:532
+#: builtin/grep.c:863 builtin/log.c:155 builtin/log.c:157
+#: builtin/ls-files.c:548 builtin/name-rev.c:397 builtin/name-rev.c:399
+#: builtin/show-ref.c:176
msgid "pattern"
msgstr "模式"
-#: builtin/clean.c:913
+#: builtin/clean.c:917
msgid "add <pattern> to ignore rules"
msgstr "添加 <模式> 到忽略规则"
-#: builtin/clean.c:914
+#: builtin/clean.c:918
msgid "remove ignored files, too"
msgstr "也删除忽略的文件"
-#: builtin/clean.c:916
+#: builtin/clean.c:920
msgid "remove only ignored files"
msgstr "只删除忽略的文件"
-#: builtin/clean.c:934
+#: builtin/clean.c:938
msgid "-x and -X cannot be used together"
msgstr "-x 和 -X 不能同时使用"
-#: builtin/clean.c:938
+#: builtin/clean.c:942
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:941
+#: builtin/clean.c:945
msgid ""
"clean.requireForce defaults to true and neither -i, -n, nor -f given; "
"refusing to clean"
msgstr ""
"clean.requireForce 默认为 true 且未提供 -i、-n 或 -f 选项，拒绝执行清理动作"
-#: builtin/clone.c:38
+#: builtin/clone.c:39
msgid "git clone [<options>] [--] <repo> [<dir>]"
msgstr "git clone [<选项>] [--] <仓库> [<路径>]"
-#: builtin/clone.c:82
+#: builtin/clone.c:83
msgid "don't create a checkout"
msgstr "不创建一个检出"
-#: builtin/clone.c:83 builtin/clone.c:85 builtin/init-db.c:479
+#: builtin/clone.c:84 builtin/clone.c:86 builtin/init-db.c:479
msgid "create a bare repository"
msgstr "创建一个纯仓库"
-#: builtin/clone.c:87
+#: builtin/clone.c:88
msgid "create a mirror repository (implies bare)"
msgstr "创建一个镜像仓库（也是纯仓库）"
-#: builtin/clone.c:89
+#: builtin/clone.c:90
msgid "to clone from a local repository"
msgstr "从本地仓库克隆"
-#: builtin/clone.c:91
+#: builtin/clone.c:92
msgid "don't use local hardlinks, always copy"
msgstr "不使用本地硬链接，始终复制"
-#: builtin/clone.c:93
+#: builtin/clone.c:94
msgid "setup as shared repository"
msgstr "设置为共享仓库"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "pathspec"
msgstr "路径规格"
-#: builtin/clone.c:95 builtin/clone.c:99
+#: builtin/clone.c:96 builtin/clone.c:100
msgid "initialize submodules in the clone"
msgstr "在克隆时初始化子模组"
-#: builtin/clone.c:102
+#: builtin/clone.c:103
msgid "number of submodules cloned in parallel"
msgstr "并发克隆的子模组的数量"
-#: builtin/clone.c:103 builtin/init-db.c:476
+#: builtin/clone.c:104 builtin/init-db.c:476
msgid "template-directory"
msgstr "模板目录"
-#: builtin/clone.c:104 builtin/init-db.c:477
+#: builtin/clone.c:105 builtin/init-db.c:477
msgid "directory from which templates will be used"
msgstr "模板目录将被使用"
-#: builtin/clone.c:106 builtin/clone.c:108 builtin/submodule--helper.c:642
-#: builtin/submodule--helper.c:983
+#: builtin/clone.c:107 builtin/clone.c:109 builtin/submodule--helper.c:873
+#: builtin/submodule--helper.c:1240
msgid "reference repository"
msgstr "参考仓库"
-#: builtin/clone.c:110
+#: builtin/clone.c:111
msgid "use --reference only while cloning"
msgstr "仅在克隆时参考 --reference 指向的本地仓库"
-#: builtin/clone.c:111 builtin/column.c:27 builtin/merge-file.c:44
+#: builtin/clone.c:112 builtin/column.c:27 builtin/merge-file.c:44
msgid "name"
msgstr "名称"
-#: builtin/clone.c:112
+#: builtin/clone.c:113
msgid "use <name> instead of 'origin' to track upstream"
msgstr "使用 <名称> 而不是 'origin' 去跟踪上游"
-#: builtin/clone.c:114
+#: builtin/clone.c:115
msgid "checkout <branch> instead of the remote's HEAD"
msgstr "检出 <分支> 而不是远程 HEAD"
-#: builtin/clone.c:116
+#: builtin/clone.c:117
msgid "path to git-upload-pack on the remote"
msgstr "远程 git-upload-pack 路径"
-#: builtin/clone.c:117 builtin/fetch.c:115 builtin/grep.c:1025
-#: builtin/pull.c:205
+#: builtin/clone.c:118 builtin/fetch.c:138 builtin/grep.c:806
+#: builtin/pull.c:211
msgid "depth"
msgstr "深度"
-#: builtin/clone.c:118
+#: builtin/clone.c:119
msgid "create a shallow clone of that depth"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/clone.c:119 builtin/fetch.c:117 builtin/pack-objects.c:2932
+#: builtin/clone.c:120 builtin/fetch.c:140 builtin/pack-objects.c:2991
#: parse-options.h:142
msgid "time"
msgstr "时间"
-#: builtin/clone.c:120
+#: builtin/clone.c:121
msgid "create a shallow clone since a specific time"
msgstr "从一个特定时间创建一个浅克隆"
-#: builtin/clone.c:121 builtin/fetch.c:119
+#: builtin/clone.c:122 builtin/fetch.c:142
msgid "revision"
msgstr "版本"
-#: builtin/clone.c:122 builtin/fetch.c:120
+#: builtin/clone.c:123 builtin/fetch.c:143
msgid "deepen history of shallow clone, excluding rev"
msgstr "深化浅克隆的历史，除了特定版本"
-#: builtin/clone.c:124
+#: builtin/clone.c:125
msgid "clone only one branch, HEAD or --branch"
msgstr "只克隆一个分支、HEAD 或 --branch"
-#: builtin/clone.c:126
+#: builtin/clone.c:127
msgid "don't clone any tags, and make later fetches not to follow them"
msgstr "不要克隆任何标签，并且后续获取操作也不下载它们"
-#: builtin/clone.c:128
+#: builtin/clone.c:129
msgid "any cloned submodules will be shallow"
msgstr "子模组将以浅下载模式克隆"
-#: builtin/clone.c:129 builtin/init-db.c:485
+#: builtin/clone.c:130 builtin/init-db.c:485
msgid "gitdir"
msgstr "git目录"
-#: builtin/clone.c:130 builtin/init-db.c:486
+#: builtin/clone.c:131 builtin/init-db.c:486
msgid "separate git dir from working tree"
msgstr "git目录和工作区分离"
-#: builtin/clone.c:131
+#: builtin/clone.c:132
msgid "key=value"
msgstr "key=value"
-#: builtin/clone.c:132
+#: builtin/clone.c:133
msgid "set config inside the new repository"
msgstr "在新仓库中设置配置信息"
-#: builtin/clone.c:133 builtin/fetch.c:137 builtin/push.c:555
+#: builtin/clone.c:134 builtin/fetch.c:160 builtin/pull.c:224
+#: builtin/push.c:567
msgid "use IPv4 addresses only"
msgstr "只使用 IPv4 地址"
-#: builtin/clone.c:135 builtin/fetch.c:139 builtin/push.c:557
+#: builtin/clone.c:136 builtin/fetch.c:162 builtin/pull.c:227
+#: builtin/push.c:569
msgid "use IPv6 addresses only"
msgstr "只使用 IPv6 地址"
-#: builtin/clone.c:272
+#: builtin/clone.c:273
msgid ""
"No directory name could be guessed.\n"
"Please specify a directory on the command line"
@@ -6669,42 +6860,42 @@
"无法猜到目录名。\n"
"请在命令行指定一个目录"
-#: builtin/clone.c:325
+#: builtin/clone.c:326
#, c-format
msgid "info: Could not add alternate for '%s': %s\n"
msgstr "info: 不能为 '%s' 添加一个备用：%s\n"
-#: builtin/clone.c:397
+#: builtin/clone.c:398
#, c-format
msgid "failed to open '%s'"
msgstr "无法打开 '%s'"
-#: builtin/clone.c:405
+#: builtin/clone.c:406
#, c-format
msgid "%s exists and is not a directory"
msgstr "%s 存在且不是一个目录"
-#: builtin/clone.c:419
+#: builtin/clone.c:420
#, c-format
msgid "failed to stat %s\n"
msgstr "对 %s 调用 stat 失败\n"
-#: builtin/clone.c:441
+#: builtin/clone.c:442
#, c-format
msgid "failed to create link '%s'"
msgstr "无法创建链接 '%s'"
-#: builtin/clone.c:445
+#: builtin/clone.c:446
#, c-format
msgid "failed to copy file to '%s'"
msgstr "无法拷贝文件至 '%s'"
-#: builtin/clone.c:470
+#: builtin/clone.c:472
#, c-format
msgid "done.\n"
msgstr "完成。\n"
-#: builtin/clone.c:482
+#: builtin/clone.c:484
msgid ""
"Clone succeeded, but checkout failed.\n"
"You can inspect what was checked out with 'git status'\n"
@@ -6714,135 +6905,130 @@
"您可以通过 'git status' 检查哪些已被检出，然后使用命令\n"
"'git checkout -f HEAD' 重试\n"
-#: builtin/clone.c:559
+#: builtin/clone.c:561
#, c-format
msgid "Could not find remote branch %s to clone."
msgstr "不能发现要克隆的远程分支 %s。"
-#: builtin/clone.c:654
+#: builtin/clone.c:656
msgid "remote did not send all necessary objects"
msgstr "远程没有发送所有必须的对象"
-#: builtin/clone.c:670
+#: builtin/clone.c:672
#, c-format
msgid "unable to update %s"
msgstr "不能更新 %s"
-#: builtin/clone.c:719
+#: builtin/clone.c:721
msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n"
msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n"
-#: builtin/clone.c:750
+#: builtin/clone.c:751
msgid "unable to checkout working tree"
msgstr "不能检出工作区"
-#: builtin/clone.c:792
+#: builtin/clone.c:796
msgid "unable to write parameters to config file"
msgstr "无法将参数写入配置文件"
-#: builtin/clone.c:855
+#: builtin/clone.c:859
msgid "cannot repack to clean up"
msgstr "无法执行 repack 来清理"
-#: builtin/clone.c:857
+#: builtin/clone.c:861
msgid "cannot unlink temporary alternates file"
msgstr "无法删除临时的 alternates 文件"
-#: builtin/clone.c:890 builtin/receive-pack.c:1945
+#: builtin/clone.c:894 builtin/receive-pack.c:1945
msgid "Too many arguments."
msgstr "太多参数。"
-#: builtin/clone.c:894
+#: builtin/clone.c:898
msgid "You must specify a repository to clone."
msgstr "您必须指定一个仓库来克隆。"
-#: builtin/clone.c:907
+#: builtin/clone.c:911
#, c-format
msgid "--bare and --origin %s options are incompatible."
msgstr "--bare 和 --origin %s 选项不兼容。"
-#: builtin/clone.c:910
+#: builtin/clone.c:914
msgid "--bare and --separate-git-dir are incompatible."
msgstr "--bare 和 --separate-git-dir 选项不兼容。"
-#: builtin/clone.c:923
+#: builtin/clone.c:927
#, c-format
msgid "repository '%s' does not exist"
msgstr "仓库 '%s' 不存在"
-#: builtin/clone.c:929 builtin/fetch.c:1337
+#: builtin/clone.c:933 builtin/fetch.c:1358
#, c-format
msgid "depth %s is not a positive number"
msgstr "深度 %s 不是一个正数"
-#: builtin/clone.c:939
+#: builtin/clone.c:943
#, c-format
msgid "destination path '%s' already exists and is not an empty directory."
msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。"
-#: builtin/clone.c:949
+#: builtin/clone.c:953
#, c-format
msgid "working tree '%s' already exists."
msgstr "工作区 '%s' 已经存在。"
-#: builtin/clone.c:964 builtin/clone.c:975 builtin/difftool.c:260
-#: builtin/worktree.c:222 builtin/worktree.c:252
+#: builtin/clone.c:968 builtin/clone.c:979 builtin/difftool.c:270
+#: builtin/worktree.c:253 builtin/worktree.c:283
#, c-format
msgid "could not create leading directories of '%s'"
msgstr "不能为 '%s' 创建先导目录"
-#: builtin/clone.c:967
+#: builtin/clone.c:971
#, c-format
msgid "could not create work tree dir '%s'"
msgstr "不能创建工作区目录 '%s'"
-#: builtin/clone.c:979
+#: builtin/clone.c:983
#, c-format
msgid "Cloning into bare repository '%s'...\n"
msgstr "克隆到纯仓库 '%s'...\n"
-#: builtin/clone.c:981
+#: builtin/clone.c:985
#, c-format
msgid "Cloning into '%s'...\n"
msgstr "正克隆到 '%s'...\n"
-#: builtin/clone.c:1005
+#: builtin/clone.c:1009
msgid ""
"clone --recursive is not compatible with both --reference and --reference-if-"
"able"
msgstr "clone --recursive 和 --reference 以及 --reference-if-able 不兼容"
-#: builtin/clone.c:1067
+#: builtin/clone.c:1071
msgid "--depth is ignored in local clones; use file:// instead."
msgstr "--depth 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1069
+#: builtin/clone.c:1073
msgid "--shallow-since is ignored in local clones; use file:// instead."
msgstr "--shallow-since 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1071
+#: builtin/clone.c:1075
msgid "--shallow-exclude is ignored in local clones; use file:// instead."
msgstr "--shallow-exclude 在本地克隆时被忽略，请改用 file:// 协议。"
-#: builtin/clone.c:1074
+#: builtin/clone.c:1078
msgid "source repository is shallow, ignoring --local"
msgstr "源仓库是浅克隆，忽略 --local"
-#: builtin/clone.c:1079
+#: builtin/clone.c:1083
msgid "--local is ignored"
msgstr "--local 被忽略"
-#: builtin/clone.c:1083
-#, c-format
-msgid "Don't know how to clone %s"
-msgstr "不知道如何克隆 %s"
-
-#: builtin/clone.c:1138 builtin/clone.c:1146
+#: builtin/clone.c:1139 builtin/clone.c:1147
#, c-format
msgid "Remote branch %s not found in upstream %s"
msgstr "远程分支 %s 在上游 %s 未发现"
-#: builtin/clone.c:1149
+#: builtin/clone.c:1150
msgid "You appear to have cloned an empty repository."
msgstr "您似乎克隆了一个空仓库。"
@@ -6976,98 +7162,98 @@
"然后执行 \"git cherry-pick --continue\" 继续对其余提交执行拣选\n"
"操作。\n"
-#: builtin/commit.c:319
+#: builtin/commit.c:318
msgid "failed to unpack HEAD tree object"
msgstr "无法解包 HEAD 树对象"
-#: builtin/commit.c:360
+#: builtin/commit.c:359
msgid "unable to create temporary index"
msgstr "不能创建临时索引"
-#: builtin/commit.c:366
+#: builtin/commit.c:365
msgid "interactive add failed"
msgstr "交互式添加失败"
-#: builtin/commit.c:379
+#: builtin/commit.c:378
msgid "unable to update temporary index"
msgstr "无法更新临时索引"
-#: builtin/commit.c:381
+#: builtin/commit.c:380
msgid "Failed to update main cache tree"
msgstr "不能更新树的主缓存"
-#: builtin/commit.c:405 builtin/commit.c:428 builtin/commit.c:477
+#: builtin/commit.c:405 builtin/commit.c:429 builtin/commit.c:478
msgid "unable to write new_index file"
msgstr "无法写 new_index 文件"
-#: builtin/commit.c:459
+#: builtin/commit.c:461
msgid "cannot do a partial commit during a merge."
msgstr "在合并过程中不能做部分提交。"
-#: builtin/commit.c:461
+#: builtin/commit.c:463
msgid "cannot do a partial commit during a cherry-pick."
msgstr "在拣选过程中不能做部分提交。"
-#: builtin/commit.c:470
+#: builtin/commit.c:471
msgid "cannot read the index"
msgstr "无法读取索引"
-#: builtin/commit.c:489
+#: builtin/commit.c:490
msgid "unable to write temporary index file"
msgstr "无法写临时索引文件"
-#: builtin/commit.c:583
+#: builtin/commit.c:587
#, c-format
msgid "commit '%s' lacks author header"
msgstr "提交 '%s' 缺少作者信息"
-#: builtin/commit.c:585
+#: builtin/commit.c:589
#, c-format
msgid "commit '%s' has malformed author line"
msgstr "提交 '%s' 有非法的作者信息"
-#: builtin/commit.c:604
+#: builtin/commit.c:608
msgid "malformed --author parameter"
msgstr "非法的 --author 参数"
-#: builtin/commit.c:656
+#: builtin/commit.c:660
msgid ""
"unable to select a comment character that is not used\n"
"in the current commit message"
msgstr "无法选择一个未被当前提交说明使用的注释字符"
-#: builtin/commit.c:693 builtin/commit.c:726 builtin/commit.c:1093
+#: builtin/commit.c:697 builtin/commit.c:730 builtin/commit.c:1114
#, c-format
msgid "could not lookup commit %s"
msgstr "不能查询提交 %s"
-#: builtin/commit.c:705 builtin/shortlog.c:295
+#: builtin/commit.c:709 builtin/shortlog.c:309
#, c-format
msgid "(reading log message from standard input)\n"
msgstr "（正从标准输入中读取日志信息）\n"
-#: builtin/commit.c:707
+#: builtin/commit.c:711
msgid "could not read log from standard input"
msgstr "不能从标准输入中读取日志信息"
-#: builtin/commit.c:711
+#: builtin/commit.c:715
#, c-format
msgid "could not read log file '%s'"
msgstr "不能读取日志文件 '%s'"
-#: builtin/commit.c:738 builtin/commit.c:746
+#: builtin/commit.c:742 builtin/commit.c:750
msgid "could not read SQUASH_MSG"
msgstr "不能读取 SQUASH_MSG"
-#: builtin/commit.c:743
+#: builtin/commit.c:747
msgid "could not read MERGE_MSG"
msgstr "不能读取 MERGE_MSG"
-#: builtin/commit.c:797
+#: builtin/commit.c:801
msgid "could not write commit template"
msgstr "不能写提交模版"
-#: builtin/commit.c:815
+#: builtin/commit.c:819
#, c-format
msgid ""
"\n"
@@ -7081,7 +7267,7 @@
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:820
+#: builtin/commit.c:824
#, c-format
msgid ""
"\n"
@@ -7095,7 +7281,7 @@
"\t%s\n"
"然后重试。\n"
-#: builtin/commit.c:833
+#: builtin/commit.c:837
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7104,7 +7290,7 @@
"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n"
"说明将会终止提交。\n"
-#: builtin/commit.c:840
+#: builtin/commit.c:844
#, c-format
msgid ""
"Please enter the commit message for your changes. Lines starting\n"
@@ -7115,346 +7301,362 @@
"也可以删除它们。一个空的提交说明将会终止提交。\n"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:857
+#: builtin/commit.c:861
#, c-format
msgid "%sAuthor: %.*s <%.*s>"
msgstr "%s作者： %.*s <%.*s>"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:865
+#: builtin/commit.c:869
#, c-format
msgid "%sDate: %s"
msgstr "%s日期： %s"
# 译者：为保证在输出中对齐，注意调整句中空格！
-#: builtin/commit.c:872
+#: builtin/commit.c:876
#, c-format
msgid "%sCommitter: %.*s <%.*s>"
msgstr "%s提交者：%.*s <%.*s>"
-#: builtin/commit.c:889
+#: builtin/commit.c:893
msgid "Cannot read index"
msgstr "无法读取索引"
-#: builtin/commit.c:951
+#: builtin/commit.c:959
msgid "Error building trees"
msgstr "无法创建树对象"
-#: builtin/commit.c:965 builtin/tag.c:274
+#: builtin/commit.c:973 builtin/tag.c:252
#, c-format
msgid "Please supply the message using either -m or -F option.\n"
msgstr "请使用 -m 或 -F 选项提供提交说明。\n"
-#: builtin/commit.c:1068
+#: builtin/commit.c:1076
#, c-format
msgid "--author '%s' is not 'Name <email>' and matches no existing author"
-msgstr "--author '%s' 不是 'Name <email>' 格式，且未能在现有作者中找到匹配"
+msgstr "--author '%s' 不是 '姓名 <邮箱>' 格式，且未能在现有作者中找到匹配"
-#: builtin/commit.c:1083 builtin/commit.c:1328
+#: builtin/commit.c:1090
+#, c-format
+msgid "Invalid ignored mode '%s'"
+msgstr "无效的忽略模式 '%s'"
+
+#: builtin/commit.c:1104 builtin/commit.c:1349
#, c-format
msgid "Invalid untracked files mode '%s'"
msgstr "无效的未追踪文件参数 '%s'"
-#: builtin/commit.c:1121
+#: builtin/commit.c:1142
msgid "--long and -z are incompatible"
msgstr "--long 和 -z 选项不兼容"
-#: builtin/commit.c:1151
+#: builtin/commit.c:1172
msgid "Using both --reset-author and --author does not make sense"
msgstr "同时使用 --reset-author 和 --author 没有意义"
-#: builtin/commit.c:1160
+#: builtin/commit.c:1181
msgid "You have nothing to amend."
msgstr "您没有可修补的提交。"
-#: builtin/commit.c:1163
+#: builtin/commit.c:1184
msgid "You are in the middle of a merge -- cannot amend."
msgstr "您正处于一个合并过程中 -- 无法修补提交。"
-#: builtin/commit.c:1165
+#: builtin/commit.c:1186
msgid "You are in the middle of a cherry-pick -- cannot amend."
msgstr "您正处于一个拣选过程中 -- 无法修补提交。"
-#: builtin/commit.c:1168
+#: builtin/commit.c:1189
msgid "Options --squash and --fixup cannot be used together"
msgstr "选项 --squash 和 --fixup 不能同时使用"
-#: builtin/commit.c:1178
+#: builtin/commit.c:1199
msgid "Only one of -c/-C/-F/--fixup can be used."
msgstr "只能用一个 -c/-C/-F/--fixup 选项。"
-#: builtin/commit.c:1180
+#: builtin/commit.c:1201
msgid "Option -m cannot be combined with -c/-C/-F/--fixup."
msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。"
-#: builtin/commit.c:1188
+#: builtin/commit.c:1209
msgid "--reset-author can be used only with -C, -c or --amend."
msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。"
-#: builtin/commit.c:1205
+#: builtin/commit.c:1226
msgid "Only one of --include/--only/--all/--interactive/--patch can be used."
msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。"
-#: builtin/commit.c:1207
+#: builtin/commit.c:1228
msgid "No paths with --include/--only does not make sense."
msgstr "参数 --include/--only 不跟路径没有意义。"
-#: builtin/commit.c:1219 builtin/tag.c:552
+#: builtin/commit.c:1240 builtin/tag.c:535
#, c-format
msgid "Invalid cleanup mode %s"
msgstr "无效的清理模式 %s"
-#: builtin/commit.c:1224
+#: builtin/commit.c:1245
msgid "Paths with -a does not make sense."
msgstr "路径和 -a 选项同时使用没有意义。"
-#: builtin/commit.c:1342 builtin/commit.c:1617
+#: builtin/commit.c:1363 builtin/commit.c:1648
msgid "show status concisely"
msgstr "以简洁的格式显示状态"
-#: builtin/commit.c:1344 builtin/commit.c:1619
+#: builtin/commit.c:1365 builtin/commit.c:1650
msgid "show branch information"
msgstr "显示分支信息"
-#: builtin/commit.c:1346
+#: builtin/commit.c:1367
msgid "show stash information"
msgstr "显示贮藏区信息"
-#: builtin/commit.c:1348
+#: builtin/commit.c:1369
msgid "version"
msgstr "版本"
-#: builtin/commit.c:1348 builtin/commit.c:1621 builtin/push.c:530
-#: builtin/worktree.c:449
+#: builtin/commit.c:1369 builtin/commit.c:1652 builtin/push.c:542
+#: builtin/worktree.c:523
msgid "machine-readable output"
msgstr "机器可读的输出"
-#: builtin/commit.c:1351 builtin/commit.c:1623
+#: builtin/commit.c:1372 builtin/commit.c:1654
msgid "show status in long format (default)"
msgstr "以长格式显示状态（默认）"
-#: builtin/commit.c:1354 builtin/commit.c:1626
+#: builtin/commit.c:1375 builtin/commit.c:1657
msgid "terminate entries with NUL"
msgstr "条目以 NUL 字符结尾"
-#: builtin/commit.c:1356 builtin/commit.c:1629 builtin/fast-export.c:983
-#: builtin/fast-export.c:986 builtin/tag.c:412
+#: builtin/commit.c:1377 builtin/commit.c:1381 builtin/commit.c:1660
+#: builtin/fast-export.c:999 builtin/fast-export.c:1002 builtin/tag.c:390
msgid "mode"
msgstr "模式"
-#: builtin/commit.c:1357 builtin/commit.c:1629
+#: builtin/commit.c:1378 builtin/commit.c:1660
msgid "show untracked files, optional modes: all, normal, no. (Default: all)"
msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）"
-#: builtin/commit.c:1360
-msgid "show ignored files"
-msgstr "显示忽略的文件"
+#: builtin/commit.c:1382
+msgid ""
+"show ignored files, optional modes: traditional, matching, no. (Default: "
+"traditional)"
+msgstr "显示已忽略的文件，可选模式：traditional、matching、no。（默认：traditional）"
-#: builtin/commit.c:1361 parse-options.h:155
+#: builtin/commit.c:1384 parse-options.h:155
msgid "when"
msgstr "何时"
-#: builtin/commit.c:1362
+#: builtin/commit.c:1385
msgid ""
"ignore changes to submodules, optional when: all, dirty, untracked. "
"(Default: all)"
msgstr ""
"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）"
-#: builtin/commit.c:1364
+#: builtin/commit.c:1387
msgid "list untracked files in columns"
msgstr "以列的方式显示未跟踪的文件"
-#: builtin/commit.c:1440
+#: builtin/commit.c:1406
+msgid "Unsupported combination of ignored and untracked-files arguments"
+msgstr "不支持已忽略和未跟踪文件参数的组合"
+
+#: builtin/commit.c:1469
msgid "couldn't look up newly created commit"
msgstr "无法找到新创建的提交"
-#: builtin/commit.c:1442
+#: builtin/commit.c:1471
msgid "could not parse newly created commit"
msgstr "不能解析新创建的提交"
-#: builtin/commit.c:1487
+#: builtin/commit.c:1516
+msgid "unable to resolve HEAD after creating commit"
+msgstr "创建提交后，不能解析 HEAD"
+
+#: builtin/commit.c:1518
msgid "detached HEAD"
msgstr "分离头指针"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/commit.c:1490
+#: builtin/commit.c:1521
msgid " (root-commit)"
msgstr "（根提交）"
-#: builtin/commit.c:1587
+#: builtin/commit.c:1618
msgid "suppress summary after successful commit"
msgstr "提交成功后不显示概述信息"
-#: builtin/commit.c:1588
+#: builtin/commit.c:1619
msgid "show diff in commit message template"
msgstr "在提交说明模板里显示差异"
-#: builtin/commit.c:1590
+#: builtin/commit.c:1621
msgid "Commit message options"
msgstr "提交说明选项"
-#: builtin/commit.c:1591 builtin/tag.c:410
+#: builtin/commit.c:1622 builtin/tag.c:388
msgid "read message from file"
msgstr "从文件中读取提交说明"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "author"
msgstr "作者"
-#: builtin/commit.c:1592
+#: builtin/commit.c:1623
msgid "override author for commit"
msgstr "提交时覆盖作者"
-#: builtin/commit.c:1593 builtin/gc.c:358
+#: builtin/commit.c:1624 builtin/gc.c:359
msgid "date"
msgstr "日期"
-#: builtin/commit.c:1593
+#: builtin/commit.c:1624
msgid "override date for commit"
msgstr "提交时覆盖日期"
-#: builtin/commit.c:1594 builtin/merge.c:222 builtin/notes.c:401
-#: builtin/notes.c:564 builtin/tag.c:408
+#: builtin/commit.c:1625 builtin/merge.c:225 builtin/notes.c:402
+#: builtin/notes.c:565 builtin/tag.c:386
msgid "message"
msgstr "说明"
-#: builtin/commit.c:1594
+#: builtin/commit.c:1625
msgid "commit message"
msgstr "提交说明"
-#: builtin/commit.c:1595 builtin/commit.c:1596 builtin/commit.c:1597
-#: builtin/commit.c:1598 parse-options.h:257 ref-filter.h:77
+#: builtin/commit.c:1626 builtin/commit.c:1627 builtin/commit.c:1628
+#: builtin/commit.c:1629 parse-options.h:257 ref-filter.h:92
msgid "commit"
msgstr "提交"
-#: builtin/commit.c:1595
+#: builtin/commit.c:1626
msgid "reuse and edit message from specified commit"
msgstr "重用并编辑指定提交的提交说明"
-#: builtin/commit.c:1596
+#: builtin/commit.c:1627
msgid "reuse message from specified commit"
msgstr "重用指定提交的提交说明"
-#: builtin/commit.c:1597
+#: builtin/commit.c:1628
msgid "use autosquash formatted message to fixup specified commit"
msgstr "使用 autosquash 格式的提交说明用以修正指定的提交"
-#: builtin/commit.c:1598
+#: builtin/commit.c:1629
msgid "use autosquash formatted message to squash specified commit"
msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交"
-#: builtin/commit.c:1599
+#: builtin/commit.c:1630
msgid "the commit is authored by me now (used with -C/-c/--amend)"
msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）"
-#: builtin/commit.c:1600 builtin/log.c:1430 builtin/revert.c:105
+#: builtin/commit.c:1631 builtin/log.c:1443 builtin/merge.c:239
+#: builtin/pull.c:149 builtin/revert.c:105
msgid "add Signed-off-by:"
msgstr "添加 Signed-off-by: 签名"
-#: builtin/commit.c:1601
+#: builtin/commit.c:1632
msgid "use specified template file"
msgstr "使用指定的模板文件"
-#: builtin/commit.c:1602
+#: builtin/commit.c:1633
msgid "force edit of commit"
msgstr "强制编辑提交"
# 译者：可选值，不能翻译（或是原文中笔误，应为 mode）
-#: builtin/commit.c:1603
+#: builtin/commit.c:1634
msgid "default"
msgstr "default"
-#: builtin/commit.c:1603 builtin/tag.c:413
+#: builtin/commit.c:1634 builtin/tag.c:391
msgid "how to strip spaces and #comments from message"
msgstr "设置如何删除提交说明里的空格和#注释"
-#: builtin/commit.c:1604
+#: builtin/commit.c:1635
msgid "include status in commit message template"
msgstr "在提交说明模板里包含状态信息"
-#: builtin/commit.c:1606 builtin/merge.c:234 builtin/pull.c:173
+#: builtin/commit.c:1637 builtin/merge.c:237 builtin/pull.c:179
#: builtin/revert.c:113
msgid "GPG sign commit"
msgstr "GPG 提交签名"
-#: builtin/commit.c:1609
+#: builtin/commit.c:1640
msgid "Commit contents options"
msgstr "提交内容选项"
-#: builtin/commit.c:1610
+#: builtin/commit.c:1641
msgid "commit all changed files"
msgstr "提交所有改动的文件"
-#: builtin/commit.c:1611
+#: builtin/commit.c:1642
msgid "add specified files to index for commit"
msgstr "添加指定的文件到索引区等待提交"
-#: builtin/commit.c:1612
+#: builtin/commit.c:1643
msgid "interactively add files"
msgstr "交互式添加文件"
-#: builtin/commit.c:1613
+#: builtin/commit.c:1644
msgid "interactively add changes"
msgstr "交互式添加变更"
-#: builtin/commit.c:1614
+#: builtin/commit.c:1645
msgid "commit only specified files"
msgstr "只提交指定的文件"
-#: builtin/commit.c:1615
+#: builtin/commit.c:1646
msgid "bypass pre-commit and commit-msg hooks"
msgstr "绕过 pre-commit 和 commit-msg 钩子"
-#: builtin/commit.c:1616
+#: builtin/commit.c:1647
msgid "show what would be committed"
msgstr "显示将要提交的内容"
-#: builtin/commit.c:1627
+#: builtin/commit.c:1658
msgid "amend previous commit"
msgstr "修改先前的提交"
-#: builtin/commit.c:1628
+#: builtin/commit.c:1659
msgid "bypass post-rewrite hook"
msgstr "绕过 post-rewrite 钩子"
-#: builtin/commit.c:1633
+#: builtin/commit.c:1664
msgid "ok to record an empty change"
msgstr "允许一个空提交"
-#: builtin/commit.c:1635
+#: builtin/commit.c:1666
msgid "ok to record a change with an empty message"
msgstr "允许空的提交说明"
-#: builtin/commit.c:1665
+#: builtin/commit.c:1696
msgid "could not parse HEAD commit"
msgstr "不能解析 HEAD 提交"
-#: builtin/commit.c:1710
+#: builtin/commit.c:1741
#, c-format
msgid "Corrupt MERGE_HEAD file (%s)"
msgstr "损坏的 MERGE_HEAD 文件（%s）"
-#: builtin/commit.c:1717
+#: builtin/commit.c:1748
msgid "could not read MERGE_MODE"
msgstr "不能读取 MERGE_MODE"
-#: builtin/commit.c:1736
+#: builtin/commit.c:1767
#, c-format
msgid "could not read commit message: %s"
msgstr "不能读取提交说明：%s"
-#: builtin/commit.c:1747
-#, c-format
-msgid "Aborting commit; you did not edit the message.\n"
-msgstr "终止提交；您未更改来自模版的提交说明。\n"
-
-#: builtin/commit.c:1752
+#: builtin/commit.c:1778
#, c-format
msgid "Aborting commit due to empty commit message.\n"
msgstr "终止提交因为提交说明为空。\n"
-#: builtin/commit.c:1800
+#: builtin/commit.c:1783
+#, c-format
+msgid "Aborting commit; you did not edit the message.\n"
+msgstr "终止提交；您未更改来自模版的提交说明。\n"
+
+#: builtin/commit.c:1831
msgid ""
"Repository has been updated, but unable to write\n"
"new_index file. Check that disk is not full and quota is\n"
@@ -7467,139 +7669,143 @@
msgid "git config [<options>]"
msgstr "git config [<选项>]"
-#: builtin/config.c:57
+#: builtin/config.c:58
msgid "Config file location"
msgstr "配置文件位置"
-#: builtin/config.c:58
+#: builtin/config.c:59
msgid "use global config file"
msgstr "使用全局配置文件"
-#: builtin/config.c:59
+#: builtin/config.c:60
msgid "use system config file"
msgstr "使用系统级配置文件"
-#: builtin/config.c:60
+#: builtin/config.c:61
msgid "use repository config file"
msgstr "使用仓库级配置文件"
-#: builtin/config.c:61
+#: builtin/config.c:62
msgid "use given config file"
msgstr "使用指定的配置文件"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "blob-id"
msgstr "数据对象 ID"
-#: builtin/config.c:62
+#: builtin/config.c:63
msgid "read config from given blob object"
msgstr "从给定的数据对象读取配置"
-#: builtin/config.c:63
+#: builtin/config.c:64
msgid "Action"
msgstr "操作"
-#: builtin/config.c:64
+#: builtin/config.c:65
msgid "get value: name [value-regex]"
msgstr "获取值：name [value-regex]"
-#: builtin/config.c:65
+#: builtin/config.c:66
msgid "get all values: key [value-regex]"
msgstr "获得所有的值：key [value-regex]"
-#: builtin/config.c:66
+#: builtin/config.c:67
msgid "get values for regexp: name-regex [value-regex]"
msgstr "根据正则表达式获得值：name-regex [value-regex]"
-#: builtin/config.c:67
+#: builtin/config.c:68
msgid "get value specific for the URL: section[.var] URL"
msgstr "获得 URL 取值：section[.var] URL"
-#: builtin/config.c:68
+#: builtin/config.c:69
msgid "replace all matching variables: name value [value_regex]"
msgstr "替换所有匹配的变量：name value [value_regex]"
-#: builtin/config.c:69
+#: builtin/config.c:70
msgid "add a new variable: name value"
msgstr "添加一个新的变量：name value"
-#: builtin/config.c:70
+#: builtin/config.c:71
msgid "remove a variable: name [value-regex]"
msgstr "删除一个变量：name [value-regex]"
-#: builtin/config.c:71
+#: builtin/config.c:72
msgid "remove all matches: name [value-regex]"
msgstr "删除所有匹配项：name [value-regex]"
-#: builtin/config.c:72
+#: builtin/config.c:73
msgid "rename section: old-name new-name"
msgstr "重命名小节：old-name new-name"
-#: builtin/config.c:73
+#: builtin/config.c:74
msgid "remove a section: name"
msgstr "删除一个小节：name"
-#: builtin/config.c:74
+#: builtin/config.c:75
msgid "list all"
msgstr "列出所有"
-#: builtin/config.c:75
+#: builtin/config.c:76
msgid "open an editor"
msgstr "打开一个编辑器"
-#: builtin/config.c:76
+#: builtin/config.c:77
msgid "find the color configured: slot [default]"
msgstr "获得配置的颜色：配置 [默认]"
-#: builtin/config.c:77
+#: builtin/config.c:78
msgid "find the color setting: slot [stdout-is-tty]"
msgstr "获得颜色设置：配置 [stdout-is-tty]"
-#: builtin/config.c:78
+#: builtin/config.c:79
msgid "Type"
msgstr "类型"
-#: builtin/config.c:79
+#: builtin/config.c:80
msgid "value is \"true\" or \"false\""
msgstr "值是 \"true\" 或 \"false\""
-#: builtin/config.c:80
+#: builtin/config.c:81
msgid "value is decimal number"
msgstr "值是十进制数"
-#: builtin/config.c:81
+#: builtin/config.c:82
msgid "value is --bool or --int"
msgstr "值是 --bool or --int"
-#: builtin/config.c:82
+#: builtin/config.c:83
msgid "value is a path (file or directory name)"
msgstr "值是一个路径（文件或目录名）"
-#: builtin/config.c:83
+#: builtin/config.c:84
+msgid "value is an expiry date"
+msgstr "值是一个到期日期"
+
+#: builtin/config.c:85
msgid "Other"
msgstr "其它"
-#: builtin/config.c:84
+#: builtin/config.c:86
msgid "terminate values with NUL byte"
msgstr "终止值是 NUL 字节"
-#: builtin/config.c:85
+#: builtin/config.c:87
msgid "show variable names only"
msgstr "只显示变量名"
-#: builtin/config.c:86
+#: builtin/config.c:88
msgid "respect include directives on lookup"
msgstr "查询时参照 include 指令递归查找"
-#: builtin/config.c:87
+#: builtin/config.c:89
msgid "show origin of config (file, standard input, blob, command line)"
msgstr "显示配置的来源（文件、标准输入、数据对象，或命令行）"
-#: builtin/config.c:327
+#: builtin/config.c:335
msgid "unable to parse default color value"
msgstr "不能解析默认颜色值"
-#: builtin/config.c:471
+#: builtin/config.c:479
#, c-format
msgid ""
"# This is Git's per-user configuration file.\n"
@@ -7614,16 +7820,16 @@
"#\tname = %s\n"
"#\temail = %s\n"
-#: builtin/config.c:499
+#: builtin/config.c:507
msgid "--local can only be used inside a git repository"
msgstr "--local 只能在一个仓库内使用"
-#: builtin/config.c:621
+#: builtin/config.c:632
#, c-format
msgid "cannot create configuration file %s"
msgstr "不能创建配置文件 %s"
-#: builtin/config.c:633
+#: builtin/config.c:645
#, c-format
msgid ""
"cannot overwrite multiple values with a single value\n"
@@ -7632,75 +7838,65 @@
"无法用一个值覆盖多个值\n"
" 使用一个正则表达式、--add 或 --replace-all 来修改 %s。"
-#: builtin/count-objects.c:87
+#: builtin/count-objects.c:88
msgid "git count-objects [-v] [-H | --human-readable]"
msgstr "git count-objects [-v] [-H | --human-readable]"
-#: builtin/count-objects.c:97
+#: builtin/count-objects.c:98
msgid "print sizes in human readable format"
msgstr "以用户可读的格式显示大小"
-#: builtin/describe.c:19
+#: builtin/describe.c:22
msgid "git describe [<options>] [<commit-ish>...]"
msgstr "git describe [<选项>] [<提交号>...]"
-#: builtin/describe.c:20
+#: builtin/describe.c:23
msgid "git describe [<options>] --dirty"
msgstr "git describe [<选项>] --dirty"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "head"
msgstr "头"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "lightweight"
msgstr "轻量级的"
-#: builtin/describe.c:54
+#: builtin/describe.c:57
msgid "annotated"
msgstr "附注的"
-#: builtin/describe.c:253
+#: builtin/describe.c:267
#, c-format
msgid "annotated tag %s not available"
msgstr "附注标签 %s 无效"
-#: builtin/describe.c:257
+#: builtin/describe.c:271
#, c-format
msgid "annotated tag %s has no embedded name"
msgstr "附注标签 %s 没有嵌入名称"
-#: builtin/describe.c:259
+#: builtin/describe.c:273
#, c-format
msgid "tag '%s' is really '%s' here"
msgstr "标签 '%s' 的确是在 '%s'"
-#: builtin/describe.c:286 builtin/log.c:489
-#, c-format
-msgid "Not a valid object name %s"
-msgstr "不是一个有效的对象名 %s"
-
-#: builtin/describe.c:289
-#, c-format
-msgid "%s is not a valid '%s' object"
-msgstr "%s 不是一个有效的 '%s' 对象"
-
-#: builtin/describe.c:306
+#: builtin/describe.c:314
#, c-format
msgid "no tag exactly matches '%s'"
msgstr "没有标签准确匹配 '%s'"
-#: builtin/describe.c:308
+#: builtin/describe.c:316
#, c-format
-msgid "searching to describe %s\n"
-msgstr "搜索描述 %s\n"
+msgid "No exact match on refs or tags, searching to describe\n"
+msgstr "没有精确匹配到引用或标签，继续搜索进行描述\n"
-#: builtin/describe.c:355
+#: builtin/describe.c:363
#, c-format
msgid "finished search at %s\n"
msgstr "完成搜索 %s\n"
-#: builtin/describe.c:382
+#: builtin/describe.c:389
#, c-format
msgid ""
"No annotated tags can describe '%s'.\n"
@@ -7709,7 +7905,7 @@
"没有附注标签能描述 '%s'。\n"
"然而，存在未附注标签：尝试 --tags。"
-#: builtin/describe.c:386
+#: builtin/describe.c:393
#, c-format
msgid ""
"No tags can describe '%s'.\n"
@@ -7718,12 +7914,12 @@
"没有标签能描述 '%s'。\n"
"尝试 --always，或者创建一些标签。"
-#: builtin/describe.c:416
+#: builtin/describe.c:423
#, c-format
msgid "traversed %lu commits\n"
msgstr "已遍历 %lu 个提交\n"
-#: builtin/describe.c:419
+#: builtin/describe.c:426
#, c-format
msgid ""
"more than %i tags found; listed %i most recent\n"
@@ -7732,75 +7928,90 @@
"发现多于 %i 个标签，列出最近的 %i 个\n"
"在 %s 放弃搜索\n"
-#: builtin/describe.c:441
+#: builtin/describe.c:494
+#, c-format
+msgid "describe %s\n"
+msgstr "描述 %s\n"
+
+#: builtin/describe.c:497 builtin/log.c:500
+#, c-format
+msgid "Not a valid object name %s"
+msgstr "不是一个有效的对象名 %s"
+
+#: builtin/describe.c:505
+#, c-format
+msgid "%s is neither a commit nor blob"
+msgstr "%s 既不是提交也不是数据对象"
+
+#: builtin/describe.c:519
msgid "find the tag that comes after the commit"
msgstr "寻找该提交之后的标签"
-#: builtin/describe.c:442
+#: builtin/describe.c:520
msgid "debug search strategy on stderr"
msgstr "在标准错误上调试搜索策略"
-#: builtin/describe.c:443
+#: builtin/describe.c:521
msgid "use any ref"
msgstr "使用任意引用"
-#: builtin/describe.c:444
+#: builtin/describe.c:522
msgid "use any tag, even unannotated"
msgstr "使用任意标签，即使未附带注释"
-#: builtin/describe.c:445
+#: builtin/describe.c:523
msgid "always use long format"
msgstr "始终使用长提交号格式"
-#: builtin/describe.c:446
+#: builtin/describe.c:524
msgid "only follow first parent"
msgstr "只跟随第一个父提交"
-#: builtin/describe.c:449
+#: builtin/describe.c:527
msgid "only output exact matches"
msgstr "只输出精确匹配"
-#: builtin/describe.c:451
+#: builtin/describe.c:529
msgid "consider <n> most recent tags (default: 10)"
msgstr "考虑最近 <n> 个标签（默认：10）"
-#: builtin/describe.c:453
+#: builtin/describe.c:531
msgid "only consider tags matching <pattern>"
msgstr "只考虑匹配 <模式> 的标签"
-#: builtin/describe.c:455
+#: builtin/describe.c:533
msgid "do not consider tags matching <pattern>"
msgstr "不考虑匹配 <模式> 的标签"
-#: builtin/describe.c:457 builtin/name-rev.c:406
+#: builtin/describe.c:535 builtin/name-rev.c:406
msgid "show abbreviated commit object as fallback"
msgstr "显示简写的提交号作为后备"
-#: builtin/describe.c:458 builtin/describe.c:461
+#: builtin/describe.c:536 builtin/describe.c:539
msgid "mark"
msgstr "标记"
-#: builtin/describe.c:459
+#: builtin/describe.c:537
msgid "append <mark> on dirty working tree (default: \"-dirty\")"
msgstr "对于脏工作区，追加 <标记>（默认：\"-dirty\"）"
-#: builtin/describe.c:462
+#: builtin/describe.c:540
msgid "append <mark> on broken working tree (default: \"-broken\")"
msgstr "对于损坏的工作区，追加 <标记>（默认：\"-broken\"）"
-#: builtin/describe.c:480
+#: builtin/describe.c:558
msgid "--long is incompatible with --abbrev=0"
msgstr "--long 与 --abbrev=0 不兼容"
-#: builtin/describe.c:509
+#: builtin/describe.c:587
msgid "No names found, cannot describe anything."
msgstr "没有发现名称，无法描述任何东西。"
-#: builtin/describe.c:552
+#: builtin/describe.c:637
msgid "--dirty is incompatible with commit-ishes"
msgstr "--dirty 与提交号不兼容"
-#: builtin/describe.c:554
+#: builtin/describe.c:639
msgid "--broken is incompatible with commit-ishes"
msgstr "--broken 与提交号不兼容"
@@ -7809,26 +8020,26 @@
msgid "'%s': not a regular file or symlink"
msgstr "'%s'：不是一个正规文件或符号链接"
-#: builtin/diff.c:235
+#: builtin/diff.c:234
#, c-format
msgid "invalid option: %s"
msgstr "无效选项：%s"
-#: builtin/diff.c:359
+#: builtin/diff.c:356
msgid "Not a git repository"
msgstr "不是一个 git 仓库"
-#: builtin/diff.c:402
+#: builtin/diff.c:399
#, c-format
msgid "invalid object '%s' given."
msgstr "提供了无效对象 '%s'。"
-#: builtin/diff.c:411
+#: builtin/diff.c:408
#, c-format
msgid "more than two blobs given: '%s'"
msgstr "提供了超过两个数据对象：'%s'"
-#: builtin/diff.c:416
+#: builtin/diff.c:413
#, c-format
msgid "unhandled object '%s' given."
msgstr "无法处理的对象 '%s'。"
@@ -7837,27 +8048,27 @@
msgid "git difftool [<options>] [<commit> [<commit>]] [--] [<path>...]"
msgstr "git difftool [<选项>] [<提交> [<提交>]] [--] [<路径>...]"
-#: builtin/difftool.c:249
+#: builtin/difftool.c:259
#, c-format
msgid "failed: %d"
msgstr "失败：%d"
-#: builtin/difftool.c:291
+#: builtin/difftool.c:301
#, c-format
msgid "could not read symlink %s"
msgstr "无法读取符号链接 %s"
-#: builtin/difftool.c:293
+#: builtin/difftool.c:303
#, c-format
msgid "could not read symlink file %s"
msgstr "无法读取符号链接文件 %s"
-#: builtin/difftool.c:301
+#: builtin/difftool.c:311
#, c-format
msgid "could not read object %s for symlink %s"
msgstr "无法读取符号链接 %2$s 指向的对象 %1$s"
-#: builtin/difftool.c:403
+#: builtin/difftool.c:412
msgid ""
"combined diff formats('-c' and '--cc') are not supported in\n"
"directory diff mode('-d' and '--dir-diff')."
@@ -7865,71 +8076,71 @@
"不支持在目录比较模式（'-d' 和 '--dir-diff'）中采用组合差异格式（'-c' 和 '--"
"cc'）。"
-#: builtin/difftool.c:626
+#: builtin/difftool.c:632
#, c-format
msgid "both files modified: '%s' and '%s'."
msgstr "两个文件都被修改：'%s' 和 '%s'。"
-#: builtin/difftool.c:628
+#: builtin/difftool.c:634
msgid "working tree file has been left."
msgstr "工作区文件被留了下来。"
-#: builtin/difftool.c:639
+#: builtin/difftool.c:645
#, c-format
msgid "temporary files exist in '%s'."
msgstr "临时文件存在于 '%s'。"
-#: builtin/difftool.c:640
+#: builtin/difftool.c:646
msgid "you may want to cleanup or recover these."
msgstr "您可能想要清理或者恢复它们。"
-#: builtin/difftool.c:689
+#: builtin/difftool.c:695
msgid "use `diff.guitool` instead of `diff.tool`"
msgstr "使用 `diff.guitool` 代替 `diff.tool`"
-#: builtin/difftool.c:691
+#: builtin/difftool.c:697
msgid "perform a full-directory diff"
msgstr "执行一个全目录差异比较"
-#: builtin/difftool.c:693
+#: builtin/difftool.c:699
msgid "do not prompt before launching a diff tool"
msgstr "启动差异比较工具之前不提示"
-#: builtin/difftool.c:699
+#: builtin/difftool.c:705
msgid "use symlinks in dir-diff mode"
msgstr "在 dir-diff 模式中使用符号链接"
-#: builtin/difftool.c:700
+#: builtin/difftool.c:706
msgid "<tool>"
msgstr "<工具>"
-#: builtin/difftool.c:701
+#: builtin/difftool.c:707
msgid "use the specified diff tool"
msgstr "使用指定的差异比较工具"
-#: builtin/difftool.c:703
+#: builtin/difftool.c:709
msgid "print a list of diff tools that may be used with `--tool`"
msgstr "显示可以用在 `--tool` 参数后的差异工具列表"
-#: builtin/difftool.c:706
+#: builtin/difftool.c:712
msgid ""
"make 'git-difftool' exit when an invoked diff tool returns a non - zero exit "
"code"
msgstr "当执行 diff 工具返回非零退出码时，使 'git-difftool' 退出"
-#: builtin/difftool.c:708
+#: builtin/difftool.c:714
msgid "<command>"
msgstr "<命令>"
-#: builtin/difftool.c:709
+#: builtin/difftool.c:715
msgid "specify a custom command for viewing diffs"
msgstr "指定一个用于查看差异的自定义命令"
-#: builtin/difftool.c:733
+#: builtin/difftool.c:739
msgid "no <tool> given for --tool=<tool>"
msgstr "没有为 --tool=<工具> 参数提供 <工具>"
-#: builtin/difftool.c:740
+#: builtin/difftool.c:746
msgid "no <cmd> given for --extcmd=<cmd>"
msgstr "没有为 --extcmd=<命令> 参数提供 <命令>"
@@ -7937,232 +8148,232 @@
msgid "git fast-export [rev-list-opts]"
msgstr "git fast-export [rev-list-opts]"
-#: builtin/fast-export.c:982
+#: builtin/fast-export.c:998
msgid "show progress after <n> objects"
msgstr "在 <n> 个对象之后显示进度"
-#: builtin/fast-export.c:984
+#: builtin/fast-export.c:1000
msgid "select handling of signed tags"
msgstr "选择如何处理签名标签"
-#: builtin/fast-export.c:987
+#: builtin/fast-export.c:1003
msgid "select handling of tags that tag filtered objects"
msgstr "选择当标签指向被过滤对象时该标签的处理方式"
-#: builtin/fast-export.c:990
+#: builtin/fast-export.c:1006
msgid "Dump marks to this file"
msgstr "把标记存储到这个文件"
-#: builtin/fast-export.c:992
+#: builtin/fast-export.c:1008
msgid "Import marks from this file"
msgstr "从这个文件导入标记"
-#: builtin/fast-export.c:994
+#: builtin/fast-export.c:1010
msgid "Fake a tagger when tags lack one"
msgstr "当标签缺少标记者字段时，假装提供一个"
-#: builtin/fast-export.c:996
+#: builtin/fast-export.c:1012
msgid "Output full tree for each commit"
msgstr "每次提交都输出整个树"
-#: builtin/fast-export.c:998
+#: builtin/fast-export.c:1014
msgid "Use the done feature to terminate the stream"
msgstr "使用 done 功能来终止流"
-#: builtin/fast-export.c:999
+#: builtin/fast-export.c:1015
msgid "Skip output of blob data"
msgstr "跳过数据对象的输出"
-#: builtin/fast-export.c:1000
+#: builtin/fast-export.c:1016
msgid "refspec"
msgstr "引用规格"
-#: builtin/fast-export.c:1001
+#: builtin/fast-export.c:1017
msgid "Apply refspec to exported refs"
msgstr "对导出的引用应用引用规格"
-#: builtin/fast-export.c:1002
+#: builtin/fast-export.c:1018
msgid "anonymize output"
msgstr "匿名输出"
-#: builtin/fetch.c:22
+#: builtin/fetch.c:24
msgid "git fetch [<options>] [<repository> [<refspec>...]]"
msgstr "git fetch [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/fetch.c:23
+#: builtin/fetch.c:25
msgid "git fetch [<options>] <group>"
msgstr "git fetch [<选项>] <组>"
-#: builtin/fetch.c:24
+#: builtin/fetch.c:26
msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]"
msgstr "git fetch --multiple [<选项>] [(<仓库> | <组>)...]"
-#: builtin/fetch.c:25
+#: builtin/fetch.c:27
msgid "git fetch --all [<options>]"
msgstr "git fetch --all [<选项>]"
-#: builtin/fetch.c:90 builtin/pull.c:182
+#: builtin/fetch.c:113 builtin/pull.c:188
msgid "fetch from all remotes"
msgstr "从所有的远程抓取"
-#: builtin/fetch.c:92 builtin/pull.c:185
+#: builtin/fetch.c:115 builtin/pull.c:191
msgid "append to .git/FETCH_HEAD instead of overwriting"
msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它"
-#: builtin/fetch.c:94 builtin/pull.c:188
+#: builtin/fetch.c:117 builtin/pull.c:194
msgid "path to upload pack on remote end"
msgstr "上传包到远程的路径"
-#: builtin/fetch.c:95 builtin/pull.c:190
+#: builtin/fetch.c:118 builtin/pull.c:196
msgid "force overwrite of local branch"
msgstr "强制覆盖本地分支"
-#: builtin/fetch.c:97
+#: builtin/fetch.c:120
msgid "fetch from multiple remotes"
msgstr "从多个远程抓取"
-#: builtin/fetch.c:99 builtin/pull.c:192
+#: builtin/fetch.c:122 builtin/pull.c:198
msgid "fetch all tags and associated objects"
msgstr "抓取所有的标签和关联对象"
-#: builtin/fetch.c:101
+#: builtin/fetch.c:124
msgid "do not fetch all tags (--no-tags)"
msgstr "不抓取任何标签(--no-tags)"
-#: builtin/fetch.c:103
+#: builtin/fetch.c:126
msgid "number of submodules fetched in parallel"
msgstr "子模组获取的并发数"
-#: builtin/fetch.c:105 builtin/pull.c:195
+#: builtin/fetch.c:128 builtin/pull.c:201
msgid "prune remote-tracking branches no longer on remote"
msgstr "清除远程已经不存在的分支的跟踪分支"
# 译者：可选值，不能翻译
-#: builtin/fetch.c:106 builtin/fetch.c:129 builtin/pull.c:123
+#: builtin/fetch.c:129 builtin/fetch.c:152 builtin/pull.c:126
msgid "on-demand"
msgstr "on-demand"
-#: builtin/fetch.c:107
+#: builtin/fetch.c:130
msgid "control recursive fetching of submodules"
msgstr "控制子模组的递归抓取"
-#: builtin/fetch.c:111 builtin/pull.c:203
+#: builtin/fetch.c:134 builtin/pull.c:209
msgid "keep downloaded pack"
msgstr "保持下载包"
-#: builtin/fetch.c:113
+#: builtin/fetch.c:136
msgid "allow updating of HEAD ref"
msgstr "允许更新 HEAD 引用"
-#: builtin/fetch.c:116 builtin/fetch.c:122 builtin/pull.c:206
+#: builtin/fetch.c:139 builtin/fetch.c:145 builtin/pull.c:212
msgid "deepen history of shallow clone"
msgstr "深化浅克隆的历史"
-#: builtin/fetch.c:118
+#: builtin/fetch.c:141
msgid "deepen history of shallow repository based on time"
msgstr "基于时间来深化浅克隆的历史"
-#: builtin/fetch.c:124 builtin/pull.c:209
+#: builtin/fetch.c:147 builtin/pull.c:215
msgid "convert to a complete repository"
msgstr "转换为一个完整的仓库"
-#: builtin/fetch.c:126 builtin/log.c:1450
+#: builtin/fetch.c:149 builtin/log.c:1463
msgid "dir"
msgstr "目录"
-#: builtin/fetch.c:127
+#: builtin/fetch.c:150
msgid "prepend this to submodule path output"
msgstr "在子模组路径输出的前面加上此目录"
-#: builtin/fetch.c:130
+#: builtin/fetch.c:153
msgid ""
"default for recursive fetching of submodules (lower priority than config "
"files)"
msgstr "递归获取子模组的缺省值（比配置文件优先级低）"
-#: builtin/fetch.c:134 builtin/pull.c:212
+#: builtin/fetch.c:157 builtin/pull.c:218
msgid "accept refs that update .git/shallow"
msgstr "接受更新 .git/shallow 的引用"
-#: builtin/fetch.c:135 builtin/pull.c:214
+#: builtin/fetch.c:158 builtin/pull.c:220
msgid "refmap"
msgstr "引用映射"
-#: builtin/fetch.c:136 builtin/pull.c:215
+#: builtin/fetch.c:159 builtin/pull.c:221
msgid "specify fetch refmap"
msgstr "指定获取操作的引用映射"
-#: builtin/fetch.c:394
+#: builtin/fetch.c:417
msgid "Couldn't find remote ref HEAD"
msgstr "无法发现远程 HEAD 引用"
-#: builtin/fetch.c:512
+#: builtin/fetch.c:535
#, c-format
msgid "configuration fetch.output contains invalid value %s"
msgstr "配置变量 fetch.output 包含无效值 %s"
-#: builtin/fetch.c:605
+#: builtin/fetch.c:628
#, c-format
msgid "object %s not found"
msgstr "对象 %s 未发现"
-#: builtin/fetch.c:609
+#: builtin/fetch.c:632
msgid "[up to date]"
msgstr "[最新]"
-#: builtin/fetch.c:622 builtin/fetch.c:702
+#: builtin/fetch.c:645 builtin/fetch.c:725
msgid "[rejected]"
msgstr "[已拒绝]"
-#: builtin/fetch.c:623
+#: builtin/fetch.c:646
msgid "can't fetch in current branch"
msgstr "当前分支下不能执行获取操作"
-#: builtin/fetch.c:632
+#: builtin/fetch.c:655
msgid "[tag update]"
msgstr "[标签更新]"
-#: builtin/fetch.c:633 builtin/fetch.c:666 builtin/fetch.c:682
-#: builtin/fetch.c:697
+#: builtin/fetch.c:656 builtin/fetch.c:689 builtin/fetch.c:705
+#: builtin/fetch.c:720
msgid "unable to update local ref"
msgstr "不能更新本地引用"
-#: builtin/fetch.c:652
+#: builtin/fetch.c:675
msgid "[new tag]"
msgstr "[新标签]"
-#: builtin/fetch.c:655
+#: builtin/fetch.c:678
msgid "[new branch]"
msgstr "[新分支]"
-#: builtin/fetch.c:658
+#: builtin/fetch.c:681
msgid "[new ref]"
msgstr "[新引用]"
-#: builtin/fetch.c:697
+#: builtin/fetch.c:720
msgid "forced update"
msgstr "强制更新"
-#: builtin/fetch.c:702
+#: builtin/fetch.c:725
msgid "non-fast-forward"
msgstr "非快进"
-#: builtin/fetch.c:747
+#: builtin/fetch.c:770
#, c-format
msgid "%s did not send all necessary objects\n"
msgstr "%s 未发送所有必须的对象\n"
-#: builtin/fetch.c:767
+#: builtin/fetch.c:790
#, c-format
msgid "reject %s because shallow roots are not allowed to be updated"
msgstr "拒绝 %s 因为浅克隆不允许被更新"
-#: builtin/fetch.c:855 builtin/fetch.c:951
+#: builtin/fetch.c:878 builtin/fetch.c:974
#, c-format
msgid "From %.*s\n"
msgstr "来自 %.*s\n"
-#: builtin/fetch.c:866
+#: builtin/fetch.c:889
#, c-format
msgid ""
"some local refs could not be updated; try running\n"
@@ -8172,95 +8383,90 @@
" 'git remote prune %s' 来删除旧的、有冲突的分支"
# 译者：注意保持前导空格
-#: builtin/fetch.c:921
+#: builtin/fetch.c:944
#, c-format
msgid " (%s will become dangling)"
msgstr " （%s 将成为摇摆状态）"
# 译者：注意保持前导空格
-#: builtin/fetch.c:922
+#: builtin/fetch.c:945
#, c-format
msgid " (%s has become dangling)"
msgstr " （%s 已成为摇摆状态）"
-#: builtin/fetch.c:954
+#: builtin/fetch.c:977
msgid "[deleted]"
msgstr "[已删除]"
-#: builtin/fetch.c:955 builtin/remote.c:1023
+#: builtin/fetch.c:978 builtin/remote.c:1024
msgid "(none)"
msgstr "（无）"
-#: builtin/fetch.c:978
+#: builtin/fetch.c:1001
#, c-format
msgid "Refusing to fetch into current branch %s of non-bare repository"
msgstr "拒绝获取到非纯仓库的当前分支 %s"
-#: builtin/fetch.c:997
+#: builtin/fetch.c:1020
#, c-format
msgid "Option \"%s\" value \"%s\" is not valid for %s"
msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的"
-#: builtin/fetch.c:1000
+#: builtin/fetch.c:1023
#, c-format
msgid "Option \"%s\" is ignored for %s\n"
msgstr "选项 \"%s\" 为 %s 所忽略\n"
-#: builtin/fetch.c:1076
-#, c-format
-msgid "Don't know how to fetch from %s"
-msgstr "不知道如何从 %s 获取"
-
-#: builtin/fetch.c:1236
+#: builtin/fetch.c:1256
#, c-format
msgid "Fetching %s\n"
msgstr "正在获取 %s\n"
-#: builtin/fetch.c:1238 builtin/remote.c:97
+#: builtin/fetch.c:1258 builtin/remote.c:97
#, c-format
msgid "Could not fetch %s"
msgstr "不能获取 %s"
-#: builtin/fetch.c:1256
+#: builtin/fetch.c:1276
msgid ""
"No remote repository specified. Please, specify either a URL or a\n"
"remote name from which new revisions should be fetched."
msgstr "未指定远程仓库。请通过一个 URL 或远程仓库名指定，用以获取新提交。"
-#: builtin/fetch.c:1279
+#: builtin/fetch.c:1299
msgid "You need to specify a tag name."
msgstr "您需要指定一个标签名称。"
-#: builtin/fetch.c:1321
+#: builtin/fetch.c:1342
msgid "Negative depth in --deepen is not supported"
msgstr "--deepen 不支持负数深度"
-#: builtin/fetch.c:1323
+#: builtin/fetch.c:1344
msgid "--deepen and --depth are mutually exclusive"
msgstr "--deepen 和 --depth 是互斥的"
-#: builtin/fetch.c:1328
+#: builtin/fetch.c:1349
msgid "--depth and --unshallow cannot be used together"
msgstr "--depth 和 --unshallow 不能同时使用"
-#: builtin/fetch.c:1330
+#: builtin/fetch.c:1351
msgid "--unshallow on a complete repository does not make sense"
msgstr "对于一个完整的仓库，参数 --unshallow 没有意义"
-#: builtin/fetch.c:1349
+#: builtin/fetch.c:1364
msgid "fetch --all does not take a repository argument"
msgstr "fetch --all 不能带一个仓库参数"
-#: builtin/fetch.c:1351
+#: builtin/fetch.c:1366
msgid "fetch --all does not make sense with refspecs"
msgstr "fetch --all 带引用规格没有任何意义"
-#: builtin/fetch.c:1362
+#: builtin/fetch.c:1377
#, c-format
msgid "No such remote or remote group: %s"
msgstr "没有这样的远程或远程组：%s"
-#: builtin/fetch.c:1370
+#: builtin/fetch.c:1385
msgid "Fetching a group and specifying refspecs does not make sense"
msgstr "获取组并指定引用规格没有意义"
@@ -8269,23 +8475,23 @@
"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:664
+#: builtin/fmt-merge-msg.c:666
msgid "populate log with at most <n> entries from shortlog"
msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明"
-#: builtin/fmt-merge-msg.c:667
+#: builtin/fmt-merge-msg.c:669
msgid "alias for --log (deprecated)"
msgstr "参数 --log 的别名（已弃用）"
-#: builtin/fmt-merge-msg.c:670
+#: builtin/fmt-merge-msg.c:672
msgid "text"
msgstr "文本"
-#: builtin/fmt-merge-msg.c:671
+#: builtin/fmt-merge-msg.c:673
msgid "use <text> as start of message"
msgstr "使用 <文本> 作为提交说明的开始"
-#: builtin/fmt-merge-msg.c:672
+#: builtin/fmt-merge-msg.c:674
msgid "file to read from"
msgstr "从文件中读取"
@@ -8325,101 +8531,105 @@
msgid "show only <n> matched refs"
msgstr "只显示 <n> 个匹配的引用"
-#: builtin/for-each-ref.c:42
+#: builtin/for-each-ref.c:39 builtin/tag.c:414
+msgid "respect format colors"
+msgstr "遵照格式中的颜色输出"
+
+#: builtin/for-each-ref.c:43
msgid "print only refs which points at the given object"
msgstr "只打印指向给定对象的引用"
-#: builtin/for-each-ref.c:44
+#: builtin/for-each-ref.c:45
msgid "print only refs that are merged"
msgstr "只打印已经合并的引用"
-#: builtin/for-each-ref.c:45
+#: builtin/for-each-ref.c:46
msgid "print only refs that are not merged"
msgstr "只打印没有合并的引用"
-#: builtin/for-each-ref.c:46
+#: builtin/for-each-ref.c:47
msgid "print only refs which contain the commit"
msgstr "只打印包含该提交的引用"
-#: builtin/for-each-ref.c:47
+#: builtin/for-each-ref.c:48
msgid "print only refs which don't contain the commit"
msgstr "只打印不包含该提交的引用"
-#: builtin/fsck.c:554
+#: builtin/fsck.c:543
msgid "Checking object directories"
msgstr "检查对象目录中"
-#: builtin/fsck.c:646
+#: builtin/fsck.c:635
msgid "git fsck [<options>] [<object>...]"
msgstr "git fsck [<选项>] [<对象>...]"
-#: builtin/fsck.c:652
+#: builtin/fsck.c:641
msgid "show unreachable objects"
msgstr "显示不可达的对象"
-#: builtin/fsck.c:653
+#: builtin/fsck.c:642
msgid "show dangling objects"
msgstr "显示摇摆的对象"
-#: builtin/fsck.c:654
+#: builtin/fsck.c:643
msgid "report tags"
msgstr "报告标签"
-#: builtin/fsck.c:655
+#: builtin/fsck.c:644
msgid "report root nodes"
msgstr "报告根节点"
-#: builtin/fsck.c:656
+#: builtin/fsck.c:645
msgid "make index objects head nodes"
msgstr "将索引亦作为检查的头节点"
-#: builtin/fsck.c:657
+#: builtin/fsck.c:646
msgid "make reflogs head nodes (default)"
msgstr "将引用日志作为检查的头节点（默认）"
-#: builtin/fsck.c:658
+#: builtin/fsck.c:647
msgid "also consider packs and alternate objects"
msgstr "也考虑包和备用对象"
-#: builtin/fsck.c:659
+#: builtin/fsck.c:648
msgid "check only connectivity"
msgstr "仅检查连通性"
-#: builtin/fsck.c:660
+#: builtin/fsck.c:649
msgid "enable more strict checking"
msgstr "启用更严格的检查"
-#: builtin/fsck.c:662
+#: builtin/fsck.c:651
msgid "write dangling objects in .git/lost-found"
msgstr "将摇摆对象写入 .git/lost-found 中"
-#: builtin/fsck.c:663 builtin/prune.c:107
+#: builtin/fsck.c:652 builtin/prune.c:107
msgid "show progress"
msgstr "显示进度"
-#: builtin/fsck.c:664
+#: builtin/fsck.c:653
msgid "show verbose names for reachable objects"
msgstr "显示可达对象的详细名称"
-#: builtin/fsck.c:725
+#: builtin/fsck.c:714
msgid "Checking objects"
msgstr "检查对象中"
-#: builtin/gc.c:26
+#: builtin/gc.c:27
msgid "git gc [<options>]"
msgstr "git gc [<选项>]"
-#: builtin/gc.c:79
+#: builtin/gc.c:80
#, c-format
msgid "Failed to fstat %s: %s"
msgstr "对 %s 调用 fstat 失败：%s"
-#: builtin/gc.c:311
+#: builtin/gc.c:312
#, c-format
msgid "Can't stat %s"
msgstr "不能对 %s 调用 stat"
-#: builtin/gc.c:320
+#: builtin/gc.c:321
#, c-format
msgid ""
"The last gc run reported the following. Please correct the root cause\n"
@@ -8433,50 +8643,50 @@
"\n"
"%s"
-#: builtin/gc.c:359
+#: builtin/gc.c:360
msgid "prune unreferenced objects"
msgstr "清除未引用的对象"
-#: builtin/gc.c:361
+#: builtin/gc.c:362
msgid "be more thorough (increased runtime)"
msgstr "更彻底（增加运行时间）"
-#: builtin/gc.c:362
+#: builtin/gc.c:363
msgid "enable auto-gc mode"
msgstr "启用自动垃圾回收模式"
-#: builtin/gc.c:363
+#: builtin/gc.c:364
msgid "force running gc even if there may be another gc running"
msgstr "强制执行 gc 即使另外一个 gc 正在执行"
-#: builtin/gc.c:380
+#: builtin/gc.c:381
#, c-format
msgid "Failed to parse gc.logexpiry value %s"
msgstr "无法解析 gc.logexpiry 的值 %s"
-#: builtin/gc.c:408
+#: builtin/gc.c:409
#, c-format
msgid "Auto packing the repository in background for optimum performance.\n"
msgstr "自动在后台执行仓库打包以求最佳性能。\n"
-#: builtin/gc.c:410
+#: builtin/gc.c:411
#, c-format
msgid "Auto packing the repository for optimum performance.\n"
msgstr "自动打包仓库以求最佳性能。\n"
-#: builtin/gc.c:411
+#: builtin/gc.c:412
#, c-format
msgid "See \"git help gc\" for manual housekeeping.\n"
msgstr "手工维护参见 \"git help gc\"。\n"
-#: builtin/gc.c:436
+#: builtin/gc.c:437
#, 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:480
+#: builtin/gc.c:481
msgid ""
"There are too many unreachable loose objects; run 'git prune' to remove them."
msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。"
@@ -8485,12 +8695,12 @@
msgid "git grep [<options>] [-e] <pattern> [<rev>...] [[--] <path>...]"
msgstr "git grep [<选项>] [-e] <模式> [<版本>...] [[--] <路径>...]"
-#: builtin/grep.c:235
+#: builtin/grep.c:226
#, c-format
msgid "grep: failed to create thread: %s"
msgstr "grep：无法创建线程：%s"
-#: builtin/grep.c:293
+#: builtin/grep.c:284
#, c-format
msgid "invalid number of threads specified (%d) for %s"
msgstr "为 %2$s 设定的线程数 (%1$d) 无效"
@@ -8499,250 +8709,242 @@
#. variable for tweaking threads, currently
#. grep.threads
#.
-#: builtin/grep.c:302 builtin/index-pack.c:1494 builtin/index-pack.c:1692
+#: builtin/grep.c:293 builtin/index-pack.c:1495 builtin/index-pack.c:1688
#, c-format
msgid "no threads support, ignoring %s"
msgstr "没有线程支持，忽略 %s"
-#: builtin/grep.c:788 builtin/grep.c:829
+#: builtin/grep.c:453 builtin/grep.c:573 builtin/grep.c:615
#, c-format
msgid "unable to read tree (%s)"
msgstr "无法读取树（%s）"
-#: builtin/grep.c:848
+#: builtin/grep.c:630
#, c-format
msgid "unable to grep from object of type %s"
msgstr "无法抓取来自于 %s 类型的对象"
-#: builtin/grep.c:912
+#: builtin/grep.c:696
#, c-format
msgid "switch `%c' expects a numerical value"
msgstr "开关 `%c' 期望一个数字值"
-#: builtin/grep.c:999
+#: builtin/grep.c:783
msgid "search in index instead of in the work tree"
msgstr "在索引区搜索而不是在工作区"
-#: builtin/grep.c:1001
+#: builtin/grep.c:785
msgid "find in contents not managed by git"
msgstr "在未被 git 管理的内容中查找"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/grep.c:1003
+#: builtin/grep.c:787
msgid "search in both tracked and untracked files"
msgstr "在跟踪和未跟踪的文件中搜索"
-#: builtin/grep.c:1005
+#: builtin/grep.c:789
msgid "ignore files specified via '.gitignore'"
msgstr "忽略 '.gitignore' 包含的文件"
-#: builtin/grep.c:1007
+#: builtin/grep.c:791
msgid "recursively search in each submodule"
msgstr "在每一个子模组中递归搜索"
-#: builtin/grep.c:1009
-msgid "basename"
-msgstr "基本名"
-
-#: builtin/grep.c:1010
-msgid "prepend parent project's basename to output"
-msgstr "在输出中以父项目的基本名为前缀"
-
-#: builtin/grep.c:1013
+#: builtin/grep.c:794
msgid "show non-matching lines"
msgstr "显示未匹配的行"
-#: builtin/grep.c:1015
+#: builtin/grep.c:796
msgid "case insensitive matching"
msgstr "不区分大小写匹配"
-#: builtin/grep.c:1017
+#: builtin/grep.c:798
msgid "match patterns only at word boundaries"
msgstr "只在单词边界匹配模式"
-#: builtin/grep.c:1019
+#: builtin/grep.c:800
msgid "process binary files as text"
msgstr "把二进制文件当做文本处理"
-#: builtin/grep.c:1021
+#: builtin/grep.c:802
msgid "don't match patterns in binary files"
msgstr "不在二进制文件中匹配模式"
-#: builtin/grep.c:1024
+#: builtin/grep.c:805
msgid "process binary files with textconv filters"
msgstr "用 textconv 过滤器处理二进制文件"
-#: builtin/grep.c:1026
+#: builtin/grep.c:807
msgid "descend at most <depth> levels"
msgstr "最多以指定的深度向下寻找"
-#: builtin/grep.c:1030
+#: builtin/grep.c:811
msgid "use extended POSIX regular expressions"
msgstr "使用扩展的 POSIX 正则表达式"
-#: builtin/grep.c:1033
+#: builtin/grep.c:814
msgid "use basic POSIX regular expressions (default)"
msgstr "使用基本的 POSIX 正则表达式（默认）"
-#: builtin/grep.c:1036
+#: builtin/grep.c:817
msgid "interpret patterns as fixed strings"
msgstr "把模式解析为固定的字符串"
-#: builtin/grep.c:1039
+#: builtin/grep.c:820
msgid "use Perl-compatible regular expressions"
msgstr "使用 Perl 兼容的正则表达式"
-#: builtin/grep.c:1042
+#: builtin/grep.c:823
msgid "show line numbers"
msgstr "显示行号"
-#: builtin/grep.c:1043
+#: builtin/grep.c:824
msgid "don't show filenames"
msgstr "不显示文件名"
-#: builtin/grep.c:1044
+#: builtin/grep.c:825
msgid "show filenames"
msgstr "显示文件名"
-#: builtin/grep.c:1046
+#: builtin/grep.c:827
msgid "show filenames relative to top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/grep.c:1048
+#: builtin/grep.c:829
msgid "show only filenames instead of matching lines"
msgstr "只显示文件名而不显示匹配的行"
-#: builtin/grep.c:1050
+#: builtin/grep.c:831
msgid "synonym for --files-with-matches"
msgstr "和 --files-with-matches 同义"
-#: builtin/grep.c:1053
+#: builtin/grep.c:834
msgid "show only the names of files without match"
msgstr "只显示未匹配的文件名"
-#: builtin/grep.c:1055
+#: builtin/grep.c:836
msgid "print NUL after filenames"
msgstr "在文件名后输出 NUL 字符"
-#: builtin/grep.c:1057
+#: builtin/grep.c:838
msgid "show the number of matches instead of matching lines"
msgstr "显示总匹配行数，而不显示匹配的行"
-#: builtin/grep.c:1058
+#: builtin/grep.c:839
msgid "highlight matches"
msgstr "高亮显示匹配项"
-#: builtin/grep.c:1060
+#: builtin/grep.c:841
msgid "print empty line between matches from different files"
msgstr "在不同文件的匹配项之间打印空行"
-#: builtin/grep.c:1062
+#: builtin/grep.c:843
msgid "show filename only once above matches from same file"
msgstr "只在同一文件的匹配项的上面显示一次文件名"
-#: builtin/grep.c:1065
+#: builtin/grep.c:846
msgid "show <n> context lines before and after matches"
msgstr "显示匹配项前后的 <n> 行上下文"
-#: builtin/grep.c:1068
+#: builtin/grep.c:849
msgid "show <n> context lines before matches"
msgstr "显示匹配项前 <n> 行上下文"
-#: builtin/grep.c:1070
+#: builtin/grep.c:851
msgid "show <n> context lines after matches"
msgstr "显示匹配项后 <n> 行上下文"
-#: builtin/grep.c:1072
+#: builtin/grep.c:853
msgid "use <n> worker threads"
msgstr "使用 <n> 个工作线程"
-#: builtin/grep.c:1073
+#: builtin/grep.c:854
msgid "shortcut for -C NUM"
msgstr "快捷键 -C 数字"
-#: builtin/grep.c:1076
+#: builtin/grep.c:857
msgid "show a line with the function name before matches"
msgstr "在匹配的前面显示一行函数名"
-#: builtin/grep.c:1078
+#: builtin/grep.c:859
msgid "show the surrounding function"
msgstr "显示所在函数的前后内容"
-#: builtin/grep.c:1081
+#: builtin/grep.c:862
msgid "read patterns from file"
msgstr "从文件读取模式"
-#: builtin/grep.c:1083
+#: builtin/grep.c:864
msgid "match <pattern>"
msgstr "匹配 <模式>"
-#: builtin/grep.c:1085
+#: builtin/grep.c:866
msgid "combine patterns specified with -e"
msgstr "组合用 -e 参数设定的模式"
-#: builtin/grep.c:1097
+#: builtin/grep.c:878
msgid "indicate hit with exit status without output"
msgstr "不输出，而用退出码标识命中状态"
-#: builtin/grep.c:1099
+#: builtin/grep.c:880
msgid "show only matches from files that match all patterns"
msgstr "只显示匹配所有模式的文件中的匹配"
-#: builtin/grep.c:1101
+#: builtin/grep.c:882
msgid "show parse tree for grep expression"
msgstr "显示 grep 表达式的解析树"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "pager"
msgstr "分页"
-#: builtin/grep.c:1105
+#: builtin/grep.c:886
msgid "show matching files in the pager"
msgstr "分页显示匹配的文件"
-#: builtin/grep.c:1108
+#: builtin/grep.c:889
msgid "allow calling of grep(1) (ignored by this build)"
msgstr "允许调用 grep(1)（本次构建忽略）"
-#: builtin/grep.c:1172
+#: builtin/grep.c:952
msgid "no pattern given."
msgstr "未提供模式匹配。"
-#: builtin/grep.c:1204
+#: builtin/grep.c:984
msgid "--no-index or --untracked cannot be used with revs"
msgstr "--no-index 或 --untracked 不能和版本同时使用"
-#: builtin/grep.c:1211
+#: builtin/grep.c:991
#, c-format
msgid "unable to resolve revision: %s"
msgstr "不能解析版本：%s"
-#: builtin/grep.c:1245 builtin/index-pack.c:1490
+#: builtin/grep.c:1026 builtin/index-pack.c:1491
#, c-format
msgid "invalid number of threads specified (%d)"
msgstr "指定的线程数无效（%d）"
-#: builtin/grep.c:1250
+#: builtin/grep.c:1031
msgid "no threads support, ignoring --threads"
msgstr "没有线程支持，忽略 --threads"
-#: builtin/grep.c:1281
+#: builtin/grep.c:1055
msgid "--open-files-in-pager only works on the worktree"
msgstr "--open-files-in-pager 仅用于工作区"
-#: builtin/grep.c:1304
+#: builtin/grep.c:1078
msgid "option not supported with --recurse-submodules."
msgstr "选项不支持和 --recurse-submodules 共用。"
-#: builtin/grep.c:1310
+#: builtin/grep.c:1084
msgid "--cached or --untracked cannot be used with --no-index."
msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。"
-#: builtin/grep.c:1316
+#: builtin/grep.c:1090
msgid "--[no-]exclude-standard cannot be used for tracked contents."
msgstr "--[no-]exclude-standard 不能用于已跟踪内容。"
-#: builtin/grep.c:1324
+#: builtin/grep.c:1098
msgid "both --cached and trees are given."
msgstr "同时给出了 --cached 和树对象。"
@@ -8833,12 +9035,12 @@
msgid "emacsclient version '%d' too old (< 22)."
msgstr "emacsclient 版本 '%d' 太老（< 22）。"
-#: builtin/help.c:133 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171
+#: builtin/help.c:133 builtin/help.c:155 builtin/help.c:165 builtin/help.c:173
#, c-format
msgid "failed to exec '%s'"
msgstr "无法执行 '%s'"
-#: builtin/help.c:208
+#: builtin/help.c:211
#, c-format
msgid ""
"'%s': path for unsupported man viewer.\n"
@@ -8847,7 +9049,7 @@
"'%s'：不支持的 man 手册查看器的路径。\n"
"请使用 'man.<工具>.cmd'。"
-#: builtin/help.c:220
+#: builtin/help.c:223
#, c-format
msgid ""
"'%s': cmd for supported man viewer.\n"
@@ -8856,351 +9058,351 @@
"'%s': 支持的 man 手册查看器命令。\n"
"请使用 'man.<工具>.path'。"
-#: builtin/help.c:337
+#: builtin/help.c:340
#, c-format
msgid "'%s': unknown man viewer."
msgstr "'%s'：未知的 man 查看器。"
-#: builtin/help.c:354
+#: builtin/help.c:357
msgid "no man viewer handled the request"
msgstr "没有 man 查看器处理此请求"
-#: builtin/help.c:362
+#: builtin/help.c:365
msgid "no info viewer handled the request"
msgstr "没有 info 查看器处理此请求"
-#: builtin/help.c:404
+#: builtin/help.c:407
msgid "Defining attributes per path"
msgstr "定义路径的属性"
-#: builtin/help.c:405
+#: builtin/help.c:408
msgid "Everyday Git With 20 Commands Or So"
msgstr "每一天 Git 常用的约 20 条命令"
-#: builtin/help.c:406
+#: builtin/help.c:409
msgid "A Git glossary"
msgstr "Git 词汇表"
-#: builtin/help.c:407
+#: builtin/help.c:410
msgid "Specifies intentionally untracked files to ignore"
msgstr "忽略指定的未跟踪文件"
-#: builtin/help.c:408
+#: builtin/help.c:411
msgid "Defining submodule properties"
msgstr "定义子模组属性"
-#: builtin/help.c:409
+#: builtin/help.c:412
msgid "Specifying revisions and ranges for Git"
msgstr "指定 Git 的版本和版本范围"
-#: builtin/help.c:410
+#: builtin/help.c:413
msgid "A tutorial introduction to Git (for version 1.5.1 or newer)"
msgstr "一个 Git 教程（针对 1.5.1 或更新版本）"
-#: builtin/help.c:411
+#: builtin/help.c:414
msgid "An overview of recommended workflows with Git"
msgstr "Git 推荐的工作流概览"
-#: builtin/help.c:423
+#: builtin/help.c:426
msgid "The common Git guides are:\n"
msgstr "最常用的 Git 向导有：\n"
-#: builtin/help.c:441
+#: builtin/help.c:444
#, c-format
-msgid "`git %s' is aliased to `%s'"
-msgstr "`git %s' 是 `%s' 的别名"
+msgid "'%s' is aliased to '%s'"
+msgstr "'%s' 是 '%s' 的别名"
-#: builtin/help.c:463 builtin/help.c:480
+#: builtin/help.c:466 builtin/help.c:483
#, c-format
msgid "usage: %s%s"
msgstr "用法：%s%s"
-#: builtin/index-pack.c:155
+#: builtin/index-pack.c:156
#, c-format
msgid "unable to open %s"
msgstr "不能打开 %s"
-#: builtin/index-pack.c:205
+#: builtin/index-pack.c:206
#, c-format
msgid "object type mismatch at %s"
msgstr "%s 的对象类型不匹配"
-#: builtin/index-pack.c:225
+#: builtin/index-pack.c:226
#, c-format
msgid "did not receive expected object %s"
msgstr "未能获取预期的对象 %s"
-#: builtin/index-pack.c:228
+#: builtin/index-pack.c:229
#, c-format
msgid "object %s: expected type %s, found %s"
msgstr "对象 %s：应为类型 %s，却是 %s"
-#: builtin/index-pack.c:270
+#: builtin/index-pack.c:271
#, c-format
msgid "cannot fill %d byte"
msgid_plural "cannot fill %d bytes"
msgstr[0] "无法填充 %d 字节"
msgstr[1] "无法填充 %d 字节"
-#: builtin/index-pack.c:280
+#: builtin/index-pack.c:281
msgid "early EOF"
msgstr "过早的文件结束符（EOF）"
-#: builtin/index-pack.c:281
+#: builtin/index-pack.c:282
msgid "read error on input"
msgstr "输入上的读错误"
-#: builtin/index-pack.c:293
+#: builtin/index-pack.c:294
msgid "used more bytes than were available"
msgstr "用掉了超过可用的字节"
-#: builtin/index-pack.c:300
+#: builtin/index-pack.c:301
msgid "pack too large for current definition of off_t"
msgstr "包太大超过了当前 off_t 的定义"
-#: builtin/index-pack.c:303 builtin/unpack-objects.c:93
+#: builtin/index-pack.c:304 builtin/unpack-objects.c:93
msgid "pack exceeds maximum allowed size"
msgstr "包超过了最大允许值"
-#: builtin/index-pack.c:318
+#: builtin/index-pack.c:319
#, c-format
msgid "unable to create '%s'"
msgstr "不能创建 '%s'"
-#: builtin/index-pack.c:324
+#: builtin/index-pack.c:325
#, c-format
msgid "cannot open packfile '%s'"
msgstr "无法打开包文件 '%s'"
-#: builtin/index-pack.c:338
+#: builtin/index-pack.c:339
msgid "pack signature mismatch"
msgstr "包签名不匹配"
-#: builtin/index-pack.c:340
+#: builtin/index-pack.c:341
#, c-format
msgid "pack version %<PRIu32> unsupported"
msgstr "不支持包版本 %<PRIu32>"
-#: builtin/index-pack.c:358
+#: builtin/index-pack.c:359
#, c-format
msgid "pack has bad object at offset %<PRIuMAX>: %s"
msgstr "包中有错误的对象位于偏移量 %<PRIuMAX>：%s"
-#: builtin/index-pack.c:479
+#: builtin/index-pack.c:480
#, c-format
msgid "inflate returned %d"
msgstr "解压缩返回 %d"
-#: builtin/index-pack.c:528
+#: builtin/index-pack.c:529
msgid "offset value overflow for delta base object"
msgstr "偏移值覆盖了 delta 基准对象"
-#: builtin/index-pack.c:536
+#: builtin/index-pack.c:537
msgid "delta base offset is out of bound"
msgstr "delta 基准偏移越界"
-#: builtin/index-pack.c:544
+#: builtin/index-pack.c:545
#, c-format
msgid "unknown object type %d"
msgstr "未知对象类型 %d"
-#: builtin/index-pack.c:575
+#: builtin/index-pack.c:576
msgid "cannot pread pack file"
msgstr "无法读取包文件"
-#: builtin/index-pack.c:577
+#: builtin/index-pack.c:578
#, 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:603
+#: builtin/index-pack.c:604
msgid "serious inflate inconsistency"
msgstr "解压缩严重的不一致"
-#: builtin/index-pack.c:748 builtin/index-pack.c:754 builtin/index-pack.c:777
-#: builtin/index-pack.c:816 builtin/index-pack.c:825
+#: builtin/index-pack.c:749 builtin/index-pack.c:755 builtin/index-pack.c:778
+#: builtin/index-pack.c:817 builtin/index-pack.c:826
#, c-format
msgid "SHA1 COLLISION FOUND WITH %s !"
msgstr "发现 %s 出现 SHA1 冲突！"
-#: builtin/index-pack.c:751 builtin/pack-objects.c:167
-#: builtin/pack-objects.c:261
+#: builtin/index-pack.c:752 builtin/pack-objects.c:179
+#: builtin/pack-objects.c:273
#, c-format
msgid "unable to read %s"
msgstr "不能读 %s"
-#: builtin/index-pack.c:814
+#: builtin/index-pack.c:815
#, c-format
msgid "cannot read existing object info %s"
msgstr "不能读取现存对象信息 %s"
-#: builtin/index-pack.c:822
+#: builtin/index-pack.c:823
#, c-format
msgid "cannot read existing object %s"
msgstr "不能读取现存对象 %s"
-#: builtin/index-pack.c:836
+#: builtin/index-pack.c:837
#, c-format
msgid "invalid blob object %s"
msgstr "无效的数据对象 %s"
-#: builtin/index-pack.c:851
+#: builtin/index-pack.c:852
#, c-format
msgid "invalid %s"
msgstr "无效的 %s"
-#: builtin/index-pack.c:854
+#: builtin/index-pack.c:855
msgid "Error in object"
msgstr "对象中出错"
-#: builtin/index-pack.c:856
+#: builtin/index-pack.c:857
#, c-format
msgid "Not all child objects of %s are reachable"
msgstr "%s 的所有子对象并非都可达"
-#: builtin/index-pack.c:928 builtin/index-pack.c:959
+#: builtin/index-pack.c:929 builtin/index-pack.c:960
msgid "failed to apply delta"
msgstr "无法应用 delta"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Receiving objects"
msgstr "接收对象中"
-#: builtin/index-pack.c:1130
+#: builtin/index-pack.c:1131
msgid "Indexing objects"
msgstr "索引对象中"
-#: builtin/index-pack.c:1164
+#: builtin/index-pack.c:1165
msgid "pack is corrupted (SHA1 mismatch)"
msgstr "包冲突（SHA1 不匹配）"
-#: builtin/index-pack.c:1169
+#: builtin/index-pack.c:1170
msgid "cannot fstat packfile"
msgstr "不能对包文件调用 fstat"
-#: builtin/index-pack.c:1172
+#: builtin/index-pack.c:1173
msgid "pack has junk at the end"
msgstr "包的结尾有垃圾数据"
-#: builtin/index-pack.c:1184
+#: builtin/index-pack.c:1185
msgid "confusion beyond insanity in parse_pack_objects()"
msgstr "parse_pack_objects() 中遇到不可理喻的问题"
-#: builtin/index-pack.c:1207
+#: builtin/index-pack.c:1208
msgid "Resolving deltas"
msgstr "处理 delta 中"
-#: builtin/index-pack.c:1218
+#: builtin/index-pack.c:1219
#, c-format
msgid "unable to create thread: %s"
msgstr "不能创建线程：%s"
-#: builtin/index-pack.c:1260
+#: builtin/index-pack.c:1261
msgid "confusion beyond insanity"
msgstr "不可理喻"
-#: builtin/index-pack.c:1266
+#: builtin/index-pack.c:1267
#, 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:1278
+#: builtin/index-pack.c:1279
#, c-format
msgid "Unexpected tail checksum for %s (disk corruption?)"
msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）"
-#: builtin/index-pack.c:1282
+#: builtin/index-pack.c:1283
#, 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:1306
+#: builtin/index-pack.c:1307
#, c-format
msgid "unable to deflate appended object (%d)"
msgstr "不能压缩附加对象（%d）"
-#: builtin/index-pack.c:1382
+#: builtin/index-pack.c:1383
#, c-format
msgid "local object %s is corrupt"
msgstr "本地对象 %s 已损坏"
-#: builtin/index-pack.c:1408
+#: builtin/index-pack.c:1409
msgid "error while closing pack file"
msgstr "关闭包文件时出错"
-#: builtin/index-pack.c:1420
+#: builtin/index-pack.c:1421
#, c-format
msgid "cannot write keep file '%s'"
msgstr "无法写保留文件 '%s'"
-#: builtin/index-pack.c:1428
+#: builtin/index-pack.c:1429
#, c-format
msgid "cannot close written keep file '%s'"
msgstr "无法关闭保留文件 '%s'"
-#: builtin/index-pack.c:1438
+#: builtin/index-pack.c:1439
msgid "cannot store pack file"
msgstr "无法存储包文件"
-#: builtin/index-pack.c:1446
+#: builtin/index-pack.c:1447
msgid "cannot store index file"
msgstr "无法存储索引文件"
-#: builtin/index-pack.c:1484
+#: builtin/index-pack.c:1485
#, c-format
msgid "bad pack.indexversion=%<PRIu32>"
msgstr "坏的 pack.indexversion=%<PRIu32>"
-#: builtin/index-pack.c:1552
+#: builtin/index-pack.c:1553
#, c-format
msgid "Cannot open existing pack file '%s'"
msgstr "无法打开现存包文件 '%s'"
-#: builtin/index-pack.c:1554
+#: builtin/index-pack.c:1555
#, c-format
msgid "Cannot open existing pack idx file for '%s'"
msgstr "无法为 %s 打开包索引文件"
-#: builtin/index-pack.c:1602
+#: builtin/index-pack.c:1603
#, 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:1609
+#: builtin/index-pack.c:1610
#, 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:1622
+#: builtin/index-pack.c:1623
#, c-format
msgid "packfile name '%s' does not end with '.pack'"
msgstr "包文件名 '%s' 没有以 '.pack' 结尾"
-#: builtin/index-pack.c:1704 builtin/index-pack.c:1707
-#: builtin/index-pack.c:1723 builtin/index-pack.c:1727
+#: builtin/index-pack.c:1700 builtin/index-pack.c:1703
+#: builtin/index-pack.c:1719 builtin/index-pack.c:1723
#, c-format
msgid "bad %s"
msgstr "错误选项 %s"
-#: builtin/index-pack.c:1743
+#: builtin/index-pack.c:1739
msgid "--fix-thin cannot be used without --stdin"
msgstr "--fix-thin 不能和 --stdin 同时使用"
-#: builtin/index-pack.c:1745
+#: builtin/index-pack.c:1741
msgid "--stdin requires a git repository"
msgstr "--stdin 需要一个 git 仓库"
-#: builtin/index-pack.c:1753
+#: builtin/index-pack.c:1749
msgid "--verify with no packfile name given"
msgstr "--verify 没有提供包文件名参数"
@@ -9330,132 +9532,172 @@
"git interpret-trailers [--in-place] [--trim-empty] [(--trailer <键>[(=|:)<值"
">])...] [<文件>...]"
-#: builtin/interpret-trailers.c:26
+#: builtin/interpret-trailers.c:92
msgid "edit files in place"
msgstr "在原位编辑文件"
-#: builtin/interpret-trailers.c:27
+#: builtin/interpret-trailers.c:93
msgid "trim empty trailers"
-msgstr "删除空签名"
+msgstr "删除空的尾部署名"
-#: builtin/interpret-trailers.c:28
+#: builtin/interpret-trailers.c:96
+msgid "where to place the new trailer"
+msgstr "在哪里放置新的尾部署名"
+
+#: builtin/interpret-trailers.c:98
+msgid "action if trailer already exists"
+msgstr "当尾部署名已经存在时所采取的动作"
+
+#: builtin/interpret-trailers.c:100
+msgid "action if trailer is missing"
+msgstr "当尾部署名缺失时所采取的动作"
+
+#: builtin/interpret-trailers.c:102
+msgid "output only the trailers"
+msgstr "只输出尾部署名"
+
+#: builtin/interpret-trailers.c:103
+msgid "do not apply config rules"
+msgstr "不要应用配置规则"
+
+#: builtin/interpret-trailers.c:104
+msgid "join whitespace-continued values"
+msgstr "连接空白折行的值"
+
+#: builtin/interpret-trailers.c:105
+msgid "set parsing options"
+msgstr "设置解析选项"
+
+#: builtin/interpret-trailers.c:107
msgid "trailer"
-msgstr "签名"
+msgstr "尾部署名"
-#: builtin/interpret-trailers.c:29
+#: builtin/interpret-trailers.c:108
msgid "trailer(s) to add"
-msgstr "要添加的签名"
+msgstr "要添加的尾部署名"
-#: builtin/interpret-trailers.c:42
+#: builtin/interpret-trailers.c:117
+msgid "--trailer with --only-input does not make sense"
+msgstr "--trailer 和 --only-input 同时使用没有意义"
+
+#: builtin/interpret-trailers.c:127
msgid "no input file given for in-place editing"
msgstr "没有给出要原位编辑的文件"
-#: builtin/log.c:45
+#: builtin/log.c:46
msgid "git log [<options>] [<revision-range>] [[--] <path>...]"
msgstr "git log [<选项>] [<版本范围>] [[--] <路径>...]"
-#: builtin/log.c:46
+#: builtin/log.c:47
msgid "git show [<options>] <object>..."
msgstr "git show [<选项>] <对象>..."
-#: builtin/log.c:90
+#: builtin/log.c:91
#, c-format
msgid "invalid --decorate option: %s"
msgstr "无效的 --decorate 选项：%s"
-#: builtin/log.c:147
+#: builtin/log.c:151
msgid "suppress diff output"
msgstr "不显示差异输出"
-#: builtin/log.c:148
+#: builtin/log.c:152
msgid "show source"
msgstr "显示源"
-#: builtin/log.c:149
+#: builtin/log.c:153
msgid "Use mail map file"
msgstr "使用邮件映射文件"
-#: builtin/log.c:150
+#: builtin/log.c:155
+msgid "only decorate refs that match <pattern>"
+msgstr "只修饰与 <模式> 匹配的引用"
+
+#: builtin/log.c:157
+msgid "do not decorate refs that match <pattern>"
+msgstr "不修饰和 <模式> 匹配的引用"
+
+#: builtin/log.c:158
msgid "decorate options"
msgstr "修饰选项"
-#: builtin/log.c:153
+#: builtin/log.c:161
msgid "Process line range n,m in file, counting from 1"
msgstr "处理文件中第 n 到 m 之间的行，从 1 开始"
-#: builtin/log.c:249
+#: builtin/log.c:257
#, c-format
msgid "Final output: %d %s\n"
msgstr "最终输出：%d %s\n"
-#: builtin/log.c:497
+#: builtin/log.c:508
#, c-format
msgid "git show %s: bad file"
msgstr "git show %s: 损坏的文件"
-#: builtin/log.c:512 builtin/log.c:606
+#: builtin/log.c:523 builtin/log.c:617
#, c-format
msgid "Could not read object %s"
msgstr "不能读取对象 %s"
-#: builtin/log.c:630
+#: builtin/log.c:641
#, c-format
msgid "Unknown type: %d"
msgstr "未知类型：%d"
-#: builtin/log.c:751
+#: builtin/log.c:762
msgid "format.headers without value"
msgstr "format.headers 没有值"
-#: builtin/log.c:852
+#: builtin/log.c:863
msgid "name of output directory is too long"
msgstr "输出目录名太长"
-#: builtin/log.c:868
+#: builtin/log.c:879
#, c-format
msgid "Cannot open patch file %s"
msgstr "无法打开补丁文件 %s"
-#: builtin/log.c:885
+#: builtin/log.c:896
msgid "Need exactly one range."
msgstr "只需要一个范围。"
-#: builtin/log.c:895
+#: builtin/log.c:906
msgid "Not a range."
msgstr "不是一个范围。"
-#: builtin/log.c:1001
+#: builtin/log.c:1012
msgid "Cover letter needs email format"
msgstr "信封需要邮件地址格式"
-#: builtin/log.c:1081
+#: builtin/log.c:1092
#, c-format
msgid "insane in-reply-to: %s"
msgstr "不正常的 in-reply-to：%s"
-#: builtin/log.c:1108
+#: builtin/log.c:1119
msgid "git format-patch [<options>] [<since> | <revision-range>]"
msgstr "git format-patch [<选项>] [<从> | <版本范围>]"
-#: builtin/log.c:1158
+#: builtin/log.c:1169
msgid "Two output directories?"
msgstr "两个输出目录？"
-#: builtin/log.c:1265 builtin/log.c:1908 builtin/log.c:1910 builtin/log.c:1922
+#: builtin/log.c:1276 builtin/log.c:1927 builtin/log.c:1929 builtin/log.c:1941
#, c-format
msgid "Unknown commit %s"
msgstr "未知提交 %s"
-#: builtin/log.c:1275 builtin/notes.c:886 builtin/tag.c:533
+#: builtin/log.c:1286 builtin/notes.c:887 builtin/tag.c:516
#, c-format
msgid "Failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
-#: builtin/log.c:1280
+#: builtin/log.c:1291
msgid "Could not find exact merge base."
msgstr "不能找到准确的合并基线。"
-#: builtin/log.c:1284
+#: builtin/log.c:1295
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"
@@ -9463,220 +9705,228 @@
msgstr ""
"无法得到上游地址，如果你想自动记录基线提交，请使用命令\n"
"git branch --set-upstream-to 来跟踪一个远程分支。或者你可以通过\n"
-"参数 --base=<base-commit-id> 手动指定一个基线提交。"
+"参数 --base=<基线提交> 手动指定一个基线提交。"
-#: builtin/log.c:1304
+#: builtin/log.c:1315
msgid "Failed to find exact merge base"
msgstr "无法找到准确的合并基线"
-#: builtin/log.c:1315
+#: builtin/log.c:1326
msgid "base commit should be the ancestor of revision list"
msgstr "基线提交应该是版本列表的祖先"
-#: builtin/log.c:1319
+#: builtin/log.c:1330
msgid "base commit shouldn't be in revision list"
msgstr "基线提交不应该出现在版本列表中"
-#: builtin/log.c:1368
+#: builtin/log.c:1379
msgid "cannot get patch id"
msgstr "无法得到补丁 id"
-#: builtin/log.c:1425
+#: builtin/log.c:1438
msgid "use [PATCH n/m] even with a single patch"
msgstr "使用 [PATCH n/m]，即使只有一个补丁"
-#: builtin/log.c:1428
+#: builtin/log.c:1441
msgid "use [PATCH] even with multiple patches"
msgstr "使用 [PATCH]，即使有多个补丁"
-#: builtin/log.c:1432
+#: builtin/log.c:1445
msgid "print patches to standard out"
msgstr "打印补丁到标准输出"
-#: builtin/log.c:1434
+#: builtin/log.c:1447
msgid "generate a cover letter"
msgstr "生成一封附信"
-#: builtin/log.c:1436
+#: builtin/log.c:1449
msgid "use simple number sequence for output file names"
msgstr "使用简单的数字序列作为输出文件名"
-#: builtin/log.c:1437
+#: builtin/log.c:1450
msgid "sfx"
msgstr "后缀"
-#: builtin/log.c:1438
+#: builtin/log.c:1451
msgid "use <sfx> instead of '.patch'"
msgstr "使用 <后缀> 代替 '.patch'"
-#: builtin/log.c:1440
+#: builtin/log.c:1453
msgid "start numbering patches at <n> instead of 1"
msgstr "补丁以 <n> 开始编号，而不是1"
-#: builtin/log.c:1442
+#: builtin/log.c:1455
msgid "mark the series as Nth re-roll"
msgstr "标记补丁系列是第几次重制"
-#: builtin/log.c:1444
+#: builtin/log.c:1457
msgid "Use [RFC PATCH] instead of [PATCH]"
msgstr "使用 [RFC PATCH] 代替 [PATCH]"
-#: builtin/log.c:1447
+#: builtin/log.c:1460
msgid "Use [<prefix>] instead of [PATCH]"
msgstr "使用 [<前缀>] 代替 [PATCH]"
-#: builtin/log.c:1450
+#: builtin/log.c:1463
msgid "store resulting files in <dir>"
msgstr "把结果文件存储在 <目录>"
-#: builtin/log.c:1453
+#: builtin/log.c:1466
msgid "don't strip/add [PATCH]"
msgstr "不删除/添加 [PATCH]"
-#: builtin/log.c:1456
+#: builtin/log.c:1469
msgid "don't output binary diffs"
msgstr "不输出二进制差异"
-#: builtin/log.c:1458
+#: builtin/log.c:1471
msgid "output all-zero hash in From header"
msgstr "在 From 头信息中输出全为零的哈希值"
-#: builtin/log.c:1460
+#: builtin/log.c:1473
msgid "don't include a patch matching a commit upstream"
msgstr "不包含已在上游提交中的补丁"
-#: builtin/log.c:1462
+#: builtin/log.c:1475
msgid "show patch format instead of default (patch + stat)"
msgstr "显示纯补丁格式而非默认的（补丁+状态）"
-#: builtin/log.c:1464
+#: builtin/log.c:1477
msgid "Messaging"
msgstr "邮件发送"
-#: builtin/log.c:1465
+#: builtin/log.c:1478
msgid "header"
msgstr "header"
-#: builtin/log.c:1466
+#: builtin/log.c:1479
msgid "add email header"
msgstr "添加邮件头"
-#: builtin/log.c:1467 builtin/log.c:1469
+#: builtin/log.c:1480 builtin/log.c:1482
msgid "email"
msgstr "邮件地址"
-#: builtin/log.c:1467
+#: builtin/log.c:1480
msgid "add To: header"
msgstr "添加收件人"
-#: builtin/log.c:1469
+#: builtin/log.c:1482
msgid "add Cc: header"
msgstr "添加抄送"
-#: builtin/log.c:1471
+#: builtin/log.c:1484
msgid "ident"
msgstr "标识"
-#: builtin/log.c:1472
+#: builtin/log.c:1485
msgid "set From address to <ident> (or committer ident if absent)"
msgstr "将 From 地址设置为 <标识>（如若不提供，则用提交者 ID 做为地址）"
-#: builtin/log.c:1474
+#: builtin/log.c:1487
msgid "message-id"
msgstr "邮件标识"
-#: builtin/log.c:1475
+#: builtin/log.c:1488
msgid "make first mail a reply to <message-id>"
msgstr "使第一封邮件作为对 <邮件标识> 的回复"
-#: builtin/log.c:1476 builtin/log.c:1479
+#: builtin/log.c:1489 builtin/log.c:1492
msgid "boundary"
msgstr "边界"
-#: builtin/log.c:1477
+#: builtin/log.c:1490
msgid "attach the patch"
msgstr "附件方式添加补丁"
-#: builtin/log.c:1480
+#: builtin/log.c:1493
msgid "inline the patch"
msgstr "内联显示补丁"
-#: builtin/log.c:1484
+#: builtin/log.c:1497
msgid "enable message threading, styles: shallow, deep"
msgstr "启用邮件线索，风格：浅，深"
-#: builtin/log.c:1486
+#: builtin/log.c:1499
msgid "signature"
msgstr "签名"
-#: builtin/log.c:1487
+#: builtin/log.c:1500
msgid "add a signature"
msgstr "添加一个签名"
-#: builtin/log.c:1488
+#: builtin/log.c:1501
msgid "base-commit"
msgstr "基线提交"
-#: builtin/log.c:1489
+#: builtin/log.c:1502
msgid "add prerequisite tree info to the patch series"
msgstr "为补丁列表添加前置树信息"
-#: builtin/log.c:1491
+#: builtin/log.c:1504
msgid "add a signature from a file"
msgstr "从文件添加一个签名"
-#: builtin/log.c:1492
+#: builtin/log.c:1505
msgid "don't print the patch filenames"
msgstr "不要打印补丁文件名"
-#: builtin/log.c:1567
+#: builtin/log.c:1507
+msgid "show progress while generating patches"
+msgstr "在生成补丁时显示进度"
+
+#: builtin/log.c:1582
#, c-format
msgid "invalid ident line: %s"
msgstr "包含无效的身份标识：%s"
-#: builtin/log.c:1582
+#: builtin/log.c:1597
msgid "-n and -k are mutually exclusive."
msgstr "-n 和 -k 互斥。"
-#: builtin/log.c:1584
+#: builtin/log.c:1599
msgid "--subject-prefix/--rfc and -k are mutually exclusive."
msgstr "--subject-prefix/--rfc 和 -k 互斥。"
-#: builtin/log.c:1592
+#: builtin/log.c:1607
msgid "--name-only does not make sense"
msgstr "--name-only 无意义"
-#: builtin/log.c:1594
+#: builtin/log.c:1609
msgid "--name-status does not make sense"
msgstr "--name-status 无意义"
-#: builtin/log.c:1596
+#: builtin/log.c:1611
msgid "--check does not make sense"
msgstr "--check 无意义"
-#: builtin/log.c:1626
+#: builtin/log.c:1641
msgid "standard output, or directory, which one?"
msgstr "标准输出或目录，哪一个？"
-#: builtin/log.c:1628
+#: builtin/log.c:1643
#, c-format
msgid "Could not create directory '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/log.c:1722
+#: builtin/log.c:1736
#, c-format
msgid "unable to read signature file '%s'"
msgstr "无法读取签名文件 '%s'"
-#: builtin/log.c:1794
+#: builtin/log.c:1768
+msgid "Generating patches"
+msgstr "生成补丁"
+
+#: builtin/log.c:1812
msgid "Failed to create output files"
msgstr "无法创建输出文件"
-#: builtin/log.c:1843
+#: builtin/log.c:1862
msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]"
msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]"
-#: builtin/log.c:1897
+#: builtin/log.c:1916
#, c-format
msgid ""
"Could not find a tracked remote branch, please specify <upstream> manually.\n"
@@ -9695,90 +9945,94 @@
msgstr "使用小写字母表示 '假设未改变的' 文件"
#: builtin/ls-files.c:521
+msgid "use lowercase letters for 'fsmonitor clean' files"
+msgstr "使用小写字母表示 'fsmonitor clean' 文件"
+
+#: builtin/ls-files.c:523
msgid "show cached files in the output (default)"
msgstr "显示缓存的文件（默认）"
-#: builtin/ls-files.c:523
+#: builtin/ls-files.c:525
msgid "show deleted files in the output"
msgstr "显示已删除的文件"
-#: builtin/ls-files.c:525
+#: builtin/ls-files.c:527
msgid "show modified files in the output"
msgstr "显示已修改的文件"
-#: builtin/ls-files.c:527
+#: builtin/ls-files.c:529
msgid "show other files in the output"
msgstr "显示其它文件"
-#: builtin/ls-files.c:529
+#: builtin/ls-files.c:531
msgid "show ignored files in the output"
msgstr "显示忽略的文件"
-#: builtin/ls-files.c:532
+#: builtin/ls-files.c:534
msgid "show staged contents' object name in the output"
msgstr "显示暂存区内容的对象名称"
-#: builtin/ls-files.c:534
+#: builtin/ls-files.c:536
msgid "show files on the filesystem that need to be removed"
msgstr "显示文件系统需要删除的文件"
-#: builtin/ls-files.c:536
+#: builtin/ls-files.c:538
msgid "show 'other' directories' names only"
msgstr "只显示“其他”目录的名称"
-#: builtin/ls-files.c:538
+#: builtin/ls-files.c:540
msgid "show line endings of files"
msgstr "显示文件换行符格式"
-#: builtin/ls-files.c:540
+#: builtin/ls-files.c:542
msgid "don't show empty directories"
msgstr "不显示空目录"
-#: builtin/ls-files.c:543
+#: builtin/ls-files.c:545
msgid "show unmerged files in the output"
msgstr "显示未合并的文件"
-#: builtin/ls-files.c:545
+#: builtin/ls-files.c:547
msgid "show resolve-undo information"
msgstr "显示 resolve-undo 信息"
-#: builtin/ls-files.c:547
+#: builtin/ls-files.c:549
msgid "skip files matching pattern"
msgstr "匹配排除文件的模式"
-#: builtin/ls-files.c:550
+#: builtin/ls-files.c:552
msgid "exclude patterns are read from <file>"
msgstr "从 <文件> 中读取排除模式"
-#: builtin/ls-files.c:553
+#: builtin/ls-files.c:555
msgid "read additional per-directory exclude patterns in <file>"
msgstr "从 <文件> 读取额外的每个目录的排除模式"
-#: builtin/ls-files.c:555
+#: builtin/ls-files.c:557
msgid "add the standard git exclusions"
msgstr "添加标准的 git 排除"
-#: builtin/ls-files.c:558
+#: builtin/ls-files.c:560
msgid "make the output relative to the project top directory"
msgstr "显示相对于顶级目录的文件名"
-#: builtin/ls-files.c:561
+#: builtin/ls-files.c:563
msgid "recurse through submodules"
msgstr "在子模组中递归"
-#: builtin/ls-files.c:563
+#: builtin/ls-files.c:565
msgid "if any <file> is not in the index, treat this as an error"
msgstr "如果任何 <文件> 都不在索引区，视为错误"
-#: builtin/ls-files.c:564
+#: builtin/ls-files.c:566
msgid "tree-ish"
msgstr "树或提交"
-#: builtin/ls-files.c:565
+#: builtin/ls-files.c:567
msgid "pretend that paths removed since <tree-ish> are still present"
msgstr "假装自从 <树或提交> 之后删除的路径仍然存在"
-#: builtin/ls-files.c:567
+#: builtin/ls-files.c:569
msgid "show debugging data"
msgstr "显示调试数据"
@@ -9869,177 +10123,181 @@
msgid "empty mbox: '%s'"
msgstr "空的 mbox：'%s'"
-#: builtin/merge.c:47
+#: builtin/merge.c:48
msgid "git merge [<options>] [<commit>...]"
msgstr "git merge [<选项>] [<提交>...]"
-#: builtin/merge.c:48
+#: builtin/merge.c:49
msgid "git merge --abort"
msgstr "git merge --abort"
-#: builtin/merge.c:49
+#: builtin/merge.c:50
msgid "git merge --continue"
msgstr "git merge --continue"
-#: builtin/merge.c:104
+#: builtin/merge.c:107
msgid "switch `m' requires a value"
msgstr "开关 `m' 需要一个值"
-#: builtin/merge.c:141
+#: builtin/merge.c:144
#, c-format
msgid "Could not find merge strategy '%s'.\n"
msgstr "不能找到合并策略 '%s'。\n"
-#: builtin/merge.c:142
+#: builtin/merge.c:145
#, c-format
msgid "Available strategies are:"
msgstr "可用的策略有："
-#: builtin/merge.c:147
+#: builtin/merge.c:150
#, c-format
msgid "Available custom strategies are:"
msgstr "可用的自定义策略有："
-#: builtin/merge.c:197 builtin/pull.c:134
+#: builtin/merge.c:200 builtin/pull.c:137
msgid "do not show a diffstat at the end of the merge"
msgstr "在合并的最后不显示差异统计"
-#: builtin/merge.c:200 builtin/pull.c:137
+#: builtin/merge.c:203 builtin/pull.c:140
msgid "show a diffstat at the end of the merge"
msgstr "在合并的最后显示差异统计"
-#: builtin/merge.c:201 builtin/pull.c:140
+#: builtin/merge.c:204 builtin/pull.c:143
msgid "(synonym to --stat)"
msgstr "（和 --stat 同义）"
-#: builtin/merge.c:203 builtin/pull.c:143
+#: builtin/merge.c:206 builtin/pull.c:146
msgid "add (at most <n>) entries from shortlog to merge commit message"
msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录"
-#: builtin/merge.c:206 builtin/pull.c:146
+#: builtin/merge.c:209 builtin/pull.c:152
msgid "create a single commit instead of doing a merge"
msgstr "创建一个单独的提交而不是做一次合并"
-#: builtin/merge.c:208 builtin/pull.c:149
+#: builtin/merge.c:211 builtin/pull.c:155
msgid "perform a commit if the merge succeeds (default)"
msgstr "如果合并成功，执行一次提交（默认）"
-#: builtin/merge.c:210 builtin/pull.c:152
+#: builtin/merge.c:213 builtin/pull.c:158
msgid "edit message before committing"
msgstr "在提交前编辑提交说明"
-#: builtin/merge.c:211
+#: builtin/merge.c:214
msgid "allow fast-forward (default)"
msgstr "允许快进（默认）"
-#: builtin/merge.c:213 builtin/pull.c:158
+#: builtin/merge.c:216 builtin/pull.c:164
msgid "abort if fast-forward is not possible"
msgstr "如果不能快进就放弃合并"
-#: builtin/merge.c:217 builtin/pull.c:161
+#: builtin/merge.c:220 builtin/pull.c:167
msgid "verify that the named commit has a valid GPG signature"
msgstr "验证指定的提交是否包含一个有效的 GPG 签名"
-#: builtin/merge.c:218 builtin/notes.c:776 builtin/pull.c:165
+#: builtin/merge.c:221 builtin/notes.c:777 builtin/pull.c:171
#: builtin/revert.c:109
msgid "strategy"
msgstr "策略"
-#: builtin/merge.c:219 builtin/pull.c:166
+#: builtin/merge.c:222 builtin/pull.c:172
msgid "merge strategy to use"
msgstr "要使用的合并策略"
-#: builtin/merge.c:220 builtin/pull.c:169
+#: builtin/merge.c:223 builtin/pull.c:175
msgid "option=value"
msgstr "option=value"
-#: builtin/merge.c:221 builtin/pull.c:170
+#: builtin/merge.c:224 builtin/pull.c:176
msgid "option for selected merge strategy"
msgstr "所选的合并策略的选项"
-#: builtin/merge.c:223
+#: builtin/merge.c:226
msgid "merge commit message (for a non-fast-forward merge)"
msgstr "合并的提交说明（针对非快进式合并）"
-#: builtin/merge.c:227
+#: builtin/merge.c:230
msgid "abort the current in-progress merge"
msgstr "放弃当前正在进行的合并"
-#: builtin/merge.c:229
+#: builtin/merge.c:232
msgid "continue the current in-progress merge"
msgstr "继续当前正在进行的合并"
-#: builtin/merge.c:231 builtin/pull.c:177
+#: builtin/merge.c:234 builtin/pull.c:183
msgid "allow merging unrelated histories"
msgstr "允许合并不相关的历史"
-#: builtin/merge.c:259
+#: builtin/merge.c:240
+msgid "verify commit-msg hook"
+msgstr "校验 commit-msg 钩子"
+
+#: builtin/merge.c:265
msgid "could not run stash."
msgstr "不能运行贮藏。"
-#: builtin/merge.c:264
+#: builtin/merge.c:270
msgid "stash failed"
msgstr "贮藏失败"
-#: builtin/merge.c:269
+#: builtin/merge.c:275
#, c-format
msgid "not a valid object: %s"
msgstr "不是一个有效对象：%s"
-#: builtin/merge.c:288 builtin/merge.c:305
+#: builtin/merge.c:297 builtin/merge.c:314
msgid "read-tree failed"
msgstr "读取树失败"
# 译者：注意保持前导空格
-#: builtin/merge.c:335
+#: builtin/merge.c:344
msgid " (nothing to squash)"
msgstr " （无可压缩）"
-#: builtin/merge.c:346
+#: builtin/merge.c:355
#, c-format
msgid "Squash commit -- not updating HEAD\n"
msgstr "压缩提交 -- 未更新 HEAD\n"
-#: builtin/merge.c:396
+#: builtin/merge.c:405
#, c-format
msgid "No merge message -- not updating HEAD\n"
msgstr "无合并信息 -- 未更新 HEAD\n"
-#: builtin/merge.c:447
+#: builtin/merge.c:455
#, c-format
msgid "'%s' does not point to a commit"
msgstr "'%s' 没有指向一个提交"
-#: builtin/merge.c:537
+#: builtin/merge.c:545
#, c-format
msgid "Bad branch.%s.mergeoptions string: %s"
msgstr "坏的 branch.%s.mergeoptions 字符串：%s"
-#: builtin/merge.c:657
+#: builtin/merge.c:667
msgid "Not handling anything other than two heads merge."
msgstr "未处理两个头合并之外的任何操作。"
-#: builtin/merge.c:671
+#: builtin/merge.c:681
#, c-format
msgid "Unknown option for merge-recursive: -X%s"
msgstr "merge-recursive 的未知选项：-X%s"
-#: builtin/merge.c:686
+#: builtin/merge.c:696
#, c-format
msgid "unable to write %s"
msgstr "不能写 %s"
-#: builtin/merge.c:738
+#: builtin/merge.c:748
#, c-format
msgid "Could not read from '%s'"
msgstr "不能从 '%s' 读取"
-#: builtin/merge.c:747
+#: builtin/merge.c:757
#, c-format
msgid "Not committing merge; use 'git commit' to complete the merge.\n"
msgstr "未提交合并，使用 'git commit' 完成此次合并。\n"
-#: builtin/merge.c:753
+#: builtin/merge.c:763
#, c-format
msgid ""
"Please enter a commit message to explain why this merge is necessary,\n"
@@ -10053,68 +10311,68 @@
"\n"
"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n"
-#: builtin/merge.c:777
+#: builtin/merge.c:799
msgid "Empty commit message."
msgstr "空提交信息。"
-#: builtin/merge.c:797
+#: builtin/merge.c:819
#, c-format
msgid "Wonderful.\n"
msgstr "太棒了。\n"
-#: builtin/merge.c:850
+#: builtin/merge.c:872
#, c-format
msgid "Automatic merge failed; fix conflicts and then commit the result.\n"
msgstr "自动合并失败，修正冲突然后提交修正的结果。\n"
-#: builtin/merge.c:889
+#: builtin/merge.c:911
msgid "No current branch."
msgstr "没有当前分支。"
-#: builtin/merge.c:891
+#: builtin/merge.c:913
msgid "No remote for the current branch."
msgstr "当前分支没有对应的远程仓库。"
-#: builtin/merge.c:893
+#: builtin/merge.c:915
msgid "No default upstream defined for the current branch."
msgstr "当前分支没有定义默认的上游分支。"
-#: builtin/merge.c:898
+#: builtin/merge.c:920
#, c-format
msgid "No remote-tracking branch for %s from %s"
msgstr "对于 %s 没有来自 %s 的远程跟踪分支"
-#: builtin/merge.c:945
+#: builtin/merge.c:973
#, c-format
msgid "Bad value '%s' in environment '%s'"
msgstr "环境 '%2$s' 中存在坏的取值 '%1$s'"
-#: builtin/merge.c:1046
+#: builtin/merge.c:1075
#, c-format
msgid "not something we can merge in %s: %s"
msgstr "不能在 %s 中合并：%s"
-#: builtin/merge.c:1080
+#: builtin/merge.c:1109
msgid "not something we can merge"
msgstr "不能合并"
-#: builtin/merge.c:1145
+#: builtin/merge.c:1174
msgid "--abort expects no arguments"
msgstr "--abort 不带参数"
-#: builtin/merge.c:1149
+#: builtin/merge.c:1178
msgid "There is no merge to abort (MERGE_HEAD missing)."
msgstr "没有要终止的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1161
+#: builtin/merge.c:1190
msgid "--continue expects no arguments"
msgstr "--continue 不带参数"
-#: builtin/merge.c:1165
+#: builtin/merge.c:1194
msgid "There is no merge in progress (MERGE_HEAD missing)."
msgstr "没有进行中的合并（MERGE_HEAD 丢失）。"
-#: builtin/merge.c:1181
+#: builtin/merge.c:1210
msgid ""
"You have not concluded your merge (MERGE_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10122,7 +10380,7 @@
"您尚未结束您的合并（存在 MERGE_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1188
+#: builtin/merge.c:1217
msgid ""
"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n"
"Please, commit your changes before you merge."
@@ -10130,112 +10388,112 @@
"您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n"
"请在合并前先提交您的修改。"
-#: builtin/merge.c:1191
+#: builtin/merge.c:1220
msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)."
msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。"
-#: builtin/merge.c:1200
+#: builtin/merge.c:1229
msgid "You cannot combine --squash with --no-ff."
msgstr "您不能将 --squash 与 --no-ff 同时使用。"
-#: builtin/merge.c:1208
+#: builtin/merge.c:1237
msgid "No commit specified and merge.defaultToUpstream not set."
msgstr "未指定提交并且 merge.defaultToUpstream 未设置。"
-#: builtin/merge.c:1225
+#: builtin/merge.c:1254
msgid "Squash commit into empty head not supported yet"
msgstr "尚不支持到空分支的压缩提交"
-#: builtin/merge.c:1227
+#: builtin/merge.c:1256
msgid "Non-fast-forward commit does not make sense into an empty head"
msgstr "到空分支的非快进式提交没有意义"
-#: builtin/merge.c:1232
+#: builtin/merge.c:1261
#, c-format
msgid "%s - not something we can merge"
msgstr "%s - 不能被合并"
-#: builtin/merge.c:1234
+#: builtin/merge.c:1263
msgid "Can merge only exactly one commit into empty head"
msgstr "只能将一个提交合并到空分支上"
-#: builtin/merge.c:1268
+#: builtin/merge.c:1297
#, c-format
msgid "Commit %s has an untrusted GPG signature, allegedly by %s."
msgstr "提交 %s 有一个非可信的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1271
+#: builtin/merge.c:1300
#, c-format
msgid "Commit %s has a bad GPG signature allegedly by %s."
msgstr "提交 %s 有一个错误的声称来自 %s 的 GPG 签名。"
-#: builtin/merge.c:1274
+#: builtin/merge.c:1303
#, c-format
msgid "Commit %s does not have a GPG signature."
msgstr "提交 %s 没有一个 GPG 签名。"
-#: builtin/merge.c:1277
+#: builtin/merge.c:1306
#, c-format
msgid "Commit %s has a good GPG signature by %s\n"
msgstr "提交 %s 有一个来自 %s 的好的 GPG 签名。\n"
-#: builtin/merge.c:1339
+#: builtin/merge.c:1368
msgid "refusing to merge unrelated histories"
msgstr "拒绝合并无关的历史"
-#: builtin/merge.c:1348
-msgid "Already up-to-date."
+#: builtin/merge.c:1377
+msgid "Already up to date."
msgstr "已经是最新的。"
-#: builtin/merge.c:1358
+#: builtin/merge.c:1387
#, c-format
msgid "Updating %s..%s\n"
msgstr "更新 %s..%s\n"
-#: builtin/merge.c:1399
+#: builtin/merge.c:1428
#, c-format
msgid "Trying really trivial in-index merge...\n"
msgstr "尝试非常小的索引内合并...\n"
-#: builtin/merge.c:1406
+#: builtin/merge.c:1435
#, c-format
msgid "Nope.\n"
msgstr "无。\n"
-#: builtin/merge.c:1431
-msgid "Already up-to-date. Yeeah!"
+#: builtin/merge.c:1460
+msgid "Already up to date. Yeeah!"
msgstr "已经是最新的。耶！"
-#: builtin/merge.c:1437
+#: builtin/merge.c:1466
msgid "Not possible to fast-forward, aborting."
msgstr "无法快进，终止。"
-#: builtin/merge.c:1460 builtin/merge.c:1539
+#: builtin/merge.c:1489 builtin/merge.c:1568
#, c-format
msgid "Rewinding the tree to pristine...\n"
msgstr "将树回滚至原始状态...\n"
-#: builtin/merge.c:1464
+#: builtin/merge.c:1493
#, c-format
msgid "Trying merge strategy %s...\n"
msgstr "尝试合并策略 %s...\n"
-#: builtin/merge.c:1530
+#: builtin/merge.c:1559
#, c-format
msgid "No merge strategy handled the merge.\n"
msgstr "没有合并策略处理此合并。\n"
-#: builtin/merge.c:1532
+#: builtin/merge.c:1561
#, c-format
msgid "Merge with strategy %s failed.\n"
msgstr "使用策略 %s 合并失败。\n"
-#: builtin/merge.c:1541
+#: builtin/merge.c:1570
#, c-format
msgid "Using the %s to prepare resolving by hand.\n"
msgstr "使用 %s 以准备手工解决。\n"
-#: builtin/merge.c:1553
+#: builtin/merge.c:1582
#, c-format
msgid "Automatic merge went well; stopped before committing as requested\n"
msgstr "自动合并进展顺利，按要求在提交前停止\n"
@@ -10260,23 +10518,23 @@
msgid "git merge-base --fork-point <ref> [<commit>]"
msgstr "git merge-base --fork-point <引用> [<提交>]"
-#: builtin/merge-base.c:218
+#: builtin/merge-base.c:220
msgid "output all common ancestors"
msgstr "输出所有共同的祖先"
-#: builtin/merge-base.c:220
+#: builtin/merge-base.c:222
msgid "find ancestors for a single n-way merge"
msgstr "查找一个多路合并的祖先提交"
-#: builtin/merge-base.c:222
+#: builtin/merge-base.c:224
msgid "list revs not reachable from others"
msgstr "显示不能被其他访问到的版本"
-#: builtin/merge-base.c:224
+#: builtin/merge-base.c:226
msgid "is the first one ancestor of the other?"
msgstr "第一个是其他的祖先提交么？"
-#: builtin/merge-base.c:226
+#: builtin/merge-base.c:228
msgid "find where <commit> forked from reflog of <ref>"
msgstr "根据 <引用> 的引用日志查找 <提交> 的派生处"
@@ -10376,7 +10634,7 @@
msgid "Directory %s is in index and no submodule?"
msgstr "目录 %s 在索引中并且不是子模组？"
-#: builtin/mv.c:85 builtin/rm.c:290
+#: builtin/mv.c:85 builtin/rm.c:289
msgid "Please stage your changes to .gitmodules or stash them to proceed"
msgstr "请将您的修改暂存到 .gitmodules 中或贮藏后再继续"
@@ -10393,68 +10651,68 @@
msgid "skip move/rename errors"
msgstr "跳过移动/重命名错误"
-#: builtin/mv.c:168
+#: builtin/mv.c:167
#, c-format
msgid "destination '%s' is not a directory"
msgstr "目标 '%s' 不是一个目录"
-#: builtin/mv.c:179
+#: builtin/mv.c:178
#, c-format
msgid "Checking rename of '%s' to '%s'\n"
msgstr "检查 '%s' 到 '%s' 的重命名\n"
-#: builtin/mv.c:183
+#: builtin/mv.c:182
msgid "bad source"
msgstr "坏的源"
-#: builtin/mv.c:186
+#: builtin/mv.c:185
msgid "can not move directory into itself"
msgstr "不能将目录移动到自身"
-#: builtin/mv.c:189
+#: builtin/mv.c:188
msgid "cannot move directory over file"
msgstr "不能将目录移动到文件"
-#: builtin/mv.c:198
+#: builtin/mv.c:197
msgid "source directory is empty"
msgstr "源目录为空"
-#: builtin/mv.c:223
+#: builtin/mv.c:222
msgid "not under version control"
msgstr "不在版本控制之下"
-#: builtin/mv.c:226
+#: builtin/mv.c:225
msgid "destination exists"
msgstr "目标已存在"
-#: builtin/mv.c:234
+#: builtin/mv.c:233
#, c-format
msgid "overwriting '%s'"
msgstr "覆盖 '%s'"
-#: builtin/mv.c:237
+#: builtin/mv.c:236
msgid "Cannot overwrite"
msgstr "不能覆盖"
-#: builtin/mv.c:240
+#: builtin/mv.c:239
msgid "multiple sources for the same target"
msgstr "同一目标具有多个源"
-#: builtin/mv.c:242
+#: builtin/mv.c:241
msgid "destination directory does not exist"
msgstr "目标目录不存在"
-#: builtin/mv.c:249
+#: builtin/mv.c:248
#, c-format
msgid "%s, source=%s, destination=%s"
msgstr "%s，源=%s，目标=%s"
-#: builtin/mv.c:270
+#: builtin/mv.c:269
#, c-format
msgid "Renaming %s to %s\n"
msgstr "重命名 %s 至 %s\n"
-#: builtin/mv.c:276 builtin/remote.c:711 builtin/repack.c:390
+#: builtin/mv.c:275 builtin/remote.c:712 builtin/repack.c:390
#, c-format
msgid "renaming '%s' failed"
msgstr "重命名 '%s' 失败"
@@ -10553,8 +10811,8 @@
msgstr "git notes [--ref <注解引用>] remove [<对象>...]"
#: builtin/notes.c:36
-msgid "git notes [--ref <notes-ref>] prune [-n | -v]"
-msgstr "git notes [--ref <注解引用>] prune [-n | -v]"
+msgid "git notes [--ref <notes-ref>] prune [-n] [-v]"
+msgstr "git notes [--ref <注解引用>] prune [-n] [-v]"
#: builtin/notes.c:37
msgid "git notes [--ref <notes-ref>] get-ref"
@@ -10643,19 +10901,19 @@
msgid "the note contents have been left in %s"
msgstr "注解内容被留在 %s 中"
-#: builtin/notes.c:234 builtin/tag.c:517
+#: builtin/notes.c:234 builtin/tag.c:500
#, c-format
msgid "cannot read '%s'"
msgstr "不能读取 '%s'"
-#: builtin/notes.c:236 builtin/tag.c:520
+#: builtin/notes.c:236 builtin/tag.c:503
#, c-format
msgid "could not open or read '%s'"
msgstr "不能打开或读取 '%s'"
#: builtin/notes.c:255 builtin/notes.c:306 builtin/notes.c:308
-#: builtin/notes.c:375 builtin/notes.c:430 builtin/notes.c:516
-#: builtin/notes.c:521 builtin/notes.c:599 builtin/notes.c:661
+#: builtin/notes.c:376 builtin/notes.c:431 builtin/notes.c:517
+#: builtin/notes.c:522 builtin/notes.c:600 builtin/notes.c:662
#, c-format
msgid "failed to resolve '%s' as a valid ref."
msgstr "无法解析 '%s' 为一个有效引用。"
@@ -10683,88 +10941,88 @@
#. TRANSLATORS: the first %s will be replaced by a git
#. notes command: 'add', 'merge', 'remove', etc.
#.
-#: builtin/notes.c:348
+#: builtin/notes.c:349
#, c-format
msgid "refusing to %s notes in %s (outside of refs/notes/)"
msgstr "拒绝向 %2$s（在 refs/notes/ 之外）%1$s注解"
-#: builtin/notes.c:368 builtin/notes.c:423 builtin/notes.c:499
-#: builtin/notes.c:511 builtin/notes.c:587 builtin/notes.c:654
-#: builtin/notes.c:804 builtin/notes.c:951 builtin/notes.c:972
+#: builtin/notes.c:369 builtin/notes.c:424 builtin/notes.c:500
+#: builtin/notes.c:512 builtin/notes.c:588 builtin/notes.c:655
+#: builtin/notes.c:805 builtin/notes.c:952 builtin/notes.c:973
msgid "too many parameters"
msgstr "参数太多"
-#: builtin/notes.c:381 builtin/notes.c:667
+#: builtin/notes.c:382 builtin/notes.c:668
#, c-format
msgid "no note found for object %s."
msgstr "未发现对象 %s 的注解。"
-#: builtin/notes.c:402 builtin/notes.c:565
+#: builtin/notes.c:403 builtin/notes.c:566
msgid "note contents as a string"
msgstr "注解内容作为一个字符串"
-#: builtin/notes.c:405 builtin/notes.c:568
+#: builtin/notes.c:406 builtin/notes.c:569
msgid "note contents in a file"
msgstr "注解内容到一个文件中"
-#: builtin/notes.c:408 builtin/notes.c:571
+#: builtin/notes.c:409 builtin/notes.c:572
msgid "reuse and edit specified note object"
msgstr "重用和编辑指定的注解对象"
-#: builtin/notes.c:411 builtin/notes.c:574
+#: builtin/notes.c:412 builtin/notes.c:575
msgid "reuse specified note object"
msgstr "重用指定的注解对象"
-#: builtin/notes.c:414 builtin/notes.c:577
+#: builtin/notes.c:415 builtin/notes.c:578
msgid "allow storing empty note"
msgstr "允许保存空白注释"
-#: builtin/notes.c:415 builtin/notes.c:486
+#: builtin/notes.c:416 builtin/notes.c:487
msgid "replace existing notes"
msgstr "替换已存在的注解"
-#: builtin/notes.c:440
+#: builtin/notes.c:441
#, c-format
msgid ""
"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:455 builtin/notes.c:534
+#: builtin/notes.c:456 builtin/notes.c:535
#, c-format
msgid "Overwriting existing notes for object %s\n"
msgstr "覆盖对象 %s 现存注解\n"
-#: builtin/notes.c:466 builtin/notes.c:626 builtin/notes.c:891
+#: builtin/notes.c:467 builtin/notes.c:627 builtin/notes.c:892
#, c-format
msgid "Removing note for object %s\n"
msgstr "删除对象 %s 的注解\n"
-#: builtin/notes.c:487
+#: builtin/notes.c:488
msgid "read objects from stdin"
msgstr "从标准输入读取对象"
-#: builtin/notes.c:489
+#: builtin/notes.c:490
msgid "load rewriting config for <command> (implies --stdin)"
msgstr "重新加载 <命令> 的配置（隐含 --stdin）"
-#: builtin/notes.c:507
+#: builtin/notes.c:508
msgid "too few parameters"
msgstr "参数太少"
-#: builtin/notes.c:528
+#: builtin/notes.c:529
#, c-format
msgid ""
"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite "
"existing notes"
msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解"
-#: builtin/notes.c:540
+#: builtin/notes.c:541
#, c-format
msgid "missing notes on source object %s. Cannot copy."
msgstr "源对象 %s 缺少注解。不能拷贝。"
-#: builtin/notes.c:592
+#: builtin/notes.c:593
#, c-format
msgid ""
"The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n"
@@ -10773,97 +11031,97 @@
"子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n"
"请换用 'git notes add -f -m/-F/-c/-C'。\n"
-#: builtin/notes.c:687
+#: builtin/notes.c:688
msgid "failed to delete ref NOTES_MERGE_PARTIAL"
msgstr "无法删除引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:689
+#: builtin/notes.c:690
msgid "failed to delete ref NOTES_MERGE_REF"
msgstr "无法删除引用 NOTES_MERGE_REF"
-#: builtin/notes.c:691
+#: builtin/notes.c:692
msgid "failed to remove 'git notes merge' worktree"
msgstr "无法删除 'git notes merge' 工作区"
-#: builtin/notes.c:711
+#: builtin/notes.c:712
msgid "failed to read ref NOTES_MERGE_PARTIAL"
msgstr "无法读取引用 NOTES_MERGE_PARTIAL"
-#: builtin/notes.c:713
+#: builtin/notes.c:714
msgid "could not find commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中找到提交。"
-#: builtin/notes.c:715
+#: builtin/notes.c:716
msgid "could not parse commit from NOTES_MERGE_PARTIAL."
msgstr "无法从 NOTES_MERGE_PARTIAL 中解析提交。"
-#: builtin/notes.c:728
+#: builtin/notes.c:729
msgid "failed to resolve NOTES_MERGE_REF"
msgstr "无法解析 NOTES_MERGE_REF"
-#: builtin/notes.c:731
+#: builtin/notes.c:732
msgid "failed to finalize notes merge"
msgstr "无法完成注解合并"
-#: builtin/notes.c:757
+#: builtin/notes.c:758
#, c-format
msgid "unknown notes merge strategy %s"
msgstr "未知的注解合并策略 %s"
-#: builtin/notes.c:773
+#: builtin/notes.c:774
msgid "General options"
msgstr "通用选项"
-#: builtin/notes.c:775
+#: builtin/notes.c:776
msgid "Merge options"
msgstr "合并选项"
-#: builtin/notes.c:777
+#: builtin/notes.c:778
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:779
+#: builtin/notes.c:780
msgid "Committing unmerged notes"
msgstr "提交未合并的注解"
-#: builtin/notes.c:781
+#: builtin/notes.c:782
msgid "finalize notes merge by committing unmerged notes"
msgstr "通过提交未合并的注解来完成注解合并"
-#: builtin/notes.c:783
+#: builtin/notes.c:784
msgid "Aborting notes merge resolution"
msgstr "中止注解合并的方案"
-#: builtin/notes.c:785
+#: builtin/notes.c:786
msgid "abort notes merge"
msgstr "中止注解合并"
-#: builtin/notes.c:796
+#: builtin/notes.c:797
msgid "cannot mix --commit, --abort or -s/--strategy"
msgstr "不能混用 --commit、--abort 或 -s/--strategy"
-#: builtin/notes.c:801
+#: builtin/notes.c:802
msgid "must specify a notes ref to merge"
msgstr "必须指定一个注解引用来合并"
-#: builtin/notes.c:825
+#: builtin/notes.c:826
#, c-format
msgid "unknown -s/--strategy: %s"
msgstr "未知的 -s/--strategy：%s"
-#: builtin/notes.c:862
+#: builtin/notes.c:863
#, c-format
msgid "a notes merge into %s is already in-progress at %s"
msgstr "位于 %2$s 的一个到 %1$s 中的注解合并正在执行中"
-#: builtin/notes.c:865
+#: builtin/notes.c:866
#, c-format
msgid "failed to store link to current notes ref (%s)"
msgstr "无法存储链接到当前的注解引用（%s）"
-#: builtin/notes.c:867
+#: builtin/notes.c:868
#, c-format
msgid ""
"Automatic notes merge failed. Fix conflicts in %s and commit the result with "
@@ -10873,218 +11131,226 @@
"自动合并说明失败。修改 %s 中的冲突并且使用命令 'git notes merge --commit' 提"
"交结果，或者使用命令 'git notes merge --abort' 终止合并。\n"
-#: builtin/notes.c:889
+#: builtin/notes.c:890
#, c-format
msgid "Object %s has no note\n"
msgstr "对象 %s 没有注解\n"
-#: builtin/notes.c:901
+#: builtin/notes.c:902
msgid "attempt to remove non-existent note is not an error"
msgstr "尝试删除不存在的注解不是一个错误"
-#: builtin/notes.c:904
+#: builtin/notes.c:905
msgid "read object names from the standard input"
msgstr "从标准输入读取对象名称"
-#: builtin/notes.c:942 builtin/prune.c:105 builtin/worktree.c:128
+#: builtin/notes.c:943 builtin/prune.c:105 builtin/worktree.c:158
msgid "do not remove, show only"
msgstr "不删除，只显示"
-#: builtin/notes.c:943
+#: builtin/notes.c:944
msgid "report pruned notes"
msgstr "报告清除的注解"
-#: builtin/notes.c:985
+#: builtin/notes.c:986
msgid "notes-ref"
msgstr "注解引用"
-#: builtin/notes.c:986
+#: builtin/notes.c:987
msgid "use notes from <notes-ref>"
msgstr "从 <注解引用> 使用注解"
-#: builtin/notes.c:1021
+#: builtin/notes.c:1022
#, c-format
msgid "unknown subcommand: %s"
msgstr "未知子命令：%s"
-#: builtin/pack-objects.c:30
+#: builtin/pack-objects.c:33
msgid ""
"git pack-objects --stdout [<options>...] [< <ref-list> | < <object-list>]"
msgstr "git pack-objects --stdout [<选项>...] [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:31
+#: builtin/pack-objects.c:34
msgid ""
"git pack-objects [<options>...] <base-name> [< <ref-list> | < <object-list>]"
-msgstr "git pack-objects [<选项>...] <base-name> [< <引用列表> | < <对象列表>]"
+msgstr "git pack-objects [<选项>...] <前缀名称> [< <引用列表> | < <对象列表>]"
-#: builtin/pack-objects.c:180 builtin/pack-objects.c:183
+#: builtin/pack-objects.c:192 builtin/pack-objects.c:195
#, c-format
msgid "deflate error (%d)"
msgstr "压缩错误 (%d)"
-#: builtin/pack-objects.c:776
+#: builtin/pack-objects.c:788
msgid "disabling bitmap writing, packs are split due to pack.packSizeLimit"
msgstr "禁用 bitmap 写入，因为 pack.packSizeLimit 设置使得包被切分为多个"
-#: builtin/pack-objects.c:789
+#: builtin/pack-objects.c:801
msgid "Writing objects"
msgstr "写入对象中"
-#: builtin/pack-objects.c:1069
+#: builtin/pack-objects.c:1081
msgid "disabling bitmap writing, as some objects are not being packed"
msgstr "禁用 bitmap 写入，因为一些对象将不会被打包"
-#: builtin/pack-objects.c:2434
+#: builtin/pack-objects.c:2451
msgid "Compressing objects"
msgstr "压缩对象中"
-#: builtin/pack-objects.c:2843
+#: builtin/pack-objects.c:2599
+msgid "invalid value for --missing"
+msgstr "选项 --missing 的值无效"
+
+#: builtin/pack-objects.c:2902
#, c-format
msgid "unsupported index version %s"
msgstr "不支持的索引版本 %s"
-#: builtin/pack-objects.c:2847
+#: builtin/pack-objects.c:2906
#, c-format
msgid "bad index version '%s'"
msgstr "坏的索引版本 '%s'"
-#: builtin/pack-objects.c:2877
+#: builtin/pack-objects.c:2936
msgid "do not show progress meter"
msgstr "不显示进度表"
-#: builtin/pack-objects.c:2879
+#: builtin/pack-objects.c:2938
msgid "show progress meter"
msgstr "显示进度表"
-#: builtin/pack-objects.c:2881
+#: builtin/pack-objects.c:2940
msgid "show progress meter during object writing phase"
msgstr "在对象写入阶段显示进度表"
-#: builtin/pack-objects.c:2884
+#: builtin/pack-objects.c:2943
msgid "similar to --all-progress when progress meter is shown"
msgstr "当进度表显示时类似于 --all-progress"
-#: builtin/pack-objects.c:2885
+#: builtin/pack-objects.c:2944
msgid "version[,offset]"
msgstr "版本[,偏移]"
-#: builtin/pack-objects.c:2886
+#: builtin/pack-objects.c:2945
msgid "write the pack index file in the specified idx format version"
msgstr "用指定的 idx 格式版本来写包索引文件"
-#: builtin/pack-objects.c:2889
+#: builtin/pack-objects.c:2948
msgid "maximum size of each output pack file"
msgstr "每个输出包的最大尺寸"
-#: builtin/pack-objects.c:2891
+#: builtin/pack-objects.c:2950
msgid "ignore borrowed objects from alternate object store"
msgstr "忽略从备用对象存储里借用对象"
-#: builtin/pack-objects.c:2893
+#: builtin/pack-objects.c:2952
msgid "ignore packed objects"
msgstr "忽略包对象"
-#: builtin/pack-objects.c:2895
+#: builtin/pack-objects.c:2954
msgid "limit pack window by objects"
msgstr "限制打包窗口的对象数"
-#: builtin/pack-objects.c:2897
+#: builtin/pack-objects.c:2956
msgid "limit pack window by memory in addition to object limit"
msgstr "除对象数量限制外设置打包窗口的内存限制"
-#: builtin/pack-objects.c:2899
+#: builtin/pack-objects.c:2958
msgid "maximum length of delta chain allowed in the resulting pack"
msgstr "打包允许的 delta 链的最大长度"
-#: builtin/pack-objects.c:2901
+#: builtin/pack-objects.c:2960
msgid "reuse existing deltas"
msgstr "重用已存在的 deltas"
-#: builtin/pack-objects.c:2903
+#: builtin/pack-objects.c:2962
msgid "reuse existing objects"
msgstr "重用已存在的对象"
-#: builtin/pack-objects.c:2905
+#: builtin/pack-objects.c:2964
msgid "use OFS_DELTA objects"
msgstr "使用 OFS_DELTA 对象"
-#: builtin/pack-objects.c:2907
+#: builtin/pack-objects.c:2966
msgid "use threads when searching for best delta matches"
msgstr "使用线程查询最佳 delta 匹配"
-#: builtin/pack-objects.c:2909
+#: builtin/pack-objects.c:2968
msgid "do not create an empty pack output"
msgstr "不创建空的包输出"
-#: builtin/pack-objects.c:2911
+#: builtin/pack-objects.c:2970
msgid "read revision arguments from standard input"
msgstr "从标准输入读取版本号参数"
-#: builtin/pack-objects.c:2913
+#: builtin/pack-objects.c:2972
msgid "limit the objects to those that are not yet packed"
msgstr "限制那些尚未打包的对象"
-#: builtin/pack-objects.c:2916
+#: builtin/pack-objects.c:2975
msgid "include objects reachable from any reference"
msgstr "包括可以从任何引用访问到的对象"
-#: builtin/pack-objects.c:2919
+#: builtin/pack-objects.c:2978
msgid "include objects referred by reflog entries"
msgstr "包括被引用日志引用到的对象"
-#: builtin/pack-objects.c:2922
+#: builtin/pack-objects.c:2981
msgid "include objects referred to by the index"
msgstr "包括被索引引用到的对象"
-#: builtin/pack-objects.c:2925
+#: builtin/pack-objects.c:2984
msgid "output pack to stdout"
msgstr "输出包到标准输出"
-#: builtin/pack-objects.c:2927
+#: builtin/pack-objects.c:2986
msgid "include tag objects that refer to objects to be packed"
msgstr "包括那些引用了待打包对象的标签对象"
-#: builtin/pack-objects.c:2929
+#: builtin/pack-objects.c:2988
msgid "keep unreachable objects"
msgstr "维持不可达的对象"
-#: builtin/pack-objects.c:2931
+#: builtin/pack-objects.c:2990
msgid "pack loose unreachable objects"
msgstr "打包松散的不可达对象"
-#: builtin/pack-objects.c:2933
+#: builtin/pack-objects.c:2992
msgid "unpack unreachable objects newer than <time>"
msgstr "将比给定 <时间> 新的无法访问的对象解包"
-#: builtin/pack-objects.c:2936
+#: builtin/pack-objects.c:2995
msgid "create thin packs"
msgstr "创建精简包"
-#: builtin/pack-objects.c:2938
+#: builtin/pack-objects.c:2997
msgid "create packs suitable for shallow fetches"
msgstr "创建适合浅克隆仓库获取的包"
-#: builtin/pack-objects.c:2940
+#: builtin/pack-objects.c:2999
msgid "ignore packs that have companion .keep file"
msgstr "忽略配有 .keep 文件的包"
-#: builtin/pack-objects.c:2942
+#: builtin/pack-objects.c:3001
msgid "pack compression level"
msgstr "打包压缩级别"
-#: builtin/pack-objects.c:2944
+#: builtin/pack-objects.c:3003
msgid "do not hide commits by grafts"
msgstr "显示被嫁接隐藏的提交"
-#: builtin/pack-objects.c:2946
+#: builtin/pack-objects.c:3005
msgid "use a bitmap index if available to speed up counting objects"
msgstr "使用 bitmap 索引（如果有的话）以提高对象计数时的速度"
-#: builtin/pack-objects.c:2948
+#: builtin/pack-objects.c:3007
msgid "write a bitmap index together with the pack index"
msgstr "在建立包索引的同时创建 bitmap 索引"
-#: builtin/pack-objects.c:3075
+#: builtin/pack-objects.c:3010
+msgid "handling for missing objects"
+msgstr "处理丢失的对象"
+
+#: builtin/pack-objects.c:3144
msgid "Counting objects"
msgstr "对象计数中"
@@ -11100,17 +11366,17 @@
msgid "prune loose refs (default)"
msgstr "清除松散的引用（默认）"
-#: builtin/prune-packed.c:7
+#: builtin/prune-packed.c:8
msgid "git prune-packed [-n | --dry-run] [-q | --quiet]"
msgstr "git prune-packed [-n | --dry-run] [-q | --quiet]"
-#: builtin/prune-packed.c:40
+#: builtin/prune-packed.c:41
msgid "Removing duplicate objects"
msgstr "正在删除重复对象"
#: builtin/prune.c:11
-msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]"
-msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]"
+msgid "git prune [-n] [-v] [--progress] [--expire <time>] [--] [<head>...]"
+msgstr "git prune [-n] [-v] [--progress] [--expire <时间>] [--] [<head>...]"
#: builtin/prune.c:106
msgid "report pruned objects"
@@ -11133,57 +11399,57 @@
msgid "git pull [<options>] [<repository> [<refspec>...]]"
msgstr "git pull [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/pull.c:124
+#: builtin/pull.c:127
msgid "control for recursive fetching of submodules"
msgstr "控制子模组的递归获取"
-#: builtin/pull.c:128
+#: builtin/pull.c:131
msgid "Options related to merging"
msgstr "和合并相关的选项"
-#: builtin/pull.c:131
+#: builtin/pull.c:134
msgid "incorporate changes by rebasing rather than merging"
msgstr "使用变基操作取代合并操作以合入修改"
-#: builtin/pull.c:155 builtin/rebase--helper.c:19 builtin/revert.c:121
+#: builtin/pull.c:161 builtin/rebase--helper.c:23 builtin/revert.c:121
msgid "allow fast-forward"
msgstr "允许快进式"
-#: builtin/pull.c:164
+#: builtin/pull.c:170
msgid "automatically stash/stash pop before and after rebase"
msgstr "变基操作前后执行自动贮藏和弹出贮藏"
-#: builtin/pull.c:180
+#: builtin/pull.c:186
msgid "Options related to fetching"
msgstr "和获取相关的参数"
-#: builtin/pull.c:198
+#: builtin/pull.c:204
msgid "number of submodules pulled in parallel"
msgstr "并发拉取的子模组的数量"
-#: builtin/pull.c:287
+#: builtin/pull.c:299
#, c-format
msgid "Invalid value for pull.ff: %s"
msgstr "pull.ff 的取值无效：%s"
-#: builtin/pull.c:399
+#: builtin/pull.c:415
msgid ""
"There is no candidate for rebasing against among the refs that you just "
"fetched."
msgstr "在您刚刚获取到的引用中没有变基操作的候选。"
-#: builtin/pull.c:401
+#: builtin/pull.c:417
msgid ""
"There are no candidates for merging among the refs that you just fetched."
msgstr "在您刚刚获取到的引用中没有合并操作的候选。"
-#: builtin/pull.c:402
+#: builtin/pull.c:418
msgid ""
"Generally this means that you provided a wildcard refspec which had no\n"
"matches on the remote end."
msgstr "通常这意味着您提供了一个通配符引用规格但未能和远端匹配。"
-#: builtin/pull.c:405
+#: builtin/pull.c:421
#, c-format
msgid ""
"You asked to pull from the remote '%s', but did not specify\n"
@@ -11193,42 +11459,42 @@
"您要求从远程 '%s' 拉取，但是未指定一个分支。因为这不是当前\n"
"分支默认的远程仓库，您必须在命令行中指定一个分支名。"
-#: builtin/pull.c:410 git-parse-remote.sh:73
+#: builtin/pull.c:426 git-parse-remote.sh:73
msgid "You are not currently on a branch."
msgstr "您当前不在一个分支上。"
-#: builtin/pull.c:412 builtin/pull.c:427 git-parse-remote.sh:79
+#: builtin/pull.c:428 builtin/pull.c:443 git-parse-remote.sh:79
msgid "Please specify which branch you want to rebase against."
msgstr "请指定您要变基到哪一个分支。"
-#: builtin/pull.c:414 builtin/pull.c:429 git-parse-remote.sh:82
+#: builtin/pull.c:430 builtin/pull.c:445 git-parse-remote.sh:82
msgid "Please specify which branch you want to merge with."
msgstr "请指定您要合并哪一个分支。"
-#: builtin/pull.c:415 builtin/pull.c:430
+#: builtin/pull.c:431 builtin/pull.c:446
msgid "See git-pull(1) for details."
msgstr "详见 git-pull(1)。"
-#: builtin/pull.c:417 builtin/pull.c:423 builtin/pull.c:432
+#: builtin/pull.c:433 builtin/pull.c:439 builtin/pull.c:448
#: git-parse-remote.sh:64
msgid "<remote>"
msgstr "<远程>"
-#: builtin/pull.c:417 builtin/pull.c:432 builtin/pull.c:437 git-rebase.sh:456
+#: builtin/pull.c:433 builtin/pull.c:448 builtin/pull.c:453 git-rebase.sh:466
#: git-parse-remote.sh:65
msgid "<branch>"
msgstr "<分支>"
-#: builtin/pull.c:425 git-parse-remote.sh:75
+#: builtin/pull.c:441 git-parse-remote.sh:75
msgid "There is no tracking information for the current branch."
msgstr "当前分支没有跟踪信息。"
-#: builtin/pull.c:434 git-parse-remote.sh:95
+#: builtin/pull.c:450 git-parse-remote.sh:95
msgid ""
"If you wish to set tracking information for this branch you can do so with:"
msgstr "如果您想要为此分支创建跟踪信息，您可以执行："
-#: builtin/pull.c:439
+#: builtin/pull.c:455
#, c-format
msgid ""
"Your configuration specifies to merge with the ref '%s'\n"
@@ -11237,27 +11503,27 @@
"您的配置中指定要合并远程的引用 '%s'，\n"
"但是没有获取到这个引用。"
-#: builtin/pull.c:792
+#: builtin/pull.c:817
msgid "ignoring --verify-signatures for rebase"
msgstr "为变基操作忽略 --verify-signatures"
-#: builtin/pull.c:840
+#: builtin/pull.c:865
msgid "--[no-]autostash option is only valid with --rebase."
msgstr "--[no-]autostash 选项只在使用 --rebase 时有效。"
-#: builtin/pull.c:848
+#: builtin/pull.c:873
msgid "Updating an unborn branch with changes added to the index."
msgstr "更新尚未诞生的分支，变更添加至索引。"
-#: builtin/pull.c:851
+#: builtin/pull.c:876
msgid "pull with rebase"
msgstr "变基式拉取"
-#: builtin/pull.c:852
+#: builtin/pull.c:877
msgid "please commit or stash them."
msgstr "请提交或贮藏它们。"
-#: builtin/pull.c:877
+#: builtin/pull.c:902
#, c-format
msgid ""
"fetch updated the current branch head.\n"
@@ -11267,7 +11533,7 @@
"fetch 更新了当前的分支。快进您的工作区\n"
"至提交 %s。"
-#: builtin/pull.c:882
+#: builtin/pull.c:907
#, c-format
msgid ""
"Cannot fast-forward your working tree.\n"
@@ -11284,15 +11550,15 @@
"$ git reset --hard\n"
"恢复之前的状态。"
-#: builtin/pull.c:897
+#: builtin/pull.c:922
msgid "Cannot merge multiple branches into empty head."
msgstr "无法将多个分支合并到空分支。"
-#: builtin/pull.c:901
+#: builtin/pull.c:926
msgid "Cannot rebase onto multiple branches."
msgstr "无法变基到多个分支。"
-#: builtin/pull.c:908
+#: builtin/pull.c:933
msgid "cannot rebase with locally recorded submodule modifications"
msgstr "本地子模组中有修改，无法变基"
@@ -11300,15 +11566,15 @@
msgid "git push [<options>] [<repository> [<refspec>...]]"
msgstr "git push [<选项>] [<仓库> [<引用规格>...]]"
-#: builtin/push.c:90
+#: builtin/push.c:92
msgid "tag shorthand without <tag>"
msgstr "标签后面未提供 <标签> 参数"
-#: builtin/push.c:100
+#: builtin/push.c:102
msgid "--delete only accepts plain target ref names"
msgstr "--delete 只接受简单的目标引用名"
-#: builtin/push.c:144
+#: builtin/push.c:146
msgid ""
"\n"
"To choose either option permanently, see push.default in 'git help config'."
@@ -11316,7 +11582,7 @@
"\n"
"为了永久地选择任一选项，参见 'git help config' 中的 push.default。"
-#: builtin/push.c:147
+#: builtin/push.c:149
#, c-format
msgid ""
"The upstream branch of your current branch does not match\n"
@@ -11340,7 +11606,7 @@
" git push %s %s\n"
"%s"
-#: builtin/push.c:162
+#: builtin/push.c:164
#, c-format
msgid ""
"You are not currently on a branch.\n"
@@ -11354,7 +11620,7 @@
"\n"
" git push %s HEAD:<远程分支名字>\n"
-#: builtin/push.c:176
+#: builtin/push.c:178
#, c-format
msgid ""
"The current branch %s has no upstream branch.\n"
@@ -11367,12 +11633,12 @@
"\n"
" git push --set-upstream %s %s\n"
-#: builtin/push.c:184
+#: builtin/push.c:186
#, c-format
msgid "The current branch %s has multiple upstream branches, refusing to push."
msgstr "当前分支 %s 有多个上游分支，拒绝推送。"
-#: builtin/push.c:187
+#: builtin/push.c:189
#, c-format
msgid ""
"You are pushing to remote '%s', which is not the upstream of\n"
@@ -11382,12 +11648,12 @@
"您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n"
"而没有告诉我要推送什么、更新哪个远程分支。"
-#: builtin/push.c:246
+#: builtin/push.c:248
msgid ""
"You didn't specify any refspecs to push, and push.default is \"nothing\"."
msgstr "您没有为推送指定任何引用规格，并且 push.default 为 \"nothing\"。"
-#: builtin/push.c:253
+#: builtin/push.c:255
msgid ""
"Updates were rejected because the tip of your current branch is behind\n"
"its remote counterpart. Integrate the remote changes (e.g.\n"
@@ -11398,7 +11664,7 @@
"再次推送前，先与远程变更合并（如 'git pull ...'）。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:259
+#: builtin/push.c:261
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"
@@ -11409,7 +11675,7 @@
"检出该分支并整合远程变更（如 'git pull ...'），然后再推送。详见\n"
"'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:265
+#: builtin/push.c:267
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"
@@ -11422,11 +11688,11 @@
"（如 'git pull ...'）。\n"
"详见 'git push --help' 中的 'Note about fast-forwards' 小节。"
-#: builtin/push.c:272
+#: builtin/push.c:274
msgid "Updates were rejected because the tag already exists in the remote."
msgstr "更新被拒绝，因为该标签在远程已经存在。"
-#: builtin/push.c:275
+#: builtin/push.c:277
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"
@@ -11435,22 +11701,22 @@
"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n"
"也不能更新远程引用让其指向一个非提交对象。\n"
-#: builtin/push.c:335
+#: builtin/push.c:337
#, c-format
msgid "Pushing to %s\n"
msgstr "推送到 %s\n"
-#: builtin/push.c:339
+#: builtin/push.c:341
#, c-format
msgid "failed to push some refs to '%s'"
msgstr "无法推送一些引用到 '%s'"
-#: builtin/push.c:370
+#: builtin/push.c:372
#, c-format
msgid "bad repository '%s'"
msgstr "坏的仓库 '%s'"
-#: builtin/push.c:371
+#: builtin/push.c:373
msgid ""
"No configured push destination.\n"
"Either specify the URL from the command-line or configure a remote "
@@ -11471,112 +11737,112 @@
"\n"
" git push <名称>\n"
-#: builtin/push.c:389
+#: builtin/push.c:391
msgid "--all and --tags are incompatible"
msgstr "--all 和 --tags 不兼容"
-#: builtin/push.c:390
+#: builtin/push.c:392
msgid "--all can't be combined with refspecs"
msgstr "--all 不能和引用规格同时使用"
-#: builtin/push.c:395
+#: builtin/push.c:397
msgid "--mirror and --tags are incompatible"
msgstr "--mirror 和 --tags 不兼容"
-#: builtin/push.c:396
+#: builtin/push.c:398
msgid "--mirror can't be combined with refspecs"
msgstr "--mirror 不能和引用规格同时使用"
-#: builtin/push.c:401
+#: builtin/push.c:403
msgid "--all and --mirror are incompatible"
msgstr "--all 和 --mirror 不兼容"
-#: builtin/push.c:523
+#: builtin/push.c:535
msgid "repository"
msgstr "仓库"
-#: builtin/push.c:524 builtin/send-pack.c:163
+#: builtin/push.c:536 builtin/send-pack.c:163
msgid "push all refs"
msgstr "推送所有引用"
-#: builtin/push.c:525 builtin/send-pack.c:165
+#: builtin/push.c:537 builtin/send-pack.c:165
msgid "mirror all refs"
msgstr "镜像所有引用"
-#: builtin/push.c:527
+#: builtin/push.c:539
msgid "delete refs"
msgstr "删除引用"
-#: builtin/push.c:528
+#: builtin/push.c:540
msgid "push tags (can't be used with --all or --mirror)"
msgstr "推送标签（不能使用 --all or --mirror）"
-#: builtin/push.c:531 builtin/send-pack.c:166
+#: builtin/push.c:543 builtin/send-pack.c:166
msgid "force updates"
msgstr "强制更新"
-#: builtin/push.c:533 builtin/send-pack.c:180
+#: builtin/push.c:545 builtin/send-pack.c:180
msgid "refname>:<expect"
msgstr "引用名>:<期望值"
-#: builtin/push.c:534 builtin/send-pack.c:181
+#: builtin/push.c:546 builtin/send-pack.c:181
msgid "require old value of ref to be at this value"
msgstr "要求引用旧的取值为设定值"
-#: builtin/push.c:537
+#: builtin/push.c:549
msgid "control recursive pushing of submodules"
msgstr "控制子模组的递归推送"
-#: builtin/push.c:539 builtin/send-pack.c:174
+#: builtin/push.c:551 builtin/send-pack.c:174
msgid "use thin pack"
msgstr "使用精简打包"
-#: builtin/push.c:540 builtin/push.c:541 builtin/send-pack.c:160
+#: builtin/push.c:552 builtin/push.c:553 builtin/send-pack.c:160
#: builtin/send-pack.c:161
msgid "receive pack program"
msgstr "接收包程序"
-#: builtin/push.c:542
+#: builtin/push.c:554
msgid "set upstream for git pull/status"
msgstr "设置 git pull/status 的上游"
-#: builtin/push.c:545
+#: builtin/push.c:557
msgid "prune locally removed refs"
msgstr "清除本地删除的引用"
-#: builtin/push.c:547
+#: builtin/push.c:559
msgid "bypass pre-push hook"
msgstr "绕过 pre-push 钩子"
-#: builtin/push.c:548
+#: builtin/push.c:560
msgid "push missing but relevant tags"
msgstr "推送缺失但有关的标签"
-#: builtin/push.c:551 builtin/send-pack.c:168
+#: builtin/push.c:563 builtin/send-pack.c:168
msgid "GPG sign the push"
msgstr "用 GPG 为推送签名"
-#: builtin/push.c:553 builtin/send-pack.c:175
+#: builtin/push.c:565 builtin/send-pack.c:175
msgid "request atomic transaction on remote side"
msgstr "需要远端支持原子事务"
-#: builtin/push.c:554 builtin/send-pack.c:171
+#: builtin/push.c:566 builtin/send-pack.c:171
msgid "server-specific"
msgstr "server-specific"
-#: builtin/push.c:554 builtin/send-pack.c:172
+#: builtin/push.c:566 builtin/send-pack.c:172
msgid "option to transmit"
msgstr "传输选项"
-#: builtin/push.c:568
+#: builtin/push.c:583
msgid "--delete is incompatible with --all, --mirror and --tags"
msgstr "--delete 与 --all、--mirror 及 --tags 不兼容"
-#: builtin/push.c:570
+#: builtin/push.c:585
msgid "--delete doesn't make sense without any refs"
msgstr "--delete 未接任何引用没有意义"
-#: builtin/push.c:589
+#: builtin/push.c:604
msgid "push options must not have new line characters"
msgstr "推送选项不能有换行符"
@@ -11658,19 +11924,51 @@
msgid "git rebase--helper [<options>]"
msgstr "git rebase--helper [<选项>]"
-#: builtin/rebase--helper.c:20
+#: builtin/rebase--helper.c:24
+msgid "keep empty commits"
+msgstr "保持空提交"
+
+#: builtin/rebase--helper.c:25
msgid "continue rebase"
msgstr "继续变基"
-#: builtin/rebase--helper.c:22
+#: builtin/rebase--helper.c:27
msgid "abort rebase"
msgstr "中止变基"
-#: builtin/receive-pack.c:28
-msgid "git receive-pack <git-dir>"
-msgstr "git receive-pack <git-dir>"
+#: builtin/rebase--helper.c:30
+msgid "make rebase script"
+msgstr "制作变基脚本"
-#: builtin/receive-pack.c:838
+#: builtin/rebase--helper.c:32
+msgid "shorten commit ids in the todo list"
+msgstr "缩短待办列表中的提交号"
+
+#: builtin/rebase--helper.c:34
+msgid "expand commit ids in the todo list"
+msgstr "扩展待办列表中的提交号"
+
+#: builtin/rebase--helper.c:36
+msgid "check the todo list"
+msgstr "检查待办列表"
+
+#: builtin/rebase--helper.c:38
+msgid "skip unnecessary picks"
+msgstr "跳过不必要的拣选"
+
+#: builtin/rebase--helper.c:40
+msgid "rearrange fixup/squash lines"
+msgstr "重新排列 fixup/squash 行"
+
+#: builtin/rebase--helper.c:42
+msgid "insert exec commands in todo list"
+msgstr "在待办列表中插入 exec 执行命令"
+
+#: builtin/receive-pack.c:30
+msgid "git receive-pack <git-dir>"
+msgstr "git receive-pack <仓库目录>"
+
+#: builtin/receive-pack.c:840
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"
@@ -11696,7 +11994,7 @@
"若要屏蔽此信息且保持默认行为，设置 'receive.denyCurrentBranch'\n"
"配置变量为 'refuse'。"
-#: builtin/receive-pack.c:858
+#: builtin/receive-pack.c:860
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"
@@ -11723,12 +12021,7 @@
msgid "You must specify a directory."
msgstr "您必须指定一个目录。"
-#: builtin/reflog.c:424
-#, c-format
-msgid "'%s' for '%s' is not a valid timestamp"
-msgstr "'%2$s' 的值 '%1$s' 不是一个有效的时间戳"
-
-#: builtin/reflog.c:541 builtin/reflog.c:546
+#: builtin/reflog.c:531 builtin/reflog.c:536
#, c-format
msgid "'%s' is not a valid timestamp"
msgstr "'%s' 不是一个有效的时间戳"
@@ -11868,12 +12161,12 @@
msgid "specifying branches to track makes sense only with fetch mirrors"
msgstr "指定要跟踪的分支只在与获取镜像同时使用才有意义"
-#: builtin/remote.c:191 builtin/remote.c:630
+#: builtin/remote.c:191 builtin/remote.c:631
#, c-format
msgid "remote %s already exists."
msgstr "远程 %s 已经存在。"
-#: builtin/remote.c:195 builtin/remote.c:634
+#: builtin/remote.c:195 builtin/remote.c:635
#, c-format
msgid "'%s' is not a valid remote name"
msgstr "'%s' 不是一个有效的远程名称"
@@ -11896,17 +12189,17 @@
msgid "(delete)"
msgstr "（删除）"
-#: builtin/remote.c:623 builtin/remote.c:758 builtin/remote.c:857
+#: builtin/remote.c:624 builtin/remote.c:759 builtin/remote.c:858
#, c-format
msgid "No such remote: %s"
msgstr "没有这样的远程：%s"
-#: builtin/remote.c:640
+#: builtin/remote.c:641
#, c-format
msgid "Could not rename config section '%s' to '%s'"
msgstr "不能重命名配置小节 '%s' 到 '%s'"
-#: builtin/remote.c:660
+#: builtin/remote.c:661
#, c-format
msgid ""
"Not updating non-default fetch refspec\n"
@@ -11917,17 +12210,17 @@
"\t%s\n"
"\t如果必要请手动更新配置。"
-#: builtin/remote.c:696
+#: builtin/remote.c:697
#, c-format
msgid "deleting '%s' failed"
msgstr "删除 '%s' 失败"
-#: builtin/remote.c:730
+#: builtin/remote.c:731
#, c-format
msgid "creating '%s' failed"
msgstr "创建 '%s' 失败"
-#: builtin/remote.c:795
+#: builtin/remote.c:796
msgid ""
"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n"
"to delete it, use:"
@@ -11937,113 +12230,113 @@
msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用："
msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用："
-#: builtin/remote.c:809
+#: builtin/remote.c:810
#, c-format
msgid "Could not remove config section '%s'"
msgstr "不能移除配置小节 '%s'"
-#: builtin/remote.c:910
+#: builtin/remote.c:911
#, c-format
msgid " new (next fetch will store in remotes/%s)"
msgstr " 新的（下一次获取将存储于 remotes/%s）"
-#: builtin/remote.c:913
+#: builtin/remote.c:914
msgid " tracked"
msgstr " 已跟踪"
-#: builtin/remote.c:915
+#: builtin/remote.c:916
msgid " stale (use 'git remote prune' to remove)"
msgstr " 过时（使用 'git remote prune' 来移除）"
-#: builtin/remote.c:917
+#: builtin/remote.c:918
msgid " ???"
msgstr " ???"
-#: builtin/remote.c:958
+#: builtin/remote.c:959
#, c-format
msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch"
msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支"
-#: builtin/remote.c:966
+#: builtin/remote.c:967
#, c-format
msgid "rebases interactively onto remote %s"
msgstr "交互式变基到远程 %s"
-#: builtin/remote.c:967
+#: builtin/remote.c:968
#, c-format
msgid "rebases onto remote %s"
msgstr "变基到远程 %s"
-#: builtin/remote.c:970
+#: builtin/remote.c:971
#, c-format
msgid " merges with remote %s"
msgstr " 与远程 %s 合并"
-#: builtin/remote.c:973
+#: builtin/remote.c:974
#, c-format
msgid "merges with remote %s"
msgstr "与远程 %s 合并"
-#: builtin/remote.c:976
+#: builtin/remote.c:977
#, c-format
msgid "%-*s and with remote %s\n"
msgstr "%-*s 以及和远程 %s\n"
-#: builtin/remote.c:1019
+#: builtin/remote.c:1020
msgid "create"
msgstr "创建"
-#: builtin/remote.c:1022
+#: builtin/remote.c:1023
msgid "delete"
msgstr "删除"
-#: builtin/remote.c:1026
+#: builtin/remote.c:1027
msgid "up to date"
msgstr "最新"
-#: builtin/remote.c:1029
+#: builtin/remote.c:1030
msgid "fast-forwardable"
msgstr "可快进"
-#: builtin/remote.c:1032
+#: builtin/remote.c:1033
msgid "local out of date"
msgstr "本地已过时"
-#: builtin/remote.c:1039
+#: builtin/remote.c:1040
#, c-format
msgid " %-*s forces to %-*s (%s)"
msgstr " %-*s 强制推送至 %-*s (%s)"
-#: builtin/remote.c:1042
+#: builtin/remote.c:1043
#, c-format
msgid " %-*s pushes to %-*s (%s)"
msgstr " %-*s 推送至 %-*s (%s)"
-#: builtin/remote.c:1046
+#: builtin/remote.c:1047
#, c-format
msgid " %-*s forces to %s"
msgstr " %-*s 强制推送至 %s"
-#: builtin/remote.c:1049
+#: builtin/remote.c:1050
#, c-format
msgid " %-*s pushes to %s"
msgstr " %-*s 推送至 %s"
-#: builtin/remote.c:1117
+#: builtin/remote.c:1118
msgid "do not query remotes"
msgstr "不查询远程"
-#: builtin/remote.c:1144
+#: builtin/remote.c:1145
#, c-format
msgid "* remote %s"
msgstr "* 远程 %s"
-#: builtin/remote.c:1145
+#: builtin/remote.c:1146
#, c-format
msgid " Fetch URL: %s"
msgstr " 获取地址：%s"
-#: builtin/remote.c:1146 builtin/remote.c:1162 builtin/remote.c:1301
+#: builtin/remote.c:1147 builtin/remote.c:1163 builtin/remote.c:1302
msgid "(no URL)"
msgstr "(无 URL)"
@@ -12051,32 +12344,32 @@
#. with the one in " Fetch URL: %s"
#. translation.
#.
-#: builtin/remote.c:1160 builtin/remote.c:1162
+#: builtin/remote.c:1161 builtin/remote.c:1163
#, c-format
msgid " Push URL: %s"
msgstr " 推送地址：%s"
-#: builtin/remote.c:1164 builtin/remote.c:1166 builtin/remote.c:1168
+#: builtin/remote.c:1165 builtin/remote.c:1167 builtin/remote.c:1169
#, c-format
msgid " HEAD branch: %s"
msgstr " HEAD 分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1164
+#: builtin/remote.c:1165
msgid "(not queried)"
msgstr "（未查询）"
-#: builtin/remote.c:1166
+#: builtin/remote.c:1167
msgid "(unknown)"
msgstr "（未知）"
-#: builtin/remote.c:1170
+#: builtin/remote.c:1171
#, c-format
msgid ""
" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n"
msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n"
-#: builtin/remote.c:1182
+#: builtin/remote.c:1183
#, c-format
msgid " Remote branch:%s"
msgid_plural " Remote branches:%s"
@@ -12084,155 +12377,155 @@
msgstr[1] " 远程分支：%s"
# 译者：中文字符串拼接，可删除前导空格
-#: builtin/remote.c:1185 builtin/remote.c:1211
+#: builtin/remote.c:1186 builtin/remote.c:1212
msgid " (status not queried)"
msgstr "（状态未查询）"
-#: builtin/remote.c:1194
+#: builtin/remote.c:1195
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:1202
+#: builtin/remote.c:1203
msgid " Local refs will be mirrored by 'git push'"
msgstr " 本地引用将在 'git push' 时被镜像"
-#: builtin/remote.c:1208
+#: builtin/remote.c:1209
#, 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:1229
+#: builtin/remote.c:1230
msgid "set refs/remotes/<name>/HEAD according to remote"
msgstr "根据远程设置 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1231
+#: builtin/remote.c:1232
msgid "delete refs/remotes/<name>/HEAD"
msgstr "删除 refs/remotes/<名称>/HEAD"
-#: builtin/remote.c:1246
+#: builtin/remote.c:1247
msgid "Cannot determine remote HEAD"
msgstr "无法确定远程 HEAD"
-#: builtin/remote.c:1248
+#: builtin/remote.c:1249
msgid "Multiple remote HEAD branches. Please choose one explicitly with:"
msgstr "多个远程 HEAD 分支。请明确地选择一个用命令："
-#: builtin/remote.c:1258
+#: builtin/remote.c:1259
#, c-format
msgid "Could not delete %s"
msgstr "无法删除 %s"
-#: builtin/remote.c:1266
+#: builtin/remote.c:1267
#, c-format
msgid "Not a valid ref: %s"
msgstr "不是一个有效引用：%s"
-#: builtin/remote.c:1268
+#: builtin/remote.c:1269
#, c-format
msgid "Could not setup %s"
msgstr "不能设置 %s"
# 译者：注意保持前导空格
-#: builtin/remote.c:1286
+#: builtin/remote.c:1287
#, c-format
msgid " %s will become dangling!"
msgstr " %s 将成为摇摆状态！"
# 译者：注意保持前导空格
-#: builtin/remote.c:1287
+#: builtin/remote.c:1288
#, c-format
msgid " %s has become dangling!"
msgstr " %s 已成为摇摆状态！"
-#: builtin/remote.c:1297
+#: builtin/remote.c:1298
#, c-format
msgid "Pruning %s"
msgstr "修剪 %s"
-#: builtin/remote.c:1298
+#: builtin/remote.c:1299
#, c-format
msgid "URL: %s"
msgstr "URL：%s"
-#: builtin/remote.c:1314
+#: builtin/remote.c:1315
#, c-format
msgid " * [would prune] %s"
msgstr " * [将删除] %s"
-#: builtin/remote.c:1317
+#: builtin/remote.c:1318
#, c-format
msgid " * [pruned] %s"
msgstr " * [已删除] %s"
-#: builtin/remote.c:1362
+#: builtin/remote.c:1363
msgid "prune remotes after fetching"
msgstr "抓取后清除远程"
-#: builtin/remote.c:1425 builtin/remote.c:1479 builtin/remote.c:1547
+#: builtin/remote.c:1426 builtin/remote.c:1480 builtin/remote.c:1548
#, c-format
msgid "No such remote '%s'"
msgstr "没有此远程 '%s'"
-#: builtin/remote.c:1441
+#: builtin/remote.c:1442
msgid "add branch"
msgstr "添加分支"
-#: builtin/remote.c:1448
+#: builtin/remote.c:1449
msgid "no remote specified"
msgstr "未指定远程"
-#: builtin/remote.c:1465
+#: builtin/remote.c:1466
msgid "query push URLs rather than fetch URLs"
msgstr "查询推送 URL 地址，而非获取 URL 地址"
-#: builtin/remote.c:1467
+#: builtin/remote.c:1468
msgid "return all URLs"
msgstr "返回所有 URL 地址"
-#: builtin/remote.c:1495
+#: builtin/remote.c:1496
#, c-format
msgid "no URLs configured for remote '%s'"
msgstr "没有给远程仓库 '%s' 设定 URL"
-#: builtin/remote.c:1521
+#: builtin/remote.c:1522
msgid "manipulate push URLs"
msgstr "操作推送 URLS"
-#: builtin/remote.c:1523
+#: builtin/remote.c:1524
msgid "add URL"
msgstr "添加 URL"
-#: builtin/remote.c:1525
+#: builtin/remote.c:1526
msgid "delete URLs"
msgstr "删除 URLS"
-#: builtin/remote.c:1532
+#: builtin/remote.c:1533
msgid "--add --delete doesn't make sense"
msgstr "--add --delete 无意义"
-#: builtin/remote.c:1573
+#: builtin/remote.c:1572
#, c-format
msgid "Invalid old URL pattern: %s"
msgstr "无效的旧 URL 匹配模版：%s"
-#: builtin/remote.c:1581
+#: builtin/remote.c:1580
#, c-format
msgid "No such URL found: %s"
msgstr "未找到此 URL：%s"
-#: builtin/remote.c:1583
+#: builtin/remote.c:1582
msgid "Will not delete all non-push URLs"
msgstr "将不会删除所有非推送 URL 地址"
-#: builtin/remote.c:1597
+#: builtin/remote.c:1598
msgid "be verbose; must be placed before a subcommand"
msgstr "冗长输出；必须置于子命令之前"
-#: builtin/remote.c:1628
+#: builtin/remote.c:1629
#, c-format
msgid "Unknown subcommand: %s"
msgstr "未知子命令：%s"
@@ -12329,7 +12622,7 @@
msgid "--keep-unreachable and -A are incompatible"
msgstr "--keep-unreachable 和 -A 不兼容"
-#: builtin/repack.c:406 builtin/worktree.c:116
+#: builtin/repack.c:406 builtin/worktree.c:146
#, c-format
msgid "failed to remove '%s'"
msgstr "无法删除 '%s'"
@@ -12459,122 +12752,135 @@
msgid "keep"
msgstr "保持"
-#: builtin/reset.c:77
+#: builtin/reset.c:78
msgid "You do not have a valid HEAD."
msgstr "您没有一个有效的 HEAD。"
-#: builtin/reset.c:79
+#: builtin/reset.c:80
msgid "Failed to find tree of HEAD."
msgstr "无法找到 HEAD 指向的树。"
-#: builtin/reset.c:85
+#: builtin/reset.c:86
#, c-format
msgid "Failed to find tree of %s."
msgstr "无法找到 %s 指向的树。"
-#: builtin/reset.c:103
+#: builtin/reset.c:113
#, c-format
msgid "HEAD is now at %s"
msgstr "HEAD 现在位于 %s"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:186
+#: builtin/reset.c:197
#, c-format
msgid "Cannot do a %s reset in the middle of a merge."
msgstr "在合并过程中不能做%s重置操作。"
-#: builtin/reset.c:286
+#: builtin/reset.c:297
msgid "be quiet, only report errors"
msgstr "安静模式，只报告错误"
-#: builtin/reset.c:288
+#: builtin/reset.c:299
msgid "reset HEAD and index"
msgstr "重置 HEAD 和索引"
-#: builtin/reset.c:289
+#: builtin/reset.c:300
msgid "reset only HEAD"
msgstr "只重置 HEAD"
-#: builtin/reset.c:291 builtin/reset.c:293
+#: builtin/reset.c:302 builtin/reset.c:304
msgid "reset HEAD, index and working tree"
msgstr "重置 HEAD、索引和工作区"
-#: builtin/reset.c:295
+#: builtin/reset.c:306
msgid "reset HEAD but keep local changes"
msgstr "重置 HEAD 但保存本地变更"
-#: builtin/reset.c:301
+#: builtin/reset.c:312
msgid "record only the fact that removed paths will be added later"
msgstr "将删除的路径标记为稍后添加"
-#: builtin/reset.c:320
+#: builtin/reset.c:329
#, c-format
msgid "Failed to resolve '%s' as a valid revision."
msgstr "无法将 '%s' 解析为一个有效的版本。"
-#: builtin/reset.c:328
+#: builtin/reset.c:337
#, c-format
msgid "Failed to resolve '%s' as a valid tree."
msgstr "无法将 '%s' 解析为一个有效的树对象。"
-#: builtin/reset.c:337
+#: builtin/reset.c:346
msgid "--patch is incompatible with --{hard,mixed,soft}"
msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容"
-#: builtin/reset.c:346
+#: builtin/reset.c:355
msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead."
msgstr "--mixed 带路径已弃用，而是用 'git reset -- <路径>'。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:348
+#: builtin/reset.c:357
#, c-format
msgid "Cannot do %s reset with paths."
msgstr "不能带路径进行%s重置。"
# 译者：汉字之间无空格，故删除%s前后空格
-#: builtin/reset.c:358
+#: builtin/reset.c:367
#, c-format
msgid "%s reset is not allowed in a bare repository"
msgstr "不能对纯仓库进行%s重置"
-#: builtin/reset.c:362
+#: builtin/reset.c:371
msgid "-N can only be used with --mixed"
msgstr "-N 只能和 --mixed 同时使用"
-#: builtin/reset.c:379
+#: builtin/reset.c:388
msgid "Unstaged changes after reset:"
msgstr "重置后取消暂存的变更："
-#: builtin/reset.c:385
+#: builtin/reset.c:394
#, c-format
msgid "Could not reset index file to revision '%s'."
msgstr "不能重置索引文件至版本 '%s'。"
-#: builtin/reset.c:389
+#: builtin/reset.c:398
msgid "Could not write new index file."
msgstr "不能写入新的索引文件。"
-#: builtin/rev-list.c:358
+#: builtin/rev-list.c:399
+msgid "object filtering requires --objects"
+msgstr "对象过滤需要 --objects"
+
+#: builtin/rev-list.c:402
+#, c-format
+msgid "invalid sparse value '%s'"
+msgstr "无效的稀疏值 '%s'"
+
+#: builtin/rev-list.c:442
msgid "rev-list does not support display of notes"
msgstr "rev-list 不支持显示注解"
-#: builtin/rev-parse.c:394
+#: builtin/rev-list.c:445
+msgid "cannot combine --use-bitmap-index with object filtering"
+msgstr "不能将 --use-bitmap-index 和对象过滤组合使用"
+
+#: builtin/rev-parse.c:402
msgid "git rev-parse --parseopt [<options>] -- [<args>...]"
msgstr "git rev-parse --parseopt [<选项>] -- [<参数>...]"
-#: builtin/rev-parse.c:399
+#: builtin/rev-parse.c:407
msgid "keep the `--` passed as an arg"
msgstr "保持 `--` 作为一个参数传递"
-#: builtin/rev-parse.c:401
+#: builtin/rev-parse.c:409
msgid "stop parsing after the first non-option argument"
msgstr "遇到第一个非选项参数后停止解析"
-#: builtin/rev-parse.c:404
+#: builtin/rev-parse.c:412
msgid "output in stuck long form"
msgstr "以固定长格式输出"
-#: builtin/rev-parse.c:535
+#: builtin/rev-parse.c:545
msgid ""
"git rev-parse --parseopt [<options>] -- [<args>...]\n"
" or: git rev-parse --sq-quote [<arg>...]\n"
@@ -12665,11 +12971,11 @@
msgid "keep redundant, empty commits"
msgstr "保持多余的、空的提交"
-#: builtin/revert.c:212
+#: builtin/revert.c:214
msgid "revert failed"
msgstr "还原失败"
-#: builtin/revert.c:225
+#: builtin/revert.c:227
msgid "cherry-pick failed"
msgstr "拣选失败"
@@ -12735,17 +13041,17 @@
msgid "exit with a zero status even if nothing matched"
msgstr "即使没有匹配，也以零状态退出"
-#: builtin/rm.c:308
+#: builtin/rm.c:307
#, c-format
msgid "not removing '%s' recursively without -r"
msgstr "未提供 -r 选项不会递归删除 '%s'"
-#: builtin/rm.c:347
+#: builtin/rm.c:346
#, c-format
msgid "git rm: unable to remove %s"
msgstr "git rm：不能删除 %s"
-#: builtin/rm.c:370
+#: builtin/rm.c:369
#, c-format
msgid "could not remove '%s'"
msgstr "无法删除 '%s'"
@@ -12781,27 +13087,27 @@
msgid "git shortlog [<options>] [<revision-range>] [[--] [<path>...]]"
msgstr "git shortlog [<选项>] [<版本范围>] [[--] [<路径>...]]"
-#: builtin/shortlog.c:249
+#: builtin/shortlog.c:263
msgid "Group by committer rather than author"
msgstr "按照提交者分组而不是作者"
-#: builtin/shortlog.c:251
+#: builtin/shortlog.c:265
msgid "sort output according to the number of commits per author"
msgstr "根据每个作者的提交数量排序"
-#: builtin/shortlog.c:253
+#: builtin/shortlog.c:267
msgid "Suppress commit descriptions, only provides commit count"
msgstr "隐藏提交说明，只提供提交数量"
-#: builtin/shortlog.c:255
+#: builtin/shortlog.c:269
msgid "Show the email address of each author"
msgstr "显示每个作者的电子邮件地址"
-#: builtin/shortlog.c:256
+#: builtin/shortlog.c:270
msgid "w[,i1[,i2]]"
msgstr "w[,i1[,i2]]"
-#: builtin/shortlog.c:257
+#: builtin/shortlog.c:271
msgid "Linewrap output"
msgstr "折行输出"
@@ -12819,7 +13125,7 @@
#: builtin/show-branch.c:16
msgid "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"
-msgstr "git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<引用>]"
+msgstr "git show-branch (-g | --reflog)[=<n>[,<起始点>]] [--list] [<引用>]"
#: builtin/show-branch.c:376
#, c-format
@@ -12895,7 +13201,7 @@
#: builtin/show-branch.c:656
msgid "show <n> most recent ref-log entries starting at base"
-msgstr "显示从 base 开始的 <n> 条最近的引用日志记录"
+msgstr "显示从起始点开始的 <n> 条最近的引用日志记录"
#: builtin/show-branch.c:690
msgid ""
@@ -12999,115 +13305,143 @@
msgid "prepend comment character and space to each line"
msgstr "为每一行的行首添加注释符和空格"
-#: builtin/submodule--helper.c:25 builtin/submodule--helper.c:1075
+#: builtin/submodule--helper.c:34 builtin/submodule--helper.c:1332
#, c-format
msgid "No such ref: %s"
msgstr "没有这样的引用：%s"
-#: builtin/submodule--helper.c:32 builtin/submodule--helper.c:1084
+#: builtin/submodule--helper.c:41 builtin/submodule--helper.c:1341
#, c-format
msgid "Expecting a full ref name, got %s"
msgstr "期望一个完整的引用名称，却得到 %s"
-#: builtin/submodule--helper.c:72
+#: builtin/submodule--helper.c:81
#, c-format
msgid "cannot strip one component off url '%s'"
msgstr "无法从 url '%s' 剥离一个组件"
-#: builtin/submodule--helper.c:305 builtin/submodule--helper.c:630
+#: builtin/submodule--helper.c:370 builtin/submodule--helper.c:861
msgid "alternative anchor for relative paths"
msgstr "相对路径的替代锚记（anchor）"
-#: builtin/submodule--helper.c:310
+#: builtin/submodule--helper.c:375
msgid "git submodule--helper list [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper list [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:356 builtin/submodule--helper.c:380
+#: builtin/submodule--helper.c:426 builtin/submodule--helper.c:449
#, c-format
msgid "No url found for submodule path '%s' in .gitmodules"
msgstr "在 .gitmodules 中未找到子模组 '%s' 的 url"
-#: builtin/submodule--helper.c:395
+#: builtin/submodule--helper.c:464
#, c-format
msgid ""
"could not lookup configuration '%s'. Assuming this repository is its own "
"authoritative upstream."
msgstr "无法找到配置 '%s'。假定这个仓库是其自身的官方上游。"
-#: builtin/submodule--helper.c:406
+#: builtin/submodule--helper.c:475
#, c-format
msgid "Failed to register url for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册 url"
-#: builtin/submodule--helper.c:410
+#: builtin/submodule--helper.c:479
#, c-format
msgid "Submodule '%s' (%s) registered for path '%s'\n"
msgstr "子模组 '%s'（%s）未对路径 '%s' 注册\n"
#
-#: builtin/submodule--helper.c:420
+#: builtin/submodule--helper.c:489
#, c-format
msgid "warning: command update mode suggested for submodule '%s'\n"
msgstr "警告：建议子模组 '%s' 使用命令更新模式\n"
-#: builtin/submodule--helper.c:427
+#: builtin/submodule--helper.c:496
#, c-format
msgid "Failed to register update mode for submodule path '%s'"
msgstr "无法为子模组 '%s' 注册更新模式"
-#: builtin/submodule--helper.c:443
+#: builtin/submodule--helper.c:518
msgid "Suppress output for initializing a submodule"
-msgstr "初始化子模组时抑制输出"
+msgstr "取消子模组初始化的输出"
-#: builtin/submodule--helper.c:448
+#: builtin/submodule--helper.c:523
msgid "git submodule--helper init [<path>]"
msgstr "git submodule--helper init [<路径>]"
-#: builtin/submodule--helper.c:476
-msgid "git submodule--helper name <path>"
-msgstr "git submodule--helper name <路径>"
-
-#: builtin/submodule--helper.c:482
+#: builtin/submodule--helper.c:591 builtin/submodule--helper.c:713
#, c-format
msgid "no submodule mapping found in .gitmodules for path '%s'"
msgstr "在 .gitmodules 中没有发现路径 '%s' 的子模组映射"
-#: builtin/submodule--helper.c:565 builtin/submodule--helper.c:568
+#: builtin/submodule--helper.c:626
+#, c-format
+msgid "could not resolve HEAD ref inside the submodule '%s'"
+msgstr "无法解析子模组 '%s' 的 HEAD 引用"
+
+#: builtin/submodule--helper.c:653
+#, c-format
+msgid "failed to recurse into submodule '%s'"
+msgstr "无法递归子模组 '%s'"
+
+#: builtin/submodule--helper.c:677
+msgid "Suppress submodule status output"
+msgstr "取消子模组状态输出"
+
+#: builtin/submodule--helper.c:678
+msgid ""
+"Use commit stored in the index instead of the one stored in the submodule "
+"HEAD"
+msgstr "使用存储在索引中的提交，而非存储在子模组 HEAD 中的提交"
+
+#: builtin/submodule--helper.c:679
+msgid "recurse into nested submodules"
+msgstr "在嵌套子模组中递归"
+
+#: builtin/submodule--helper.c:684
+msgid "git submodule status [--quiet] [--cached] [--recursive] [<path>...]"
+msgstr "git submodule status [--quiet] [--cached] [--recursive] [<路径>...]"
+
+#: builtin/submodule--helper.c:708
+msgid "git submodule--helper name <path>"
+msgstr "git submodule--helper name <路径>"
+
+#: builtin/submodule--helper.c:796 builtin/submodule--helper.c:799
#, c-format
msgid "submodule '%s' cannot add alternate: %s"
msgstr "子模组 '%s' 不能添加仓库备选：%s"
-#: builtin/submodule--helper.c:604
+#: builtin/submodule--helper.c:835
#, c-format
msgid "Value '%s' for submodule.alternateErrorStrategy is not recognized"
msgstr "不能识别 submodule.alternateErrorStrategy 的取值 '%s'"
-#: builtin/submodule--helper.c:611
+#: builtin/submodule--helper.c:842
#, c-format
msgid "Value '%s' for submodule.alternateLocation is not recognized"
msgstr "不能识别 submodule.alternateLocaion 的取值 '%s'"
-#: builtin/submodule--helper.c:633
+#: builtin/submodule--helper.c:864
msgid "where the new submodule will be cloned to"
msgstr "新的子模组将要克隆的路径"
-#: builtin/submodule--helper.c:636
+#: builtin/submodule--helper.c:867
msgid "name of the new submodule"
msgstr "新子模组的名称"
-#: builtin/submodule--helper.c:639
+#: builtin/submodule--helper.c:870
msgid "url where to clone the submodule from"
msgstr "克隆子模组的 url 地址"
-#: builtin/submodule--helper.c:645
+#: builtin/submodule--helper.c:876
msgid "depth for shallow clones"
msgstr "浅克隆的深度"
-#: builtin/submodule--helper.c:648 builtin/submodule--helper.c:993
+#: builtin/submodule--helper.c:879 builtin/submodule--helper.c:1250
msgid "force cloning progress"
msgstr "强制显示克隆进度"
-#: builtin/submodule--helper.c:653
+#: builtin/submodule--helper.c:884
msgid ""
"git submodule--helper clone [--prefix=<path>] [--quiet] [--reference "
"<repository>] [--name <name>] [--depth <depth>] --url <url> --path <path>"
@@ -13115,102 +13449,102 @@
"git submodule--helper clone [--prefix=<路径>] [--quiet] [--reference <仓库>] "
"[--name <名字>] [--depth <深度>] --url <url> --path <路径>"
-#: builtin/submodule--helper.c:684
+#: builtin/submodule--helper.c:915
#, c-format
msgid "clone of '%s' into submodule path '%s' failed"
msgstr "无法克隆 '%s' 到子模组路径 '%s'"
-#: builtin/submodule--helper.c:699
+#: builtin/submodule--helper.c:930
#, c-format
msgid "could not get submodule directory for '%s'"
msgstr "无法得到 '%s' 的子模组目录"
-#: builtin/submodule--helper.c:764
+#: builtin/submodule--helper.c:995
#, c-format
msgid "Submodule path '%s' not initialized"
msgstr "子模组 '%s' 尚未初始化"
-#: builtin/submodule--helper.c:768
+#: builtin/submodule--helper.c:999
msgid "Maybe you want to use 'update --init'?"
msgstr "也许您想要执行 'update --init'？"
-#: builtin/submodule--helper.c:793
+#: builtin/submodule--helper.c:1028
#, c-format
msgid "Skipping unmerged submodule %s"
msgstr "略过未合并的子模组 %s"
-#: builtin/submodule--helper.c:814
+#: builtin/submodule--helper.c:1057
#, c-format
msgid "Skipping submodule '%s'"
msgstr "略过子模组 '%s'"
-#: builtin/submodule--helper.c:942
+#: builtin/submodule--helper.c:1190
#, c-format
msgid "Failed to clone '%s'. Retry scheduled"
msgstr "克隆 '%s' 失败。按计划重试"
-#: builtin/submodule--helper.c:953
+#: builtin/submodule--helper.c:1201
#, c-format
msgid "Failed to clone '%s' a second time, aborting"
msgstr "第二次尝试克隆 '%s' 失败，退出"
-#: builtin/submodule--helper.c:974 builtin/submodule--helper.c:1162
+#: builtin/submodule--helper.c:1231 builtin/submodule--helper.c:1451
msgid "path into the working tree"
msgstr "到工作区的路径"
-#: builtin/submodule--helper.c:977
+#: builtin/submodule--helper.c:1234
msgid "path into the working tree, across nested submodule boundaries"
msgstr "工作区中的路径，递归嵌套子模组"
-#: builtin/submodule--helper.c:981
+#: builtin/submodule--helper.c:1238
msgid "rebase, merge, checkout or none"
msgstr "rebase、merge、checkout 或 none"
-#: builtin/submodule--helper.c:985
+#: builtin/submodule--helper.c:1242
msgid "Create a shallow clone truncated to the specified number of revisions"
msgstr "创建一个指定深度的浅克隆"
-#: builtin/submodule--helper.c:988
+#: builtin/submodule--helper.c:1245
msgid "parallel jobs"
msgstr "并发任务"
-#: builtin/submodule--helper.c:990
+#: builtin/submodule--helper.c:1247
msgid "whether the initial clone should follow the shallow recommendation"
msgstr "初始克隆是否应该遵守推荐的浅克隆选项"
-#: builtin/submodule--helper.c:991
+#: builtin/submodule--helper.c:1248
msgid "don't print cloning progress"
msgstr "不要输出克隆进度"
-#: builtin/submodule--helper.c:998
+#: builtin/submodule--helper.c:1255
msgid "git submodule--helper update_clone [--prefix=<path>] [<path>...]"
msgstr "git submodule--helper update_clone [--prefix=<路径>] [<路径>...]"
-#: builtin/submodule--helper.c:1008
+#: builtin/submodule--helper.c:1268
msgid "bad value for update parameter"
msgstr "update 参数取值错误"
-#: builtin/submodule--helper.c:1079
+#: builtin/submodule--helper.c:1336
#, 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:1163
+#: builtin/submodule--helper.c:1452
msgid "recurse into submodules"
msgstr "在子模组中递归"
-#: builtin/submodule--helper.c:1169
+#: builtin/submodule--helper.c:1458
msgid "git submodule--helper embed-git-dir [<path>...]"
msgstr "git submodule--helper embed-git-dir [<路径>...]"
-#: builtin/submodule--helper.c:1232
+#: builtin/submodule--helper.c:1517
#, c-format
msgid "%s doesn't support --super-prefix"
msgstr "%s 不支持 --super-prefix"
-#: builtin/submodule--helper.c:1238
+#: builtin/submodule--helper.c:1523
#, c-format
msgid "'%s' is not a valid submodule--helper subcommand"
msgstr "'%s' 不是一个有效的 submodule--helper 子命令"
@@ -13223,23 +13557,23 @@
msgid "git symbolic-ref -d [-q] <name>"
msgstr "git symbolic-ref -d [-q] <名称>"
-#: builtin/symbolic-ref.c:41
+#: builtin/symbolic-ref.c:40
msgid "suppress error message for non-symbolic (detached) refs"
msgstr "不显示非符号（分离的）引用的错误信息"
-#: builtin/symbolic-ref.c:42
+#: builtin/symbolic-ref.c:41
msgid "delete symbolic ref"
msgstr "删除符号引用"
-#: builtin/symbolic-ref.c:43
+#: builtin/symbolic-ref.c:42
msgid "shorten ref output"
-msgstr "简短的引用输出"
+msgstr "缩短引用输出"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason"
msgstr "原因"
-#: builtin/symbolic-ref.c:44 builtin/update-ref.c:363
+#: builtin/symbolic-ref.c:43 builtin/update-ref.c:362
msgid "reason of the update"
msgstr "更新的原因"
@@ -13268,17 +13602,17 @@
msgid "git tag -v [--format=<format>] <tagname>..."
msgstr "git tag -v [--format=<格式>] <标签名>..."
-#: builtin/tag.c:84
+#: builtin/tag.c:86
#, c-format
msgid "tag '%s' not found."
msgstr "未发现标签 '%s'。"
-#: builtin/tag.c:100
+#: builtin/tag.c:102
#, c-format
msgid "Deleted tag '%s' (was %s)\n"
msgstr "已删除标签 '%s'（曾为 %s）\n"
-#: builtin/tag.c:129
+#: builtin/tag.c:131
#, c-format
msgid ""
"\n"
@@ -13291,7 +13625,7 @@
" %s\n"
"以 '%c' 开头的行将被忽略。\n"
-#: builtin/tag.c:133
+#: builtin/tag.c:135
#, c-format
msgid ""
"\n"
@@ -13305,142 +13639,142 @@
" %s\n"
"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n"
-#: builtin/tag.c:211
+#: builtin/tag.c:189
msgid "unable to sign the tag"
msgstr "无法签署标签"
-#: builtin/tag.c:213
+#: builtin/tag.c:191
msgid "unable to write tag file"
msgstr "无法写标签文件"
-#: builtin/tag.c:237
+#: builtin/tag.c:215
msgid "bad object type."
msgstr "坏的对象类型。"
-#: builtin/tag.c:283
+#: builtin/tag.c:261
msgid "no tag message?"
msgstr "无标签说明？"
-#: builtin/tag.c:290
+#: builtin/tag.c:268
#, c-format
msgid "The tag message has been left in %s\n"
msgstr "标签说明被保留在 %s\n"
-#: builtin/tag.c:398
+#: builtin/tag.c:376
msgid "list tag names"
msgstr "列出标签名称"
-#: builtin/tag.c:400
+#: builtin/tag.c:378
msgid "print <n> lines of each tag message"
msgstr "每个标签信息打印 <n> 行"
-#: builtin/tag.c:402
+#: builtin/tag.c:380
msgid "delete tags"
msgstr "删除标签"
-#: builtin/tag.c:403
+#: builtin/tag.c:381
msgid "verify tags"
msgstr "验证标签"
-#: builtin/tag.c:405
+#: builtin/tag.c:383
msgid "Tag creation options"
msgstr "标签创建选项"
-#: builtin/tag.c:407
+#: builtin/tag.c:385
msgid "annotated tag, needs a message"
msgstr "附注标签，需要一个说明"
-#: builtin/tag.c:409
+#: builtin/tag.c:387
msgid "tag message"
msgstr "标签说明"
-#: builtin/tag.c:411
+#: builtin/tag.c:389
msgid "annotated and GPG-signed tag"
msgstr "附注并附加 GPG 签名的标签"
-#: builtin/tag.c:415
+#: builtin/tag.c:393
msgid "use another key to sign the tag"
msgstr "使用另外的私钥签名该标签"
-#: builtin/tag.c:416
+#: builtin/tag.c:394
msgid "replace the tag if exists"
msgstr "如果存在，替换现有的标签"
-#: builtin/tag.c:417 builtin/update-ref.c:369
+#: builtin/tag.c:395 builtin/update-ref.c:368
msgid "create a reflog"
msgstr "创建引用日志"
-#: builtin/tag.c:419
+#: builtin/tag.c:397
msgid "Tag listing options"
msgstr "标签列表选项"
-#: builtin/tag.c:420
+#: builtin/tag.c:398
msgid "show tag list in columns"
msgstr "以列的方式显示标签列表"
-#: builtin/tag.c:421 builtin/tag.c:423
+#: builtin/tag.c:399 builtin/tag.c:401
msgid "print only tags that contain the commit"
msgstr "只打印包含该提交的标签"
-#: builtin/tag.c:422 builtin/tag.c:424
+#: builtin/tag.c:400 builtin/tag.c:402
msgid "print only tags that don't contain the commit"
msgstr "只打印不包含该提交的标签"
-#: builtin/tag.c:425
+#: builtin/tag.c:403
msgid "print only tags that are merged"
msgstr "只打印已经合并的标签"
-#: builtin/tag.c:426
+#: builtin/tag.c:404
msgid "print only tags that are not merged"
msgstr "只打印尚未合并的标签"
-#: builtin/tag.c:431
+#: builtin/tag.c:409
msgid "print only tags of the object"
msgstr "只打印指向该对象的标签"
-#: builtin/tag.c:470
+#: builtin/tag.c:453
msgid "--column and -n are incompatible"
msgstr "--column 和 -n 不兼容"
-#: builtin/tag.c:492
+#: builtin/tag.c:475
msgid "-n option is only allowed in list mode"
msgstr "-n 选项只允许用在列表显示模式"
-#: builtin/tag.c:494
+#: builtin/tag.c:477
msgid "--contains option is only allowed in list mode"
msgstr "--contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:496
+#: builtin/tag.c:479
msgid "--no-contains option is only allowed in list mode"
msgstr "--no-contains 选项只允许用在列表显示模式"
-#: builtin/tag.c:498
+#: builtin/tag.c:481
msgid "--points-at option is only allowed in list mode"
msgstr "--points-at 选项只允许用在列表显示模式"
-#: builtin/tag.c:500
+#: builtin/tag.c:483
msgid "--merged and --no-merged options are only allowed in list mode"
msgstr "--merged 和 --no-merged 选项只允许用在列表显示模式"
-#: builtin/tag.c:511
+#: builtin/tag.c:494
msgid "only one -F or -m option is allowed."
msgstr "只允许一个 -F 或 -m 选项。"
-#: builtin/tag.c:530
+#: builtin/tag.c:513
msgid "too many params"
msgstr "太多参数"
-#: builtin/tag.c:536
+#: builtin/tag.c:519
#, c-format
msgid "'%s' is not a valid tag name."
msgstr "'%s' 不是一个有效的标签名称。"
-#: builtin/tag.c:541
+#: builtin/tag.c:524
#, c-format
msgid "tag '%s' already exists"
msgstr "标签 '%s' 已存在"
-#: builtin/tag.c:571
+#: builtin/tag.c:554
#, c-format
msgid "Updated tag '%s' (was %s)\n"
msgstr "已更新标签 '%s'（曾为 %s）\n"
@@ -13449,199 +13783,215 @@
msgid "Unpacking objects"
msgstr "展开对象中"
-#: builtin/update-index.c:80
+#: builtin/update-index.c:82
#, c-format
msgid "failed to create directory %s"
msgstr "无法创建目录 %s"
-#: builtin/update-index.c:86
+#: builtin/update-index.c:88
#, c-format
msgid "failed to stat %s"
msgstr "对 %s 调用 stat 失败"
-#: builtin/update-index.c:96
+#: builtin/update-index.c:98
#, c-format
msgid "failed to create file %s"
msgstr "无法创建文件 %s"
-#: builtin/update-index.c:104
+#: builtin/update-index.c:106
#, c-format
msgid "failed to delete file %s"
msgstr "无法删除文件 %s"
-#: builtin/update-index.c:111 builtin/update-index.c:217
+#: builtin/update-index.c:113 builtin/update-index.c:219
#, c-format
msgid "failed to delete directory %s"
msgstr "无法删除目录 %s"
-#: builtin/update-index.c:136
+#: builtin/update-index.c:138
#, c-format
msgid "Testing mtime in '%s' "
msgstr "在 '%s' 中测试 mtime "
-#: builtin/update-index.c:150
+#: builtin/update-index.c:152
msgid "directory stat info does not change after adding a new file"
msgstr "添加一个新文件后，目录的状态信息未改变"
-#: builtin/update-index.c:163
+#: builtin/update-index.c:165
msgid "directory stat info does not change after adding a new directory"
msgstr "添加一个新目录后，目录的状态信息未改变"
-#: builtin/update-index.c:176
+#: builtin/update-index.c:178
msgid "directory stat info changes after updating a file"
msgstr "更新一个文件后，目录的状态信息被修改"
-#: builtin/update-index.c:187
+#: builtin/update-index.c:189
msgid "directory stat info changes after adding a file inside subdirectory"
msgstr "在子目录中添加文件后，目录的状态信息被修改"
-#: builtin/update-index.c:198
+#: builtin/update-index.c:200
msgid "directory stat info does not change after deleting a file"
msgstr "删除一个文件后，目录的状态信息未改变"
-#: builtin/update-index.c:211
+#: builtin/update-index.c:213
msgid "directory stat info does not change after deleting a directory"
msgstr "删除一个目录后，目录的状态信息未改变"
-#: builtin/update-index.c:218
+#: builtin/update-index.c:220
msgid " OK"
msgstr " OK"
-#: builtin/update-index.c:569
+#: builtin/update-index.c:579
msgid "git update-index [<options>] [--] [<file>...]"
msgstr "git update-index [<选项>] [--] [<文件>...]"
-#: builtin/update-index.c:924
+#: builtin/update-index.c:936
msgid "continue refresh even when index needs update"
msgstr "当索引需要更新时继续刷新"
-#: builtin/update-index.c:927
+#: builtin/update-index.c:939
msgid "refresh: ignore submodules"
msgstr "刷新：忽略子模组"
-#: builtin/update-index.c:930
+#: builtin/update-index.c:942
msgid "do not ignore new files"
msgstr "不忽略新的文件"
-#: builtin/update-index.c:932
+#: builtin/update-index.c:944
msgid "let files replace directories and vice-versa"
msgstr "让文件替换目录（反之亦然）"
-#: builtin/update-index.c:934
+#: builtin/update-index.c:946
msgid "notice files missing from worktree"
msgstr "通知文件从工作区丢失"
-#: builtin/update-index.c:936
+#: builtin/update-index.c:948
msgid "refresh even if index contains unmerged entries"
msgstr "即使索引区包含未合并的条目也执行刷新"
-#: builtin/update-index.c:939
+#: builtin/update-index.c:951
msgid "refresh stat information"
msgstr "刷新统计信息"
-#: builtin/update-index.c:943
+#: builtin/update-index.c:955
msgid "like --refresh, but ignore assume-unchanged setting"
msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置"
-#: builtin/update-index.c:947
+#: builtin/update-index.c:959
msgid "<mode>,<object>,<path>"
msgstr "<存取模式>,<对象>,<路径>"
-#: builtin/update-index.c:948
+#: builtin/update-index.c:960
msgid "add the specified entry to the index"
msgstr "添加指定的条目到索引区"
-#: builtin/update-index.c:957
+#: builtin/update-index.c:969
msgid "mark files as \"not changing\""
msgstr "把文件标记为 \"没有变更\""
-#: builtin/update-index.c:960
+#: builtin/update-index.c:972
msgid "clear assumed-unchanged bit"
msgstr "清除 assumed-unchanged 位"
-#: builtin/update-index.c:963
+#: builtin/update-index.c:975
msgid "mark files as \"index-only\""
msgstr "把文件标记为 \"仅索引\""
-#: builtin/update-index.c:966
+#: builtin/update-index.c:978
msgid "clear skip-worktree bit"
msgstr "清除 skip-worktree 位"
-#: builtin/update-index.c:969
+#: builtin/update-index.c:981
msgid "add to index only; do not add content to object database"
msgstr "只添加到索引区；不添加对象到对象库"
-#: builtin/update-index.c:971
+#: builtin/update-index.c:983
msgid "remove named paths even if present in worktree"
msgstr "即使存在工作区里，也删除路径"
-#: builtin/update-index.c:973
+#: builtin/update-index.c:985
msgid "with --stdin: input lines are terminated by null bytes"
msgstr "携带 --stdin：输入的行以 null 字符终止"
-#: builtin/update-index.c:975
+#: builtin/update-index.c:987
msgid "read list of paths to be updated from standard input"
msgstr "从标准输入中读取需要更新的路径列表"
-#: builtin/update-index.c:979
+#: builtin/update-index.c:991
msgid "add entries from standard input to the index"
msgstr "从标准输入添加条目到索引区"
-#: builtin/update-index.c:983
+#: builtin/update-index.c:995
msgid "repopulate stages #2 and #3 for the listed paths"
msgstr "为指定文件重新生成第2和第3暂存区"
-#: builtin/update-index.c:987
+#: builtin/update-index.c:999
msgid "only update entries that differ from HEAD"
msgstr "只更新与 HEAD 不同的条目"
-#: builtin/update-index.c:991
+#: builtin/update-index.c:1003
msgid "ignore files missing from worktree"
msgstr "忽略工作区丢失的文件"
-#: builtin/update-index.c:994
+#: builtin/update-index.c:1006
msgid "report actions to standard output"
msgstr "在标准输出显示操作"
-#: builtin/update-index.c:996
+#: builtin/update-index.c:1008
msgid "(for porcelains) forget saved unresolved conflicts"
msgstr "(for porcelains) 忘记保存的未解决的冲突"
-#: builtin/update-index.c:1000
+#: builtin/update-index.c:1012
msgid "write index in this format"
msgstr "以这种格式写入索引区"
-#: builtin/update-index.c:1002
+#: builtin/update-index.c:1014
msgid "enable or disable split index"
msgstr "启用或禁用索引拆分"
-#: builtin/update-index.c:1004
+#: builtin/update-index.c:1016
msgid "enable/disable untracked cache"
msgstr "启用/禁用对未跟踪文件的缓存"
-#: builtin/update-index.c:1006
+#: builtin/update-index.c:1018
msgid "test if the filesystem supports untracked cache"
msgstr "测试文件系统是否支持未跟踪文件缓存"
-#: builtin/update-index.c:1008
+#: builtin/update-index.c:1020
msgid "enable untracked cache without testing the filesystem"
msgstr "无需检测文件系统，启用对未跟踪文件的缓存"
-#: builtin/update-index.c:1108
+#: builtin/update-index.c:1022
+msgid "write out the index even if is not flagged as changed"
+msgstr "即使没有被标记为已更改，也要写出索引"
+
+#: builtin/update-index.c:1024
+msgid "enable or disable file system monitor"
+msgstr "启用或禁用文件系统监控"
+
+#: builtin/update-index.c:1026
+msgid "mark files as fsmonitor valid"
+msgstr "标记文件为 fsmonitor 有效"
+
+#: builtin/update-index.c:1029
+msgid "clear fsmonitor valid bit"
+msgstr "清除 fsmonitor 有效位"
+
+#: builtin/update-index.c:1127
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:1117
+#: builtin/update-index.c:1136
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:1128
+#: builtin/update-index.c:1147
msgid ""
"core.untrackedCache is set to true; remove or change it, if you really want "
"to disable the untracked cache"
@@ -13649,11 +13999,11 @@
"core.untrackedCache 被设置为 true。如果您确实要禁用未跟踪文件缓存，请删除或修"
"改它。"
-#: builtin/update-index.c:1132
+#: builtin/update-index.c:1151
msgid "Untracked cache disabled"
msgstr "缓存未跟踪文件被禁用"
-#: builtin/update-index.c:1140
+#: builtin/update-index.c:1159
msgid ""
"core.untrackedCache is set to false; remove or change it, if you really want "
"to enable the untracked cache"
@@ -13661,11 +14011,28 @@
"core.untrackedCache 被设置为 false。如果您确实要启用未跟踪文件缓存，请删除或"
"修改它。"
-#: builtin/update-index.c:1144
+#: builtin/update-index.c:1163
#, c-format
msgid "Untracked cache enabled for '%s'"
msgstr "缓存未跟踪文件在 '%s' 启用"
+#: builtin/update-index.c:1171
+msgid "core.fsmonitor is unset; set it if you really want to enable fsmonitor"
+msgstr "core.fsmonitor 未设置；如果想要启用 fsmonitor 请设置"
+
+#: builtin/update-index.c:1175
+msgid "fsmonitor enabled"
+msgstr "fsmonitor 被启用"
+
+#: builtin/update-index.c:1178
+msgid ""
+"core.fsmonitor is set; remove it if you really want to disable fsmonitor"
+msgstr "core.fsmonitor 已设置；如果想要禁用 fsmonitor 请移除设置"
+
+#: builtin/update-index.c:1182
+msgid "fsmonitor disabled"
+msgstr "fsmonitor 被禁用"
+
#: builtin/update-ref.c:10
msgid "git update-ref [<options>] -d <refname> [<old-val>]"
msgstr "git update-ref [<选项>] -d <引用名> [<旧值>]"
@@ -13678,19 +14045,19 @@
msgid "git update-ref [<options>] --stdin [-z]"
msgstr "git update-ref [<选项>] --stdin [-z]"
-#: builtin/update-ref.c:364
+#: builtin/update-ref.c:363
msgid "delete the reference"
msgstr "删除引用"
-#: builtin/update-ref.c:366
+#: builtin/update-ref.c:365
msgid "update <refname> not the one it points to"
msgstr "更新 <引用名> 本身而不是它指向的引用"
-#: builtin/update-ref.c:367
+#: builtin/update-ref.c:366
msgid "stdin has NUL-terminated arguments"
msgstr "标准输入有以 NUL 字符终止的参数"
-#: builtin/update-ref.c:368
+#: builtin/update-ref.c:367
msgid "read updates from stdin"
msgstr "从标准输入读取更新"
@@ -13734,122 +14101,141 @@
msgid "print tag contents"
msgstr "打印标签内容"
-#: builtin/worktree.c:16
+#: builtin/worktree.c:17
msgid "git worktree add [<options>] <path> [<branch>]"
msgstr "git worktree add [<选项>] <路径> [<分支>]"
-#: builtin/worktree.c:17
+#: builtin/worktree.c:18
msgid "git worktree list [<options>]"
msgstr "git worktree list [<选项>]"
-#: builtin/worktree.c:18
+#: builtin/worktree.c:19
msgid "git worktree lock [<options>] <path>"
msgstr "git worktree lock [<选项>] <路径>"
-#: builtin/worktree.c:19
+#: builtin/worktree.c:20
msgid "git worktree prune [<options>]"
msgstr "git worktree prune [<选项>]"
-#: builtin/worktree.c:20
+#: builtin/worktree.c:21
msgid "git worktree unlock <path>"
msgstr "git worktree unlock <路径>"
-#: builtin/worktree.c:44
+#: builtin/worktree.c:58
#, c-format
msgid "Removing worktrees/%s: not a valid directory"
msgstr "删除工作区/%s：不是一个有效的目录"
-#: builtin/worktree.c:50
+#: builtin/worktree.c:64
#, c-format
msgid "Removing worktrees/%s: gitdir file does not exist"
msgstr "删除 worktrees/%s：gitdir 文件不存在"
-#: builtin/worktree.c:55
+#: builtin/worktree.c:69 builtin/worktree.c:78
#, c-format
msgid "Removing worktrees/%s: unable to read gitdir file (%s)"
msgstr "删除 worktrees/%s：无法读取 gitdir 文件 (%s)"
-#: builtin/worktree.c:66
+#: builtin/worktree.c:88
+#, c-format
+msgid ""
+"Removing worktrees/%s: short read (expected %<PRIuMAX> bytes, read "
+"%<PRIuMAX>)"
+msgstr "删除工作树/%s：读取过短（期望 %<PRIuMAX> 字节，读取 %<PRIuMAX>）"
+
+#: builtin/worktree.c:96
#, c-format
msgid "Removing worktrees/%s: invalid gitdir file"
msgstr "删除 worktrees/%s：无效的 gitdir 文件"
-#: builtin/worktree.c:82
+#: builtin/worktree.c:112
#, c-format
msgid "Removing worktrees/%s: gitdir file points to non-existent location"
msgstr "删除 worktrees/%s：gitdir 文件的指向不存在"
-#: builtin/worktree.c:129
+#: builtin/worktree.c:159
msgid "report pruned working trees"
msgstr "报告清除的工作区"
-#: builtin/worktree.c:131
+#: builtin/worktree.c:161
msgid "expire working trees older than <time>"
-msgstr "将早于 <time> 的工作区过期"
+msgstr "将早于 <时间> 的工作区过期"
-#: builtin/worktree.c:205
+#: builtin/worktree.c:236
#, c-format
msgid "'%s' already exists"
msgstr "'%s' 已经存在"
-#: builtin/worktree.c:236
+#: builtin/worktree.c:267
#, c-format
msgid "could not create directory of '%s'"
msgstr "不能创建目录 '%s'"
-#: builtin/worktree.c:275
+#: builtin/worktree.c:306
#, c-format
msgid "Preparing %s (identifier %s)"
msgstr "准备 %s（标识符 %s）"
-#: builtin/worktree.c:327
+#: builtin/worktree.c:368
msgid "checkout <branch> even if already checked out in other worktree"
-msgstr "检出分支 <branch> 即使已经被检出到其它工作区"
+msgstr "检出 <分支>，即使已经被检出到其它工作区"
-#: builtin/worktree.c:329
+#: builtin/worktree.c:370
msgid "create a new branch"
msgstr "创建一个新分支"
-#: builtin/worktree.c:331
+#: builtin/worktree.c:372
msgid "create or reset a branch"
msgstr "创建或重置一个分支"
-#: builtin/worktree.c:333
+#: builtin/worktree.c:374
msgid "populate the new working tree"
msgstr "生成新的工作区"
-#: builtin/worktree.c:334
+#: builtin/worktree.c:375
msgid "keep the new working tree locked"
msgstr "锁定新工作区"
-#: builtin/worktree.c:342
+#: builtin/worktree.c:377
+msgid "set up tracking mode (see git-branch(1))"
+msgstr "设置跟踪模式（参见 git-branch(1)）"
+
+#: builtin/worktree.c:380
+msgid "try to match the new branch name with a remote-tracking branch"
+msgstr "尝试为新分支名匹配一个远程跟踪分支"
+
+#: builtin/worktree.c:388
msgid "-b, -B, and --detach are mutually exclusive"
msgstr "-b、-B 和 --detach 是互斥的"
-#: builtin/worktree.c:479
+#: builtin/worktree.c:453
+msgid "--[no-]track can only be used if a new branch is created"
+msgstr "只能在创建新分支时使用选项 --[no-]track "
+
+#: builtin/worktree.c:553
msgid "reason for locking"
msgstr "锁定原因"
-#: builtin/worktree.c:491 builtin/worktree.c:524
+#: builtin/worktree.c:565 builtin/worktree.c:598
#, c-format
msgid "'%s' is not a working tree"
msgstr "'%s' 不是一个工作区"
-#: builtin/worktree.c:493 builtin/worktree.c:526
+#: builtin/worktree.c:567 builtin/worktree.c:600
msgid "The main working tree cannot be locked or unlocked"
msgstr "主工作区无法被加锁或解锁"
-#: builtin/worktree.c:498
+#: builtin/worktree.c:572
#, c-format
msgid "'%s' is already locked, reason: %s"
msgstr "'%s' 已被锁定，原因：%s"
-#: builtin/worktree.c:500
+#: builtin/worktree.c:574
#, c-format
msgid "'%s' is already locked"
msgstr "'%s' 已被锁定"
-#: builtin/worktree.c:528
+#: builtin/worktree.c:602
#, c-format
msgid "'%s' is not locked"
msgstr "'%s' 未被锁定"
@@ -13870,7 +14256,7 @@
msgid "only useful for debugging"
msgstr "只对调试有用"
-#: upload-pack.c:23
+#: upload-pack.c:24
msgid "git upload-pack [<options>] <dir>"
msgstr "git upload-pack [<选项>] <目录>"
@@ -13884,13 +14270,13 @@
#: upload-pack.c:1045
msgid "do not try <directory>/.git/ if <directory> is no Git directory"
-msgstr "不要尝试 <directory>/.git/ 如果 <directory> 不是一个 Git 目录"
+msgstr "如果 <目录> 不是一个 Git 目录，不要尝试 <目录>/.git/"
#: upload-pack.c:1047
msgid "interrupt transfer after <n> seconds of inactivity"
msgstr "不活动 <n> 秒钟后终止传输"
-#: credential-cache--daemon.c:224
+#: credential-cache--daemon.c:222
#, c-format
msgid ""
"The permissions on your socket directory are too loose; other\n"
@@ -13903,7 +14289,7 @@
"\n"
"\tchmod 0700 %s"
-#: credential-cache--daemon.c:272
+#: credential-cache--daemon.c:271
msgid "print debugging messages to stderr"
msgstr "调试信息输出到标准错误"
@@ -13917,20 +14303,20 @@
"查看 'git help <命令>' 或 'git help <概念>' 以获取给定子命令或概念的\n"
"帮助。"
-#: http.c:337
+#: http.c:339
#, c-format
msgid "negative value for http.postbuffer; defaulting to %d"
msgstr "http.postbuffer 为负值，默认为 %d"
-#: http.c:358
+#: http.c:360
msgid "Delegation control is not supported with cURL < 7.22.0"
msgstr "当 cURL < 7.22.0 时，不支持委托控制"
-#: http.c:367
+#: http.c:369
msgid "Public key pinning not supported with cURL < 7.44.0"
msgstr "不支持公钥文件锁定，因为 cURL < 7.44.0"
-#: http.c:1764
+#: http.c:1791
#, c-format
msgid ""
"unable to update url base from redirection:\n"
@@ -13946,6 +14332,14 @@
msgid "redirecting to %s"
msgstr "重定向到 %s"
+#: list-objects-filter-options.h:54
+msgid "args"
+msgstr "参数"
+
+#: list-objects-filter-options.h:55
+msgid "object filtering"
+msgstr "对象过滤"
+
#: common-cmds.h:9
msgid "start a working area (see also: git help tutorial)"
msgstr "开始一个工作区（参见：git help tutorial）"
@@ -14119,27 +14513,27 @@
msgid "Bad bisect_write argument: $state"
msgstr "坏的 bisect_write 参数：$state"
-#: git-bisect.sh:262
+#: git-bisect.sh:246
#, sh-format
msgid "Bad rev input: $arg"
msgstr "坏的输入版本：$arg"
-#: git-bisect.sh:281
+#: git-bisect.sh:265
#, sh-format
msgid "Bad rev input: $bisected_head"
msgstr "坏的输入版本：$bisected_head"
-#: git-bisect.sh:290
+#: git-bisect.sh:274
#, sh-format
msgid "Bad rev input: $rev"
msgstr "坏的输入版本：$rev"
-#: git-bisect.sh:299
+#: git-bisect.sh:283
#, sh-format
msgid "'git bisect $TERM_BAD' can take only one argument."
msgstr "'git bisect $TERM_BAD' 只能带一个参数。"
-#: git-bisect.sh:322
+#: git-bisect.sh:306
#, sh-format
msgid "Warning: bisecting only with a $TERM_BAD commit."
msgstr "警告：在仅有一个坏（$TERM_BAD）提交下进行二分查找。"
@@ -14148,11 +14542,11 @@
#. TRANSLATORS: Make sure to include [Y] and [n] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-bisect.sh:328
+#: git-bisect.sh:312
msgid "Are you sure [Y/n]? "
msgstr "您确认么[Y/n]？ "
-#: git-bisect.sh:340
+#: git-bisect.sh:324
#, sh-format
msgid ""
"You need to give me at least one $bad_syn and one $good_syn revision.\n"
@@ -14161,7 +14555,7 @@
"您需要给我至少一个好版本和一个坏版本。\n"
"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
-#: git-bisect.sh:343
+#: git-bisect.sh:327
#, sh-format
msgid ""
"You need to start by \"git bisect start\".\n"
@@ -14172,16 +14566,16 @@
"然后需要提供我至少一个好版本和一个坏版本。\n"
"（为此您可以用 \"git bisect $bad_syn\" 和 \"git bisect $good_syn\" 命令。）"
-#: git-bisect.sh:414 git-bisect.sh:546
+#: git-bisect.sh:398 git-bisect.sh:512
msgid "We are not bisecting."
msgstr "我们没有在二分查找。"
-#: git-bisect.sh:421
+#: git-bisect.sh:405
#, sh-format
msgid "'$invalid' is not a valid commit"
msgstr "'$invalid' 不是一个有效的提交"
-#: git-bisect.sh:430
+#: git-bisect.sh:414
#, sh-format
msgid ""
"Could not check out original HEAD '$branch'.\n"
@@ -14190,25 +14584,29 @@
"不能检出原始 HEAD '$branch'。\n"
"尝试 'git bisect reset <提交>'。"
-#: git-bisect.sh:458
+#: git-bisect.sh:422
msgid "No logfile given"
msgstr "未提供日志文件"
-#: git-bisect.sh:459
+#: git-bisect.sh:423
#, sh-format
msgid "cannot read $file for replaying"
msgstr "不能读取 $file 来重放"
-#: git-bisect.sh:480
+#: git-bisect.sh:444
msgid "?? what are you talking about?"
msgstr "?? 您在说什么?"
-#: git-bisect.sh:492
+#: git-bisect.sh:453
+msgid "bisect run failed: no command provided."
+msgstr "二分查找运行失败：没有提供命令。"
+
+#: git-bisect.sh:458
#, sh-format
msgid "running $command"
msgstr "运行 $command"
-#: git-bisect.sh:499
+#: git-bisect.sh:465
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14217,11 +14615,11 @@
"二分查找运行失败：\n"
"命令 '$command' 的退出码 $res 小于 0 或大于等于 128"
-#: git-bisect.sh:525
+#: git-bisect.sh:491
msgid "bisect run cannot continue any more"
msgstr "二分查找不能继续运行"
-#: git-bisect.sh:531
+#: git-bisect.sh:497
#, sh-format
msgid ""
"bisect run failed:\n"
@@ -14230,39 +14628,20 @@
"二分查找运行失败：\n"
"'bisect_state $state' 退出码为 $res"
-#: git-bisect.sh:538
+#: git-bisect.sh:504
msgid "bisect run success"
msgstr "二分查找运行成功"
-#: git-bisect.sh:565
-msgid "please use two different terms"
-msgstr "请使用两个不同的术语"
-
-#: git-bisect.sh:575
-#, sh-format
-msgid "'$term' is not a valid term"
-msgstr "'$term' 不是一个有效的名称"
-
-#: git-bisect.sh:578
-#, sh-format
-msgid "can't use the builtin command '$term' as a term"
-msgstr "不能使用内置命令 '$term' 作为术语"
-
-#: git-bisect.sh:587 git-bisect.sh:593
-#, sh-format
-msgid "can't change the meaning of term '$term'"
-msgstr "不能修改术语 '$term' 的含义"
-
-#: git-bisect.sh:606
+#: git-bisect.sh:533
#, sh-format
msgid "Invalid command: you're currently in a $TERM_BAD/$TERM_GOOD bisect."
msgstr "无效的命令：您当前正处于一个 $TERM_BAD/$TERM_GOOD 二分查找。"
-#: git-bisect.sh:636
+#: git-bisect.sh:567
msgid "no terms defined"
msgstr "未定义术语"
-#: git-bisect.sh:653
+#: git-bisect.sh:584
#, sh-format
msgid ""
"invalid argument $arg for 'git bisect terms'.\n"
@@ -14292,7 +14671,7 @@
#: git-merge-octopus.sh:77
#, sh-format
-msgid "Already up-to-date with $pretty_name"
+msgid "Already up to date with $pretty_name"
msgstr "已经和 $pretty_name 保持一致"
#: git-merge-octopus.sh:89
@@ -14311,50 +14690,52 @@
#: git-rebase.sh:58
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"
-"\"."
+"Resolve all conflicts manually, mark them as resolved with\n"
+"\"git add/rm <conflicted_files>\", then run \"git rebase --continue\".\n"
+"You can instead skip this commit: run \"git rebase --skip\".\n"
+"To abort and get back to the state before \"git rebase\", run \"git rebase --"
+"abort\"."
msgstr ""
-"当您解决了此问题后，执行 \"git rebase --continue\"。\n"
-"如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n"
-"要恢复原分支并停止变基，执行 \"git rebase --abort\"。"
+"手工解决所有冲突，执行 \"git add/rm <冲突的文件>\" 标记\n"
+"冲突已解决，然后执行 \"git rebase --continue\"。您也可以执行\n"
+"\"git rebase --skip\" 命令跳过这个提交。如果想要终止执行并回到\n"
+"\"git rebase\" 执行之前的状态，执行 \"git rebase --abort\"。"
-#: git-rebase.sh:158 git-rebase.sh:397
+#: git-rebase.sh:160 git-rebase.sh:402
#, sh-format
msgid "Could not move back to $head_name"
msgstr "无法移回 $head_name"
-#: git-rebase.sh:169
+#: git-rebase.sh:171
msgid "Applied autostash."
msgstr "成功应用 autostash。"
-#: git-rebase.sh:172
+#: git-rebase.sh:174
#, sh-format
msgid "Cannot store $stash_sha1"
msgstr "无法保存 $stash_sha1"
-#: git-rebase.sh:212
+#: git-rebase.sh:214
msgid "The pre-rebase hook refused to rebase."
msgstr "钩子 pre-rebase 拒绝变基操作。"
-#: git-rebase.sh:217
-msgid "It looks like git-am is in progress. Cannot rebase."
-msgstr "似乎正处于在 git-am 的执行过程中。无法变基。"
+#: git-rebase.sh:219
+msgid "It looks like 'git am' is in progress. Cannot rebase."
+msgstr "看起来 'git-am' 正在执行中。无法变基。"
-#: git-rebase.sh:358
+#: git-rebase.sh:363
msgid "No rebase in progress?"
msgstr "没有正在进行的变基？"
-#: git-rebase.sh:369
+#: git-rebase.sh:374
msgid "The --edit-todo action can only be used during interactive rebase."
msgstr "动作 --edit-todo 只能用在交互式变基过程中。"
-#: git-rebase.sh:376
+#: git-rebase.sh:381
msgid "Cannot read HEAD"
msgstr "不能读取 HEAD"
-#: git-rebase.sh:379
+#: git-rebase.sh:384
msgid ""
"You must edit all merge conflicts and then\n"
"mark them as resolved using git add"
@@ -14362,7 +14743,7 @@
"您必须编辑所有的合并冲突，然后通过 git add\n"
"命令将它们标记为已解决"
-#: git-rebase.sh:419
+#: git-rebase.sh:424
#, sh-format
msgid ""
"It seems that there is already a $state_dir_base directory, and\n"
@@ -14381,225 +14762,221 @@
"\t$cmd_clear_stale_rebase\n"
"然后再重新执行变基操作。 为避免丢失重要数据，我已经停止当前操作。"
-#: git-rebase.sh:470
+#: git-rebase.sh:480
#, sh-format
-msgid "invalid upstream $upstream_name"
-msgstr "无效的上游 $upstream_name"
+msgid "invalid upstream '$upstream_name'"
+msgstr "无效的上游 '$upstream_name'"
-#: git-rebase.sh:494
+#: git-rebase.sh:504
#, sh-format
msgid "$onto_name: there are more than one merge bases"
msgstr "$onto_name: 有一个以上的合并基准"
-#: git-rebase.sh:497 git-rebase.sh:501
+#: git-rebase.sh:507 git-rebase.sh:511
#, sh-format
msgid "$onto_name: there is no merge base"
msgstr "$onto_name: 没有合并基准"
-#: git-rebase.sh:506
+#: git-rebase.sh:516
#, sh-format
msgid "Does not point to a valid commit: $onto_name"
msgstr "没有指向一个有效的提交：$onto_name"
-#: git-rebase.sh:529
+#: git-rebase.sh:542
#, sh-format
-msgid "fatal: no such branch: $branch_name"
-msgstr "严重错误：无此分支：$branch_name"
+msgid "fatal: no such branch/commit '$branch_name'"
+msgstr "严重错误：无此分支/提交 '$branch_name'"
-#: git-rebase.sh:562
+#: git-rebase.sh:575
msgid "Cannot autostash"
msgstr "无法 autostash"
-#: git-rebase.sh:567
+#: git-rebase.sh:580
#, sh-format
msgid "Created autostash: $stash_abbrev"
msgstr "创建了 autostash: $stash_abbrev"
-#: git-rebase.sh:571
+#: git-rebase.sh:584
msgid "Please commit or stash them."
msgstr "请提交或贮藏修改。"
-#: git-rebase.sh:591
+#: git-rebase.sh:607
+#, sh-format
+msgid "HEAD is up to date."
+msgstr "HEAD 是最新的。"
+
+#: git-rebase.sh:609
#, sh-format
msgid "Current branch $branch_name is up to date."
msgstr "当前分支 $branch_name 是最新的。"
-#: git-rebase.sh:595
+#: git-rebase.sh:617
+#, sh-format
+msgid "HEAD is up to date, rebase forced."
+msgstr "HEAD 是最新的，强制变基。"
+
+#: git-rebase.sh:619
#, sh-format
msgid "Current branch $branch_name is up to date, rebase forced."
msgstr "当前分支 $branch_name 是最新的，强制变基。"
-#: git-rebase.sh:606
+#: git-rebase.sh:631
#, sh-format
msgid "Changes from $mb to $onto:"
msgstr "变更从 $mb 到 $onto："
-#: git-rebase.sh:615
+#: git-rebase.sh:640
msgid "First, rewinding head to replay your work on top of it..."
msgstr "首先，回退分支以便在上面重放您的工作..."
-#: git-rebase.sh:625
+#: git-rebase.sh:650
#, sh-format
msgid "Fast-forwarded $branch_name to $onto_name."
msgstr "快进 $branch_name 至 $onto_name。"
-#: git-stash.sh:54
+#: git-stash.sh:61
msgid "git stash clear with parameters is unimplemented"
msgstr "git stash clear 不支持参数"
-#: git-stash.sh:95
+#: git-stash.sh:108
msgid "You do not have the initial commit yet"
msgstr "您尚未建立初始提交"
-#: git-stash.sh:110
+#: git-stash.sh:123
msgid "Cannot save the current index state"
msgstr "无法保存当前索引状态"
-#: git-stash.sh:125
+#: git-stash.sh:138
msgid "Cannot save the untracked files"
msgstr "无法保存未跟踪文件"
-#: git-stash.sh:145 git-stash.sh:158
+#: git-stash.sh:158 git-stash.sh:171
msgid "Cannot save the current worktree state"
msgstr "无法保存当前工作区状态"
-#: git-stash.sh:162
+#: git-stash.sh:175
msgid "No changes selected"
msgstr "没有选择变更"
-#: git-stash.sh:165
+#: git-stash.sh:178
msgid "Cannot remove temporary index (can't happen)"
msgstr "无法删除临时索引（不应发生）"
-#: git-stash.sh:178
+#: git-stash.sh:191
msgid "Cannot record working tree state"
msgstr "不能记录工作区状态"
-#: git-stash.sh:210
+#: git-stash.sh:229
#, sh-format
msgid "Cannot update $ref_stash with $w_commit"
msgstr "无法用 $w_commit 更新 $ref_stash"
-#. TRANSLATORS: $option is an invalid option, like
-#. `--blah-blah'. The 7 spaces at the beginning of the
-#. second line correspond to "error: ". So you should line
-#. up the second line with however many characters the
-#. translation of "error: " takes in your language. E.g. in
-#. English this is:
-#.
-#. $ git stash save --blah-blah 2>&1 | head -n 2
-#. error: unknown option for 'stash save': --blah-blah
-#. To provide a message, use git stash save -- '--blah-blah'
-#: git-stash.sh:266
-#, sh-format
-msgid ""
-"error: unknown option for 'stash save': $option\n"
-" To provide a message, use git stash save -- '$option'"
-msgstr ""
-"错误：'stash save' 的未知选项：$option\n"
-" 要提供一个描述信息，使用 git stash save -- '$option'"
-
#: git-stash.sh:281
+#, sh-format
+msgid "error: unknown option for 'stash push': $option"
+msgstr "错误：'stash push' 的未知选项：$option"
+
+#: git-stash.sh:295
msgid "Can't use --patch and --include-untracked or --all at the same time"
msgstr "不能同时使用参数 --patch 和 --include-untracked 或 --all"
-#: git-stash.sh:289
+#: git-stash.sh:303
msgid "No local changes to save"
msgstr "没有要保存的本地修改"
-#: git-stash.sh:294
+#: git-stash.sh:308
msgid "Cannot initialize stash"
msgstr "无法初始化贮藏"
-#: git-stash.sh:298
+#: git-stash.sh:312
msgid "Cannot save the current status"
msgstr "无法保存当前状态"
-#: git-stash.sh:299
+#: git-stash.sh:313
#, sh-format
msgid "Saved working directory and index state $stash_msg"
msgstr "保存工作目录和索引状态 $stash_msg"
-#: git-stash.sh:326
+#: git-stash.sh:341
msgid "Cannot remove worktree changes"
msgstr "无法删除工作区变更"
-#: git-stash.sh:474
+#: git-stash.sh:489
#, sh-format
msgid "unknown option: $opt"
msgstr "未知选项: $opt"
-#: git-stash.sh:487
+#: git-stash.sh:502
msgid "No stash entries found."
msgstr "未发现贮藏条目。"
-#: git-stash.sh:494
+#: git-stash.sh:509
#, sh-format
msgid "Too many revisions specified: $REV"
msgstr "指定了太多的版本：$REV"
-#: git-stash.sh:509
+#: git-stash.sh:524
#, sh-format
msgid "$reference is not a valid reference"
msgstr "$reference 不是一个有效的引用"
-#: git-stash.sh:537
+#: git-stash.sh:552
#, sh-format
msgid "'$args' is not a stash-like commit"
msgstr "'$args' 不是贮藏式提交"
-#: git-stash.sh:548
+#: git-stash.sh:563
#, sh-format
msgid "'$args' is not a stash reference"
msgstr "'$args' 不是一个贮藏引用"
-#: git-stash.sh:556
+#: git-stash.sh:571
msgid "unable to refresh index"
msgstr "无法刷新索引"
-#: git-stash.sh:560
+#: git-stash.sh:575
msgid "Cannot apply a stash in the middle of a merge"
msgstr "无法在合并过程应用贮藏"
-#: git-stash.sh:568
+#: git-stash.sh:583
msgid "Conflicts in index. Try without --index."
msgstr "索引中有冲突。尝试不使用 --index。"
-#: git-stash.sh:570
+#: git-stash.sh:585
msgid "Could not save index tree"
msgstr "不能保存索引树"
-#: git-stash.sh:579
+#: git-stash.sh:594
msgid "Could not restore untracked files from stash entry"
msgstr "无法从贮藏条目中恢复未跟踪文件"
-#: git-stash.sh:604
+#: git-stash.sh:619
msgid "Cannot unstage modified files"
msgstr "无法将修改的文件取消暂存"
-#: git-stash.sh:619
+#: git-stash.sh:634
msgid "Index was not unstashed."
msgstr "索引未从贮藏中恢复。"
-#: git-stash.sh:633
+#: git-stash.sh:648
msgid "The stash entry is kept in case you need it again."
msgstr "贮藏条目被保留以备您再次需要。"
-#: git-stash.sh:642
+#: git-stash.sh:657
#, sh-format
msgid "Dropped ${REV} ($s)"
msgstr "丢弃了 ${REV} ($s)"
-#: git-stash.sh:643
+#: git-stash.sh:658
#, sh-format
msgid "${REV}: Could not drop stash entry"
msgstr "${REV}：无法丢弃贮藏条目"
-#: git-stash.sh:651
+#: git-stash.sh:666
msgid "No branch name specified"
msgstr "未指定分支名"
-#: git-stash.sh:730
+#: git-stash.sh:745
msgid "(To restore them type \"git stash apply\")"
msgstr "（为恢复数据输入 \"git stash apply\"）"
@@ -14739,29 +15116,29 @@
msgid "Submodule '$name' ($url) unregistered for path '$displaypath'"
msgstr "子模组 '$name' ($url) 未对路径 '$displaypath' 注册"
-#: git-submodule.sh:638
+#: git-submodule.sh:637
#, sh-format
msgid "Unable to find current revision in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中找到当前版本"
-#: git-submodule.sh:648
+#: git-submodule.sh:647
#, sh-format
msgid "Unable to fetch in submodule path '$sm_path'"
msgstr "无法在子模组路径 '$sm_path' 中获取"
-#: git-submodule.sh:653
+#: git-submodule.sh:652
#, 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:671
+#: git-submodule.sh:670
#, sh-format
msgid "Unable to fetch in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中获取"
-#: git-submodule.sh:677
+#: git-submodule.sh:676
#, sh-format
msgid ""
"Fetched in submodule path '$displaypath', but it did not contain $sha1. "
@@ -14769,84 +15146,79 @@
msgstr ""
"获取了子模组路径 '$displaypath'，但是它没有包含 $sha1。直接获取该提交失败。"
-#: git-submodule.sh:684
+#: git-submodule.sh:683
#, sh-format
msgid "Unable to checkout '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中检出 '$sha1'"
-#: git-submodule.sh:685
+#: git-submodule.sh:684
#, sh-format
msgid "Submodule path '$displaypath': checked out '$sha1'"
msgstr "子模组路径 '$displaypath'：检出 '$sha1'"
-#: git-submodule.sh:689
+#: git-submodule.sh:688
#, sh-format
msgid "Unable to rebase '$sha1' in submodule path '$displaypath'"
msgstr "无法在子模组路径 '$displaypath' 中变基 '$sha1'"
-#: git-submodule.sh:690
+#: git-submodule.sh:689
#, sh-format
msgid "Submodule path '$displaypath': rebased into '$sha1'"
msgstr "子模组路径 '$displaypath'：变基至 '$sha1'"
-#: git-submodule.sh:695
+#: git-submodule.sh:694
#, sh-format
msgid "Unable to merge '$sha1' in submodule path '$displaypath'"
msgstr "无法合并 '$sha1' 到子模组路径 '$displaypath' 中"
-#: git-submodule.sh:696
+#: git-submodule.sh:695
#, sh-format
msgid "Submodule path '$displaypath': merged in '$sha1'"
msgstr "子模组路径 '$displaypath'：已合并入 '$sha1'"
-#: git-submodule.sh:701
+#: git-submodule.sh:700
#, sh-format
msgid "Execution of '$command $sha1' failed in submodule path '$displaypath'"
msgstr "在子模组 '$displaypath' 中执行 '$command $sha1' 失败"
-#: git-submodule.sh:702
+#: git-submodule.sh:701
#, sh-format
msgid "Submodule path '$displaypath': '$command $sha1'"
msgstr "子模组 '$displaypath'：'$command $sha1'"
-#: git-submodule.sh:733
+#: git-submodule.sh:732
#, sh-format
msgid "Failed to recurse into submodule path '$displaypath'"
msgstr "无法递归进子模组路径 '$displaypath'"
-#: git-submodule.sh:841
+#: git-submodule.sh:828
msgid "The --cached option cannot be used with the --files option"
msgstr "选项 --cached 不能和选项 --files 同时使用"
-#: git-submodule.sh:893
+#: git-submodule.sh:880
#, sh-format
msgid "unexpected mode $mod_dst"
msgstr "意外的模式 $mod_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:913
+#: git-submodule.sh:900
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_src"
msgstr " 警告：$display_name 未包含提交 $sha1_src"
# 译者：注意保持前导空格
-#: git-submodule.sh:916
+#: git-submodule.sh:903
#, sh-format
msgid " Warn: $display_name doesn't contain commit $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_dst"
# 译者：注意保持前导空格
-#: git-submodule.sh:919
+#: git-submodule.sh:906
#, sh-format
msgid " Warn: $display_name doesn't contain commits $sha1_src and $sha1_dst"
msgstr " 警告：$display_name 未包含提交 $sha1_src 和 $sha1_dst"
-#: git-submodule.sh:1065
-#, sh-format
-msgid "Failed to recurse into submodule path '$sm_path'"
-msgstr "无法递归进子模组路径 '$sm_path'"
-
-#: git-submodule.sh:1137
+#: git-submodule.sh:1077
#, sh-format
msgid "Synchronizing submodule url for '$displaypath'"
msgstr "为 '$displaypath' 同步子模组 url"
@@ -14865,28 +15237,27 @@
msgid ""
"\n"
"Commands:\n"
-" p, pick = use commit\n"
-" r, reword = use commit, but edit the commit message\n"
-" e, edit = use commit, but stop for amending\n"
-" s, squash = use commit, but meld into previous commit\n"
-" f, fixup = like \"squash\", but discard this commit's log message\n"
-" x, exec = run command (the rest of the line) using shell\n"
-" d, drop = remove commit\n"
+"p, pick = use commit\n"
+"r, reword = use commit, but edit the commit message\n"
+"e, edit = use commit, but stop for amending\n"
+"s, squash = use commit, but meld into previous commit\n"
+"f, fixup = like \"squash\", but discard this commit's log message\n"
+"x, exec = run command (the rest of the line) using shell\n"
+"d, drop = remove commit\n"
"\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"
+"p, pick = 使用提交\n"
+"r, reword = 使用提交，但修改提交说明\n"
+"e, edit = 使用提交，但停止以便进行提交修补\n"
+"s, squash = 使用提交，但和前一个版本融合\n"
+"f, fixup = 类似于 \"squash\"，但丢弃提交说明日志\n"
+"x, exec = 使用 shell 运行命令（此行剩余部分）\n"
+"d, drop = 删除提交\n"
"\n"
"这些行可以被重新排序；它们会被从上至下地执行。\n"
-"\n"
#: git-rebase--interactive.sh:171
msgid ""
@@ -14957,49 +15328,49 @@
msgid "Refusing to squash a merge: $sha1"
msgstr "拒绝压缩一个合并：$sha1"
-#: git-rebase--interactive.sh:399
+#: git-rebase--interactive.sh:400
#, sh-format
msgid "Error redoing merge $sha1"
msgstr "无法重做合并 $sha1"
-#: git-rebase--interactive.sh:407
+#: git-rebase--interactive.sh:408
#, sh-format
msgid "Could not pick $sha1"
msgstr "不能拣选 $sha1"
-#: git-rebase--interactive.sh:416
+#: git-rebase--interactive.sh:417
#, sh-format
msgid "This is the commit message #${n}:"
msgstr "这是提交说明 #${n}："
-#: git-rebase--interactive.sh:421
+#: git-rebase--interactive.sh:422
#, sh-format
msgid "The commit message #${n} will be skipped:"
msgstr "提交说明 #${n} 将被跳过："
-#: git-rebase--interactive.sh:432
+#: git-rebase--interactive.sh:433
#, 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--interactive.sh:441
+#: git-rebase--interactive.sh:442
#, sh-format
msgid "Cannot write $fixup_msg"
msgstr "不能写入 $fixup_msg"
-#: git-rebase--interactive.sh:444
+#: git-rebase--interactive.sh:445
msgid "This is a combination of 2 commits."
msgstr "这是一个 2 个提交的组合。"
-#: git-rebase--interactive.sh:485 git-rebase--interactive.sh:528
-#: git-rebase--interactive.sh:531
+#: git-rebase--interactive.sh:486 git-rebase--interactive.sh:529
+#: git-rebase--interactive.sh:532
#, sh-format
msgid "Could not apply $sha1... $rest"
msgstr "不能应用 $sha1... $rest"
-#: git-rebase--interactive.sh:559
+#: git-rebase--interactive.sh:560
#, sh-format
msgid ""
"Could not amend commit after successfully picking $sha1... $rest\n"
@@ -15012,32 +15383,32 @@
"这通常是因为空的提交说明，或者 pre-commit 钩子执行失败。如果是 pre-commit\n"
"钩子执行失败，你可能需要在重写提交说明前解决这个问题。"
-#: git-rebase--interactive.sh:574
+#: git-rebase--interactive.sh:575
#, sh-format
msgid "Stopped at $sha1_abbrev... $rest"
msgstr "停止在 $sha1_abbrev... $rest"
-#: git-rebase--interactive.sh:589
+#: git-rebase--interactive.sh:590
#, sh-format
msgid "Cannot '$squash_style' without a previous commit"
msgstr "没有父提交的情况下不能 '$squash_style'"
-#: git-rebase--interactive.sh:631
+#: git-rebase--interactive.sh:632
#, sh-format
msgid "Executing: $rest"
msgstr "执行：$rest"
-#: git-rebase--interactive.sh:639
+#: git-rebase--interactive.sh:640
#, sh-format
msgid "Execution failed: $rest"
msgstr "执行失败：$rest"
-#: git-rebase--interactive.sh:641
+#: git-rebase--interactive.sh:642
msgid "and made changes to the index and/or the working tree"
msgstr "并且修改索引和/或工作区"
# 译者：注意保持前导空格
-#: git-rebase--interactive.sh:643
+#: git-rebase--interactive.sh:644
msgid ""
"You can fix the problem, and then run\n"
"\n"
@@ -15048,7 +15419,7 @@
"\tgit rebase --continue"
#. TRANSLATORS: after these lines is a command to be issued by the user
-#: git-rebase--interactive.sh:656
+#: git-rebase--interactive.sh:657
#, sh-format
msgid ""
"Execution succeeded: $rest\n"
@@ -15062,88 +15433,29 @@
"\n"
"\tgit rebase --continue"
-#: git-rebase--interactive.sh:667
+#: git-rebase--interactive.sh:668
#, sh-format
msgid "Unknown command: $command $sha1 $rest"
msgstr "未知命令：$command $sha1 $rest"
-#: git-rebase--interactive.sh:668
+#: git-rebase--interactive.sh:669
msgid "Please fix this using 'git rebase --edit-todo'."
msgstr "要修改请使用命令 'git rebase --edit-todo'。"
-#: git-rebase--interactive.sh:703
+#: git-rebase--interactive.sh:704
#, sh-format
msgid "Successfully rebased and updated $head_name."
msgstr "成功变基并更新 $head_name。"
-#: git-rebase--interactive.sh:750
-msgid "Could not skip unnecessary pick commands"
-msgstr "不能跳过不必要的拣选命令"
-
-#: git-rebase--interactive.sh:908
-#, sh-format
-msgid ""
-"Warning: the SHA-1 is missing or isn't a commit in the following line:\n"
-" - $line"
-msgstr ""
-"警告：缺失 SHA-1 或者在下面一行中不是一个提交：\n"
-" - $line"
-
-#: git-rebase--interactive.sh:941
-#, sh-format
-msgid ""
-"Warning: the command isn't recognized in the following line:\n"
-" - $line"
-msgstr ""
-"警告：下面一行中的命令未能被识别：\n"
-" - $line"
-
-#: git-rebase--interactive.sh:980
+#: git-rebase--interactive.sh:728
msgid "could not detach HEAD"
msgstr "不能检出为分离头指针"
-#: git-rebase--interactive.sh:1018
-msgid ""
-"Warning: some commits may have been dropped accidentally.\n"
-"Dropped commits (newer to older):"
-msgstr "警告：一些提交可能被意外丢弃。丢弃的提交（从新到旧）："
-
-#: git-rebase--interactive.sh:1026
-msgid ""
-"To avoid this message, use \"drop\" to explicitly remove a commit.\n"
-"\n"
-"Use 'git config rebase.missingCommitsCheck' to change the level of "
-"warnings.\n"
-"The possible behaviours are: ignore, warn, error."
-msgstr ""
-"为避免这条信息，使用 \"drop\" 指令显式地删除一个提交。\n"
-"\n"
-"使用 'git config rebase.missingCommitsCheck' 来修改警告级别。\n"
-"可选值有：ignore、warn、error。"
-
-#: git-rebase--interactive.sh:1037
-#, sh-format
-msgid ""
-"Unrecognized setting $check_level for option rebase.missingCommitsCheck. "
-"Ignoring."
-msgstr "选项 rebase.missingCommitsCheck 的值 $check_level 无法被识别。已忽略。"
-
-#: git-rebase--interactive.sh:1054
-msgid ""
-"You can fix this with 'git rebase --edit-todo' and then run 'git rebase --"
-"continue'."
-msgstr ""
-"您可以用 'git rebase --edit-todo' 修正问题然后执行 'git rebase --continue'。"
-
-#: git-rebase--interactive.sh:1055
-msgid "Or you can abort the rebase with 'git rebase --abort'."
-msgstr "或者您可以使用 'git rebase --abort' 命令终止变基操作。"
-
-#: git-rebase--interactive.sh:1083
+#: git-rebase--interactive.sh:763
msgid "Could not remove CHERRY_PICK_HEAD"
msgstr "不能删除 CHERRY_PICK_HEAD"
-#: git-rebase--interactive.sh:1088
+#: git-rebase--interactive.sh:768
#, sh-format
msgid ""
"You have staged changes in your working tree.\n"
@@ -15172,22 +15484,22 @@
"\n"
" git rebase --continue\n"
-#: git-rebase--interactive.sh:1105
+#: git-rebase--interactive.sh:785
msgid "Error trying to find the author identity to amend commit"
msgstr "在修补提交中查找作者信息时遇到错误"
-#: git-rebase--interactive.sh:1110
+#: git-rebase--interactive.sh:790
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--interactive.sh:1115 git-rebase--interactive.sh:1119
+#: git-rebase--interactive.sh:795 git-rebase--interactive.sh:799
msgid "Could not commit staged changes."
msgstr "不能提交暂存的修改。"
-#: git-rebase--interactive.sh:1147
+#: git-rebase--interactive.sh:827
msgid ""
"\n"
"You are editing the todo file of an ongoing interactive rebase.\n"
@@ -15196,45 +15508,49 @@
"\n"
msgstr ""
"\n"
-"您正在修改运行中的交互式变基的 todo 文件。若要在编辑结束后继续变基，\n"
+"您正在修改运行中的交互式变基待办列表。若要在编辑结束后继续变基，\n"
"请执行：\n"
" git rebase --continue\n"
"\n"
-#: git-rebase--interactive.sh:1155 git-rebase--interactive.sh:1313
+#: git-rebase--interactive.sh:835 git-rebase--interactive.sh:995
msgid "Could not execute editor"
msgstr "无法运行编辑器"
-#: git-rebase--interactive.sh:1168
+#: git-rebase--interactive.sh:848
#, sh-format
msgid "Could not checkout $switch_to"
msgstr "不能检出 $switch_to"
-#: git-rebase--interactive.sh:1173
+#: git-rebase--interactive.sh:853
msgid "No HEAD?"
msgstr "没有 HEAD？"
-#: git-rebase--interactive.sh:1174
+#: git-rebase--interactive.sh:854
#, sh-format
msgid "Could not create temporary $state_dir"
msgstr "不能创建临时 $state_dir"
-#: git-rebase--interactive.sh:1176
+#: git-rebase--interactive.sh:856
msgid "Could not mark as interactive"
msgstr "不能标记为交互式"
-#: git-rebase--interactive.sh:1186 git-rebase--interactive.sh:1191
+#: git-rebase--interactive.sh:866 git-rebase--interactive.sh:871
msgid "Could not init rewritten commits"
msgstr "不能对重写提交进行初始化"
-#: git-rebase--interactive.sh:1291
+#: git-rebase--interactive.sh:897
+msgid "Could not generate todo list"
+msgstr "无法生成待办列表"
+
+#: git-rebase--interactive.sh:973
#, 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--interactive.sh:1296
+#: git-rebase--interactive.sh:978
msgid ""
"\n"
"However, if you remove everything, the rebase will be aborted.\n"
@@ -15244,7 +15560,7 @@
"然而，如果您删除全部内容，变基操作将会终止。\n"
"\n"
-#: git-rebase--interactive.sh:1303
+#: git-rebase--interactive.sh:985
msgid "Note that empty commits are commented out"
msgstr "注意空提交已被注释掉"
@@ -15807,60 +16123,60 @@
msgid "local time offset greater than or equal to 24 hours\n"
msgstr "本地时间偏移量大于等于 24 小时\n"
-#: git-send-email.perl:208 git-send-email.perl:214
+#: git-send-email.perl:207 git-send-email.perl:213
msgid "the editor exited uncleanly, aborting everything"
msgstr "编辑器非正常退出，终止所有操作"
-#: git-send-email.perl:291
+#: git-send-email.perl:290
#, perl-format
msgid ""
"'%s' contains an intermediate version of the email you were composing.\n"
msgstr "'%s' 包含您正在编写的一个中间版本的邮件。\n"
-#: git-send-email.perl:296
+#: git-send-email.perl:295
#, perl-format
msgid "'%s.final' contains the composed email.\n"
msgstr "'%s.final' 包含编辑的邮件。\n"
-#: git-send-email.perl:314
+#: git-send-email.perl:313
msgid "--dump-aliases incompatible with other options\n"
msgstr "--dump-aliases 和其它选项不兼容\n"
-#: git-send-email.perl:379 git-send-email.perl:634
+#: git-send-email.perl:378 git-send-email.perl:629
msgid "Cannot run git format-patch from outside a repository\n"
msgstr "不能在仓库之外运行 git format-patch\n"
-#: git-send-email.perl:448
+#: git-send-email.perl:447
#, perl-format
msgid "Unknown --suppress-cc field: '%s'\n"
msgstr "未知的 --suppress-cc 字段：'%s'\n"
-#: git-send-email.perl:477
+#: git-send-email.perl:476
#, perl-format
msgid "Unknown --confirm setting: '%s'\n"
msgstr "未知的 --confirm 设置：'%s'\n"
-#: git-send-email.perl:509
+#: git-send-email.perl:504
#, perl-format
msgid "warning: sendmail alias with quotes is not supported: %s\n"
msgstr "警告：不支持带引号的 sendmail 别名：%s\n"
-#: git-send-email.perl:511
+#: git-send-email.perl:506
#, perl-format
msgid "warning: `:include:` not supported: %s\n"
msgstr "警告：不支持 `:include:`：%s\n"
-#: git-send-email.perl:513
+#: git-send-email.perl:508
#, perl-format
msgid "warning: `/file` or `|pipe` redirection not supported: %s\n"
msgstr "警告：不支持 `/file` 或 `|pipe` 重定向：%s\n"
-#: git-send-email.perl:518
+#: git-send-email.perl:513
#, perl-format
msgid "warning: sendmail line is not recognized: %s\n"
msgstr "警告：不能识别的 sendmail 行：%s\n"
-#: git-send-email.perl:600
+#: git-send-email.perl:595
#, perl-format
msgid ""
"File '%s' exists but it could also be the range of commits\n"
@@ -15875,12 +16191,12 @@
" * 如果含义为一个文件，使用 \"./%s\"，或者\n"
" * 如果含义为一个范围，使用 --format-patch 选项。\n"
-#: git-send-email.perl:621
+#: git-send-email.perl:616
#, perl-format
msgid "Failed to opendir %s: %s"
msgstr "无法打开目录 %s: %s"
-#: git-send-email.perl:645
+#: git-send-email.perl:640
#, perl-format
msgid ""
"fatal: %s: %s\n"
@@ -15889,7 +16205,7 @@
"严重：%s：%s\n"
"警告：补丁未能发送\n"
-#: git-send-email.perl:656
+#: git-send-email.perl:651
msgid ""
"\n"
"No patch files specified!\n"
@@ -15899,17 +16215,17 @@
"未指定补丁文件！\n"
"\n"
-#: git-send-email.perl:669
+#: git-send-email.perl:664
#, perl-format
msgid "No subject line in %s?"
msgstr "在 %s 中没有标题行？"
-#: git-send-email.perl:679
+#: git-send-email.perl:674
#, perl-format
msgid "Failed to open for writing %s: %s"
msgstr "无法写入 %s: %s"
-#: git-send-email.perl:689
+#: git-send-email.perl:684
msgid ""
"Lines beginning in \"GIT:\" will be removed.\n"
"Consider including an overall diffstat or table of contents\n"
@@ -15922,41 +16238,41 @@
"\n"
"如果您不想发送摘要，清除内容。\n"
-#: git-send-email.perl:712
+#: git-send-email.perl:707
#, perl-format
msgid "Failed to open %s.final: %s"
msgstr "无法打开 %s.final: %s"
-#: git-send-email.perl:715
+#: git-send-email.perl:710
#, perl-format
msgid "Failed to open %s: %s"
msgstr "无法打开 %s: %s"
-#: git-send-email.perl:750
+#: git-send-email.perl:745
msgid "To/Cc/Bcc fields are not interpreted yet, they have been ignored\n"
msgstr "To/Cc/Bcc 字段不解析，它们被忽略\n"
-#: git-send-email.perl:759
+#: git-send-email.perl:754
msgid "Summary email is empty, skipping it\n"
msgstr "摘要邮件为空，跳过\n"
#. TRANSLATORS: please keep [y/N] as is.
-#: git-send-email.perl:791
+#: git-send-email.perl:786
#, perl-format
msgid "Are you sure you want to use <%s> [y/N]? "
msgstr "您确认要使用 <%s> [y/N]？"
-#: git-send-email.perl:820
+#: git-send-email.perl:815
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:825
+#: git-send-email.perl:820
msgid "Which 8bit encoding should I declare [UTF-8]? "
msgstr "要声明 8bit 为什么样的编码格式 [UTF-8]？"
-#: git-send-email.perl:833
+#: git-send-email.perl:828
#, perl-format
msgid ""
"Refusing to send because the patch\n"
@@ -15968,20 +16284,20 @@
"\t%s\n"
"包含模版标题 '*** SUBJECT HERE ***'。如果确实想要发送，使用参数 --force。\n"
-#: git-send-email.perl:852
+#: git-send-email.perl:847
msgid "To whom should the emails be sent (if anyone)?"
msgstr "邮件将要发送给谁？"
-#: git-send-email.perl:870
+#: git-send-email.perl:865
#, perl-format
msgid "fatal: alias '%s' expands to itself\n"
msgstr "严重：别名 '%s' 扩展为它自己\n"
-#: git-send-email.perl:882
+#: git-send-email.perl:877
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:932 git-send-email.perl:940
+#: git-send-email.perl:929 git-send-email.perl:937
#, perl-format
msgid "error: unable to extract a valid address from: %s\n"
msgstr "错误：不能从 %s 中提取一个有效的邮件地址\n"
@@ -15989,16 +16305,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:944
+#: git-send-email.perl:941
msgid "What to do with this address? ([q]uit|[d]rop|[e]dit): "
msgstr "如何处理这个地址？([q]uit|[d]rop|[e]dit)："
-#: git-send-email.perl:1245
+#: git-send-email.perl:1262
#, perl-format
msgid "CA path \"%s\" does not exist"
msgstr "CA 路径 \"%s\" 不存在"
-#: git-send-email.perl:1320
+#: git-send-email.perl:1337
msgid ""
" The Cc list above has been expanded by additional\n"
" addresses found in the patch commit message. By default\n"
@@ -16023,128 +16339,179 @@
#. TRANSLATORS: Make sure to include [y] [n] [q] [a] in your
#. translation. The program will only accept English input
#. at this point.
-#: git-send-email.perl:1335
+#: git-send-email.perl:1352
msgid "Send this email? ([y]es|[n]o|[q]uit|[a]ll): "
msgstr "发送邮件？([y]es|[n]o|[q]uit|[a]ll)："
-#: git-send-email.perl:1338
+#: git-send-email.perl:1355
msgid "Send this email reply required"
msgstr "发送要求的邮件回复"
-#: git-send-email.perl:1364
+#: git-send-email.perl:1381
msgid "The required SMTP server is not properly defined."
msgstr "要求的 SMTP 服务器未被正确定义。"
-#: git-send-email.perl:1411
+#: git-send-email.perl:1428
#, perl-format
msgid "Server does not support STARTTLS! %s"
msgstr "服务器不支持 STARTTLS！%s"
-#: git-send-email.perl:1416 git-send-email.perl:1420
+#: git-send-email.perl:1433 git-send-email.perl:1437
#, perl-format
msgid "STARTTLS failed! %s"
msgstr "STARTTLS 失败！%s"
-#: git-send-email.perl:1430
+#: git-send-email.perl:1447
msgid "Unable to initialize SMTP properly. Check config and use --smtp-debug."
msgstr "无法正确地初始化 SMTP。检查配置并使用 --smtp-debug。"
-#: git-send-email.perl:1448
+#: git-send-email.perl:1465
#, perl-format
msgid "Failed to send %s\n"
msgstr "无法发送 %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Dry-Sent %s\n"
msgstr "演习发送 %s\n"
-#: git-send-email.perl:1451
+#: git-send-email.perl:1468
#, perl-format
msgid "Sent %s\n"
msgstr "正发送 %s\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "Dry-OK. Log says:\n"
msgstr "演习成功。日志说：\n"
-#: git-send-email.perl:1453
+#: git-send-email.perl:1470
msgid "OK. Log says:\n"
msgstr "OK。日志说：\n"
-#: git-send-email.perl:1465
+#: git-send-email.perl:1482
msgid "Result: "
msgstr "结果："
-#: git-send-email.perl:1468
+#: git-send-email.perl:1485
msgid "Result: OK\n"
msgstr "结果：OK\n"
-#: git-send-email.perl:1481
+#: git-send-email.perl:1498
#, perl-format
msgid "can't open file %s"
msgstr "无法打开文件 %s"
-#: git-send-email.perl:1528 git-send-email.perl:1548
+#: git-send-email.perl:1545 git-send-email.perl:1565
#, perl-format
msgid "(mbox) Adding cc: %s from line '%s'\n"
msgstr "(mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1534
+#: git-send-email.perl:1551
#, perl-format
msgid "(mbox) Adding to: %s from line '%s'\n"
msgstr "(mbox) 添加 to：%s 自行 '%s'\n"
-#: git-send-email.perl:1582
+#: git-send-email.perl:1599
#, perl-format
msgid "(non-mbox) Adding cc: %s from line '%s'\n"
msgstr "(non-mbox) 添加 cc：%s 自行 '%s'\n"
-#: git-send-email.perl:1605
+#: git-send-email.perl:1624
#, perl-format
msgid "(body) Adding cc: %s from line '%s'\n"
msgstr "(body) 添加 cc: %s 自行 '%s'\n"
-#: git-send-email.perl:1711
+#: git-send-email.perl:1730
#, perl-format
msgid "(%s) Could not execute '%s'"
msgstr "(%s) 不能执行 '%s'"
-#: git-send-email.perl:1718
+#: git-send-email.perl:1737
#, perl-format
msgid "(%s) Adding %s: %s from: '%s'\n"
msgstr "(%s) 添加 %s: %s 自：'%s'\n"
-#: git-send-email.perl:1722
+#: git-send-email.perl:1741
#, perl-format
msgid "(%s) failed to close pipe to '%s'"
msgstr "(%s) 无法关闭管道至 '%s'"
-#: git-send-email.perl:1749
+#: git-send-email.perl:1768
msgid "cannot send message as 7bit"
msgstr "不能以 7bit 形式发送信息"
-#: git-send-email.perl:1757
+#: git-send-email.perl:1776
msgid "invalid transfer encoding"
msgstr "无效的传送编码"
-#: git-send-email.perl:1795 git-send-email.perl:1846 git-send-email.perl:1856
+#: git-send-email.perl:1814 git-send-email.perl:1865 git-send-email.perl:1875
#, perl-format
msgid "unable to open %s: %s\n"
msgstr "不能打开 %s：%s\n"
-#: git-send-email.perl:1798
+#: git-send-email.perl:1817
#, perl-format
msgid "%s: patch contains a line longer than 998 characters"
msgstr "%s：补丁包含一个超过 998 字符的行"
-#: git-send-email.perl:1814
+#: git-send-email.perl:1833
#, 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:1818
+#: git-send-email.perl:1837
#, perl-format
msgid "Do you really want to send %s? [y|N]: "
msgstr "您真的要发送 %s？[y|N]："
+
+#~ msgid ""
+#~ "empty strings as pathspecs will be made invalid in upcoming releases. "
+#~ "please use . instead if you meant to match all paths"
+#~ msgstr ""
+#~ "在下一个版本中，使用空字符串作为路径规格将被视作非法。如果要匹配所有路"
+#~ "径，\n"
+#~ "请代之以 ."
+
+#~ msgid "unable to open '%s' for writing"
+#~ msgstr "无法以写入方式打开 '%s'"
+
+#~ msgid "could not truncate '%s'"
+#~ msgstr "无法截断 '%s'"
+
+#~ msgid "could not finish '%s'"
+#~ msgstr "无法结束 '%s'"
+
+#~ msgid "could not close %s"
+#~ msgstr "不能关闭 %s"
+
+#~ msgid "Copied a misnamed branch '%s' away"
+#~ msgstr "已将错误命名的分支 '%s' 复制"
+
+#~ msgid "it does not make sense to create 'HEAD' manually"
+#~ msgstr "手工创建 'HEAD' 没有意义"
+
+#~ msgid "Don't know how to clone %s"
+#~ msgstr "不知道如何克隆 %s"
+
+#~ msgid "show ignored files"
+#~ msgstr "显示忽略的文件"
+
+#~ msgid "%s is not a valid '%s' object"
+#~ msgstr "%s 不是一个有效的 '%s' 对象"
+
+#~ msgid "Don't know how to fetch from %s"
+#~ msgstr "不知道如何从 %s 获取"
+
+#~ msgid "'$term' is not a valid term"
+#~ msgstr "'$term' 不是一个有效的名称"
+
+#~ msgid ""
+#~ "error: unknown option for 'stash save': $option\n"
+#~ " To provide a message, use git stash save -- '$option'"
+#~ msgstr ""
+#~ "错误：'stash save' 的未知选项：$option\n"
+#~ " 要提供一个描述信息，使用 git stash save -- '$option'"
+
+#~ msgid "Failed to recurse into submodule path '$sm_path'"
+#~ msgstr "无法递归进子模组路径 '$sm_path'"
diff --git a/preload-index.c b/preload-index.c
index 70a4c80..2a83255 100644
--- a/preload-index.c
+++ b/preload-index.c
@@ -4,6 +4,7 @@
#include "cache.h"
#include "pathspec.h"
#include "dir.h"
+#include "fsmonitor.h"
#ifdef NO_PTHREADS
static void preload_index(struct index_state *index,
@@ -55,15 +56,18 @@
continue;
if (ce_skip_worktree(ce))
continue;
+ if (ce->ce_flags & CE_FSMONITOR_VALID)
+ continue;
if (!ce_path_match(ce, &p->pathspec, NULL))
continue;
if (threaded_has_symlink_leading_path(&cache, ce->name, ce_namelen(ce)))
continue;
if (lstat(ce->name, &st))
continue;
- if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY))
+ if (ie_match_stat(index, ce, &st, CE_MATCH_RACY_IS_DIRTY|CE_MATCH_IGNORE_FSMONITOR))
continue;
ce_mark_uptodate(ce);
+ mark_fsmonitor_valid(ce);
} while (--nr > 0);
cache_def_clear(&cache);
return NULL;
@@ -79,6 +83,8 @@
return;
threads = index->cache_nr / THREAD_COST;
+ if ((index->cache_nr > 1) && (threads < 2) && getenv("GIT_FORCE_PRELOAD_TEST"))
+ threads = 2;
if (threads < 2)
return;
if (threads > MAX_PARALLEL)
diff --git a/pretty.c b/pretty.c
index 39cad51..f7ce490 100644
--- a/pretty.c
+++ b/pretty.c
@@ -871,16 +871,6 @@
return msg;
}
-static void format_trailers(struct strbuf *sb, const char *msg)
-{
- struct trailer_info info;
-
- trailer_info_get(&info, msg);
- strbuf_add(sb, info.trailer_start,
- info.trailer_end - info.trailer_start);
- trailer_info_release(&info);
-}
-
static void parse_commit_message(struct format_commit_context *c)
{
const char *msg = c->message + c->message_off;
@@ -1066,6 +1056,24 @@
return 0;
}
+static int match_placeholder_arg(const char *to_parse, const char *candidate,
+ const char **end)
+{
+ const char *p;
+
+ if (!(skip_prefix(to_parse, candidate, &p)))
+ return 0;
+ if (*p == ',') {
+ *end = p + 1;
+ return 1;
+ }
+ if (*p == ')') {
+ *end = p;
+ return 1;
+ }
+ return 0;
+}
+
static size_t format_commit_one(struct strbuf *sb, /* in UTF-8 */
const char *placeholder,
void *context)
@@ -1074,6 +1082,7 @@
const struct commit *commit = c->commit;
const char *msg = c->message;
struct commit_list *p;
+ const char *arg;
int ch;
/* these are independent of the commit */
@@ -1177,11 +1186,11 @@
strbuf_addstr(sb, get_revision_mark(NULL, commit));
return 1;
case 'd':
- load_ref_decorations(DECORATE_SHORT_REFS);
+ load_ref_decorations(NULL, DECORATE_SHORT_REFS);
format_decorations(sb, commit, c->auto_color);
return 1;
case 'D':
- load_ref_decorations(DECORATE_SHORT_REFS);
+ load_ref_decorations(NULL, DECORATE_SHORT_REFS);
format_decorations_extended(sb, commit, c->auto_color, "", ", ", "");
return 1;
case 'g': /* reflog info */
@@ -1292,9 +1301,23 @@
return 1;
}
- if (starts_with(placeholder, "(trailers)")) {
- format_trailers(sb, msg + c->subject_off);
- return strlen("(trailers)");
+ if (skip_prefix(placeholder, "(trailers", &arg)) {
+ struct process_trailer_options opts = PROCESS_TRAILER_OPTIONS_INIT;
+ if (*arg == ':') {
+ arg++;
+ for (;;) {
+ if (match_placeholder_arg(arg, "only", &arg))
+ opts.only_trailers = 1;
+ else if (match_placeholder_arg(arg, "unfold", &arg))
+ opts.unfold = 1;
+ else
+ break;
+ }
+ }
+ if (*arg == ')') {
+ format_trailers_from_commit(sb, msg + c->subject_off, &opts);
+ return arg - placeholder + 1;
+ }
}
return 0; /* unknown placeholder */
diff --git a/pretty.h b/pretty.h
new file mode 100644
index 0000000..5c85d94
--- /dev/null
+++ b/pretty.h
@@ -0,0 +1,131 @@
+#ifndef PRETTY_H
+#define PRETTY_H
+
+struct commit;
+
+/* Commit formats */
+enum cmit_fmt {
+ CMIT_FMT_RAW,
+ CMIT_FMT_MEDIUM,
+ CMIT_FMT_DEFAULT = CMIT_FMT_MEDIUM,
+ CMIT_FMT_SHORT,
+ CMIT_FMT_FULL,
+ CMIT_FMT_FULLER,
+ CMIT_FMT_ONELINE,
+ CMIT_FMT_EMAIL,
+ CMIT_FMT_MBOXRD,
+ CMIT_FMT_USERFORMAT,
+
+ CMIT_FMT_UNSPECIFIED
+};
+
+struct pretty_print_context {
+ /*
+ * Callers should tweak these to change the behavior of pp_* functions.
+ */
+ enum cmit_fmt fmt;
+ int abbrev;
+ const char *after_subject;
+ int preserve_subject;
+ struct date_mode date_mode;
+ unsigned date_mode_explicit:1;
+ int print_email_subject;
+ int expand_tabs_in_log;
+ int need_8bit_cte;
+ char *notes_message;
+ struct reflog_walk_info *reflog_info;
+ struct rev_info *rev;
+ const char *output_encoding;
+ struct string_list *mailmap;
+ int color;
+ struct ident_split *from_ident;
+
+ /*
+ * Fields below here are manipulated internally by pp_* functions and
+ * should not be counted on by callers.
+ */
+ struct string_list in_body_headers;
+ int graph_width;
+};
+
+/* Check whether commit format is mail. */
+static inline int cmit_fmt_is_mail(enum cmit_fmt fmt)
+{
+ return (fmt == CMIT_FMT_EMAIL || fmt == CMIT_FMT_MBOXRD);
+}
+
+struct userformat_want {
+ unsigned notes:1;
+};
+
+/* Set the flag "w->notes" if there is placeholder %N in "fmt". */
+void userformat_find_requirements(const char *fmt, struct userformat_want *w);
+
+/*
+ * Shortcut for invoking pretty_print_commit if we do not have any context.
+ * Context would be set empty except "fmt".
+ */
+void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit,
+ struct strbuf *sb);
+
+/*
+ * Get information about user and date from "line", format it and
+ * put it into "sb".
+ * Format of "line" must be readable for split_ident_line function.
+ * The resulting format is "what: name <email> date".
+ */
+void pp_user_info(struct pretty_print_context *pp, const char *what,
+ struct strbuf *sb, const char *line,
+ const char *encoding);
+
+/*
+ * Format title line of commit message taken from "msg_p" and
+ * put it into "sb".
+ * First line of "msg_p" is also affected.
+ */
+void pp_title_line(struct pretty_print_context *pp, const char **msg_p,
+ struct strbuf *sb, const char *encoding,
+ int need_8bit_cte);
+
+/*
+ * Get current state of commit message from "msg_p" and continue formatting
+ * by adding indentation and '>' signs. Put result into "sb".
+ */
+void pp_remainder(struct pretty_print_context *pp, const char **msg_p,
+ struct strbuf *sb, int indent);
+
+/*
+ * Create a text message about commit using given "format" and "context".
+ * Put the result to "sb".
+ * Please use this function for custom formats.
+ */
+void format_commit_message(const struct commit *commit,
+ const char *format, struct strbuf *sb,
+ const struct pretty_print_context *context);
+
+/*
+ * Parse given arguments from "arg", check it for correctness and
+ * fill struct rev_info.
+ */
+void get_commit_format(const char *arg, struct rev_info *);
+
+/*
+ * Make a commit message with all rules from given "pp"
+ * and put it into "sb".
+ * Please use this function if you have a context (candidate for "pp").
+ */
+void pretty_print_commit(struct pretty_print_context *pp,
+ const struct commit *commit,
+ struct strbuf *sb);
+
+/*
+ * Change line breaks in "msg" to "line_separator" and put it into "sb".
+ * Return "msg" itself.
+ */
+const char *format_subject(struct strbuf *sb, const char *msg,
+ const char *line_separator);
+
+/* Check if "cmit_fmt" will produce an empty output. */
+int commit_format_is_empty(enum cmit_fmt);
+
+#endif /* PRETTY_H */
diff --git a/progress.c b/progress.c
index 73e36d4..5a99c9f 100644
--- a/progress.c
+++ b/progress.c
@@ -30,11 +30,10 @@
struct progress {
const char *title;
- int last_value;
- unsigned total;
+ uint64_t last_value;
+ uint64_t total;
unsigned last_percent;
unsigned delay;
- unsigned delayed_percent_treshold;
struct throughput *throughput;
uint64_t start_ns;
};
@@ -79,24 +78,12 @@
return tpgrp < 0 || tpgrp == getpgid(0);
}
-static int display(struct progress *progress, unsigned n, const char *done)
+static int display(struct progress *progress, uint64_t n, const char *done)
{
const char *eol, *tp;
- if (progress->delay) {
- if (!progress_update || --progress->delay)
- return 0;
- if (progress->total) {
- unsigned percent = n * 100 / progress->total;
- if (percent > progress->delayed_percent_treshold) {
- /* inhibit this progress report entirely */
- clear_progress_signal();
- progress->delay = -1;
- progress->total = 0;
- return 0;
- }
- }
- }
+ if (progress->delay && (!progress_update || --progress->delay))
+ return 0;
progress->last_value = n;
tp = (progress->throughput) ? progress->throughput->display.buf : "";
@@ -106,9 +93,10 @@
if (percent != progress->last_percent || progress_update) {
progress->last_percent = percent;
if (is_foreground_fd(fileno(stderr)) || done) {
- fprintf(stderr, "%s: %3u%% (%u/%u)%s%s",
- progress->title, percent, n,
- progress->total, tp, eol);
+ fprintf(stderr, "%s: %3u%% (%"PRIuMAX"/%"PRIuMAX")%s%s",
+ progress->title, percent,
+ (uintmax_t)n, (uintmax_t)progress->total,
+ tp, eol);
fflush(stderr);
}
progress_update = 0;
@@ -116,8 +104,8 @@
}
} else if (progress_update) {
if (is_foreground_fd(fileno(stderr)) || done) {
- fprintf(stderr, "%s: %u%s%s",
- progress->title, n, tp, eol);
+ fprintf(stderr, "%s: %"PRIuMAX"%s%s",
+ progress->title, (uintmax_t)n, tp, eol);
fflush(stderr);
}
progress_update = 0;
@@ -127,7 +115,7 @@
return 0;
}
-static void throughput_string(struct strbuf *buf, off_t total,
+static void throughput_string(struct strbuf *buf, uint64_t total,
unsigned int rate)
{
strbuf_reset(buf);
@@ -138,7 +126,7 @@
strbuf_addstr(buf, "/s");
}
-void display_throughput(struct progress *progress, off_t total)
+void display_throughput(struct progress *progress, uint64_t total)
{
struct throughput *tp;
uint64_t now_ns;
@@ -200,13 +188,13 @@
display(progress, progress->last_value, NULL);
}
-int display_progress(struct progress *progress, unsigned n)
+int display_progress(struct progress *progress, uint64_t n)
{
return progress ? display(progress, n, NULL) : 0;
}
-struct progress *start_progress_delay(const char *title, unsigned total,
- unsigned percent_treshold, unsigned delay)
+static struct progress *start_progress_delay(const char *title, uint64_t total,
+ unsigned delay)
{
struct progress *progress = malloc(sizeof(*progress));
if (!progress) {
@@ -219,7 +207,6 @@
progress->total = total;
progress->last_value = -1;
progress->last_percent = -1;
- progress->delayed_percent_treshold = percent_treshold;
progress->delay = delay;
progress->throughput = NULL;
progress->start_ns = getnanotime();
@@ -227,9 +214,14 @@
return progress;
}
-struct progress *start_progress(const char *title, unsigned total)
+struct progress *start_delayed_progress(const char *title, uint64_t total)
{
- return start_progress_delay(title, total, 0, 0);
+ return start_progress_delay(title, total, 2);
+}
+
+struct progress *start_progress(const char *title, uint64_t total)
+{
+ return start_progress_delay(title, total, 0);
}
void stop_progress(struct progress **p_progress)
diff --git a/progress.h b/progress.h
index 611e4c4..70a4d4a 100644
--- a/progress.h
+++ b/progress.h
@@ -3,11 +3,10 @@
struct progress;
-void display_throughput(struct progress *progress, off_t total);
-int display_progress(struct progress *progress, unsigned n);
-struct progress *start_progress(const char *title, unsigned total);
-struct progress *start_progress_delay(const char *title, unsigned total,
- unsigned percent_treshold, unsigned delay);
+void display_throughput(struct progress *progress, uint64_t total);
+int display_progress(struct progress *progress, uint64_t n);
+struct progress *start_progress(const char *title, uint64_t total);
+struct progress *start_delayed_progress(const char *title, uint64_t total);
void stop_progress(struct progress **progress);
void stop_progress_msg(struct progress **progress, const char *msg);
diff --git a/protocol.c b/protocol.c
new file mode 100644
index 0000000..43012b7
--- /dev/null
+++ b/protocol.c
@@ -0,0 +1,79 @@
+#include "cache.h"
+#include "config.h"
+#include "protocol.h"
+
+static enum protocol_version parse_protocol_version(const char *value)
+{
+ if (!strcmp(value, "0"))
+ return protocol_v0;
+ else if (!strcmp(value, "1"))
+ return protocol_v1;
+ else
+ return protocol_unknown_version;
+}
+
+enum protocol_version get_protocol_version_config(void)
+{
+ const char *value;
+ if (!git_config_get_string_const("protocol.version", &value)) {
+ enum protocol_version version = parse_protocol_version(value);
+
+ if (version == protocol_unknown_version)
+ die("unknown value for config 'protocol.version': %s",
+ value);
+
+ return version;
+ }
+
+ return protocol_v0;
+}
+
+enum protocol_version determine_protocol_version_server(void)
+{
+ const char *git_protocol = getenv(GIT_PROTOCOL_ENVIRONMENT);
+ enum protocol_version version = protocol_v0;
+
+ /*
+ * Determine which protocol version the client has requested. Since
+ * multiple 'version' keys can be sent by the client, indicating that
+ * the client is okay to speak any of them, select the greatest version
+ * that the client has requested. This is due to the assumption that
+ * the most recent protocol version will be the most state-of-the-art.
+ */
+ if (git_protocol) {
+ struct string_list list = STRING_LIST_INIT_DUP;
+ const struct string_list_item *item;
+ string_list_split(&list, git_protocol, ':', -1);
+
+ for_each_string_list_item(item, &list) {
+ const char *value;
+ enum protocol_version v;
+
+ if (skip_prefix(item->string, "version=", &value)) {
+ v = parse_protocol_version(value);
+ if (v > version)
+ version = v;
+ }
+ }
+
+ string_list_clear(&list, 0);
+ }
+
+ return version;
+}
+
+enum protocol_version determine_protocol_version_client(const char *server_response)
+{
+ enum protocol_version version = protocol_v0;
+
+ if (skip_prefix(server_response, "version ", &server_response)) {
+ version = parse_protocol_version(server_response);
+
+ if (version == protocol_unknown_version)
+ die("server is speaking an unknown protocol");
+ if (version == protocol_v0)
+ die("protocol error: server explicitly said version 0");
+ }
+
+ return version;
+}
diff --git a/protocol.h b/protocol.h
new file mode 100644
index 0000000..1b2bc94
--- /dev/null
+++ b/protocol.h
@@ -0,0 +1,33 @@
+#ifndef PROTOCOL_H
+#define PROTOCOL_H
+
+enum protocol_version {
+ protocol_unknown_version = -1,
+ protocol_v0 = 0,
+ protocol_v1 = 1,
+};
+
+/*
+ * Used by a client to determine which protocol version to request be used when
+ * communicating with a server, reflecting the configured value of the
+ * 'protocol.version' config. If unconfigured, a value of 'protocol_v0' is
+ * returned.
+ */
+extern enum protocol_version get_protocol_version_config(void);
+
+/*
+ * Used by a server to determine which protocol version should be used based on
+ * a client's request, communicated via the 'GIT_PROTOCOL' environment variable
+ * by setting appropriate values for the key 'version'. If a client doesn't
+ * request a particular protocol version, a default of 'protocol_v0' will be
+ * used.
+ */
+extern enum protocol_version determine_protocol_version_server(void);
+
+/*
+ * Used by a client to determine which protocol version the server is speaking
+ * based on the server's initial response.
+ */
+extern enum protocol_version determine_protocol_version_client(const char *server_response);
+
+#endif /* PROTOCOL_H */
diff --git a/quote.c b/quote.c
index 53b98a5..de2922d 100644
--- a/quote.c
+++ b/quote.c
@@ -431,6 +431,7 @@
case '{': case '}':
case '$': case '\\': case '"':
strbuf_addch(sb, '\\');
+ /* fallthrough */
default:
strbuf_addch(sb, c);
break;
diff --git a/reachable.c b/reachable.c
index c62efbf..88d7d67 100644
--- a/reachable.c
+++ b/reachable.c
@@ -9,6 +9,8 @@
#include "cache-tree.h"
#include "progress.h"
#include "list-objects.h"
+#include "packfile.h"
+#include "worktree.h"
struct connectivity_progress {
struct progress *progress;
@@ -176,6 +178,7 @@
/* detached HEAD is not included in the list above */
head_ref(add_one_ref, revs);
+ other_head_refs(add_one_ref, revs);
/* Add all reflog info */
if (mark_reflog)
diff --git a/read-cache.c b/read-cache.c
index 5e6d24d..198e72b 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -19,6 +19,7 @@
#include "varint.h"
#include "split-index.h"
#include "utf8.h"
+#include "fsmonitor.h"
/* Mask for the name length in ce_flags in the on-disk index */
@@ -38,11 +39,12 @@
#define CACHE_EXT_RESOLVE_UNDO 0x52455543 /* "REUC" */
#define CACHE_EXT_LINK 0x6c696e6b /* "link" */
#define CACHE_EXT_UNTRACKED 0x554E5452 /* "UNTR" */
+#define CACHE_EXT_FSMONITOR 0x46534D4E /* "FSMN" */
/* changes that can be kept in $GIT_DIR/index (basically all extensions) */
#define EXTMASK (RESOLVE_UNDO_CHANGED | CACHE_TREE_CHANGED | \
CE_ENTRY_ADDED | CE_ENTRY_REMOVED | CE_ENTRY_CHANGED | \
- SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED)
+ SPLIT_INDEX_ORDERED | UNTRACKED_CHANGED | FSMONITOR_CHANGED)
struct index_state the_index;
static const char *alternate_index_output;
@@ -62,6 +64,7 @@
free(old);
set_index_entry(istate, nr, ce);
ce->ce_flags |= CE_UPDATE_IN_BASE;
+ mark_fsmonitor_invalid(istate, ce);
istate->cache_changed |= CE_ENTRY_CHANGED;
}
@@ -150,8 +153,10 @@
if (assume_unchanged)
ce->ce_flags |= CE_VALID;
- if (S_ISREG(st->st_mode))
+ if (S_ISREG(st->st_mode)) {
ce_mark_uptodate(ce);
+ mark_fsmonitor_valid(ce);
+ }
}
static int ce_compare_data(const struct cache_entry *ce, struct stat *st)
@@ -160,9 +165,9 @@
int fd = git_open_cloexec(ce->name, O_RDONLY);
if (fd >= 0) {
- unsigned char sha1[20];
- if (!index_fd(sha1, fd, st, OBJ_BLOB, ce->name, 0))
- match = hashcmp(sha1, ce->oid.hash);
+ struct object_id oid;
+ if (!index_fd(&oid, fd, st, OBJ_BLOB, ce->name, 0))
+ match = oidcmp(&oid, &ce->oid);
/* index_fd() closed the file descriptor already */
}
return match;
@@ -191,7 +196,7 @@
static int ce_compare_gitlink(const struct cache_entry *ce)
{
- unsigned char sha1[20];
+ struct object_id oid;
/*
* We don't actually require that the .git directory
@@ -201,9 +206,9 @@
*
* If so, we consider it always to match.
*/
- if (resolve_gitlink_ref(ce->name, "HEAD", sha1) < 0)
+ if (resolve_gitlink_ref(ce->name, "HEAD", &oid) < 0)
return 0;
- return hashcmp(sha1, ce->oid.hash);
+ return oidcmp(&oid, &ce->oid);
}
static int ce_modified_check_fs(const struct cache_entry *ce, struct stat *st)
@@ -220,6 +225,7 @@
case S_IFDIR:
if (S_ISGITLINK(ce->ce_mode))
return ce_compare_gitlink(ce) ? DATA_CHANGED : 0;
+ /* else fallthrough */
default:
return TYPE_CHANGED;
}
@@ -300,7 +306,7 @@
return match_stat_data(sd, st);
}
-int ie_match_stat(const struct index_state *istate,
+int ie_match_stat(struct index_state *istate,
const struct cache_entry *ce, struct stat *st,
unsigned int options)
{
@@ -308,7 +314,10 @@
int ignore_valid = options & CE_MATCH_IGNORE_VALID;
int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
int assume_racy_is_modified = options & CE_MATCH_RACY_IS_DIRTY;
+ int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
+ if (!ignore_fsmonitor)
+ refresh_fsmonitor(istate);
/*
* If it's marked as always valid in the index, it's
* valid whatever the checked-out copy says.
@@ -319,6 +328,8 @@
return 0;
if (!ignore_valid && (ce->ce_flags & CE_VALID))
return 0;
+ if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID))
+ return 0;
/*
* Intent-to-add entries have not been added, so the index entry
@@ -356,7 +367,7 @@
return changed;
}
-int ie_modified(const struct index_state *istate,
+int ie_modified(struct index_state *istate,
const struct cache_entry *ce,
struct stat *st, unsigned int options)
{
@@ -630,13 +641,17 @@
{
int size, namelen, was_same;
mode_t st_mode = st->st_mode;
- struct cache_entry *ce, *alias;
+ struct cache_entry *ce, *alias = NULL;
unsigned ce_option = CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE|CE_MATCH_RACY_IS_DIRTY;
int verbose = flags & (ADD_CACHE_VERBOSE | ADD_CACHE_PRETEND);
int pretend = flags & ADD_CACHE_PRETEND;
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 newflags = HASH_WRITE_OBJECT;
+
+ if (flags & HASH_RENORMALIZE)
+ newflags |= HASH_RENORMALIZE;
if (!S_ISREG(st_mode) && !S_ISLNK(st_mode) && !S_ISDIR(st_mode))
return error("%s: can only add regular files, symbolic links or git-directories", path);
@@ -677,19 +692,23 @@
if (ignore_case) {
adjust_dirname_case(istate, ce->name);
}
+ if (!(flags & HASH_RENORMALIZE)) {
+ alias = index_file_exists(istate, ce->name,
+ ce_namelen(ce), ignore_case);
+ if (alias &&
+ !ce_stage(alias) &&
+ !ie_match_stat(istate, alias, st, ce_option)) {
+ /* Nothing changed, really */
+ if (!S_ISGITLINK(alias->ce_mode))
+ ce_mark_uptodate(alias);
+ alias->ce_flags |= CE_ADDED;
- alias = index_file_exists(istate, ce->name, ce_namelen(ce), ignore_case);
- if (alias && !ce_stage(alias) && !ie_match_stat(istate, alias, st, ce_option)) {
- /* Nothing changed, really */
- if (!S_ISGITLINK(alias->ce_mode))
- ce_mark_uptodate(alias);
- alias->ce_flags |= CE_ADDED;
-
- free(ce);
- return 0;
+ free(ce);
+ return 0;
+ }
}
if (!intent_only) {
- if (index_path(ce->oid.hash, path, st, HASH_WRITE_OBJECT)) {
+ if (index_path(&ce->oid, path, st, newflags)) {
free(ce);
return error("unable to index file %s", path);
}
@@ -777,6 +796,7 @@
}
cache_tree_invalidate_path(istate, ce->name);
ce->ce_flags |= CE_UPDATE_IN_BASE;
+ mark_fsmonitor_invalid(istate, ce);
istate->cache_changed |= CE_ENTRY_CHANGED;
return 0;
@@ -1228,10 +1248,13 @@
int ignore_valid = options & CE_MATCH_IGNORE_VALID;
int ignore_skip_worktree = options & CE_MATCH_IGNORE_SKIP_WORKTREE;
int ignore_missing = options & CE_MATCH_IGNORE_MISSING;
+ int ignore_fsmonitor = options & CE_MATCH_IGNORE_FSMONITOR;
if (!refresh || ce_uptodate(ce))
return ce;
+ if (!ignore_fsmonitor)
+ refresh_fsmonitor(istate);
/*
* CE_VALID or CE_SKIP_WORKTREE means the user promised us
* that the change to the work tree does not matter and told
@@ -1245,6 +1268,10 @@
ce_mark_uptodate(ce);
return ce;
}
+ if (!ignore_fsmonitor && (ce->ce_flags & CE_FSMONITOR_VALID)) {
+ ce_mark_uptodate(ce);
+ return ce;
+ }
if (has_symlink_leading_path(ce->name, ce_namelen(ce))) {
if (ignore_missing)
@@ -1282,8 +1309,10 @@
* because CE_UPTODATE flag is in-core only;
* we are not going to write this change out.
*/
- if (!S_ISGITLINK(ce->ce_mode))
+ if (!S_ISGITLINK(ce->ce_mode)) {
ce_mark_uptodate(ce);
+ mark_fsmonitor_valid(ce);
+ }
return ce;
}
}
@@ -1391,6 +1420,7 @@
*/
ce->ce_flags &= ~CE_VALID;
ce->ce_flags |= CE_UPDATE_IN_BASE;
+ mark_fsmonitor_invalid(istate, ce);
istate->cache_changed |= CE_ENTRY_CHANGED;
}
if (quiet)
@@ -1499,6 +1529,7 @@
};
/* These are only used for v3 or lower */
+#define align_padding_size(size, len) ((size + (len) + 8) & ~7) - (size + len)
#define align_flex_name(STRUCT,len) ((offsetof(struct STRUCT,name) + (len) + 8) & ~7)
#define ondisk_cache_entry_size(len) align_flex_name(ondisk_cache_entry,len)
#define ondisk_cache_entry_extended_size(len) align_flex_name(ondisk_cache_entry_extended,len)
@@ -1509,6 +1540,9 @@
/* Allow fsck to force verification of the index checksum. */
int verify_index_checksum;
+/* Allow fsck to force verification of the cache entry order. */
+int verify_ce_order;
+
static int verify_hdr(struct cache_header *hdr, unsigned long size)
{
git_SHA_CTX c;
@@ -1549,6 +1583,9 @@
case CACHE_EXT_UNTRACKED:
istate->untracked = read_untracked_extension(data, sz);
break;
+ case CACHE_EXT_FSMONITOR:
+ read_fsmonitor_extension(istate, data, sz);
+ break;
default:
if (*ext < 'A' || 'Z' < *ext)
return error("index uses %.4s extension, which we do not understand",
@@ -1566,7 +1603,7 @@
int read_index(struct index_state *istate)
{
- return read_index_from(istate, get_index_file());
+ return read_index_from(istate, get_index_file(), get_git_dir());
}
static struct cache_entry *cache_entry_from_ondisk(struct ondisk_cache_entry *ondisk,
@@ -1666,6 +1703,9 @@
{
unsigned int i;
+ if (!verify_ce_order)
+ return;
+
for (i = 1; i < istate->cache_nr; i++) {
struct cache_entry *ce = istate->cache[i - 1];
struct cache_entry *next_ce = istate->cache[i];
@@ -1721,6 +1761,7 @@
check_ce_order(istate);
tweak_untracked_cache(istate);
tweak_split_index(istate);
+ tweak_fsmonitor(istate);
}
/* remember to discard_cache() before reading a different cache! */
@@ -1822,20 +1863,19 @@
* This way, shared index can be removed if they have not been used
* for some time.
*/
-static void freshen_shared_index(char *base_sha1_hex, int warn)
+static void freshen_shared_index(const char *shared_index, int warn)
{
- char *shared_index = git_pathdup("sharedindex.%s", base_sha1_hex);
if (!check_and_freshen_file(shared_index, 1) && warn)
warning("could not freshen shared index '%s'", shared_index);
- free(shared_index);
}
-int read_index_from(struct index_state *istate, const char *path)
+int read_index_from(struct index_state *istate, const char *path,
+ const char *gitdir)
{
struct split_index *split_index;
int ret;
char *base_sha1_hex;
- const char *base_path;
+ char *base_path;
/* istate->initialized covers both .git/index and .git/sharedindex.xxx */
if (istate->initialized)
@@ -1855,16 +1895,17 @@
split_index->base = xcalloc(1, sizeof(*split_index->base));
base_sha1_hex = sha1_to_hex(split_index->base_sha1);
- base_path = git_path("sharedindex.%s", base_sha1_hex);
+ base_path = xstrfmt("%s/sharedindex.%s", gitdir, base_sha1_hex);
ret = do_read_index(split_index->base, base_path, 1);
if (hashcmp(split_index->base_sha1, split_index->base->sha1))
die("broken index, expect %s in %s, got %s",
base_sha1_hex, base_path,
sha1_to_hex(split_index->base->sha1));
- freshen_shared_index(base_sha1_hex, 0);
+ freshen_shared_index(base_path, 0);
merge_base_index(istate);
post_read_index_from(istate);
+ free(base_path);
return ret;
}
@@ -2032,7 +2073,7 @@
}
/* Copy miscellaneous fields but not the name */
-static char *copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
+static void copy_cache_entry_to_ondisk(struct ondisk_cache_entry *ondisk,
struct cache_entry *ce)
{
short flags;
@@ -2056,32 +2097,35 @@
struct ondisk_cache_entry_extended *ondisk2;
ondisk2 = (struct ondisk_cache_entry_extended *)ondisk;
ondisk2->flags2 = htons((ce->ce_flags & CE_EXTENDED_FLAGS) >> 16);
- return ondisk2->name;
- }
- else {
- return ondisk->name;
}
}
static int ce_write_entry(git_SHA_CTX *c, int fd, struct cache_entry *ce,
- struct strbuf *previous_name)
+ struct strbuf *previous_name, struct ondisk_cache_entry *ondisk)
{
int size;
- struct ondisk_cache_entry *ondisk;
int saved_namelen = saved_namelen; /* compiler workaround */
- char *name;
int result;
+ static unsigned char padding[8] = { 0x00 };
if (ce->ce_flags & CE_STRIP_NAME) {
saved_namelen = ce_namelen(ce);
ce->ce_namelen = 0;
}
+ if (ce->ce_flags & CE_EXTENDED)
+ size = offsetof(struct ondisk_cache_entry_extended, name);
+ else
+ size = offsetof(struct ondisk_cache_entry, name);
+
if (!previous_name) {
- size = ondisk_ce_size(ce);
- ondisk = xcalloc(1, size);
- name = copy_cache_entry_to_ondisk(ondisk, ce);
- memcpy(name, ce->name, ce_namelen(ce));
+ int len = ce_namelen(ce);
+ copy_cache_entry_to_ondisk(ondisk, ce);
+ result = ce_write(c, fd, ondisk, size);
+ if (!result)
+ result = ce_write(c, fd, ce->name, len);
+ if (!result)
+ result = ce_write(c, fd, padding, align_padding_size(size, len));
} else {
int common, to_remove, prefix_size;
unsigned char to_remove_vi[16];
@@ -2094,16 +2138,14 @@
to_remove = previous_name->len - common;
prefix_size = encode_varint(to_remove, to_remove_vi);
- if (ce->ce_flags & CE_EXTENDED)
- size = offsetof(struct ondisk_cache_entry_extended, name);
- else
- size = offsetof(struct ondisk_cache_entry, name);
- size += prefix_size + (ce_namelen(ce) - common + 1);
-
- ondisk = xcalloc(1, size);
- name = copy_cache_entry_to_ondisk(ondisk, ce);
- memcpy(name, to_remove_vi, prefix_size);
- memcpy(name + prefix_size, ce->name + common, ce_namelen(ce) - common);
+ copy_cache_entry_to_ondisk(ondisk, ce);
+ result = ce_write(c, fd, ondisk, size);
+ if (!result)
+ result = ce_write(c, fd, to_remove_vi, prefix_size);
+ if (!result)
+ result = ce_write(c, fd, ce->name + common, ce_namelen(ce) - common);
+ if (!result)
+ result = ce_write(c, fd, padding, 1);
strbuf_splice(previous_name, common, to_remove,
ce->name + common, ce_namelen(ce) - common);
@@ -2113,8 +2155,6 @@
ce->ce_flags &= ~CE_STRIP_NAME;
}
- result = ce_write(c, fd, ondisk, size);
- free(ondisk);
return result;
}
@@ -2175,29 +2215,35 @@
return 0;
}
-/*
- * Opportunistically update the index but do not complain if we can't
- */
void update_index_if_able(struct index_state *istate, struct lock_file *lockfile)
{
if ((istate->cache_changed || has_racy_timestamp(istate)) &&
- verify_index(istate) &&
- write_locked_index(istate, lockfile, COMMIT_LOCK))
+ verify_index(istate))
+ write_locked_index(istate, lockfile, COMMIT_LOCK);
+ else
rollback_lock_file(lockfile);
}
+/*
+ * On success, `tempfile` is closed. If it is the temporary file
+ * of a `struct lock_file`, we will therefore effectively perform
+ * a 'close_lock_file_gently()`. Since that is an implementation
+ * detail of lockfiles, callers of `do_write_index()` should not
+ * rely on it.
+ */
static int do_write_index(struct index_state *istate, struct tempfile *tempfile,
int strip_extensions)
{
int newfd = tempfile->fd;
git_SHA_CTX c;
struct cache_header hdr;
- int i, err, removed, extended, hdr_version;
+ int i, err = 0, removed, extended, hdr_version;
struct cache_entry **cache = istate->cache;
int entries = istate->cache_nr;
struct stat st;
+ struct ondisk_cache_entry_extended ondisk;
struct strbuf previous_name_buf = STRBUF_INIT, *previous_name;
- int drop_cache_tree = 0;
+ int drop_cache_tree = istate->drop_cache_tree;
for (i = removed = extended = 0; i < entries; i++) {
if (cache[i]->ce_flags & CE_REMOVE)
@@ -2232,6 +2278,7 @@
return -1;
previous_name = (hdr_version == 4) ? &previous_name_buf : NULL;
+
for (i = 0; i < entries; i++) {
struct cache_entry *ce = cache[i];
if (ce->ce_flags & CE_REMOVE)
@@ -2247,15 +2294,21 @@
if (allow)
warning(msg, ce->name);
else
- return error(msg, ce->name);
+ err = error(msg, ce->name);
drop_cache_tree = 1;
}
- if (ce_write_entry(&c, newfd, ce, previous_name) < 0)
- return -1;
+ if (ce_write_entry(&c, newfd, ce, previous_name, (struct ondisk_cache_entry *)&ondisk) < 0)
+ err = -1;
+
+ if (err)
+ break;
}
strbuf_release(&previous_name_buf);
+ if (err)
+ return err;
+
/* Write extension data here */
if (!strip_extensions && istate->split_index) {
struct strbuf sb = STRBUF_INIT;
@@ -2300,11 +2353,23 @@
if (err)
return -1;
}
+ if (!strip_extensions && istate->fsmonitor_last_update) {
+ struct strbuf sb = STRBUF_INIT;
+
+ write_fsmonitor_extension(&sb, istate);
+ err = write_index_ext_header(&c, newfd, CACHE_EXT_FSMONITOR, sb.len) < 0
+ || ce_write(&c, newfd, sb.buf, sb.len) < 0;
+ strbuf_release(&sb);
+ if (err)
+ return -1;
+ }
if (ce_flush(&c, newfd, istate->sha1))
return -1;
- if (close_tempfile(tempfile))
- return error(_("could not close '%s'"), tempfile->filename.buf);
+ if (close_tempfile_gently(tempfile)) {
+ error(_("could not close '%s'"), tempfile->filename.buf);
+ return -1;
+ }
if (stat(tempfile->filename.buf, &st))
return -1;
istate->timestamp.sec = (unsigned int)st.st_mtime;
@@ -2328,17 +2393,12 @@
static int do_write_locked_index(struct index_state *istate, struct lock_file *lock,
unsigned flags)
{
- int ret = do_write_index(istate, &lock->tempfile, 0);
+ int ret = do_write_index(istate, lock->tempfile, 0);
if (ret)
return ret;
- assert((flags & (COMMIT_LOCK | CLOSE_LOCK)) !=
- (COMMIT_LOCK | CLOSE_LOCK));
if (flags & COMMIT_LOCK)
return commit_locked_index(lock);
- else if (flags & CLOSE_LOCK)
- return close_lock_file(lock);
- else
- return ret;
+ return close_lock_file_gently(lock);
}
static int write_split_index(struct index_state *istate,
@@ -2411,34 +2471,22 @@
return 0;
}
-static struct tempfile temporary_sharedindex;
-
static int write_shared_index(struct index_state *istate,
- struct lock_file *lock, unsigned flags)
+ struct tempfile **temp)
{
struct split_index *si = istate->split_index;
- int fd, ret;
+ int ret;
- fd = mks_tempfile(&temporary_sharedindex, git_path("sharedindex_XXXXXX"));
- if (fd < 0) {
- hashclr(si->base_sha1);
- return do_write_locked_index(istate, lock, flags);
- }
move_cache_to_base_index(istate);
- ret = do_write_index(si->base, &temporary_sharedindex, 1);
+ ret = do_write_index(si->base, *temp, 1);
+ if (ret)
+ return ret;
+ ret = adjust_shared_perm(get_tempfile_path(*temp));
if (ret) {
- delete_tempfile(&temporary_sharedindex);
+ error("cannot fix permission bits on %s", get_tempfile_path(*temp));
return ret;
}
- ret = adjust_shared_perm(get_tempfile_path(&temporary_sharedindex));
- if (ret) {
- int save_errno = errno;
- error("cannot fix permission bits on %s", get_tempfile_path(&temporary_sharedindex));
- delete_tempfile(&temporary_sharedindex);
- errno = save_errno;
- return ret;
- }
- ret = rename_tempfile(&temporary_sharedindex,
+ ret = rename_tempfile(temp,
git_path("sharedindex.%s", sha1_to_hex(si->base->sha1)));
if (!ret) {
hashcpy(si->base_sha1, si->base->sha1);
@@ -2484,11 +2532,15 @@
int new_shared_index, ret;
struct split_index *si = istate->split_index;
+ if (istate->fsmonitor_last_update)
+ fill_fsmonitor_bitmap(istate);
+
if (!si || alternate_index_output ||
(istate->cache_changed & ~EXTMASK)) {
if (si)
hashclr(si->base_sha1);
- return do_write_locked_index(istate, lock, flags);
+ ret = do_write_locked_index(istate, lock, flags);
+ goto out;
}
if (getenv("GIT_TEST_SPLIT_INDEX")) {
@@ -2502,17 +2554,38 @@
new_shared_index = istate->cache_changed & SPLIT_INDEX_ORDERED;
if (new_shared_index) {
- ret = write_shared_index(istate, lock, flags);
+ struct tempfile *temp;
+ int saved_errno;
+
+ temp = mks_tempfile(git_path("sharedindex_XXXXXX"));
+ if (!temp) {
+ hashclr(si->base_sha1);
+ ret = do_write_locked_index(istate, lock, flags);
+ goto out;
+ }
+ ret = write_shared_index(istate, &temp);
+
+ saved_errno = errno;
+ if (is_tempfile_active(temp))
+ delete_tempfile(&temp);
+ errno = saved_errno;
+
if (ret)
- return ret;
+ goto out;
}
ret = write_split_index(istate, lock, flags);
/* Freshen the shared index only if the split-index was written */
- if (!ret && !new_shared_index)
- freshen_shared_index(sha1_to_hex(si->base_sha1), 1);
+ if (!ret && !new_shared_index) {
+ const char *shared_index = git_path("sharedindex.%s",
+ sha1_to_hex(si->base_sha1));
+ freshen_shared_index(shared_index, 1);
+ }
+out:
+ if (flags & COMMIT_LOCK)
+ rollback_lock_file(lock);
return ret;
}
diff --git a/ref-filter.c b/ref-filter.c
index f3e53d4..f9e25ae 100644
--- a/ref-filter.c
+++ b/ref-filter.c
@@ -76,12 +76,15 @@
char color[COLOR_MAXLEN];
struct align align;
struct {
- enum { RR_REF, RR_TRACK, RR_TRACKSHORT } option;
+ enum {
+ RR_REF, RR_TRACK, RR_TRACKSHORT, RR_REMOTE_NAME, RR_REMOTE_REF
+ } option;
struct refname_atom refname;
- unsigned int nobracket : 1;
+ unsigned int nobracket : 1, push : 1, push_remote : 1;
} remote_ref;
struct {
enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, C_SUB, C_TRAILERS } option;
+ struct process_trailer_options trailer_opts;
unsigned int nlines;
} contents;
struct {
@@ -137,6 +140,9 @@
struct string_list params = STRING_LIST_INIT_DUP;
int i;
+ if (!strcmp(atom->name, "push") || starts_with(atom->name, "push:"))
+ atom->u.remote_ref.push = 1;
+
if (!arg) {
atom->u.remote_ref.option = RR_REF;
refname_atom_parser_internal(&atom->u.remote_ref.refname,
@@ -156,7 +162,13 @@
atom->u.remote_ref.option = RR_TRACKSHORT;
else if (!strcmp(s, "nobracket"))
atom->u.remote_ref.nobracket = 1;
- else {
+ else if (!strcmp(s, "remotename")) {
+ atom->u.remote_ref.option = RR_REMOTE_NAME;
+ atom->u.remote_ref.push_remote = 1;
+ } else if (!strcmp(s, "remoteref")) {
+ atom->u.remote_ref.option = RR_REMOTE_REF;
+ atom->u.remote_ref.push_remote = 1;
+ } else {
atom->u.remote_ref.option = RR_REF;
refname_atom_parser_internal(&atom->u.remote_ref.refname,
arg, atom->name);
@@ -182,9 +194,23 @@
static void trailers_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg)
{
- if (arg)
- die(_("%%(trailers) does not take arguments"));
+ struct string_list params = STRING_LIST_INIT_DUP;
+ int i;
+
+ if (arg) {
+ string_list_split(¶ms, arg, ',', -1);
+ for (i = 0; i < params.nr; i++) {
+ const char *s = params.items[i].string;
+ if (!strcmp(s, "unfold"))
+ atom->u.contents.trailer_opts.unfold = 1;
+ else if (!strcmp(s, "only"))
+ atom->u.contents.trailer_opts.only_trailers = 1;
+ else
+ die(_("unknown %%(trailers) argument: %s"), s);
+ }
+ }
atom->u.contents.option = C_TRAILERS;
+ string_list_clear(¶ms, 0);
}
static void contents_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg)
@@ -197,9 +223,10 @@
atom->u.contents.option = C_SIG;
else if (!strcmp(arg, "subject"))
atom->u.contents.option = C_SUB;
- else if (!strcmp(arg, "trailers"))
- atom->u.contents.option = C_TRAILERS;
- else if (skip_prefix(arg, "lines=", &arg)) {
+ else if (skip_prefix(arg, "trailers", &arg)) {
+ skip_prefix(arg, ":", &arg);
+ trailers_atom_parser(format, atom, *arg ? arg : NULL);
+ } else if (skip_prefix(arg, "lines=", &arg)) {
atom->u.contents.option = C_LINES;
if (strtoul_ui(arg, 10, &atom->u.contents.nlines))
die(_("positive value expected contents:lines=%s"), arg);
@@ -295,9 +322,7 @@
static void head_atom_parser(const struct ref_format *format, struct used_atom *atom, const char *arg)
{
- struct object_id unused;
-
- atom->u.head = resolve_refdup("HEAD", RESOLVE_REF_READING, unused.hash, NULL);
+ atom->u.head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
}
static struct {
@@ -1050,7 +1075,7 @@
name++;
if (strcmp(name, "subject") &&
strcmp(name, "body") &&
- strcmp(name, "trailers") &&
+ !starts_with(name, "trailers") &&
!starts_with(name, "contents"))
continue;
if (!subpos)
@@ -1075,13 +1100,12 @@
append_lines(&s, subpos, contents_end - subpos, atom->u.contents.nlines);
v->s = strbuf_detach(&s, NULL);
} else if (atom->u.contents.option == C_TRAILERS) {
- struct trailer_info info;
+ struct strbuf s = STRBUF_INIT;
- /* Search for trailer info */
- trailer_info_get(&info, subpos);
- v->s = xmemdupz(info.trailer_start,
- info.trailer_end - info.trailer_start);
- trailer_info_release(&info);
+ /* Format the trailer info according to the trailer_opts given */
+ format_trailers_from_commit(&s, subpos, &atom->u.contents.trailer_opts);
+
+ v->s = strbuf_detach(&s, NULL);
} else if (atom->u.contents.option == C_BARE)
v->s = xstrdup(subpos);
}
@@ -1255,6 +1279,25 @@
*s = ">";
else
*s = "<>";
+ } else if (atom->u.remote_ref.option == RR_REMOTE_NAME) {
+ int explicit;
+ const char *remote = atom->u.remote_ref.push ?
+ pushremote_for_branch(branch, &explicit) :
+ remote_for_branch(branch, &explicit);
+ if (explicit)
+ *s = xstrdup(remote);
+ else
+ *s = "";
+ } else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
+ int explicit;
+ const char *merge;
+
+ merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
+ &explicit);
+ if (explicit)
+ *s = xstrdup(merge);
+ else
+ *s = "";
} else
die("BUG: unhandled RR_* enum");
}
@@ -1325,9 +1368,8 @@
ref->value = xcalloc(used_atom_cnt, sizeof(struct atom_value));
if (need_symref && (ref->flag & REF_ISSYMREF) && !ref->symref) {
- struct object_id unused1;
ref->symref = resolve_refdup(ref->refname, RESOLVE_REF_READING,
- unused1.hash, NULL);
+ NULL, NULL);
if (!ref->symref)
ref->symref = "";
}
@@ -1365,16 +1407,20 @@
if (refname)
fill_remote_ref_details(atom, refname, branch, &v->s);
continue;
- } else if (starts_with(name, "push")) {
+ } else if (atom->u.remote_ref.push) {
const char *branch_name;
if (!skip_prefix(ref->refname, "refs/heads/",
&branch_name))
continue;
branch = branch_get(branch_name);
- refname = branch_get_push(branch, NULL);
- if (!refname)
- continue;
+ if (atom->u.remote_ref.push_remote)
+ refname = NULL;
+ else {
+ refname = branch_get_push(branch, NULL);
+ if (!refname)
+ continue;
+ }
fill_remote_ref_details(atom, refname, branch, &v->s);
continue;
} else if (starts_with(name, "color:")) {
@@ -1949,8 +1995,7 @@
free_array_item(item);
}
- for (i = 0; i < old_nr; i++)
- clear_commit_marks(to_clear[i], ALL_REV_FLAGS);
+ clear_commit_marks_many(old_nr, to_clear, ALL_REV_FLAGS);
clear_commit_marks(filter->merge_commit, ALL_REV_FLAGS);
free(to_clear);
}
diff --git a/reflog-walk.c b/reflog-walk.c
index 74ebe51..5008bbf 100644
--- a/reflog-walk.c
+++ b/reflog-walk.c
@@ -61,11 +61,10 @@
reflogs->ref = xstrdup(ref);
for_each_reflog_ent(ref, read_one_reflog, reflogs);
if (reflogs->nr == 0) {
- struct object_id oid;
const char *name;
void *name_to_free;
name = name_to_free = resolve_refdup(ref, RESOLVE_REF_READING,
- oid.hash, NULL);
+ NULL, NULL);
if (name) {
for_each_reflog_ent(name, read_one_reflog, reflogs);
free(name_to_free);
@@ -151,9 +150,8 @@
reflogs = item->util;
else {
if (*branch == '\0') {
- struct object_id oid;
free(branch);
- branch = resolve_refdup("HEAD", 0, oid.hash, NULL);
+ branch = resolve_refdup("HEAD", 0, NULL, NULL);
if (!branch)
die ("No current branch");
@@ -163,7 +161,7 @@
struct object_id oid;
char *b;
int ret = dwim_log(branch, strlen(branch),
- oid.hash, &b);
+ &oid, &b);
if (ret > 1)
free(b);
else if (ret == 1) {
diff --git a/refs.c b/refs.c
index 7edcf6c..20ba82b 100644
--- a/refs.c
+++ b/refs.c
@@ -174,23 +174,41 @@
return 1;
}
+/*
+ * Return true if refname, which has the specified oid and flags, can
+ * be resolved to an object in the database. If the referred-to object
+ * does not exist, emit a warning and return false.
+ */
+int ref_resolves_to_object(const char *refname,
+ const struct object_id *oid,
+ unsigned int flags)
+{
+ if (flags & REF_ISBROKEN)
+ return 0;
+ if (!has_sha1_file(oid->hash)) {
+ error("%s does not point to a valid object!", refname);
+ return 0;
+ }
+ return 1;
+}
+
char *refs_resolve_refdup(struct ref_store *refs,
const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags)
+ struct object_id *oid, int *flags)
{
const char *result;
result = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
- sha1, flags);
+ oid, flags);
return xstrdup_or_null(result);
}
char *resolve_refdup(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags)
+ struct object_id *oid, int *flags)
{
return refs_resolve_refdup(get_main_ref_store(),
refname, resolve_flags,
- sha1, flags);
+ oid, flags);
}
/* The argument to filter_refs */
@@ -201,28 +219,71 @@
};
int refs_read_ref_full(struct ref_store *refs, const char *refname,
- int resolve_flags, unsigned char *sha1, int *flags)
+ int resolve_flags, struct object_id *oid, int *flags)
{
- if (refs_resolve_ref_unsafe(refs, refname, resolve_flags, sha1, 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, unsigned char *sha1, int *flags)
+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(), refname,
- resolve_flags, sha1, flags);
+ resolve_flags, oid, flags);
}
-int read_ref(const char *refname, unsigned char *sha1)
+int read_ref(const char *refname, struct object_id *oid)
{
- return read_ref_full(refname, RESOLVE_REF_READING, sha1, NULL);
+ return read_ref_full(refname, RESOLVE_REF_READING, oid, NULL);
}
int ref_exists(const char *refname)
{
- unsigned char sha1[20];
- return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, sha1, NULL);
+ return !!resolve_ref_unsafe(refname, RESOLVE_REF_READING, NULL, NULL);
+}
+
+static int match_ref_pattern(const char *refname,
+ const struct string_list_item *item)
+{
+ int matched = 0;
+ if (item->util == NULL) {
+ if (!wildmatch(item->string, refname, 0))
+ matched = 1;
+ } else {
+ const char *rest;
+ if (skip_prefix(refname, item->string, &rest) &&
+ (!*rest || *rest == '/'))
+ matched = 1;
+ }
+ return matched;
+}
+
+int ref_filter_match(const char *refname,
+ const struct string_list *include_patterns,
+ const struct string_list *exclude_patterns)
+{
+ struct string_list_item *item;
+
+ if (exclude_patterns && exclude_patterns->nr) {
+ for_each_string_list_item(item, exclude_patterns) {
+ if (match_ref_pattern(refname, item))
+ return 0;
+ }
+ }
+
+ if (include_patterns && include_patterns->nr) {
+ int found = 0;
+ for_each_string_list_item(item, include_patterns) {
+ if (match_ref_pattern(refname, item)) {
+ found = 1;
+ break;
+ }
+ }
+
+ if (!found)
+ return 0;
+ }
+ return 1;
}
static int filter_refs(const char *refname, const struct object_id *oid,
@@ -235,12 +296,12 @@
return filter->fn(refname, oid, flags, filter->cb_data);
}
-enum peel_status peel_object(const unsigned char *name, unsigned char *sha1)
+enum peel_status peel_object(const struct object_id *name, struct object_id *oid)
{
- struct object *o = lookup_unknown_object(name);
+ struct object *o = lookup_unknown_object(name->hash);
if (o->type == OBJ_NONE) {
- int type = sha1_object_info(name, NULL);
+ int type = sha1_object_info(name->hash, NULL);
if (type < 0 || !object_as_type(o, type, 0))
return PEEL_INVALID;
}
@@ -252,7 +313,7 @@
if (!o)
return PEEL_INVALID;
- hashcpy(sha1, o->oid.hash);
+ oidcpy(oid, &o->oid);
return PEEL_PEELED;
}
@@ -268,12 +329,11 @@
{
struct warn_if_dangling_data *d = cb_data;
const char *resolves_to;
- struct object_id junk;
if (!(flags & REF_ISSYMREF))
return 0;
- resolves_to = resolve_ref_unsafe(refname, 0, junk.hash, NULL);
+ resolves_to = resolve_ref_unsafe(refname, 0, NULL, NULL);
if (!resolves_to
|| (d->refname
? strcmp(resolves_to, d->refname)
@@ -318,12 +378,6 @@
return refs_for_each_tag_ref(get_main_ref_store(), fn, cb_data);
}
-int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- return refs_for_each_tag_ref(get_submodule_ref_store(submodule),
- fn, cb_data);
-}
-
int refs_for_each_branch_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
return refs_for_each_ref_in(refs, "refs/heads/", fn, cb_data);
@@ -334,12 +388,6 @@
return refs_for_each_branch_ref(get_main_ref_store(), fn, cb_data);
}
-int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- return refs_for_each_branch_ref(get_submodule_ref_store(submodule),
- fn, cb_data);
-}
-
int refs_for_each_remote_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
return refs_for_each_ref_in(refs, "refs/remotes/", fn, cb_data);
@@ -350,12 +398,6 @@
return refs_for_each_remote_ref(get_main_ref_store(), fn, cb_data);
}
-int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
- fn, cb_data);
-}
-
int head_ref_namespaced(each_ref_fn fn, void *cb_data)
{
struct strbuf buf = STRBUF_INIT;
@@ -364,13 +406,34 @@
int flag;
strbuf_addf(&buf, "%sHEAD", get_git_namespace());
- if (!read_ref_full(buf.buf, RESOLVE_REF_READING, oid.hash, &flag))
+ if (!read_ref_full(buf.buf, RESOLVE_REF_READING, &oid, &flag))
ret = fn(buf.buf, &oid, flag, cb_data);
strbuf_release(&buf);
return ret;
}
+void normalize_glob_ref(struct string_list_item *item, const char *prefix,
+ const char *pattern)
+{
+ struct strbuf normalized_pattern = STRBUF_INIT;
+
+ if (*pattern == '/')
+ BUG("pattern must not start with '/'");
+
+ if (prefix) {
+ strbuf_addstr(&normalized_pattern, prefix);
+ }
+ else if (!starts_with(pattern, "refs/"))
+ strbuf_addstr(&normalized_pattern, "refs/");
+ strbuf_addstr(&normalized_pattern, pattern);
+ strbuf_strip_suffix(&normalized_pattern, "/");
+
+ item->string = strbuf_detach(&normalized_pattern, NULL);
+ item->util = has_glob_specials(pattern) ? NULL : item->string;
+ strbuf_release(&normalized_pattern);
+}
+
int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
const char *prefix, void *cb_data)
{
@@ -458,15 +521,15 @@
return NULL;
}
-int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref)
+int dwim_ref(const char *str, int len, struct object_id *oid, char **ref)
{
char *last_branch = substitute_branch_name(&str, &len);
- int refs_found = expand_ref(str, len, sha1, ref);
+ int refs_found = expand_ref(str, len, oid, ref);
free(last_branch);
return refs_found;
}
-int expand_ref(const char *str, int len, unsigned char *sha1, char **ref)
+int expand_ref(const char *str, int len, struct object_id *oid, char **ref)
{
const char **p, *r;
int refs_found = 0;
@@ -474,11 +537,11 @@
*ref = NULL;
for (p = ref_rev_parse_rules; *p; p++) {
- unsigned char sha1_from_ref[20];
- unsigned char *this_result;
+ struct object_id oid_from_ref;
+ struct object_id *this_result;
int flag;
- this_result = refs_found ? sha1_from_ref : sha1;
+ this_result = refs_found ? &oid_from_ref : oid;
strbuf_reset(&fullref);
strbuf_addf(&fullref, *p, len, str);
r = resolve_ref_unsafe(fullref.buf, RESOLVE_REF_READING,
@@ -498,7 +561,7 @@
return refs_found;
}
-int dwim_log(const char *str, int len, unsigned char *sha1, char **log)
+int dwim_log(const char *str, int len, struct object_id *oid, char **log)
{
char *last_branch = substitute_branch_name(&str, &len);
const char **p;
@@ -507,13 +570,13 @@
*log = NULL;
for (p = ref_rev_parse_rules; *p; p++) {
- unsigned char hash[20];
+ struct object_id hash;
const char *ref, *it;
strbuf_reset(&path);
strbuf_addf(&path, *p, len, str);
ref = resolve_ref_unsafe(path.buf, RESOLVE_REF_READING,
- hash, NULL);
+ &hash, NULL);
if (!ref)
continue;
if (reflog_exists(path.buf))
@@ -524,7 +587,7 @@
continue;
if (!logs_found++) {
*log = xstrdup(it);
- hashcpy(sha1, hash);
+ oidcpy(oid, &hash);
}
if (!warn_ambiguous_refs)
break;
@@ -561,8 +624,23 @@
return REF_TYPE_NORMAL;
}
-static int write_pseudoref(const char *pseudoref, const unsigned char *sha1,
- const unsigned char *old_sha1, struct strbuf *err)
+long get_files_ref_lock_timeout_ms(void)
+{
+ static int configured = 0;
+
+ /* The default timeout is 100 ms: */
+ static int timeout_ms = 100;
+
+ if (!configured) {
+ git_config_get_int("core.filesreflocktimeout", &timeout_ms);
+ configured = 1;
+ }
+
+ return timeout_ms;
+}
+
+static int write_pseudoref(const char *pseudoref, const struct object_id *oid,
+ const struct object_id *old_oid, struct strbuf *err)
{
const char *filename;
int fd;
@@ -570,22 +648,27 @@
struct strbuf buf = STRBUF_INIT;
int ret = -1;
- strbuf_addf(&buf, "%s\n", sha1_to_hex(sha1));
+ if (!oid)
+ return 0;
+
+ strbuf_addf(&buf, "%s\n", oid_to_hex(oid));
filename = git_path("%s", pseudoref);
- fd = hold_lock_file_for_update(&lock, filename, LOCK_DIE_ON_ERROR);
+ fd = hold_lock_file_for_update_timeout(&lock, filename,
+ LOCK_DIE_ON_ERROR,
+ get_files_ref_lock_timeout_ms());
if (fd < 0) {
strbuf_addf(err, "could not open '%s' for writing: %s",
filename, strerror(errno));
- return -1;
+ goto done;
}
- if (old_sha1) {
- unsigned char actual_old_sha1[20];
+ if (old_oid) {
+ struct object_id actual_old_oid;
- if (read_ref(pseudoref, actual_old_sha1))
+ if (read_ref(pseudoref, &actual_old_oid))
die("could not read ref '%s'", pseudoref);
- if (hashcmp(actual_old_sha1, old_sha1)) {
+ if (oidcmp(&actual_old_oid, old_oid)) {
strbuf_addf(err, "unexpected sha1 when writing '%s'", pseudoref);
rollback_lock_file(&lock);
goto done;
@@ -605,24 +688,25 @@
return ret;
}
-static int delete_pseudoref(const char *pseudoref, const unsigned char *old_sha1)
+static int delete_pseudoref(const char *pseudoref, const struct object_id *old_oid)
{
static struct lock_file lock;
const char *filename;
filename = git_path("%s", pseudoref);
- if (old_sha1 && !is_null_sha1(old_sha1)) {
+ if (old_oid && !is_null_oid(old_oid)) {
int fd;
- unsigned char actual_old_sha1[20];
+ struct object_id actual_old_oid;
- fd = hold_lock_file_for_update(&lock, filename,
- LOCK_DIE_ON_ERROR);
+ fd = hold_lock_file_for_update_timeout(
+ &lock, filename, LOCK_DIE_ON_ERROR,
+ get_files_ref_lock_timeout_ms());
if (fd < 0)
die_errno(_("Could not open '%s' for writing"), filename);
- if (read_ref(pseudoref, actual_old_sha1))
+ if (read_ref(pseudoref, &actual_old_oid))
die("could not read ref '%s'", pseudoref);
- if (hashcmp(actual_old_sha1, old_sha1)) {
+ if (oidcmp(&actual_old_oid, old_oid)) {
warning("Unexpected sha1 when deleting %s", pseudoref);
rollback_lock_file(&lock);
return -1;
@@ -639,7 +723,7 @@
int refs_delete_ref(struct ref_store *refs, const char *msg,
const char *refname,
- const unsigned char *old_sha1,
+ const struct object_id *old_oid,
unsigned int flags)
{
struct ref_transaction *transaction;
@@ -647,12 +731,12 @@
if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
assert(refs == get_main_ref_store());
- return delete_pseudoref(refname, old_sha1);
+ return delete_pseudoref(refname, old_oid);
}
transaction = ref_store_transaction_begin(refs, &err);
if (!transaction ||
- ref_transaction_delete(transaction, refname, old_sha1,
+ ref_transaction_delete(transaction, refname, old_oid,
flags, msg, &err) ||
ref_transaction_commit(transaction, &err)) {
error("%s", err.buf);
@@ -666,10 +750,10 @@
}
int delete_ref(const char *msg, const char *refname,
- const unsigned char *old_sha1, unsigned int flags)
+ const struct object_id *old_oid, unsigned int flags)
{
return refs_delete_ref(get_main_ref_store(), msg, refname,
- old_sha1, flags);
+ old_oid, flags);
}
int copy_reflog_msg(char *buf, const char *msg)
@@ -718,11 +802,11 @@
timestamp_t at_time;
int cnt;
int reccnt;
- unsigned char *sha1;
+ struct object_id *oid;
int found_it;
- unsigned char osha1[20];
- unsigned char nsha1[20];
+ struct object_id ooid;
+ struct object_id noid;
int tz;
timestamp_t date;
char **msg;
@@ -751,28 +835,28 @@
if (cb->cutoff_cnt)
*cb->cutoff_cnt = cb->reccnt - 1;
/*
- * we have not yet updated cb->[n|o]sha1 so they still
+ * we have not yet updated cb->[n|o]oid so they still
* hold the values for the previous record.
*/
- if (!is_null_sha1(cb->osha1)) {
- hashcpy(cb->sha1, noid->hash);
- if (hashcmp(cb->osha1, noid->hash))
+ if (!is_null_oid(&cb->ooid)) {
+ oidcpy(cb->oid, noid);
+ if (oidcmp(&cb->ooid, noid))
warning("Log for ref %s has gap after %s.",
cb->refname, show_date(cb->date, cb->tz, DATE_MODE(RFC2822)));
}
else if (cb->date == cb->at_time)
- hashcpy(cb->sha1, noid->hash);
- else if (hashcmp(noid->hash, cb->sha1))
+ oidcpy(cb->oid, noid);
+ else if (oidcmp(noid, cb->oid))
warning("Log for ref %s unexpectedly ended on %s.",
cb->refname, show_date(cb->date, cb->tz,
DATE_MODE(RFC2822)));
- hashcpy(cb->osha1, ooid->hash);
- hashcpy(cb->nsha1, noid->hash);
+ oidcpy(&cb->ooid, ooid);
+ oidcpy(&cb->noid, noid);
cb->found_it = 1;
return 1;
}
- hashcpy(cb->osha1, ooid->hash);
- hashcpy(cb->nsha1, noid->hash);
+ oidcpy(&cb->ooid, ooid);
+ oidcpy(&cb->noid, noid);
if (cb->cnt > 0)
cb->cnt--;
return 0;
@@ -792,15 +876,15 @@
*cb->cutoff_tz = tz;
if (cb->cutoff_cnt)
*cb->cutoff_cnt = cb->reccnt;
- hashcpy(cb->sha1, ooid->hash);
- if (is_null_sha1(cb->sha1))
- hashcpy(cb->sha1, noid->hash);
+ oidcpy(cb->oid, ooid);
+ if (is_null_oid(cb->oid))
+ oidcpy(cb->oid, noid);
/* We just want the first entry */
return 1;
}
int read_ref_at(const char *refname, unsigned int flags, timestamp_t at_time, int cnt,
- unsigned char *sha1, char **msg,
+ struct object_id *oid, char **msg,
timestamp_t *cutoff_time, int *cutoff_tz, int *cutoff_cnt)
{
struct read_ref_at_cb cb;
@@ -813,12 +897,12 @@
cb.cutoff_time = cutoff_time;
cb.cutoff_tz = cutoff_tz;
cb.cutoff_cnt = cutoff_cnt;
- cb.sha1 = sha1;
+ cb.oid = oid;
for_each_reflog_ent_reverse(refname, read_ref_at_ent, &cb);
if (!cb.reccnt) {
- if (flags & GET_SHA1_QUIETLY)
+ if (flags & GET_OID_QUIETLY)
exit(128);
else
die("Log for %s is empty.", refname);
@@ -878,8 +962,8 @@
struct ref_update *ref_transaction_add_update(
struct ref_transaction *transaction,
const char *refname, unsigned int flags,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
+ const struct object_id *new_oid,
+ const struct object_id *old_oid,
const char *msg)
{
struct ref_update *update;
@@ -887,9 +971,6 @@
if (transaction->state != REF_TRANSACTION_OPEN)
die("BUG: update called for transaction that is not open");
- if ((flags & REF_ISPRUNING) && !(flags & REF_NODEREF))
- die("BUG: REF_ISPRUNING set without REF_NODEREF");
-
FLEX_ALLOC_STR(update, refname, refname);
ALLOC_GROW(transaction->updates, transaction->nr + 1, transaction->alloc);
transaction->updates[transaction->nr++] = update;
@@ -897,23 +978,23 @@
update->flags = flags;
if (flags & REF_HAVE_NEW)
- hashcpy(update->new_oid.hash, new_sha1);
+ oidcpy(&update->new_oid, new_oid);
if (flags & REF_HAVE_OLD)
- hashcpy(update->old_oid.hash, old_sha1);
+ oidcpy(&update->old_oid, old_oid);
update->msg = xstrdup_or_null(msg);
return update;
}
int ref_transaction_update(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
+ const struct object_id *new_oid,
+ const struct object_id *old_oid,
unsigned int flags, const char *msg,
struct strbuf *err)
{
assert(err);
- if ((new_sha1 && !is_null_sha1(new_sha1)) ?
+ if ((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'",
@@ -921,64 +1002,57 @@
return -1;
}
- flags &= REF_TRANSACTION_UPDATE_ALLOWED_FLAGS;
+ if (flags & ~REF_TRANSACTION_UPDATE_ALLOWED_FLAGS)
+ BUG("illegal flags 0x%x passed to ref_transaction_update()", flags);
- flags |= (new_sha1 ? REF_HAVE_NEW : 0) | (old_sha1 ? REF_HAVE_OLD : 0);
+ flags |= (new_oid ? REF_HAVE_NEW : 0) | (old_oid ? REF_HAVE_OLD : 0);
ref_transaction_add_update(transaction, refname, flags,
- new_sha1, old_sha1, msg);
+ new_oid, old_oid, msg);
return 0;
}
int ref_transaction_create(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *new_sha1,
+ const struct object_id *new_oid,
unsigned int flags, const char *msg,
struct strbuf *err)
{
- if (!new_sha1 || is_null_sha1(new_sha1))
- die("BUG: create called without valid new_sha1");
- return ref_transaction_update(transaction, refname, new_sha1,
- null_sha1, flags, msg, err);
+ if (!new_oid || is_null_oid(new_oid))
+ die("BUG: create called without valid new_oid");
+ return ref_transaction_update(transaction, refname, new_oid,
+ &null_oid, flags, msg, err);
}
int ref_transaction_delete(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *old_sha1,
+ const struct object_id *old_oid,
unsigned int flags, const char *msg,
struct strbuf *err)
{
- if (old_sha1 && is_null_sha1(old_sha1))
- die("BUG: delete called with old_sha1 set to zeros");
+ if (old_oid && is_null_oid(old_oid))
+ die("BUG: delete called with old_oid set to zeros");
return ref_transaction_update(transaction, refname,
- null_sha1, old_sha1,
+ &null_oid, old_oid,
flags, msg, err);
}
int ref_transaction_verify(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *old_sha1,
+ const struct object_id *old_oid,
unsigned int flags,
struct strbuf *err)
{
- if (!old_sha1)
- die("BUG: verify called with old_sha1 set to NULL");
+ if (!old_oid)
+ die("BUG: verify called with old_oid set to NULL");
return ref_transaction_update(transaction, refname,
- NULL, old_sha1,
+ NULL, old_oid,
flags, NULL, err);
}
-int update_ref_oid(const char *msg, const char *refname,
- const struct object_id *new_oid, const struct object_id *old_oid,
- unsigned int flags, enum action_on_err onerr)
-{
- return update_ref(msg, refname, new_oid ? new_oid->hash : NULL,
- old_oid ? old_oid->hash : NULL, flags, onerr);
-}
-
int refs_update_ref(struct ref_store *refs, const char *msg,
- const char *refname, const unsigned char *new_sha1,
- const unsigned char *old_sha1, unsigned int flags,
+ const char *refname, const struct object_id *new_oid,
+ const struct object_id *old_oid, unsigned int flags,
enum action_on_err onerr)
{
struct ref_transaction *t = NULL;
@@ -987,11 +1061,11 @@
if (ref_type(refname) == REF_TYPE_PSEUDOREF) {
assert(refs == get_main_ref_store());
- ret = write_pseudoref(refname, new_sha1, old_sha1, &err);
+ ret = write_pseudoref(refname, new_oid, old_oid, &err);
} else {
t = ref_store_transaction_begin(refs, &err);
if (!t ||
- ref_transaction_update(t, refname, new_sha1, old_sha1,
+ ref_transaction_update(t, refname, new_oid, old_oid,
flags, msg, &err) ||
ref_transaction_commit(t, &err)) {
ret = 1;
@@ -1021,12 +1095,12 @@
}
int update_ref(const char *msg, const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
+ const struct object_id *new_oid,
+ const struct object_id *old_oid,
unsigned int flags, enum action_on_err onerr)
{
- return refs_update_ref(get_main_ref_store(), msg, refname, new_sha1,
- old_sha1, flags, onerr);
+ return refs_update_ref(get_main_ref_store(), msg, refname, new_oid,
+ old_oid, flags, onerr);
}
char *shorten_unambiguous_ref(const char *refname, int strict)
@@ -1232,19 +1306,13 @@
return ok;
}
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
struct object_id oid;
int flag;
- if (submodule) {
- if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
- return fn("HEAD", &oid, 0, cb_data);
-
- return 0;
- }
-
- if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+ if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING,
+ &oid, &flag))
return fn("HEAD", &oid, flag, cb_data);
return 0;
@@ -1252,7 +1320,7 @@
int head_ref(each_ref_fn fn, void *cb_data)
{
- return head_ref_submodule(NULL, fn, cb_data);
+ return refs_head_ref(get_main_ref_store(), fn, cb_data);
}
struct ref_iterator *refs_ref_iterator_begin(
@@ -1275,6 +1343,10 @@
if (trim)
iter = prefix_ref_iterator_begin(iter, "", trim);
+ /* Sanity check for subclasses: */
+ if (!iter->ordered)
+ BUG("reference iterator is not ordered");
+
return iter;
}
@@ -1310,11 +1382,6 @@
return refs_for_each_ref(get_main_ref_store(), fn, cb_data);
}
-int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
-{
- return refs_for_each_ref(get_submodule_ref_store(submodule), fn, cb_data);
-}
-
int refs_for_each_ref_in(struct ref_store *refs, const char *prefix,
each_ref_fn fn, void *cb_data)
{
@@ -1336,23 +1403,15 @@
prefix, fn, 0, flag, cb_data);
}
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data)
-{
- return refs_for_each_ref_in(get_submodule_ref_store(submodule),
- prefix, fn, cb_data);
-}
-
-int for_each_fullref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data,
- unsigned int broken)
+int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
+ each_ref_fn fn, void *cb_data,
+ unsigned int broken)
{
unsigned int flag = 0;
if (broken)
flag = DO_FOR_EACH_INCLUDE_BROKEN;
- return do_for_each_ref(get_submodule_ref_store(submodule),
- prefix, fn, 0, flag, cb_data);
+ return do_for_each_ref(refs, prefix, fn, 0, flag, cb_data);
}
int for_each_replace_ref(each_ref_fn fn, void *cb_data)
@@ -1360,7 +1419,7 @@
return do_for_each_ref(get_main_ref_store(),
git_replace_ref_base, fn,
strlen(git_replace_ref_base),
- 0, cb_data);
+ DO_FOR_EACH_INCLUDE_BROKEN, cb_data);
}
int for_each_namespaced_ref(each_ref_fn fn, void *cb_data)
@@ -1386,22 +1445,25 @@
}
int refs_read_raw_ref(struct ref_store *ref_store,
- const char *refname, unsigned char *sha1,
+ const char *refname, struct object_id *oid,
struct strbuf *referent, unsigned int *type)
{
- return ref_store->be->read_raw_ref(ref_store, refname, sha1, referent, type);
+ return ref_store->be->read_raw_ref(ref_store, refname, oid, referent, type);
}
/* This function needs to return a meaningful errno on failure */
const char *refs_resolve_ref_unsafe(struct ref_store *refs,
const char *refname,
int resolve_flags,
- unsigned char *sha1, int *flags)
+ struct object_id *oid, int *flags)
{
static struct strbuf sb_refname = STRBUF_INIT;
+ struct object_id unused_oid;
int unused_flags;
int symref_count;
+ if (!oid)
+ oid = &unused_oid;
if (!flags)
flags = &unused_flags;
@@ -1429,11 +1491,24 @@
unsigned int read_flags = 0;
if (refs_read_raw_ref(refs, refname,
- sha1, &sb_refname, &read_flags)) {
+ oid, &sb_refname, &read_flags)) {
*flags |= read_flags;
- if (errno != ENOENT || (resolve_flags & RESOLVE_REF_READING))
+
+ /* In reading mode, refs must eventually resolve */
+ if (resolve_flags & RESOLVE_REF_READING)
return NULL;
- hashclr(sha1);
+
+ /*
+ * Otherwise a missing ref is OK. But the files backend
+ * may show errors besides ENOENT if there are
+ * similarly-named refs.
+ */
+ if (errno != ENOENT &&
+ errno != EISDIR &&
+ errno != ENOTDIR)
+ return NULL;
+
+ oidclr(oid);
if (*flags & REF_BAD_NAME)
*flags |= REF_ISBROKEN;
return refname;
@@ -1443,7 +1518,7 @@
if (!(read_flags & REF_ISSYMREF)) {
if (*flags & REF_BAD_NAME) {
- hashclr(sha1);
+ oidclr(oid);
*flags |= REF_ISBROKEN;
}
return refname;
@@ -1451,7 +1526,7 @@
refname = sb_refname.buf;
if (resolve_flags & RESOLVE_REF_NO_RECURSE) {
- hashclr(sha1);
+ oidclr(oid);
return refname;
}
if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
@@ -1478,40 +1553,25 @@
}
const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags)
+ struct object_id *oid, int *flags)
{
return refs_resolve_ref_unsafe(get_main_ref_store(), refname,
- resolve_flags, sha1, flags);
+ resolve_flags, oid, flags);
}
int resolve_gitlink_ref(const char *submodule, const char *refname,
- unsigned char *sha1)
+ struct object_id *oid)
{
- size_t len = strlen(submodule);
struct ref_store *refs;
int flags;
- while (len && submodule[len - 1] == '/')
- len--;
-
- if (!len)
- return -1;
-
- if (submodule[len]) {
- /* We need to strip off one or more trailing slashes */
- char *stripped = xmemdupz(submodule, len);
-
- refs = get_submodule_ref_store(stripped);
- free(stripped);
- } else {
- refs = get_submodule_ref_store(submodule);
- }
+ refs = get_submodule_ref_store(submodule);
if (!refs)
return -1;
- if (!refs_resolve_ref_unsafe(refs, refname, 0, sha1, &flags) ||
- is_null_sha1(sha1))
+ if (!refs_resolve_ref_unsafe(refs, refname, 0, oid, &flags) ||
+ is_null_oid(oid))
return -1;
return 0;
}
@@ -1620,31 +1680,32 @@
{
struct strbuf submodule_sb = STRBUF_INIT;
struct ref_store *refs;
- int ret;
+ char *to_free = NULL;
+ size_t len;
- if (!submodule || !*submodule) {
- /*
- * FIXME: This case is ideally not allowed. But that
- * can't happen until we clean up all the callers.
- */
- return get_main_ref_store();
- }
+ if (!submodule)
+ return NULL;
+
+ len = strlen(submodule);
+ while (len && is_dir_sep(submodule[len - 1]))
+ len--;
+ if (!len)
+ return NULL;
+
+ if (submodule[len])
+ /* We need to strip off one or more trailing slashes */
+ submodule = to_free = xmemdupz(submodule, len);
refs = lookup_ref_store_map(&submodule_ref_stores, submodule);
if (refs)
- return refs;
+ goto done;
strbuf_addstr(&submodule_sb, submodule);
- ret = is_nonbare_repository_dir(&submodule_sb);
- strbuf_release(&submodule_sb);
- if (!ret)
- return NULL;
+ if (!is_nonbare_repository_dir(&submodule_sb))
+ goto done;
- ret = submodule_to_gitdir(&submodule_sb, submodule);
- if (ret) {
- strbuf_release(&submodule_sb);
- return NULL;
- }
+ if (submodule_to_gitdir(&submodule_sb, submodule))
+ goto done;
/* assume that add_submodule_odb() has been called */
refs = ref_store_init(submodule_sb.buf,
@@ -1652,7 +1713,10 @@
register_ref_store_map(&submodule_ref_stores, "submodule",
refs, submodule);
+done:
strbuf_release(&submodule_sb);
+ free(to_free);
+
return refs;
}
@@ -1695,14 +1759,30 @@
}
int refs_peel_ref(struct ref_store *refs, const char *refname,
- unsigned char *sha1)
+ struct object_id *oid)
{
- return refs->be->peel_ref(refs, refname, sha1);
+ int flag;
+ struct object_id base;
+
+ if (current_ref_iter && current_ref_iter->refname == refname) {
+ struct object_id peeled;
+
+ if (ref_iterator_peel(current_ref_iter, &peeled))
+ return -1;
+ oidcpy(oid, &peeled);
+ return 0;
+ }
+
+ if (refs_read_ref_full(refs, refname,
+ RESOLVE_REF_READING, &base, &flag))
+ return -1;
+
+ return peel_object(&base, oid);
}
-int peel_ref(const char *refname, unsigned char *sha1)
+int peel_ref(const char *refname, struct object_id *oid)
{
- return refs_peel_ref(get_main_ref_store(), refname, sha1);
+ return refs_peel_ref(get_main_ref_store(), refname, oid);
}
int refs_create_symref(struct ref_store *refs,
@@ -1862,7 +1942,7 @@
if (skip && string_list_has_string(skip, dirname.buf))
continue;
- if (!refs_read_raw_ref(refs, dirname.buf, oid.hash, &referent, &type)) {
+ if (!refs_read_raw_ref(refs, dirname.buf, &oid, &referent, &type)) {
strbuf_addf(err, "'%s' exists; cannot create '%s'",
dirname.buf, refname);
goto cleanup;
@@ -1992,19 +2072,19 @@
}
int refs_reflog_expire(struct ref_store *refs,
- const char *refname, const unsigned char *sha1,
+ const char *refname, const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data)
{
- return refs->be->reflog_expire(refs, refname, sha1, flags,
+ return refs->be->reflog_expire(refs, refname, oid, flags,
prepare_fn, should_prune_fn,
cleanup_fn, policy_cb_data);
}
-int reflog_expire(const char *refname, const unsigned char *sha1,
+int reflog_expire(const char *refname, const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
@@ -2012,7 +2092,7 @@
void *policy_cb_data)
{
return refs_reflog_expire(get_main_ref_store(),
- refname, sha1, flags,
+ refname, oid, flags,
prepare_fn, should_prune_fn,
cleanup_fn, policy_cb_data);
}
@@ -2047,3 +2127,14 @@
{
return refs_rename_ref(get_main_ref_store(), oldref, newref, logmsg);
}
+
+int refs_copy_existing_ref(struct ref_store *refs, const char *oldref,
+ const char *newref, const char *logmsg)
+{
+ return refs->be->copy_ref(refs, oldref, newref, logmsg);
+}
+
+int copy_existing_ref(const char *oldref, const char *newref, const char *logmsg)
+{
+ return refs_copy_existing_ref(get_main_ref_store(), oldref, newref, logmsg);
+}
diff --git a/refs.h b/refs.h
index 4d75c20..01be5ae 100644
--- a/refs.h
+++ b/refs.h
@@ -10,25 +10,26 @@
/*
* Resolve a reference, recursively following symbolic refererences.
*
- * Store the referred-to object's name in sha1 and return the name of
- * the non-symbolic reference that ultimately pointed at it. The
- * return value, if not NULL, is a pointer into either a static buffer
- * or the input ref.
+ * Return the name of the non-symbolic reference that ultimately pointed
+ * at the resolved object name. The return value, if not NULL, is a
+ * pointer into either a static buffer or the input ref.
+ *
+ * If oid is non-NULL, store the referred-to object's name in it.
*
* If the reference cannot be resolved to an object, the behavior
* depends on the RESOLVE_REF_READING flag:
*
* - If RESOLVE_REF_READING is set, return NULL.
*
- * - If RESOLVE_REF_READING is not set, clear sha1 and return the name of
+ * - If RESOLVE_REF_READING is not set, clear oid and return the name of
* the last reference name in the chain, which will either be a non-symbolic
* reference or an undefined reference. If this is a prelude to
* "writing" to the ref, the return value is the name of the ref
* that will actually be created or changed.
*
* If the RESOLVE_REF_NO_RECURSE flag is passed, only resolves one
- * level of symbolic reference. The value stored in sha1 for a symbolic
- * reference will always be null_sha1 in this case, and the return
+ * level of symbolic reference. The value stored in oid for a symbolic
+ * reference will always be null_oid in this case, and the return
* value is the reference that the symref refers to directly.
*
* If flags is non-NULL, set the value that it points to the
@@ -45,7 +46,7 @@
*
* RESOLVE_REF_ALLOW_BAD_NAME allows resolving refs even when their
* name is invalid according to git-check-ref-format(1). If the name
- * is bad then the value stored in sha1 will be null_sha1 and the two
+ * is bad then the value stored in oid will be null_oid and the two
* flags REF_ISBROKEN and REF_BAD_NAME will be set.
*
* Even with RESOLVE_REF_ALLOW_BAD_NAME, names that escape the refs/
@@ -61,22 +62,22 @@
const char *refs_resolve_ref_unsafe(struct ref_store *refs,
const char *refname,
int resolve_flags,
- unsigned char *sha1,
+ struct object_id *oid,
int *flags);
const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
+ struct object_id *oid, int *flags);
char *refs_resolve_refdup(struct ref_store *refs,
const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
+ struct object_id *oid, int *flags);
char *resolve_refdup(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
+ struct object_id *oid, int *flags);
int refs_read_ref_full(struct ref_store *refs, const char *refname,
- int resolve_flags, unsigned char *sha1, int *flags);
+ int resolve_flags, struct object_id *oid, int *flags);
int read_ref_full(const char *refname, int resolve_flags,
- unsigned char *sha1, int *flags);
-int read_ref(const char *refname, unsigned char *sha1);
+ struct object_id *oid, int *flags);
+int read_ref(const char *refname, struct object_id *oid);
/*
* Return 0 if a reference named refname could be created without
@@ -113,23 +114,23 @@
/*
* If refname is a non-symbolic reference that refers to a tag object,
* and the tag can be (recursively) dereferenced to a non-tag object,
- * store the SHA1 of the referred-to object to sha1 and return 0. If
- * any of these conditions are not met, return a non-zero value.
+ * store the object ID of the referred-to object to oid and return 0.
+ * If any of these conditions are not met, return a non-zero value.
* Symbolic references are considered unpeelable, even if they
* ultimately resolve to a peelable tag.
*/
int refs_peel_ref(struct ref_store *refs, const char *refname,
- unsigned char *sha1);
-int peel_ref(const char *refname, unsigned char *sha1);
+ struct object_id *oid);
+int peel_ref(const char *refname, struct object_id *oid);
/**
* Resolve refname in the nested "gitlink" repository in the specified
* submodule (which must be non-NULL). If the resolution is
- * successful, return 0 and set sha1 to the name of the object;
+ * successful, return 0 and set oid to the name of the object;
* otherwise, return a non-zero value.
*/
int resolve_gitlink_ref(const char *submodule, const char *refname,
- unsigned char *sha1);
+ struct object_id *oid);
/*
* Return true iff abbrev_name is a possible abbreviation for
@@ -138,9 +139,9 @@
*/
int refname_match(const char *abbrev_name, const char *full_name);
-int expand_ref(const char *str, int len, unsigned char *sha1, char **ref);
-int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
-int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
+int expand_ref(const char *str, int len, struct object_id *oid, char **ref);
+int dwim_ref(const char *str, int len, struct object_id *oid, char **ref);
+int dwim_log(const char *str, int len, struct object_id *oid, char **ref);
/*
* A ref_transaction represents a collection of reference updates that
@@ -259,7 +260,7 @@
/*
* The signature for the callback function for the for_each_*()
- * functions below. The memory pointed to by the refname and sha1
+ * functions below. The memory pointed to by the refname and oid
* arguments is only guaranteed to be valid for the duration of a
* single callback invocation.
*/
@@ -275,6 +276,8 @@
* modifies the reference also returns a nonzero value to immediately
* stop the iteration. Returned references are sorted.
*/
+int refs_head_ref(struct ref_store *refs,
+ each_ref_fn fn, void *cb_data);
int refs_for_each_ref(struct ref_store *refs,
each_ref_fn fn, void *cb_data);
int refs_for_each_ref_in(struct ref_store *refs, const char *prefix,
@@ -289,6 +292,9 @@
int head_ref(each_ref_fn fn, void *cb_data);
int for_each_ref(each_ref_fn fn, void *cb_data);
int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data);
+int refs_for_each_fullref_in(struct ref_store *refs, const char *prefix,
+ each_ref_fn fn, void *cb_data,
+ unsigned int broken);
int for_each_fullref_in(const char *prefix, each_ref_fn fn, void *cb_data,
unsigned int broken);
int for_each_tag_ref(each_ref_fn fn, void *cb_data);
@@ -299,21 +305,6 @@
int for_each_glob_ref_in(each_ref_fn fn, const char *pattern,
const char *prefix, void *cb_data);
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
-int for_each_ref_submodule(const char *submodule,
- each_ref_fn fn, void *cb_data);
-int for_each_ref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data);
-int for_each_fullref_in_submodule(const char *submodule, const char *prefix,
- each_ref_fn fn, void *cb_data,
- unsigned int broken);
-int for_each_tag_ref_submodule(const char *submodule,
- each_ref_fn fn, void *cb_data);
-int for_each_branch_ref_submodule(const char *submodule,
- each_ref_fn fn, void *cb_data);
-int for_each_remote_ref_submodule(const char *submodule,
- each_ref_fn fn, void *cb_data);
-
int head_ref_namespaced(each_ref_fn fn, void *cb_data);
int for_each_namespaced_ref(each_ref_fn fn, void *cb_data);
@@ -321,6 +312,30 @@
int refs_for_each_rawref(struct ref_store *refs, each_ref_fn fn, void *cb_data);
int for_each_rawref(each_ref_fn fn, void *cb_data);
+/*
+ * Normalizes partial refs to their fully qualified form.
+ * Will prepend <prefix> to the <pattern> if it doesn't start with 'refs/'.
+ * <prefix> will default to 'refs/' if NULL.
+ *
+ * item.string will be set to the result.
+ * item.util will be set to NULL if <pattern> contains glob characters, or
+ * non-NULL if it doesn't.
+ */
+void normalize_glob_ref(struct string_list_item *item, const char *prefix,
+ const char *pattern);
+
+/*
+ * Returns 0 if refname matches any of the exclude_patterns, or if it doesn't
+ * match any of the include_patterns. Returns 1 otherwise.
+ *
+ * If pattern list is NULL or empty, matching against that list is skipped.
+ * This has the effect of matching everything by default, unless the user
+ * specifies rules otherwise.
+ */
+int ref_filter_match(const char *refname,
+ const struct string_list *include_patterns,
+ const struct string_list *exclude_patterns);
+
static inline const char *has_glob_specials(const char *pattern)
{
return strpbrk(pattern, "?*[");
@@ -345,24 +360,6 @@
int refs_pack_refs(struct ref_store *refs, unsigned int flags);
/*
- * Flags controlling ref_transaction_update(), ref_transaction_create(), etc.
- * REF_NODEREF: act on the ref directly, instead of dereferencing
- * symbolic references.
- *
- * Other flags are reserved for internal use.
- */
-#define REF_NODEREF 0x01
-#define REF_FORCE_CREATE_REFLOG 0x40
-
-/*
- * Flags that can be passed in to ref_transaction_update
- */
-#define REF_TRANSACTION_UPDATE_ALLOWED_FLAGS \
- REF_ISPRUNING | \
- REF_FORCE_CREATE_REFLOG | \
- REF_NODEREF
-
-/*
* Setup reflog before using. Fill in err and return -1 on failure.
*/
int refs_create_reflog(struct ref_store *refs, const char *refname,
@@ -372,7 +369,7 @@
/** Reads log for the value of ref during at_time. **/
int read_ref_at(const char *refname, unsigned int flags,
timestamp_t at_time, int cnt,
- unsigned char *sha1, char **msg,
+ struct object_id *oid, char **msg,
timestamp_t *cutoff_time, int *cutoff_tz, int *cutoff_cnt);
/** Check if a particular reflog exists */
@@ -380,19 +377,19 @@
int reflog_exists(const char *refname);
/*
- * Delete the specified reference. If old_sha1 is non-NULL, then
- * verify that the current value of the reference is old_sha1 before
- * deleting it. If old_sha1 is NULL, delete the reference if it
- * exists, regardless of its old value. It is an error for old_sha1 to
- * be NULL_SHA1. msg and flags are passed through to
+ * Delete the specified reference. If old_oid is non-NULL, then
+ * verify that the current value of the reference is old_oid before
+ * deleting it. If old_oid is NULL, delete the reference if it
+ * exists, regardless of its old value. It is an error for old_oid to
+ * be null_oid. msg and flags are passed through to
* ref_transaction_delete().
*/
int refs_delete_ref(struct ref_store *refs, const char *msg,
const char *refname,
- const unsigned char *old_sha1,
+ const struct object_id *old_oid,
unsigned int flags);
int delete_ref(const char *msg, const char *refname,
- const unsigned char *old_sha1, unsigned int flags);
+ const struct object_id *old_oid, unsigned int flags);
/*
* Delete the specified references. If there are any problems, emit
@@ -451,7 +448,14 @@
/** rename ref, return 0 on success **/
int refs_rename_ref(struct ref_store *refs, const char *oldref,
const char *newref, const char *logmsg);
-int rename_ref(const char *oldref, const char *newref, const char *logmsg);
+int rename_ref(const char *oldref, const char *newref,
+ const char *logmsg);
+
+/** copy ref, return 0 on success **/
+int refs_copy_existing_ref(struct ref_store *refs, const char *oldref,
+ const char *newref, const char *logmsg);
+int copy_existing_ref(const char *oldref, const char *newref,
+ const char *logmsg);
int refs_create_symref(struct ref_store *refs, const char *refname,
const char *target, const char *logmsg);
@@ -482,22 +486,23 @@
*
* refname -- the name of the reference to be affected.
*
- * new_sha1 -- the SHA-1 that should be set to be the new value of
- * the reference. Some functions allow this parameter to be
+ * new_oid -- the object ID that should be set to be the new value
+ * of the reference. Some functions allow this parameter to be
* NULL, meaning that the reference is not changed, or
- * null_sha1, meaning that the reference should be deleted. A
+ * null_oid, meaning that the reference should be deleted. A
* copy of this value is made in the transaction.
*
- * old_sha1 -- the SHA-1 value that the reference must have before
+ * old_oid -- the object ID that the reference must have before
* the update. Some functions allow this parameter to be NULL,
* meaning that the old value of the reference is not checked,
- * or null_sha1, meaning that the reference must not exist
+ * or null_oid, meaning that the reference must not exist
* before the update. A copy of this value is made in the
* transaction.
*
* flags -- flags affecting the update, passed to
- * update_ref_lock(). Can be REF_NODEREF, which means that
- * symbolic references should not be followed.
+ * update_ref_lock(). Possible flags: REF_NO_DEREF,
+ * REF_FORCE_CREATE_REFLOG. See those constants for more
+ * information.
*
* msg -- a message describing the change (for the reflog).
*
@@ -513,14 +518,40 @@
*/
/*
- * Add a reference update to transaction. new_sha1 is the value that
- * the reference should have after the update, or null_sha1 if it
- * should be deleted. If new_sha1 is NULL, then the reference is not
- * changed at all. old_sha1 is the value that the reference must have
- * before the update, or null_sha1 if it must not have existed
+ * The following flags can be passed to ref_transaction_update() etc.
+ * Internally, they are stored in `ref_update::flags`, along with some
+ * internal flags.
+ */
+
+/*
+ * Act on the ref directly; i.e., without dereferencing symbolic refs.
+ * If this flag is not specified, then symbolic references are
+ * dereferenced and the update is applied to the referent.
+ */
+#define REF_NO_DEREF (1 << 0)
+
+/*
+ * Force the creation of a reflog for this reference, even if it
+ * didn't previously have a reflog.
+ */
+#define REF_FORCE_CREATE_REFLOG (1 << 1)
+
+/*
+ * 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)
+
+/*
+ * Add a reference update to transaction. `new_oid` is the value that
+ * the reference should have after the update, or `null_oid` if it
+ * should be deleted. If `new_oid` is NULL, then the reference is not
+ * changed at all. `old_oid` is the value that the reference must have
+ * before the update, or `null_oid` if it must not have existed
* beforehand. The old value is checked after the lock is taken to
- * prevent races. If the old value doesn't agree with old_sha1, the
- * whole transaction fails. If old_sha1 is NULL, then the previous
+ * prevent races. If the old value doesn't agree with old_oid, the
+ * whole transaction fails. If old_oid is NULL, then the previous
* value is not checked.
*
* See the above comment "Reference transaction updates" for more
@@ -528,15 +559,15 @@
*/
int ref_transaction_update(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
+ const struct object_id *new_oid,
+ const struct object_id *old_oid,
unsigned int flags, const char *msg,
struct strbuf *err);
/*
- * Add a reference creation to transaction. new_sha1 is the value that
+ * Add a reference creation to transaction. new_oid is the value that
* the reference should have after the update; it must not be
- * null_sha1. It is verified that the reference does not exist
+ * null_oid. It is verified that the reference does not exist
* already.
*
* See the above comment "Reference transaction updates" for more
@@ -544,35 +575,35 @@
*/
int ref_transaction_create(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *new_sha1,
+ const struct object_id *new_oid,
unsigned int flags, const char *msg,
struct strbuf *err);
/*
- * Add a reference deletion to transaction. If old_sha1 is non-NULL,
+ * Add a reference deletion to transaction. If old_oid is non-NULL,
* then it holds the value that the reference should have had before
- * the update (which must not be null_sha1).
+ * the update (which must not be null_oid).
*
* See the above comment "Reference transaction updates" for more
* information.
*/
int ref_transaction_delete(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *old_sha1,
+ const struct object_id *old_oid,
unsigned int flags, const char *msg,
struct strbuf *err);
/*
- * Verify, within a transaction, that refname has the value old_sha1,
- * or, if old_sha1 is null_sha1, then verify that the reference
- * doesn't exist. old_sha1 must be non-NULL.
+ * Verify, within a transaction, that refname has the value old_oid,
+ * or, if old_oid is null_oid, then verify that the reference
+ * doesn't exist. old_oid must be non-NULL.
*
* See the above comment "Reference transaction updates" for more
* information.
*/
int ref_transaction_verify(struct ref_transaction *transaction,
const char *refname,
- const unsigned char *old_sha1,
+ const struct object_id *old_oid,
unsigned int flags,
struct strbuf *err);
@@ -626,7 +657,7 @@
* It is a bug to call this function when there might be other
* processes accessing the repository or if there are existing
* references that might conflict with the ones being created. All
- * old_sha1 values must either be absent or NULL_SHA1.
+ * old_oid values must either be absent or null_oid.
*/
int initial_ref_transaction_commit(struct ref_transaction *transaction,
struct strbuf *err);
@@ -645,12 +676,9 @@
* argument.
*/
int refs_update_ref(struct ref_store *refs, const char *msg, const char *refname,
- const unsigned char *new_sha1, const unsigned char *old_sha1,
+ const struct object_id *new_oid, const struct object_id *old_oid,
unsigned int flags, enum action_on_err onerr);
int update_ref(const char *msg, const char *refname,
- const unsigned char *new_sha1, const unsigned char *old_sha1,
- unsigned int flags, enum action_on_err onerr);
-int update_ref_oid(const char *msg, const char *refname,
const struct object_id *new_oid, const struct object_id *old_oid,
unsigned int flags, enum action_on_err onerr);
@@ -708,20 +736,20 @@
typedef void reflog_expiry_cleanup_fn(void *cb_data);
/*
- * Expire reflog entries for the specified reference. sha1 is the old
+ * Expire reflog entries for the specified reference. oid is the old
* value of the reference. flags is a combination of the constants in
* enum expire_reflog_flags. The three function pointers are described
* above. On success, return zero.
*/
int refs_reflog_expire(struct ref_store *refs,
const char *refname,
- const unsigned char *sha1,
+ const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
reflog_expiry_cleanup_fn cleanup_fn,
void *policy_cb_data);
-int reflog_expire(const char *refname, const unsigned char *sha1,
+int reflog_expire(const char *refname, const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
diff --git a/refs/files-backend.c b/refs/files-backend.c
index f21a954..bec8e30 100644
--- a/refs/files-backend.c
+++ b/refs/files-backend.c
@@ -3,49 +3,62 @@
#include "../refs.h"
#include "refs-internal.h"
#include "ref-cache.h"
+#include "packed-backend.h"
#include "../iterator.h"
#include "../dir-iterator.h"
#include "../lockfile.h"
#include "../object.h"
#include "../dir.h"
-struct ref_lock {
- char *ref_name;
- struct lock_file *lk;
- struct object_id old_oid;
-};
+/*
+ * 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`.
+ */
/*
- * Return true if refname, which has the specified oid and flags, can
- * be resolved to an object in the database. If the referred-to object
- * does not exist, emit a warning and return false.
+ * Used as a flag in ref_update::flags when a loose ref is being
+ * pruned. This flag must only be used when REF_NO_DEREF is set.
*/
-static int ref_resolves_to_object(const char *refname,
- const struct object_id *oid,
- unsigned int flags)
-{
- if (flags & REF_ISBROKEN)
- return 0;
- if (!has_sha1_file(oid->hash)) {
- error("%s does not point to a valid object!", refname);
- return 0;
- }
- return 1;
-}
+#define REF_IS_PRUNING (1 << 4)
-struct packed_ref_cache {
- struct ref_cache *cache;
+/*
+ * Flag passed to lock_ref_sha1_basic() telling it to tolerate broken
+ * refs (i.e., because the reference is about to be deleted anyway).
+ */
+#define REF_DELETING (1 << 5)
- /*
- * Count of references to the data structure in this instance,
- * including the pointer from files_ref_store::packed if any.
- * The data will not be freed as long as the reference count
- * is nonzero.
- */
- unsigned int referrers;
+/*
+ * Used as a flag in ref_update::flags when the lockfile needs to be
+ * committed.
+ */
+#define REF_NEEDS_COMMIT (1 << 6)
- /* The metadata from when this packed-refs cache was read */
- struct stat_validity validity;
+/*
+ * Used as a flag in ref_update::flags when we want to log a ref
+ * update but not actually perform it. This is used when a symbolic
+ * ref update is split up.
+ */
+#define REF_LOG_ONLY (1 << 7)
+
+/*
+ * Used as a flag in ref_update::flags when the ref_update was via an
+ * update to HEAD.
+ */
+#define REF_UPDATE_VIA_HEAD (1 << 8)
+
+/*
+ * Used as a flag in ref_update::flags when the loose reference has
+ * been deleted.
+ */
+#define REF_DELETED_LOOSE (1 << 9)
+
+struct ref_lock {
+ char *ref_name;
+ struct lock_file lk;
+ struct object_id old_oid;
};
/*
@@ -58,54 +71,12 @@
char *gitdir;
char *gitcommondir;
- char *packed_refs_path;
struct ref_cache *loose;
- struct packed_ref_cache *packed;
- /*
- * Lock used for the "packed-refs" file. Note that this (and
- * thus the enclosing `files_ref_store`) must not be freed.
- */
- struct lock_file packed_refs_lock;
+ struct ref_store *packed_ref_store;
};
-/*
- * Increment the reference count of *packed_refs.
- */
-static void acquire_packed_ref_cache(struct packed_ref_cache *packed_refs)
-{
- packed_refs->referrers++;
-}
-
-/*
- * Decrease the reference count of *packed_refs. If it goes to zero,
- * free *packed_refs and return true; otherwise return false.
- */
-static int release_packed_ref_cache(struct packed_ref_cache *packed_refs)
-{
- if (!--packed_refs->referrers) {
- free_ref_cache(packed_refs->cache);
- stat_validity_clear(&packed_refs->validity);
- free(packed_refs);
- return 1;
- } else {
- return 0;
- }
-}
-
-static void clear_packed_ref_cache(struct files_ref_store *refs)
-{
- if (refs->packed) {
- struct packed_ref_cache *packed_refs = refs->packed;
-
- if (is_lock_file_locked(&refs->packed_refs_lock))
- die("BUG: packed-ref cache cleared while locked");
- refs->packed = NULL;
- release_packed_ref_cache(packed_refs);
- }
-}
-
static void clear_loose_ref_cache(struct files_ref_store *refs)
{
if (refs->loose) {
@@ -132,7 +103,8 @@
get_common_dir_noenv(&sb, gitdir);
refs->gitcommondir = strbuf_detach(&sb, NULL);
strbuf_addf(&sb, "%s/packed-refs", refs->gitcommondir);
- refs->packed_refs_path = strbuf_detach(&sb, NULL);
+ refs->packed_ref_store = packed_ref_store_create(sb.buf, flags);
+ strbuf_release(&sb);
return ref_store;
}
@@ -175,169 +147,10 @@
return refs;
}
-/* The length of a peeled reference line in packed-refs, including EOL: */
-#define PEELED_LINE_LENGTH 42
-
-/*
- * The packed-refs header line that we write out. Perhaps other
- * traits will be added later. The trailing space is required.
- */
-static const char PACKED_REFS_HEADER[] =
- "# pack-refs with: peeled fully-peeled \n";
-
-/*
- * Parse one line from a packed-refs file. Write the SHA1 to sha1.
- * Return a pointer to the refname within the line (null-terminated),
- * or NULL if there was a problem.
- */
-static const char *parse_ref_line(struct strbuf *line, struct object_id *oid)
-{
- const char *ref;
-
- if (parse_oid_hex(line->buf, oid, &ref) < 0)
- return NULL;
- if (!isspace(*ref++))
- return NULL;
-
- if (isspace(*ref))
- return NULL;
-
- if (line->buf[line->len - 1] != '\n')
- return NULL;
- line->buf[--line->len] = 0;
-
- return ref;
-}
-
-/*
- * Read from `packed_refs_file` into a newly-allocated
- * `packed_ref_cache` and return it. The return value will already
- * have its reference count incremented.
- *
- * A comment line of the form "# pack-refs with: " may contain zero or
- * more traits. We interpret the traits as follows:
- *
- * No traits:
- *
- * Probably no references are peeled. But if the file contains a
- * peeled value for a reference, we will use it.
- *
- * peeled:
- *
- * References under "refs/tags/", if they *can* be peeled, *are*
- * peeled in this file. References outside of "refs/tags/" are
- * probably not peeled even if they could have been, but if we find
- * a peeled value for such a reference we will use it.
- *
- * fully-peeled:
- *
- * All references in the file that can be peeled are peeled.
- * Inversely (and this is more important), any references in the
- * file for which no peeled value is recorded is not peelable. This
- * trait should typically be written alongside "peeled" for
- * compatibility with older clients, but we do not require it
- * (i.e., "peeled" is a no-op if "fully-peeled" is set).
- */
-static struct packed_ref_cache *read_packed_refs(const char *packed_refs_file)
-{
- FILE *f;
- struct packed_ref_cache *packed_refs = xcalloc(1, sizeof(*packed_refs));
- struct ref_entry *last = NULL;
- struct strbuf line = STRBUF_INIT;
- enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled = PEELED_NONE;
- struct ref_dir *dir;
-
- acquire_packed_ref_cache(packed_refs);
- packed_refs->cache = create_ref_cache(NULL, NULL);
- packed_refs->cache->root->flag &= ~REF_INCOMPLETE;
-
- f = fopen(packed_refs_file, "r");
- if (!f) {
- if (errno == ENOENT) {
- /*
- * This is OK; it just means that no
- * "packed-refs" file has been written yet,
- * which is equivalent to it being empty.
- */
- return packed_refs;
- } else {
- die_errno("couldn't read %s", packed_refs_file);
- }
- }
-
- stat_validity_update(&packed_refs->validity, fileno(f));
-
- dir = get_ref_dir(packed_refs->cache->root);
- while (strbuf_getwholeline(&line, f, '\n') != EOF) {
- struct object_id oid;
- const char *refname;
- const char *traits;
-
- if (skip_prefix(line.buf, "# pack-refs with:", &traits)) {
- if (strstr(traits, " fully-peeled "))
- peeled = PEELED_FULLY;
- else if (strstr(traits, " peeled "))
- peeled = PEELED_TAGS;
- /* perhaps other traits later as well */
- continue;
- }
-
- refname = parse_ref_line(&line, &oid);
- if (refname) {
- int flag = REF_ISPACKED;
-
- if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL)) {
- if (!refname_is_safe(refname))
- die("packed refname is dangerous: %s", refname);
- oidclr(&oid);
- flag |= REF_BAD_NAME | REF_ISBROKEN;
- }
- last = create_ref_entry(refname, &oid, flag);
- if (peeled == PEELED_FULLY ||
- (peeled == PEELED_TAGS && starts_with(refname, "refs/tags/")))
- last->flag |= REF_KNOWS_PEELED;
- add_ref_entry(dir, last);
- continue;
- }
- if (last &&
- line.buf[0] == '^' &&
- line.len == PEELED_LINE_LENGTH &&
- line.buf[PEELED_LINE_LENGTH - 1] == '\n' &&
- !get_oid_hex(line.buf + 1, &oid)) {
- oidcpy(&last->u.value.peeled, &oid);
- /*
- * Regardless of what the file header said,
- * we definitely know the value of *this*
- * reference:
- */
- last->flag |= REF_KNOWS_PEELED;
- }
- }
-
- fclose(f);
- strbuf_release(&line);
-
- return packed_refs;
-}
-
-static const char *files_packed_refs_path(struct files_ref_store *refs)
-{
- return refs->packed_refs_path;
-}
-
static void files_reflog_path(struct files_ref_store *refs,
struct strbuf *sb,
const char *refname)
{
- if (!refname) {
- /*
- * FIXME: of course this is wrong in multi worktree
- * setting. To be fixed real soon.
- */
- strbuf_addf(sb, "%s/logs", refs->gitcommondir);
- return;
- }
-
switch (ref_type(refname)) {
case REF_TYPE_PER_WORKTREE:
case REF_TYPE_PSEUDOREF:
@@ -371,70 +184,6 @@
}
/*
- * Check that the packed refs cache (if any) still reflects the
- * contents of the file. If not, clear the cache.
- */
-static void validate_packed_ref_cache(struct files_ref_store *refs)
-{
- if (refs->packed &&
- !stat_validity_check(&refs->packed->validity,
- files_packed_refs_path(refs)))
- clear_packed_ref_cache(refs);
-}
-
-/*
- * Get the packed_ref_cache for the specified files_ref_store,
- * creating and populating it if it hasn't been read before or if the
- * file has been changed (according to its `validity` field) since it
- * was last read. On the other hand, if we hold the lock, then assume
- * that the file hasn't been changed out from under us, so skip the
- * extra `stat()` call in `stat_validity_check()`.
- */
-static struct packed_ref_cache *get_packed_ref_cache(struct files_ref_store *refs)
-{
- const char *packed_refs_file = files_packed_refs_path(refs);
-
- if (!is_lock_file_locked(&refs->packed_refs_lock))
- validate_packed_ref_cache(refs);
-
- if (!refs->packed)
- refs->packed = read_packed_refs(packed_refs_file);
-
- return refs->packed;
-}
-
-static struct ref_dir *get_packed_ref_dir(struct packed_ref_cache *packed_ref_cache)
-{
- return get_ref_dir(packed_ref_cache->cache->root);
-}
-
-static struct ref_dir *get_packed_refs(struct files_ref_store *refs)
-{
- return get_packed_ref_dir(get_packed_ref_cache(refs));
-}
-
-/*
- * Add a reference to the in-memory packed reference cache. This may
- * only be called while the packed-refs file is locked (see
- * lock_packed_refs()). To actually write the packed-refs file, call
- * commit_packed_refs().
- */
-static void add_packed_ref(struct files_ref_store *refs,
- const char *refname, const struct object_id *oid)
-{
- struct packed_ref_cache *packed_ref_cache = get_packed_ref_cache(refs);
-
- if (!is_lock_file_locked(&refs->packed_refs_lock))
- die("BUG: packed refs not locked");
-
- if (check_refname_format(refname, REFNAME_ALLOW_ONELEVEL))
- die("Reference has invalid format: '%s'", refname);
-
- add_ref_entry(get_packed_ref_dir(packed_ref_cache),
- create_ref_entry(refname, oid, REF_ISPACKED));
-}
-
-/*
* Read the loose references from the namespace dirname into dir
* (without recursing). dirname must end with '/'. dir must be the
* directory entry corresponding to dirname.
@@ -485,13 +234,13 @@
if (!refs_resolve_ref_unsafe(&refs->base,
refname.buf,
RESOLVE_REF_READING,
- oid.hash, &flag)) {
+ &oid, &flag)) {
oidclr(&oid);
flag |= REF_ISBROKEN;
} else if (is_null_oid(&oid)) {
/*
* It is so astronomically unlikely
- * that NULL_SHA1 is the SHA-1 of an
+ * that null_oid is the OID of an
* actual object that we consider its
* appearance in a loose reference
* file to be repo corruption
@@ -556,41 +305,8 @@
return refs->loose;
}
-/*
- * Return the ref_entry for the given refname from the packed
- * references. If it does not exist, return NULL.
- */
-static struct ref_entry *get_packed_ref(struct files_ref_store *refs,
- const char *refname)
-{
- return find_ref_entry(get_packed_refs(refs), refname);
-}
-
-/*
- * A loose ref file doesn't exist; check for a packed ref.
- */
-static int resolve_packed_ref(struct files_ref_store *refs,
- const char *refname,
- unsigned char *sha1, unsigned int *flags)
-{
- struct ref_entry *entry;
-
- /*
- * The loose reference file does not exist; check for a packed
- * reference.
- */
- entry = get_packed_ref(refs, refname);
- if (entry) {
- hashcpy(sha1, entry->u.value.oid.hash);
- *flags |= REF_ISPACKED;
- return 0;
- }
- /* refname is not a packed reference. */
- return -1;
-}
-
static int files_read_raw_ref(struct ref_store *ref_store,
- const char *refname, unsigned char *sha1,
+ const char *refname, struct object_id *oid,
struct strbuf *referent, unsigned int *type)
{
struct files_ref_store *refs =
@@ -599,6 +315,7 @@
struct strbuf sb_path = STRBUF_INIT;
const char *path;
const char *buf;
+ const char *p;
struct stat st;
int fd;
int ret = -1;
@@ -632,7 +349,8 @@
if (lstat(path, &st) < 0) {
if (errno != ENOENT)
goto out;
- if (resolve_packed_ref(refs, refname, sha1, type)) {
+ if (refs_read_raw_ref(refs->packed_ref_store, refname,
+ oid, referent, type)) {
errno = ENOENT;
goto out;
}
@@ -671,7 +389,8 @@
* ref is supposed to be, there could still be a
* packed ref:
*/
- if (resolve_packed_ref(refs, refname, sha1, type)) {
+ if (refs_read_raw_ref(refs->packed_ref_store, refname,
+ oid, referent, type)) {
errno = EISDIR;
goto out;
}
@@ -717,8 +436,8 @@
* Please note that FETCH_HEAD has additional
* data after the sha.
*/
- if (get_sha1_hex(buf, sha1) ||
- (buf[40] != '\0' && !isspace(buf[40]))) {
+ if (parse_oid_hex(buf, oid, &p) ||
+ (*p != '\0' && !isspace(*p))) {
*type |= REF_ISBROKEN;
errno = EINVAL;
goto out;
@@ -736,9 +455,7 @@
static void unlock_ref(struct ref_lock *lock)
{
- /* Do not free lock->lk -- atexit() still looks at them */
- if (lock->lk)
- rollback_lock_file(lock->lk);
+ rollback_lock_file(&lock->lk);
free(lock->ref_name);
free(lock);
}
@@ -756,7 +473,7 @@
* are passed to refs_verify_refname_available() for this check.
*
* If mustexist is not set and the reference is not found or is
- * broken, lock the reference anyway but clear sha1.
+ * broken, lock the reference anyway but clear old_oid.
*
* Return 0 on success. On failure, write an error message to err and
* return TRANSACTION_NAME_CONFLICT or TRANSACTION_GENERIC_ERROR.
@@ -852,10 +569,9 @@
goto error_return;
}
- if (!lock->lk)
- lock->lk = xcalloc(1, sizeof(struct lock_file));
-
- if (hold_lock_file_for_update(lock->lk, ref_file.buf, LOCK_NO_DEREF) < 0) {
+ if (hold_lock_file_for_update_timeout(
+ &lock->lk, ref_file.buf, LOCK_NO_DEREF,
+ get_files_ref_lock_timeout_ms()) < 0) {
if (errno == ENOENT && --attempts_remaining > 0) {
/*
* Maybe somebody just deleted one of the
@@ -875,7 +591,7 @@
*/
if (files_read_raw_ref(&refs->base, refname,
- lock->old_oid.hash, referent, type)) {
+ &lock->old_oid, referent, type)) {
if (errno == ENOENT) {
if (mustexist) {
/* Garden variety missing reference. */
@@ -950,11 +666,11 @@
/*
* If the ref did not exist and we are creating it,
- * make sure there is no existing ref that conflicts
- * with refname:
+ * make sure there is no existing packed ref that
+ * conflicts with refname:
*/
if (refs_verify_refname_available(
- &refs->base, refname,
+ refs->packed_ref_store, refname,
extras, skip, err))
goto error_return;
}
@@ -971,53 +687,9 @@
return ret;
}
-static int files_peel_ref(struct ref_store *ref_store,
- const char *refname, unsigned char *sha1)
-{
- struct files_ref_store *refs =
- files_downcast(ref_store, REF_STORE_READ | REF_STORE_ODB,
- "peel_ref");
- int flag;
- unsigned char base[20];
-
- if (current_ref_iter && current_ref_iter->refname == refname) {
- struct object_id peeled;
-
- if (ref_iterator_peel(current_ref_iter, &peeled))
- return -1;
- hashcpy(sha1, peeled.hash);
- return 0;
- }
-
- if (refs_read_ref_full(ref_store, refname,
- RESOLVE_REF_READING, base, &flag))
- return -1;
-
- /*
- * If the reference is packed, read its ref_entry from the
- * cache in the hope that we already know its peeled value.
- * We only try this optimization on packed references because
- * (a) forcing the filling of the loose reference cache could
- * be expensive and (b) loose references anyway usually do not
- * have REF_KNOWS_PEELED.
- */
- if (flag & REF_ISPACKED) {
- struct ref_entry *r = get_packed_ref(refs, refname);
- if (r) {
- if (peel_entry(r, 0))
- return -1;
- hashcpy(sha1, r->u.value.peeled.hash);
- return 0;
- }
- }
-
- return peel_object(base, sha1);
-}
-
struct files_ref_iterator {
struct ref_iterator base;
- struct packed_ref_cache *packed_ref_cache;
struct ref_iterator *iter0;
unsigned int flags;
};
@@ -1070,7 +742,6 @@
if (iter->iter0)
ok = ref_iterator_abort(iter->iter0);
- release_packed_ref_cache(iter->packed_ref_cache);
base_ref_iterator_free(ref_iterator);
return ok;
}
@@ -1086,7 +757,7 @@
const char *prefix, unsigned int flags)
{
struct files_ref_store *refs;
- struct ref_iterator *loose_iter, *packed_iter;
+ struct ref_iterator *loose_iter, *packed_iter, *overlay_iter;
struct files_ref_iterator *iter;
struct ref_iterator *ref_iterator;
unsigned int required_flags = REF_STORE_READ;
@@ -1096,10 +767,6 @@
refs = files_downcast(ref_store, required_flags, "ref_iterator_begin");
- iter = xcalloc(1, sizeof(*iter));
- ref_iterator = &iter->base;
- base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable);
-
/*
* We must make sure that all loose refs are read before
* accessing the packed-refs file; this avoids a race
@@ -1112,41 +779,57 @@
* (If they've already been read, that's OK; we only need to
* guarantee that they're read before the packed refs, not
* *how much* before.) After that, we call
- * get_packed_ref_cache(), which internally checks whether the
- * packed-ref cache is up to date with what is on disk, and
- * re-reads it if not.
+ * packed_ref_iterator_begin(), which internally checks
+ * whether the packed-ref cache is up to date with what is on
+ * disk, and re-reads it if not.
*/
loose_iter = cache_ref_iterator_begin(get_loose_ref_cache(refs),
prefix, 1);
- iter->packed_ref_cache = get_packed_ref_cache(refs);
- acquire_packed_ref_cache(iter->packed_ref_cache);
- packed_iter = cache_ref_iterator_begin(iter->packed_ref_cache->cache,
- prefix, 0);
+ /*
+ * The packed-refs file might contain broken references, for
+ * example an old version of a reference that points at an
+ * object that has since been garbage-collected. This is OK as
+ * long as there is a corresponding loose reference that
+ * overrides it, and we don't want to emit an error message in
+ * this case. So ask the packed_ref_store for all of its
+ * references, and (if needed) do our own check for broken
+ * ones in files_ref_iterator_advance(), after we have merged
+ * the packed and loose references.
+ */
+ packed_iter = refs_ref_iterator_begin(
+ refs->packed_ref_store, prefix, 0,
+ DO_FOR_EACH_INCLUDE_BROKEN);
- iter->iter0 = overlay_ref_iterator_begin(loose_iter, packed_iter);
+ overlay_iter = overlay_ref_iterator_begin(loose_iter, packed_iter);
+
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+ base_ref_iterator_init(ref_iterator, &files_ref_iterator_vtable,
+ overlay_iter->ordered);
+ iter->iter0 = overlay_iter;
iter->flags = flags;
return ref_iterator;
}
/*
- * Verify that the reference locked by lock has the value old_sha1.
- * Fail if the reference doesn't exist and mustexist is set. Return 0
- * on success. On error, write an error message to err, set errno, and
- * return a negative value.
+ * Verify that the reference locked by lock has the value old_oid
+ * (unless it is NULL). Fail if the reference doesn't exist and
+ * mustexist is set. Return 0 on success. On error, write an error
+ * message to err, set errno, and return a negative value.
*/
static int verify_lock(struct ref_store *ref_store, struct ref_lock *lock,
- const unsigned char *old_sha1, int mustexist,
+ const struct object_id *old_oid, int mustexist,
struct strbuf *err)
{
assert(err);
if (refs_read_ref_full(ref_store, lock->ref_name,
mustexist ? RESOLVE_REF_READING : 0,
- lock->old_oid.hash, NULL)) {
- if (old_sha1) {
+ &lock->old_oid, NULL)) {
+ if (old_oid) {
int save_errno = errno;
strbuf_addf(err, "can't verify ref '%s'", lock->ref_name);
errno = save_errno;
@@ -1156,11 +839,11 @@
return 0;
}
}
- if (old_sha1 && hashcmp(lock->old_oid.hash, old_sha1)) {
+ if (old_oid && oidcmp(&lock->old_oid, old_oid)) {
strbuf_addf(err, "ref '%s' is at %s but expected %s",
lock->ref_name,
oid_to_hex(&lock->old_oid),
- sha1_to_hex(old_sha1));
+ oid_to_hex(old_oid));
errno = EBUSY;
return -1;
}
@@ -1181,29 +864,31 @@
{
struct lock_file *lk = cb;
- return hold_lock_file_for_update(lk, path, LOCK_NO_DEREF) < 0 ? -1 : 0;
+ return hold_lock_file_for_update_timeout(
+ lk, path, LOCK_NO_DEREF,
+ get_files_ref_lock_timeout_ms()) < 0 ? -1 : 0;
}
/*
* Locks a ref returning the lock on success and NULL on failure.
* On failure errno is set to something meaningful.
*/
-static struct ref_lock *lock_ref_sha1_basic(struct files_ref_store *refs,
- const char *refname,
- const unsigned char *old_sha1,
- const struct string_list *extras,
- const struct string_list *skip,
- unsigned int flags, int *type,
- struct strbuf *err)
+static struct ref_lock *lock_ref_oid_basic(struct files_ref_store *refs,
+ const char *refname,
+ const struct object_id *old_oid,
+ const struct string_list *extras,
+ const struct string_list *skip,
+ unsigned int flags, int *type,
+ struct strbuf *err)
{
struct strbuf ref_file = STRBUF_INIT;
struct ref_lock *lock;
int last_errno = 0;
- int mustexist = (old_sha1 && !is_null_sha1(old_sha1));
+ int mustexist = (old_oid && !is_null_oid(old_oid));
int resolve_flags = RESOLVE_REF_NO_RECURSE;
int resolved;
- files_assert_main_repository(refs, "lock_ref_sha1_basic");
+ files_assert_main_repository(refs, "lock_ref_oid_basic");
assert(err);
lock = xcalloc(1, sizeof(struct ref_lock));
@@ -1216,7 +901,7 @@
files_ref_path(refs, &ref_file, refname);
resolved = !!refs_resolve_ref_unsafe(&refs->base,
refname, resolve_flags,
- lock->old_oid.hash, type);
+ &lock->old_oid, type);
if (!resolved && errno == EISDIR) {
/*
* we are trying to lock foo but we used to
@@ -1235,7 +920,7 @@
}
resolved = !!refs_resolve_ref_unsafe(&refs->base,
refname, resolve_flags,
- lock->old_oid.hash, type);
+ &lock->old_oid, type);
}
if (!resolved) {
last_errno = errno;
@@ -1255,23 +940,21 @@
* our refname.
*/
if (is_null_oid(&lock->old_oid) &&
- refs_verify_refname_available(&refs->base, refname,
+ refs_verify_refname_available(refs->packed_ref_store, refname,
extras, skip, err)) {
last_errno = ENOTDIR;
goto error_return;
}
- lock->lk = xcalloc(1, sizeof(struct lock_file));
-
lock->ref_name = xstrdup(refname);
- if (raceproof_create_file(ref_file.buf, create_reflock, lock->lk)) {
+ if (raceproof_create_file(ref_file.buf, create_reflock, &lock->lk)) {
last_errno = errno;
unable_to_lock_message(ref_file.buf, errno, err);
goto error_return;
}
- if (verify_lock(&refs->base, lock, old_sha1, mustexist, err)) {
+ if (verify_lock(&refs->base, lock, old_oid, mustexist, err)) {
last_errno = errno;
goto error_return;
}
@@ -1287,127 +970,9 @@
return lock;
}
-/*
- * Write an entry to the packed-refs file for the specified refname.
- * If peeled is non-NULL, write it as the entry's peeled value.
- */
-static void write_packed_entry(FILE *fh, const char *refname,
- const unsigned char *sha1,
- const unsigned char *peeled)
-{
- fprintf_or_die(fh, "%s %s\n", sha1_to_hex(sha1), refname);
- if (peeled)
- fprintf_or_die(fh, "^%s\n", sha1_to_hex(peeled));
-}
-
-/*
- * Lock the packed-refs file for writing. Flags is passed to
- * hold_lock_file_for_update(). Return 0 on success. On errors, set
- * errno appropriately and return a nonzero value.
- */
-static int lock_packed_refs(struct files_ref_store *refs, int flags)
-{
- static int timeout_configured = 0;
- static int timeout_value = 1000;
- struct packed_ref_cache *packed_ref_cache;
-
- files_assert_main_repository(refs, "lock_packed_refs");
-
- if (!timeout_configured) {
- git_config_get_int("core.packedrefstimeout", &timeout_value);
- timeout_configured = 1;
- }
-
- if (hold_lock_file_for_update_timeout(
- &refs->packed_refs_lock, files_packed_refs_path(refs),
- flags, timeout_value) < 0)
- return -1;
-
- /*
- * Now that we hold the `packed-refs` lock, make sure that our
- * cache matches the current version of the file. Normally
- * `get_packed_ref_cache()` does that for us, but that
- * function assumes that when the file is locked, any existing
- * cache is still valid. We've just locked the file, but it
- * might have changed the moment *before* we locked it.
- */
- validate_packed_ref_cache(refs);
-
- packed_ref_cache = get_packed_ref_cache(refs);
- /* Increment the reference count to prevent it from being freed: */
- acquire_packed_ref_cache(packed_ref_cache);
- return 0;
-}
-
-/*
- * Write the current version of the packed refs cache from memory to
- * disk. The packed-refs file must already be locked for writing (see
- * lock_packed_refs()). Return zero on success. On errors, set errno
- * and return a nonzero value
- */
-static int commit_packed_refs(struct files_ref_store *refs)
-{
- struct packed_ref_cache *packed_ref_cache =
- get_packed_ref_cache(refs);
- int ok, error = 0;
- int save_errno = 0;
- FILE *out;
- struct ref_iterator *iter;
-
- files_assert_main_repository(refs, "commit_packed_refs");
-
- if (!is_lock_file_locked(&refs->packed_refs_lock))
- die("BUG: packed-refs not locked");
-
- out = fdopen_lock_file(&refs->packed_refs_lock, "w");
- if (!out)
- die_errno("unable to fdopen packed-refs descriptor");
-
- fprintf_or_die(out, "%s", PACKED_REFS_HEADER);
-
- iter = cache_ref_iterator_begin(packed_ref_cache->cache, NULL, 0);
- while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
- struct object_id peeled;
- int peel_error = ref_iterator_peel(iter, &peeled);
-
- write_packed_entry(out, iter->refname, iter->oid->hash,
- peel_error ? NULL : peeled.hash);
- }
-
- if (ok != ITER_DONE)
- die("error while iterating over references");
-
- if (commit_lock_file(&refs->packed_refs_lock)) {
- save_errno = errno;
- error = -1;
- }
- release_packed_ref_cache(packed_ref_cache);
- errno = save_errno;
- return error;
-}
-
-/*
- * Rollback the lockfile for the packed-refs file, and discard the
- * in-memory packed reference cache. (The packed-refs file will be
- * read anew if it is needed again after this function is called.)
- */
-static void rollback_packed_refs(struct files_ref_store *refs)
-{
- struct packed_ref_cache *packed_ref_cache =
- get_packed_ref_cache(refs);
-
- files_assert_main_repository(refs, "rollback_packed_refs");
-
- if (!is_lock_file_locked(&refs->packed_refs_lock))
- die("BUG: packed-refs not locked");
- rollback_lock_file(&refs->packed_refs_lock);
- release_packed_ref_cache(packed_ref_cache);
- clear_packed_ref_cache(refs);
-}
-
struct ref_to_prune {
struct ref_to_prune *next;
- unsigned char sha1[20];
+ struct object_id oid;
char name[FLEX_ARRAY];
};
@@ -1469,29 +1034,42 @@
{
struct ref_transaction *transaction;
struct strbuf err = STRBUF_INIT;
+ int ret = -1;
if (check_refname_format(r->name, 0))
return;
transaction = ref_store_transaction_begin(&refs->base, &err);
- if (!transaction ||
- ref_transaction_delete(transaction, r->name, r->sha1,
- REF_ISPRUNING | REF_NODEREF, NULL, &err) ||
- ref_transaction_commit(transaction, &err)) {
- ref_transaction_free(transaction);
+ if (!transaction)
+ goto cleanup;
+ ref_transaction_add_update(
+ transaction, r->name,
+ REF_NO_DEREF | REF_HAVE_NEW | REF_HAVE_OLD | REF_IS_PRUNING,
+ &null_oid, &r->oid, NULL);
+ if (ref_transaction_commit(transaction, &err))
+ goto cleanup;
+
+ ret = 0;
+
+cleanup:
+ if (ret)
error("%s", err.buf);
- strbuf_release(&err);
- return;
- }
- ref_transaction_free(transaction);
strbuf_release(&err);
+ ref_transaction_free(transaction);
+ return;
}
-static void prune_refs(struct files_ref_store *refs, struct ref_to_prune *r)
+/*
+ * Prune the loose versions of the references in the linked list
+ * `*refs_to_prune`, freeing the entries in the list as we go.
+ */
+static void prune_refs(struct files_ref_store *refs, struct ref_to_prune **refs_to_prune)
{
- while (r) {
+ while (*refs_to_prune) {
+ struct ref_to_prune *r = *refs_to_prune;
+ *refs_to_prune = r->next;
prune_ref(refs, r);
- r = r->next;
+ free(r);
}
}
@@ -1527,12 +1105,16 @@
files_downcast(ref_store, REF_STORE_WRITE | REF_STORE_ODB,
"pack_refs");
struct ref_iterator *iter;
- struct ref_dir *packed_refs;
int ok;
struct ref_to_prune *refs_to_prune = NULL;
+ struct strbuf err = STRBUF_INIT;
+ struct ref_transaction *transaction;
- lock_packed_refs(refs, LOCK_DIE_ON_ERROR);
- packed_refs = get_packed_refs(refs);
+ transaction = ref_store_transaction_begin(refs->packed_ref_store, &err);
+ if (!transaction)
+ return -1;
+
+ packed_refs_lock(refs->packed_ref_store, LOCK_DIE_ON_ERROR, &err);
iter = cache_ref_iterator_begin(get_loose_ref_cache(refs), NULL, 0);
while ((ok = ref_iterator_advance(iter)) == ITER_OK) {
@@ -1541,35 +1123,25 @@
* in the packed ref cache. If the reference should be
* pruned, also add it to refs_to_prune.
*/
- struct ref_entry *packed_entry;
-
if (!should_pack_ref(iter->refname, iter->oid, iter->flags,
flags))
continue;
/*
- * Create an entry in the packed-refs cache equivalent
- * to the one from the loose ref cache, except that
- * we don't copy the peeled status, because we want it
- * to be re-peeled.
+ * Add a reference creation for this reference to the
+ * packed-refs transaction:
*/
- packed_entry = find_ref_entry(packed_refs, iter->refname);
- if (packed_entry) {
- /* Overwrite existing packed entry with info from loose entry */
- packed_entry->flag = REF_ISPACKED;
- oidcpy(&packed_entry->u.value.oid, iter->oid);
- } else {
- packed_entry = create_ref_entry(iter->refname, iter->oid,
- REF_ISPACKED);
- add_ref_entry(packed_refs, packed_entry);
- }
- oidclr(&packed_entry->u.value.peeled);
+ if (ref_transaction_update(transaction, iter->refname,
+ iter->oid, NULL,
+ REF_NO_DEREF, NULL, &err))
+ die("failure preparing to create packed reference %s: %s",
+ iter->refname, err.buf);
/* Schedule the loose reference for pruning if requested. */
if ((flags & PACK_REFS_PRUNE)) {
struct ref_to_prune *n;
FLEX_ALLOC_STR(n, name, iter->refname);
- hashcpy(n->sha1, iter->oid->hash);
+ oidcpy(&n->oid, iter->oid);
n->next = refs_to_prune;
refs_to_prune = n;
}
@@ -1577,69 +1149,18 @@
if (ok != ITER_DONE)
die("error while iterating over references");
- if (commit_packed_refs(refs))
- die_errno("unable to overwrite old ref-pack file");
+ if (ref_transaction_commit(transaction, &err))
+ die("unable to write new packed-refs: %s", err.buf);
- prune_refs(refs, refs_to_prune);
+ ref_transaction_free(transaction);
+
+ packed_refs_unlock(refs->packed_ref_store);
+
+ prune_refs(refs, &refs_to_prune);
+ strbuf_release(&err);
return 0;
}
-/*
- * Rewrite the packed-refs file, omitting any refs listed in
- * 'refnames'. On error, leave packed-refs unchanged, write an error
- * message to 'err', and return a nonzero value.
- *
- * The refs in 'refnames' needn't be sorted. `err` must not be NULL.
- */
-static int repack_without_refs(struct files_ref_store *refs,
- struct string_list *refnames, struct strbuf *err)
-{
- struct ref_dir *packed;
- struct string_list_item *refname;
- int ret, needs_repacking = 0, removed = 0;
-
- files_assert_main_repository(refs, "repack_without_refs");
- assert(err);
-
- /* Look for a packed ref */
- for_each_string_list_item(refname, refnames) {
- if (get_packed_ref(refs, refname->string)) {
- needs_repacking = 1;
- break;
- }
- }
-
- /* Avoid locking if we have nothing to do */
- if (!needs_repacking)
- return 0; /* no refname exists in packed refs */
-
- if (lock_packed_refs(refs, 0)) {
- unable_to_lock_message(files_packed_refs_path(refs), errno, err);
- return -1;
- }
- packed = get_packed_refs(refs);
-
- /* Remove refnames from the cache */
- for_each_string_list_item(refname, refnames)
- if (remove_entry_from_dir(packed, refname->string) != -1)
- removed = 1;
- if (!removed) {
- /*
- * All packed entries disappeared while we were
- * acquiring the lock.
- */
- rollback_packed_refs(refs);
- return 0;
- }
-
- /* Write what remains */
- ret = commit_packed_refs(refs);
- if (ret)
- strbuf_addf(err, "unable to overwrite old ref-pack file: %s",
- strerror(errno));
- return ret;
-}
-
static int files_delete_refs(struct ref_store *ref_store, const char *msg,
struct string_list *refnames, unsigned int flags)
{
@@ -1651,24 +1172,16 @@
if (!refnames->nr)
return 0;
- result = repack_without_refs(refs, refnames, &err);
- if (result) {
- /*
- * If we failed to rewrite the packed-refs file, then
- * it is unsafe to try to remove loose refs, because
- * doing so might expose an obsolete packed value for
- * a reference that might even point at an object that
- * has been garbage collected.
- */
- if (refnames->nr == 1)
- error(_("could not delete reference %s: %s"),
- refnames->items[0].string, err.buf);
- else
- error(_("could not delete references: %s"), err.buf);
+ if (packed_refs_lock(refs->packed_ref_store, 0, &err))
+ goto error;
- goto out;
+ if (refs_delete_refs(refs->packed_ref_store, msg, refnames, flags)) {
+ packed_refs_unlock(refs->packed_ref_store);
+ goto error;
}
+ packed_refs_unlock(refs->packed_ref_store);
+
for (i = 0; i < refnames->nr; i++) {
const char *refname = refnames->items[i].string;
@@ -1676,9 +1189,24 @@
result |= error(_("could not remove reference %s"), refname);
}
-out:
strbuf_release(&err);
return result;
+
+error:
+ /*
+ * If we failed to rewrite the packed-refs file, then it is
+ * unsafe to try to remove loose refs, because doing so might
+ * expose an obsolete packed value for a reference that might
+ * even point at an object that has been garbage collected.
+ */
+ if (refnames->nr == 1)
+ error(_("could not delete reference %s: %s"),
+ refnames->items[0].string, err.buf);
+ else
+ error(_("could not delete references: %s"), err.buf);
+
+ strbuf_release(&err);
+ return -1;
}
/*
@@ -1748,9 +1276,9 @@
const struct object_id *oid, const char *logmsg,
struct strbuf *err);
-static int files_rename_ref(struct ref_store *ref_store,
+static int files_copy_or_rename_ref(struct ref_store *ref_store,
const char *oldrefname, const char *newrefname,
- const char *logmsg)
+ const char *logmsg, int copy)
{
struct files_ref_store *refs =
files_downcast(ref_store, REF_STORE_WRITE, "rename_ref");
@@ -1776,14 +1304,18 @@
if (!refs_resolve_ref_unsafe(&refs->base, oldrefname,
RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
- orig_oid.hash, &flag)) {
+ &orig_oid, &flag)) {
ret = error("refname %s not found", oldrefname);
goto out;
}
if (flag & REF_ISSYMREF) {
- ret = error("refname %s is a symbolic ref, renaming it is not supported",
- oldrefname);
+ if (copy)
+ ret = error("refname %s is a symbolic ref, copying it is not supported",
+ oldrefname);
+ else
+ ret = error("refname %s is a symbolic ref, renaming it is not supported",
+ oldrefname);
goto out;
}
if (!refs_rename_ref_available(&refs->base, oldrefname, newrefname)) {
@@ -1791,14 +1323,20 @@
goto out;
}
- if (log && rename(sb_oldref.buf, tmp_renamed_log.buf)) {
+ if (!copy && log && rename(sb_oldref.buf, tmp_renamed_log.buf)) {
ret = error("unable to move logfile logs/%s to logs/"TMP_RENAMED_LOG": %s",
oldrefname, strerror(errno));
goto out;
}
- if (refs_delete_ref(&refs->base, logmsg, oldrefname,
- orig_oid.hash, REF_NODEREF)) {
+ if (copy && log && copy_file(tmp_renamed_log.buf, sb_oldref.buf, 0644)) {
+ ret = error("unable to copy logfile logs/%s to logs/"TMP_RENAMED_LOG": %s",
+ oldrefname, strerror(errno));
+ goto out;
+ }
+
+ if (!copy && refs_delete_ref(&refs->base, logmsg, oldrefname,
+ &orig_oid, REF_NO_DEREF)) {
error("unable to delete old %s", oldrefname);
goto rollback;
}
@@ -1810,11 +1348,11 @@
* the safety anyway; we want to delete the reference whatever
* its current value.
*/
- if (!refs_read_ref_full(&refs->base, newrefname,
+ if (!copy && !refs_read_ref_full(&refs->base, newrefname,
RESOLVE_REF_READING | RESOLVE_REF_NO_RECURSE,
- oid.hash, NULL) &&
+ &oid, NULL) &&
refs_delete_ref(&refs->base, NULL, newrefname,
- NULL, REF_NODEREF)) {
+ NULL, REF_NO_DEREF)) {
if (errno == EISDIR) {
struct strbuf path = STRBUF_INIT;
int result;
@@ -1838,10 +1376,13 @@
logmoved = log;
- lock = lock_ref_sha1_basic(refs, newrefname, NULL, NULL, NULL,
- REF_NODEREF, NULL, &err);
+ lock = lock_ref_oid_basic(refs, newrefname, NULL, NULL, NULL,
+ REF_NO_DEREF, NULL, &err);
if (!lock) {
- error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
+ if (copy)
+ error("unable to copy '%s' to '%s': %s", oldrefname, newrefname, err.buf);
+ else
+ error("unable to rename '%s' to '%s': %s", oldrefname, newrefname, err.buf);
strbuf_release(&err);
goto rollback;
}
@@ -1858,8 +1399,8 @@
goto out;
rollback:
- lock = lock_ref_sha1_basic(refs, oldrefname, NULL, NULL, NULL,
- REF_NODEREF, NULL, &err);
+ lock = lock_ref_oid_basic(refs, oldrefname, NULL, NULL, NULL,
+ REF_NO_DEREF, NULL, &err);
if (!lock) {
error("unable to lock %s for rollback: %s", oldrefname, err.buf);
strbuf_release(&err);
@@ -1892,16 +1433,32 @@
return ret;
}
-static int close_ref(struct ref_lock *lock)
+static int files_rename_ref(struct ref_store *ref_store,
+ const char *oldrefname, const char *newrefname,
+ const char *logmsg)
{
- if (close_lock_file(lock->lk))
+ return files_copy_or_rename_ref(ref_store, oldrefname,
+ newrefname, logmsg, 0);
+}
+
+static int files_copy_ref(struct ref_store *ref_store,
+ const char *oldrefname, const char *newrefname,
+ const char *logmsg)
+{
+ return files_copy_or_rename_ref(ref_store, oldrefname,
+ newrefname, logmsg, 1);
+}
+
+static int close_ref_gently(struct ref_lock *lock)
+{
+ if (close_lock_file_gently(&lock->lk))
return -1;
return 0;
}
static int commit_ref(struct ref_lock *lock)
{
- char *path = get_locked_file_path(lock->lk);
+ char *path = get_locked_file_path(&lock->lk);
struct stat st;
if (!lstat(path, &st) && S_ISDIR(st.st_mode)) {
@@ -1925,7 +1482,7 @@
free(path);
}
- if (commit_lock_file(lock->lk))
+ if (commit_lock_file(&lock->lk))
return -1;
return 0;
}
@@ -2091,9 +1648,8 @@
}
/*
- * Write sha1 into the open lockfile, then close the lockfile. On
- * errors, rollback the lockfile, fill in *err and
- * return -1.
+ * Write oid into the open lockfile, then close the lockfile. On
+ * 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)
@@ -2117,12 +1673,12 @@
unlock_ref(lock);
return -1;
}
- fd = get_lock_file_fd(lock->lk);
+ fd = get_lock_file_fd(&lock->lk);
if (write_in_full(fd, oid_to_hex(oid), GIT_SHA1_HEXSZ) < 0 ||
write_in_full(fd, &term, 1) < 0 ||
- close_ref(lock) < 0) {
+ close_ref_gently(lock) < 0) {
strbuf_addf(err,
- "couldn't write '%s'", get_lock_file_path(lock->lk));
+ "couldn't write '%s'", get_lock_file_path(&lock->lk));
unlock_ref(lock);
return -1;
}
@@ -2166,13 +1722,12 @@
* check with HEAD only which should cover 99% of all usage
* scenarios (even 100% of the default ones).
*/
- struct object_id head_oid;
int head_flag;
const char *head_ref;
head_ref = refs_resolve_ref_unsafe(&refs->base, "HEAD",
RESOLVE_REF_READING,
- head_oid.hash, &head_flag);
+ NULL, &head_flag);
if (head_ref && (head_flag & REF_ISSYMREF) &&
!strcmp(head_ref, lock->ref_name)) {
struct strbuf log_err = STRBUF_INIT;
@@ -2199,7 +1754,7 @@
{
int ret = -1;
#ifndef NO_SYMLINK_HEAD
- char *ref_path = get_locked_file_path(lock->lk);
+ char *ref_path = get_locked_file_path(&lock->lk);
unlink(ref_path);
ret = symlink(target, ref_path);
free(ref_path);
@@ -2218,7 +1773,7 @@
struct object_id new_oid;
if (logmsg &&
!refs_read_ref_full(&refs->base, target,
- RESOLVE_REF_READING, new_oid.hash, NULL) &&
+ RESOLVE_REF_READING, &new_oid, NULL) &&
files_log_ref_write(refs, refname, &lock->old_oid,
&new_oid, logmsg, 0, &err)) {
error("%s", err.buf);
@@ -2235,14 +1790,14 @@
return 0;
}
- if (!fdopen_lock_file(lock->lk, "w"))
+ if (!fdopen_lock_file(&lock->lk, "w"))
return error("unable to fdopen %s: %s",
- lock->lk->tempfile.filename.buf, strerror(errno));
+ lock->lk.tempfile->filename.buf, strerror(errno));
update_symref_reflog(refs, lock, refname, target, logmsg);
/* no error check; commit_ref will check ferror */
- fprintf(lock->lk->tempfile.fp, "ref: %s\n", target);
+ fprintf(lock->lk.tempfile->fp, "ref: %s\n", target);
if (commit_ref(lock) < 0)
return error("unable to write symref for %s: %s", refname,
strerror(errno));
@@ -2259,9 +1814,9 @@
struct ref_lock *lock;
int ret;
- lock = lock_ref_sha1_basic(refs, refname, NULL,
- NULL, NULL, REF_NODEREF, NULL,
- &err);
+ lock = lock_ref_oid_basic(refs, refname, NULL,
+ NULL, NULL, REF_NO_DEREF, NULL,
+ &err);
if (!lock) {
error("%s", err.buf);
strbuf_release(&err);
@@ -2507,7 +2062,7 @@
if (refs_read_ref_full(iter->ref_store,
diter->relative_path, 0,
- iter->oid.hash, &flags)) {
+ &iter->oid, &flags)) {
error("bad ref for %s", diter->path.buf);
continue;
}
@@ -2549,21 +2104,62 @@
files_reflog_iterator_abort
};
+static struct ref_iterator *reflog_iterator_begin(struct ref_store *ref_store,
+ const char *gitdir)
+{
+ struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
+ struct ref_iterator *ref_iterator = &iter->base;
+ struct strbuf sb = STRBUF_INIT;
+
+ base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable, 0);
+ strbuf_addf(&sb, "%s/logs", gitdir);
+ iter->dir_iterator = dir_iterator_begin(sb.buf);
+ iter->ref_store = ref_store;
+ strbuf_release(&sb);
+
+ return ref_iterator;
+}
+
+static enum iterator_selection reflog_iterator_select(
+ struct ref_iterator *iter_worktree,
+ struct ref_iterator *iter_common,
+ void *cb_data)
+{
+ if (iter_worktree) {
+ /*
+ * We're a bit loose here. We probably should ignore
+ * common refs if they are accidentally added as
+ * per-worktree refs.
+ */
+ return ITER_SELECT_0;
+ } else if (iter_common) {
+ if (ref_type(iter_common->refname) == REF_TYPE_NORMAL)
+ return ITER_SELECT_1;
+
+ /*
+ * The main ref store may contain main worktree's
+ * per-worktree refs, which should be ignored
+ */
+ return ITER_SKIP_1;
+ } else
+ return ITER_DONE;
+}
+
static struct ref_iterator *files_reflog_iterator_begin(struct ref_store *ref_store)
{
struct files_ref_store *refs =
files_downcast(ref_store, REF_STORE_READ,
"reflog_iterator_begin");
- struct files_reflog_iterator *iter = xcalloc(1, sizeof(*iter));
- struct ref_iterator *ref_iterator = &iter->base;
- struct strbuf sb = STRBUF_INIT;
- base_ref_iterator_init(ref_iterator, &files_reflog_iterator_vtable);
- files_reflog_path(refs, &sb, NULL);
- iter->dir_iterator = dir_iterator_begin(sb.buf);
- iter->ref_store = ref_store;
- strbuf_release(&sb);
- return ref_iterator;
+ if (!strcmp(refs->gitdir, refs->gitcommondir)) {
+ return reflog_iterator_begin(ref_store, refs->gitcommondir);
+ } else {
+ return merge_ref_iterator_begin(
+ 0,
+ reflog_iterator_begin(ref_store, refs->gitdir),
+ reflog_iterator_begin(ref_store, refs->gitcommondir),
+ reflog_iterator_select, refs);
+ }
}
/*
@@ -2580,7 +2176,7 @@
struct ref_update *new_update;
if ((update->flags & REF_LOG_ONLY) ||
- (update->flags & REF_ISPRUNING) ||
+ (update->flags & REF_IS_PRUNING) ||
(update->flags & REF_UPDATE_VIA_HEAD))
return 0;
@@ -2589,11 +2185,10 @@
/*
* First make sure that HEAD is not already in the
- * transaction. This insertion is O(N) in the transaction
+ * transaction. This check is O(lg N) in the transaction
* size, but it happens at most once per transaction.
*/
- item = string_list_insert(affected_refnames, "HEAD");
- if (item->util) {
+ if (string_list_has_string(affected_refnames, "HEAD")) {
/* An entry already existed */
strbuf_addf(err,
"multiple updates for 'HEAD' (including one "
@@ -2604,10 +2199,18 @@
new_update = ref_transaction_add_update(
transaction, "HEAD",
- update->flags | REF_LOG_ONLY | REF_NODEREF,
- update->new_oid.hash, update->old_oid.hash,
+ update->flags | REF_LOG_ONLY | REF_NO_DEREF,
+ &update->new_oid, &update->old_oid,
update->msg);
+ /*
+ * Add "HEAD". This insertion is O(N) in the transaction
+ * size, but it happens at most once per transaction.
+ * Add new_update->refname instead of a literal "HEAD".
+ */
+ if (strcmp(new_update->refname, "HEAD"))
+ BUG("%s unexpectedly not 'HEAD'", new_update->refname);
+ item = string_list_insert(affected_refnames, new_update->refname);
item->util = new_update;
return 0;
@@ -2615,8 +2218,8 @@
/*
* update is for a symref that points at referent and doesn't have
- * REF_NODEREF set. Split it into two updates:
- * - The original update, but with REF_LOG_ONLY and REF_NODEREF set
+ * REF_NO_DEREF set. Split it into two updates:
+ * - The original update, but with REF_LOG_ONLY and REF_NO_DEREF set
* - A new, separate update for the referent reference
* Note that the new update will itself be subject to splitting when
* the iteration gets to it.
@@ -2634,13 +2237,12 @@
/*
* First make sure that referent is not already in the
- * transaction. This insertion is O(N) in the transaction
+ * transaction. This check is O(lg N) in the transaction
* size, but it happens at most once per symref in a
* transaction.
*/
- item = string_list_insert(affected_refnames, referent);
- if (item->util) {
- /* An entry already existed */
+ if (string_list_has_string(affected_refnames, referent)) {
+ /* An entry already exists */
strbuf_addf(err,
"multiple updates for '%s' (including one "
"via symref '%s') are not allowed",
@@ -2662,19 +2264,30 @@
new_update = ref_transaction_add_update(
transaction, referent, new_flags,
- update->new_oid.hash, update->old_oid.hash,
+ &update->new_oid, &update->old_oid,
update->msg);
new_update->parent_update = update;
/*
* Change the symbolic ref update to log only. Also, it
- * doesn't need to check its old SHA-1 value, as that will be
+ * doesn't need to check its old OID value, as that will be
* done when new_update is processed.
*/
- update->flags |= REF_LOG_ONLY | REF_NODEREF;
+ update->flags |= REF_LOG_ONLY | REF_NO_DEREF;
update->flags &= ~REF_HAVE_OLD;
+ /*
+ * Add the referent. This insertion is O(N) in the transaction
+ * size, but it happens at most once per symref in a
+ * transaction. Make sure to add new_update->refname, which will
+ * be valid as long as affected_refnames is in use, and NOT
+ * referent, which might soon be freed by our caller.
+ */
+ item = string_list_insert(affected_refnames, new_update->refname);
+ if (item->util)
+ BUG("%s unexpectedly found in affected_refnames",
+ new_update->refname);
item->util = new_update;
return 0;
@@ -2727,10 +2340,10 @@
* Prepare for carrying out update:
* - Lock the reference referred to by update.
* - Read the reference under lock.
- * - Check that its old SHA-1 value (if specified) is correct, and in
+ * - Check that its old OID value (if specified) is correct, and in
* any case record it in update->lock->old_oid for later use when
* writing the reflog.
- * - If it is a symref update without REF_NODEREF, split it up into a
+ * - If it is a symref update without REF_NO_DEREF, split it up into a
* REF_LOG_ONLY update of the symref and add a separate update for
* the referent to transaction.
* - If it is an update of head_ref, add a corresponding REF_LOG_ONLY
@@ -2746,7 +2359,7 @@
struct strbuf referent = STRBUF_INIT;
int mustexist = (update->flags & REF_HAVE_OLD) &&
!is_null_oid(&update->old_oid);
- int ret;
+ int ret = 0;
struct ref_lock *lock;
files_assert_main_repository(refs, "lock_ref_for_update");
@@ -2758,7 +2371,7 @@
ret = split_head_update(update, transaction, head_ref,
affected_refnames, err);
if (ret)
- return ret;
+ goto out;
}
ret = lock_raw_ref(refs, update->refname, mustexist,
@@ -2772,35 +2385,37 @@
strbuf_addf(err, "cannot lock ref '%s': %s",
original_update_refname(update), reason);
free(reason);
- return ret;
+ goto out;
}
update->backend_data = lock;
if (update->type & REF_ISSYMREF) {
- if (update->flags & REF_NODEREF) {
+ if (update->flags & REF_NO_DEREF) {
/*
* We won't be reading the referent as part of
* the transaction, so we have to read it here
- * to record and possibly check old_sha1:
+ * to record and possibly check old_oid:
*/
if (refs_read_ref_full(&refs->base,
referent.buf, 0,
- lock->old_oid.hash, NULL)) {
+ &lock->old_oid, NULL)) {
if (update->flags & REF_HAVE_OLD) {
strbuf_addf(err, "cannot lock ref '%s': "
"error reading reference",
original_update_refname(update));
- return -1;
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto out;
}
} else if (check_old_oid(update, &lock->old_oid, err)) {
- return TRANSACTION_GENERIC_ERROR;
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto out;
}
} else {
/*
* Create a new update for the reference this
* symref is pointing at. Also, we will record
- * and verify old_sha1 for this update as part
+ * and verify old_oid for this update as part
* of processing the split-off update, so we
* don't have to do it here.
*/
@@ -2808,17 +2423,19 @@
referent.buf, transaction,
affected_refnames, err);
if (ret)
- return ret;
+ goto out;
}
} else {
struct ref_update *parent_update;
- if (check_old_oid(update, &lock->old_oid, err))
- return TRANSACTION_GENERIC_ERROR;
+ if (check_old_oid(update, &lock->old_oid, err)) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto out;
+ }
/*
* If this update is happening indirectly because of a
- * symref update, record the old SHA-1 in the parent
+ * symref update, record the old OID in the parent
* update:
*/
for (parent_update = update->parent_update;
@@ -2851,7 +2468,8 @@
"cannot update ref '%s': %s",
update->refname, write_err);
free(write_err);
- return TRANSACTION_GENERIC_ERROR;
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto out;
} else {
update->flags |= REF_NEEDS_COMMIT;
}
@@ -2862,22 +2480,35 @@
* the lockfile is still open. Close it to
* free up the file descriptor:
*/
- if (close_ref(lock)) {
+ if (close_ref_gently(lock)) {
strbuf_addf(err, "couldn't close '%s.lock'",
update->refname);
- return TRANSACTION_GENERIC_ERROR;
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto out;
}
}
- return 0;
+
+out:
+ strbuf_release(&referent);
+ return ret;
}
+struct files_transaction_backend_data {
+ struct ref_transaction *packed_transaction;
+ int packed_refs_locked;
+};
+
/*
* Unlock any references in `transaction` that are still locked, and
* mark the transaction closed.
*/
-static void files_transaction_cleanup(struct ref_transaction *transaction)
+static void files_transaction_cleanup(struct files_ref_store *refs,
+ struct ref_transaction *transaction)
{
size_t i;
+ struct files_transaction_backend_data *backend_data =
+ transaction->backend_data;
+ struct strbuf err = STRBUF_INIT;
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
@@ -2889,6 +2520,17 @@
}
}
+ if (backend_data->packed_transaction &&
+ ref_transaction_abort(backend_data->packed_transaction, &err)) {
+ error("error aborting transaction: %s", err.buf);
+ strbuf_release(&err);
+ }
+
+ if (backend_data->packed_refs_locked)
+ packed_refs_unlock(refs->packed_ref_store);
+
+ free(backend_data);
+
transaction->state = REF_TRANSACTION_CLOSED;
}
@@ -2904,25 +2546,34 @@
struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
char *head_ref = NULL;
int head_type;
- struct object_id head_oid;
+ struct files_transaction_backend_data *backend_data;
+ struct ref_transaction *packed_transaction = NULL;
assert(err);
if (!transaction->nr)
goto cleanup;
+ backend_data = xcalloc(1, sizeof(*backend_data));
+ transaction->backend_data = backend_data;
+
/*
* Fail if a refname appears more than once in the
* transaction. (If we end up splitting up any updates using
* split_symref_update() or split_head_update(), those
* functions will check that the new updates don't have the
- * same refname as any existing ones.)
+ * same refname as any existing ones.) Also fail if any of the
+ * updates use REF_IS_PRUNING without REF_NO_DEREF.
*/
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
struct string_list_item *item =
string_list_append(&affected_refnames, update->refname);
+ if ((update->flags & REF_IS_PRUNING) &&
+ !(update->flags & REF_NO_DEREF))
+ BUG("REF_IS_PRUNING set without REF_NO_DEREF");
+
/*
* We store a pointer to update in item->util, but at
* the moment we never use the value of this field
@@ -2956,7 +2607,7 @@
*/
head_ref = refs_resolve_refdup(ref_store, "HEAD",
RESOLVE_REF_NO_RECURSE,
- head_oid.hash, &head_type);
+ NULL, &head_type);
if (head_ref && !(head_type & REF_ISSYMREF)) {
FREE_AND_NULL(head_ref);
@@ -2976,7 +2627,58 @@
ret = lock_ref_for_update(refs, update, transaction,
head_ref, &affected_refnames, err);
if (ret)
- break;
+ goto cleanup;
+
+ if (update->flags & REF_DELETING &&
+ !(update->flags & REF_LOG_ONLY) &&
+ !(update->flags & REF_IS_PRUNING)) {
+ /*
+ * This reference has to be deleted from
+ * packed-refs if it exists there.
+ */
+ if (!packed_transaction) {
+ packed_transaction = ref_store_transaction_begin(
+ refs->packed_ref_store, err);
+ if (!packed_transaction) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto cleanup;
+ }
+
+ backend_data->packed_transaction =
+ packed_transaction;
+ }
+
+ ref_transaction_add_update(
+ packed_transaction, update->refname,
+ REF_HAVE_NEW | REF_NO_DEREF,
+ &update->new_oid, NULL,
+ NULL);
+ }
+ }
+
+ if (packed_transaction) {
+ if (packed_refs_lock(refs->packed_ref_store, 0, err)) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto cleanup;
+ }
+ backend_data->packed_refs_locked = 1;
+
+ if (is_packed_transaction_needed(refs->packed_ref_store,
+ packed_transaction)) {
+ ret = ref_transaction_prepare(packed_transaction, err);
+ } else {
+ /*
+ * We can skip rewriting the `packed-refs`
+ * file. But we do need to leave it locked, so
+ * that somebody else doesn't pack a reference
+ * that we are trying to delete.
+ */
+ if (ref_transaction_abort(packed_transaction, err)) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto cleanup;
+ }
+ backend_data->packed_transaction = NULL;
+ }
}
cleanup:
@@ -2984,7 +2686,7 @@
string_list_clear(&affected_refnames, 0);
if (ret)
- files_transaction_cleanup(transaction);
+ files_transaction_cleanup(refs, transaction);
else
transaction->state = REF_TRANSACTION_PREPARED;
@@ -2999,9 +2701,10 @@
files_downcast(ref_store, 0, "ref_transaction_finish");
size_t i;
int ret = 0;
- struct string_list refs_to_delete = STRING_LIST_INIT_NODUP;
- struct string_list_item *ref_to_delete;
struct strbuf sb = STRBUF_INIT;
+ struct files_transaction_backend_data *backend_data;
+ struct ref_transaction *packed_transaction;
+
assert(err);
@@ -3010,6 +2713,9 @@
return 0;
}
+ backend_data = transaction->backend_data;
+ packed_transaction = backend_data->packed_transaction;
+
/* Perform updates first so live commits remain referenced */
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
@@ -3045,7 +2751,44 @@
}
}
}
- /* Perform deletes now that updates are safely completed */
+
+ /*
+ * Now that updates are safely completed, we can perform
+ * deletes. First delete the reflogs of any references that
+ * will be deleted, since (in the unexpected event of an
+ * error) leaving a reference without a reflog is less bad
+ * than leaving a reflog without a reference (the latter is a
+ * mildly invalid repository state):
+ */
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+ if (update->flags & REF_DELETING &&
+ !(update->flags & REF_LOG_ONLY) &&
+ !(update->flags & REF_IS_PRUNING)) {
+ strbuf_reset(&sb);
+ files_reflog_path(refs, &sb, update->refname);
+ if (!unlink_or_warn(sb.buf))
+ try_remove_empty_parents(refs, update->refname,
+ REMOVE_EMPTY_PARENTS_REFLOG);
+ }
+ }
+
+ /*
+ * Perform deletes now that updates are safely completed.
+ *
+ * First delete any packed versions of the references, while
+ * retaining the packed-refs lock:
+ */
+ if (packed_transaction) {
+ ret = ref_transaction_commit(packed_transaction, err);
+ ref_transaction_free(packed_transaction);
+ packed_transaction = NULL;
+ backend_data->packed_transaction = NULL;
+ if (ret)
+ goto cleanup;
+ }
+
+ /* Now delete the loose versions of the references: */
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
struct ref_lock *lock = update->backend_data;
@@ -3063,31 +2806,13 @@
}
update->flags |= REF_DELETED_LOOSE;
}
-
- if (!(update->flags & REF_ISPRUNING))
- string_list_append(&refs_to_delete,
- lock->ref_name);
}
}
- if (repack_without_refs(refs, &refs_to_delete, err)) {
- ret = TRANSACTION_GENERIC_ERROR;
- goto cleanup;
- }
-
- /* Delete the reflogs of any references that were deleted: */
- for_each_string_list_item(ref_to_delete, &refs_to_delete) {
- strbuf_reset(&sb);
- files_reflog_path(refs, &sb, ref_to_delete->string);
- if (!unlink_or_warn(sb.buf))
- try_remove_empty_parents(refs, ref_to_delete->string,
- REMOVE_EMPTY_PARENTS_REFLOG);
- }
-
clear_loose_ref_cache(refs);
cleanup:
- files_transaction_cleanup(transaction);
+ files_transaction_cleanup(refs, transaction);
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
@@ -3105,7 +2830,6 @@
}
strbuf_release(&sb);
- string_list_clear(&refs_to_delete, 0);
return ret;
}
@@ -3113,7 +2837,10 @@
struct ref_transaction *transaction,
struct strbuf *err)
{
- files_transaction_cleanup(transaction);
+ struct files_ref_store *refs =
+ files_downcast(ref_store, 0, "ref_transaction_abort");
+
+ files_transaction_cleanup(refs, transaction);
return 0;
}
@@ -3135,6 +2862,7 @@
size_t i;
int ret = 0;
struct string_list affected_refnames = STRING_LIST_INIT_NODUP;
+ struct ref_transaction *packed_transaction = NULL;
assert(err);
@@ -3167,6 +2895,12 @@
&affected_refnames))
die("BUG: initial ref transaction called with existing refs");
+ packed_transaction = ref_store_transaction_begin(refs->packed_ref_store, err);
+ if (!packed_transaction) {
+ ret = TRANSACTION_GENERIC_ERROR;
+ goto cleanup;
+ }
+
for (i = 0; i < transaction->nr; i++) {
struct ref_update *update = transaction->updates[i];
@@ -3179,32 +2913,30 @@
ret = TRANSACTION_NAME_CONFLICT;
goto cleanup;
}
+
+ /*
+ * Add a reference creation for this reference to the
+ * packed-refs transaction:
+ */
+ ref_transaction_add_update(packed_transaction, update->refname,
+ update->flags & ~REF_HAVE_OLD,
+ &update->new_oid, &update->old_oid,
+ NULL);
}
- if (lock_packed_refs(refs, 0)) {
- strbuf_addf(err, "unable to lock packed-refs file: %s",
- strerror(errno));
+ if (packed_refs_lock(refs->packed_ref_store, 0, err)) {
ret = TRANSACTION_GENERIC_ERROR;
goto cleanup;
}
- for (i = 0; i < transaction->nr; i++) {
- struct ref_update *update = transaction->updates[i];
-
- if ((update->flags & REF_HAVE_NEW) &&
- !is_null_oid(&update->new_oid))
- add_packed_ref(refs, update->refname,
- &update->new_oid);
- }
-
- if (commit_packed_refs(refs)) {
- strbuf_addf(err, "unable to commit packed-refs file: %s",
- strerror(errno));
+ if (initial_ref_transaction_commit(packed_transaction, err)) {
ret = TRANSACTION_GENERIC_ERROR;
- goto cleanup;
}
+ packed_refs_unlock(refs->packed_ref_store);
cleanup:
+ if (packed_transaction)
+ ref_transaction_free(packed_transaction);
transaction->state = REF_TRANSACTION_CLOSED;
string_list_clear(&affected_refnames, 0);
return ret;
@@ -3248,7 +2980,7 @@
}
static int files_reflog_expire(struct ref_store *ref_store,
- const char *refname, const unsigned char *sha1,
+ const char *refname, const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
@@ -3265,7 +2997,6 @@
int status = 0;
int type;
struct strbuf err = STRBUF_INIT;
- struct object_id oid;
memset(&cb, 0, sizeof(cb));
cb.flags = flags;
@@ -3277,9 +3008,9 @@
* reference itself, plus we might need to update the
* reference if --updateref was specified:
*/
- lock = lock_ref_sha1_basic(refs, refname, sha1,
- NULL, NULL, REF_NODEREF,
- &type, &err);
+ lock = lock_ref_oid_basic(refs, refname, oid,
+ NULL, NULL, REF_NO_DEREF,
+ &type, &err);
if (!lock) {
error("cannot lock ref '%s': %s", refname, err.buf);
strbuf_release(&err);
@@ -3315,9 +3046,7 @@
}
}
- hashcpy(oid.hash, sha1);
-
- (*prepare_fn)(refname, &oid, cb.policy_cb);
+ (*prepare_fn)(refname, oid, cb.policy_cb);
refs_for_each_reflog_ent(ref_store, refname, expire_reflog_ent, &cb);
(*cleanup_fn)(cb.policy_cb);
@@ -3333,16 +3062,17 @@
!(type & REF_ISSYMREF) &&
!is_null_oid(&cb.last_kept_oid);
- if (close_lock_file(&reflog_lock)) {
+ if (close_lock_file_gently(&reflog_lock)) {
status |= error("couldn't write %s: %s", log_file,
strerror(errno));
+ rollback_lock_file(&reflog_lock);
} else if (update &&
- (write_in_full(get_lock_file_fd(lock->lk),
+ (write_in_full(get_lock_file_fd(&lock->lk),
oid_to_hex(&cb.last_kept_oid), GIT_SHA1_HEXSZ) < 0 ||
- write_str_in_full(get_lock_file_fd(lock->lk), "\n") < 0 ||
- close_ref(lock) < 0)) {
+ write_str_in_full(get_lock_file_fd(&lock->lk), "\n") < 0 ||
+ close_ref_gently(lock) < 0)) {
status |= error("couldn't write %s",
- get_lock_file_path(lock->lk));
+ get_lock_file_path(&lock->lk));
rollback_lock_file(&reflog_lock);
} else if (commit_lock_file(&reflog_lock)) {
status |= error("unable to write reflog '%s' (%s)",
@@ -3393,10 +3123,10 @@
files_initial_transaction_commit,
files_pack_refs,
- files_peel_ref,
files_create_symref,
files_delete_refs,
files_rename_ref,
+ files_copy_ref,
files_ref_iterator_begin,
files_read_raw_ref,
diff --git a/refs/iterator.c b/refs/iterator.c
index 4cf449e..bd35da4 100644
--- a/refs/iterator.c
+++ b/refs/iterator.c
@@ -25,9 +25,11 @@
}
void base_ref_iterator_init(struct ref_iterator *iter,
- struct ref_iterator_vtable *vtable)
+ struct ref_iterator_vtable *vtable,
+ int ordered)
{
iter->vtable = vtable;
+ iter->ordered = !!ordered;
iter->refname = NULL;
iter->oid = NULL;
iter->flags = 0;
@@ -72,7 +74,7 @@
struct empty_ref_iterator *iter = xcalloc(1, sizeof(*iter));
struct ref_iterator *ref_iterator = &iter->base;
- base_ref_iterator_init(ref_iterator, &empty_ref_iterator_vtable);
+ base_ref_iterator_init(ref_iterator, &empty_ref_iterator_vtable, 1);
return ref_iterator;
}
@@ -205,6 +207,7 @@
};
struct ref_iterator *merge_ref_iterator_begin(
+ int ordered,
struct ref_iterator *iter0, struct ref_iterator *iter1,
ref_iterator_select_fn *select, void *cb_data)
{
@@ -219,7 +222,7 @@
* references through only if they exist in both iterators.
*/
- base_ref_iterator_init(ref_iterator, &merge_ref_iterator_vtable);
+ base_ref_iterator_init(ref_iterator, &merge_ref_iterator_vtable, ordered);
iter->iter0 = iter0;
iter->iter1 = iter1;
iter->select = select;
@@ -268,9 +271,11 @@
} else if (is_empty_ref_iterator(back)) {
ref_iterator_abort(back);
return front;
+ } else if (!front->ordered || !back->ordered) {
+ BUG("overlay_ref_iterator requires ordered inputs");
}
- return merge_ref_iterator_begin(front, back,
+ return merge_ref_iterator_begin(1, front, back,
overlay_iterator_select, NULL);
}
@@ -282,6 +287,20 @@
int trim;
};
+/* Return -1, 0, 1 if refname is before, inside, or after the prefix. */
+static int compare_prefix(const char *refname, const char *prefix)
+{
+ while (*prefix) {
+ if (*refname != *prefix)
+ return ((unsigned char)*refname < (unsigned char)*prefix) ? -1 : +1;
+
+ refname++;
+ prefix++;
+ }
+
+ return 0;
+}
+
static int prefix_ref_iterator_advance(struct ref_iterator *ref_iterator)
{
struct prefix_ref_iterator *iter =
@@ -289,9 +308,25 @@
int ok;
while ((ok = ref_iterator_advance(iter->iter0)) == ITER_OK) {
- if (!starts_with(iter->iter0->refname, iter->prefix))
+ int cmp = compare_prefix(iter->iter0->refname, iter->prefix);
+
+ if (cmp < 0)
continue;
+ if (cmp > 0) {
+ /*
+ * If the source iterator is ordered, then we
+ * can stop the iteration as soon as we see a
+ * refname that comes after the prefix:
+ */
+ if (iter->iter0->ordered) {
+ ok = ref_iterator_abort(iter->iter0);
+ break;
+ } else {
+ continue;
+ }
+ }
+
if (iter->trim) {
/*
* It is nonsense to trim off characters that
@@ -361,7 +396,7 @@
iter = xcalloc(1, sizeof(*iter));
ref_iterator = &iter->base;
- base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable);
+ base_ref_iterator_init(ref_iterator, &prefix_ref_iterator_vtable, iter0->ordered);
iter->iter0 = iter0;
iter->prefix = xstrdup(prefix);
diff --git a/refs/packed-backend.c b/refs/packed-backend.c
new file mode 100644
index 0000000..023243f
--- /dev/null
+++ b/refs/packed-backend.c
@@ -0,0 +1,1652 @@
+#include "../cache.h"
+#include "../config.h"
+#include "../refs.h"
+#include "refs-internal.h"
+#include "packed-backend.h"
+#include "../iterator.h"
+#include "../lockfile.h"
+
+enum mmap_strategy {
+ /*
+ * Don't use mmap() at all for reading `packed-refs`.
+ */
+ MMAP_NONE,
+
+ /*
+ * Can use mmap() for reading `packed-refs`, but the file must
+ * not remain mmapped. This is the usual option on Windows,
+ * where you cannot rename a new version of a file onto a file
+ * that is currently mmapped.
+ */
+ MMAP_TEMPORARY,
+
+ /*
+ * It is OK to leave the `packed-refs` file mmapped while
+ * arbitrary other code is running.
+ */
+ MMAP_OK
+};
+
+#if defined(NO_MMAP)
+static enum mmap_strategy mmap_strategy = MMAP_NONE;
+#elif defined(MMAP_PREVENTS_DELETE)
+static enum mmap_strategy mmap_strategy = MMAP_TEMPORARY;
+#else
+static enum mmap_strategy mmap_strategy = MMAP_OK;
+#endif
+
+struct packed_ref_store;
+
+/*
+ * A `snapshot` represents one snapshot of a `packed-refs` file.
+ *
+ * Normally, this will be a mmapped view of the contents of the
+ * `packed-refs` file at the time the snapshot was created. However,
+ * if the `packed-refs` file was not sorted, this might point at heap
+ * memory holding the contents of the `packed-refs` file with its
+ * records sorted by refname.
+ *
+ * `snapshot` instances are reference counted (via
+ * `acquire_snapshot()` and `release_snapshot()`). This is to prevent
+ * an instance from disappearing while an iterator is still iterating
+ * over it. Instances are garbage collected when their `referrers`
+ * count goes to zero.
+ *
+ * The most recent `snapshot`, if available, is referenced by the
+ * `packed_ref_store`. Its freshness is checked whenever
+ * `get_snapshot()` is called; if the existing snapshot is obsolete, a
+ * new snapshot is taken.
+ */
+struct snapshot {
+ /*
+ * A back-pointer to the packed_ref_store with which this
+ * snapshot is associated:
+ */
+ struct packed_ref_store *refs;
+
+ /* Is the `packed-refs` file currently mmapped? */
+ int mmapped;
+
+ /*
+ * The contents of the `packed-refs` file. If the file was
+ * already sorted, this points at the mmapped contents of the
+ * file. If not, this points at heap-allocated memory
+ * containing the contents, sorted. If there were no contents
+ * (e.g., because the file didn't exist), `buf` and `eof` are
+ * both NULL.
+ */
+ char *buf, *eof;
+
+ /* The size of the header line, if any; otherwise, 0: */
+ size_t header_len;
+
+ /*
+ * What is the peeled state of the `packed-refs` file that
+ * this snapshot represents? (This is usually determined from
+ * the file's header.)
+ */
+ enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled;
+
+ /*
+ * Count of references to this instance, including the pointer
+ * from `packed_ref_store::snapshot`, if any. The instance
+ * will not be freed as long as the reference count is
+ * nonzero.
+ */
+ unsigned int referrers;
+
+ /*
+ * The metadata of the `packed-refs` file from which this
+ * snapshot was created, used to tell if the file has been
+ * replaced since we read it.
+ */
+ struct stat_validity validity;
+};
+
+/*
+ * A `ref_store` representing references stored in a `packed-refs`
+ * file. It implements the `ref_store` interface, though it has some
+ * limitations:
+ *
+ * - It cannot store symbolic references.
+ *
+ * - It cannot store reflogs.
+ *
+ * - It does not support reference renaming (though it could).
+ *
+ * On the other hand, it can be locked outside of a reference
+ * transaction. In that case, it remains locked even after the
+ * transaction is done and the new `packed-refs` file is activated.
+ */
+struct packed_ref_store {
+ struct ref_store base;
+
+ unsigned int store_flags;
+
+ /* The path of the "packed-refs" file: */
+ char *path;
+
+ /*
+ * A snapshot of the values read from the `packed-refs` file,
+ * if it might still be current; otherwise, NULL.
+ */
+ struct snapshot *snapshot;
+
+ /*
+ * Lock used for the "packed-refs" file. Note that this (and
+ * thus the enclosing `packed_ref_store`) must not be freed.
+ */
+ struct lock_file lock;
+
+ /*
+ * Temporary file used when rewriting new contents to the
+ * "packed-refs" file. Note that this (and thus the enclosing
+ * `packed_ref_store`) must not be freed.
+ */
+ struct tempfile *tempfile;
+};
+
+/*
+ * Increment the reference count of `*snapshot`.
+ */
+static void acquire_snapshot(struct snapshot *snapshot)
+{
+ snapshot->referrers++;
+}
+
+/*
+ * If the buffer in `snapshot` is active, then either munmap the
+ * memory and close the file, or free the memory. Then set the buffer
+ * pointers to NULL.
+ */
+static void clear_snapshot_buffer(struct snapshot *snapshot)
+{
+ if (snapshot->mmapped) {
+ if (munmap(snapshot->buf, snapshot->eof - snapshot->buf))
+ die_errno("error ummapping packed-refs file %s",
+ snapshot->refs->path);
+ snapshot->mmapped = 0;
+ } else {
+ free(snapshot->buf);
+ }
+ snapshot->buf = snapshot->eof = NULL;
+ snapshot->header_len = 0;
+}
+
+/*
+ * Decrease the reference count of `*snapshot`. If it goes to zero,
+ * free `*snapshot` and return true; otherwise return false.
+ */
+static int release_snapshot(struct snapshot *snapshot)
+{
+ if (!--snapshot->referrers) {
+ stat_validity_clear(&snapshot->validity);
+ clear_snapshot_buffer(snapshot);
+ free(snapshot);
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+struct ref_store *packed_ref_store_create(const char *path,
+ unsigned int store_flags)
+{
+ struct packed_ref_store *refs = xcalloc(1, sizeof(*refs));
+ struct ref_store *ref_store = (struct ref_store *)refs;
+
+ base_ref_store_init(ref_store, &refs_be_packed);
+ refs->store_flags = store_flags;
+
+ refs->path = xstrdup(path);
+ return ref_store;
+}
+
+/*
+ * Downcast `ref_store` to `packed_ref_store`. Die if `ref_store` is
+ * not a `packed_ref_store`. Also die if `packed_ref_store` doesn't
+ * support at least the flags specified in `required_flags`. `caller`
+ * is used in any necessary error messages.
+ */
+static struct packed_ref_store *packed_downcast(struct ref_store *ref_store,
+ unsigned int required_flags,
+ const char *caller)
+{
+ struct packed_ref_store *refs;
+
+ if (ref_store->be != &refs_be_packed)
+ die("BUG: ref_store is type \"%s\" not \"packed\" in %s",
+ ref_store->be->name, caller);
+
+ refs = (struct packed_ref_store *)ref_store;
+
+ if ((refs->store_flags & required_flags) != required_flags)
+ die("BUG: unallowed operation (%s), requires %x, has %x\n",
+ caller, required_flags, refs->store_flags);
+
+ return refs;
+}
+
+static void clear_snapshot(struct packed_ref_store *refs)
+{
+ if (refs->snapshot) {
+ struct snapshot *snapshot = refs->snapshot;
+
+ refs->snapshot = NULL;
+ release_snapshot(snapshot);
+ }
+}
+
+static NORETURN void die_unterminated_line(const char *path,
+ const char *p, size_t len)
+{
+ if (len < 80)
+ die("unterminated line in %s: %.*s", path, (int)len, p);
+ else
+ die("unterminated line in %s: %.75s...", path, p);
+}
+
+static NORETURN void die_invalid_line(const char *path,
+ const char *p, size_t len)
+{
+ const char *eol = memchr(p, '\n', len);
+
+ if (!eol)
+ die_unterminated_line(path, p, len);
+ else if (eol - p < 80)
+ die("unexpected line in %s: %.*s", path, (int)(eol - p), p);
+ else
+ die("unexpected line in %s: %.75s...", path, p);
+
+}
+
+struct snapshot_record {
+ const char *start;
+ size_t len;
+};
+
+static int cmp_packed_ref_records(const void *v1, const void *v2)
+{
+ const struct snapshot_record *e1 = v1, *e2 = v2;
+ const char *r1 = e1->start + GIT_SHA1_HEXSZ + 1;
+ const char *r2 = e2->start + GIT_SHA1_HEXSZ + 1;
+
+ while (1) {
+ if (*r1 == '\n')
+ return *r2 == '\n' ? 0 : -1;
+ if (*r1 != *r2) {
+ if (*r2 == '\n')
+ return 1;
+ else
+ return (unsigned char)*r1 < (unsigned char)*r2 ? -1 : +1;
+ }
+ r1++;
+ r2++;
+ }
+}
+
+/*
+ * Compare a snapshot record at `rec` to the specified NUL-terminated
+ * refname.
+ */
+static int cmp_record_to_refname(const char *rec, const char *refname)
+{
+ const char *r1 = rec + GIT_SHA1_HEXSZ + 1;
+ const char *r2 = refname;
+
+ while (1) {
+ if (*r1 == '\n')
+ return *r2 ? -1 : 0;
+ if (!*r2)
+ return 1;
+ if (*r1 != *r2)
+ return (unsigned char)*r1 < (unsigned char)*r2 ? -1 : +1;
+ r1++;
+ r2++;
+ }
+}
+
+/*
+ * `snapshot->buf` is not known to be sorted. Check whether it is, and
+ * if not, sort it into new memory and munmap/free the old storage.
+ */
+static void sort_snapshot(struct snapshot *snapshot)
+{
+ struct snapshot_record *records = NULL;
+ size_t alloc = 0, nr = 0;
+ int sorted = 1;
+ const char *pos, *eof, *eol;
+ size_t len, i;
+ char *new_buffer, *dst;
+
+ pos = snapshot->buf + snapshot->header_len;
+ eof = snapshot->eof;
+ len = eof - pos;
+
+ if (!len)
+ return;
+
+ /*
+ * Initialize records based on a crude estimate of the number
+ * of references in the file (we'll grow it below if needed):
+ */
+ ALLOC_GROW(records, len / 80 + 20, alloc);
+
+ while (pos < eof) {
+ eol = memchr(pos, '\n', eof - pos);
+ if (!eol)
+ /* The safety check should prevent this. */
+ BUG("unterminated line found in packed-refs");
+ if (eol - pos < GIT_SHA1_HEXSZ + 2)
+ die_invalid_line(snapshot->refs->path,
+ pos, eof - pos);
+ eol++;
+ if (eol < eof && *eol == '^') {
+ /*
+ * Keep any peeled line together with its
+ * reference:
+ */
+ const char *peeled_start = eol;
+
+ eol = memchr(peeled_start, '\n', eof - peeled_start);
+ if (!eol)
+ /* The safety check should prevent this. */
+ BUG("unterminated peeled line found in packed-refs");
+ eol++;
+ }
+
+ ALLOC_GROW(records, nr + 1, alloc);
+ records[nr].start = pos;
+ records[nr].len = eol - pos;
+ nr++;
+
+ if (sorted &&
+ nr > 1 &&
+ cmp_packed_ref_records(&records[nr - 2],
+ &records[nr - 1]) >= 0)
+ sorted = 0;
+
+ pos = eol;
+ }
+
+ if (sorted)
+ goto cleanup;
+
+ /* We need to sort the memory. First we sort the records array: */
+ QSORT(records, nr, cmp_packed_ref_records);
+
+ /*
+ * Allocate a new chunk of memory, and copy the old memory to
+ * the new in the order indicated by `records` (not bothering
+ * with the header line):
+ */
+ new_buffer = xmalloc(len);
+ for (dst = new_buffer, i = 0; i < nr; i++) {
+ memcpy(dst, records[i].start, records[i].len);
+ dst += records[i].len;
+ }
+
+ /*
+ * Now munmap the old buffer and use the sorted buffer in its
+ * place:
+ */
+ clear_snapshot_buffer(snapshot);
+ snapshot->buf = new_buffer;
+ snapshot->eof = new_buffer + len;
+ snapshot->header_len = 0;
+
+cleanup:
+ free(records);
+}
+
+/*
+ * Return a pointer to the start of the record that contains the
+ * character `*p` (which must be within the buffer). If no other
+ * record start is found, return `buf`.
+ */
+static const char *find_start_of_record(const char *buf, const char *p)
+{
+ while (p > buf && (p[-1] != '\n' || p[0] == '^'))
+ p--;
+ return p;
+}
+
+/*
+ * Return a pointer to the start of the record following the record
+ * that contains `*p`. If none is found before `end`, return `end`.
+ */
+static const char *find_end_of_record(const char *p, const char *end)
+{
+ while (++p < end && (p[-1] != '\n' || p[0] == '^'))
+ ;
+ return p;
+}
+
+/*
+ * We want to be able to compare mmapped reference records quickly,
+ * without totally parsing them. We can do so because the records are
+ * LF-terminated, and the refname should start exactly (GIT_SHA1_HEXSZ
+ * + 1) bytes past the beginning of the record.
+ *
+ * But what if the `packed-refs` file contains garbage? We're willing
+ * to tolerate not detecting the problem, as long as we don't produce
+ * totally garbled output (we can't afford to check the integrity of
+ * the whole file during every Git invocation). But we do want to be
+ * sure that we never read past the end of the buffer in memory and
+ * perform an illegal memory access.
+ *
+ * Guarantee that minimum level of safety by verifying that the last
+ * record in the file is LF-terminated, and that it has at least
+ * (GIT_SHA1_HEXSZ + 1) characters before the LF. Die if either of
+ * these checks fails.
+ */
+static void verify_buffer_safe(struct snapshot *snapshot)
+{
+ const char *buf = snapshot->buf + snapshot->header_len;
+ const char *eof = snapshot->eof;
+ const char *last_line;
+
+ if (buf == eof)
+ return;
+
+ last_line = find_start_of_record(buf, eof - 1);
+ if (*(eof - 1) != '\n' || eof - last_line < GIT_SHA1_HEXSZ + 2)
+ die_invalid_line(snapshot->refs->path,
+ last_line, eof - last_line);
+}
+
+/*
+ * Depending on `mmap_strategy`, either mmap or read the contents of
+ * the `packed-refs` file into the snapshot. Return 1 if the file
+ * existed and was read, or 0 if the file was absent. Die on errors.
+ */
+static int load_contents(struct snapshot *snapshot)
+{
+ int fd;
+ struct stat st;
+ size_t size;
+ ssize_t bytes_read;
+
+ fd = open(snapshot->refs->path, O_RDONLY);
+ if (fd < 0) {
+ if (errno == ENOENT) {
+ /*
+ * This is OK; it just means that no
+ * "packed-refs" file has been written yet,
+ * which is equivalent to it being empty,
+ * which is its state when initialized with
+ * zeros.
+ */
+ return 0;
+ } else {
+ die_errno("couldn't read %s", snapshot->refs->path);
+ }
+ }
+
+ stat_validity_update(&snapshot->validity, fd);
+
+ if (fstat(fd, &st) < 0)
+ die_errno("couldn't stat %s", snapshot->refs->path);
+ size = xsize_t(st.st_size);
+
+ switch (mmap_strategy) {
+ case MMAP_NONE:
+ snapshot->buf = xmalloc(size);
+ bytes_read = read_in_full(fd, snapshot->buf, size);
+ if (bytes_read < 0 || bytes_read != size)
+ die_errno("couldn't read %s", snapshot->refs->path);
+ snapshot->eof = snapshot->buf + size;
+ snapshot->mmapped = 0;
+ break;
+ case MMAP_TEMPORARY:
+ case MMAP_OK:
+ snapshot->buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+ snapshot->eof = snapshot->buf + size;
+ snapshot->mmapped = 1;
+ break;
+ }
+ close(fd);
+
+ return 1;
+}
+
+/*
+ * Find the place in `snapshot->buf` where the start of the record for
+ * `refname` starts. If `mustexist` is true and the reference doesn't
+ * exist, then return NULL. If `mustexist` is false and the reference
+ * doesn't exist, then return the point where that reference would be
+ * inserted. In the latter mode, `refname` doesn't have to be a proper
+ * reference name; for example, one could search for "refs/replace/"
+ * to find the start of any replace references.
+ *
+ * The record is sought using a binary search, so `snapshot->buf` must
+ * be sorted.
+ */
+static const char *find_reference_location(struct snapshot *snapshot,
+ const char *refname, int mustexist)
+{
+ /*
+ * This is not *quite* a garden-variety binary search, because
+ * the data we're searching is made up of records, and we
+ * always need to find the beginning of a record to do a
+ * comparison. A "record" here is one line for the reference
+ * itself and zero or one peel lines that start with '^'. Our
+ * loop invariant is described in the next two comments.
+ */
+
+ /*
+ * A pointer to the character at the start of a record whose
+ * preceding records all have reference names that come
+ * *before* `refname`.
+ */
+ const char *lo = snapshot->buf + snapshot->header_len;
+
+ /*
+ * A pointer to a the first character of a record whose
+ * reference name comes *after* `refname`.
+ */
+ const char *hi = snapshot->eof;
+
+ while (lo < hi) {
+ const char *mid, *rec;
+ int cmp;
+
+ mid = lo + (hi - lo) / 2;
+ rec = find_start_of_record(lo, mid);
+ cmp = cmp_record_to_refname(rec, refname);
+ if (cmp < 0) {
+ lo = find_end_of_record(mid, hi);
+ } else if (cmp > 0) {
+ hi = rec;
+ } else {
+ return rec;
+ }
+ }
+
+ if (mustexist)
+ return NULL;
+ else
+ return lo;
+}
+
+/*
+ * Create a newly-allocated `snapshot` of the `packed-refs` file in
+ * its current state and return it. The return value will already have
+ * its reference count incremented.
+ *
+ * A comment line of the form "# pack-refs with: " may contain zero or
+ * more traits. We interpret the traits as follows:
+ *
+ * Neither `peeled` nor `fully-peeled`:
+ *
+ * Probably no references are peeled. But if the file contains a
+ * peeled value for a reference, we will use it.
+ *
+ * `peeled`:
+ *
+ * References under "refs/tags/", if they *can* be peeled, *are*
+ * peeled in this file. References outside of "refs/tags/" are
+ * probably not peeled even if they could have been, but if we find
+ * a peeled value for such a reference we will use it.
+ *
+ * `fully-peeled`:
+ *
+ * All references in the file that can be peeled are peeled.
+ * Inversely (and this is more important), any references in the
+ * file for which no peeled value is recorded is not peelable. This
+ * trait should typically be written alongside "peeled" for
+ * compatibility with older clients, but we do not require it
+ * (i.e., "peeled" is a no-op if "fully-peeled" is set).
+ *
+ * `sorted`:
+ *
+ * The references in this file are known to be sorted by refname.
+ */
+static struct snapshot *create_snapshot(struct packed_ref_store *refs)
+{
+ struct snapshot *snapshot = xcalloc(1, sizeof(*snapshot));
+ int sorted = 0;
+
+ snapshot->refs = refs;
+ acquire_snapshot(snapshot);
+ snapshot->peeled = PEELED_NONE;
+
+ if (!load_contents(snapshot))
+ return snapshot;
+
+ /* If the file has a header line, process it: */
+ if (snapshot->buf < snapshot->eof && *snapshot->buf == '#') {
+ struct strbuf tmp = STRBUF_INIT;
+ char *p;
+ const char *eol;
+ struct string_list traits = STRING_LIST_INIT_NODUP;
+
+ eol = memchr(snapshot->buf, '\n',
+ snapshot->eof - snapshot->buf);
+ if (!eol)
+ die_unterminated_line(refs->path,
+ snapshot->buf,
+ snapshot->eof - snapshot->buf);
+
+ strbuf_add(&tmp, snapshot->buf, eol - snapshot->buf);
+
+ if (!skip_prefix(tmp.buf, "# pack-refs with:", (const char **)&p))
+ die_invalid_line(refs->path,
+ snapshot->buf,
+ snapshot->eof - snapshot->buf);
+
+ string_list_split_in_place(&traits, p, ' ', -1);
+
+ if (unsorted_string_list_has_string(&traits, "fully-peeled"))
+ snapshot->peeled = PEELED_FULLY;
+ else if (unsorted_string_list_has_string(&traits, "peeled"))
+ snapshot->peeled = PEELED_TAGS;
+
+ sorted = unsorted_string_list_has_string(&traits, "sorted");
+
+ /* perhaps other traits later as well */
+
+ /* The "+ 1" is for the LF character. */
+ snapshot->header_len = eol + 1 - snapshot->buf;
+
+ string_list_clear(&traits, 0);
+ strbuf_release(&tmp);
+ }
+
+ verify_buffer_safe(snapshot);
+
+ if (!sorted) {
+ sort_snapshot(snapshot);
+
+ /*
+ * Reordering the records might have moved a short one
+ * to the end of the buffer, so verify the buffer's
+ * safety again:
+ */
+ verify_buffer_safe(snapshot);
+ }
+
+ if (mmap_strategy != MMAP_OK && snapshot->mmapped) {
+ /*
+ * We don't want to leave the file mmapped, so we are
+ * forced to make a copy now:
+ */
+ size_t size = snapshot->eof -
+ (snapshot->buf + snapshot->header_len);
+ char *buf_copy = xmalloc(size);
+
+ memcpy(buf_copy, snapshot->buf + snapshot->header_len, size);
+ clear_snapshot_buffer(snapshot);
+ snapshot->buf = buf_copy;
+ snapshot->eof = buf_copy + size;
+ }
+
+ return snapshot;
+}
+
+/*
+ * Check that `refs->snapshot` (if present) still reflects the
+ * contents of the `packed-refs` file. If not, clear the snapshot.
+ */
+static void validate_snapshot(struct packed_ref_store *refs)
+{
+ if (refs->snapshot &&
+ !stat_validity_check(&refs->snapshot->validity, refs->path))
+ clear_snapshot(refs);
+}
+
+/*
+ * Get the `snapshot` for the specified packed_ref_store, creating and
+ * populating it if it hasn't been read before or if the file has been
+ * changed (according to its `validity` field) since it was last read.
+ * On the other hand, if we hold the lock, then assume that the file
+ * hasn't been changed out from under us, so skip the extra `stat()`
+ * call in `stat_validity_check()`. This function does *not* increase
+ * the snapshot's reference count on behalf of the caller.
+ */
+static struct snapshot *get_snapshot(struct packed_ref_store *refs)
+{
+ if (!is_lock_file_locked(&refs->lock))
+ validate_snapshot(refs);
+
+ if (!refs->snapshot)
+ refs->snapshot = create_snapshot(refs);
+
+ return refs->snapshot;
+}
+
+static int packed_read_raw_ref(struct ref_store *ref_store,
+ const char *refname, struct object_id *oid,
+ struct strbuf *referent, unsigned int *type)
+{
+ struct packed_ref_store *refs =
+ packed_downcast(ref_store, REF_STORE_READ, "read_raw_ref");
+ struct snapshot *snapshot = get_snapshot(refs);
+ const char *rec;
+
+ *type = 0;
+
+ rec = find_reference_location(snapshot, refname, 1);
+
+ if (!rec) {
+ /* refname is not a packed reference. */
+ errno = ENOENT;
+ return -1;
+ }
+
+ if (get_oid_hex(rec, oid))
+ die_invalid_line(refs->path, rec, snapshot->eof - rec);
+
+ *type = REF_ISPACKED;
+ return 0;
+}
+
+/*
+ * This value is set in `base.flags` if the peeled value of the
+ * current reference is known. In that case, `peeled` contains the
+ * correct peeled value for the reference, which might be `null_oid`
+ * if the reference is not a tag or if it is broken.
+ */
+#define REF_KNOWS_PEELED 0x40
+
+/*
+ * An iterator over a snapshot of a `packed-refs` file.
+ */
+struct packed_ref_iterator {
+ struct ref_iterator base;
+
+ struct snapshot *snapshot;
+
+ /* The current position in the snapshot's buffer: */
+ const char *pos;
+
+ /* The end of the part of the buffer that will be iterated over: */
+ const char *eof;
+
+ /* Scratch space for current values: */
+ struct object_id oid, peeled;
+ struct strbuf refname_buf;
+
+ unsigned int flags;
+};
+
+/*
+ * Move the iterator to the next record in the snapshot, without
+ * respect for whether the record is actually required by the current
+ * iteration. Adjust the fields in `iter` and return `ITER_OK` or
+ * `ITER_DONE`. This function does not free the iterator in the case
+ * of `ITER_DONE`.
+ */
+static int next_record(struct packed_ref_iterator *iter)
+{
+ const char *p = iter->pos, *eol;
+
+ strbuf_reset(&iter->refname_buf);
+
+ if (iter->pos == iter->eof)
+ return ITER_DONE;
+
+ iter->base.flags = REF_ISPACKED;
+
+ if (iter->eof - p < GIT_SHA1_HEXSZ + 2 ||
+ parse_oid_hex(p, &iter->oid, &p) ||
+ !isspace(*p++))
+ die_invalid_line(iter->snapshot->refs->path,
+ iter->pos, iter->eof - iter->pos);
+
+ eol = memchr(p, '\n', iter->eof - p);
+ if (!eol)
+ die_unterminated_line(iter->snapshot->refs->path,
+ iter->pos, iter->eof - iter->pos);
+
+ strbuf_add(&iter->refname_buf, p, eol - p);
+ iter->base.refname = iter->refname_buf.buf;
+
+ if (check_refname_format(iter->base.refname, REFNAME_ALLOW_ONELEVEL)) {
+ if (!refname_is_safe(iter->base.refname))
+ die("packed refname is dangerous: %s",
+ iter->base.refname);
+ oidclr(&iter->oid);
+ iter->base.flags |= REF_BAD_NAME | REF_ISBROKEN;
+ }
+ if (iter->snapshot->peeled == PEELED_FULLY ||
+ (iter->snapshot->peeled == PEELED_TAGS &&
+ starts_with(iter->base.refname, "refs/tags/")))
+ iter->base.flags |= REF_KNOWS_PEELED;
+
+ iter->pos = eol + 1;
+
+ if (iter->pos < iter->eof && *iter->pos == '^') {
+ p = iter->pos + 1;
+ if (iter->eof - p < GIT_SHA1_HEXSZ + 1 ||
+ parse_oid_hex(p, &iter->peeled, &p) ||
+ *p++ != '\n')
+ die_invalid_line(iter->snapshot->refs->path,
+ iter->pos, iter->eof - iter->pos);
+ iter->pos = p;
+
+ /*
+ * Regardless of what the file header said, we
+ * definitely know the value of *this* reference. But
+ * we suppress it if the reference is broken:
+ */
+ if ((iter->base.flags & REF_ISBROKEN)) {
+ oidclr(&iter->peeled);
+ iter->base.flags &= ~REF_KNOWS_PEELED;
+ } else {
+ iter->base.flags |= REF_KNOWS_PEELED;
+ }
+ } else {
+ oidclr(&iter->peeled);
+ }
+
+ return ITER_OK;
+}
+
+static int packed_ref_iterator_advance(struct ref_iterator *ref_iterator)
+{
+ struct packed_ref_iterator *iter =
+ (struct packed_ref_iterator *)ref_iterator;
+ int ok;
+
+ while ((ok = next_record(iter)) == ITER_OK) {
+ if (iter->flags & DO_FOR_EACH_PER_WORKTREE_ONLY &&
+ ref_type(iter->base.refname) != REF_TYPE_PER_WORKTREE)
+ continue;
+
+ if (!(iter->flags & DO_FOR_EACH_INCLUDE_BROKEN) &&
+ !ref_resolves_to_object(iter->base.refname, &iter->oid,
+ iter->flags))
+ continue;
+
+ return ITER_OK;
+ }
+
+ if (ref_iterator_abort(ref_iterator) != ITER_DONE)
+ ok = ITER_ERROR;
+
+ return ok;
+}
+
+static int packed_ref_iterator_peel(struct ref_iterator *ref_iterator,
+ struct object_id *peeled)
+{
+ struct packed_ref_iterator *iter =
+ (struct packed_ref_iterator *)ref_iterator;
+
+ if ((iter->base.flags & REF_KNOWS_PEELED)) {
+ oidcpy(peeled, &iter->peeled);
+ return is_null_oid(&iter->peeled) ? -1 : 0;
+ } else if ((iter->base.flags & (REF_ISBROKEN | REF_ISSYMREF))) {
+ return -1;
+ } else {
+ return !!peel_object(&iter->oid, peeled);
+ }
+}
+
+static int packed_ref_iterator_abort(struct ref_iterator *ref_iterator)
+{
+ struct packed_ref_iterator *iter =
+ (struct packed_ref_iterator *)ref_iterator;
+ int ok = ITER_DONE;
+
+ strbuf_release(&iter->refname_buf);
+ release_snapshot(iter->snapshot);
+ base_ref_iterator_free(ref_iterator);
+ return ok;
+}
+
+static struct ref_iterator_vtable packed_ref_iterator_vtable = {
+ packed_ref_iterator_advance,
+ packed_ref_iterator_peel,
+ packed_ref_iterator_abort
+};
+
+static struct ref_iterator *packed_ref_iterator_begin(
+ struct ref_store *ref_store,
+ const char *prefix, unsigned int flags)
+{
+ struct packed_ref_store *refs;
+ struct snapshot *snapshot;
+ const char *start;
+ struct packed_ref_iterator *iter;
+ struct ref_iterator *ref_iterator;
+ unsigned int required_flags = REF_STORE_READ;
+
+ if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN))
+ required_flags |= REF_STORE_ODB;
+ refs = packed_downcast(ref_store, required_flags, "ref_iterator_begin");
+
+ /*
+ * Note that `get_snapshot()` internally checks whether the
+ * snapshot is up to date with what is on disk, and re-reads
+ * it if not.
+ */
+ snapshot = get_snapshot(refs);
+
+ if (!snapshot->buf)
+ return empty_ref_iterator_begin();
+
+ iter = xcalloc(1, sizeof(*iter));
+ ref_iterator = &iter->base;
+ base_ref_iterator_init(ref_iterator, &packed_ref_iterator_vtable, 1);
+
+ iter->snapshot = snapshot;
+ acquire_snapshot(snapshot);
+
+ if (prefix && *prefix)
+ start = find_reference_location(snapshot, prefix, 0);
+ else
+ start = snapshot->buf + snapshot->header_len;
+
+ iter->pos = start;
+ iter->eof = snapshot->eof;
+ strbuf_init(&iter->refname_buf, 0);
+
+ iter->base.oid = &iter->oid;
+
+ iter->flags = flags;
+
+ if (prefix && *prefix)
+ /* Stop iteration after we've gone *past* prefix: */
+ ref_iterator = prefix_ref_iterator_begin(ref_iterator, prefix, 0);
+
+ return ref_iterator;
+}
+
+/*
+ * Write an entry to the packed-refs file for the specified refname.
+ * If peeled is non-NULL, write it as the entry's peeled value. On
+ * error, return a nonzero value and leave errno set at the value left
+ * by the failing call to `fprintf()`.
+ */
+static int write_packed_entry(FILE *fh, const char *refname,
+ const struct object_id *oid,
+ const struct object_id *peeled)
+{
+ if (fprintf(fh, "%s %s\n", oid_to_hex(oid), refname) < 0 ||
+ (peeled && fprintf(fh, "^%s\n", oid_to_hex(peeled)) < 0))
+ return -1;
+
+ return 0;
+}
+
+int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err)
+{
+ struct packed_ref_store *refs =
+ packed_downcast(ref_store, REF_STORE_WRITE | REF_STORE_MAIN,
+ "packed_refs_lock");
+ static int timeout_configured = 0;
+ static int timeout_value = 1000;
+
+ if (!timeout_configured) {
+ git_config_get_int("core.packedrefstimeout", &timeout_value);
+ timeout_configured = 1;
+ }
+
+ /*
+ * Note that we close the lockfile immediately because we
+ * don't write new content to it, but rather to a separate
+ * tempfile.
+ */
+ if (hold_lock_file_for_update_timeout(
+ &refs->lock,
+ refs->path,
+ flags, timeout_value) < 0) {
+ unable_to_lock_message(refs->path, errno, err);
+ return -1;
+ }
+
+ if (close_lock_file_gently(&refs->lock)) {
+ strbuf_addf(err, "unable to close %s: %s", refs->path, strerror(errno));
+ rollback_lock_file(&refs->lock);
+ return -1;
+ }
+
+ /*
+ * Now that we hold the `packed-refs` lock, make sure that our
+ * snapshot matches the current version of the file. Normally
+ * `get_snapshot()` does that for us, but that function
+ * assumes that when the file is locked, any existing snapshot
+ * is still valid. We've just locked the file, but it might
+ * have changed the moment *before* we locked it.
+ */
+ validate_snapshot(refs);
+
+ /*
+ * Now make sure that the packed-refs file as it exists in the
+ * locked state is loaded into the snapshot:
+ */
+ get_snapshot(refs);
+ return 0;
+}
+
+void packed_refs_unlock(struct ref_store *ref_store)
+{
+ struct packed_ref_store *refs = packed_downcast(
+ ref_store,
+ REF_STORE_READ | REF_STORE_WRITE,
+ "packed_refs_unlock");
+
+ if (!is_lock_file_locked(&refs->lock))
+ die("BUG: packed_refs_unlock() called when not locked");
+ rollback_lock_file(&refs->lock);
+}
+
+int packed_refs_is_locked(struct ref_store *ref_store)
+{
+ struct packed_ref_store *refs = packed_downcast(
+ ref_store,
+ REF_STORE_READ | REF_STORE_WRITE,
+ "packed_refs_is_locked");
+
+ return is_lock_file_locked(&refs->lock);
+}
+
+/*
+ * The packed-refs header line that we write out. Perhaps other traits
+ * will be added later.
+ *
+ * Note that earlier versions of Git used to parse these traits by
+ * looking for " trait " in the line. For this reason, the space after
+ * the colon and the trailing space are required.
+ */
+static const char PACKED_REFS_HEADER[] =
+ "# pack-refs with: peeled fully-peeled sorted \n";
+
+static int packed_init_db(struct ref_store *ref_store, struct strbuf *err)
+{
+ /* Nothing to do. */
+ return 0;
+}
+
+/*
+ * Write the packed refs from the current snapshot to the packed-refs
+ * tempfile, incorporating any changes from `updates`. `updates` must
+ * be a sorted string list whose keys are the refnames and whose util
+ * values are `struct ref_update *`. On error, rollback the tempfile,
+ * write an error message to `err`, and return a nonzero value.
+ *
+ * The packfile must be locked before calling this function and will
+ * remain locked when it is done.
+ */
+static int write_with_updates(struct packed_ref_store *refs,
+ struct string_list *updates,
+ struct strbuf *err)
+{
+ struct ref_iterator *iter = NULL;
+ size_t i;
+ int ok;
+ FILE *out;
+ struct strbuf sb = STRBUF_INIT;
+ char *packed_refs_path;
+
+ if (!is_lock_file_locked(&refs->lock))
+ die("BUG: write_with_updates() called while unlocked");
+
+ /*
+ * If packed-refs is a symlink, we want to overwrite the
+ * symlinked-to file, not the symlink itself. Also, put the
+ * staging file next to it:
+ */
+ packed_refs_path = get_locked_file_path(&refs->lock);
+ strbuf_addf(&sb, "%s.new", packed_refs_path);
+ free(packed_refs_path);
+ refs->tempfile = create_tempfile(sb.buf);
+ if (!refs->tempfile) {
+ strbuf_addf(err, "unable to create file %s: %s",
+ sb.buf, strerror(errno));
+ strbuf_release(&sb);
+ return -1;
+ }
+ strbuf_release(&sb);
+
+ out = fdopen_tempfile(refs->tempfile, "w");
+ if (!out) {
+ strbuf_addf(err, "unable to fdopen packed-refs tempfile: %s",
+ strerror(errno));
+ goto error;
+ }
+
+ if (fprintf(out, "%s", PACKED_REFS_HEADER) < 0)
+ goto write_error;
+
+ /*
+ * We iterate in parallel through the current list of refs and
+ * the list of updates, processing an entry from at least one
+ * of the lists each time through the loop. When the current
+ * list of refs is exhausted, set iter to NULL. When the list
+ * of updates is exhausted, leave i set to updates->nr.
+ */
+ iter = packed_ref_iterator_begin(&refs->base, "",
+ DO_FOR_EACH_INCLUDE_BROKEN);
+ if ((ok = ref_iterator_advance(iter)) != ITER_OK)
+ iter = NULL;
+
+ i = 0;
+
+ while (iter || i < updates->nr) {
+ struct ref_update *update = NULL;
+ int cmp;
+
+ if (i >= updates->nr) {
+ cmp = -1;
+ } else {
+ update = updates->items[i].util;
+
+ if (!iter)
+ cmp = +1;
+ else
+ cmp = strcmp(iter->refname, update->refname);
+ }
+
+ if (!cmp) {
+ /*
+ * There is both an old value and an update
+ * for this reference. Check the old value if
+ * necessary:
+ */
+ if ((update->flags & REF_HAVE_OLD)) {
+ if (is_null_oid(&update->old_oid)) {
+ strbuf_addf(err, "cannot update ref '%s': "
+ "reference already exists",
+ update->refname);
+ goto error;
+ } else if (oidcmp(&update->old_oid, iter->oid)) {
+ strbuf_addf(err, "cannot update ref '%s': "
+ "is at %s but expected %s",
+ update->refname,
+ oid_to_hex(iter->oid),
+ oid_to_hex(&update->old_oid));
+ goto error;
+ }
+ }
+
+ /* Now figure out what to use for the new value: */
+ if ((update->flags & REF_HAVE_NEW)) {
+ /*
+ * The update takes precedence. Skip
+ * the iterator over the unneeded
+ * value.
+ */
+ if ((ok = ref_iterator_advance(iter)) != ITER_OK)
+ iter = NULL;
+ cmp = +1;
+ } else {
+ /*
+ * The update doesn't actually want to
+ * change anything. We're done with it.
+ */
+ i++;
+ cmp = -1;
+ }
+ } else if (cmp > 0) {
+ /*
+ * There is no old value but there is an
+ * update for this reference. Make sure that
+ * the update didn't expect an existing value:
+ */
+ if ((update->flags & REF_HAVE_OLD) &&
+ !is_null_oid(&update->old_oid)) {
+ strbuf_addf(err, "cannot update ref '%s': "
+ "reference is missing but expected %s",
+ update->refname,
+ oid_to_hex(&update->old_oid));
+ goto error;
+ }
+ }
+
+ if (cmp < 0) {
+ /* Pass the old reference through. */
+
+ struct object_id peeled;
+ int peel_error = ref_iterator_peel(iter, &peeled);
+
+ if (write_packed_entry(out, iter->refname,
+ iter->oid,
+ peel_error ? NULL : &peeled))
+ goto write_error;
+
+ if ((ok = ref_iterator_advance(iter)) != ITER_OK)
+ iter = NULL;
+ } else if (is_null_oid(&update->new_oid)) {
+ /*
+ * The update wants to delete the reference,
+ * and the reference either didn't exist or we
+ * have already skipped it. So we're done with
+ * the update (and don't have to write
+ * anything).
+ */
+ i++;
+ } else {
+ struct object_id peeled;
+ int peel_error = peel_object(&update->new_oid,
+ &peeled);
+
+ if (write_packed_entry(out, update->refname,
+ &update->new_oid,
+ peel_error ? NULL : &peeled))
+ goto write_error;
+
+ i++;
+ }
+ }
+
+ if (ok != ITER_DONE) {
+ strbuf_addstr(err, "unable to write packed-refs file: "
+ "error iterating over old contents");
+ goto error;
+ }
+
+ if (close_tempfile_gently(refs->tempfile)) {
+ strbuf_addf(err, "error closing file %s: %s",
+ get_tempfile_path(refs->tempfile),
+ strerror(errno));
+ strbuf_release(&sb);
+ delete_tempfile(&refs->tempfile);
+ return -1;
+ }
+
+ return 0;
+
+write_error:
+ strbuf_addf(err, "error writing to %s: %s",
+ get_tempfile_path(refs->tempfile), strerror(errno));
+
+error:
+ if (iter)
+ ref_iterator_abort(iter);
+
+ delete_tempfile(&refs->tempfile);
+ return -1;
+}
+
+int is_packed_transaction_needed(struct ref_store *ref_store,
+ struct ref_transaction *transaction)
+{
+ struct packed_ref_store *refs = packed_downcast(
+ ref_store,
+ REF_STORE_READ,
+ "is_packed_transaction_needed");
+ struct strbuf referent = STRBUF_INIT;
+ size_t i;
+ int ret;
+
+ if (!is_lock_file_locked(&refs->lock))
+ BUG("is_packed_transaction_needed() called while unlocked");
+
+ /*
+ * We're only going to bother returning false for the common,
+ * trivial case that references are only being deleted, their
+ * old values are not being checked, and the old `packed-refs`
+ * file doesn't contain any of those reference(s). This gives
+ * false positives for some other cases that could
+ * theoretically be optimized away:
+ *
+ * 1. It could be that the old value is being verified without
+ * setting a new value. In this case, we could verify the
+ * old value here and skip the update if it agrees. If it
+ * disagrees, we could either let the update go through
+ * (the actual commit would re-detect and report the
+ * problem), or come up with a way of reporting such an
+ * error to *our* caller.
+ *
+ * 2. It could be that a new value is being set, but that it
+ * is identical to the current packed value of the
+ * reference.
+ *
+ * Neither of these cases will come up in the current code,
+ * because the only caller of this function passes to it a
+ * transaction that only includes `delete` updates with no
+ * `old_id`. Even if that ever changes, false positives only
+ * cause an optimization to be missed; they do not affect
+ * correctness.
+ */
+
+ /*
+ * Start with the cheap checks that don't require old
+ * reference values to be read:
+ */
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+
+ if (update->flags & REF_HAVE_OLD)
+ /* Have to check the old value -> needed. */
+ return 1;
+
+ if ((update->flags & REF_HAVE_NEW) && !is_null_oid(&update->new_oid))
+ /* Have to set a new value -> needed. */
+ return 1;
+ }
+
+ /*
+ * The transaction isn't checking any old values nor is it
+ * setting any nonzero new values, so it still might be able
+ * to be skipped. Now do the more expensive check: the update
+ * is needed if any of the updates is a delete, and the old
+ * `packed-refs` file contains a value for that reference.
+ */
+ ret = 0;
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+ unsigned int type;
+ struct object_id oid;
+
+ if (!(update->flags & REF_HAVE_NEW))
+ /*
+ * This reference isn't being deleted -> not
+ * needed.
+ */
+ continue;
+
+ if (!refs_read_raw_ref(ref_store, update->refname,
+ &oid, &referent, &type) ||
+ errno != ENOENT) {
+ /*
+ * We have to actually delete that reference
+ * -> this transaction is needed.
+ */
+ ret = 1;
+ break;
+ }
+ }
+
+ strbuf_release(&referent);
+ return ret;
+}
+
+struct packed_transaction_backend_data {
+ /* True iff the transaction owns the packed-refs lock. */
+ int own_lock;
+
+ struct string_list updates;
+};
+
+static void packed_transaction_cleanup(struct packed_ref_store *refs,
+ struct ref_transaction *transaction)
+{
+ struct packed_transaction_backend_data *data = transaction->backend_data;
+
+ if (data) {
+ string_list_clear(&data->updates, 0);
+
+ if (is_tempfile_active(refs->tempfile))
+ delete_tempfile(&refs->tempfile);
+
+ if (data->own_lock && is_lock_file_locked(&refs->lock)) {
+ packed_refs_unlock(&refs->base);
+ data->own_lock = 0;
+ }
+
+ free(data);
+ transaction->backend_data = NULL;
+ }
+
+ transaction->state = REF_TRANSACTION_CLOSED;
+}
+
+static int packed_transaction_prepare(struct ref_store *ref_store,
+ struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ struct packed_ref_store *refs = packed_downcast(
+ ref_store,
+ REF_STORE_READ | REF_STORE_WRITE | REF_STORE_ODB,
+ "ref_transaction_prepare");
+ struct packed_transaction_backend_data *data;
+ size_t i;
+ int ret = TRANSACTION_GENERIC_ERROR;
+
+ /*
+ * Note that we *don't* skip transactions with zero updates,
+ * because such a transaction might be executed for the side
+ * effect of ensuring that all of the references are peeled or
+ * ensuring that the `packed-refs` file is sorted. If the
+ * caller wants to optimize away empty transactions, it should
+ * do so itself.
+ */
+
+ data = xcalloc(1, sizeof(*data));
+ string_list_init(&data->updates, 0);
+
+ transaction->backend_data = data;
+
+ /*
+ * Stick the updates in a string list by refname so that we
+ * can sort them:
+ */
+ for (i = 0; i < transaction->nr; i++) {
+ struct ref_update *update = transaction->updates[i];
+ struct string_list_item *item =
+ string_list_append(&data->updates, update->refname);
+
+ /* Store a pointer to update in item->util: */
+ item->util = update;
+ }
+ string_list_sort(&data->updates);
+
+ if (ref_update_reject_duplicates(&data->updates, err))
+ goto failure;
+
+ if (!is_lock_file_locked(&refs->lock)) {
+ if (packed_refs_lock(ref_store, 0, err))
+ goto failure;
+ data->own_lock = 1;
+ }
+
+ if (write_with_updates(refs, &data->updates, err))
+ goto failure;
+
+ transaction->state = REF_TRANSACTION_PREPARED;
+ return 0;
+
+failure:
+ packed_transaction_cleanup(refs, transaction);
+ return ret;
+}
+
+static int packed_transaction_abort(struct ref_store *ref_store,
+ struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ struct packed_ref_store *refs = packed_downcast(
+ ref_store,
+ REF_STORE_READ | REF_STORE_WRITE | REF_STORE_ODB,
+ "ref_transaction_abort");
+
+ packed_transaction_cleanup(refs, transaction);
+ return 0;
+}
+
+static int packed_transaction_finish(struct ref_store *ref_store,
+ struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ struct packed_ref_store *refs = packed_downcast(
+ ref_store,
+ REF_STORE_READ | REF_STORE_WRITE | REF_STORE_ODB,
+ "ref_transaction_finish");
+ int ret = TRANSACTION_GENERIC_ERROR;
+ char *packed_refs_path;
+
+ clear_snapshot(refs);
+
+ packed_refs_path = get_locked_file_path(&refs->lock);
+ if (rename_tempfile(&refs->tempfile, packed_refs_path)) {
+ strbuf_addf(err, "error replacing %s: %s",
+ refs->path, strerror(errno));
+ goto cleanup;
+ }
+
+ ret = 0;
+
+cleanup:
+ free(packed_refs_path);
+ packed_transaction_cleanup(refs, transaction);
+ return ret;
+}
+
+static int packed_initial_transaction_commit(struct ref_store *ref_store,
+ struct ref_transaction *transaction,
+ struct strbuf *err)
+{
+ return ref_transaction_commit(transaction, err);
+}
+
+static int packed_delete_refs(struct ref_store *ref_store, const char *msg,
+ struct string_list *refnames, unsigned int flags)
+{
+ struct packed_ref_store *refs =
+ packed_downcast(ref_store, REF_STORE_WRITE, "delete_refs");
+ struct strbuf err = STRBUF_INIT;
+ struct ref_transaction *transaction;
+ struct string_list_item *item;
+ int ret;
+
+ (void)refs; /* We need the check above, but don't use the variable */
+
+ if (!refnames->nr)
+ return 0;
+
+ /*
+ * Since we don't check the references' old_oids, the
+ * individual updates can't fail, so we can pack all of the
+ * updates into a single transaction.
+ */
+
+ transaction = ref_store_transaction_begin(ref_store, &err);
+ if (!transaction)
+ return -1;
+
+ for_each_string_list_item(item, refnames) {
+ if (ref_transaction_delete(transaction, item->string, NULL,
+ flags, msg, &err)) {
+ warning(_("could not delete reference %s: %s"),
+ item->string, err.buf);
+ strbuf_reset(&err);
+ }
+ }
+
+ ret = ref_transaction_commit(transaction, &err);
+
+ if (ret) {
+ if (refnames->nr == 1)
+ error(_("could not delete reference %s: %s"),
+ refnames->items[0].string, err.buf);
+ else
+ error(_("could not delete references: %s"), err.buf);
+ }
+
+ ref_transaction_free(transaction);
+ strbuf_release(&err);
+ return ret;
+}
+
+static int packed_pack_refs(struct ref_store *ref_store, unsigned int flags)
+{
+ /*
+ * Packed refs are already packed. It might be that loose refs
+ * are packed *into* a packed refs store, but that is done by
+ * updating the packed references via a transaction.
+ */
+ return 0;
+}
+
+static int packed_create_symref(struct ref_store *ref_store,
+ const char *refname, const char *target,
+ const char *logmsg)
+{
+ die("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)
+{
+ die("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)
+{
+ die("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)
+{
+ 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)
+{
+ return 0;
+}
+
+static int packed_reflog_exists(struct ref_store *ref_store,
+ const char *refname)
+{
+ return 0;
+}
+
+static int packed_create_reflog(struct ref_store *ref_store,
+ const char *refname, int force_create,
+ struct strbuf *err)
+{
+ die("BUG: packed reference store does not support reflogs");
+}
+
+static int packed_delete_reflog(struct ref_store *ref_store,
+ const char *refname)
+{
+ return 0;
+}
+
+static int packed_reflog_expire(struct ref_store *ref_store,
+ const char *refname, const struct object_id *oid,
+ unsigned int flags,
+ reflog_expiry_prepare_fn prepare_fn,
+ reflog_expiry_should_prune_fn should_prune_fn,
+ reflog_expiry_cleanup_fn cleanup_fn,
+ void *policy_cb_data)
+{
+ 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,
+
+ packed_pack_refs,
+ packed_create_symref,
+ packed_delete_refs,
+ packed_rename_ref,
+ packed_copy_ref,
+
+ packed_ref_iterator_begin,
+ packed_read_raw_ref,
+
+ 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
+};
diff --git a/refs/packed-backend.h b/refs/packed-backend.h
new file mode 100644
index 0000000..640245d
--- /dev/null
+++ b/refs/packed-backend.h
@@ -0,0 +1,35 @@
+#ifndef REFS_PACKED_BACKEND_H
+#define REFS_PACKED_BACKEND_H
+
+/*
+ * Support for storing references in a `packed-refs` file.
+ *
+ * Note that this backend doesn't check for D/F conflicts, because it
+ * doesn't care about them. But usually it should be wrapped in a
+ * `files_ref_store` that prevents D/F conflicts from being created,
+ * even among packed refs.
+ */
+
+struct ref_store *packed_ref_store_create(const char *path,
+ unsigned int store_flags);
+
+/*
+ * Lock the packed-refs file for writing. Flags is passed to
+ * hold_lock_file_for_update(). Return 0 on success. On errors, write
+ * an error message to `err` and return a nonzero value.
+ */
+int packed_refs_lock(struct ref_store *ref_store, int flags, struct strbuf *err);
+
+void packed_refs_unlock(struct ref_store *ref_store);
+int packed_refs_is_locked(struct ref_store *ref_store);
+
+/*
+ * Return true if `transaction` really needs to be carried out against
+ * the specified packed_ref_store, or false if it can be skipped
+ * (i.e., because it is an obvious NOOP). `ref_store` must be locked
+ * before calling this function.
+ */
+int is_packed_transaction_needed(struct ref_store *ref_store,
+ struct ref_transaction *transaction);
+
+#endif /* REFS_PACKED_BACKEND_H */
diff --git a/refs/ref-cache.c b/refs/ref-cache.c
index 76bb723..82c1cf9 100644
--- a/refs/ref-cache.c
+++ b/refs/ref-cache.c
@@ -38,7 +38,6 @@
FLEX_ALLOC_STR(ref, name, refname);
oidcpy(&ref->u.value.oid, oid);
- oidclr(&ref->u.value.peeled);
ref->flag = flag;
return ref;
}
@@ -261,8 +260,8 @@
/*
* Emit a warning and return true iff ref1 and ref2 have the same name
- * and the same sha1. Die if they have the same name but different
- * sha1s.
+ * and the same oid. Die if they have the same name but different
+ * oids.
*/
static int is_dup_ref(const struct ref_entry *ref1, const struct ref_entry *ref2)
{
@@ -491,49 +490,10 @@
}
}
-enum peel_status peel_entry(struct ref_entry *entry, int repeel)
-{
- enum peel_status status;
-
- if (entry->flag & REF_KNOWS_PEELED) {
- if (repeel) {
- entry->flag &= ~REF_KNOWS_PEELED;
- oidclr(&entry->u.value.peeled);
- } else {
- return is_null_oid(&entry->u.value.peeled) ?
- PEEL_NON_TAG : PEEL_PEELED;
- }
- }
- if (entry->flag & REF_ISBROKEN)
- return PEEL_BROKEN;
- if (entry->flag & REF_ISSYMREF)
- return PEEL_IS_SYMREF;
-
- status = peel_object(entry->u.value.oid.hash, entry->u.value.peeled.hash);
- if (status == PEEL_PEELED || status == PEEL_NON_TAG)
- entry->flag |= REF_KNOWS_PEELED;
- return status;
-}
-
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;
- struct cache_ref_iterator_level *level;
- struct ref_entry *entry;
-
- level = &iter->levels[iter->levels_nr - 1];
-
- if (level->index == -1)
- die("BUG: peel called before advance for cache iterator");
-
- entry = level->dir->entries[level->index];
-
- if (peel_entry(entry, 0))
- return -1;
- oidcpy(peeled, &entry->u.value.peeled);
- return 0;
+ return peel_object(ref_iterator->oid, peeled);
}
static int cache_ref_iterator_abort(struct ref_iterator *ref_iterator)
@@ -574,7 +534,7 @@
iter = xcalloc(1, sizeof(*iter));
ref_iterator = &iter->base;
- base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable);
+ base_ref_iterator_init(ref_iterator, &cache_ref_iterator_vtable, 1);
ALLOC_GROW(iter->levels, 10, iter->levels_alloc);
iter->levels_nr = 1;
diff --git a/refs/ref-cache.h b/refs/ref-cache.h
index 794f000..eda65e7 100644
--- a/refs/ref-cache.h
+++ b/refs/ref-cache.h
@@ -38,14 +38,6 @@
* referred to by the last reference in the symlink chain.
*/
struct object_id oid;
-
- /*
- * If REF_KNOWS_PEELED, then this field holds the peeled value
- * of this reference, or null if the reference is known not to
- * be peelable. See the documentation for peel_ref() for an
- * exact definition of "peelable".
- */
- struct object_id peeled;
};
/*
@@ -97,21 +89,14 @@
* public values; see refs.h.
*/
-/*
- * The field ref_entry->u.value.peeled of this value entry contains
- * the correct peeled value for the reference, which might be
- * null_sha1 if the reference is not a tag or if it is broken.
- */
-#define REF_KNOWS_PEELED 0x10
-
/* ref_entry represents a directory of references */
-#define REF_DIR 0x20
+#define REF_DIR 0x10
/*
* Entry has not yet been read from disk (used only for REF_DIR
* entries representing loose references)
*/
-#define REF_INCOMPLETE 0x40
+#define REF_INCOMPLETE 0x20
/*
* A ref_entry represents either a reference or a "subdirectory" of
@@ -245,23 +230,11 @@
* Start iterating over references in `cache`. If `prefix` is
* specified, only include references whose names start with that
* prefix. If `prime_dir` is true, then fill any incomplete
- * directories before beginning the iteration.
+ * directories before beginning the iteration. The output is ordered
+ * by refname.
*/
struct ref_iterator *cache_ref_iterator_begin(struct ref_cache *cache,
const char *prefix,
int prime_dir);
-/*
- * Peel the entry (if possible) and return its new peel_status. If
- * repeel is true, re-peel the entry even if there is an old peeled
- * value that is already stored in it.
- *
- * It is OK to call this function with a packed reference entry that
- * might be stale and might even refer to an object that has since
- * been garbage-collected. In such a case, if the entry has
- * REF_KNOWS_PEELED then leave the status unchanged and return
- * PEEL_PEELED or PEEL_NON_TAG; otherwise, return PEEL_INVALID.
- */
-enum peel_status peel_entry(struct ref_entry *entry, int repeel);
-
#endif /* REFS_REF_CACHE_H */
diff --git a/refs/refs-internal.h b/refs/refs-internal.h
index 192f9f8..dd83431 100644
--- a/refs/refs-internal.h
+++ b/refs/refs-internal.h
@@ -8,58 +8,28 @@
*/
/*
- * Flag passed to lock_ref_sha1_basic() telling it to tolerate broken
- * refs (i.e., because the reference is about to be deleted anyway).
- */
-#define REF_DELETING 0x02
-
-/*
- * Used as a flag in ref_update::flags when a loose ref is being
- * pruned. This flag must only be used when REF_NODEREF is set.
- */
-#define REF_ISPRUNING 0x04
-
-/*
- * Used as a flag in ref_update::flags when the reference should be
- * updated to new_sha1.
- */
-#define REF_HAVE_NEW 0x08
-
-/*
- * Used as a flag in ref_update::flags when old_sha1 should be
- * checked.
- */
-#define REF_HAVE_OLD 0x10
-
-/*
- * Used as a flag in ref_update::flags when the lockfile needs to be
- * committed.
- */
-#define REF_NEEDS_COMMIT 0x20
-
-/*
- * 0x40 is REF_FORCE_CREATE_REFLOG, so skip it if you're adding a
- * value to ref_update::flags
+ * The following flags can appear in `ref_update::flags`. Their
+ * numerical values must not conflict with those of REF_NO_DEREF and
+ * REF_FORCE_CREATE_REFLOG, which are also stored in
+ * `ref_update::flags`.
*/
/*
- * Used as a flag in ref_update::flags when we want to log a ref
- * update but not actually perform it. This is used when a symbolic
- * ref update is split up.
+ * The reference should be updated to new_oid.
*/
-#define REF_LOG_ONLY 0x80
+#define REF_HAVE_NEW (1 << 2)
/*
- * Internal flag, meaning that the containing ref_update was via an
- * update to HEAD.
+ * The current reference's value should be checked to make sure that
+ * it agrees with old_oid.
*/
-#define REF_UPDATE_VIA_HEAD 0x100
+#define REF_HAVE_OLD (1 << 3)
/*
- * Used as a flag in ref_update::flags when the loose reference has
- * been deleted.
+ * Return the length of time to retry acquiring a loose reference lock
+ * before giving up, in milliseconds:
*/
-#define REF_DELETED_LOOSE 0x200
+long get_files_ref_lock_timeout_ms(void);
/*
* Return true iff refname is minimally safe. "Safe" here means that
@@ -77,6 +47,15 @@
*/
int refname_is_safe(const char *refname);
+/*
+ * Helper function: return true if refname, which has the specified
+ * oid and flags, can be resolved to an object in the database. If the
+ * referred-to object does not exist, emit a warning and return false.
+ */
+int ref_resolves_to_object(const char *refname,
+ const struct object_id *oid,
+ unsigned int flags);
+
enum peel_status {
/* object was peeled successfully: */
PEEL_PEELED = 0,
@@ -105,11 +84,11 @@
/*
* Peel the named object; i.e., if the object is a tag, resolve the
* tag recursively until a non-tag is found. If successful, store the
- * result to sha1 and return PEEL_PEELED. If the object is not a tag
+ * result to oid and return PEEL_PEELED. If the object is not a tag
* or is not valid, return PEEL_NON_TAG or PEEL_INVALID, respectively,
- * and leave sha1 unchanged.
+ * and leave oid unchanged.
*/
-enum peel_status peel_object(const unsigned char *name, unsigned char *sha1);
+enum peel_status peel_object(const struct object_id *name, struct object_id *oid);
/*
* Copy the reflog message msg to buf, which has been allocated sufficiently
@@ -119,30 +98,29 @@
int copy_reflog_msg(char *buf, const char *msg);
/**
- * Information needed for a single ref update. Set new_sha1 to the new
- * value or to null_sha1 to delete the ref. To check the old value
- * while the ref is locked, set (flags & REF_HAVE_OLD) and set
- * old_sha1 to the old value, or to null_sha1 to ensure the ref does
- * not exist before update.
+ * Information needed for a single ref update. Set new_oid to the new
+ * value or to null_oid to delete the ref. To check the old value
+ * while the ref is locked, set (flags & REF_HAVE_OLD) and set old_oid
+ * to the old value, or to null_oid to ensure the ref does not exist
+ * before update.
*/
struct ref_update {
-
/*
- * If (flags & REF_HAVE_NEW), set the reference to this value:
+ * If (flags & REF_HAVE_NEW), set the reference to this value
+ * (or delete it, if `new_oid` is `null_oid`).
*/
struct object_id new_oid;
/*
* If (flags & REF_HAVE_OLD), check that the reference
- * previously had this value:
+ * previously had this value (or didn't previously exist, if
+ * `old_oid` is `null_oid`).
*/
struct object_id old_oid;
/*
- * One or more of REF_HAVE_NEW, REF_HAVE_OLD, REF_NODEREF,
- * REF_DELETING, REF_ISPRUNING, REF_LOG_ONLY,
- * REF_UPDATE_VIA_HEAD, REF_NEEDS_COMMIT, and
- * REF_DELETED_LOOSE:
+ * One or more of REF_NO_DEREF, REF_FORCE_CREATE_REFLOG,
+ * REF_HAVE_NEW, REF_HAVE_OLD, or backend-specific flags.
*/
unsigned int flags;
@@ -166,7 +144,7 @@
};
int refs_read_raw_ref(struct ref_store *ref_store,
- const char *refname, unsigned char *sha1,
+ const char *refname, struct object_id *oid,
struct strbuf *referent, unsigned int *type);
/*
@@ -180,15 +158,15 @@
/*
* Add a ref_update with the specified properties to transaction, and
* return a pointer to the new object. This function does not verify
- * that refname is well-formed. new_sha1 and old_sha1 are only
+ * that refname is well-formed. new_oid and old_oid are only
* dereferenced if the REF_HAVE_NEW and REF_HAVE_OLD bits,
* respectively, are set in flags.
*/
struct ref_update *ref_transaction_add_update(
struct ref_transaction *transaction,
const char *refname, unsigned int flags,
- const unsigned char *new_sha1,
- const unsigned char *old_sha1,
+ const struct object_id *new_oid,
+ const struct object_id *old_oid,
const char *msg);
/*
@@ -227,6 +205,7 @@
size_t alloc;
size_t nr;
enum ref_transaction_state state;
+ void *backend_data;
};
/*
@@ -313,6 +292,13 @@
*/
struct ref_iterator {
struct ref_iterator_vtable *vtable;
+
+ /*
+ * Does this `ref_iterator` iterate over references in order
+ * by refname?
+ */
+ unsigned int ordered : 1;
+
const char *refname;
const struct object_id *oid;
unsigned int flags;
@@ -358,7 +344,7 @@
* which the refname begins with prefix. If trim is non-zero, then
* trim that many characters off the beginning of each refname. flags
* can be DO_FOR_EACH_INCLUDE_BROKEN to include broken references in
- * the iteration.
+ * the iteration. The output is ordered by refname.
*/
struct ref_iterator *refs_ref_iterator_begin(
struct ref_store *refs,
@@ -384,9 +370,11 @@
* Iterate over the entries from iter0 and iter1, with the values
* interleaved as directed by the select function. The iterator takes
* ownership of iter0 and iter1 and frees them when the iteration is
- * over.
+ * over. A derived class should set `ordered` to 1 or 0 based on
+ * whether it generates its output in order by reference name.
*/
struct ref_iterator *merge_ref_iterator_begin(
+ int ordered,
struct ref_iterator *iter0, struct ref_iterator *iter1,
ref_iterator_select_fn *select, void *cb_data);
@@ -415,6 +403,8 @@
* As an convenience to callers, if prefix is the empty string and
* trim is zero, this function returns iter0 directly, without
* wrapping it.
+ *
+ * The resulting ref_iterator is ordered if iter0 is.
*/
struct ref_iterator *prefix_ref_iterator_begin(struct ref_iterator *iter0,
const char *prefix,
@@ -425,11 +415,14 @@
/*
* Base class constructor for ref_iterators. Initialize the
* ref_iterator part of iter, setting its vtable pointer as specified.
+ * `ordered` should be set to 1 if the iterator will iterate over
+ * references in order by refname; otherwise it should be set to 0.
* This is meant to be called only by the initializers of derived
* classes.
*/
void base_ref_iterator_init(struct ref_iterator *iter,
- struct ref_iterator_vtable *vtable);
+ struct ref_iterator_vtable *vtable,
+ int ordered);
/*
* Base class destructor for ref_iterators. Destroy the ref_iterator
@@ -532,8 +525,6 @@
struct strbuf *err);
typedef int pack_refs_fn(struct ref_store *ref_store, unsigned int flags);
-typedef int peel_ref_fn(struct ref_store *ref_store,
- const char *refname, unsigned char *sha1);
typedef int create_symref_fn(struct ref_store *ref_store,
const char *ref_target,
const char *refs_heads_master,
@@ -543,12 +534,16 @@
typedef int rename_ref_fn(struct ref_store *ref_store,
const char *oldref, const char *newref,
const char *logmsg);
+typedef int copy_ref_fn(struct ref_store *ref_store,
+ const char *oldref, const char *newref,
+ const char *logmsg);
/*
* Iterate over the references in `ref_store` whose names start with
* `prefix`. `prefix` is matched as a literal string, without regard
* for path separators. If prefix is NULL or the empty string, iterate
- * over all references in `ref_store`.
+ * over all references in `ref_store`. The output is ordered by
+ * refname.
*/
typedef struct ref_iterator *ref_iterator_begin_fn(
struct ref_store *ref_store,
@@ -576,7 +571,7 @@
int force_create, 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, const unsigned char *sha1,
+ const char *refname, const struct object_id *oid,
unsigned int flags,
reflog_expiry_prepare_fn prepare_fn,
reflog_expiry_should_prune_fn should_prune_fn,
@@ -587,13 +582,13 @@
* Read a reference from the specified reference store, non-recursively.
* Set type to describe the reference, and:
*
- * - If refname is the name of a normal reference, fill in sha1
+ * - If refname is the name of a normal reference, fill in oid
* (leaving referent unchanged).
*
* - If refname is the name of a symbolic reference, write the full
* name of the reference to which it refers (e.g.
* "refs/heads/master") to referent and set the REF_ISSYMREF bit in
- * type (leaving sha1 unchanged). The caller is responsible for
+ * type (leaving oid unchanged). The caller is responsible for
* validating that referent is a valid reference name.
*
* WARNING: refname might be used as part of a filename, so it is
@@ -605,7 +600,7 @@
*
* Return 0 on success. If the ref doesn't exist, set errno to ENOENT
* and return -1. If the ref exists but is neither a symbolic ref nor
- * a sha1, it is broken; set REF_ISBROKEN in type, set errno to
+ * an object ID, it is broken; set REF_ISBROKEN in type, set errno to
* EINVAL, and return -1. If there is another error reading the ref,
* set errno appropriately and return -1.
*
@@ -622,7 +617,7 @@
* refname will still be valid and unchanged.
*/
typedef int read_raw_ref_fn(struct ref_store *ref_store,
- const char *refname, unsigned char *sha1,
+ const char *refname, struct object_id *oid,
struct strbuf *referent, unsigned int *type);
struct ref_storage_be {
@@ -637,10 +632,10 @@
ref_transaction_commit_fn *initial_transaction_commit;
pack_refs_fn *pack_refs;
- peel_ref_fn *peel_ref;
create_symref_fn *create_symref;
delete_refs_fn *delete_refs;
rename_ref_fn *rename_ref;
+ copy_ref_fn *copy_ref;
ref_iterator_begin_fn *iterator_begin;
read_raw_ref_fn *read_raw_ref;
@@ -655,6 +650,7 @@
};
extern struct ref_storage_be refs_be_files;
+extern struct ref_storage_be refs_be_packed;
/*
* A representation of the reference store for the main repository or
diff --git a/remote-testsvn.c b/remote-testsvn.c
index 0ff4a31..bcebb4c 100644
--- a/remote-testsvn.c
+++ b/remote-testsvn.c
@@ -174,7 +174,7 @@
struct child_process svndump_proc = CHILD_PROCESS_INIT;
const char *command = "svnrdump";
- if (read_ref(private_ref, head_oid.hash))
+ if (read_ref(private_ref, &head_oid))
startrev = 0;
else {
note_msg = read_ref_note(&head_oid);
diff --git a/remote.c b/remote.c
index 60d0043..4e93753 100644
--- a/remote.c
+++ b/remote.c
@@ -134,10 +134,14 @@
};
static int remotes_hash_cmp(const void *unused_cmp_data,
- const struct remote *a,
- const struct remote *b,
- const struct remotes_hash_key *key)
+ const void *entry,
+ const void *entry_or_key,
+ const void *keydata)
{
+ const struct remote *a = entry;
+ const struct remote *b = entry_or_key;
+ const struct remotes_hash_key *key = keydata;
+
if (key)
return strncmp(a->name, key->str, key->len) || a->name[key->len];
else
@@ -147,7 +151,7 @@
static inline void init_remotes_hash(void)
{
if (!remotes_hash.cmpfn)
- hashmap_init(&remotes_hash, (hashmap_cmp_fn)remotes_hash_cmp, NULL, 0);
+ hashmap_init(&remotes_hash, remotes_hash_cmp, NULL, 0);
}
static struct remote *make_remote(const char *name, int len)
@@ -462,7 +466,6 @@
static void read_config(void)
{
static int loaded;
- struct object_id oid;
int flag;
if (loaded)
@@ -471,7 +474,7 @@
current_branch = NULL;
if (startup_info->have_repository) {
- const char *head_ref = resolve_ref_unsafe("HEAD", 0, oid.hash, &flag);
+ const char *head_ref = resolve_ref_unsafe("HEAD", 0, NULL, &flag);
if (head_ref && (flag & REF_ISSYMREF) &&
skip_prefix(head_ref, "refs/heads/", &head_ref)) {
current_branch = make_branch(head_ref, 0);
@@ -672,6 +675,36 @@
return remote_for_branch(branch, explicit);
}
+const char *remote_ref_for_branch(struct branch *branch, int for_push,
+ int *explicit)
+{
+ if (branch) {
+ if (!for_push) {
+ if (branch->merge_nr) {
+ if (explicit)
+ *explicit = 1;
+ return branch->merge_name[0];
+ }
+ } else {
+ const char *dst, *remote_name =
+ pushremote_for_branch(branch, NULL);
+ struct remote *remote = remote_get(remote_name);
+
+ if (remote && remote->push_refspec_nr &&
+ (dst = apply_refspecs(remote->push,
+ remote->push_refspec_nr,
+ branch->refname))) {
+ if (explicit)
+ *explicit = 1;
+ return dst;
+ }
+ }
+ }
+ if (explicit)
+ *explicit = 0;
+ return "";
+}
+
static struct remote *remote_get_1(const char *name,
const char *(*get_default)(struct branch *, int *))
{
@@ -1081,7 +1114,7 @@
return 0;
}
- if (get_sha1(name, oid.hash))
+ if (get_oid(name, &oid))
return -1;
if (match) {
@@ -1101,10 +1134,9 @@
static char *guess_ref(const char *name, struct ref *peer)
{
struct strbuf buf = STRBUF_INIT;
- struct object_id oid;
const char *r = resolve_ref_unsafe(peer->name, RESOLVE_REF_READING,
- oid.hash, NULL);
+ NULL, NULL);
if (!r)
return NULL;
@@ -1162,12 +1194,11 @@
return -1;
if (!dst_value) {
- struct object_id oid;
int flag;
dst_value = resolve_ref_unsafe(matched_src->name,
RESOLVE_REF_READING,
- oid.hash, &flag);
+ NULL, &flag);
if (!dst_value ||
((flag & REF_ISSYMREF) &&
!starts_with(dst_value, "refs/heads/")))
@@ -1628,7 +1659,7 @@
strcmp(ret->remote_name, "."))
continue;
if (dwim_ref(ret->merge_name[i], strlen(ret->merge_name[i]),
- oid.hash, &ref) == 1)
+ &oid, &ref) == 1)
ret->merge[i]->dst = ref;
else
ret->merge[i]->dst = xstrdup(ret->merge_name[i]);
@@ -1788,10 +1819,9 @@
static int ignore_symref_update(const char *refname)
{
- struct object_id oid;
int flag;
- if (!resolve_ref_unsafe(refname, 0, oid.hash, &flag))
+ if (!resolve_ref_unsafe(refname, 0, NULL, &flag))
return 0; /* non-existing refs are OK */
return (flag & REF_ISSYMREF);
}
@@ -2002,13 +2032,13 @@
return -1;
/* Cannot stat if what we used to build on no longer exists */
- if (read_ref(base, oid.hash))
+ if (read_ref(base, &oid))
return -1;
theirs = lookup_commit_reference(&oid);
if (!theirs)
return -1;
- if (read_ref(branch->refname, oid.hash))
+ if (read_ref(branch->refname, &oid))
return -1;
ours = lookup_commit_reference(&oid);
if (!ours)
@@ -2080,7 +2110,7 @@
_(" (use \"git branch --unset-upstream\" to fixup)\n"));
} else if (!ours && !theirs) {
strbuf_addf(sb,
- _("Your branch is up-to-date with '%s'.\n"),
+ _("Your branch is up to date with '%s'.\n"),
base);
} else if (!theirs) {
strbuf_addf(sb,
@@ -2297,8 +2327,8 @@
if (!*colon)
entry->use_tracking = 1;
else if (!colon[1])
- hashclr(entry->expect);
- else if (get_sha1(colon + 1, entry->expect))
+ oidclr(&entry->expect);
+ else if (get_oid(colon + 1, &entry->expect))
return error("cannot parse expected object name '%s'", colon + 1);
return 0;
}
@@ -2327,7 +2357,7 @@
dst = apply_refspecs(remote->fetch, remote->fetch_refspec_nr, refname);
if (!dst)
return -1; /* no tracking ref for refname at remote */
- if (read_ref(dst, oid->hash))
+ if (read_ref(dst, oid))
return -1; /* we know what the tracking ref is but we cannot read it */
return 0;
}
@@ -2345,7 +2375,7 @@
continue;
ref->expect_old_sha1 = 1;
if (!entry->use_tracking)
- hashcpy(ref->old_oid_expect.hash, cas->entry[i].expect);
+ oidcpy(&ref->old_oid_expect, &entry->expect);
else if (remote_tracking(remote, ref->name, &ref->old_oid_expect))
oidclr(&ref->old_oid_expect);
return;
diff --git a/remote.h b/remote.h
index 6c28cd3..1f6611b 100644
--- a/remote.h
+++ b/remote.h
@@ -223,6 +223,8 @@
struct branch *branch_get(const char *name);
const char *remote_for_branch(struct branch *branch, int *explicit);
const char *pushremote_for_branch(struct branch *branch, int *explicit);
+const char *remote_ref_for_branch(struct branch *branch, int for_push,
+ int *explicit);
int branch_has_merge_config(struct branch *branch);
int branch_merge_matches(struct branch *, int n, const char *);
@@ -282,7 +284,7 @@
struct push_cas_option {
unsigned use_tracking_for_rest:1;
struct push_cas {
- unsigned char expect[20];
+ struct object_id expect;
unsigned use_tracking:1;
char *refname;
} *entry;
diff --git a/repository.c b/repository.c
index edca907..4ffbe9b 100644
--- a/repository.c
+++ b/repository.c
@@ -4,7 +4,9 @@
#include "submodule-config.h"
/* The main repository */
-static struct repository the_repo;
+static struct repository the_repo = {
+ NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &the_index, &hash_algos[GIT_HASH_SHA1], 0, 0
+};
struct repository *the_repository = &the_repo;
static char *git_path_from_env(const char *envvar, const char *git_dir,
@@ -38,11 +40,15 @@
repo->different_commondir = find_common_dir(&sb, repo->gitdir,
!repo->ignore_env);
+ free(repo->commondir);
repo->commondir = strbuf_detach(&sb, NULL);
+ free(repo->objectdir);
repo->objectdir = git_path_from_env(DB_ENVIRONMENT, repo->commondir,
"objects", !repo->ignore_env);
+ free(repo->graft_file);
repo->graft_file = git_path_from_env(GRAFT_ENVIRONMENT, repo->commondir,
"info/grafts", !repo->ignore_env);
+ free(repo->index_file);
repo->index_file = git_path_from_env(INDEX_ENVIRONMENT, repo->gitdir,
"index", !repo->ignore_env);
}
@@ -50,16 +56,17 @@
void repo_set_gitdir(struct repository *repo, const char *path)
{
const char *gitfile = read_gitfile(path);
+ char *old_gitdir = repo->gitdir;
- /*
- * NEEDSWORK: Eventually we want to be able to free gitdir and the rest
- * of the environment before reinitializing it again, but we have some
- * crazy code paths where we try to set gitdir with the current gitdir
- * and we don't want to free gitdir before copying the passed in value.
- */
repo->gitdir = xstrdup(gitfile ? gitfile : path);
-
repo_setup_env(repo);
+
+ free(old_gitdir);
+}
+
+void repo_set_hash_algo(struct repository *repo, int hash_algo)
+{
+ repo->hash_algo = &hash_algos[hash_algo];
}
/*
@@ -134,6 +141,8 @@
if (read_and_verify_repository_format(&format, repo->commondir))
goto error;
+ repo_set_hash_algo(repo, format.hash_algo);
+
if (worktree)
repo_set_worktree(repo, worktree);
@@ -158,7 +167,7 @@
struct strbuf worktree = STRBUF_INIT;
int ret = 0;
- sub = submodule_from_cache(superproject, null_sha1, path);
+ sub = submodule_from_cache(superproject, &null_oid, path);
if (!sub) {
ret = -1;
goto out;
@@ -198,25 +207,17 @@
void repo_clear(struct repository *repo)
{
- free(repo->gitdir);
- repo->gitdir = NULL;
- free(repo->commondir);
- repo->commondir = NULL;
- free(repo->objectdir);
- repo->objectdir = NULL;
- free(repo->graft_file);
- repo->graft_file = NULL;
- free(repo->index_file);
- repo->index_file = NULL;
- free(repo->worktree);
- repo->worktree = NULL;
- free(repo->submodule_prefix);
- repo->submodule_prefix = NULL;
+ FREE_AND_NULL(repo->gitdir);
+ FREE_AND_NULL(repo->commondir);
+ FREE_AND_NULL(repo->objectdir);
+ FREE_AND_NULL(repo->graft_file);
+ FREE_AND_NULL(repo->index_file);
+ FREE_AND_NULL(repo->worktree);
+ FREE_AND_NULL(repo->submodule_prefix);
if (repo->config) {
git_configset_clear(repo->config);
- free(repo->config);
- repo->config = NULL;
+ FREE_AND_NULL(repo->config);
}
if (repo->submodule_cache) {
@@ -226,8 +227,7 @@
if (repo->index) {
discard_index(repo->index);
- free(repo->index);
- repo->index = NULL;
+ FREE_AND_NULL(repo->index);
}
}
@@ -235,8 +235,6 @@
{
if (!repo->index)
repo->index = xcalloc(1, sizeof(*repo->index));
- else
- discard_index(repo->index);
- return read_index_from(repo->index, repo->index_file);
+ return read_index_from(repo->index, repo->index_file, repo->gitdir);
}
diff --git a/repository.h b/repository.h
index 417787f..0329e40 100644
--- a/repository.h
+++ b/repository.h
@@ -4,6 +4,7 @@
struct config_set;
struct index_state;
struct submodule_cache;
+struct git_hash_algo;
struct repository {
/* Environment */
@@ -67,6 +68,9 @@
*/
struct index_state *index;
+ /* Repository's current hash algorithm, as serialized on disk. */
+ const struct git_hash_algo *hash_algo;
+
/* Configurations */
/*
* Bit used during initialization to indicate if repository state (like
@@ -86,12 +90,21 @@
extern void repo_set_gitdir(struct repository *repo, const char *path);
extern void repo_set_worktree(struct repository *repo, const char *path);
+extern void repo_set_hash_algo(struct repository *repo, int algo);
extern int repo_init(struct repository *repo, const char *gitdir, const char *worktree);
extern int repo_submodule_init(struct repository *submodule,
struct repository *superproject,
const char *path);
extern void repo_clear(struct repository *repo);
+/*
+ * Populates the repository's index from its index_file, an index struct will
+ * be allocated if needed.
+ *
+ * Return the number of index entries in the populated index or a value less
+ * than zero if an error occured. If the repository's index has already been
+ * populated then the number of entries will simply be returned.
+ */
extern int repo_read_index(struct repository *repo);
#endif /* REPOSITORY_H */
diff --git a/rerere.c b/rerere.c
index 51376cf..1ce440f 100644
--- a/rerere.c
+++ b/rerere.c
@@ -1133,14 +1133,14 @@
* Garbage collection support
*/
-static time_t rerere_created_at(struct rerere_id *id)
+static timestamp_t rerere_created_at(struct rerere_id *id)
{
struct stat st;
return stat(rerere_path(id, "preimage"), &st) ? (time_t) 0 : st.st_mtime;
}
-static time_t rerere_last_used_at(struct rerere_id *id)
+static timestamp_t rerere_last_used_at(struct rerere_id *id)
{
struct stat st;
@@ -1157,11 +1157,11 @@
id->collection->status[id->variant] = 0;
}
-static void prune_one(struct rerere_id *id, time_t now,
- int cutoff_resolve, int cutoff_noresolve)
+static void prune_one(struct rerere_id *id,
+ timestamp_t cutoff_resolve, timestamp_t cutoff_noresolve)
{
- time_t then;
- int cutoff;
+ timestamp_t then;
+ timestamp_t cutoff;
then = rerere_last_used_at(id);
if (then)
@@ -1172,7 +1172,7 @@
return;
cutoff = cutoff_noresolve;
}
- if (then < now - cutoff * 86400)
+ if (then < cutoff)
unlink_rr_item(id);
}
@@ -1182,15 +1182,15 @@
DIR *dir;
struct dirent *e;
int i;
- time_t now = time(NULL);
- int cutoff_noresolve = 15;
- int cutoff_resolve = 60;
+ timestamp_t now = time(NULL);
+ timestamp_t cutoff_noresolve = now - 15 * 86400;
+ timestamp_t cutoff_resolve = now - 60 * 86400;
if (setup_rerere(rr, 0) < 0)
return;
- git_config_get_int("gc.rerereresolved", &cutoff_resolve);
- git_config_get_int("gc.rerereunresolved", &cutoff_noresolve);
+ git_config_get_expiry_in_days("gc.rerereresolved", &cutoff_resolve, now);
+ git_config_get_expiry_in_days("gc.rerereunresolved", &cutoff_noresolve, now);
git_config(git_default_config, NULL);
dir = opendir(git_path("rr-cache"));
if (!dir)
@@ -1211,7 +1211,7 @@
for (id.variant = 0, id.collection = rr_dir;
id.variant < id.collection->status_nr;
id.variant++) {
- prune_one(&id, now, cutoff_resolve, cutoff_noresolve);
+ prune_one(&id, cutoff_resolve, cutoff_noresolve);
if (id.collection->status[id.variant])
now_empty = 0;
}
diff --git a/revision.c b/revision.c
index 7da0907..a2ba544 100644
--- a/revision.c
+++ b/revision.c
@@ -19,6 +19,9 @@
#include "dir.h"
#include "cache-tree.h"
#include "bisect.h"
+#include "packfile.h"
+#include "worktree.h"
+#include "argv-array.h"
volatile show_early_output_fn_t show_early_output;
@@ -392,8 +395,16 @@
* if the whole diff is removal of old data, and otherwise
* REV_TREE_DIFFERENT (of course if the trees are the same we
* want REV_TREE_SAME).
- * That means that once we get to REV_TREE_DIFFERENT, we do not
- * have to look any further.
+ *
+ * The only time we care about the distinction is when
+ * remove_empty_trees is in effect, in which case we care only about
+ * whether the whole change is REV_TREE_NEW, or if there's another type
+ * of change. Which means we can stop the diff early in either of these
+ * cases:
+ *
+ * 1. We're not using remove_empty_trees at all.
+ *
+ * 2. We saw anything except REV_TREE_NEW.
*/
static int tree_difference = REV_TREE_SAME;
@@ -404,10 +415,11 @@
const char *fullpath, unsigned dirty_submodule)
{
int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
+ struct rev_info *revs = options->change_fn_data;
tree_difference |= diff;
- if (tree_difference == REV_TREE_DIFFERENT)
- DIFF_OPT_SET(options, HAS_CHANGES);
+ if (!revs->remove_empty_trees || tree_difference != REV_TREE_NEW)
+ options->flags.has_changes = 1;
}
static void file_change(struct diff_options *options,
@@ -419,7 +431,7 @@
unsigned old_dirty_submodule, unsigned new_dirty_submodule)
{
tree_difference = REV_TREE_DIFFERENT;
- DIFF_OPT_SET(options, HAS_CHANGES);
+ options->flags.has_changes = 1;
}
static int rev_compare_tree(struct rev_info *revs,
@@ -452,7 +464,7 @@
}
tree_difference = REV_TREE_SAME;
- DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
+ revs->pruning.flags.has_changes = 0;
if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
&revs->pruning) < 0)
return REV_TREE_DIFFERENT;
@@ -468,7 +480,7 @@
return 0;
tree_difference = REV_TREE_SAME;
- DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
+ revs->pruning.flags.has_changes = 0;
retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
return retval >= 0 && (tree_difference == REV_TREE_SAME);
@@ -1131,6 +1143,7 @@
int warned_bad_reflog;
struct rev_info *all_revs;
const char *name_for_errormsg;
+ struct ref_store *refs;
};
int ref_excluded(struct string_list *ref_excludes, const char *path)
@@ -1167,6 +1180,7 @@
cb->all_revs = revs;
cb->all_flags = flags;
revs->rev_input_given = 1;
+ cb->refs = NULL;
}
void clear_ref_exclusion(struct string_list **ref_excludes_p)
@@ -1187,12 +1201,19 @@
string_list_append(*ref_excludes_p, exclude);
}
-static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
- int (*for_each)(const char *, each_ref_fn, void *))
+static void handle_refs(struct ref_store *refs,
+ struct rev_info *revs, unsigned flags,
+ int (*for_each)(struct ref_store *, each_ref_fn, void *))
{
struct all_refs_cb cb;
+
+ if (!refs) {
+ /* this could happen with uninitialized submodules */
+ return;
+ }
+
init_all_refs_cb(&cb, revs, flags);
- for_each(submodule, handle_one_ref, &cb);
+ for_each(refs, handle_one_ref, &cb);
}
static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
@@ -1228,17 +1249,41 @@
struct all_refs_cb *cb = cb_data;
cb->warned_bad_reflog = 0;
cb->name_for_errormsg = path;
- for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
+ refs_for_each_reflog_ent(cb->refs, path,
+ handle_one_reflog_ent, cb_data);
return 0;
}
+static void add_other_reflogs_to_pending(struct all_refs_cb *cb)
+{
+ struct worktree **worktrees, **p;
+
+ worktrees = get_worktrees(0);
+ for (p = worktrees; *p; p++) {
+ struct worktree *wt = *p;
+
+ if (wt->is_current)
+ continue;
+
+ cb->refs = get_worktree_ref_store(wt);
+ refs_for_each_reflog(cb->refs,
+ handle_one_reflog,
+ cb);
+ }
+ free_worktrees(worktrees);
+}
+
void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
{
struct all_refs_cb cb;
cb.all_revs = revs;
cb.all_flags = flags;
+ cb.refs = get_main_ref_store();
for_each_reflog(handle_one_reflog, &cb);
+
+ if (!revs->single_worktree)
+ add_other_reflogs_to_pending(&cb);
}
static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
@@ -1262,13 +1307,13 @@
}
-void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
+static void do_add_index_objects_to_pending(struct rev_info *revs,
+ struct index_state *istate)
{
int i;
- read_cache();
- for (i = 0; i < active_nr; i++) {
- struct cache_entry *ce = active_cache[i];
+ for (i = 0; i < istate->cache_nr; i++) {
+ struct cache_entry *ce = istate->cache[i];
struct blob *blob;
if (S_ISGITLINK(ce->ce_mode))
@@ -1281,13 +1326,40 @@
ce->ce_mode, ce->name);
}
- if (active_cache_tree) {
+ if (istate->cache_tree) {
struct strbuf path = STRBUF_INIT;
- add_cache_tree(active_cache_tree, revs, &path);
+ add_cache_tree(istate->cache_tree, revs, &path);
strbuf_release(&path);
}
}
+void add_index_objects_to_pending(struct rev_info *revs, unsigned int flags)
+{
+ struct worktree **worktrees, **p;
+
+ read_cache();
+ do_add_index_objects_to_pending(revs, &the_index);
+
+ if (revs->single_worktree)
+ return;
+
+ worktrees = get_worktrees(0);
+ for (p = worktrees; *p; p++) {
+ struct worktree *wt = *p;
+ struct index_state istate = { NULL };
+
+ if (wt->is_current)
+ continue; /* current index already taken care of */
+
+ if (read_index_from(&istate,
+ worktree_git_path(wt, "index"),
+ get_worktree_git_dir(wt)) > 0)
+ do_add_index_objects_to_pending(revs, &istate);
+ discard_index(&istate);
+ }
+ free_worktrees(worktrees);
+}
+
static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
int exclude_parent)
{
@@ -1302,7 +1374,7 @@
flags ^= UNINTERESTING | BOTTOM;
arg++;
}
- if (get_sha1_committish(arg, oid.hash))
+ if (get_oid_committish(arg, &oid))
return 0;
while (1) {
it = get_reference(revs, arg, &oid, 0);
@@ -1341,10 +1413,11 @@
revs->abbrev = DEFAULT_ABBREV;
revs->ignore_merges = 1;
revs->simplify_history = 1;
- DIFF_OPT_SET(&revs->pruning, RECURSIVE);
- DIFF_OPT_SET(&revs->pruning, QUICK);
+ revs->pruning.flags.recursive = 1;
+ revs->pruning.flags.quick = 1;
revs->pruning.add_remove = file_add_remove;
revs->pruning.change = file_change;
+ revs->pruning.change_fn_data = revs;
revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
revs->dense = 1;
revs->prefix = prefix;
@@ -1451,7 +1524,7 @@
unsigned int a_flags, b_flags;
int symmetric = 0;
unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
- unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
+ unsigned int oc_flags = GET_OID_COMMITTISH | GET_OID_RECORD_PATH;
a_name = arg;
if (!*a_name)
@@ -1465,8 +1538,8 @@
if (!*b_name)
b_name = "HEAD";
- if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) ||
- get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc))
+ if (get_oid_with_context(a_name, oc_flags, &a_oid, a_oc) ||
+ get_oid_with_context(b_name, oc_flags, &b_oid, b_oc))
return -1;
if (!cant_be_filename) {
@@ -1547,7 +1620,7 @@
int local_flags;
const char *arg = arg_;
int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
- unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
+ unsigned get_sha1_flags = GET_OID_RECORD_PATH;
flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
@@ -1598,9 +1671,9 @@
}
if (revarg_opt & REVARG_COMMITTISH)
- get_sha1_flags |= GET_SHA1_COMMITTISH;
+ get_sha1_flags |= GET_OID_COMMITTISH;
- if (get_sha1_with_context(arg, get_sha1_flags, oid.hash, &oc))
+ if (get_oid_with_context(arg, get_sha1_flags, &oid, &oc))
return revs->ignore_missing ? 0 : -1;
if (!cant_be_filename)
verify_non_filename(revs->prefix, arg);
@@ -1611,31 +1684,15 @@
return 0;
}
-struct cmdline_pathspec {
- int alloc;
- int nr;
- const char **path;
-};
-
-static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
-{
- while (*av) {
- ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
- prune->path[prune->nr++] = *(av++);
- }
-}
-
static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
- struct cmdline_pathspec *prune)
+ struct argv_array *prune)
{
- while (strbuf_getline(sb, stdin) != EOF) {
- ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
- prune->path[prune->nr++] = xstrdup(sb->buf);
- }
+ while (strbuf_getline(sb, stdin) != EOF)
+ argv_array_push(prune, sb->buf);
}
static void read_revisions_from_stdin(struct rev_info *revs,
- struct cmdline_pathspec *prune)
+ struct argv_array *prune)
{
struct strbuf sb;
int seen_dashdash = 0;
@@ -1776,7 +1833,7 @@
revs->simplify_by_decoration = 1;
revs->limited = 1;
revs->prune = 1;
- load_ref_decorations(DECORATE_SHORT_REFS);
+ load_ref_decorations(NULL, DECORATE_SHORT_REFS);
} else if (!strcmp(arg, "--date-order")) {
revs->sort_order = REV_SORT_BY_COMMIT_DATE;
revs->topo_order = 1;
@@ -1799,6 +1856,8 @@
revs->dense = 0;
} else if (!strcmp(arg, "--show-all")) {
revs->show_all = 1;
+ } else if (!strcmp(arg, "--in-commit-order")) {
+ revs->tree_blobs_in_commit_order = 1;
} else if (!strcmp(arg, "--remove-empty")) {
revs->remove_empty_trees = 1;
} else if (!strcmp(arg, "--merges")) {
@@ -1871,11 +1930,11 @@
die("--unpacked=<packfile> no longer supported.");
} else if (!strcmp(arg, "-r")) {
revs->diff = 1;
- DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
+ revs->diffopt.flags.recursive = 1;
} else if (!strcmp(arg, "-t")) {
revs->diff = 1;
- DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
- DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
+ revs->diffopt.flags.recursive = 1;
+ revs->diffopt.flags.tree_in_recursive = 1;
} else if (!strcmp(arg, "-m")) {
revs->ignore_merges = 0;
} else if (!strcmp(arg, "-c")) {
@@ -2020,7 +2079,7 @@
revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
} else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
revs->grep_filter.ignore_case = 1;
- DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
+ revs->diffopt.flags.pickaxe_ignore_case = 1;
} else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
} else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
@@ -2068,23 +2127,25 @@
ctx->argc -= n;
}
-static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
+static int for_each_bisect_ref(struct ref_store *refs, each_ref_fn fn,
+ void *cb_data, const char *term)
+{
struct strbuf bisect_refs = STRBUF_INIT;
int status;
strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
- status = for_each_fullref_in_submodule(submodule, bisect_refs.buf, fn, cb_data, 0);
+ status = refs_for_each_fullref_in(refs, bisect_refs.buf, fn, cb_data, 0);
strbuf_release(&bisect_refs);
return status;
}
-static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
+static int for_each_bad_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
- return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
+ return for_each_bisect_ref(refs, fn, cb_data, term_bad);
}
-static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
+static int for_each_good_bisect_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
- return for_each_bisect_ref(submodule, fn, cb_data, term_good);
+ return for_each_bisect_ref(refs, fn, cb_data, term_good);
}
static int handle_revision_pseudo_opt(const char *submodule,
@@ -2093,8 +2154,22 @@
{
const char *arg = argv[0];
const char *optarg;
+ struct ref_store *refs;
int argcount;
+ if (submodule) {
+ /*
+ * We need some something like get_submodule_worktrees()
+ * before we can go through all worktrees of a submodule,
+ * .e.g with adding all HEADs from --all, which is not
+ * supported right now, so stick to single worktree.
+ */
+ if (!revs->single_worktree)
+ die("BUG: --single-worktree cannot be used together with submodule");
+ refs = get_submodule_ref_store(submodule);
+ } else
+ refs = get_main_ref_store();
+
/*
* NOTE!
*
@@ -2106,22 +2181,29 @@
* register it in the list at the top of handle_revision_opt.
*/
if (!strcmp(arg, "--all")) {
- handle_refs(submodule, revs, *flags, for_each_ref_submodule);
- handle_refs(submodule, revs, *flags, head_ref_submodule);
+ handle_refs(refs, revs, *flags, refs_for_each_ref);
+ handle_refs(refs, revs, *flags, refs_head_ref);
+ if (!revs->single_worktree) {
+ struct all_refs_cb cb;
+
+ init_all_refs_cb(&cb, revs, *flags);
+ other_head_refs(handle_one_ref, &cb);
+ }
clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--branches")) {
- handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
+ handle_refs(refs, revs, *flags, refs_for_each_branch_ref);
clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--bisect")) {
read_bisect_terms(&term_bad, &term_good);
- handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
- handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
+ handle_refs(refs, revs, *flags, for_each_bad_bisect_ref);
+ handle_refs(refs, revs, *flags ^ (UNINTERESTING | BOTTOM),
+ for_each_good_bisect_ref);
revs->bisect = 1;
} else if (!strcmp(arg, "--tags")) {
- handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
+ handle_refs(refs, revs, *flags, refs_for_each_tag_ref);
clear_ref_exclusion(&revs->ref_excludes);
} else if (!strcmp(arg, "--remotes")) {
- handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
+ handle_refs(refs, revs, *flags, refs_for_each_remote_ref);
clear_ref_exclusion(&revs->ref_excludes);
} else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
struct all_refs_cb cb;
@@ -2168,6 +2250,8 @@
return error("invalid argument to --no-walk");
} else if (!strcmp(arg, "--do-walk")) {
revs->no_walk = 0;
+ } else if (!strcmp(arg, "--single-worktree")) {
+ revs->single_worktree = 1;
} else {
return 0;
}
@@ -2177,11 +2261,10 @@
static void NORETURN diagnose_missing_default(const char *def)
{
- unsigned char sha1[20];
int flags;
const char *refname;
- refname = resolve_ref_unsafe(def, 0, sha1, &flags);
+ refname = resolve_ref_unsafe(def, 0, NULL, &flags);
if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
die(_("your current branch appears to be broken"));
@@ -2200,10 +2283,9 @@
int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
{
int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
- struct cmdline_pathspec prune_data;
+ struct argv_array prune_data = ARGV_ARRAY_INIT;
const char *submodule = NULL;
- memset(&prune_data, 0, sizeof(prune_data));
if (opt)
submodule = opt->submodule;
@@ -2219,7 +2301,7 @@
argv[i] = NULL;
argc = i;
if (argv[i + 1])
- append_prune_data(&prune_data, argv + i + 1);
+ argv_array_pushv(&prune_data, argv + i + 1);
seen_dashdash = 1;
break;
}
@@ -2280,14 +2362,14 @@
for (j = i; j < argc; j++)
verify_filename(revs->prefix, argv[j], j == i);
- append_prune_data(&prune_data, argv + i);
+ argv_array_pushv(&prune_data, argv + i);
break;
}
else
got_rev_arg = 1;
}
- if (prune_data.nr) {
+ if (prune_data.argc) {
/*
* If we need to introduce the magic "a lone ':' means no
* pathspec whatsoever", here is the place to do so.
@@ -2302,11 +2384,10 @@
* call init_pathspec() to set revs->prune_data here.
* }
*/
- ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
- prune_data.path[prune_data.nr++] = NULL;
parse_pathspec(&revs->prune_data, 0, 0,
- revs->prefix, prune_data.path);
+ revs->prefix, prune_data.argv);
}
+ argv_array_clear(&prune_data);
if (revs->def == NULL)
revs->def = opt ? opt->def : NULL;
@@ -2318,7 +2399,7 @@
struct object_id oid;
struct object *object;
struct object_context oc;
- if (get_sha1_with_context(revs->def, 0, oid.hash, &oc))
+ if (get_oid_with_context(revs->def, 0, &oid, &oc))
diagnose_missing_default(revs->def);
object = get_reference(revs, revs->def, &oid, 0);
add_pending_object_with_mode(revs, object, revs->def, oc.mode);
@@ -2331,7 +2412,7 @@
/* Pickaxe, diff-filter and rename following need diffs */
if (revs->diffopt.pickaxe ||
revs->diffopt.filter ||
- DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
+ revs->diffopt.flags.follow_renames)
revs->diff = 1;
if (revs->topo_order)
@@ -2340,7 +2421,7 @@
if (revs->prune_data.nr) {
copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
/* Can't prune commits with rename following: the paths change.. */
- if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
+ if (!revs->diffopt.flags.follow_renames)
revs->prune = 1;
if (!revs->full_diff)
copy_pathspec(&revs->diffopt.pathspec,
@@ -2782,8 +2863,7 @@
}
}
}
- if (!revs->leak_pending)
- object_array_clear(&old_pending);
+ object_array_clear(&old_pending);
/* Signal whether we need per-parent treesame decoration */
if (revs->simplify_merges ||
diff --git a/revision.h b/revision.h
index bc18487..d7a35c8 100644
--- a/revision.h
+++ b/revision.h
@@ -4,7 +4,7 @@
#include "parse-options.h"
#include "grep.h"
#include "notes.h"
-#include "commit.h"
+#include "pretty.h"
#include "diff.h"
/* Remember to update object flag allocation in object.h */
@@ -96,6 +96,7 @@
topo_order:1,
simplify_merges:1,
simplify_by_decoration:1,
+ single_worktree:1,
tag_objects:1,
tree_objects:1,
blob_objects:1,
@@ -120,7 +121,8 @@
bisect:1,
ancestry_path:1,
first_parent_only:1,
- line_level_traverse:1;
+ line_level_traverse:1,
+ tree_blobs_in_commit_order:1;
/* Diff flags */
unsigned int diff:1,
@@ -149,7 +151,6 @@
date_mode_explicit:1,
preserve_subject:1;
unsigned int disable_stdin:1;
- unsigned int leak_pending:1;
/* --show-linear-break */
unsigned int track_linear:1,
track_first_time:1,
diff --git a/run-command.c b/run-command.c
index 014b216..31fc5ea 100644
--- a/run-command.c
+++ b/run-command.c
@@ -5,6 +5,7 @@
#include "argv-array.h"
#include "thread-utils.h"
#include "strbuf.h"
+#include "string-list.h"
void child_process_init(struct child_process *child)
{
@@ -1169,11 +1170,28 @@
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_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;
diff --git a/send-pack.c b/send-pack.c
index 11d6f3d..2112d3b 100644
--- a/send-pack.c
+++ b/send-pack.c
@@ -58,35 +58,25 @@
* the revision parameters to it via its stdin and
* let its stdout go back to the other end.
*/
- const char *argv[] = {
- "pack-objects",
- "--all-progress-implied",
- "--revs",
- "--stdout",
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- NULL,
- };
struct child_process po = CHILD_PROCESS_INIT;
FILE *po_in;
int i;
int rc;
- i = 4;
+ argv_array_push(&po.args, "pack-objects");
+ argv_array_push(&po.args, "--all-progress-implied");
+ argv_array_push(&po.args, "--revs");
+ argv_array_push(&po.args, "--stdout");
if (args->use_thin_pack)
- argv[i++] = "--thin";
+ argv_array_push(&po.args, "--thin");
if (args->use_ofs_delta)
- argv[i++] = "--delta-base-offset";
+ argv_array_push(&po.args, "--delta-base-offset");
if (args->quiet || !args->progress)
- argv[i++] = "-q";
+ argv_array_push(&po.args, "-q");
if (args->progress)
- argv[i++] = "--progress";
+ argv_array_push(&po.args, "--progress");
if (is_repository_shallow())
- argv[i++] = "--shallow";
- po.argv = argv;
+ argv_array_push(&po.args, "--shallow");
po.in = -1;
po.out = args->stateless_rpc ? -1 : fd;
po.git_cmd = 1;
@@ -492,9 +482,12 @@
* we were to send it and we're trying to send the refs
* atomically, abort the whole operation.
*/
- if (use_atomic)
+ if (use_atomic) {
+ strbuf_release(&req_buf);
+ strbuf_release(&cap_buf);
return atomic_push_failure(args, remote_refs, ref);
- /* Fallthrough for non atomic case. */
+ }
+ /* else fallthrough */
default:
continue;
}
diff --git a/sequencer.c b/sequencer.c
index e0e66b9..4d3f605 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -20,6 +20,7 @@
#include "trailer.h"
#include "log-tree.h"
#include "wt-status.h"
+#include "hashmap.h"
#define GIT_REFLOG_ACTION "GIT_REFLOG_ACTION"
@@ -203,7 +204,7 @@
free(opts->xopts[i]);
free(opts->xopts);
- strbuf_addf(&dir, "%s", get_dir(opts));
+ strbuf_addstr(&dir, get_dir(opts));
remove_dir_recursively(&dir, 0);
strbuf_release(&dir);
@@ -346,7 +347,7 @@
static struct tree *empty_tree(void)
{
- return lookup_tree(&empty_tree_oid);
+ return lookup_tree(the_hash_algo->empty_tree);
}
static int error_dirty_index(struct replay_opts *opts)
@@ -392,7 +393,7 @@
transaction = ref_transaction_begin(&err);
if (!transaction ||
ref_transaction_update(transaction, "HEAD",
- to->hash, unborn ? null_sha1 : from->hash,
+ to, unborn ? &null_oid : from,
0, sb.buf, &err) ||
ref_transaction_commit(transaction, &err)) {
ref_transaction_free(transaction);
@@ -437,7 +438,8 @@
char **xopt;
static struct lock_file index_lock;
- hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
+ if (hold_locked_index(&index_lock, LOCK_REPORT_ON_ERROR) < 0)
+ return -1;
read_cache();
@@ -447,6 +449,7 @@
o.branch2 = next ? next_label : "(empty tree)";
if (is_rebase_i(opts))
o.buffer_output = 2;
+ o.show_rename_progress = 1;
head_tree = parse_tree_indirect(head);
next_tree = next ? next->tree : empty_tree();
@@ -461,6 +464,7 @@
if (is_rebase_i(opts) && clean <= 0)
fputs(o.obuf.buf, stdout);
strbuf_release(&o.obuf);
+ diff_warn_rename_limit("merge.renamelimit", o.needed_rename_limit, 0);
if (clean < 0)
return clean;
@@ -488,8 +492,8 @@
struct object_id head_oid;
struct commit *head_commit;
- if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL))
- return error(_("could not resolve HEAD commit\n"));
+ if (!resolve_ref_unsafe("HEAD", RESOLVE_REF_READING, &head_oid, NULL))
+ return error(_("could not resolve HEAD commit"));
head_commit = lookup_commit(&head_oid);
@@ -509,7 +513,7 @@
if (!cache_tree_fully_valid(active_cache_tree))
if (cache_tree_update(&the_index, 0))
- return error(_("unable to update cache tree\n"));
+ return error(_("unable to update cache tree"));
return !oidcmp(&active_cache_tree->oid,
&head_commit->tree->object.oid);
@@ -692,22 +696,22 @@
static int is_original_commit_empty(struct commit *commit)
{
- const unsigned char *ptree_sha1;
+ const struct object_id *ptree_oid;
if (parse_commit(commit))
- return error(_("could not parse commit %s\n"),
+ return error(_("could not parse commit %s"),
oid_to_hex(&commit->object.oid));
if (commit->parents) {
struct commit *parent = commit->parents->item;
if (parse_commit(parent))
- return error(_("could not parse parent commit %s\n"),
+ return error(_("could not parse parent commit %s"),
oid_to_hex(&parent->object.oid));
- ptree_sha1 = parent->tree->object.oid.hash;
+ ptree_oid = &parent->tree->object.oid;
} else {
- ptree_sha1 = EMPTY_TREE_SHA1_BIN; /* commit is root */
+ ptree_oid = the_hash_algo->empty_tree; /* commit is root */
}
- return !hashcmp(ptree_sha1, commit->tree->object.oid.hash);
+ return !oidcmp(ptree_oid, &commit->tree->object.oid);
}
/*
@@ -793,6 +797,13 @@
die("Unknown command: %d", command);
}
+static char command_to_char(const enum todo_command command)
+{
+ if (command < TODO_COMMENT && todo_command_info[command].c)
+ return todo_command_info[command].c;
+ return comment_line_char;
+}
+
static int is_noop(const enum todo_command command)
{
return TODO_NOOP <= command;
@@ -897,18 +908,18 @@
static void flush_rewritten_pending(void) {
struct strbuf buf = STRBUF_INIT;
- unsigned char newsha1[20];
+ struct object_id newoid;
FILE *out;
- if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), 82) > 0 &&
- !get_sha1("HEAD", newsha1) &&
+ if (strbuf_read_file(&buf, rebase_path_rewritten_pending(), (GIT_MAX_HEXSZ + 1) * 2) > 0 &&
+ !get_oid("HEAD", &newoid) &&
(out = fopen_or_warn(rebase_path_rewritten_list(), "a"))) {
char *bol = buf.buf, *eol;
while (*bol) {
eol = strchrnul(bol, '\n');
fprintf(out, "%.*s %s\n", (int)(eol - bol),
- bol, sha1_to_hex(newsha1));
+ bol, oid_to_hex(&newoid));
if (!*eol)
break;
bol = eol + 1;
@@ -957,8 +968,9 @@
} else {
unborn = get_oid("HEAD", &head);
if (unborn)
- oidcpy(&head, &empty_tree_oid);
- if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD", 0, 0))
+ oidcpy(&head, the_hash_algo->empty_tree);
+ if (index_differs_from(unborn ? EMPTY_TREE_SHA1_HEX : "HEAD",
+ NULL, 0))
return error_dirty_index(opts);
}
discard_cache();
@@ -1001,9 +1013,7 @@
opts);
if (res || command != TODO_REWORD)
goto leave;
- flags |= EDIT_MSG | AMEND_MSG;
- if (command == TODO_REWORD)
- flags |= VERIFY_MSG;
+ flags |= EDIT_MSG | AMEND_MSG | VERIFY_MSG;
msg_file = NULL;
goto fast_forward_edit;
}
@@ -1114,12 +1124,12 @@
* write it at all.
*/
if (command == TODO_PICK && !opts->no_commit && (res == 0 || res == 1) &&
- update_ref(NULL, "CHERRY_PICK_HEAD", commit->object.oid.hash, NULL,
- REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
+ update_ref(NULL, "CHERRY_PICK_HEAD", &commit->object.oid, NULL,
+ REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR))
res = -1;
if (command == TODO_REVERT && ((opts->no_commit && res == 0) || res == 1) &&
- update_ref(NULL, "REVERT_HEAD", commit->object.oid.hash, NULL,
- REF_NODEREF, UPDATE_REFS_MSG_ON_ERR))
+ update_ref(NULL, "REVERT_HEAD", &commit->object.oid, NULL,
+ REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR))
res = -1;
if (res) {
@@ -1183,7 +1193,6 @@
refresh_index(&the_index, REFRESH_QUIET|REFRESH_UNMERGED, NULL, NULL, NULL);
if (the_index.cache_changed && index_fd >= 0) {
if (write_locked_index(&the_index, &index_lock, COMMIT_LOCK)) {
- rollback_lock_file(&index_lock);
return error(_("git %s: failed to refresh the index"),
_(action_name(opts)));
}
@@ -1252,20 +1261,26 @@
if (i >= TODO_COMMENT)
return -1;
+ /* Eat up extra spaces/ tabs before object name */
+ padding = strspn(bol, " \t");
+ bol += padding;
+
if (item->command == TODO_NOOP) {
+ if (bol != eol)
+ return error(_("%s does not accept arguments: '%s'"),
+ command_to_string(item->command), bol);
item->commit = NULL;
item->arg = bol;
item->arg_len = eol - bol;
return 0;
}
- /* Eat up extra spaces/ tabs before object name */
- padding = strspn(bol, " \t");
if (!padding)
- return -1;
- bol += padding;
+ return error(_("missing arguments for %s"),
+ command_to_string(item->command));
if (item->command == TODO_EXEC) {
+ item->commit = NULL;
item->arg = bol;
item->arg_len = (int)(eol - bol);
return 0;
@@ -1565,6 +1580,7 @@
static struct lock_file head_lock;
struct strbuf buf = STRBUF_INIT;
int fd;
+ ssize_t written;
fd = hold_lock_file_for_update(&head_lock, git_path_head_file(), 0);
if (fd < 0) {
@@ -1572,7 +1588,9 @@
return error_errno(_("could not lock HEAD"));
}
strbuf_addf(&buf, "%s\n", head);
- if (write_in_full(fd, buf.buf, buf.len) < 0) {
+ written = write_in_full(fd, buf.buf, buf.len);
+ strbuf_release(&buf);
+ if (written < 0) {
rollback_lock_file(&head_lock);
return error_errno(_("could not write to '%s'"),
git_path_head_file());
@@ -1608,36 +1626,37 @@
return !oidcmp(&actual_head, &expected_head);
}
-static int reset_for_rollback(const unsigned char *sha1)
+static int reset_for_rollback(const struct object_id *oid)
{
const char *argv[4]; /* reset --merge <arg> + NULL */
argv[0] = "reset";
argv[1] = "--merge";
- argv[2] = sha1_to_hex(sha1);
+ argv[2] = oid_to_hex(oid);
argv[3] = NULL;
return run_command_v_opt(argv, RUN_GIT_CMD);
}
static int rollback_single_pick(void)
{
- unsigned char head_sha1[20];
+ struct object_id head_oid;
if (!file_exists(git_path_cherry_pick_head()) &&
!file_exists(git_path_revert_head()))
return error(_("no cherry-pick or revert in progress"));
- if (read_ref_full("HEAD", 0, head_sha1, NULL))
+ if (read_ref_full("HEAD", 0, &head_oid, NULL))
return error(_("cannot resolve HEAD"));
- if (is_null_sha1(head_sha1))
+ if (is_null_oid(&head_oid))
return error(_("cannot abort from a branch yet to be born"));
- return reset_for_rollback(head_sha1);
+ return reset_for_rollback(&head_oid);
}
int sequencer_rollback(struct replay_opts *opts)
{
FILE *f;
- unsigned char sha1[20];
+ struct object_id oid;
struct strbuf buf = STRBUF_INIT;
+ const char *p;
f = fopen(git_path_head_file(), "r");
if (!f && errno == ENOENT) {
@@ -1657,12 +1676,12 @@
goto fail;
}
fclose(f);
- if (get_sha1_hex(buf.buf, sha1) || buf.buf[40] != '\0') {
+ if (parse_oid_hex(buf.buf, &oid, &p) || *p != '\0') {
error(_("stored pre-cherry-pick HEAD file '%s' is corrupt"),
git_path_head_file());
goto fail;
}
- if (is_null_sha1(sha1)) {
+ if (is_null_oid(&oid)) {
error(_("cannot abort from a branch yet to be born"));
goto fail;
}
@@ -1672,7 +1691,7 @@
warning(_("You seem to have moved HEAD. "
"Not rewinding, check your HEAD!"));
} else
- if (reset_for_rollback(sha1))
+ if (reset_for_rollback(&oid))
goto fail;
strbuf_release(&buf);
return sequencer_remove_state(opts);
@@ -1806,13 +1825,13 @@
static int intend_to_amend(void)
{
- unsigned char head[20];
+ struct object_id head;
char *p;
- if (get_sha1("HEAD", head))
+ if (get_oid("HEAD", &head))
return error(_("cannot read HEAD"));
- p = sha1_to_hex(head);
+ p = oid_to_hex(&head);
return write_message(p, strlen(p), rebase_path_amend(), 1);
}
@@ -1857,12 +1876,15 @@
static int do_exec(const char *command_line)
{
+ struct argv_array child_env = ARGV_ARRAY_INIT;
const char *child_argv[] = { NULL, NULL };
int dirty, status;
fprintf(stderr, "Executing: %s\n", command_line);
child_argv[0] = command_line;
- status = run_command_v_opt(child_argv, RUN_USING_SHELL);
+ argv_array_pushf(&child_env, "GIT_DIR=%s", absolute_path(get_git_dir()));
+ status = run_command_v_opt_cd_env(child_argv, RUN_USING_SHELL, NULL,
+ child_env.argv);
/* force re-reading of the cache */
if (discard_cache() < 0 || read_cache() < 0)
@@ -1892,6 +1914,8 @@
status = 1;
}
+ argv_array_clear(&child_env);
+
return status;
}
@@ -2097,10 +2121,10 @@
if (read_oneliner(&head_ref, rebase_path_head_name(), 0) &&
starts_with(head_ref.buf, "refs/")) {
const char *msg;
- unsigned char head[20], orig[20];
+ struct object_id head, orig;
int res;
- if (get_sha1("HEAD", head)) {
+ if (get_oid("HEAD", &head)) {
res = error(_("cannot read HEAD"));
cleanup_head_ref:
strbuf_release(&head_ref);
@@ -2108,7 +2132,7 @@
return res;
}
if (!read_oneliner(&buf, rebase_path_orig_head(), 0) ||
- get_sha1_hex(buf.buf, orig)) {
+ get_oid_hex(buf.buf, &orig)) {
res = error(_("could not read orig-head"));
goto cleanup_head_ref;
}
@@ -2119,8 +2143,8 @@
}
msg = reflog_message(opts, "finish", "%s onto %s",
head_ref.buf, buf.buf);
- if (update_ref(msg, head_ref.buf, head, orig,
- REF_NODEREF, UPDATE_REFS_MSG_ON_ERR)) {
+ if (update_ref(msg, head_ref.buf, &head, &orig,
+ REF_NO_DEREF, UPDATE_REFS_MSG_ON_ERR)) {
res = error(_("could not update %s"),
head_ref.buf);
goto cleanup_head_ref;
@@ -2147,8 +2171,8 @@
log_tree_opt.disable_stdin = 1;
if (read_oneliner(&buf, rebase_path_orig_head(), 0) &&
- !get_sha1(buf.buf, orig.hash) &&
- !get_sha1("HEAD", head.hash)) {
+ !get_oid(buf.buf, &orig) &&
+ !get_oid("HEAD", &head)) {
diff_tree_oid(&orig, &head, "",
&log_tree_opt.diffopt);
log_tree_diff_flush(&log_tree_opt);
@@ -2223,16 +2247,16 @@
if (file_exists(rebase_path_amend())) {
struct strbuf rev = STRBUF_INIT;
- unsigned char head[20], to_amend[20];
+ struct object_id head, to_amend;
- if (get_sha1("HEAD", head))
+ if (get_oid("HEAD", &head))
return error(_("cannot amend non-existing commit"));
if (!read_oneliner(&rev, rebase_path_amend(), 0))
return error(_("invalid file: '%s'"), rebase_path_amend());
- if (get_sha1_hex(rev.buf, to_amend))
+ if (get_oid_hex(rev.buf, &to_amend))
return error(_("invalid contents: '%s'"),
rebase_path_amend());
- if (hashcmp(head, to_amend))
+ if (oidcmp(&head, &to_amend))
return error(_("\nYou have uncommitted changes in your "
"working tree. Please, commit them\n"
"first and then run 'git rebase "
@@ -2274,7 +2298,7 @@
if (res)
goto release_todo_list;
}
- if (index_differs_from("HEAD", 0, 0)) {
+ if (index_differs_from("HEAD", NULL, 0)) {
res = error_dirty_index(opts);
goto release_todo_list;
}
@@ -2284,7 +2308,7 @@
struct object_id oid;
if (read_oneliner(&buf, rebase_path_stopped_sha(), 1) &&
- !get_sha1_committish(buf.buf, oid.hash))
+ !get_oid_committish(buf.buf, &oid))
record_in_rewritten(&oid, peek_command(&todo_list, 0));
strbuf_release(&buf);
}
@@ -2431,3 +2455,555 @@
strbuf_release(&sob);
}
+
+int sequencer_make_script(FILE *out, int argc, const char **argv,
+ unsigned flags)
+{
+ char *format = NULL;
+ struct pretty_print_context pp = {0};
+ struct strbuf buf = STRBUF_INIT;
+ struct rev_info revs;
+ struct commit *commit;
+ int keep_empty = flags & TODO_LIST_KEEP_EMPTY;
+ const char *insn = flags & TODO_LIST_ABBREVIATE_CMDS ? "p" : "pick";
+
+ init_revisions(&revs, NULL);
+ revs.verbose_header = 1;
+ revs.max_parents = 1;
+ revs.cherry_pick = 1;
+ revs.limited = 1;
+ revs.reverse = 1;
+ revs.right_only = 1;
+ revs.sort_order = REV_SORT_IN_GRAPH_ORDER;
+ revs.topo_order = 1;
+
+ revs.pretty_given = 1;
+ git_config_get_string("rebase.instructionFormat", &format);
+ if (!format || !*format) {
+ free(format);
+ format = xstrdup("%s");
+ }
+ get_commit_format(format, &revs);
+ free(format);
+ 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 (prepare_revision_walk(&revs) < 0)
+ return error(_("make_script: error preparing revisions"));
+
+ while ((commit = get_revision(&revs))) {
+ strbuf_reset(&buf);
+ if (!keep_empty && is_original_commit_empty(commit))
+ strbuf_addf(&buf, "%c ", comment_line_char);
+ strbuf_addf(&buf, "%s %s ", insn,
+ oid_to_hex(&commit->object.oid));
+ pretty_print_commit(&pp, commit, &buf);
+ strbuf_addch(&buf, '\n');
+ fputs(buf.buf, out);
+ }
+ strbuf_release(&buf);
+ return 0;
+}
+
+/*
+ * Add commands after pick and (series of) squash/fixup commands
+ * in the todo list.
+ */
+int sequencer_add_exec_commands(const char *commands)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT;
+ struct todo_item *item;
+ struct strbuf *buf = &todo_list.buf;
+ size_t offset = 0, commands_len = strlen(commands);
+ int i, first;
+
+ if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+ return error(_("could not read '%s'."), todo_file);
+
+ if (parse_insn_buffer(todo_list.buf.buf, &todo_list)) {
+ todo_list_release(&todo_list);
+ return error(_("unusable todo list: '%s'"), todo_file);
+ }
+
+ first = 1;
+ /* insert <commands> before every pick except the first one */
+ for (item = todo_list.items, i = 0; i < todo_list.nr; i++, item++) {
+ if (item->command == TODO_PICK && !first) {
+ strbuf_insert(buf, item->offset_in_buf + offset,
+ commands, commands_len);
+ offset += commands_len;
+ }
+ first = 0;
+ }
+
+ /* append final <commands> */
+ strbuf_add(buf, commands, commands_len);
+
+ i = write_message(buf->buf, buf->len, todo_file, 0);
+ todo_list_release(&todo_list);
+ return i;
+}
+
+int transform_todos(unsigned flags)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT;
+ struct strbuf buf = STRBUF_INIT;
+ struct todo_item *item;
+ int i;
+
+ if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
+ return error(_("could not read '%s'."), todo_file);
+
+ if (parse_insn_buffer(todo_list.buf.buf, &todo_list)) {
+ todo_list_release(&todo_list);
+ return error(_("unusable todo list: '%s'"), todo_file);
+ }
+
+ for (item = todo_list.items, i = 0; i < todo_list.nr; i++, item++) {
+ /* if the item is not a command write it and continue */
+ if (item->command >= TODO_COMMENT) {
+ strbuf_addf(&buf, "%.*s\n", item->arg_len, item->arg);
+ continue;
+ }
+
+ /* add command to the buffer */
+ if (flags & TODO_LIST_ABBREVIATE_CMDS)
+ strbuf_addch(&buf, command_to_char(item->command));
+ else
+ strbuf_addstr(&buf, command_to_string(item->command));
+
+ /* add commit id */
+ if (item->commit) {
+ const char *oid = flags & TODO_LIST_SHORTEN_IDS ?
+ short_commit_name(item->commit) :
+ oid_to_hex(&item->commit->object.oid);
+
+ strbuf_addf(&buf, " %s", oid);
+ }
+ /* add all the rest */
+ if (!item->arg_len)
+ strbuf_addch(&buf, '\n');
+ else
+ strbuf_addf(&buf, " %.*s\n", item->arg_len, item->arg);
+ }
+
+ i = write_message(buf.buf, buf.len, todo_file, 0);
+ todo_list_release(&todo_list);
+ return i;
+}
+
+enum check_level {
+ CHECK_IGNORE = 0, CHECK_WARN, CHECK_ERROR
+};
+
+static enum check_level get_missing_commit_check_level(void)
+{
+ const char *value;
+
+ if (git_config_get_value("rebase.missingcommitscheck", &value) ||
+ !strcasecmp("ignore", value))
+ return CHECK_IGNORE;
+ if (!strcasecmp("warn", value))
+ return CHECK_WARN;
+ if (!strcasecmp("error", value))
+ return CHECK_ERROR;
+ warning(_("unrecognized setting %s for option "
+ "rebase.missingCommitsCheck. Ignoring."), value);
+ return CHECK_IGNORE;
+}
+
+/*
+ * Check if the user dropped some commits by mistake
+ * Behaviour determined by rebase.missingCommitsCheck.
+ * Check if there is an unrecognized command or a
+ * bad SHA-1 in a command.
+ */
+int check_todo_list(void)
+{
+ enum check_level check_level = get_missing_commit_check_level();
+ struct strbuf todo_file = STRBUF_INIT;
+ struct todo_list todo_list = TODO_LIST_INIT;
+ struct strbuf missing = STRBUF_INIT;
+ int advise_to_edit_todo = 0, res = 0, fd, i;
+
+ strbuf_addstr(&todo_file, rebase_path_todo());
+ fd = open(todo_file.buf, O_RDONLY);
+ if (fd < 0) {
+ res = error_errno(_("could not open '%s'"), todo_file.buf);
+ goto leave_check;
+ }
+ if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
+ close(fd);
+ res = error(_("could not read '%s'."), todo_file.buf);
+ goto leave_check;
+ }
+ close(fd);
+ advise_to_edit_todo = res =
+ parse_insn_buffer(todo_list.buf.buf, &todo_list);
+
+ if (res || check_level == CHECK_IGNORE)
+ goto leave_check;
+
+ /* Mark the commits in git-rebase-todo as seen */
+ for (i = 0; i < todo_list.nr; i++) {
+ struct commit *commit = todo_list.items[i].commit;
+ if (commit)
+ commit->util = (void *)1;
+ }
+
+ todo_list_release(&todo_list);
+ strbuf_addstr(&todo_file, ".backup");
+ fd = open(todo_file.buf, O_RDONLY);
+ if (fd < 0) {
+ res = error_errno(_("could not open '%s'"), todo_file.buf);
+ goto leave_check;
+ }
+ if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
+ close(fd);
+ res = error(_("could not read '%s'."), todo_file.buf);
+ goto leave_check;
+ }
+ close(fd);
+ strbuf_release(&todo_file);
+ res = !!parse_insn_buffer(todo_list.buf.buf, &todo_list);
+
+ /* Find commits in git-rebase-todo.backup yet unseen */
+ for (i = todo_list.nr - 1; i >= 0; i--) {
+ struct todo_item *item = todo_list.items + i;
+ struct commit *commit = item->commit;
+ if (commit && !commit->util) {
+ strbuf_addf(&missing, " - %s %.*s\n",
+ short_commit_name(commit),
+ item->arg_len, item->arg);
+ commit->util = (void *)1;
+ }
+ }
+
+ /* Warn about missing commits */
+ if (!missing.len)
+ goto leave_check;
+
+ if (check_level == CHECK_ERROR)
+ advise_to_edit_todo = res = 1;
+
+ fprintf(stderr,
+ _("Warning: some commits may have been dropped accidentally.\n"
+ "Dropped commits (newer to older):\n"));
+
+ /* Make the list user-friendly and display */
+ fputs(missing.buf, stderr);
+ strbuf_release(&missing);
+
+ fprintf(stderr, _("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"));
+
+leave_check:
+ strbuf_release(&todo_file);
+ todo_list_release(&todo_list);
+
+ if (advise_to_edit_todo)
+ fprintf(stderr,
+ _("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"));
+
+ return res;
+}
+
+static int rewrite_file(const char *path, const char *buf, size_t len)
+{
+ int rc = 0;
+ int fd = open(path, O_WRONLY | O_TRUNC);
+ if (fd < 0)
+ return error_errno(_("could not open '%s' for writing"), path);
+ if (write_in_full(fd, buf, len) < 0)
+ rc = error_errno(_("could not write to '%s'"), path);
+ if (close(fd) && !rc)
+ rc = error_errno(_("could not close '%s'"), path);
+ return rc;
+}
+
+/* skip picking commits whose parents are unchanged */
+int skip_unnecessary_picks(void)
+{
+ const char *todo_file = rebase_path_todo();
+ struct strbuf buf = STRBUF_INIT;
+ struct todo_list todo_list = TODO_LIST_INIT;
+ struct object_id onto_oid, *oid = &onto_oid, *parent_oid;
+ int fd, i;
+
+ if (!read_oneliner(&buf, rebase_path_onto(), 0))
+ return error(_("could not read 'onto'"));
+ if (get_oid(buf.buf, &onto_oid)) {
+ strbuf_release(&buf);
+ return error(_("need a HEAD to fixup"));
+ }
+ strbuf_release(&buf);
+
+ fd = open(todo_file, O_RDONLY);
+ if (fd < 0) {
+ return error_errno(_("could not open '%s'"), todo_file);
+ }
+ if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
+ close(fd);
+ return error(_("could not read '%s'."), todo_file);
+ }
+ close(fd);
+ if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
+ todo_list_release(&todo_list);
+ return -1;
+ }
+
+ for (i = 0; i < todo_list.nr; i++) {
+ struct todo_item *item = todo_list.items + i;
+
+ if (item->command >= TODO_NOOP)
+ continue;
+ if (item->command != TODO_PICK)
+ break;
+ if (parse_commit(item->commit)) {
+ todo_list_release(&todo_list);
+ return error(_("could not parse commit '%s'"),
+ oid_to_hex(&item->commit->object.oid));
+ }
+ if (!item->commit->parents)
+ break; /* root commit */
+ if (item->commit->parents->next)
+ break; /* merge commit */
+ parent_oid = &item->commit->parents->item->object.oid;
+ if (hashcmp(parent_oid->hash, oid->hash))
+ break;
+ oid = &item->commit->object.oid;
+ }
+ if (i > 0) {
+ int offset = i < todo_list.nr ?
+ todo_list.items[i].offset_in_buf : todo_list.buf.len;
+ const char *done_path = rebase_path_done();
+
+ fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
+ if (fd < 0) {
+ error_errno(_("could not open '%s' for writing"),
+ done_path);
+ todo_list_release(&todo_list);
+ return -1;
+ }
+ if (write_in_full(fd, todo_list.buf.buf, offset) < 0) {
+ error_errno(_("could not write to '%s'"), done_path);
+ todo_list_release(&todo_list);
+ close(fd);
+ return -1;
+ }
+ close(fd);
+
+ if (rewrite_file(rebase_path_todo(), todo_list.buf.buf + offset,
+ todo_list.buf.len - offset) < 0) {
+ todo_list_release(&todo_list);
+ return -1;
+ }
+
+ todo_list.current = i;
+ if (is_fixup(peek_command(&todo_list, 0)))
+ record_in_rewritten(oid, peek_command(&todo_list, 0));
+ }
+
+ todo_list_release(&todo_list);
+ printf("%s\n", oid_to_hex(oid));
+
+ return 0;
+}
+
+struct subject2item_entry {
+ struct hashmap_entry entry;
+ int i;
+ char subject[FLEX_ARRAY];
+};
+
+static int subject2item_cmp(const void *fndata,
+ const struct subject2item_entry *a,
+ const struct subject2item_entry *b, const void *key)
+{
+ return key ? strcmp(a->subject, key) : strcmp(a->subject, b->subject);
+}
+
+/*
+ * Rearrange the todo list that has both "pick commit-id msg" and "pick
+ * commit-id fixup!/squash! msg" in it so that the latter is put immediately
+ * after the former, and change "pick" to "fixup"/"squash".
+ *
+ * Note that if the config has specified a custom instruction format, each log
+ * message will have to be retrieved from the commit (as the oneline in the
+ * script cannot be trusted) in order to normalize the autosquash arrangement.
+ */
+int rearrange_squash(void)
+{
+ const char *todo_file = rebase_path_todo();
+ struct todo_list todo_list = TODO_LIST_INIT;
+ struct hashmap subject2item;
+ int res = 0, rearranged = 0, *next, *tail, fd, i;
+ char **subjects;
+
+ fd = open(todo_file, O_RDONLY);
+ if (fd < 0)
+ return error_errno(_("could not open '%s'"), todo_file);
+ if (strbuf_read(&todo_list.buf, fd, 0) < 0) {
+ close(fd);
+ return error(_("could not read '%s'."), todo_file);
+ }
+ close(fd);
+ if (parse_insn_buffer(todo_list.buf.buf, &todo_list) < 0) {
+ todo_list_release(&todo_list);
+ return -1;
+ }
+
+ /*
+ * The hashmap maps onelines to the respective todo list index.
+ *
+ * If any items need to be rearranged, the next[i] value will indicate
+ * which item was moved directly after the i'th.
+ *
+ * In that case, last[i] will indicate the index of the latest item to
+ * be moved to appear after the i'th.
+ */
+ hashmap_init(&subject2item, (hashmap_cmp_fn) subject2item_cmp,
+ NULL, todo_list.nr);
+ ALLOC_ARRAY(next, todo_list.nr);
+ ALLOC_ARRAY(tail, todo_list.nr);
+ ALLOC_ARRAY(subjects, todo_list.nr);
+ for (i = 0; i < todo_list.nr; i++) {
+ struct strbuf buf = STRBUF_INIT;
+ struct todo_item *item = todo_list.items + i;
+ const char *commit_buffer, *subject, *p;
+ size_t subject_len;
+ int i2 = -1;
+ struct subject2item_entry *entry;
+
+ next[i] = tail[i] = -1;
+ if (item->command >= TODO_EXEC) {
+ subjects[i] = NULL;
+ continue;
+ }
+
+ if (is_fixup(item->command)) {
+ todo_list_release(&todo_list);
+ return error(_("the script was already rearranged."));
+ }
+
+ item->commit->util = item;
+
+ parse_commit(item->commit);
+ commit_buffer = get_commit_buffer(item->commit, NULL);
+ find_commit_subject(commit_buffer, &subject);
+ format_subject(&buf, subject, " ");
+ subject = subjects[i] = strbuf_detach(&buf, &subject_len);
+ unuse_commit_buffer(item->commit, commit_buffer);
+ if ((skip_prefix(subject, "fixup! ", &p) ||
+ skip_prefix(subject, "squash! ", &p))) {
+ struct commit *commit2;
+
+ for (;;) {
+ while (isspace(*p))
+ p++;
+ if (!skip_prefix(p, "fixup! ", &p) &&
+ !skip_prefix(p, "squash! ", &p))
+ break;
+ }
+
+ if ((entry = hashmap_get_from_hash(&subject2item,
+ strhash(p), p)))
+ /* found by title */
+ i2 = entry->i;
+ else if (!strchr(p, ' ') &&
+ (commit2 =
+ lookup_commit_reference_by_name(p)) &&
+ commit2->util)
+ /* found by commit name */
+ i2 = (struct todo_item *)commit2->util
+ - todo_list.items;
+ else {
+ /* copy can be a prefix of the commit subject */
+ for (i2 = 0; i2 < i; i2++)
+ if (subjects[i2] &&
+ starts_with(subjects[i2], p))
+ break;
+ if (i2 == i)
+ i2 = -1;
+ }
+ }
+ if (i2 >= 0) {
+ rearranged = 1;
+ todo_list.items[i].command =
+ starts_with(subject, "fixup!") ?
+ TODO_FIXUP : TODO_SQUASH;
+ if (next[i2] < 0)
+ next[i2] = i;
+ else
+ next[tail[i2]] = i;
+ tail[i2] = i;
+ } else if (!hashmap_get_from_hash(&subject2item,
+ strhash(subject), subject)) {
+ FLEX_ALLOC_MEM(entry, subject, subject, subject_len);
+ entry->i = i;
+ hashmap_entry_init(entry, strhash(entry->subject));
+ hashmap_put(&subject2item, entry);
+ }
+ }
+
+ if (rearranged) {
+ struct strbuf buf = STRBUF_INIT;
+
+ for (i = 0; i < todo_list.nr; i++) {
+ enum todo_command command = todo_list.items[i].command;
+ int cur = i;
+
+ /*
+ * Initially, all commands are 'pick's. If it is a
+ * fixup or a squash now, we have rearranged it.
+ */
+ if (is_fixup(command))
+ continue;
+
+ while (cur >= 0) {
+ int offset = todo_list.items[cur].offset_in_buf;
+ int end_offset = cur + 1 < todo_list.nr ?
+ todo_list.items[cur + 1].offset_in_buf :
+ todo_list.buf.len;
+ char *bol = todo_list.buf.buf + offset;
+ char *eol = todo_list.buf.buf + end_offset;
+
+ /* replace 'pick', by 'fixup' or 'squash' */
+ command = todo_list.items[cur].command;
+ if (is_fixup(command)) {
+ strbuf_addstr(&buf,
+ todo_command_info[command].str);
+ bol += strcspn(bol, " \t");
+ }
+
+ strbuf_add(&buf, bol, eol - bol);
+
+ cur = next[cur];
+ }
+ }
+
+ res = rewrite_file(todo_file, buf.buf, buf.len);
+ strbuf_release(&buf);
+ }
+
+ free(next);
+ free(tail);
+ for (i = 0; i < todo_list.nr; i++)
+ free(subjects[i]);
+ free(subjects);
+ hashmap_free(&subject2item, 1);
+ todo_list_release(&todo_list);
+
+ return res;
+}
diff --git a/sequencer.h b/sequencer.h
index f885b68..81f6d7d 100644
--- a/sequencer.h
+++ b/sequencer.h
@@ -45,6 +45,18 @@
int sequencer_rollback(struct replay_opts *opts);
int sequencer_remove_state(struct replay_opts *opts);
+#define TODO_LIST_KEEP_EMPTY (1U << 0)
+#define TODO_LIST_SHORTEN_IDS (1U << 1)
+#define TODO_LIST_ABBREVIATE_CMDS (1U << 2)
+int sequencer_make_script(FILE *out, int argc, const char **argv,
+ unsigned flags);
+
+int sequencer_add_exec_commands(const char *command);
+int transform_todos(unsigned flags);
+int check_todo_list(void);
+int skip_unnecessary_picks(void);
+int rearrange_squash(void);
+
extern const char sign_off_header[];
void append_signoff(struct strbuf *msgbuf, int ignore_footer, unsigned flag);
diff --git a/server-info.c b/server-info.c
index 5ec5b1d..26a6c20 100644
--- a/server-info.c
+++ b/server-info.c
@@ -3,6 +3,7 @@
#include "object.h"
#include "commit.h"
#include "tag.h"
+#include "packfile.h"
/*
* Create the file "path" by writing to a temporary file and renaming
diff --git a/setup.c b/setup.c
index 860507e..8cc3418 100644
--- a/setup.c
+++ b/setup.c
@@ -230,7 +230,7 @@
int diagnose_misspelt_rev)
{
if (*arg == '-')
- die("bad flag '%s' used after filename", arg);
+ die("option '%s' must come before non-option arguments", arg);
if (looks_like_pathspec(arg) || check_filename(prefix, arg))
return;
die_verify_filename(prefix, arg, diagnose_misspelt_rev);
@@ -312,7 +312,9 @@
size_t len;
/* Check worktree-related signatures */
- strbuf_addf(&path, "%s/HEAD", suspect);
+ strbuf_addstr(&path, suspect);
+ strbuf_complete(&path, '/');
+ strbuf_addstr(&path, "HEAD");
if (validate_headref(path.buf))
goto done;
@@ -399,11 +401,6 @@
if (getenv(GIT_WORK_TREE_ENVIRONMENT))
setenv(GIT_WORK_TREE_ENVIRONMENT, ".", 1);
- /*
- * NEEDSWORK: this call can essentially be set_git_dir(get_git_dir())
- * which can cause some problems when trying to free the old value of
- * gitdir.
- */
set_git_dir(remove_leading_path(git_dir, work_tree));
initialized = 1;
}
@@ -437,16 +434,15 @@
return 0;
}
-static int check_repository_format_gently(const char *gitdir, int *nongit_ok)
+static int check_repository_format_gently(const char *gitdir, struct repository_format *candidate, int *nongit_ok)
{
struct strbuf sb = STRBUF_INIT;
struct strbuf err = STRBUF_INIT;
- struct repository_format candidate;
int has_common;
has_common = get_common_dir(&sb, gitdir);
strbuf_addstr(&sb, "/config");
- read_repository_format(&candidate, sb.buf);
+ read_repository_format(candidate, sb.buf);
strbuf_release(&sb);
/*
@@ -454,10 +450,10 @@
* we treat a missing config as a silent "ok", even when nongit_ok
* is unset.
*/
- if (candidate.version < 0)
+ if (candidate->version < 0)
return 0;
- if (verify_repository_format(&candidate, &err) < 0) {
+ if (verify_repository_format(candidate, &err) < 0) {
if (nongit_ok) {
warning("%s", err.buf);
strbuf_release(&err);
@@ -467,21 +463,21 @@
die("%s", err.buf);
}
- repository_format_precious_objects = candidate.precious_objects;
- string_list_clear(&candidate.unknown_extensions, 0);
+ repository_format_precious_objects = candidate->precious_objects;
+ string_list_clear(&candidate->unknown_extensions, 0);
if (!has_common) {
- if (candidate.is_bare != -1) {
- is_bare_repository_cfg = candidate.is_bare;
+ if (candidate->is_bare != -1) {
+ is_bare_repository_cfg = candidate->is_bare;
if (is_bare_repository_cfg == 1)
inside_work_tree = -1;
}
- if (candidate.work_tree) {
+ if (candidate->work_tree) {
free(git_work_tree_cfg);
- git_work_tree_cfg = candidate.work_tree;
+ git_work_tree_cfg = candidate->work_tree;
inside_work_tree = -1;
}
} else {
- free(candidate.work_tree);
+ free(candidate->work_tree);
}
return 0;
@@ -492,6 +488,7 @@
memset(format, 0, sizeof(*format));
format->version = -1;
format->is_bare = -1;
+ format->hash_algo = GIT_HASH_SHA1;
string_list_init(&format->unknown_extensions, 1);
git_config_from_file(check_repo_format, path, format);
return format->version;
@@ -546,7 +543,8 @@
/*
* Try to read the location of the git directory from the .git file,
- * return path to git directory if found.
+ * return path to git directory if found. The return value comes from
+ * a shared buffer.
*
* On failure, if return_error_code is not NULL, return_error_code
* will be set to an error code and NULL will be returned. If
@@ -627,6 +625,7 @@
static const char *setup_explicit_git_dir(const char *gitdirenv,
struct strbuf *cwd,
+ struct repository_format *repo_fmt,
int *nongit_ok)
{
const char *work_tree_env = getenv(GIT_WORK_TREE_ENVIRONMENT);
@@ -652,7 +651,7 @@
die("Not a git repository: '%s'", gitdirenv);
}
- if (check_repository_format_gently(gitdirenv, nongit_ok)) {
+ if (check_repository_format_gently(gitdirenv, repo_fmt, nongit_ok)) {
free(gitfile);
return NULL;
}
@@ -725,9 +724,10 @@
static const char *setup_discovered_git_dir(const char *gitdir,
struct strbuf *cwd, int offset,
+ struct repository_format *repo_fmt,
int *nongit_ok)
{
- if (check_repository_format_gently(gitdir, nongit_ok))
+ if (check_repository_format_gently(gitdir, repo_fmt, nongit_ok))
return NULL;
/* --work-tree is set without --git-dir; use discovered one */
@@ -739,7 +739,7 @@
gitdir = to_free = real_pathdup(gitdir, 1);
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
- ret = setup_explicit_git_dir(gitdir, cwd, nongit_ok);
+ ret = setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
free(to_free);
return ret;
}
@@ -771,11 +771,12 @@
/* #16.1, #17.1, #20.1, #21.1, #22.1 (see t1510) */
static const char *setup_bare_git_dir(struct strbuf *cwd, int offset,
+ struct repository_format *repo_fmt,
int *nongit_ok)
{
int root_len;
- if (check_repository_format_gently(".", nongit_ok))
+ if (check_repository_format_gently(".", repo_fmt, nongit_ok))
return NULL;
setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1);
@@ -787,7 +788,7 @@
gitdir = offset == cwd->len ? "." : xmemdupz(cwd->buf, offset);
if (chdir(cwd->buf))
die_errno("Could not come back to cwd");
- return setup_explicit_git_dir(gitdir, cwd, nongit_ok);
+ return setup_explicit_git_dir(gitdir, cwd, repo_fmt, nongit_ok);
}
inside_git_dir = 1;
@@ -925,7 +926,7 @@
* - ../.git
* - ../.git/
* - ../ (bare)
- * - ../../.git/
+ * - ../../.git
* etc.
*/
one_filesystem = !git_env_bool("GIT_DISCOVERY_ACROSS_FILESYSTEM", 0);
@@ -1027,7 +1028,8 @@
{
static struct strbuf cwd = STRBUF_INIT;
struct strbuf dir = STRBUF_INIT, gitdir = STRBUF_INIT;
- const char *prefix, *env_prefix;
+ const char *prefix;
+ struct repository_format repo_fmt;
/*
* We may have read an incomplete configuration before
@@ -1055,18 +1057,18 @@
prefix = NULL;
break;
case GIT_DIR_EXPLICIT:
- prefix = setup_explicit_git_dir(gitdir.buf, &cwd, nongit_ok);
+ prefix = setup_explicit_git_dir(gitdir.buf, &cwd, &repo_fmt, nongit_ok);
break;
case GIT_DIR_DISCOVERED:
if (dir.len < cwd.len && chdir(dir.buf))
die(_("Cannot change to '%s'"), dir.buf);
prefix = setup_discovered_git_dir(gitdir.buf, &cwd, dir.len,
- nongit_ok);
+ &repo_fmt, nongit_ok);
break;
case GIT_DIR_BARE:
if (dir.len < cwd.len && chdir(dir.buf))
die(_("Cannot change to '%s'"), dir.buf);
- prefix = setup_bare_git_dir(&cwd, dir.len, nongit_ok);
+ prefix = setup_bare_git_dir(&cwd, dir.len, &repo_fmt, nongit_ok);
break;
case GIT_DIR_HIT_CEILING:
prefix = setup_nongit(cwd.buf, nongit_ok);
@@ -1085,16 +1087,6 @@
die("BUG: unhandled setup_git_directory_1() result");
}
- /*
- * NEEDSWORK: This was a hack in order to get ls-files and grep to have
- * properly formated output when recursing submodules. Once ls-files
- * and grep have been changed to perform this recursing in-process this
- * needs to be removed.
- */
- env_prefix = getenv(GIT_TOPLEVEL_PREFIX_ENVIRONMENT);
- if (env_prefix)
- prefix = env_prefix;
-
if (prefix)
setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1);
else
@@ -1122,6 +1114,8 @@
repo_set_gitdir(the_repository, gitdir);
setup_git_env();
}
+ if (startup_info->have_repository)
+ repo_set_hash_algo(the_repository, repo_fmt.hash_algo);
}
strbuf_release(&dir);
@@ -1183,7 +1177,8 @@
void check_repository_format(void)
{
- check_repository_format_gently(get_git_dir(), NULL);
+ struct repository_format repo_fmt;
+ check_repository_format_gently(get_git_dir(), &repo_fmt, NULL);
startup_info->have_repository = 1;
}
diff --git a/sh-i18n--envsubst.c b/sh-i18n--envsubst.c
index c3a2b5a..09c6b44 100644
--- a/sh-i18n--envsubst.c
+++ b/sh-i18n--envsubst.c
@@ -30,8 +30,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
/* closeout.c - close standard output and standard error
Copyright (C) 1998-2007 Free Software Foundation, Inc.
@@ -47,8 +46,7 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include <errno.h>
#include <stdio.h>
diff --git a/sha1-lookup.c b/sha1-lookup.c
index 2552b79..4cf3ebd 100644
--- a/sha1-lookup.c
+++ b/sha1-lookup.c
@@ -10,7 +10,7 @@
* Conventional binary search loop looks like this:
*
* do {
- * int mi = (lo + hi) / 2;
+ * int mi = lo + (hi - lo) / 2;
* int cmp = "entry pointed at by mi" minus "target";
* if (!cmp)
* return (mi is the wanted one)
@@ -95,7 +95,7 @@
hi = mi;
else
lo = mi + 1;
- mi = (hi + lo) / 2;
+ mi = lo + (hi - lo) / 2;
} while (lo < hi);
return -lo-1;
}
diff --git a/sha1_file.c b/sha1_file.c
index bd5f82e..3da70ac 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -28,11 +28,9 @@
#include "list.h"
#include "mergesort.h"
#include "quote.h"
+#include "packfile.h"
-#define SZ_FMT PRIuMAX
-static inline uintmax_t sz_fmt(size_t s) { return s; }
-
-const unsigned char null_sha1[20];
+const unsigned char null_sha1[GIT_MAX_RAWSZ];
const struct object_id null_oid;
const struct object_id empty_tree_oid = {
EMPTY_TREE_SHA1_BIN_LITERAL
@@ -41,6 +39,64 @@
EMPTY_BLOB_SHA1_BIN_LITERAL
};
+static void git_hash_sha1_init(void *ctx)
+{
+ git_SHA1_Init((git_SHA_CTX *)ctx);
+}
+
+static void git_hash_sha1_update(void *ctx, const void *data, size_t len)
+{
+ git_SHA1_Update((git_SHA_CTX *)ctx, data, len);
+}
+
+static void git_hash_sha1_final(unsigned char *hash, void *ctx)
+{
+ git_SHA1_Final(hash, (git_SHA_CTX *)ctx);
+}
+
+static void git_hash_unknown_init(void *ctx)
+{
+ die("trying to init unknown hash");
+}
+
+static void git_hash_unknown_update(void *ctx, const void *data, size_t len)
+{
+ die("trying to update unknown hash");
+}
+
+static void git_hash_unknown_final(unsigned char *hash, void *ctx)
+{
+ die("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_update,
+ git_hash_unknown_final,
+ NULL,
+ NULL,
+ },
+ {
+ "sha-1",
+ /* "sha1", big-endian */
+ 0x73686131,
+ sizeof(git_SHA_CTX),
+ GIT_SHA1_RAWSZ,
+ GIT_SHA1_HEXSZ,
+ git_hash_sha1_init,
+ git_hash_sha1_update,
+ git_hash_sha1_final,
+ &empty_tree_oid,
+ &empty_blob_oid,
+ },
+};
+
/*
* This is meant to hold a *small* number of objects that you would
* want read_sha1_file() to be able to return, but yet you do not want
@@ -76,6 +132,18 @@
return NULL;
}
+
+static enum safe_crlf get_safe_crlf(unsigned flags)
+{
+ if (flags & HASH_RENORMALIZE)
+ return SAFE_CRLF_RENORMALIZE;
+ else if (flags & HASH_WRITE_OBJECT)
+ return safe_crlf;
+ else
+ return SAFE_CRLF_FALSE;
+}
+
+
int mkdir_in_gitdir(const char *path)
{
if (mkdir(path, 0777)) {
@@ -278,28 +346,6 @@
return buf->buf;
}
- char *odb_pack_name(struct strbuf *buf,
- const unsigned char *sha1,
- const char *ext)
-{
- strbuf_reset(buf);
- strbuf_addf(buf, "%s/pack/pack-%s.%s", get_object_directory(),
- sha1_to_hex(sha1), ext);
- return buf->buf;
-}
-
-char *sha1_pack_name(const unsigned char *sha1)
-{
- static struct strbuf buf = STRBUF_INIT;
- return odb_pack_name(&buf, sha1, "pack");
-}
-
-char *sha1_pack_index_name(const unsigned char *sha1)
-{
- static struct strbuf buf = STRBUF_INIT;
- return odb_pack_name(&buf, sha1, "idx");
-}
-
struct alternate_object_database *alt_odb_list;
static struct alternate_object_database **alt_odb_tail;
@@ -428,6 +474,9 @@
struct strbuf objdirbuf = STRBUF_INIT;
struct strbuf entry = STRBUF_INIT;
+ if (!alt || !*alt)
+ return;
+
if (depth > 5) {
error("%s: ignoring alternate object stores, nesting too deep.",
relative_base);
@@ -480,19 +529,19 @@
void add_to_alternates_file(const char *reference)
{
- struct lock_file *lock = xcalloc(1, sizeof(struct lock_file));
+ struct lock_file lock = LOCK_INIT;
char *alts = git_pathdup("objects/info/alternates");
FILE *in, *out;
+ int found = 0;
- hold_lock_file_for_update(lock, alts, LOCK_DIE_ON_ERROR);
- out = fdopen_lock_file(lock, "w");
+ hold_lock_file_for_update(&lock, alts, LOCK_DIE_ON_ERROR);
+ out = fdopen_lock_file(&lock, "w");
if (!out)
die_errno("unable to fdopen alternates lockfile");
in = fopen(alts, "r");
if (in) {
struct strbuf line = STRBUF_INIT;
- int found = 0;
while (strbuf_getline(&line, in) != EOF) {
if (!strcmp(reference, line.buf)) {
@@ -504,18 +553,15 @@
strbuf_release(&line);
fclose(in);
-
- if (found) {
- rollback_lock_file(lock);
- lock = NULL;
- }
}
else if (errno != ENOENT)
die_errno("unable to read alternates file");
- if (lock) {
+ if (found) {
+ rollback_lock_file(&lock);
+ } else {
fprintf_or_die(out, "%s\n", reference);
- if (commit_lock_file(lock))
+ if (commit_lock_file(&lock))
die_errno("unable to move new alternates file into place");
if (alt_odb_tail)
link_alt_odb_entries(reference, '\n', NULL, 0);
@@ -631,7 +677,6 @@
return;
alt = getenv(ALTERNATE_DB_ENVIRONMENT);
- if (!alt) alt = "";
alt_odb_tail = &alt_odb_list;
link_alt_odb_entries(alt, PATH_SEP, NULL, 0);
@@ -696,213 +741,6 @@
return check_and_freshen(sha1, 0);
}
-static unsigned int pack_used_ctr;
-static unsigned int pack_mmap_calls;
-static unsigned int peak_pack_open_windows;
-static unsigned int pack_open_windows;
-static unsigned int pack_open_fds;
-static unsigned int pack_max_fds;
-static size_t peak_pack_mapped;
-static size_t pack_mapped;
-struct packed_git *packed_git;
-
-static struct mru packed_git_mru_storage;
-struct mru *packed_git_mru = &packed_git_mru_storage;
-
-void pack_report(void)
-{
- fprintf(stderr,
- "pack_report: getpagesize() = %10" SZ_FMT "\n"
- "pack_report: core.packedGitWindowSize = %10" SZ_FMT "\n"
- "pack_report: core.packedGitLimit = %10" SZ_FMT "\n",
- sz_fmt(getpagesize()),
- sz_fmt(packed_git_window_size),
- sz_fmt(packed_git_limit));
- fprintf(stderr,
- "pack_report: pack_used_ctr = %10u\n"
- "pack_report: pack_mmap_calls = %10u\n"
- "pack_report: pack_open_windows = %10u / %10u\n"
- "pack_report: pack_mapped = "
- "%10" SZ_FMT " / %10" SZ_FMT "\n",
- pack_used_ctr,
- pack_mmap_calls,
- pack_open_windows, peak_pack_open_windows,
- sz_fmt(pack_mapped), sz_fmt(peak_pack_mapped));
-}
-
-/*
- * Open and mmap the index file at path, perform a couple of
- * consistency checks, then record its information to p. Return 0 on
- * success.
- */
-static int check_packed_git_idx(const char *path, struct packed_git *p)
-{
- void *idx_map;
- struct pack_idx_header *hdr;
- size_t idx_size;
- uint32_t version, nr, i, *index;
- int fd = git_open(path);
- struct stat st;
-
- if (fd < 0)
- return -1;
- if (fstat(fd, &st)) {
- close(fd);
- return -1;
- }
- idx_size = xsize_t(st.st_size);
- if (idx_size < 4 * 256 + 20 + 20) {
- close(fd);
- return error("index file %s is too small", path);
- }
- idx_map = xmmap(NULL, idx_size, PROT_READ, MAP_PRIVATE, fd, 0);
- close(fd);
-
- hdr = idx_map;
- if (hdr->idx_signature == htonl(PACK_IDX_SIGNATURE)) {
- version = ntohl(hdr->idx_version);
- if (version < 2 || version > 2) {
- munmap(idx_map, idx_size);
- return error("index file %s is version %"PRIu32
- " and is not supported by this binary"
- " (try upgrading GIT to a newer version)",
- path, version);
- }
- } else
- version = 1;
-
- nr = 0;
- index = idx_map;
- if (version > 1)
- index += 2; /* skip index header */
- for (i = 0; i < 256; i++) {
- uint32_t n = ntohl(index[i]);
- if (n < nr) {
- munmap(idx_map, idx_size);
- return error("non-monotonic index %s", path);
- }
- nr = n;
- }
-
- if (version == 1) {
- /*
- * Total size:
- * - 256 index entries 4 bytes each
- * - 24-byte entries * nr (20-byte sha1 + 4-byte offset)
- * - 20-byte SHA1 of the packfile
- * - 20-byte SHA1 file checksum
- */
- if (idx_size != 4*256 + nr * 24 + 20 + 20) {
- munmap(idx_map, idx_size);
- return error("wrong index v1 file size in %s", path);
- }
- } else if (version == 2) {
- /*
- * Minimum size:
- * - 8 bytes of header
- * - 256 index entries 4 bytes each
- * - 20-byte sha1 entry * nr
- * - 4-byte crc entry * nr
- * - 4-byte offset entry * nr
- * - 20-byte SHA1 of the packfile
- * - 20-byte SHA1 file checksum
- * And after the 4-byte offset table might be a
- * variable sized table containing 8-byte entries
- * for offsets larger than 2^31.
- */
- unsigned long min_size = 8 + 4*256 + nr*(20 + 4 + 4) + 20 + 20;
- unsigned long max_size = min_size;
- if (nr)
- max_size += (nr - 1)*8;
- if (idx_size < min_size || idx_size > max_size) {
- munmap(idx_map, idx_size);
- return error("wrong index v2 file size in %s", path);
- }
- if (idx_size != min_size &&
- /*
- * make sure we can deal with large pack offsets.
- * 31-bit signed offset won't be enough, neither
- * 32-bit unsigned one will be.
- */
- (sizeof(off_t) <= 4)) {
- munmap(idx_map, idx_size);
- return error("pack too large for current definition of off_t in %s", path);
- }
- }
-
- p->index_version = version;
- p->index_data = idx_map;
- p->index_size = idx_size;
- p->num_objects = nr;
- return 0;
-}
-
-int open_pack_index(struct packed_git *p)
-{
- char *idx_name;
- size_t len;
- int ret;
-
- if (p->index_data)
- return 0;
-
- if (!strip_suffix(p->pack_name, ".pack", &len))
- die("BUG: pack_name does not end in .pack");
- idx_name = xstrfmt("%.*s.idx", (int)len, p->pack_name);
- ret = check_packed_git_idx(idx_name, p);
- free(idx_name);
- return ret;
-}
-
-static void scan_windows(struct packed_git *p,
- struct packed_git **lru_p,
- struct pack_window **lru_w,
- struct pack_window **lru_l)
-{
- struct pack_window *w, *w_l;
-
- for (w_l = NULL, w = p->windows; w; w = w->next) {
- if (!w->inuse_cnt) {
- if (!*lru_w || w->last_used < (*lru_w)->last_used) {
- *lru_p = p;
- *lru_w = w;
- *lru_l = w_l;
- }
- }
- w_l = w;
- }
-}
-
-static int unuse_one_window(struct packed_git *current)
-{
- struct packed_git *p, *lru_p = NULL;
- struct pack_window *lru_w = NULL, *lru_l = NULL;
-
- if (current)
- scan_windows(current, &lru_p, &lru_w, &lru_l);
- for (p = packed_git; p; p = p->next)
- scan_windows(p, &lru_p, &lru_w, &lru_l);
- if (lru_p) {
- munmap(lru_w->base, lru_w->len);
- pack_mapped -= lru_w->len;
- if (lru_l)
- lru_l->next = lru_w->next;
- else
- lru_p->windows = lru_w->next;
- free(lru_w);
- pack_open_windows--;
- return 1;
- }
- return 0;
-}
-
-void release_pack_memory(size_t need)
-{
- size_t cur = pack_mapped;
- while (need >= (cur - pack_mapped) && unuse_one_window(NULL))
- ; /* nothing */
-}
-
static void mmap_limit_check(size_t length)
{
static size_t limit = 0;
@@ -941,681 +779,6 @@
return ret;
}
-void close_pack_windows(struct packed_git *p)
-{
- while (p->windows) {
- struct pack_window *w = p->windows;
-
- if (w->inuse_cnt)
- die("pack '%s' still has open windows to it",
- p->pack_name);
- munmap(w->base, w->len);
- pack_mapped -= w->len;
- pack_open_windows--;
- p->windows = w->next;
- free(w);
- }
-}
-
-static int close_pack_fd(struct packed_git *p)
-{
- if (p->pack_fd < 0)
- return 0;
-
- close(p->pack_fd);
- pack_open_fds--;
- p->pack_fd = -1;
-
- return 1;
-}
-
-static void close_pack(struct packed_git *p)
-{
- close_pack_windows(p);
- close_pack_fd(p);
- close_pack_index(p);
-}
-
-void close_all_packs(void)
-{
- struct packed_git *p;
-
- for (p = packed_git; p; p = p->next)
- if (p->do_not_close)
- die("BUG: want to close pack marked 'do-not-close'");
- else
- close_pack(p);
-}
-
-
-/*
- * The LRU pack is the one with the oldest MRU window, preferring packs
- * with no used windows, or the oldest mtime if it has no windows allocated.
- */
-static void find_lru_pack(struct packed_git *p, struct packed_git **lru_p, struct pack_window **mru_w, int *accept_windows_inuse)
-{
- struct pack_window *w, *this_mru_w;
- int has_windows_inuse = 0;
-
- /*
- * Reject this pack if it has windows and the previously selected
- * one does not. If this pack does not have windows, reject
- * it if the pack file is newer than the previously selected one.
- */
- if (*lru_p && !*mru_w && (p->windows || p->mtime > (*lru_p)->mtime))
- return;
-
- for (w = this_mru_w = p->windows; w; w = w->next) {
- /*
- * Reject this pack if any of its windows are in use,
- * but the previously selected pack did not have any
- * inuse windows. Otherwise, record that this pack
- * has windows in use.
- */
- if (w->inuse_cnt) {
- if (*accept_windows_inuse)
- has_windows_inuse = 1;
- else
- return;
- }
-
- if (w->last_used > this_mru_w->last_used)
- this_mru_w = w;
-
- /*
- * Reject this pack if it has windows that have been
- * used more recently than the previously selected pack.
- * If the previously selected pack had windows inuse and
- * we have not encountered a window in this pack that is
- * inuse, skip this check since we prefer a pack with no
- * inuse windows to one that has inuse windows.
- */
- if (*mru_w && *accept_windows_inuse == has_windows_inuse &&
- this_mru_w->last_used > (*mru_w)->last_used)
- return;
- }
-
- /*
- * Select this pack.
- */
- *mru_w = this_mru_w;
- *lru_p = p;
- *accept_windows_inuse = has_windows_inuse;
-}
-
-static int close_one_pack(void)
-{
- struct packed_git *p, *lru_p = NULL;
- struct pack_window *mru_w = NULL;
- int accept_windows_inuse = 1;
-
- for (p = packed_git; p; p = p->next) {
- if (p->pack_fd == -1)
- continue;
- find_lru_pack(p, &lru_p, &mru_w, &accept_windows_inuse);
- }
-
- if (lru_p)
- return close_pack_fd(lru_p);
-
- return 0;
-}
-
-void unuse_pack(struct pack_window **w_cursor)
-{
- struct pack_window *w = *w_cursor;
- if (w) {
- w->inuse_cnt--;
- *w_cursor = NULL;
- }
-}
-
-void close_pack_index(struct packed_git *p)
-{
- if (p->index_data) {
- munmap((void *)p->index_data, p->index_size);
- p->index_data = NULL;
- }
-}
-
-static unsigned int get_max_fd_limit(void)
-{
-#ifdef RLIMIT_NOFILE
- {
- struct rlimit lim;
-
- if (!getrlimit(RLIMIT_NOFILE, &lim))
- return lim.rlim_cur;
- }
-#endif
-
-#ifdef _SC_OPEN_MAX
- {
- long open_max = sysconf(_SC_OPEN_MAX);
- if (0 < open_max)
- return open_max;
- /*
- * Otherwise, we got -1 for one of the two
- * reasons:
- *
- * (1) sysconf() did not understand _SC_OPEN_MAX
- * and signaled an error with -1; or
- * (2) sysconf() said there is no limit.
- *
- * We _could_ clear errno before calling sysconf() to
- * tell these two cases apart and return a huge number
- * in the latter case to let the caller cap it to a
- * value that is not so selfish, but letting the
- * fallback OPEN_MAX codepath take care of these cases
- * is a lot simpler.
- */
- }
-#endif
-
-#ifdef OPEN_MAX
- return OPEN_MAX;
-#else
- return 1; /* see the caller ;-) */
-#endif
-}
-
-/*
- * Do not call this directly as this leaks p->pack_fd on error return;
- * call open_packed_git() instead.
- */
-static int open_packed_git_1(struct packed_git *p)
-{
- struct stat st;
- struct pack_header hdr;
- unsigned char sha1[20];
- unsigned char *idx_sha1;
- long fd_flag;
-
- if (!p->index_data && open_pack_index(p))
- return error("packfile %s index unavailable", p->pack_name);
-
- if (!pack_max_fds) {
- unsigned int max_fds = get_max_fd_limit();
-
- /* Save 3 for stdin/stdout/stderr, 22 for work */
- if (25 < max_fds)
- pack_max_fds = max_fds - 25;
- else
- pack_max_fds = 1;
- }
-
- while (pack_max_fds <= pack_open_fds && close_one_pack())
- ; /* nothing */
-
- p->pack_fd = git_open(p->pack_name);
- if (p->pack_fd < 0 || fstat(p->pack_fd, &st))
- return -1;
- pack_open_fds++;
-
- /* If we created the struct before we had the pack we lack size. */
- if (!p->pack_size) {
- if (!S_ISREG(st.st_mode))
- return error("packfile %s not a regular file", p->pack_name);
- p->pack_size = st.st_size;
- } else if (p->pack_size != st.st_size)
- return error("packfile %s size changed", p->pack_name);
-
- /* We leave these file descriptors open with sliding mmap;
- * there is no point keeping them open across exec(), though.
- */
- fd_flag = fcntl(p->pack_fd, F_GETFD, 0);
- if (fd_flag < 0)
- return error("cannot determine file descriptor flags");
- fd_flag |= FD_CLOEXEC;
- if (fcntl(p->pack_fd, F_SETFD, fd_flag) == -1)
- return error("cannot set FD_CLOEXEC");
-
- /* Verify we recognize this pack file format. */
- if (read_in_full(p->pack_fd, &hdr, sizeof(hdr)) != sizeof(hdr))
- return error("file %s is far too short to be a packfile", p->pack_name);
- if (hdr.hdr_signature != htonl(PACK_SIGNATURE))
- return error("file %s is not a GIT packfile", p->pack_name);
- if (!pack_version_ok(hdr.hdr_version))
- return error("packfile %s is version %"PRIu32" and not"
- " supported (try upgrading GIT to a newer version)",
- p->pack_name, ntohl(hdr.hdr_version));
-
- /* Verify the pack matches its index. */
- if (p->num_objects != ntohl(hdr.hdr_entries))
- return error("packfile %s claims to have %"PRIu32" objects"
- " while index indicates %"PRIu32" objects",
- p->pack_name, ntohl(hdr.hdr_entries),
- p->num_objects);
- if (lseek(p->pack_fd, p->pack_size - sizeof(sha1), SEEK_SET) == -1)
- return error("end of packfile %s is unavailable", p->pack_name);
- if (read_in_full(p->pack_fd, sha1, sizeof(sha1)) != sizeof(sha1))
- return error("packfile %s signature is unavailable", p->pack_name);
- idx_sha1 = ((unsigned char *)p->index_data) + p->index_size - 40;
- if (hashcmp(sha1, idx_sha1))
- return error("packfile %s does not match index", p->pack_name);
- return 0;
-}
-
-static int open_packed_git(struct packed_git *p)
-{
- if (!open_packed_git_1(p))
- return 0;
- close_pack_fd(p);
- return -1;
-}
-
-static int in_window(struct pack_window *win, off_t offset)
-{
- /* We must promise at least 20 bytes (one hash) after the
- * offset is available from this window, otherwise the offset
- * is not actually in this window and a different window (which
- * has that one hash excess) must be used. This is to support
- * the object header and delta base parsing routines below.
- */
- off_t win_off = win->offset;
- return win_off <= offset
- && (offset + 20) <= (win_off + win->len);
-}
-
-unsigned char *use_pack(struct packed_git *p,
- struct pack_window **w_cursor,
- off_t offset,
- unsigned long *left)
-{
- struct pack_window *win = *w_cursor;
-
- /* Since packfiles end in a hash of their content and it's
- * pointless to ask for an offset into the middle of that
- * hash, and the in_window function above wouldn't match
- * don't allow an offset too close to the end of the file.
- */
- if (!p->pack_size && p->pack_fd == -1 && open_packed_git(p))
- die("packfile %s cannot be accessed", p->pack_name);
- if (offset > (p->pack_size - 20))
- die("offset beyond end of packfile (truncated pack?)");
- if (offset < 0)
- die(_("offset before end of packfile (broken .idx?)"));
-
- if (!win || !in_window(win, offset)) {
- if (win)
- win->inuse_cnt--;
- for (win = p->windows; win; win = win->next) {
- if (in_window(win, offset))
- break;
- }
- if (!win) {
- size_t window_align = packed_git_window_size / 2;
- off_t len;
-
- if (p->pack_fd == -1 && open_packed_git(p))
- die("packfile %s cannot be accessed", p->pack_name);
-
- win = xcalloc(1, sizeof(*win));
- win->offset = (offset / window_align) * window_align;
- len = p->pack_size - win->offset;
- if (len > packed_git_window_size)
- len = packed_git_window_size;
- win->len = (size_t)len;
- pack_mapped += win->len;
- while (packed_git_limit < pack_mapped
- && unuse_one_window(p))
- ; /* nothing */
- win->base = xmmap(NULL, win->len,
- PROT_READ, MAP_PRIVATE,
- p->pack_fd, win->offset);
- if (win->base == MAP_FAILED)
- die_errno("packfile %s cannot be mapped",
- p->pack_name);
- if (!win->offset && win->len == p->pack_size
- && !p->do_not_close)
- close_pack_fd(p);
- pack_mmap_calls++;
- pack_open_windows++;
- if (pack_mapped > peak_pack_mapped)
- peak_pack_mapped = pack_mapped;
- if (pack_open_windows > peak_pack_open_windows)
- peak_pack_open_windows = pack_open_windows;
- win->next = p->windows;
- p->windows = win;
- }
- }
- if (win != *w_cursor) {
- win->last_used = pack_used_ctr++;
- win->inuse_cnt++;
- *w_cursor = win;
- }
- offset -= win->offset;
- if (left)
- *left = win->len - xsize_t(offset);
- return win->base + offset;
-}
-
-static struct packed_git *alloc_packed_git(int extra)
-{
- struct packed_git *p = xmalloc(st_add(sizeof(*p), extra));
- memset(p, 0, sizeof(*p));
- p->pack_fd = -1;
- return p;
-}
-
-static void try_to_free_pack_memory(size_t size)
-{
- release_pack_memory(size);
-}
-
-struct packed_git *add_packed_git(const char *path, size_t path_len, int local)
-{
- static int have_set_try_to_free_routine;
- struct stat st;
- size_t alloc;
- struct packed_git *p;
-
- if (!have_set_try_to_free_routine) {
- have_set_try_to_free_routine = 1;
- set_try_to_free_routine(try_to_free_pack_memory);
- }
-
- /*
- * Make sure a corresponding .pack file exists and that
- * the index looks sane.
- */
- if (!strip_suffix_mem(path, &path_len, ".idx"))
- return NULL;
-
- /*
- * ".pack" is long enough to hold any suffix we're adding (and
- * the use xsnprintf double-checks that)
- */
- alloc = st_add3(path_len, strlen(".pack"), 1);
- p = alloc_packed_git(alloc);
- memcpy(p->pack_name, path, path_len);
-
- xsnprintf(p->pack_name + path_len, alloc - path_len, ".keep");
- if (!access(p->pack_name, F_OK))
- p->pack_keep = 1;
-
- xsnprintf(p->pack_name + path_len, alloc - path_len, ".pack");
- if (stat(p->pack_name, &st) || !S_ISREG(st.st_mode)) {
- free(p);
- return NULL;
- }
-
- /* ok, it looks sane as far as we can check without
- * actually mapping the pack file.
- */
- p->pack_size = st.st_size;
- p->pack_local = local;
- p->mtime = st.st_mtime;
- if (path_len < 40 || get_sha1_hex(path + path_len - 40, p->sha1))
- hashclr(p->sha1);
- return p;
-}
-
-struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path)
-{
- const char *path = sha1_pack_name(sha1);
- size_t alloc = st_add(strlen(path), 1);
- struct packed_git *p = alloc_packed_git(alloc);
-
- memcpy(p->pack_name, path, alloc); /* includes NUL */
- hashcpy(p->sha1, sha1);
- if (check_packed_git_idx(idx_path, p)) {
- free(p);
- return NULL;
- }
-
- return p;
-}
-
-void install_packed_git(struct packed_git *pack)
-{
- if (pack->pack_fd != -1)
- pack_open_fds++;
-
- pack->next = packed_git;
- packed_git = pack;
-}
-
-void (*report_garbage)(unsigned seen_bits, const char *path);
-
-static void report_helper(const struct string_list *list,
- int seen_bits, int first, int last)
-{
- if (seen_bits == (PACKDIR_FILE_PACK|PACKDIR_FILE_IDX))
- return;
-
- for (; first < last; first++)
- report_garbage(seen_bits, list->items[first].string);
-}
-
-static void report_pack_garbage(struct string_list *list)
-{
- int i, baselen = -1, first = 0, seen_bits = 0;
-
- if (!report_garbage)
- return;
-
- string_list_sort(list);
-
- for (i = 0; i < list->nr; i++) {
- const char *path = list->items[i].string;
- if (baselen != -1 &&
- strncmp(path, list->items[first].string, baselen)) {
- report_helper(list, seen_bits, first, i);
- baselen = -1;
- seen_bits = 0;
- }
- if (baselen == -1) {
- const char *dot = strrchr(path, '.');
- if (!dot) {
- report_garbage(PACKDIR_FILE_GARBAGE, path);
- continue;
- }
- baselen = dot - path + 1;
- first = i;
- }
- if (!strcmp(path + baselen, "pack"))
- seen_bits |= 1;
- else if (!strcmp(path + baselen, "idx"))
- seen_bits |= 2;
- }
- report_helper(list, seen_bits, first, list->nr);
-}
-
-static void prepare_packed_git_one(char *objdir, int local)
-{
- struct strbuf path = STRBUF_INIT;
- size_t dirnamelen;
- DIR *dir;
- struct dirent *de;
- struct string_list garbage = STRING_LIST_INIT_DUP;
-
- strbuf_addstr(&path, objdir);
- strbuf_addstr(&path, "/pack");
- dir = opendir(path.buf);
- if (!dir) {
- if (errno != ENOENT)
- error_errno("unable to open object pack directory: %s",
- path.buf);
- strbuf_release(&path);
- return;
- }
- strbuf_addch(&path, '/');
- dirnamelen = path.len;
- while ((de = readdir(dir)) != NULL) {
- struct packed_git *p;
- size_t base_len;
-
- if (is_dot_or_dotdot(de->d_name))
- continue;
-
- strbuf_setlen(&path, dirnamelen);
- strbuf_addstr(&path, de->d_name);
-
- base_len = path.len;
- if (strip_suffix_mem(path.buf, &base_len, ".idx")) {
- /* Don't reopen a pack we already have. */
- for (p = packed_git; p; p = p->next) {
- size_t len;
- if (strip_suffix(p->pack_name, ".pack", &len) &&
- len == base_len &&
- !memcmp(p->pack_name, path.buf, len))
- break;
- }
- if (p == NULL &&
- /*
- * See if it really is a valid .idx file with
- * corresponding .pack file that we can map.
- */
- (p = add_packed_git(path.buf, path.len, local)) != NULL)
- install_packed_git(p);
- }
-
- if (!report_garbage)
- continue;
-
- if (ends_with(de->d_name, ".idx") ||
- ends_with(de->d_name, ".pack") ||
- ends_with(de->d_name, ".bitmap") ||
- ends_with(de->d_name, ".keep"))
- string_list_append(&garbage, path.buf);
- else
- report_garbage(PACKDIR_FILE_GARBAGE, path.buf);
- }
- closedir(dir);
- report_pack_garbage(&garbage);
- string_list_clear(&garbage, 0);
- strbuf_release(&path);
-}
-
-static int approximate_object_count_valid;
-
-/*
- * Give a fast, rough count of the number of objects in the repository. This
- * ignores loose objects completely. If you have a lot of them, then either
- * you should repack because your performance will be awful, or they are
- * all unreachable objects about to be pruned, in which case they're not really
- * interesting as a measure of repo size in the first place.
- */
-unsigned long approximate_object_count(void)
-{
- static unsigned long count;
- if (!approximate_object_count_valid) {
- struct packed_git *p;
-
- prepare_packed_git();
- count = 0;
- for (p = packed_git; p; p = p->next) {
- if (open_pack_index(p))
- continue;
- count += p->num_objects;
- }
- }
- return count;
-}
-
-static void *get_next_packed_git(const void *p)
-{
- return ((const struct packed_git *)p)->next;
-}
-
-static void set_next_packed_git(void *p, void *next)
-{
- ((struct packed_git *)p)->next = next;
-}
-
-static int sort_pack(const void *a_, const void *b_)
-{
- const struct packed_git *a = a_;
- const struct packed_git *b = b_;
- int st;
-
- /*
- * Local packs tend to contain objects specific to our
- * variant of the project than remote ones. In addition,
- * remote ones could be on a network mounted filesystem.
- * Favor local ones for these reasons.
- */
- st = a->pack_local - b->pack_local;
- if (st)
- return -st;
-
- /*
- * Younger packs tend to contain more recent objects,
- * and more recent objects tend to get accessed more
- * often.
- */
- if (a->mtime < b->mtime)
- return 1;
- else if (a->mtime == b->mtime)
- return 0;
- return -1;
-}
-
-static void rearrange_packed_git(void)
-{
- packed_git = llist_mergesort(packed_git, get_next_packed_git,
- set_next_packed_git, sort_pack);
-}
-
-static void prepare_packed_git_mru(void)
-{
- struct packed_git *p;
-
- mru_clear(packed_git_mru);
- for (p = packed_git; p; p = p->next)
- mru_append(packed_git_mru, p);
-}
-
-static int prepare_packed_git_run_once = 0;
-void prepare_packed_git(void)
-{
- struct alternate_object_database *alt;
-
- if (prepare_packed_git_run_once)
- return;
- prepare_packed_git_one(get_object_directory(), 1);
- prepare_alt_odb();
- for (alt = alt_odb_list; alt; alt = alt->next)
- prepare_packed_git_one(alt->path, 0);
- rearrange_packed_git();
- prepare_packed_git_mru();
- prepare_packed_git_run_once = 1;
-}
-
-void reprepare_packed_git(void)
-{
- approximate_object_count_valid = 0;
- prepare_packed_git_run_once = 0;
- prepare_packed_git();
-}
-
-static void mark_bad_packed_object(struct packed_git *p,
- const unsigned char *sha1)
-{
- unsigned i;
- for (i = 0; i < p->num_bad_objects; i++)
- if (!hashcmp(sha1, p->bad_object_sha1 + GIT_SHA1_RAWSZ * i))
- return;
- p->bad_object_sha1 = xrealloc(p->bad_object_sha1,
- st_mult(GIT_MAX_RAWSZ,
- st_add(p->num_bad_objects, 1)));
- hashcpy(p->bad_object_sha1 + GIT_SHA1_RAWSZ * p->num_bad_objects, sha1);
- p->num_bad_objects++;
-}
-
-static const struct packed_git *has_packed_and_bad(const unsigned char *sha1)
-{
- struct packed_git *p;
- unsigned i;
-
- for (p = packed_git; p; p = p->next)
- for (i = 0; i < p->num_bad_objects; i++)
- if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
- return p;
- return NULL;
-}
-
/*
* With an in-core object data in "map", rehash it to make sure the
* object name actually matches "sha1" to detect object corruption.
@@ -1786,31 +949,6 @@
return map_sha1_file_1(NULL, sha1, size);
}
-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;
- unsigned long used = 0;
-
- c = buf[used++];
- *type = (c >> 4) & 7;
- size = c & 15;
- shift = 4;
- while (c & 0x80) {
- if (len <= used || bitsizeof(long) <= shift) {
- error("bad object header");
- size = used = 0;
- break;
- }
- c = buf[used++];
- size += (c & 0x7f) << shift;
- shift += 7;
- }
- *sizep = size;
- return used;
-}
-
static int unpack_sha1_short_header(git_zstream *stream,
unsigned char *map, unsigned long mapsize,
void *buffer, unsigned long bufsiz)
@@ -1997,894 +1135,6 @@
return parse_sha1_header_extended(hdr, &oi, 0);
}
-unsigned long get_size_from_delta(struct packed_git *p,
- struct pack_window **w_curs,
- off_t curpos)
-{
- const unsigned char *data;
- unsigned char delta_head[20], *in;
- git_zstream stream;
- int st;
-
- memset(&stream, 0, sizeof(stream));
- stream.next_out = delta_head;
- stream.avail_out = sizeof(delta_head);
-
- git_inflate_init(&stream);
- do {
- in = use_pack(p, w_curs, curpos, &stream.avail_in);
- stream.next_in = in;
- st = git_inflate(&stream, Z_FINISH);
- curpos += stream.next_in - in;
- } while ((st == Z_OK || st == Z_BUF_ERROR) &&
- stream.total_out < sizeof(delta_head));
- git_inflate_end(&stream);
- if ((st != Z_STREAM_END) && stream.total_out != sizeof(delta_head)) {
- error("delta data unpack-initial failed");
- return 0;
- }
-
- /* Examine the initial part of the delta to figure out
- * the result size.
- */
- data = delta_head;
-
- /* ignore base size */
- get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
-
- /* Read the result size */
- return get_delta_hdr_size(&data, delta_head+sizeof(delta_head));
-}
-
-static off_t get_delta_base(struct packed_git *p,
- struct pack_window **w_curs,
- off_t *curpos,
- enum object_type type,
- off_t delta_obj_offset)
-{
- unsigned char *base_info = use_pack(p, w_curs, *curpos, NULL);
- off_t base_offset;
-
- /* use_pack() assured us we have [base_info, base_info + 20)
- * as a range that we can look at without walking off the
- * end of the mapped window. Its actually the hash size
- * that is assured. An OFS_DELTA longer than the hash size
- * is stupid, as then a REF_DELTA would be smaller to store.
- */
- if (type == OBJ_OFS_DELTA) {
- unsigned used = 0;
- unsigned char c = base_info[used++];
- base_offset = c & 127;
- while (c & 128) {
- base_offset += 1;
- if (!base_offset || MSB(base_offset, 7))
- return 0; /* overflow */
- c = base_info[used++];
- base_offset = (base_offset << 7) + (c & 127);
- }
- base_offset = delta_obj_offset - base_offset;
- if (base_offset <= 0 || base_offset >= delta_obj_offset)
- return 0; /* out of bound */
- *curpos += used;
- } else if (type == OBJ_REF_DELTA) {
- /* The base entry _must_ be in the same pack */
- base_offset = find_pack_entry_one(base_info, p);
- *curpos += 20;
- } else
- die("I am totally screwed");
- return base_offset;
-}
-
-/*
- * Like get_delta_base above, but we return the sha1 instead of the pack
- * offset. This means it is cheaper for REF deltas (we do not have to do
- * the final object lookup), but more expensive for OFS deltas (we
- * have to load the revidx to convert the offset back into a sha1).
- */
-static const unsigned char *get_delta_base_sha1(struct packed_git *p,
- struct pack_window **w_curs,
- off_t curpos,
- enum object_type type,
- off_t delta_obj_offset)
-{
- if (type == OBJ_REF_DELTA) {
- unsigned char *base = use_pack(p, w_curs, curpos, NULL);
- return base;
- } else if (type == OBJ_OFS_DELTA) {
- struct revindex_entry *revidx;
- off_t base_offset = get_delta_base(p, w_curs, &curpos,
- type, delta_obj_offset);
-
- if (!base_offset)
- return NULL;
-
- revidx = find_pack_revindex(p, base_offset);
- if (!revidx)
- return NULL;
-
- return nth_packed_object_sha1(p, revidx->nr);
- } else
- return NULL;
-}
-
-int unpack_object_header(struct packed_git *p,
- struct pack_window **w_curs,
- off_t *curpos,
- unsigned long *sizep)
-{
- unsigned char *base;
- unsigned long left;
- unsigned long used;
- enum object_type type;
-
- /* use_pack() assures us we have [base, base + 20) available
- * as a range that we can look at. (Its actually the hash
- * size that is assured.) With our object header encoding
- * the maximum deflated object size is 2^137, which is just
- * insane, so we know won't exceed what we have been given.
- */
- base = use_pack(p, w_curs, *curpos, &left);
- used = unpack_object_header_buffer(base, left, &type, sizep);
- if (!used) {
- type = OBJ_BAD;
- } else
- *curpos += used;
-
- return type;
-}
-
-static int retry_bad_packed_offset(struct packed_git *p, off_t obj_offset)
-{
- int type;
- struct revindex_entry *revidx;
- const unsigned char *sha1;
- revidx = find_pack_revindex(p, obj_offset);
- if (!revidx)
- return OBJ_BAD;
- sha1 = nth_packed_object_sha1(p, revidx->nr);
- mark_bad_packed_object(p, sha1);
- type = sha1_object_info(sha1, NULL);
- if (type <= OBJ_NONE)
- return OBJ_BAD;
- return type;
-}
-
-#define POI_STACK_PREALLOC 64
-
-static enum object_type packed_to_object_type(struct packed_git *p,
- off_t obj_offset,
- enum object_type type,
- struct pack_window **w_curs,
- off_t curpos)
-{
- off_t small_poi_stack[POI_STACK_PREALLOC];
- off_t *poi_stack = small_poi_stack;
- int poi_stack_nr = 0, poi_stack_alloc = POI_STACK_PREALLOC;
-
- while (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
- off_t base_offset;
- unsigned long size;
- /* Push the object we're going to leave behind */
- if (poi_stack_nr >= poi_stack_alloc && poi_stack == small_poi_stack) {
- poi_stack_alloc = alloc_nr(poi_stack_nr);
- ALLOC_ARRAY(poi_stack, poi_stack_alloc);
- memcpy(poi_stack, small_poi_stack, sizeof(off_t)*poi_stack_nr);
- } else {
- ALLOC_GROW(poi_stack, poi_stack_nr+1, poi_stack_alloc);
- }
- poi_stack[poi_stack_nr++] = obj_offset;
- /* If parsing the base offset fails, just unwind */
- base_offset = get_delta_base(p, w_curs, &curpos, type, obj_offset);
- if (!base_offset)
- goto unwind;
- curpos = obj_offset = base_offset;
- type = unpack_object_header(p, w_curs, &curpos, &size);
- if (type <= OBJ_NONE) {
- /* If getting the base itself fails, we first
- * retry the base, otherwise unwind */
- type = retry_bad_packed_offset(p, base_offset);
- if (type > OBJ_NONE)
- goto out;
- goto unwind;
- }
- }
-
- switch (type) {
- case OBJ_BAD:
- case OBJ_COMMIT:
- case OBJ_TREE:
- case OBJ_BLOB:
- case OBJ_TAG:
- break;
- default:
- error("unknown object type %i at offset %"PRIuMAX" in %s",
- type, (uintmax_t)obj_offset, p->pack_name);
- type = OBJ_BAD;
- }
-
-out:
- if (poi_stack != small_poi_stack)
- free(poi_stack);
- return type;
-
-unwind:
- while (poi_stack_nr) {
- obj_offset = poi_stack[--poi_stack_nr];
- type = retry_bad_packed_offset(p, obj_offset);
- if (type > OBJ_NONE)
- goto out;
- }
- type = OBJ_BAD;
- goto out;
-}
-
-static struct hashmap delta_base_cache;
-static size_t delta_base_cached;
-
-static LIST_HEAD(delta_base_cache_lru);
-
-struct delta_base_cache_key {
- struct packed_git *p;
- off_t base_offset;
-};
-
-struct delta_base_cache_entry {
- struct hashmap hash;
- struct delta_base_cache_key key;
- struct list_head lru;
- void *data;
- unsigned long size;
- enum object_type type;
-};
-
-static unsigned int pack_entry_hash(struct packed_git *p, off_t base_offset)
-{
- unsigned int hash;
-
- hash = (unsigned int)(intptr_t)p + (unsigned int)base_offset;
- hash += (hash >> 8) + (hash >> 16);
- return hash;
-}
-
-static struct delta_base_cache_entry *
-get_delta_base_cache_entry(struct packed_git *p, off_t base_offset)
-{
- struct hashmap_entry entry;
- struct delta_base_cache_key key;
-
- if (!delta_base_cache.cmpfn)
- return NULL;
-
- hashmap_entry_init(&entry, pack_entry_hash(p, base_offset));
- key.p = p;
- key.base_offset = base_offset;
- return hashmap_get(&delta_base_cache, &entry, &key);
-}
-
-static int delta_base_cache_key_eq(const struct delta_base_cache_key *a,
- const struct delta_base_cache_key *b)
-{
- return a->p == b->p && a->base_offset == b->base_offset;
-}
-
-static int delta_base_cache_hash_cmp(const void *unused_cmp_data,
- const void *va, const void *vb,
- const void *vkey)
-{
- const struct delta_base_cache_entry *a = va, *b = vb;
- const struct delta_base_cache_key *key = vkey;
- if (key)
- return !delta_base_cache_key_eq(&a->key, key);
- else
- return !delta_base_cache_key_eq(&a->key, &b->key);
-}
-
-static int in_delta_base_cache(struct packed_git *p, off_t base_offset)
-{
- return !!get_delta_base_cache_entry(p, base_offset);
-}
-
-/*
- * Remove the entry from the cache, but do _not_ free the associated
- * entry data. The caller takes ownership of the "data" buffer, and
- * should copy out any fields it wants before detaching.
- */
-static void detach_delta_base_cache_entry(struct delta_base_cache_entry *ent)
-{
- hashmap_remove(&delta_base_cache, ent, &ent->key);
- list_del(&ent->lru);
- delta_base_cached -= ent->size;
- free(ent);
-}
-
-static void *cache_or_unpack_entry(struct packed_git *p, off_t base_offset,
- unsigned long *base_size, enum object_type *type)
-{
- struct delta_base_cache_entry *ent;
-
- ent = get_delta_base_cache_entry(p, base_offset);
- if (!ent)
- return unpack_entry(p, base_offset, type, base_size);
-
- if (type)
- *type = ent->type;
- if (base_size)
- *base_size = ent->size;
- return xmemdupz(ent->data, ent->size);
-}
-
-static inline void release_delta_base_cache(struct delta_base_cache_entry *ent)
-{
- free(ent->data);
- detach_delta_base_cache_entry(ent);
-}
-
-void clear_delta_base_cache(void)
-{
- struct list_head *lru, *tmp;
- list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
- struct delta_base_cache_entry *entry =
- list_entry(lru, struct delta_base_cache_entry, lru);
- release_delta_base_cache(entry);
- }
-}
-
-static void add_delta_base_cache(struct packed_git *p, off_t base_offset,
- void *base, unsigned long base_size, enum object_type type)
-{
- struct delta_base_cache_entry *ent = xmalloc(sizeof(*ent));
- struct list_head *lru, *tmp;
-
- delta_base_cached += base_size;
-
- list_for_each_safe(lru, tmp, &delta_base_cache_lru) {
- struct delta_base_cache_entry *f =
- list_entry(lru, struct delta_base_cache_entry, lru);
- if (delta_base_cached <= delta_base_cache_limit)
- break;
- release_delta_base_cache(f);
- }
-
- ent->key.p = p;
- ent->key.base_offset = base_offset;
- ent->type = type;
- ent->data = base;
- ent->size = base_size;
- list_add_tail(&ent->lru, &delta_base_cache_lru);
-
- if (!delta_base_cache.cmpfn)
- hashmap_init(&delta_base_cache, delta_base_cache_hash_cmp, NULL, 0);
- hashmap_entry_init(ent, pack_entry_hash(p, base_offset));
- hashmap_add(&delta_base_cache, ent);
-}
-
-int packed_object_info(struct packed_git *p, off_t obj_offset,
- struct object_info *oi)
-{
- struct pack_window *w_curs = NULL;
- unsigned long size;
- off_t curpos = obj_offset;
- enum object_type type;
-
- /*
- * We always get the representation type, but only convert it to
- * a "real" type later if the caller is interested.
- */
- if (oi->contentp) {
- *oi->contentp = cache_or_unpack_entry(p, obj_offset, oi->sizep,
- &type);
- if (!*oi->contentp)
- type = OBJ_BAD;
- } else {
- type = unpack_object_header(p, &w_curs, &curpos, &size);
- }
-
- if (!oi->contentp && oi->sizep) {
- if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
- off_t tmp_pos = curpos;
- off_t base_offset = get_delta_base(p, &w_curs, &tmp_pos,
- type, obj_offset);
- if (!base_offset) {
- type = OBJ_BAD;
- goto out;
- }
- *oi->sizep = get_size_from_delta(p, &w_curs, tmp_pos);
- if (*oi->sizep == 0) {
- type = OBJ_BAD;
- goto out;
- }
- } else {
- *oi->sizep = size;
- }
- }
-
- if (oi->disk_sizep) {
- struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
- *oi->disk_sizep = revidx[1].offset - obj_offset;
- }
-
- if (oi->typep || oi->typename) {
- enum object_type ptot;
- ptot = packed_to_object_type(p, obj_offset, type, &w_curs,
- curpos);
- if (oi->typep)
- *oi->typep = ptot;
- if (oi->typename) {
- const char *tn = typename(ptot);
- if (tn)
- strbuf_addstr(oi->typename, tn);
- }
- if (ptot < 0) {
- type = OBJ_BAD;
- goto out;
- }
- }
-
- if (oi->delta_base_sha1) {
- if (type == OBJ_OFS_DELTA || type == OBJ_REF_DELTA) {
- const unsigned char *base;
-
- base = get_delta_base_sha1(p, &w_curs, curpos,
- type, obj_offset);
- if (!base) {
- type = OBJ_BAD;
- goto out;
- }
-
- hashcpy(oi->delta_base_sha1, base);
- } else
- hashclr(oi->delta_base_sha1);
- }
-
-out:
- unuse_pack(&w_curs);
- return type;
-}
-
-static void *unpack_compressed_entry(struct packed_git *p,
- struct pack_window **w_curs,
- off_t curpos,
- unsigned long size)
-{
- int st;
- git_zstream stream;
- unsigned char *buffer, *in;
-
- buffer = xmallocz_gently(size);
- if (!buffer)
- return NULL;
- memset(&stream, 0, sizeof(stream));
- stream.next_out = buffer;
- stream.avail_out = size + 1;
-
- git_inflate_init(&stream);
- do {
- in = use_pack(p, w_curs, curpos, &stream.avail_in);
- stream.next_in = in;
- st = git_inflate(&stream, Z_FINISH);
- if (!stream.avail_out)
- break; /* the payload is larger than it should be */
- curpos += stream.next_in - in;
- } while (st == Z_OK || st == Z_BUF_ERROR);
- git_inflate_end(&stream);
- if ((st != Z_STREAM_END) || stream.total_out != size) {
- free(buffer);
- return NULL;
- }
-
- return buffer;
-}
-
-static void *read_object(const unsigned char *sha1, enum object_type *type,
- unsigned long *size);
-
-static void write_pack_access_log(struct packed_git *p, off_t obj_offset)
-{
- static struct trace_key pack_access = TRACE_KEY_INIT(PACK_ACCESS);
- trace_printf_key(&pack_access, "%s %"PRIuMAX"\n",
- p->pack_name, (uintmax_t)obj_offset);
-}
-
-int do_check_packed_object_crc;
-
-#define UNPACK_ENTRY_STACK_PREALLOC 64
-struct unpack_entry_stack_ent {
- off_t obj_offset;
- off_t curpos;
- unsigned long size;
-};
-
-void *unpack_entry(struct packed_git *p, off_t obj_offset,
- enum object_type *final_type, unsigned long *final_size)
-{
- struct pack_window *w_curs = NULL;
- off_t curpos = obj_offset;
- void *data = NULL;
- unsigned long size;
- enum object_type type;
- struct unpack_entry_stack_ent small_delta_stack[UNPACK_ENTRY_STACK_PREALLOC];
- struct unpack_entry_stack_ent *delta_stack = small_delta_stack;
- int delta_stack_nr = 0, delta_stack_alloc = UNPACK_ENTRY_STACK_PREALLOC;
- int base_from_cache = 0;
-
- write_pack_access_log(p, obj_offset);
-
- /* PHASE 1: drill down to the innermost base object */
- for (;;) {
- off_t base_offset;
- int i;
- struct delta_base_cache_entry *ent;
-
- ent = get_delta_base_cache_entry(p, curpos);
- if (ent) {
- type = ent->type;
- data = ent->data;
- size = ent->size;
- detach_delta_base_cache_entry(ent);
- base_from_cache = 1;
- break;
- }
-
- if (do_check_packed_object_crc && p->index_version > 1) {
- struct revindex_entry *revidx = find_pack_revindex(p, obj_offset);
- off_t len = revidx[1].offset - obj_offset;
- if (check_pack_crc(p, &w_curs, obj_offset, len, revidx->nr)) {
- const unsigned char *sha1 =
- nth_packed_object_sha1(p, revidx->nr);
- error("bad packed object CRC for %s",
- sha1_to_hex(sha1));
- mark_bad_packed_object(p, sha1);
- data = NULL;
- goto out;
- }
- }
-
- type = unpack_object_header(p, &w_curs, &curpos, &size);
- if (type != OBJ_OFS_DELTA && type != OBJ_REF_DELTA)
- break;
-
- base_offset = get_delta_base(p, &w_curs, &curpos, type, obj_offset);
- if (!base_offset) {
- error("failed to validate delta base reference "
- "at offset %"PRIuMAX" from %s",
- (uintmax_t)curpos, p->pack_name);
- /* bail to phase 2, in hopes of recovery */
- data = NULL;
- break;
- }
-
- /* push object, proceed to base */
- if (delta_stack_nr >= delta_stack_alloc
- && delta_stack == small_delta_stack) {
- delta_stack_alloc = alloc_nr(delta_stack_nr);
- ALLOC_ARRAY(delta_stack, delta_stack_alloc);
- memcpy(delta_stack, small_delta_stack,
- sizeof(*delta_stack)*delta_stack_nr);
- } else {
- ALLOC_GROW(delta_stack, delta_stack_nr+1, delta_stack_alloc);
- }
- i = delta_stack_nr++;
- delta_stack[i].obj_offset = obj_offset;
- delta_stack[i].curpos = curpos;
- delta_stack[i].size = size;
-
- curpos = obj_offset = base_offset;
- }
-
- /* PHASE 2: handle the base */
- switch (type) {
- case OBJ_OFS_DELTA:
- case OBJ_REF_DELTA:
- if (data)
- die("BUG: unpack_entry: left loop at a valid delta");
- break;
- case OBJ_COMMIT:
- case OBJ_TREE:
- case OBJ_BLOB:
- case OBJ_TAG:
- if (!base_from_cache)
- data = unpack_compressed_entry(p, &w_curs, curpos, size);
- break;
- default:
- data = NULL;
- error("unknown object type %i at offset %"PRIuMAX" in %s",
- type, (uintmax_t)obj_offset, p->pack_name);
- }
-
- /* PHASE 3: apply deltas in order */
-
- /* invariants:
- * 'data' holds the base data, or NULL if there was corruption
- */
- while (delta_stack_nr) {
- void *delta_data;
- void *base = data;
- void *external_base = NULL;
- unsigned long delta_size, base_size = size;
- int i;
-
- data = NULL;
-
- if (base)
- add_delta_base_cache(p, obj_offset, base, base_size, type);
-
- if (!base) {
- /*
- * We're probably in deep shit, but let's try to fetch
- * the required base anyway from another pack or loose.
- * This is costly but should happen only in the presence
- * of a corrupted pack, and is better than failing outright.
- */
- struct revindex_entry *revidx;
- const unsigned char *base_sha1;
- revidx = find_pack_revindex(p, obj_offset);
- if (revidx) {
- base_sha1 = nth_packed_object_sha1(p, revidx->nr);
- error("failed to read delta base object %s"
- " at offset %"PRIuMAX" from %s",
- sha1_to_hex(base_sha1), (uintmax_t)obj_offset,
- p->pack_name);
- mark_bad_packed_object(p, base_sha1);
- base = read_object(base_sha1, &type, &base_size);
- external_base = base;
- }
- }
-
- i = --delta_stack_nr;
- obj_offset = delta_stack[i].obj_offset;
- curpos = delta_stack[i].curpos;
- delta_size = delta_stack[i].size;
-
- if (!base)
- continue;
-
- delta_data = unpack_compressed_entry(p, &w_curs, curpos, delta_size);
-
- if (!delta_data) {
- error("failed to unpack compressed delta "
- "at offset %"PRIuMAX" from %s",
- (uintmax_t)curpos, p->pack_name);
- data = NULL;
- free(external_base);
- continue;
- }
-
- data = patch_delta(base, base_size,
- delta_data, delta_size,
- &size);
-
- /*
- * We could not apply the delta; warn the user, but keep going.
- * Our failure will be noticed either in the next iteration of
- * the loop, or if this is the final delta, in the caller when
- * we return NULL. Those code paths will take care of making
- * a more explicit warning and retrying with another copy of
- * the object.
- */
- if (!data)
- error("failed to apply delta");
-
- free(delta_data);
- free(external_base);
- }
-
- if (final_type)
- *final_type = type;
- if (final_size)
- *final_size = size;
-
-out:
- unuse_pack(&w_curs);
-
- if (delta_stack != small_delta_stack)
- free(delta_stack);
-
- return data;
-}
-
-const unsigned char *nth_packed_object_sha1(struct packed_git *p,
- uint32_t n)
-{
- const unsigned char *index = p->index_data;
- if (!index) {
- if (open_pack_index(p))
- return NULL;
- index = p->index_data;
- }
- if (n >= p->num_objects)
- return NULL;
- index += 4 * 256;
- if (p->index_version == 1) {
- return index + 24 * n + 4;
- } else {
- index += 8;
- return index + 20 * n;
- }
-}
-
-const struct object_id *nth_packed_object_oid(struct object_id *oid,
- struct packed_git *p,
- uint32_t n)
-{
- const unsigned char *hash = nth_packed_object_sha1(p, n);
- if (!hash)
- return NULL;
- hashcpy(oid->hash, hash);
- return oid;
-}
-
-void check_pack_index_ptr(const struct packed_git *p, const void *vptr)
-{
- const unsigned char *ptr = vptr;
- const unsigned char *start = p->index_data;
- const unsigned char *end = start + p->index_size;
- if (ptr < start)
- die(_("offset before start of pack index for %s (corrupt index?)"),
- p->pack_name);
- /* No need to check for underflow; .idx files must be at least 8 bytes */
- if (ptr >= end - 8)
- die(_("offset beyond end of pack index for %s (truncated index?)"),
- p->pack_name);
-}
-
-off_t nth_packed_object_offset(const struct packed_git *p, uint32_t n)
-{
- const unsigned char *index = p->index_data;
- index += 4 * 256;
- if (p->index_version == 1) {
- return ntohl(*((uint32_t *)(index + 24 * n)));
- } else {
- uint32_t off;
- index += 8 + p->num_objects * (20 + 4);
- off = ntohl(*((uint32_t *)(index + 4 * n)));
- if (!(off & 0x80000000))
- return off;
- index += p->num_objects * 4 + (off & 0x7fffffff) * 8;
- check_pack_index_ptr(p, index);
- return (((uint64_t)ntohl(*((uint32_t *)(index + 0)))) << 32) |
- ntohl(*((uint32_t *)(index + 4)));
- }
-}
-
-off_t find_pack_entry_one(const unsigned char *sha1,
- struct packed_git *p)
-{
- const uint32_t *level1_ofs = p->index_data;
- const unsigned char *index = p->index_data;
- unsigned hi, lo, stride;
- static int debug_lookup = -1;
-
- if (debug_lookup < 0)
- debug_lookup = !!getenv("GIT_DEBUG_LOOKUP");
-
- if (!index) {
- if (open_pack_index(p))
- return 0;
- level1_ofs = p->index_data;
- index = p->index_data;
- }
- if (p->index_version > 1) {
- level1_ofs += 2;
- index += 8;
- }
- index += 4 * 256;
- hi = ntohl(level1_ofs[*sha1]);
- lo = ((*sha1 == 0x0) ? 0 : ntohl(level1_ofs[*sha1 - 1]));
- if (p->index_version > 1) {
- stride = 20;
- } else {
- stride = 24;
- index += 4;
- }
-
- if (debug_lookup)
- printf("%02x%02x%02x... lo %u hi %u nr %"PRIu32"\n",
- sha1[0], sha1[1], sha1[2], lo, hi, p->num_objects);
-
- while (lo < hi) {
- unsigned mi = (lo + hi) / 2;
- int cmp = hashcmp(index + mi * stride, sha1);
-
- if (debug_lookup)
- printf("lo %u hi %u rg %u mi %u\n",
- lo, hi, hi - lo, mi);
- if (!cmp)
- return nth_packed_object_offset(p, mi);
- if (cmp > 0)
- hi = mi;
- else
- lo = mi+1;
- }
- return 0;
-}
-
-int is_pack_valid(struct packed_git *p)
-{
- /* An already open pack is known to be valid. */
- if (p->pack_fd != -1)
- return 1;
-
- /* If the pack has one window completely covering the
- * file size, the pack is known to be valid even if
- * the descriptor is not currently open.
- */
- if (p->windows) {
- struct pack_window *w = p->windows;
-
- if (!w->offset && w->len == p->pack_size)
- return 1;
- }
-
- /* Force the pack to open to prove its valid. */
- return !open_packed_git(p);
-}
-
-static int fill_pack_entry(const unsigned char *sha1,
- struct pack_entry *e,
- struct packed_git *p)
-{
- off_t offset;
-
- if (p->num_bad_objects) {
- unsigned i;
- for (i = 0; i < p->num_bad_objects; i++)
- if (!hashcmp(sha1, p->bad_object_sha1 + 20 * i))
- return 0;
- }
-
- offset = find_pack_entry_one(sha1, p);
- if (!offset)
- return 0;
-
- /*
- * We are about to tell the caller where they can locate the
- * requested object. We better make sure the packfile is
- * still here and can be accessed before supplying that
- * answer, as it may have been deleted since the index was
- * loaded!
- */
- if (!is_pack_valid(p))
- return 0;
- e->offset = offset;
- e->p = p;
- hashcpy(e->sha1, sha1);
- return 1;
-}
-
-/*
- * Iff a pack file contains the object named by sha1, return true and
- * store its location to e.
- */
-static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
-{
- struct mru_entry *p;
-
- prepare_packed_git();
- if (!packed_git)
- return 0;
-
- for (p = packed_git_mru->head; p; p = p->next) {
- if (fill_pack_entry(sha1, e, p->item)) {
- mru_mark(packed_git_mru, p);
- return 1;
- }
- }
- return 0;
-}
-
-struct packed_git *find_sha1_pack(const unsigned char *sha1,
- struct packed_git *packs)
-{
- struct packed_git *p;
-
- for (p = packs; p; p = p->next) {
- if (find_pack_entry_one(sha1, p))
- return p;
- }
- return NULL;
-
-}
-
static int sha1_loose_object_info(const unsigned char *sha1,
struct object_info *oi,
int flags)
@@ -2959,6 +1209,7 @@
if (oi->sizep == &size_scratch)
oi->sizep = NULL;
strbuf_release(&hdrbuf);
+ oi->whence = OI_LOOSE;
return (status < 0) ? status : 0;
}
@@ -2971,6 +1222,9 @@
lookup_replace_object(sha1) :
sha1;
+ if (is_null_sha1(real))
+ return -1;
+
if (!oi)
oi = &blank_oi;
@@ -2996,10 +1250,8 @@
if (!find_pack_entry(real, &e)) {
/* Most likely it's a loose object. */
- if (!sha1_loose_object_info(real, oi, flags)) {
- oi->whence = OI_LOOSE;
+ if (!sha1_loose_object_info(real, oi, flags))
return 0;
- }
/* Not a loose object; someone else may have just packed it. */
if (flags & OBJECT_INFO_QUICK) {
@@ -3022,10 +1274,7 @@
if (rtype < 0) {
mark_bad_packed_object(e.p, real);
return sha1_object_info_extended(real, oi, 0);
- } else if (in_delta_base_cache(e.p, e.offset)) {
- oi->whence = OI_DBCACHED;
- } else {
- oi->whence = OI_PACKED;
+ } else if (oi->whence == OI_PACKED) {
oi->u.packed.offset = e.offset;
oi->u.packed.pack = e.p;
oi->u.packed.is_delta = (rtype == OBJ_REF_DELTA ||
@@ -3049,28 +1298,18 @@
return type;
}
-static void *read_packed_sha1(const unsigned char *sha1,
- enum object_type *type, unsigned long *size)
+static void *read_object(const unsigned char *sha1, enum object_type *type,
+ unsigned long *size)
{
- struct pack_entry e;
- void *data;
+ struct object_info oi = OBJECT_INFO_INIT;
+ void *content;
+ oi.typep = type;
+ oi.sizep = size;
+ oi.contentp = &content;
- if (!find_pack_entry(sha1, &e))
+ if (sha1_object_info_extended(sha1, &oi, 0) < 0)
return NULL;
- data = cache_or_unpack_entry(e.p, e.offset, size, type);
- if (!data) {
- /*
- * We're probably in deep shit, but let's try to fetch
- * the required object anyway from another pack or loose.
- * This should happen only in the presence of a corrupted
- * pack, and is better than failing outright.
- */
- error("failed to read object %s at offset %"PRIuMAX" from %s",
- sha1_to_hex(sha1), (uintmax_t)e.offset, e.p->pack_name);
- mark_bad_packed_object(e.p, sha1);
- data = read_object(sha1, type, size);
- }
- return data;
+ return content;
}
int pretend_sha1_file(void *buf, unsigned long len, enum object_type type,
@@ -3091,20 +1330,6 @@
return 0;
}
-static void *read_object(const unsigned char *sha1, enum object_type *type,
- unsigned long *size)
-{
- struct object_info oi = OBJECT_INFO_INIT;
- void *content;
- oi.typep = type;
- oi.sizep = size;
- oi.contentp = &content;
-
- if (sha1_object_info_extended(sha1, &oi, 0) < 0)
- return NULL;
- return content;
-}
-
/*
* This function dies on corrupt objects; the callers who want to
* deal with them should arrange to call read_object() and give error
@@ -3423,7 +1648,7 @@
}
int hash_sha1_file_literally(const void *buf, unsigned long len, const char *type,
- unsigned char *sha1, unsigned flags)
+ struct object_id *oid, unsigned flags)
{
char *header;
int hdrlen, status = 0;
@@ -3431,13 +1656,13 @@
/* type string, SP, %lu of the length plus NUL must fit this */
hdrlen = strlen(type) + 32;
header = xmalloc(hdrlen);
- write_sha1_file_prepare(buf, len, type, sha1, header, &hdrlen);
+ write_sha1_file_prepare(buf, len, type, oid->hash, header, &hdrlen);
if (!(flags & HASH_WRITE_OBJECT))
goto cleanup;
- if (freshen_packed_object(sha1) || freshen_loose_object(sha1))
+ if (freshen_packed_object(oid->hash) || freshen_loose_object(oid->hash))
goto cleanup;
- status = write_loose_object(sha1, header, hdrlen, buf, len, 0);
+ status = write_loose_object(oid->hash, header, hdrlen, buf, len, 0);
cleanup:
free(header);
@@ -3455,7 +1680,7 @@
if (has_loose_object(sha1))
return 0;
- buf = read_packed_sha1(sha1, &type, &len);
+ buf = read_object(sha1, &type, &len);
if (!buf)
return error("cannot read sha1_file for %s", sha1_to_hex(sha1));
hdrlen = xsnprintf(hdr, sizeof(hdr), "%s %lu", typename(type), len) + 1;
@@ -3465,20 +1690,6 @@
return ret;
}
-int has_pack_index(const unsigned char *sha1)
-{
- struct stat st;
- if (stat(sha1_pack_index_name(sha1), &st))
- return 0;
- return 1;
-}
-
-int has_sha1_pack(const unsigned char *sha1)
-{
- struct pack_entry e;
- return find_pack_entry(sha1, &e);
-}
-
int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
{
if (!startup_info->have_repository)
@@ -3525,7 +1736,7 @@
die("corrupt tag");
}
-static int index_mem(unsigned char *sha1, void *buf, size_t size,
+static int index_mem(struct object_id *oid, void *buf, size_t size,
enum object_type type,
const char *path, unsigned flags)
{
@@ -3541,7 +1752,7 @@
if ((type == OBJ_BLOB) && path) {
struct strbuf nbuf = STRBUF_INIT;
if (convert_to_git(&the_index, path, buf, size, &nbuf,
- write_object ? safe_crlf : SAFE_CRLF_FALSE)) {
+ get_safe_crlf(flags))) {
buf = strbuf_detach(&nbuf, &size);
re_allocated = 1;
}
@@ -3556,15 +1767,15 @@
}
if (write_object)
- ret = write_sha1_file(buf, size, typename(type), sha1);
+ ret = write_sha1_file(buf, size, typename(type), oid->hash);
else
- ret = hash_sha1_file(buf, size, typename(type), sha1);
+ ret = hash_sha1_file(buf, size, typename(type), oid->hash);
if (re_allocated)
free(buf);
return ret;
}
-static int index_stream_convert_blob(unsigned char *sha1, int fd,
+static int index_stream_convert_blob(struct object_id *oid, int fd,
const char *path, unsigned flags)
{
int ret;
@@ -3575,26 +1786,26 @@
assert(would_convert_to_git_filter_fd(path));
convert_to_git_filter_fd(&the_index, path, fd, &sbuf,
- write_object ? safe_crlf : SAFE_CRLF_FALSE);
+ get_safe_crlf(flags));
if (write_object)
ret = write_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
- sha1);
+ oid->hash);
else
ret = hash_sha1_file(sbuf.buf, sbuf.len, typename(OBJ_BLOB),
- sha1);
+ oid->hash);
strbuf_release(&sbuf);
return ret;
}
-static int index_pipe(unsigned char *sha1, int fd, enum object_type type,
+static int index_pipe(struct object_id *oid, int fd, enum object_type type,
const char *path, unsigned flags)
{
struct strbuf sbuf = STRBUF_INIT;
int ret;
if (strbuf_read(&sbuf, fd, 4096) >= 0)
- ret = index_mem(sha1, sbuf.buf, sbuf.len, type, path, flags);
+ ret = index_mem(oid, sbuf.buf, sbuf.len, type, path, flags);
else
ret = -1;
strbuf_release(&sbuf);
@@ -3603,24 +1814,29 @@
#define SMALL_FILE_SIZE (32*1024)
-static int index_core(unsigned char *sha1, int fd, size_t size,
+static int index_core(struct object_id *oid, int fd, size_t size,
enum object_type type, const char *path,
unsigned flags)
{
int ret;
if (!size) {
- ret = index_mem(sha1, "", size, type, path, flags);
+ ret = index_mem(oid, "", size, type, path, flags);
} else if (size <= SMALL_FILE_SIZE) {
char *buf = xmalloc(size);
- if (size == read_in_full(fd, buf, size))
- ret = index_mem(sha1, buf, size, type, path, flags);
+ ssize_t read_result = read_in_full(fd, buf, size);
+ if (read_result < 0)
+ ret = error_errno("read error while indexing %s",
+ path ? path : "<unknown>");
+ else if (read_result != size)
+ ret = error("short read while indexing %s",
+ path ? path : "<unknown>");
else
- ret = error_errno("short read");
+ ret = index_mem(oid, buf, size, type, path, flags);
free(buf);
} else {
void *buf = xmmap(NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
- ret = index_mem(sha1, buf, size, type, path, flags);
+ ret = index_mem(oid, buf, size, type, path, flags);
munmap(buf, size);
}
return ret;
@@ -3641,14 +1857,14 @@
* binary blobs, they generally do not want to get any conversion, and
* callers should avoid this code path when filters are requested.
*/
-static int index_stream(unsigned char *sha1, int fd, size_t size,
+static int index_stream(struct object_id *oid, int fd, size_t size,
enum object_type type, const char *path,
unsigned flags)
{
- return index_bulk_checkin(sha1, fd, size, type, path, flags);
+ return index_bulk_checkin(oid->hash, fd, size, type, path, flags);
}
-int index_fd(unsigned char *sha1, int fd, struct stat *st,
+int index_fd(struct object_id *oid, int fd, struct stat *st,
enum object_type type, const char *path, unsigned flags)
{
int ret;
@@ -3658,31 +1874,32 @@
* die() for large files.
*/
if (type == OBJ_BLOB && path && would_convert_to_git_filter_fd(path))
- ret = index_stream_convert_blob(sha1, fd, path, flags);
+ ret = index_stream_convert_blob(oid, fd, path, flags);
else if (!S_ISREG(st->st_mode))
- ret = index_pipe(sha1, fd, type, path, flags);
+ ret = index_pipe(oid, fd, type, path, flags);
else if (st->st_size <= big_file_threshold || type != OBJ_BLOB ||
(path && would_convert_to_git(&the_index, path)))
- ret = index_core(sha1, fd, xsize_t(st->st_size), type, path,
+ ret = index_core(oid, fd, xsize_t(st->st_size), type, path,
flags);
else
- ret = index_stream(sha1, fd, xsize_t(st->st_size), type, path,
+ ret = index_stream(oid, fd, xsize_t(st->st_size), type, path,
flags);
close(fd);
return ret;
}
-int index_path(unsigned char *sha1, const char *path, struct stat *st, unsigned flags)
+int index_path(struct object_id *oid, const char *path, struct stat *st, unsigned flags)
{
int fd;
struct strbuf sb = STRBUF_INIT;
+ int rc = 0;
switch (st->st_mode & S_IFMT) {
case S_IFREG:
fd = open(path, O_RDONLY);
if (fd < 0)
return error_errno("open(\"%s\")", path);
- if (index_fd(sha1, fd, st, OBJ_BLOB, path, flags) < 0)
+ if (index_fd(oid, fd, st, OBJ_BLOB, path, flags) < 0)
return error("%s: failed to insert into database",
path);
break;
@@ -3690,18 +1907,17 @@
if (strbuf_readlink(&sb, path, st->st_size))
return error_errno("readlink(\"%s\")", path);
if (!(flags & HASH_WRITE_OBJECT))
- hash_sha1_file(sb.buf, sb.len, blob_type, sha1);
- else if (write_sha1_file(sb.buf, sb.len, blob_type, sha1))
- return error("%s: failed to insert into database",
- path);
+ hash_sha1_file(sb.buf, sb.len, blob_type, oid->hash);
+ else if (write_sha1_file(sb.buf, sb.len, blob_type, oid->hash))
+ rc = error("%s: failed to insert into database", path);
strbuf_release(&sb);
break;
case S_IFDIR:
- return resolve_gitlink_ref(path, "HEAD", sha1);
+ return resolve_gitlink_ref(path, "HEAD", oid);
default:
return error("%s: unsupported file type", path);
}
- return 0;
+ return rc;
}
int read_pack_header(int fd, struct pack_header *header)
@@ -3740,6 +1956,7 @@
DIR *dir;
struct dirent *de;
int r = 0;
+ struct object_id oid;
if (subdir_nr > 0xff)
BUG("invalid loose object subdirectory: %x", subdir_nr);
@@ -3747,7 +1964,6 @@
origlen = path->len;
strbuf_complete(path, '/');
strbuf_addf(path, "%02x", subdir_nr);
- baselen = path->len;
dir = opendir(path->buf);
if (!dir) {
@@ -3757,27 +1973,27 @@
return r;
}
+ oid.hash[0] = subdir_nr;
+ strbuf_addch(path, '/');
+ baselen = path->len;
+
while ((de = readdir(dir))) {
+ size_t namelen;
if (is_dot_or_dotdot(de->d_name))
continue;
+ namelen = strlen(de->d_name);
strbuf_setlen(path, baselen);
- strbuf_addf(path, "/%s", de->d_name);
-
- if (strlen(de->d_name) == GIT_SHA1_HEXSZ - 2) {
- char hex[GIT_MAX_HEXSZ+1];
- struct object_id oid;
-
- xsnprintf(hex, sizeof(hex), "%02x%s",
- subdir_nr, de->d_name);
- if (!get_oid_hex(hex, &oid)) {
- if (obj_cb) {
- r = obj_cb(&oid, path->buf, data);
- if (r)
- break;
- }
- continue;
+ strbuf_add(path, de->d_name, namelen);
+ if (namelen == GIT_SHA1_HEXSZ - 2 &&
+ !hex_to_bytes(oid.hash + 1, de->d_name,
+ GIT_SHA1_RAWSZ - 1)) {
+ if (obj_cb) {
+ r = obj_cb(&oid, path->buf, data);
+ if (r)
+ break;
}
+ continue;
}
if (cruft_cb) {
@@ -3788,7 +2004,7 @@
}
closedir(dir);
- strbuf_setlen(path, baselen);
+ strbuf_setlen(path, baselen - 1);
if (!r && subdir_cb)
r = subdir_cb(subdir_nr, path->buf, data);
@@ -3871,46 +2087,6 @@
return foreach_alt_odb(loose_from_alt_odb, &alt);
}
-static int for_each_object_in_pack(struct packed_git *p, each_packed_object_fn cb, void *data)
-{
- uint32_t i;
- int r = 0;
-
- for (i = 0; i < p->num_objects; i++) {
- struct object_id oid;
-
- if (!nth_packed_object_oid(&oid, p, i))
- return error("unable to get sha1 of object %u in %s",
- i, p->pack_name);
-
- r = cb(&oid, p, i, data);
- if (r)
- break;
- }
- return r;
-}
-
-int for_each_packed_object(each_packed_object_fn cb, void *data, unsigned flags)
-{
- struct packed_git *p;
- int r = 0;
- int pack_errors = 0;
-
- prepare_packed_git();
- for (p = packed_git; p; p = p->next) {
- if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
- continue;
- if (open_pack_index(p)) {
- pack_errors = 1;
- continue;
- }
- r = for_each_object_in_pack(p, cb, data);
- if (r)
- break;
- }
- return r ? r : pack_errors;
-}
-
static int check_stream_sha1(git_zstream *stream,
const char *hdr,
unsigned long size,
diff --git a/sha1_name.c b/sha1_name.c
index 74fcb6d..611c7d2 100644
--- a/sha1_name.c
+++ b/sha1_name.c
@@ -9,8 +9,9 @@
#include "remote.h"
#include "dir.h"
#include "sha1-array.h"
+#include "packfile.h"
-static int get_sha1_oneline(const char *, unsigned char *, struct commit_list *);
+static int get_oid_oneline(const char *, struct object_id *, struct commit_list *);
typedef int (*disambiguate_hint_fn)(const struct object_id *, void *);
@@ -152,11 +153,13 @@
uint32_t num, last, i, first = 0;
const struct object_id *current = NULL;
- open_pack_index(p);
+ if (open_pack_index(p) || !p->num_objects)
+ return;
+
num = p->num_objects;
last = num;
while (first < last) {
- uint32_t mid = (first + last) / 2;
+ uint32_t mid = first + (last - first) / 2;
const unsigned char *current;
int cmp;
@@ -200,7 +203,7 @@
#define SHORT_NAME_AMBIGUOUS (-2)
static int finish_object_disambiguation(struct disambiguate_state *ds,
- unsigned char *sha1)
+ struct object_id *oid)
{
if (ds->ambiguous)
return SHORT_NAME_AMBIGUOUS;
@@ -229,7 +232,7 @@
if (!ds->candidate_ok)
return SHORT_NAME_AMBIGUOUS;
- hashcpy(sha1, ds->candidate.hash);
+ oidcpy(oid, &ds->candidate);
return 0;
}
@@ -385,35 +388,35 @@
return 0;
}
-static int get_short_sha1(const char *name, int len, unsigned char *sha1,
+static int get_short_oid(const char *name, int len, struct object_id *oid,
unsigned flags)
{
int status;
struct disambiguate_state ds;
- int quietly = !!(flags & GET_SHA1_QUIETLY);
+ int quietly = !!(flags & GET_OID_QUIETLY);
if (init_object_disambiguation(name, len, &ds) < 0)
return -1;
- if (HAS_MULTI_BITS(flags & GET_SHA1_DISAMBIGUATORS))
- die("BUG: multiple get_short_sha1 disambiguator flags");
+ if (HAS_MULTI_BITS(flags & GET_OID_DISAMBIGUATORS))
+ die("BUG: multiple get_short_oid disambiguator flags");
- if (flags & GET_SHA1_COMMIT)
+ if (flags & GET_OID_COMMIT)
ds.fn = disambiguate_commit_only;
- else if (flags & GET_SHA1_COMMITTISH)
+ else if (flags & GET_OID_COMMITTISH)
ds.fn = disambiguate_committish_only;
- else if (flags & GET_SHA1_TREE)
+ else if (flags & GET_OID_TREE)
ds.fn = disambiguate_tree_only;
- else if (flags & GET_SHA1_TREEISH)
+ else if (flags & GET_OID_TREEISH)
ds.fn = disambiguate_treeish_only;
- else if (flags & GET_SHA1_BLOB)
+ else if (flags & GET_OID_BLOB)
ds.fn = disambiguate_blob_only;
else
ds.fn = default_disambiguate_hint;
find_short_object_filename(&ds);
find_short_packed_object(&ds);
- status = finish_object_disambiguation(&ds, sha1);
+ status = finish_object_disambiguation(&ds, oid);
if (!quietly && (status == SHORT_NAME_AMBIGUOUS)) {
error(_("short SHA1 %s is ambiguous"), ds.hex_pfx);
@@ -473,10 +476,104 @@
return r;
}
+struct min_abbrev_data {
+ unsigned int init_len;
+ unsigned int cur_len;
+ char *hex;
+ const unsigned char *hash;
+};
+
+static inline char get_hex_char_from_oid(const struct object_id *oid,
+ unsigned int pos)
+{
+ static const char hex[] = "0123456789abcdef";
+
+ if ((pos & 1) == 0)
+ return hex[oid->hash[pos >> 1] >> 4];
+ else
+ return hex[oid->hash[pos >> 1] & 0xf];
+}
+
+static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
+{
+ struct min_abbrev_data *mad = cb_data;
+
+ unsigned int i = mad->init_len;
+ while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
+ i++;
+
+ if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)
+ mad->cur_len = i + 1;
+
+ return 0;
+}
+
+static void find_abbrev_len_for_pack(struct packed_git *p,
+ struct min_abbrev_data *mad)
+{
+ int match = 0;
+ uint32_t num, last, first = 0;
+ struct object_id oid;
+
+ if (open_pack_index(p) || !p->num_objects)
+ return;
+
+ num = p->num_objects;
+ last = num;
+ while (first < last) {
+ uint32_t mid = first + (last - first) / 2;
+ const unsigned char *current;
+ int cmp;
+
+ current = nth_packed_object_sha1(p, mid);
+ cmp = hashcmp(mad->hash, current);
+ if (!cmp) {
+ match = 1;
+ first = mid;
+ break;
+ }
+ if (cmp > 0) {
+ first = mid + 1;
+ continue;
+ }
+ last = mid;
+ }
+
+ /*
+ * first is now the position in the packfile where we would insert
+ * mad->hash if it does not exist (or the position of mad->hash if
+ * it does exist). Hence, we consider a maximum of three objects
+ * nearby for the abbreviation length.
+ */
+ mad->init_len = 0;
+ if (!match) {
+ nth_packed_object_oid(&oid, p, first);
+ extend_abbrev_len(&oid, mad);
+ } else if (first < num - 1) {
+ nth_packed_object_oid(&oid, p, first + 1);
+ extend_abbrev_len(&oid, mad);
+ }
+ if (first > 0) {
+ nth_packed_object_oid(&oid, p, first - 1);
+ extend_abbrev_len(&oid, mad);
+ }
+ mad->init_len = mad->cur_len;
+}
+
+static void find_abbrev_len_packed(struct min_abbrev_data *mad)
+{
+ struct packed_git *p;
+
+ prepare_packed_git();
+ for (p = packed_git; p; p = p->next)
+ find_abbrev_len_for_pack(p, mad);
+}
+
int find_unique_abbrev_r(char *hex, const unsigned char *sha1, int len)
{
- int status, exists;
-
+ struct disambiguate_state ds;
+ struct min_abbrev_data mad;
+ struct object_id oid_ret;
if (len < 0) {
unsigned long count = approximate_object_count();
/*
@@ -500,21 +597,28 @@
}
sha1_to_hex_r(hex, sha1);
- if (len == 40 || !len)
- return 40;
- exists = has_sha1_file(sha1);
- while (len < 40) {
- unsigned char sha1_ret[20];
- status = get_short_sha1(hex, len, sha1_ret, GET_SHA1_QUIETLY);
- if (exists
- ? !status
- : status == SHORT_NAME_NOT_FOUND) {
- hex[len] = 0;
- return len;
- }
- len++;
- }
- return len;
+ if (len == GIT_SHA1_HEXSZ || !len)
+ return GIT_SHA1_HEXSZ;
+
+ mad.init_len = len;
+ mad.cur_len = len;
+ mad.hex = hex;
+ mad.hash = sha1;
+
+ find_abbrev_len_packed(&mad);
+
+ if (init_object_disambiguation(hex, mad.cur_len, &ds) < 0)
+ return -1;
+
+ ds.fn = extend_abbrev_len;
+ ds.always_call_fn = 1;
+ ds.cb_data = (void *)&mad;
+
+ find_short_object_filename(&ds);
+ (void)finish_object_disambiguation(&ds, &oid_ret);
+
+ hex[mad.cur_len] = 0;
+ return mad.cur_len;
}
const char *find_unique_abbrev(const unsigned char *sha1, int len)
@@ -578,10 +682,10 @@
return at_mark(string, len, suffix, ARRAY_SIZE(suffix));
}
-static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags);
+static int get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags);
static int interpret_nth_prior_checkout(const char *name, int namelen, struct strbuf *buf);
-static int get_sha1_basic(const char *str, int len, unsigned char *sha1,
+static int get_oid_basic(const char *str, int len, struct object_id *oid,
unsigned int flags)
{
static const char *warn_msg = "refname '%.*s' is ambiguous.";
@@ -595,14 +699,14 @@
"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\"");
- unsigned char tmp_sha1[20];
+ struct object_id tmp_oid;
char *real_ref = NULL;
int refs_found = 0;
int at, reflog_len, nth_prior = 0;
- if (len == 40 && !get_sha1_hex(str, sha1)) {
+ if (len == GIT_SHA1_HEXSZ && !get_oid_hex(str, oid)) {
if (warn_ambiguous_refs && warn_on_object_refname_ambiguity) {
- refs_found = dwim_ref(str, len, tmp_sha1, &real_ref);
+ refs_found = dwim_ref(str, len, &tmp_oid, &real_ref);
if (refs_found > 0) {
warning(warn_msg, len, str);
if (advice_object_name_warning)
@@ -644,7 +748,7 @@
int detached;
if (interpret_nth_prior_checkout(str, len, &buf) > 0) {
- detached = (buf.len == 40 && !get_sha1_hex(buf.buf, sha1));
+ detached = (buf.len == GIT_SHA1_HEXSZ && !get_oid_hex(buf.buf, oid));
strbuf_release(&buf);
if (detached)
return 0;
@@ -653,18 +757,18 @@
if (!len && reflog_len)
/* allow "@{...}" to mean the current branch reflog */
- refs_found = dwim_ref("HEAD", 4, sha1, &real_ref);
+ refs_found = dwim_ref("HEAD", 4, oid, &real_ref);
else if (reflog_len)
- refs_found = dwim_log(str, len, sha1, &real_ref);
+ refs_found = dwim_log(str, len, oid, &real_ref);
else
- refs_found = dwim_ref(str, len, sha1, &real_ref);
+ refs_found = dwim_ref(str, len, oid, &real_ref);
if (!refs_found)
return -1;
- if (warn_ambiguous_refs && !(flags & GET_SHA1_QUIETLY) &&
+ if (warn_ambiguous_refs && !(flags & GET_OID_QUIETLY) &&
(refs_found > 1 ||
- !get_short_sha1(str, len, tmp_sha1, GET_SHA1_QUIETLY)))
+ !get_short_oid(str, len, &tmp_oid, GET_OID_QUIETLY)))
warning(warn_msg, len, str);
if (reflog_len) {
@@ -696,7 +800,7 @@
return -1;
}
}
- if (read_ref_at(real_ref, flags, at_time, nth, sha1, NULL,
+ if (read_ref_at(real_ref, flags, at_time, nth, oid, NULL,
&co_time, &co_tz, &co_cnt)) {
if (!len) {
if (starts_with(real_ref, "refs/heads/")) {
@@ -709,13 +813,13 @@
}
}
if (at_time) {
- if (!(flags & GET_SHA1_QUIETLY)) {
+ if (!(flags & GET_OID_QUIETLY)) {
warning("Log for '%.*s' only goes "
"back to %s.", len, str,
show_date(co_time, co_tz, DATE_MODE(RFC2822)));
}
} else {
- if (flags & GET_SHA1_QUIETLY) {
+ if (flags & GET_OID_QUIETLY) {
exit(128);
}
die("Log for '%.*s' only has %d entries.",
@@ -729,10 +833,10 @@
}
static int get_parent(const char *name, int len,
- unsigned char *result, int idx)
+ struct object_id *result, int idx)
{
struct object_id oid;
- int ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);
+ int ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
struct commit *commit;
struct commit_list *p;
@@ -742,13 +846,13 @@
if (parse_commit(commit))
return -1;
if (!idx) {
- hashcpy(result, commit->object.oid.hash);
+ oidcpy(result, &commit->object.oid);
return 0;
}
p = commit->parents;
while (p) {
if (!--idx) {
- hashcpy(result, p->item->object.oid.hash);
+ oidcpy(result, &p->item->object.oid);
return 0;
}
p = p->next;
@@ -757,13 +861,13 @@
}
static int get_nth_ancestor(const char *name, int len,
- unsigned char *result, int generation)
+ struct object_id *result, int generation)
{
struct object_id oid;
struct commit *commit;
int ret;
- ret = get_sha1_1(name, len, oid.hash, GET_SHA1_COMMITTISH);
+ ret = get_oid_1(name, len, &oid, GET_OID_COMMITTISH);
if (ret)
return ret;
commit = lookup_commit_reference(&oid);
@@ -775,7 +879,7 @@
return -1;
commit = commit->parents->item;
}
- hashcpy(result, commit->object.oid.hash);
+ oidcpy(result, &commit->object.oid);
return 0;
}
@@ -804,7 +908,7 @@
}
}
-static int peel_onion(const char *name, int len, unsigned char *sha1,
+static int peel_onion(const char *name, int len, struct object_id *oid,
unsigned lookup_flags)
{
struct object_id outer;
@@ -849,13 +953,13 @@
else
return -1;
- lookup_flags &= ~GET_SHA1_DISAMBIGUATORS;
+ lookup_flags &= ~GET_OID_DISAMBIGUATORS;
if (expected_type == OBJ_COMMIT)
- lookup_flags |= GET_SHA1_COMMITTISH;
+ lookup_flags |= GET_OID_COMMITTISH;
else if (expected_type == OBJ_TREE)
- lookup_flags |= GET_SHA1_TREEISH;
+ lookup_flags |= GET_OID_TREEISH;
- if (get_sha1_1(name, sp - name - 2, outer.hash, lookup_flags))
+ if (get_oid_1(name, sp - name - 2, &outer, lookup_flags))
return -1;
o = parse_object(&outer);
@@ -865,7 +969,7 @@
o = deref_tag(o, name, sp - name - 2);
if (!o || (!o->parsed && !parse_object(&o->oid)))
return -1;
- hashcpy(sha1, o->oid.hash);
+ oidcpy(oid, &o->oid);
return 0;
}
@@ -878,7 +982,7 @@
if (!o)
return -1;
- hashcpy(sha1, o->oid.hash);
+ oidcpy(oid, &o->oid);
if (sp[0] == '/') {
/* "$commit^{/foo}" */
char *prefix;
@@ -894,17 +998,17 @@
prefix = xstrndup(sp + 1, name + len - 1 - (sp + 1));
commit_list_insert((struct commit *)o, &list);
- ret = get_sha1_oneline(prefix, sha1, list);
+ ret = get_oid_oneline(prefix, oid, list);
free(prefix);
return ret;
}
return 0;
}
-static int get_describe_name(const char *name, int len, unsigned char *sha1)
+static int get_describe_name(const char *name, int len, struct object_id *oid)
{
const char *cp;
- unsigned flags = GET_SHA1_QUIETLY | GET_SHA1_COMMIT;
+ unsigned flags = GET_OID_QUIETLY | GET_OID_COMMIT;
for (cp = name + len - 1; name + 2 <= cp; cp--) {
char ch = *cp;
@@ -915,14 +1019,14 @@
if (ch == 'g' && cp[-1] == '-') {
cp++;
len -= cp - name;
- return get_short_sha1(cp, len, sha1, flags);
+ return get_short_oid(cp, len, oid, flags);
}
}
}
return -1;
}
-static int get_sha1_1(const char *name, int len, unsigned char *sha1, unsigned lookup_flags)
+static int get_oid_1(const char *name, int len, struct object_id *oid, unsigned lookup_flags)
{
int ret, has_suffix;
const char *cp;
@@ -949,25 +1053,25 @@
if (!num && len1 == len - 1)
num = 1;
if (has_suffix == '^')
- return get_parent(name, len1, sha1, num);
+ return get_parent(name, len1, oid, num);
/* else if (has_suffix == '~') -- goes without saying */
- return get_nth_ancestor(name, len1, sha1, num);
+ return get_nth_ancestor(name, len1, oid, num);
}
- ret = peel_onion(name, len, sha1, lookup_flags);
+ ret = peel_onion(name, len, oid, lookup_flags);
if (!ret)
return 0;
- ret = get_sha1_basic(name, len, sha1, lookup_flags);
+ ret = get_oid_basic(name, len, oid, lookup_flags);
if (!ret)
return 0;
/* It could be describe output that is "SOMETHING-gXXXX" */
- ret = get_describe_name(name, len, sha1);
+ ret = get_describe_name(name, len, oid);
if (!ret)
return 0;
- return get_short_sha1(name, len, sha1, lookup_flags);
+ return get_short_oid(name, len, oid, lookup_flags);
}
/*
@@ -1004,7 +1108,7 @@
return 0;
}
-static int get_sha1_oneline(const char *prefix, unsigned char *sha1,
+static int get_oid_oneline(const char *prefix, struct object_id *oid,
struct commit_list *list)
{
struct commit_list *backup = NULL, *l;
@@ -1044,7 +1148,7 @@
unuse_commit_buffer(commit, buf);
if (matches) {
- hashcpy(sha1, commit->object.oid.hash);
+ oidcpy(oid, &commit->object.oid);
found = 1;
break;
}
@@ -1140,7 +1244,7 @@
struct strbuf sb;
strbuf_init(&sb, dots - name);
strbuf_add(&sb, name, dots - name);
- st = get_sha1_committish(sb.buf, oid_tmp.hash);
+ st = get_oid_committish(sb.buf, &oid_tmp);
strbuf_release(&sb);
}
if (st)
@@ -1149,7 +1253,7 @@
if (!one)
return -1;
- if (get_sha1_committish(dots[3] ? (dots + 3) : "HEAD", oid_tmp.hash))
+ if (get_oid_committish(dots[3] ? (dots + 3) : "HEAD", &oid_tmp))
return -1;
two = lookup_commit_reference_gently(&oid_tmp, 0);
if (!two)
@@ -1330,29 +1434,34 @@
int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
{
- strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
- if (name[0] == '-')
- return -1;
+ if (startup_info->have_repository)
+ strbuf_branchname(sb, name, INTERPRET_BRANCH_LOCAL);
+ else
+ strbuf_addstr(sb, name);
+
+ /*
+ * This splice must be done even if we end up rejecting the
+ * name; builtin/branch.c::copy_or_rename_branch() still wants
+ * to see what the name expanded to so that "branch -m" can be
+ * used as a tool to correct earlier mistakes.
+ */
strbuf_splice(sb, 0, 0, "refs/heads/", 11);
+
+ if (*name == '-' ||
+ !strcmp(sb->buf, "refs/heads/HEAD"))
+ return -1;
+
return check_refname_format(sb->buf, 0);
}
/*
- * This is like "get_sha1_basic()", except it allows "sha1 expressions",
+ * This is like "get_oid_basic()", except it allows "object ID expressions",
* notably "xyz^" for "parent of xyz"
*/
-int get_sha1(const char *name, unsigned char *sha1)
-{
- struct object_context unused;
- return get_sha1_with_context(name, 0, sha1, &unused);
-}
-
-/*
- * This is like "get_sha1()", but for struct object_id.
- */
int get_oid(const char *name, struct object_id *oid)
{
- return get_sha1(name, oid->hash);
+ struct object_context unused;
+ return get_oid_with_context(name, 0, oid, &unused);
}
@@ -1366,49 +1475,49 @@
* commit-ish. It is merely to give a hint to the disambiguation
* machinery.
*/
-int get_sha1_committish(const char *name, unsigned char *sha1)
+int get_oid_committish(const char *name, struct object_id *oid)
{
struct object_context unused;
- return get_sha1_with_context(name, GET_SHA1_COMMITTISH,
- sha1, &unused);
+ return get_oid_with_context(name, GET_OID_COMMITTISH,
+ oid, &unused);
}
-int get_sha1_treeish(const char *name, unsigned char *sha1)
+int get_oid_treeish(const char *name, struct object_id *oid)
{
struct object_context unused;
- return get_sha1_with_context(name, GET_SHA1_TREEISH,
- sha1, &unused);
+ return get_oid_with_context(name, GET_OID_TREEISH,
+ oid, &unused);
}
-int get_sha1_commit(const char *name, unsigned char *sha1)
+int get_oid_commit(const char *name, struct object_id *oid)
{
struct object_context unused;
- return get_sha1_with_context(name, GET_SHA1_COMMIT,
- sha1, &unused);
+ return get_oid_with_context(name, GET_OID_COMMIT,
+ oid, &unused);
}
-int get_sha1_tree(const char *name, unsigned char *sha1)
+int get_oid_tree(const char *name, struct object_id *oid)
{
struct object_context unused;
- return get_sha1_with_context(name, GET_SHA1_TREE,
- sha1, &unused);
+ return get_oid_with_context(name, GET_OID_TREE,
+ oid, &unused);
}
-int get_sha1_blob(const char *name, unsigned char *sha1)
+int get_oid_blob(const char *name, struct object_id *oid)
{
struct object_context unused;
- return get_sha1_with_context(name, GET_SHA1_BLOB,
- sha1, &unused);
+ return get_oid_with_context(name, GET_OID_BLOB,
+ oid, &unused);
}
/* Must be called only when object_name:filename doesn't exist. */
-static void diagnose_invalid_sha1_path(const char *prefix,
- const char *filename,
- const unsigned char *tree_sha1,
- const char *object_name,
- int object_name_len)
+static void diagnose_invalid_oid_path(const char *prefix,
+ const char *filename,
+ const struct object_id *tree_oid,
+ const char *object_name,
+ int object_name_len)
{
- unsigned char sha1[20];
+ struct object_id oid;
unsigned mode;
if (!prefix)
@@ -1420,8 +1529,8 @@
if (is_missing_file_error(errno)) {
char *fullname = xstrfmt("%s%s", prefix, filename);
- if (!get_tree_entry(tree_sha1, fullname,
- sha1, &mode)) {
+ if (!get_tree_entry(tree_oid->hash, fullname,
+ oid.hash, &mode)) {
die("Path '%s' exists, but not '%s'.\n"
"Did you mean '%.*s:%s' aka '%.*s:./%s'?",
fullname,
@@ -1504,24 +1613,24 @@
rel);
}
-static int get_sha1_with_context_1(const char *name,
- unsigned flags,
- const char *prefix,
- unsigned char *sha1,
- struct object_context *oc)
+static int get_oid_with_context_1(const char *name,
+ unsigned flags,
+ const char *prefix,
+ struct object_id *oid,
+ struct object_context *oc)
{
int ret, bracket_depth;
int namelen = strlen(name);
const char *cp;
- int only_to_die = flags & GET_SHA1_ONLY_TO_DIE;
+ int only_to_die = flags & GET_OID_ONLY_TO_DIE;
if (only_to_die)
- flags |= GET_SHA1_QUIETLY;
+ flags |= GET_OID_QUIETLY;
memset(oc, 0, sizeof(*oc));
oc->mode = S_IFINVALID;
strbuf_init(&oc->symlink_path, 0);
- ret = get_sha1_1(name, namelen, sha1, flags);
+ ret = get_oid_1(name, namelen, oid, flags);
if (!ret)
return ret;
/*
@@ -1541,7 +1650,7 @@
for_each_ref(handle_one_ref, &list);
commit_list_sort_by_date(&list);
- return get_sha1_oneline(name + 2, sha1, list);
+ return get_oid_oneline(name + 2, oid, list);
}
if (namelen < 3 ||
name[2] != ':' ||
@@ -1559,7 +1668,7 @@
namelen = strlen(cp);
}
- if (flags & GET_SHA1_RECORD_PATH)
+ if (flags & GET_OID_RECORD_PATH)
oc->path = xstrdup(cp);
if (!active_cache)
@@ -1573,7 +1682,7 @@
memcmp(ce->name, cp, namelen))
break;
if (ce_stage(ce) == stage) {
- hashcpy(sha1, ce->oid.hash);
+ oidcpy(oid, &ce->oid);
oc->mode = ce->ce_mode;
free(new_path);
return 0;
@@ -1594,36 +1703,36 @@
break;
}
if (*cp == ':') {
- unsigned char tree_sha1[20];
+ struct object_id tree_oid;
int len = cp - name;
unsigned sub_flags = flags;
- sub_flags &= ~GET_SHA1_DISAMBIGUATORS;
- sub_flags |= GET_SHA1_TREEISH;
+ sub_flags &= ~GET_OID_DISAMBIGUATORS;
+ sub_flags |= GET_OID_TREEISH;
- if (!get_sha1_1(name, len, tree_sha1, sub_flags)) {
+ if (!get_oid_1(name, len, &tree_oid, sub_flags)) {
const char *filename = cp+1;
char *new_filename = NULL;
new_filename = resolve_relative_path(filename);
if (new_filename)
filename = new_filename;
- if (flags & GET_SHA1_FOLLOW_SYMLINKS) {
- ret = get_tree_entry_follow_symlinks(tree_sha1,
- filename, sha1, &oc->symlink_path,
+ if (flags & GET_OID_FOLLOW_SYMLINKS) {
+ ret = get_tree_entry_follow_symlinks(tree_oid.hash,
+ filename, oid->hash, &oc->symlink_path,
&oc->mode);
} else {
- ret = get_tree_entry(tree_sha1, filename,
- sha1, &oc->mode);
+ ret = get_tree_entry(tree_oid.hash, filename,
+ oid->hash, &oc->mode);
if (ret && only_to_die) {
- diagnose_invalid_sha1_path(prefix,
+ diagnose_invalid_oid_path(prefix,
filename,
- tree_sha1,
+ &tree_oid,
name, len);
}
}
- hashcpy(oc->tree, tree_sha1);
- if (flags & GET_SHA1_RECORD_PATH)
+ hashcpy(oc->tree, tree_oid.hash);
+ if (flags & GET_OID_RECORD_PATH)
oc->path = xstrdup(filename);
free(new_filename);
@@ -1646,13 +1755,13 @@
void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
{
struct object_context oc;
- unsigned char sha1[20];
- get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
+ struct object_id oid;
+ get_oid_with_context_1(name, GET_OID_ONLY_TO_DIE, prefix, &oid, &oc);
}
-int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc)
+int get_oid_with_context(const char *str, unsigned flags, struct object_id *oid, struct object_context *oc)
{
- if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
+ if (flags & GET_OID_FOLLOW_SYMLINKS && flags & GET_OID_ONLY_TO_DIE)
die("BUG: incompatible flags for get_sha1_with_context");
- return get_sha1_with_context_1(str, flags, NULL, sha1, oc);
+ return get_oid_with_context_1(str, flags, NULL, oid, oc);
}
diff --git a/sha1dc_git.c b/sha1dc_git.c
index 4d32b4f..e0cc9d9 100644
--- a/sha1dc_git.c
+++ b/sha1dc_git.c
@@ -1,8 +1,19 @@
-/*
- * This code is included at the end of sha1dc/sha1.c with the
- * SHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_C macro.
- */
+#include "cache.h"
+#ifdef DC_SHA1_EXTERNAL
+/*
+ * Same as SHA1DCInit, but with default save_hash=0
+ */
+void git_SHA1DCInit(SHA1_CTX *ctx)
+{
+ SHA1DCInit(ctx);
+ SHA1DCSetSafeHash(ctx, 0);
+}
+#endif
+
+/*
+ * Same as SHA1DCFinal, but convert collision attack case into a verbose die().
+ */
void git_SHA1DCFinal(unsigned char hash[20], SHA1_CTX *ctx)
{
if (!SHA1DCFinal(hash, ctx))
@@ -11,6 +22,9 @@
sha1_to_hex(hash));
}
+/*
+ * Same as SHA1DCUpdate, but adjust types to match git's usual interface.
+ */
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *vdata, unsigned long len)
{
const char *data = vdata;
diff --git a/sha1dc_git.h b/sha1dc_git.h
index a8a5c1d..a8c2729 100644
--- a/sha1dc_git.h
+++ b/sha1dc_git.h
@@ -1,19 +1,23 @@
-/*
- * This code is included at the end of sha1dc/sha1.h with the
- * SHA1DC_CUSTOM_TRAILING_INCLUDE_SHA1_H macro.
- */
+/* Plumbing with collition-detecting SHA1 code */
-/*
- * Same as SHA1DCFinal, but convert collision attack case into a verbose die().
- */
+#ifdef DC_SHA1_SUBMODULE
+#include "sha1collisiondetection/lib/sha1.h"
+#elif defined(DC_SHA1_EXTERNAL)
+#include <sha1dc/sha1.h>
+#else
+#include "sha1dc/sha1.h"
+#endif
+
+#ifdef DC_SHA1_EXTERNAL
+void git_SHA1DCInit(SHA1_CTX *);
+#else
+#define git_SHA1DCInit SHA1DCInit
+#endif
+
void git_SHA1DCFinal(unsigned char [20], SHA1_CTX *);
-
-/*
- * Same as SHA1DCUpdate, but adjust types to match git's usual interface.
- */
void git_SHA1DCUpdate(SHA1_CTX *ctx, const void *data, unsigned long len);
#define platform_SHA_CTX SHA1_CTX
-#define platform_SHA1_Init SHA1DCInit
+#define platform_SHA1_Init git_SHA1DCInit
#define platform_SHA1_Update git_SHA1DCUpdate
#define platform_SHA1_Final git_SHA1DCFinal
diff --git a/shallow.c b/shallow.c
index e8429a9..df4d44e 100644
--- a/shallow.c
+++ b/shallow.c
@@ -99,7 +99,7 @@
cur_depth = 0;
} else {
commit = (struct commit *)
- stack.objects[--stack.nr].item;
+ object_array_pop(&stack);
cur_depth = *(int *)commit->util;
}
}
@@ -107,7 +107,7 @@
cur_depth++;
if ((depth != INFINITE_DEPTH && cur_depth >= depth) ||
(is_repository_shallow() && !commit->parents &&
- (graft = lookup_commit_graft(commit->object.oid.hash)) != NULL &&
+ (graft = lookup_commit_graft(&commit->object.oid)) != NULL &&
graft->nr_parent < 0)) {
commit_list_insert(commit, &result);
commit->object.flags |= shallow_flag;
@@ -286,28 +286,26 @@
return write_shallow_commits_1(out, use_pack_protocol, extra, 0);
}
-static struct tempfile temporary_shallow;
-
const char *setup_temporary_shallow(const struct oid_array *extra)
{
+ struct tempfile *temp;
struct strbuf sb = STRBUF_INIT;
- int fd;
if (write_shallow_commits(&sb, 0, extra)) {
- fd = xmks_tempfile(&temporary_shallow, git_path("shallow_XXXXXX"));
+ temp = xmks_tempfile(git_path("shallow_XXXXXX"));
- if (write_in_full(fd, sb.buf, sb.len) < 0)
+ if (write_in_full(temp->fd, sb.buf, sb.len) < 0 ||
+ close_tempfile_gently(temp) < 0)
die_errno("failed to write to %s",
- get_tempfile_path(&temporary_shallow));
- close_tempfile(&temporary_shallow);
+ get_tempfile_path(temp));
strbuf_release(&sb);
- return get_tempfile_path(&temporary_shallow);
+ return get_tempfile_path(temp);
}
/*
* is_repository_shallow() sees empty string as "no shallow
* file".
*/
- return get_tempfile_path(&temporary_shallow);
+ return "";
}
void setup_alternate_shallow(struct lock_file *shallow_lock,
@@ -398,7 +396,7 @@
for (i = 0; i < sa->nr; i++) {
if (has_object_file(sa->oid + i)) {
struct commit_graft *graft;
- graft = lookup_commit_graft(sa->oid[i].hash);
+ graft = lookup_commit_graft(&sa->oid[i]);
if (graft && graft->nr_parent < 0)
continue;
info->ours[info->nr_ours++] = i;
diff --git a/sideband.c b/sideband.c
index 1e4d684..6d7f943 100644
--- a/sideband.c
+++ b/sideband.c
@@ -20,13 +20,12 @@
int recv_sideband(const char *me, int in_stream, int out)
{
- const char *term, *suffix;
+ const char *suffix;
char buf[LARGE_PACKET_MAX + 1];
struct strbuf outbuf = STRBUF_INIT;
int retval = 0;
- term = getenv("TERM");
- if (isatty(2) && term && strcmp(term, "dumb"))
+ if (isatty(2) && !is_terminal_dumb())
suffix = ANSI_SUFFIX;
else
suffix = DUMB_SUFFIX;
diff --git a/split-index.c b/split-index.c
index 83e39ec..284d04d 100644
--- a/split-index.c
+++ b/split-index.c
@@ -238,6 +238,8 @@
ALLOC_GROW(entries, nr_entries+1, nr_alloc);
entries[nr_entries++] = ce;
}
+ if (is_null_oid(&ce->oid))
+ istate->drop_cache_tree = 1;
}
}
diff --git a/strbuf.c b/strbuf.c
index 323c49c..1df674e 100644
--- a/strbuf.c
+++ b/strbuf.c
@@ -11,6 +11,28 @@
return 0;
}
+int skip_to_optional_arg_default(const char *str, const char *prefix,
+ const char **arg, const char *def)
+{
+ const char *p;
+
+ if (!skip_prefix(str, prefix, &p))
+ return 0;
+
+ if (!*p) {
+ if (arg)
+ *arg = def;
+ return 1;
+ }
+
+ if (*p != '=')
+ return 0;
+
+ if (arg)
+ *arg = p + 1;
+ return 1;
+}
+
/*
* Used as the default ->buf value, so that people can always assume
* buf is non NULL and ->buf is NUL terminated even for a freshly
@@ -386,12 +408,15 @@
ssize_t strbuf_read_once(struct strbuf *sb, int fd, size_t hint)
{
+ size_t oldalloc = sb->alloc;
ssize_t cnt;
strbuf_grow(sb, hint ? hint : 8192);
cnt = xread(fd, sb->buf + sb->len, sb->alloc - sb->len - 1);
if (cnt > 0)
strbuf_setlen(sb, sb->len + cnt);
+ else if (oldalloc == 0)
+ strbuf_release(sb);
return cnt;
}
@@ -658,7 +683,7 @@
(!reserved && is_rfc3986_reserved(ch)))
strbuf_addch(sb, ch);
else
- strbuf_addf(sb, "%%%02x", ch);
+ strbuf_addf(sb, "%%%02x", (unsigned char)ch);
}
}
diff --git a/strbuf.h b/strbuf.h
index 295a676..14c8c10 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -68,7 +68,7 @@
};
extern char strbuf_slopbuf[];
-#define STRBUF_INIT { 0, 0, strbuf_slopbuf }
+#define STRBUF_INIT { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
/**
* Life Cycle Functions
@@ -480,15 +480,6 @@
*/
extern void strbuf_stripspace(struct strbuf *buf, int skip_comments);
-/**
- * Temporary alias until all topic branches have switched to use
- * strbuf_stripspace directly.
- */
-static inline void stripspace(struct strbuf *buf, int skip_comments)
-{
- strbuf_stripspace(buf, skip_comments);
-}
-
static inline int strbuf_strip_suffix(struct strbuf *sb, const char *suffix)
{
if (strip_suffix_mem(sb->buf, &sb->len, suffix)) {
diff --git a/streaming.c b/streaming.c
index c8b85e4..5892b50 100644
--- a/streaming.c
+++ b/streaming.c
@@ -3,6 +3,7 @@
*/
#include "cache.h"
#include "streaming.h"
+#include "packfile.h"
enum input_source {
stream_error = -1,
diff --git a/string-list.c b/string-list.c
index 806b4c8..a0cf0cf 100644
--- a/string-list.c
+++ b/string-list.c
@@ -16,7 +16,7 @@
compare_strings_fn cmp = list->cmp ? list->cmp : strcmp;
while (left + 1 < right) {
- int middle = (left + right) / 2;
+ int middle = left + (right - left) / 2;
int compare = cmp(string, list->items[middle].string);
if (compare < 0)
right = middle;
diff --git a/string-list.h b/string-list.h
index 79ae567..ff8f609 100644
--- a/string-list.h
+++ b/string-list.h
@@ -1,6 +1,69 @@
#ifndef STRING_LIST_H
#define STRING_LIST_H
+/**
+ * The string_list API offers a data structure and functions to handle
+ * sorted and unsorted arrays of strings. A "sorted" list is one whose
+ * entries are sorted by string value in `strcmp()` order.
+ *
+ * The caller:
+ *
+ * . Allocates and clears a `struct string_list` variable.
+ *
+ * . Initializes the members. You might want to set the flag `strdup_strings`
+ * if the strings should be strdup()ed. For example, this is necessary
+ * when you add something like git_path("..."), since that function returns
+ * a static buffer that will change with the next call to git_path().
+ *
+ * If you need something advanced, you can manually malloc() the `items`
+ * member (you need this if you add things later) and you should set the
+ * `nr` and `alloc` members in that case, too.
+ *
+ * . Adds new items to the list, using `string_list_append`,
+ * `string_list_append_nodup`, `string_list_insert`,
+ * `string_list_split`, and/or `string_list_split_in_place`.
+ *
+ * . Can check if a string is in the list using `string_list_has_string` or
+ * `unsorted_string_list_has_string` and get it from the list using
+ * `string_list_lookup` for sorted lists.
+ *
+ * . Can sort an unsorted list using `string_list_sort`.
+ *
+ * . Can remove duplicate items from a sorted list using
+ * `string_list_remove_duplicates`.
+ *
+ * . Can remove individual items of an unsorted list using
+ * `unsorted_string_list_delete_item`.
+ *
+ * . Can remove items not matching a criterion from a sorted or unsorted
+ * list using `filter_string_list`, or remove empty strings using
+ * `string_list_remove_empty_items`.
+ *
+ * . Finally it should free the list using `string_list_clear`.
+ *
+ * Example:
+ *
+ * struct string_list list = STRING_LIST_INIT_NODUP;
+ * int i;
+ *
+ * string_list_append(&list, "foo");
+ * string_list_append(&list, "bar");
+ * for (i = 0; i < list.nr; i++)
+ * printf("%s\n", list.items[i].string)
+ *
+ * NOTE: It is more efficient to build an unsorted list and sort it
+ * afterwards, instead of building a sorted list (`O(n log n)` instead of
+ * `O(n^2)`).
+ *
+ * However, if you use the list to check if a certain string was added
+ * already, you should not do that (using unsorted_string_list_has_string()),
+ * because the complexity would be quadratic again (but with a worse factor).
+ */
+
+/**
+ * Represents an item of the list. The `string` member is a pointer to the
+ * string, and you may use the `util` member for any purpose, if you want.
+ */
struct string_list_item {
char *string;
void *util;
@@ -8,6 +71,18 @@
typedef int (*compare_strings_fn)(const char *, const char *);
+/**
+ * Represents the list itself.
+ *
+ * . The array of items are available via the `items` member.
+ * . The `nr` member contains the number of items stored in the list.
+ * . The `alloc` member is used to avoid reallocating at every insertion.
+ * You should not tamper with it.
+ * . Setting the `strdup_strings` member to 1 will strdup() the strings
+ * before adding them, see above.
+ * . The `compare_strings_fn` member is used to specify a custom compare
+ * function, otherwise `strcmp()` is used as the default function.
+ */
struct string_list {
struct string_list_item *items;
unsigned int nr, alloc;
@@ -18,35 +93,65 @@
#define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0, NULL }
#define STRING_LIST_INIT_DUP { NULL, 0, 0, 1, NULL }
+/* General functions which work with both sorted and unsorted lists. */
+
+/**
+ * Initialize the members of the string_list, set `strdup_strings`
+ * member according to the value of the second parameter.
+ */
void string_list_init(struct string_list *list, int strdup_strings);
-void print_string_list(const struct string_list *p, const char *text);
-void string_list_clear(struct string_list *list, int free_util);
-
-/* Use this function to call a custom clear function on each util pointer */
-/* The string associated with the util pointer is passed as the second argument */
-typedef void (*string_list_clear_func_t)(void *p, const char *str);
-void string_list_clear_func(struct string_list *list, string_list_clear_func_t clearfunc);
-
-/* Use this function or the macro below to iterate over each item */
+/** Callback function type for for_each_string_list */
typedef int (*string_list_each_func_t)(struct string_list_item *, void *);
-int for_each_string_list(struct string_list *list,
- string_list_each_func_t, void *cb_data);
-#define for_each_string_list_item(item,list) \
- for (item = (list)->items; \
- item && item < (list)->items + (list)->nr; \
- ++item)
-/*
- * Apply want to each item in list, retaining only the ones for which
- * the function returns true. If free_util is true, call free() on
+/**
+ * Apply `want` to each item in `list`, retaining only the ones for which
+ * the function returns true. If `free_util` is true, call free() on
* the util members of any items that have to be deleted. Preserve
* the order of the items that are retained.
*/
void filter_string_list(struct string_list *list, int free_util,
string_list_each_func_t want, void *cb_data);
-/*
+/**
+ * Dump a string_list to stdout, useful mainly for debugging
+ * purposes. It can take an optional header argument and it writes out
+ * the string-pointer pairs of the string_list, each one in its own
+ * line.
+ */
+void print_string_list(const struct string_list *p, const char *text);
+
+/**
+ * Free a string_list. The `string` pointer of the items will be freed
+ * in case the `strdup_strings` member of the string_list is set. The
+ * second parameter controls if the `util` pointer of the items should
+ * be freed or not.
+ */
+void string_list_clear(struct string_list *list, int free_util);
+
+/**
+ * Callback type for `string_list_clear_func`. The string associated
+ * with the util pointer is passed as the second argument
+ */
+typedef void (*string_list_clear_func_t)(void *p, const char *str);
+
+/** Call a custom clear function on each util pointer */
+void string_list_clear_func(struct string_list *list, string_list_clear_func_t clearfunc);
+
+/**
+ * Apply `func` to each item. If `func` returns nonzero, the
+ * iteration aborts and the return value is propagated.
+ */
+int for_each_string_list(struct string_list *list,
+ string_list_each_func_t func, void *cb_data);
+
+/** Iterate over each item, as a macro. */
+#define for_each_string_list_item(item,list) \
+ for (item = (list)->items; \
+ item && item < (list)->items + (list)->nr; \
+ ++item)
+
+/**
* Remove any empty strings from the list. If free_util is true, call
* free() on the util members of any items that have to be deleted.
* Preserve the order of the items that are retained.
@@ -54,25 +159,34 @@
void string_list_remove_empty_items(struct string_list *list, int free_util);
/* Use these functions only on sorted lists: */
+
+/** Determine if the string_list has a given string or not. */
int string_list_has_string(const struct string_list *list, const char *string);
int string_list_find_insert_index(const struct string_list *list, const char *string,
int negative_existing_index);
-/*
- * Inserts the given string into the sorted list.
- * If the string already exists, the list is not altered.
- * Returns the string_list_item, the string is part of.
+
+/**
+ * Insert a new element to the string_list. The returned pointer can
+ * be handy if you want to write something to the `util` pointer of
+ * the string_list_item containing the just added string. If the given
+ * string already exists the insertion will be skipped and the pointer
+ * to the existing item returned.
+ *
+ * Since this function uses xrealloc() (which die()s if it fails) if the
+ * list needs to grow, it is safe not to check the pointer. I.e. you may
+ * write `string_list_insert(...)->util = ...;`.
*/
struct string_list_item *string_list_insert(struct string_list *list, const char *string);
-/*
- * Removes the given string from the sorted list.
- * If the string doesn't exist, the list is not altered.
+/**
+ * Remove the given string from the sorted list. If the string
+ * doesn't exist, the list is not altered.
*/
extern void string_list_remove(struct string_list *list, const char *string,
int free_util);
-/*
- * Checks if the given string is part of a sorted list. If it is part of the list,
+/**
+ * Check if the given string is part of a sorted list. If it is part of the list,
* return the coresponding string_list_item, NULL otherwise.
*/
struct string_list_item *string_list_lookup(struct string_list *list, const char *string);
@@ -87,14 +201,14 @@
/* Use these functions only on unsorted lists: */
-/*
+/**
* Add string to the end of list. If list->strdup_string is set, then
* string is copied; otherwise the new string_list_entry refers to the
* input string.
*/
struct string_list_item *string_list_append(struct string_list *list, const char *string);
-/*
+/**
* Like string_list_append(), except string is never copied. When
* list->strdup_strings is set, this function can be used to hand
* ownership of a malloc()ed string to list without making an extra
@@ -102,16 +216,34 @@
*/
struct string_list_item *string_list_append_nodup(struct string_list *list, char *string);
+/**
+ * Sort the list's entries by string value in `strcmp()` order.
+ */
void string_list_sort(struct string_list *list);
+
+/**
+ * Like `string_list_has_string()` but for unsorted lists. Linear in
+ * size of the list.
+ */
int unsorted_string_list_has_string(struct string_list *list, const char *string);
+
+/**
+ * Like `string_list_lookup()` but for unsorted lists. Linear in size
+ * of the list.
+ */
struct string_list_item *unsorted_string_list_lookup(struct string_list *list,
const char *string);
-
+/**
+ * Remove an item from a string_list. The `string` pointer of the
+ * items will be freed in case the `strdup_strings` member of the
+ * string_list is set. The third parameter controls if the `util`
+ * pointer of the items should be freed or not.
+ */
void unsorted_string_list_delete_item(struct string_list *list, int i, int free_util);
-/*
- * Split string into substrings on character delim and append the
- * substrings to list. The input string is not modified.
+/**
+ * Split string into substrings on character `delim` and append the
+ * substrings to `list`. The input string is not modified.
* list->strdup_strings must be set, as new memory needs to be
* allocated to hold the substrings. If maxsplit is non-negative,
* then split at most maxsplit times. Return the number of substrings
diff --git a/sub-process.c b/sub-process.c
index 8057156..8d2a170 100644
--- a/sub-process.c
+++ b/sub-process.c
@@ -6,10 +6,13 @@
#include "pkt-line.h"
int cmd2process_cmp(const void *unused_cmp_data,
- const struct subprocess_entry *e1,
- const struct subprocess_entry *e2,
+ const void *entry,
+ const void *entry_or_key,
const void *unused_keydata)
{
+ const struct subprocess_entry *e1 = entry;
+ const struct subprocess_entry *e2 = entry_or_key;
+
return strcmp(e1->cmd, e2->cmd);
}
diff --git a/sub-process.h b/sub-process.h
index caa91a9..4970199 100644
--- a/sub-process.h
+++ b/sub-process.h
@@ -43,8 +43,8 @@
/* Function to test two subprocess hashmap entries for equality. */
extern int cmd2process_cmp(const void *unused_cmp_data,
- const struct subprocess_entry *e1,
- const struct subprocess_entry *e2,
+ const void *e1,
+ const void *e2,
const void *unused_keydata);
/*
diff --git a/submodule-config.c b/submodule-config.c
index 5fe2d07..602ba8c 100644
--- a/submodule-config.c
+++ b/submodule-config.c
@@ -9,7 +9,7 @@
/*
* submodule cache lookup structure
* There is one shared set of 'struct submodule' entries which can be
- * looked up by their sha1 blob id of the .gitmodule file and either
+ * looked up by their sha1 blob id of the .gitmodules file and either
* using path or name as key.
* for_path stores submodule entries with path as key
* for_name stores submodule entries with name as key
@@ -18,6 +18,7 @@
struct hashmap for_path;
struct hashmap for_name;
unsigned initialized:1;
+ unsigned gitmodules_read:1;
};
/*
@@ -35,19 +36,25 @@
};
static int config_path_cmp(const void *unused_cmp_data,
- const struct submodule_entry *a,
- const struct submodule_entry *b,
+ const void *entry,
+ const void *entry_or_key,
const void *unused_keydata)
{
+ const struct submodule_entry *a = entry;
+ const struct submodule_entry *b = entry_or_key;
+
return strcmp(a->config->path, b->config->path) ||
hashcmp(a->config->gitmodules_sha1, b->config->gitmodules_sha1);
}
static int config_name_cmp(const void *unused_cmp_data,
- const struct submodule_entry *a,
- const struct submodule_entry *b,
+ const void *entry,
+ const void *entry_or_key,
const void *unused_keydata)
{
+ const struct submodule_entry *a = entry;
+ const struct submodule_entry *b = entry_or_key;
+
return strcmp(a->config->name, b->config->name) ||
hashcmp(a->config->gitmodules_sha1, b->config->gitmodules_sha1);
}
@@ -59,8 +66,8 @@
static void submodule_cache_init(struct submodule_cache *cache)
{
- hashmap_init(&cache->for_path, (hashmap_cmp_fn) config_path_cmp, NULL, 0);
- hashmap_init(&cache->for_name, (hashmap_cmp_fn) config_name_cmp, NULL, 0);
+ hashmap_init(&cache->for_path, config_path_cmp, NULL, 0);
+ hashmap_init(&cache->for_name, config_name_cmp, NULL, 0);
cache->initialized = 1;
}
@@ -84,7 +91,7 @@
/*
* We iterate over the name hash here to be symmetric with the
* allocation of struct submodule entries. Each is allocated by
- * their .gitmodule blob sha1 and submodule name.
+ * their .gitmodules blob sha1 and submodule name.
*/
hashmap_iter_init(&cache->for_name, &iter);
while ((entry = hashmap_iter_next(&iter)))
@@ -93,6 +100,7 @@
hashmap_free(&cache->for_path, 1);
hashmap_free(&cache->for_name, 1);
cache->initialized = 0;
+ cache->gitmodules_read = 0;
}
void submodule_cache_free(struct submodule_cache *cache)
@@ -232,7 +240,7 @@
static int parse_fetch_recurse(const char *opt, const char *arg,
int die_on_error)
{
- switch (git_config_maybe_bool(opt, arg)) {
+ switch (git_parse_maybe_bool(arg)) {
case 1:
return RECURSE_SUBMODULES_ON;
case 0:
@@ -248,6 +256,14 @@
}
}
+int parse_submodule_fetchjobs(const char *var, const char *value)
+{
+ int fetchjobs = git_config_int(var, value);
+ if (fetchjobs < 0)
+ die(_("negative values not allowed for submodule.fetchjobs"));
+ return fetchjobs;
+}
+
int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg)
{
return parse_fetch_recurse(opt, arg, 1);
@@ -277,7 +293,7 @@
static int parse_update_recurse(const char *opt, const char *arg,
int die_on_error)
{
- switch (git_config_maybe_bool(opt, arg)) {
+ switch (git_parse_maybe_bool(arg)) {
case 1:
return RECURSE_SUBMODULES_ON;
case 0:
@@ -297,7 +313,7 @@
static int parse_push_recurse(const char *opt, const char *arg,
int die_on_error)
{
- switch (git_config_maybe_bool(opt, arg)) {
+ switch (git_parse_maybe_bool(arg)) {
case 1:
/* There's no simple "on" value when pushing */
if (die_on_error)
@@ -441,19 +457,19 @@
return ret;
}
-int gitmodule_sha1_from_commit(const unsigned char *treeish_name,
- unsigned char *gitmodules_sha1,
- struct strbuf *rev)
+static int gitmodule_oid_from_commit(const struct object_id *treeish_name,
+ struct object_id *gitmodules_oid,
+ struct strbuf *rev)
{
int ret = 0;
- if (is_null_sha1(treeish_name)) {
- hashclr(gitmodules_sha1);
+ if (is_null_oid(treeish_name)) {
+ oidclr(gitmodules_oid);
return 1;
}
- strbuf_addf(rev, "%s:.gitmodules", sha1_to_hex(treeish_name));
- if (get_sha1(rev->buf, gitmodules_sha1) >= 0)
+ strbuf_addf(rev, "%s:.gitmodules", oid_to_hex(treeish_name));
+ if (get_oid(rev->buf, gitmodules_oid) >= 0)
ret = 1;
return ret;
@@ -464,13 +480,13 @@
* revisions.
*/
static const struct submodule *config_from(struct submodule_cache *cache,
- const unsigned char *treeish_name, const char *key,
+ const struct object_id *treeish_name, const char *key,
enum lookup_type lookup_type)
{
struct strbuf rev = STRBUF_INIT;
unsigned long config_size;
char *config = NULL;
- unsigned char sha1[20];
+ struct object_id oid;
enum object_type type;
const struct submodule *submodule = NULL;
struct parse_config_parameter parameter;
@@ -490,28 +506,28 @@
return entry->config;
}
- if (!gitmodule_sha1_from_commit(treeish_name, sha1, &rev))
+ if (!gitmodule_oid_from_commit(treeish_name, &oid, &rev))
goto out;
switch (lookup_type) {
case lookup_name:
- submodule = cache_lookup_name(cache, sha1, key);
+ submodule = cache_lookup_name(cache, oid.hash, key);
break;
case lookup_path:
- submodule = cache_lookup_path(cache, sha1, key);
+ submodule = cache_lookup_path(cache, oid.hash, key);
break;
}
if (submodule)
goto out;
- config = read_sha1_file(sha1, &type, &config_size);
+ config = read_sha1_file(oid.hash, &type, &config_size);
if (!config || type != OBJ_BLOB)
goto out;
/* fill the submodule config into the cache */
parameter.cache = cache;
- parameter.treeish_name = treeish_name;
- parameter.gitmodules_sha1 = sha1;
+ parameter.treeish_name = treeish_name->hash;
+ parameter.gitmodules_sha1 = oid.hash;
parameter.overwrite = 0;
git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf,
config, config_size, ¶meter);
@@ -520,9 +536,9 @@
switch (lookup_type) {
case lookup_name:
- return cache_lookup_name(cache, sha1, key);
+ return cache_lookup_name(cache, oid.hash, key);
case lookup_path:
- return cache_lookup_path(cache, sha1, key);
+ return cache_lookup_path(cache, oid.hash, key);
default:
return NULL;
}
@@ -544,13 +560,11 @@
submodule_cache_init(repo->submodule_cache);
}
-int submodule_config_option(struct repository *repo,
- const char *var, const char *value)
+static int gitmodules_cb(const char *var, const char *value, void *data)
{
+ struct repository *repo = data;
struct parse_config_parameter parameter;
- submodule_cache_check_init(repo);
-
parameter.cache = repo->submodule_cache;
parameter.treeish_name = NULL;
parameter.gitmodules_sha1 = null_sha1;
@@ -559,30 +573,71 @@
return parse_config(var, value, ¶meter);
}
-int parse_submodule_config_option(const char *var, const char *value)
+void repo_read_gitmodules(struct repository *repo)
{
- return submodule_config_option(the_repository, var, value);
+ submodule_cache_check_init(repo);
+
+ if (repo->worktree) {
+ char *gitmodules;
+
+ if (repo_read_index(repo) < 0)
+ return;
+
+ gitmodules = repo_worktree_path(repo, GITMODULES_FILE);
+
+ if (!is_gitmodules_unmerged(repo->index))
+ git_config_from_file(gitmodules_cb, gitmodules, repo);
+
+ free(gitmodules);
+ }
+
+ repo->submodule_cache->gitmodules_read = 1;
}
-const struct submodule *submodule_from_name(const unsigned char *treeish_name,
+void gitmodules_config_oid(const struct object_id *commit_oid)
+{
+ struct strbuf rev = STRBUF_INIT;
+ struct object_id oid;
+
+ submodule_cache_check_init(the_repository);
+
+ if (gitmodule_oid_from_commit(commit_oid, &oid, &rev)) {
+ git_config_from_blob_oid(gitmodules_cb, rev.buf,
+ &oid, the_repository);
+ }
+ strbuf_release(&rev);
+
+ the_repository->submodule_cache->gitmodules_read = 1;
+}
+
+static void gitmodules_read_check(struct repository *repo)
+{
+ submodule_cache_check_init(repo);
+
+ /* read the repo's .gitmodules file if it hasn't been already */
+ if (!repo->submodule_cache->gitmodules_read)
+ repo_read_gitmodules(repo);
+}
+
+const struct submodule *submodule_from_name(const struct object_id *treeish_name,
const char *name)
{
- submodule_cache_check_init(the_repository);
+ gitmodules_read_check(the_repository);
return config_from(the_repository->submodule_cache, treeish_name, name, lookup_name);
}
-const struct submodule *submodule_from_path(const unsigned char *treeish_name,
+const struct submodule *submodule_from_path(const struct object_id *treeish_name,
const char *path)
{
- submodule_cache_check_init(the_repository);
+ gitmodules_read_check(the_repository);
return config_from(the_repository->submodule_cache, treeish_name, path, lookup_path);
}
const struct submodule *submodule_from_cache(struct repository *repo,
- const unsigned char *treeish_name,
+ const struct object_id *treeish_name,
const char *key)
{
- submodule_cache_check_init(repo);
+ gitmodules_read_check(repo);
return config_from(repo->submodule_cache, treeish_name,
key, lookup_path);
}
diff --git a/submodule-config.h b/submodule-config.h
index 233bfcb..a5503a5 100644
--- a/submodule-config.h
+++ b/submodule-config.h
@@ -22,30 +22,30 @@
int recommend_shallow;
};
+#define SUBMODULE_INIT { NULL, NULL, NULL, RECURSE_SUBMODULES_NONE, \
+ NULL, NULL, SUBMODULE_UPDATE_STRATEGY_INIT, {0}, -1 };
+
struct submodule_cache;
struct repository;
extern void submodule_cache_free(struct submodule_cache *cache);
+extern int parse_submodule_fetchjobs(const char *var, const char *value);
extern int parse_fetch_recurse_submodules_arg(const char *opt, const char *arg);
struct option;
extern int option_fetch_parse_recurse_submodules(const struct option *opt,
const char *arg, int unset);
extern int parse_update_recurse_submodules_arg(const char *opt, const char *arg);
extern int parse_push_recurse_submodules_arg(const char *opt, const char *arg);
-extern int parse_submodule_config_option(const char *var, const char *value);
-extern int submodule_config_option(struct repository *repo,
- const char *var, const char *value);
+extern void repo_read_gitmodules(struct repository *repo);
+extern void gitmodules_config_oid(const struct object_id *commit_oid);
extern const struct submodule *submodule_from_name(
- const unsigned char *commit_or_tree, const char *name);
+ const struct object_id *commit_or_tree, const char *name);
extern const struct submodule *submodule_from_path(
- const unsigned char *commit_or_tree, const char *path);
+ const struct object_id *commit_or_tree, const char *path);
extern const struct submodule *submodule_from_cache(struct repository *repo,
- const unsigned char *treeish_name,
+ const struct object_id *treeish_name,
const char *key);
-extern int gitmodule_sha1_from_commit(const unsigned char *commit_sha1,
- unsigned char *gitmodules_sha1,
- struct strbuf *rev);
extern void submodule_free(void);
#endif /* SUBMODULE_CONFIG_H */
diff --git a/submodule.c b/submodule.c
index 36f45f5..47ddc9b 100644
--- a/submodule.c
+++ b/submodule.c
@@ -1,3 +1,5 @@
+#define NO_THE_INDEX_COMPATIBILITY_MACROS
+
#include "cache.h"
#include "repository.h"
#include "config.h"
@@ -20,37 +22,61 @@
#include "worktree.h"
#include "parse-options.h"
-static int config_fetch_recurse_submodules = RECURSE_SUBMODULES_ON_DEMAND;
static int config_update_recurse_submodules = RECURSE_SUBMODULES_OFF;
-static int parallel_jobs = 1;
-static struct string_list changed_submodule_paths = STRING_LIST_INIT_DUP;
+static struct string_list changed_submodule_names = STRING_LIST_INIT_DUP;
static int initialized_fetch_ref_tips;
static struct oid_array ref_tips_before_fetch;
static struct oid_array ref_tips_after_fetch;
/*
- * The following flag is set if the .gitmodules file is unmerged. We then
- * disable recursion for all submodules where .git/config doesn't have a
- * matching config entry because we can't guess what might be configured in
- * .gitmodules unless the user resolves the conflict. When a command line
- * option is given (which always overrides configuration) this flag will be
- * ignored.
+ * Check if the .gitmodules file is unmerged. Parsing of the .gitmodules file
+ * will be disabled because we can't guess what might be configured in
+ * .gitmodules unless the user resolves the conflict.
*/
-static int gitmodules_is_unmerged;
+int is_gitmodules_unmerged(const struct index_state *istate)
+{
+ int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
+ if (pos < 0) { /* .gitmodules not found or isn't merged */
+ pos = -1 - pos;
+ if (istate->cache_nr > pos) { /* there is a .gitmodules */
+ const struct cache_entry *ce = istate->cache[pos];
+ if (ce_namelen(ce) == strlen(GITMODULES_FILE) &&
+ !strcmp(ce->name, GITMODULES_FILE))
+ return 1;
+ }
+ }
+
+ return 0;
+}
/*
- * This flag is set if the .gitmodules file had unstaged modifications on
- * startup. This must be checked before allowing modifications to the
- * .gitmodules file with the intention to stage them later, because when
- * continuing we would stage the modifications the user didn't stage herself
- * too. That might change in a future version when we learn to stage the
- * changes we do ourselves without staging any previous modifications.
+ * Check if the .gitmodules file has unstaged modifications. This must be
+ * checked before allowing modifications to the .gitmodules file with the
+ * intention to stage them later, because when continuing we would stage the
+ * modifications the user didn't stage herself too. That might change in a
+ * future version when we learn to stage the changes we do ourselves without
+ * staging any previous modifications.
*/
-static int gitmodules_is_modified;
-
-int is_staging_gitmodules_ok(void)
+int is_staging_gitmodules_ok(struct index_state *istate)
{
- return !gitmodules_is_modified;
+ int pos = index_name_pos(istate, GITMODULES_FILE, strlen(GITMODULES_FILE));
+
+ if ((pos >= 0) && (pos < istate->cache_nr)) {
+ struct stat st;
+ if (lstat(GITMODULES_FILE, &st) == 0 &&
+ ie_match_stat(istate, istate->cache[pos], &st,
+ CE_MATCH_IGNORE_FSMONITOR) & DATA_CHANGED)
+ return 0;
+ }
+
+ return 1;
+}
+
+static int for_each_remote_ref_submodule(const char *submodule,
+ each_ref_fn fn, void *cb_data)
+{
+ return refs_for_each_remote_ref(get_submodule_ref_store(submodule),
+ fn, cb_data);
}
/*
@@ -63,13 +89,13 @@
struct strbuf entry = STRBUF_INIT;
const struct submodule *submodule;
- if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
+ if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
return -1;
- if (gitmodules_is_unmerged)
+ if (is_gitmodules_unmerged(&the_index))
die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
- submodule = submodule_from_path(null_sha1, oldpath);
+ submodule = submodule_from_path(&null_oid, oldpath);
if (!submodule || !submodule->name) {
warning(_("Could not find section in .gitmodules where path=%s"), oldpath);
return -1;
@@ -77,7 +103,7 @@
strbuf_addstr(&entry, "submodule.");
strbuf_addstr(&entry, submodule->name);
strbuf_addstr(&entry, ".path");
- if (git_config_set_in_file_gently(".gitmodules", entry.buf, newpath) < 0) {
+ if (git_config_set_in_file_gently(GITMODULES_FILE, entry.buf, newpath) < 0) {
/* Maybe the user already did that, don't error out here */
warning(_("Could not update .gitmodules entry %s"), entry.buf);
strbuf_release(&entry);
@@ -97,20 +123,20 @@
struct strbuf sect = STRBUF_INIT;
const struct submodule *submodule;
- if (!file_exists(".gitmodules")) /* Do nothing without .gitmodules */
+ if (!file_exists(GITMODULES_FILE)) /* Do nothing without .gitmodules */
return -1;
- if (gitmodules_is_unmerged)
+ if (is_gitmodules_unmerged(&the_index))
die(_("Cannot change unmerged .gitmodules, resolve merge conflicts first"));
- submodule = submodule_from_path(null_sha1, path);
+ submodule = submodule_from_path(&null_oid, path);
if (!submodule || !submodule->name) {
warning(_("Could not find section in .gitmodules where path=%s"), path);
return -1;
}
strbuf_addstr(§, "submodule.");
strbuf_addstr(§, submodule->name);
- if (git_config_rename_section_in_file(".gitmodules", sect.buf, NULL) < 0) {
+ if (git_config_rename_section_in_file(GITMODULES_FILE, sect.buf, NULL) < 0) {
/* Maybe the user already did that, don't error out here */
warning(_("Could not remove .gitmodules entry for %s"), path);
strbuf_release(§);
@@ -120,9 +146,9 @@
return 0;
}
-void stage_updated_gitmodules(void)
+void stage_updated_gitmodules(struct index_state *istate)
{
- if (add_file_to_cache(".gitmodules", 0))
+ if (add_file_to_index(istate, GITMODULES_FILE, 0))
die(_("staging updated .gitmodules failed"));
}
@@ -147,42 +173,20 @@
void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
const char *path)
{
- const struct submodule *submodule = submodule_from_path(null_sha1, path);
+ const struct submodule *submodule = submodule_from_path(&null_oid, path);
if (submodule) {
- if (submodule->ignore)
- handle_ignore_submodules_arg(diffopt, submodule->ignore);
- else if (gitmodules_is_unmerged)
- DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
- }
-}
+ const char *ignore;
+ char *key;
-/* For loading from the .gitmodules file. */
-static int git_modules_config(const char *var, const char *value, void *cb)
-{
- if (!strcmp(var, "submodule.fetchjobs")) {
- parallel_jobs = git_config_int(var, value);
- if (parallel_jobs < 0)
- die(_("negative values not allowed for submodule.fetchJobs"));
- return 0;
- } else if (starts_with(var, "submodule."))
- return parse_submodule_config_option(var, value);
- else if (!strcmp(var, "fetch.recursesubmodules")) {
- config_fetch_recurse_submodules = parse_fetch_recurse_submodules_arg(var, value);
- return 0;
- }
- return 0;
-}
+ key = xstrfmt("submodule.%s.ignore", submodule->name);
+ if (repo_config_get_string_const(the_repository, key, &ignore))
+ ignore = submodule->ignore;
+ free(key);
-/* Loads all submodule settings from the config. */
-int submodule_config(const char *var, const char *value, void *cb)
-{
- if (!strcmp(var, "submodule.recurse")) {
- int v = git_config_bool(var, value) ?
- RECURSE_SUBMODULES_ON : RECURSE_SUBMODULES_OFF;
- config_update_recurse_submodules = v;
- return 0;
- } else {
- return git_modules_config(var, value, cb);
+ if (ignore)
+ handle_ignore_submodules_arg(diffopt, ignore);
+ else if (is_gitmodules_unmerged(&the_index))
+ diffopt->flags.ignore_submodules = 1;
}
}
@@ -214,74 +218,6 @@
return 0;
}
-void load_submodule_cache(void)
-{
- if (config_update_recurse_submodules == RECURSE_SUBMODULES_OFF)
- return;
-
- gitmodules_config();
- git_config(submodule_config, NULL);
-}
-
-void gitmodules_config(void)
-{
- const char *work_tree = get_git_work_tree();
- if (work_tree) {
- struct strbuf gitmodules_path = STRBUF_INIT;
- int pos;
- strbuf_addstr(&gitmodules_path, work_tree);
- strbuf_addstr(&gitmodules_path, "/.gitmodules");
- if (read_cache() < 0)
- die("index file corrupt");
- pos = cache_name_pos(".gitmodules", 11);
- if (pos < 0) { /* .gitmodules not found or isn't merged */
- pos = -1 - pos;
- if (active_nr > pos) { /* there is a .gitmodules */
- const struct cache_entry *ce = active_cache[pos];
- if (ce_namelen(ce) == 11 &&
- !memcmp(ce->name, ".gitmodules", 11))
- gitmodules_is_unmerged = 1;
- }
- } else if (pos < active_nr) {
- struct stat st;
- if (lstat(".gitmodules", &st) == 0 &&
- ce_match_stat(active_cache[pos], &st, 0) & DATA_CHANGED)
- gitmodules_is_modified = 1;
- }
-
- if (!gitmodules_is_unmerged)
- git_config_from_file(git_modules_config,
- gitmodules_path.buf, NULL);
- strbuf_release(&gitmodules_path);
- }
-}
-
-static int gitmodules_cb(const char *var, const char *value, void *data)
-{
- struct repository *repo = data;
- return submodule_config_option(repo, var, value);
-}
-
-void repo_read_gitmodules(struct repository *repo)
-{
- char *gitmodules_path = repo_worktree_path(repo, ".gitmodules");
-
- git_config_from_file(gitmodules_cb, gitmodules_path, repo);
- free(gitmodules_path);
-}
-
-void gitmodules_config_sha1(const unsigned char *commit_sha1)
-{
- struct strbuf rev = STRBUF_INIT;
- unsigned char sha1[20];
-
- if (gitmodule_sha1_from_commit(commit_sha1, sha1, &rev)) {
- git_config_from_blob_sha1(git_modules_config, rev.buf,
- sha1, NULL);
- }
- strbuf_release(&rev);
-}
-
/*
* Determine if a submodule has been initialized at a given 'path'
*/
@@ -293,7 +229,7 @@
const struct string_list *sl;
const struct submodule *module;
- module = submodule_from_cache(repo, null_sha1, path);
+ module = submodule_from_cache(repo, &null_oid, path);
/* early return if there isn't a path->module mapping */
if (!module)
@@ -410,24 +346,38 @@
}
}
+enum submodule_update_type parse_submodule_update_type(const char *value)
+{
+ if (!strcmp(value, "none"))
+ return SM_UPDATE_NONE;
+ else if (!strcmp(value, "checkout"))
+ return SM_UPDATE_CHECKOUT;
+ else if (!strcmp(value, "rebase"))
+ return SM_UPDATE_REBASE;
+ else if (!strcmp(value, "merge"))
+ return SM_UPDATE_MERGE;
+ else if (*value == '!')
+ return SM_UPDATE_COMMAND;
+ else
+ return SM_UPDATE_UNSPECIFIED;
+}
+
int parse_submodule_update_strategy(const char *value,
struct submodule_update_strategy *dst)
{
+ enum submodule_update_type type;
+
free((void*)dst->command);
dst->command = NULL;
- if (!strcmp(value, "none"))
- dst->type = SM_UPDATE_NONE;
- else if (!strcmp(value, "checkout"))
- dst->type = SM_UPDATE_CHECKOUT;
- else if (!strcmp(value, "rebase"))
- dst->type = SM_UPDATE_REBASE;
- else if (!strcmp(value, "merge"))
- dst->type = SM_UPDATE_MERGE;
- else if (skip_prefix(value, "!", &value)) {
- dst->type = SM_UPDATE_COMMAND;
- dst->command = xstrdup(value);
- } else
+
+ type = parse_submodule_update_type(value);
+ if (type == SM_UPDATE_UNSPECIFIED)
return -1;
+
+ dst->type = type;
+ if (type == SM_UPDATE_COMMAND)
+ dst->command = xstrdup(value + 1);
+
return 0;
}
@@ -455,16 +405,16 @@
void handle_ignore_submodules_arg(struct diff_options *diffopt,
const char *arg)
{
- DIFF_OPT_CLR(diffopt, IGNORE_SUBMODULES);
- DIFF_OPT_CLR(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
- DIFF_OPT_CLR(diffopt, IGNORE_DIRTY_SUBMODULES);
+ diffopt->flags.ignore_submodules = 0;
+ diffopt->flags.ignore_untracked_in_submodules = 0;
+ diffopt->flags.ignore_dirty_submodules = 0;
if (!strcmp(arg, "all"))
- DIFF_OPT_SET(diffopt, IGNORE_SUBMODULES);
+ diffopt->flags.ignore_submodules = 1;
else if (!strcmp(arg, "untracked"))
- DIFF_OPT_SET(diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
+ diffopt->flags.ignore_untracked_in_submodules = 1;
else if (!strcmp(arg, "dirty"))
- DIFF_OPT_SET(diffopt, IGNORE_DIRTY_SUBMODULES);
+ diffopt->flags.ignore_dirty_submodules = 1;
else if (strcmp(arg, "none"))
die("bad --ignore-submodules argument: %s", arg);
}
@@ -490,9 +440,7 @@
return prepare_revision_walk(rev);
}
-static void print_submodule_summary(struct rev_info *rev, FILE *f,
- const char *line_prefix,
- const char *del, const char *add, const char *reset)
+static void print_submodule_summary(struct rev_info *rev, struct diff_options *o)
{
static const char format[] = " %m %s";
struct strbuf sb = STRBUF_INIT;
@@ -503,18 +451,12 @@
ctx.date_mode = rev->date_mode;
ctx.output_encoding = get_log_output_encoding();
strbuf_setlen(&sb, 0);
- strbuf_addstr(&sb, line_prefix);
- if (commit->object.flags & SYMMETRIC_LEFT) {
- if (del)
- strbuf_addstr(&sb, del);
- }
- else if (add)
- strbuf_addstr(&sb, add);
format_commit_message(commit, format, &sb, &ctx);
- if (reset)
- strbuf_addstr(&sb, reset);
strbuf_addch(&sb, '\n');
- fprintf(f, "%s", sb.buf);
+ if (commit->object.flags & SYMMETRIC_LEFT)
+ diff_emit_submodule_del(o, sb.buf);
+ else
+ diff_emit_submodule_add(o, sb.buf);
}
strbuf_release(&sb);
}
@@ -541,11 +483,9 @@
* attempt to lookup both the left and right commits and put them into the
* left and right pointers.
*/
-static void show_submodule_header(FILE *f, const char *path,
- const char *line_prefix,
+static void show_submodule_header(struct diff_options *o, const char *path,
struct object_id *one, struct object_id *two,
- unsigned dirty_submodule, const char *meta,
- const char *reset,
+ unsigned dirty_submodule,
struct commit **left, struct commit **right,
struct commit_list **merge_bases)
{
@@ -554,11 +494,10 @@
int fast_forward = 0, fast_backward = 0;
if (dirty_submodule & DIRTY_SUBMODULE_UNTRACKED)
- fprintf(f, "%sSubmodule %s contains untracked content\n",
- line_prefix, path);
+ diff_emit_submodule_untracked(o, path);
+
if (dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
- fprintf(f, "%sSubmodule %s contains modified content\n",
- line_prefix, path);
+ diff_emit_submodule_modified(o, path);
if (is_null_oid(one))
message = "(new submodule)";
@@ -567,7 +506,7 @@
if (add_submodule_odb(path)) {
if (!message)
- message = "(not initialized)";
+ message = "(commits not present)";
goto output_header;
}
@@ -600,31 +539,29 @@
}
output_header:
- strbuf_addf(&sb, "%s%sSubmodule %s ", line_prefix, meta, path);
+ strbuf_addf(&sb, "Submodule %s ", path);
strbuf_add_unique_abbrev(&sb, one->hash, DEFAULT_ABBREV);
strbuf_addstr(&sb, (fast_backward || fast_forward) ? ".." : "...");
strbuf_add_unique_abbrev(&sb, two->hash, DEFAULT_ABBREV);
if (message)
- strbuf_addf(&sb, " %s%s\n", message, reset);
+ strbuf_addf(&sb, " %s\n", message);
else
- strbuf_addf(&sb, "%s:%s\n", fast_backward ? " (rewind)" : "", reset);
- fwrite(sb.buf, sb.len, 1, f);
+ strbuf_addf(&sb, "%s:\n", fast_backward ? " (rewind)" : "");
+ diff_emit_submodule_header(o, sb.buf);
strbuf_release(&sb);
}
-void show_submodule_summary(FILE *f, const char *path,
- const char *line_prefix,
+void show_submodule_summary(struct diff_options *o, const char *path,
struct object_id *one, struct object_id *two,
- unsigned dirty_submodule, const char *meta,
- const char *del, const char *add, const char *reset)
+ unsigned dirty_submodule)
{
struct rev_info rev;
struct commit *left = NULL, *right = NULL;
struct commit_list *merge_bases = NULL;
- show_submodule_header(f, path, line_prefix, one, two, dirty_submodule,
- meta, reset, &left, &right, &merge_bases);
+ show_submodule_header(o, path, one, two, dirty_submodule,
+ &left, &right, &merge_bases);
/*
* If we don't have both a left and a right pointer, there is no
@@ -636,11 +573,11 @@
/* Treat revision walker failure the same as missing commits */
if (prepare_submodule_summary(&rev, path, left, right, merge_bases)) {
- fprintf(f, "%s(revision walker failed)\n", line_prefix);
+ diff_emit_submodule_error(o, "(revision walker failed)\n");
goto out;
}
- print_submodule_summary(&rev, f, line_prefix, del, add, reset);
+ print_submodule_summary(&rev, o);
out:
if (merge_bases)
@@ -649,21 +586,18 @@
clear_commit_marks(right, ~0);
}
-void show_submodule_inline_diff(FILE *f, const char *path,
- const char *line_prefix,
+void show_submodule_inline_diff(struct diff_options *o, const char *path,
struct object_id *one, struct object_id *two,
- unsigned dirty_submodule, const char *meta,
- const char *del, const char *add, const char *reset,
- const struct diff_options *o)
+ unsigned dirty_submodule)
{
- const struct object_id *old = &empty_tree_oid, *new = &empty_tree_oid;
+ const struct object_id *old = the_hash_algo->empty_tree, *new = the_hash_algo->empty_tree;
struct commit *left = NULL, *right = NULL;
struct commit_list *merge_bases = NULL;
- struct strbuf submodule_dir = STRBUF_INIT;
struct child_process cp = CHILD_PROCESS_INIT;
+ struct strbuf sb = STRBUF_INIT;
- show_submodule_header(f, path, line_prefix, one, two, dirty_submodule,
- meta, reset, &left, &right, &merge_bases);
+ show_submodule_header(o, path, one, two, dirty_submodule,
+ &left, &right, &merge_bases);
/* We need a valid left and right commit to display a difference */
if (!(left || is_null_oid(one)) ||
@@ -675,17 +609,17 @@
if (right)
new = two;
- fflush(f);
cp.git_cmd = 1;
cp.dir = path;
- cp.out = dup(fileno(f));
+ cp.out = -1;
cp.no_stdin = 1;
/* TODO: other options may need to be passed here. */
argv_array_pushl(&cp.args, "diff", "--submodule=diff", NULL);
+ argv_array_pushf(&cp.args, "--color=%s", want_color(o->use_color) ?
+ "always" : "never");
- argv_array_pushf(&cp.args, "--line-prefix=%s", line_prefix);
- if (DIFF_OPT_TST(o, REVERSE_DIFF)) {
+ if (o->flags.reverse_diff) {
argv_array_pushf(&cp.args, "--src-prefix=%s%s/",
o->b_prefix, path);
argv_array_pushf(&cp.args, "--dst-prefix=%s%s/",
@@ -707,11 +641,17 @@
argv_array_push(&cp.args, oid_to_hex(new));
prepare_submodule_repo_env(&cp.env_array);
- if (run_command(&cp))
- fprintf(f, "(diff failed)\n");
+ if (start_command(&cp))
+ diff_emit_submodule_error(o, "(diff failed)\n");
+
+ while (strbuf_getwholeline_fd(&sb, cp.out, '\n') != EOF)
+ diff_emit_submodule_pipethrough(o, sb.buf, sb.len);
+
+ if (finish_command(&cp))
+ diff_emit_submodule_error(o, "(diff failed)\n");
done:
- strbuf_release(&submodule_dir);
+ strbuf_release(&sb);
if (merge_bases)
free_commit_list(merge_bases);
if (left)
@@ -720,11 +660,6 @@
clear_commit_marks(right, ~0);
}
-void set_config_fetch_recurse_submodules(int value)
-{
- config_fetch_recurse_submodules = value;
-}
-
int should_update_submodules(void)
{
return config_update_recurse_submodules == RECURSE_SUBMODULES_ON;
@@ -738,15 +673,15 @@
if (!should_update_submodules())
return NULL;
- return submodule_from_path(null_sha1, ce->name);
+ return submodule_from_path(&null_oid, ce->name);
}
static struct oid_array *submodule_commits(struct string_list *submodules,
- const char *path)
+ const char *name)
{
struct string_list_item *item;
- item = string_list_insert(submodules, path);
+ item = string_list_insert(submodules, name);
if (item->util)
return (struct oid_array *) item->util;
@@ -755,39 +690,67 @@
return (struct oid_array *) item->util;
}
+struct collect_changed_submodules_cb_data {
+ struct string_list *changed;
+ const struct object_id *commit_oid;
+};
+
+/*
+ * this would normally be two functions: default_name_from_path() and
+ * path_from_default_name(). Since the default name is the same as
+ * the submodule path we can get away with just one function which only
+ * checks whether there is a submodule in the working directory at that
+ * location.
+ */
+static const char *default_name_or_path(const char *path_or_name)
+{
+ int error_code;
+
+ if (!is_submodule_populated_gently(path_or_name, &error_code))
+ return NULL;
+
+ return path_or_name;
+}
+
static void collect_changed_submodules_cb(struct diff_queue_struct *q,
struct diff_options *options,
void *data)
{
+ struct collect_changed_submodules_cb_data *me = data;
+ struct string_list *changed = me->changed;
+ const struct object_id *commit_oid = me->commit_oid;
int i;
- struct string_list *changed = data;
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;
+
if (!S_ISGITLINK(p->two->mode))
continue;
- if (S_ISGITLINK(p->one->mode)) {
- /*
- * NEEDSWORK: We should honor the name configured in
- * the .gitmodules file of the commit we are examining
- * here to be able to correctly follow submodules
- * being moved around.
- */
- commits = submodule_commits(changed, p->two->path);
- oid_array_append(commits, &p->two->oid);
- } else {
- /* Submodule is new or was moved here */
- /*
- * NEEDSWORK: When the .git directories of submodules
- * live inside the superprojects .git directory some
- * day we should fetch new submodules directly into
- * that location too when config or options request
- * that so they can be checked out from there.
- */
- continue;
+ submodule = submodule_from_path(commit_oid, p->two->path);
+ if (submodule)
+ name = submodule->name;
+ else {
+ name = default_name_or_path(p->two->path);
+ /* make sure name does not collide with existing one */
+ submodule = submodule_from_name(commit_oid, name);
+ if (submodule) {
+ warning("Submodule in commit %s at path: "
+ "'%s' collides with a submodule named "
+ "the same. Skipping it.",
+ oid_to_hex(commit_oid), name);
+ name = NULL;
+ }
}
+
+ if (!name)
+ continue;
+
+ commits = submodule_commits(changed, name);
+ oid_array_append(commits, &p->two->oid);
}
}
@@ -810,11 +773,14 @@
while ((commit = get_revision(&rev))) {
struct rev_info diff_rev;
+ struct collect_changed_submodules_cb_data data;
+ data.changed = changed;
+ data.commit_oid = &commit->object.oid;
init_revisions(&diff_rev, NULL);
diff_rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
diff_rev.diffopt.format_callback = collect_changed_submodules_cb;
- diff_rev.diffopt.format_callback_data = changed;
+ diff_rev.diffopt.format_callback_data = &data;
diff_tree_combined_merge(commit, 1, &diff_rev);
}
@@ -842,19 +808,36 @@
return 0;
}
+struct has_commit_data {
+ int result;
+ const char *path;
+};
+
static int check_has_commit(const struct object_id *oid, void *data)
{
- int *has_commit = data;
+ struct has_commit_data *cb = data;
- if (!lookup_commit_reference(oid))
- *has_commit = 0;
+ enum object_type type = sha1_object_info(oid->hash, NULL);
- return 0;
+ switch (type) {
+ case OBJ_COMMIT:
+ return 0;
+ case OBJ_BAD:
+ /*
+ * Object is missing or invalid. If invalid, an error message
+ * has already been printed.
+ */
+ cb->result = 0;
+ return 0;
+ default:
+ die(_("submodule entry '%s' (%s) is a %s, not a commit"),
+ cb->path, oid_to_hex(oid), typename(type));
+ }
}
static int submodule_has_commits(const char *path, struct oid_array *commits)
{
- int has_commit = 1;
+ struct has_commit_data has_commit = { 1, path };
/*
* Perform a cheap, but incorrect check for the existence of 'commits'.
@@ -870,7 +853,7 @@
oid_array_for_each_unique(commits, check_has_commit, &has_commit);
- if (has_commit) {
+ if (has_commit.result) {
/*
* Even if the submodule is checked out and the commit is
* present, make sure it exists in the submodule's object store
@@ -889,12 +872,12 @@
cp.dir = path;
if (capture_command(&cp, &out, GIT_MAX_HEXSZ + 1) || out.len)
- has_commit = 0;
+ has_commit.result = 0;
strbuf_release(&out);
}
- return has_commit;
+ return has_commit.result;
}
static int submodule_needs_pushing(const char *path, struct oid_array *commits)
@@ -945,7 +928,7 @@
const char *remotes_name, struct string_list *needs_pushing)
{
struct string_list submodules = STRING_LIST_INIT_DUP;
- struct string_list_item *submodule;
+ struct string_list_item *name;
struct argv_array argv = ARGV_ARRAY_INIT;
/* argv.argv[0] will be ignored by setup_revisions */
@@ -956,9 +939,19 @@
collect_changed_submodules(&submodules, &argv);
- for_each_string_list_item(submodule, &submodules) {
- struct oid_array *commits = submodule->util;
- const char *path = submodule->string;
+ for_each_string_list_item(name, &submodules) {
+ struct oid_array *commits = name->util;
+ const struct submodule *submodule;
+ const char *path = NULL;
+
+ submodule = submodule_from_name(&null_oid, name->string);
+ if (submodule)
+ path = submodule->path;
+ else
+ path = default_name_or_path(name->string);
+
+ if (!path)
+ continue;
if (submodule_needs_pushing(path, commits))
string_list_insert(needs_pushing, path);
@@ -1067,7 +1060,7 @@
char *head;
struct object_id head_oid;
- head = resolve_refdup("HEAD", 0, head_oid.hash, NULL);
+ head = resolve_refdup("HEAD", 0, &head_oid, NULL);
if (!head)
die(_("Failed to resolve HEAD as a valid ref."));
@@ -1116,7 +1109,7 @@
{
struct argv_array argv = ARGV_ARRAY_INIT;
struct string_list changed_submodules = STRING_LIST_INIT_DUP;
- const struct string_list_item *item;
+ const struct string_list_item *name;
/* No need to check if there are no submodules configured */
if (!submodule_from_path(NULL, NULL))
@@ -1131,16 +1124,26 @@
/*
* Collect all submodules (whether checked out or not) for which new
- * commits have been recorded upstream in "changed_submodule_paths".
+ * commits have been recorded upstream in "changed_submodule_names".
*/
collect_changed_submodules(&changed_submodules, &argv);
- for_each_string_list_item(item, &changed_submodules) {
- struct oid_array *commits = item->util;
- const char *path = item->string;
+ for_each_string_list_item(name, &changed_submodules) {
+ struct oid_array *commits = name->util;
+ const struct submodule *submodule;
+ const char *path = NULL;
+
+ submodule = submodule_from_name(&null_oid, name->string);
+ if (submodule)
+ path = submodule->path;
+ else
+ path = default_name_or_path(name->string);
+
+ if (!path)
+ continue;
if (!submodule_has_commits(path, commits))
- string_list_append(&changed_submodule_paths, path);
+ string_list_append(&changed_submodule_names, name->string);
}
free_submodules_oids(&changed_submodules);
@@ -1157,7 +1160,6 @@
struct argv_array args = ARGV_ARRAY_INIT;
int ret;
- gitmodules_config();
/* No need to check if there are no submodules configured */
if (!submodule_from_path(NULL, NULL))
return 0;
@@ -1179,13 +1181,39 @@
struct submodule_parallel_fetch {
int count;
struct argv_array args;
- const char *work_tree;
+ struct repository *r;
const char *prefix;
int command_line_option;
+ int default_option;
int quiet;
int result;
};
-#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0}
+#define SPF_INIT {0, ARGV_ARRAY_INIT, NULL, NULL, 0, 0, 0, 0}
+
+static int get_fetch_recurse_config(const struct submodule *submodule,
+ struct submodule_parallel_fetch *spf)
+{
+ if (spf->command_line_option != RECURSE_SUBMODULES_DEFAULT)
+ return spf->command_line_option;
+
+ if (submodule) {
+ char *key;
+ const char *value;
+
+ int fetch_recurse = submodule->fetch_recurse;
+ key = xstrfmt("submodule.%s.fetchRecurseSubmodules", submodule->name);
+ if (!repo_config_get_string_const(spf->r, key, &value)) {
+ fetch_recurse = parse_fetch_recurse_submodules_arg(key, value);
+ }
+ free(key);
+
+ if (fetch_recurse != RECURSE_SUBMODULES_NONE)
+ /* local config overrules everything except commandline */
+ return fetch_recurse;
+ }
+
+ return spf->default_option;
+}
static int get_next_submodule(struct child_process *cp,
struct strbuf *err, void *data, void **task_cb)
@@ -1193,52 +1221,45 @@
int ret = 0;
struct submodule_parallel_fetch *spf = data;
- for (; spf->count < active_nr; spf->count++) {
+ for (; spf->count < spf->r->index->cache_nr; spf->count++) {
struct strbuf submodule_path = STRBUF_INIT;
struct strbuf submodule_git_dir = STRBUF_INIT;
struct strbuf submodule_prefix = STRBUF_INIT;
- const struct cache_entry *ce = active_cache[spf->count];
+ const struct cache_entry *ce = spf->r->index->cache[spf->count];
const char *git_dir, *default_argv;
const struct submodule *submodule;
+ struct submodule default_submodule = SUBMODULE_INIT;
if (!S_ISGITLINK(ce->ce_mode))
continue;
- submodule = submodule_from_path(null_sha1, ce->name);
- if (!submodule)
- submodule = submodule_from_name(null_sha1, ce->name);
-
- default_argv = "yes";
- if (spf->command_line_option == RECURSE_SUBMODULES_DEFAULT) {
- if (submodule &&
- submodule->fetch_recurse !=
- RECURSE_SUBMODULES_NONE) {
- if (submodule->fetch_recurse ==
- RECURSE_SUBMODULES_OFF)
- continue;
- if (submodule->fetch_recurse ==
- RECURSE_SUBMODULES_ON_DEMAND) {
- if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
- continue;
- default_argv = "on-demand";
- }
- } else {
- if ((config_fetch_recurse_submodules == RECURSE_SUBMODULES_OFF) ||
- gitmodules_is_unmerged)
- continue;
- if (config_fetch_recurse_submodules == RECURSE_SUBMODULES_ON_DEMAND) {
- if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
- continue;
- default_argv = "on-demand";
- }
+ submodule = submodule_from_cache(spf->r, &null_oid, ce->name);
+ if (!submodule) {
+ const char *name = default_name_or_path(ce->name);
+ if (name) {
+ default_submodule.path = default_submodule.name = name;
+ submodule = &default_submodule;
}
- } else if (spf->command_line_option == RECURSE_SUBMODULES_ON_DEMAND) {
- if (!unsorted_string_list_lookup(&changed_submodule_paths, ce->name))
- continue;
- default_argv = "on-demand";
}
- strbuf_addf(&submodule_path, "%s/%s", spf->work_tree, ce->name);
+ switch (get_fetch_recurse_config(submodule, spf))
+ {
+ default:
+ case RECURSE_SUBMODULES_DEFAULT:
+ case RECURSE_SUBMODULES_ON_DEMAND:
+ if (!submodule || !unsorted_string_list_lookup(&changed_submodule_names,
+ submodule->name))
+ continue;
+ default_argv = "on-demand";
+ break;
+ case RECURSE_SUBMODULES_ON:
+ default_argv = "yes";
+ break;
+ case RECURSE_SUBMODULES_OFF:
+ continue;
+ }
+
+ strbuf_repo_worktree_path(&submodule_path, spf->r, "%s", ce->name);
strbuf_addf(&submodule_git_dir, "%s/.git", submodule_path.buf);
strbuf_addf(&submodule_prefix, "%s%s/", spf->prefix, ce->name);
git_dir = read_gitfile(submodule_git_dir.buf);
@@ -1291,22 +1312,25 @@
return 0;
}
-int fetch_populated_submodules(const struct argv_array *options,
+int fetch_populated_submodules(struct repository *r,
+ const struct argv_array *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;
- spf.work_tree = get_git_work_tree();
+ spf.r = r;
spf.command_line_option = command_line_option;
+ spf.default_option = default_option;
spf.quiet = quiet;
spf.prefix = prefix;
- if (!spf.work_tree)
+ if (!r->worktree)
goto out;
- if (read_cache() < 0)
+ if (repo_read_index(r) < 0)
die("index file corrupt");
argv_array_push(&spf.args, "fetch");
@@ -1315,9 +1339,6 @@
argv_array_push(&spf.args, "--recurse-submodules-default");
/* default value, "--submodule-prefix" and its value are added later */
- if (max_parallel_jobs < 0)
- max_parallel_jobs = parallel_jobs;
-
calculate_changed_submodule_paths();
run_processes_parallel(max_parallel_jobs,
get_next_submodule,
@@ -1327,7 +1348,7 @@
argv_array_clear(&spf.args);
out:
- string_list_clear(&changed_submodule_paths, 1);
+ string_list_clear(&changed_submodule_names, 1);
return spf.result;
}
@@ -1582,7 +1603,7 @@
if (old && !is_submodule_populated_gently(path, error_code_ptr))
return 0;
- sub = submodule_from_path(null_sha1, path);
+ sub = submodule_from_path(&null_oid, path);
if (!sub)
die("BUG: could not get submodule information for '%s'", path);
@@ -1636,7 +1657,9 @@
else
argv_array_push(&cp.args, "-m");
- argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
+ if (!(flags & SUBMODULE_MOVE_HEAD_FORCE))
+ argv_array_push(&cp.args, old ? old : EMPTY_TREE_SHA1_HEX);
+
argv_array_push(&cp.args, new ? new : EMPTY_TREE_SHA1_HEX);
if (run_command(&cp)) {
@@ -1653,7 +1676,8 @@
cp.dir = path;
prepare_submodule_repo_env(&cp.env_array);
- argv_array_pushl(&cp.args, "update-ref", "HEAD", new, NULL);
+ argv_array_pushl(&cp.args, "update-ref", "HEAD",
+ "--no-deref", new, NULL);
if (run_command(&cp)) {
ret = -1;
@@ -1696,6 +1720,8 @@
oid_to_hex(&a->object.oid));
init_revisions(&revs, NULL);
rev_opts.submodule = path;
+ /* FIXME: can't handle linked worktrees in submodules yet */
+ revs.single_worktree = path != NULL;
setup_revisions(ARRAY_SIZE(rev_args)-1, rev_args, &revs, &rev_opts);
/* save all revisions from the above list that contain b */
@@ -1728,7 +1754,7 @@
add_object_array(merges.objects[i].item, NULL, result);
}
- free(merges.objects);
+ object_array_clear(&merges);
return result->nr;
}
@@ -1833,15 +1859,10 @@
print_commit((struct commit *) merges.objects[i].item);
}
- free(merges.objects);
+ object_array_clear(&merges);
return 0;
}
-int parallel_submodules(void)
-{
- return parallel_jobs;
-}
-
/*
* Embeds a single submodules git directory into the superprojects git dir,
* non recursively.
@@ -1864,7 +1885,7 @@
real_old_git_dir = real_pathdup(old_git_dir, 1);
- sub = submodule_from_path(null_sha1, path);
+ sub = submodule_from_path(&null_oid, path);
if (!sub)
die(_("could not lookup name for submodule '%s'"), path);
@@ -1920,7 +1941,7 @@
* superproject did not rewrite the git file links yet,
* fix it now.
*/
- sub = submodule_from_path(null_sha1, path);
+ sub = submodule_from_path(&null_oid, path);
if (!sub)
die(_("could not lookup name for submodule '%s'"), path);
connect_work_tree_and_git_dir(path,
@@ -2045,6 +2066,10 @@
return ret;
}
+/*
+ * Put the gitdir for a submodule (given relative to the main
+ * repository worktree) into `buf`, or return -1 on error.
+ */
int submodule_to_gitdir(struct strbuf *buf, const char *submodule)
{
const struct submodule *sub;
@@ -2062,8 +2087,7 @@
strbuf_addstr(buf, git_dir);
}
if (!is_git_directory(buf->buf)) {
- gitmodules_config();
- sub = submodule_from_path(null_sha1, submodule);
+ sub = submodule_from_path(&null_oid, submodule);
if (!sub) {
ret = -1;
goto cleanup;
diff --git a/submodule.h b/submodule.h
index 3c239d1..b9b7ef0 100644
--- a/submodule.h
+++ b/submodule.h
@@ -33,22 +33,18 @@
};
#define SUBMODULE_UPDATE_STRATEGY_INIT {SM_UPDATE_UNSPECIFIED, NULL}
-extern int is_staging_gitmodules_ok(void);
+extern int is_gitmodules_unmerged(const struct index_state *istate);
+extern int is_staging_gitmodules_ok(struct index_state *istate);
extern int update_path_in_gitmodules(const char *oldpath, const char *newpath);
extern int remove_path_from_gitmodules(const char *path);
-extern void stage_updated_gitmodules(void);
+extern void stage_updated_gitmodules(struct index_state *istate);
extern void set_diffopt_flags_from_submodule_config(struct diff_options *,
const char *path);
-extern int submodule_config(const char *var, const char *value, void *cb);
extern 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);
-void load_submodule_cache(void);
-extern void gitmodules_config(void);
-extern void repo_read_gitmodules(struct repository *repo);
-extern void gitmodules_config_sha1(const unsigned char *commit_sha1);
extern int is_submodule_active(struct repository *repo, const char *path);
/*
* Determine if a submodule has been populated at a given 'path' by checking if
@@ -61,22 +57,17 @@
const char *prefix);
extern void die_path_inside_submodule(const struct index_state *istate,
const struct pathspec *ps);
+extern enum submodule_update_type parse_submodule_update_type(const char *value);
extern int parse_submodule_update_strategy(const char *value,
struct submodule_update_strategy *dst);
extern const char *submodule_strategy_to_string(const struct submodule_update_strategy *s);
extern void handle_ignore_submodules_arg(struct diff_options *, const char *);
-extern void show_submodule_summary(FILE *f, const char *path,
- const char *line_prefix,
+extern void show_submodule_summary(struct diff_options *o, const char *path,
struct object_id *one, struct object_id *two,
- unsigned dirty_submodule, const char *meta,
- const char *del, const char *add, const char *reset);
-extern void show_submodule_inline_diff(FILE *f, const char *path,
- const char *line_prefix,
+ unsigned dirty_submodule);
+extern void show_submodule_inline_diff(struct diff_options *o, const char *path,
struct object_id *one, struct object_id *two,
- unsigned dirty_submodule, const char *meta,
- const char *del, const char *add, const char *reset,
- const struct diff_options *opt);
-extern void set_config_fetch_recurse_submodules(int value);
+ unsigned dirty_submodule);
/* Check if we want to update any submodule.*/
extern int should_update_submodules(void);
/*
@@ -85,9 +76,12 @@
*/
extern const struct submodule *submodule_from_ce(const struct cache_entry *ce);
extern void check_for_new_submodule_commits(struct object_id *oid);
-extern int fetch_populated_submodules(const struct argv_array *options,
- const char *prefix, int command_line_option,
- int quiet, int max_parallel_jobs);
+extern int fetch_populated_submodules(struct repository *r,
+ const struct argv_array *options,
+ const char *prefix,
+ int command_line_option,
+ int default_option,
+ int quiet, int max_parallel_jobs);
extern unsigned is_submodule_modified(const char *path, int ignore_untracked);
extern int submodule_uses_gitfile(const char *path);
@@ -112,7 +106,6 @@
const struct string_list *push_options,
int dry_run);
extern void connect_work_tree_and_git_dir(const char *work_tree, const char *git_dir);
-extern int parallel_submodules(void);
/*
* Given a submodule path (as in the index), return the repository
* path of that submodule in 'buf'. Return -1 on error or when the
diff --git a/t/Makefile b/t/Makefile
index 1bb06c3..96317a3 100644
--- a/t/Makefile
+++ b/t/Makefile
@@ -8,6 +8,7 @@
#GIT_TEST_OPTS = --verbose --debug
SHELL_PATH ?= $(SHELL)
+TEST_SHELL_PATH ?= $(SHELL_PATH)
PERL_PATH ?= /usr/bin/perl
TAR ?= $(TAR)
RM ?= rm -f
@@ -23,6 +24,7 @@
# Shell quote;
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
+TEST_SHELL_PATH_SQ = $(subst ','\'',$(TEST_SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
TEST_RESULTS_DIRECTORY_SQ = $(subst ','\'',$(TEST_RESULTS_DIRECTORY))
@@ -42,11 +44,11 @@
test -z "$$failed" || $(MAKE) $$failed
prove: pre-clean $(TEST_LINT)
- @echo "*** prove ***"; $(PROVE) --exec '$(SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
+ @echo "*** prove ***"; $(PROVE) --exec '$(TEST_SHELL_PATH_SQ)' $(GIT_PROVE_OPTS) $(T) :: $(GIT_TEST_OPTS)
$(MAKE) clean-except-prove-cache
$(T):
- @echo "*** $@ ***"; '$(SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
+ @echo "*** $@ ***"; '$(TEST_SHELL_PATH_SQ)' $@ $(GIT_TEST_OPTS)
pre-clean:
$(RM) -r '$(TEST_RESULTS_DIRECTORY_SQ)'
diff --git a/t/README b/t/README
index 4b079e4..1a1361a 100644
--- a/t/README
+++ b/t/README
@@ -332,13 +332,10 @@
-------------
The test script is written as a shell script. It should start
-with the standard "#!/bin/sh" with copyright notices, and an
+with the standard "#!/bin/sh", and an
assignment to variable 'test_description', like this:
#!/bin/sh
- #
- # Copyright (c) 2005 Junio C Hamano
- #
test_description='xxx test (option --frotz)
@@ -658,7 +655,7 @@
test_expect_code 1 git merge "merge msg" B master
'
- - test_must_fail <git-command>
+ - test_must_fail [<options>] <git-command>
Run a git command and ensure it fails in a controlled way. Use
this instead of "! <git-command>". When git-command dies due to a
@@ -666,17 +663,32 @@
treats it as just another expected failure, which would let such a
bug go unnoticed.
- - test_might_fail <git-command>
+ Accepts the following options:
+
+ ok=<signal-name>[,<...>]:
+ Don't treat an exit caused by the given signal as error.
+ Multiple signals can be specified as a comma separated list.
+ Currently recognized signal names are: sigpipe, success.
+ (Don't use 'success', use 'test_might_fail' instead.)
+
+ - test_might_fail [<options>] <git-command>
Similar to test_must_fail, but tolerate success, too. Use this
instead of "<git-command> || :" to catch failures due to segv.
+ Accepts the same options as test_must_fail.
+
- test_cmp <expected> <actual>
Check whether the content of the <actual> file matches the
<expected> file. This behaves like "cmp" but produces more
helpful output when the test is run with "-v" option.
+ - test_cmp_rev <expected> <actual>
+
+ Check whether the <expected> rev points to the same commit as the
+ <actual> rev.
+
- test_line_count (= | -lt | -ge | ...) <length> <file>
Check whether a file has the length it is expected to.
@@ -808,6 +820,18 @@
Git was compiled with support for PCRE. Wrap any tests
that use git-grep --perl-regexp or git-grep -P in these.
+ - LIBPCRE1
+
+ Git was compiled with PCRE v1 support via
+ USE_LIBPCRE1=YesPlease. Wrap any PCRE using tests that for some
+ reason need v1 of the PCRE library instead of v2 in these.
+
+ - LIBPCRE2
+
+ Git was compiled with PCRE v2 support via
+ USE_LIBPCRE2=YesPlease. Wrap any PCRE using tests that for some
+ reason need v2 of the PCRE library instead of v1 in these.
+
- CASE_INSENSITIVE_FS
Test is run on a case insensitive file system.
diff --git a/t/check-non-portable-shell.pl b/t/check-non-portable-shell.pl
index 03dc9d2..e07f028 100755
--- a/t/check-non-portable-shell.pl
+++ b/t/check-non-portable-shell.pl
@@ -21,6 +21,7 @@
/^\s*declare\s+/ and err 'arrays/declare not portable';
/^\s*[^#]\s*which\s/ and err 'which is not portable (please use type)';
/\btest\s+[^=]*==/ and err '"test a == b" is not portable (please use =)';
+ /\bwc -l.*"\s*=/ and err '`"$(wc -l)"` is not portable (please use test_line_count)';
/\bexport\s+[A-Za-z0-9_]*=/ and err '"export FOO=bar" is not portable (please use FOO=bar && export FOO)';
# this resets our $. for each file
close ARGV if eof;
diff --git a/t/helper/.gitignore b/t/helper/.gitignore
index 7216502..2bad28a 100644
--- a/t/helper/.gitignore
+++ b/t/helper/.gitignore
@@ -1,37 +1,5 @@
-/test-chmtime
-/test-ctype
-/test-config
-/test-date
-/test-delta
-/test-dump-cache-tree
-/test-dump-split-index
-/test-dump-untracked-cache
-/test-fake-ssh
-/test-scrap-cache-tree
-/test-genrandom
-/test-hashmap
-/test-index-version
-/test-lazy-init-name-hash
-/test-line-buffer
-/test-match-trees
-/test-mergesort
-/test-mktemp
-/test-online-cpus
-/test-parse-options
-/test-path-utils
-/test-prio-queue
-/test-read-cache
-/test-ref-store
-/test-regex
-/test-revision-walking
-/test-run-command
-/test-sha1
-/test-sha1-array
-/test-sigchain
-/test-strcmp-offset
-/test-string-list
-/test-submodule-config
-/test-subprocess
-/test-svn-fe
-/test-urlmatch-normalization
-/test-wildmatch
+*
+!*.sh
+!*.[ch]
+!*.gitignore
+
diff --git a/t/helper/test-date.c b/t/helper/test-date.c
index f414a3a..ac83687 100644
--- a/t/helper/test-date.c
+++ b/t/helper/test-date.c
@@ -5,6 +5,7 @@
" test-date show:<format> [time_t]...\n"
" test-date parse [date]...\n"
" test-date approxidate [date]...\n"
+" test-date timestamp [date]...\n"
" test-date is64bit\n"
" test-date time_t-is64bit\n";
@@ -71,6 +72,15 @@
}
}
+static void parse_approx_timestamp(const char **argv, struct timeval *now)
+{
+ for (; *argv; argv++) {
+ timestamp_t t;
+ t = approxidate_relative(*argv, now);
+ printf("%s -> %"PRItime"\n", *argv, t);
+ }
+}
+
int cmd_main(int argc, const char **argv)
{
struct timeval now;
@@ -95,6 +105,8 @@
parse_dates(argv+1, &now);
else if (!strcmp(*argv, "approxidate"))
parse_approxidate(argv+1, &now);
+ else if (!strcmp(*argv, "timestamp"))
+ parse_approx_timestamp(argv+1, &now);
else if (!strcmp(*argv, "is64bit"))
return sizeof(timestamp_t) == 8 ? 0 : 1;
else if (!strcmp(*argv, "time_t-is64bit"))
diff --git a/t/helper/test-drop-caches.c b/t/helper/test-drop-caches.c
new file mode 100644
index 0000000..bd1a857
--- /dev/null
+++ b/t/helper/test-drop-caches.c
@@ -0,0 +1,164 @@
+#include "git-compat-util.h"
+
+#if defined(GIT_WINDOWS_NATIVE)
+
+static int cmd_sync(void)
+{
+ char Buffer[MAX_PATH];
+ DWORD dwRet;
+ char szVolumeAccessPath[] = "\\\\.\\X:";
+ HANDLE hVolWrite;
+ int success = 0;
+
+ dwRet = GetCurrentDirectory(MAX_PATH, Buffer);
+ if ((0 == dwRet) || (dwRet > MAX_PATH))
+ return error("Error getting current directory");
+
+ if ((Buffer[0] < 'A') || (Buffer[0] > 'Z'))
+ return error("Invalid drive letter '%c'", Buffer[0]);
+
+ szVolumeAccessPath[4] = Buffer[0];
+ hVolWrite = CreateFile(szVolumeAccessPath, GENERIC_READ | GENERIC_WRITE,
+ FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL);
+ if (INVALID_HANDLE_VALUE == hVolWrite)
+ return error("Unable to open volume for writing, need admin access");
+
+ success = FlushFileBuffers(hVolWrite);
+ if (!success)
+ error("Unable to flush volume");
+
+ CloseHandle(hVolWrite);
+
+ return !success;
+}
+
+#define STATUS_SUCCESS (0x00000000L)
+#define STATUS_PRIVILEGE_NOT_HELD (0xC0000061L)
+
+typedef enum _SYSTEM_INFORMATION_CLASS {
+ SystemMemoryListInformation = 80,
+} SYSTEM_INFORMATION_CLASS;
+
+typedef enum _SYSTEM_MEMORY_LIST_COMMAND {
+ MemoryCaptureAccessedBits,
+ MemoryCaptureAndResetAccessedBits,
+ MemoryEmptyWorkingSets,
+ MemoryFlushModifiedList,
+ MemoryPurgeStandbyList,
+ MemoryPurgeLowPriorityStandbyList,
+ MemoryCommandMax
+} SYSTEM_MEMORY_LIST_COMMAND;
+
+static BOOL GetPrivilege(HANDLE TokenHandle, LPCSTR lpName, int flags)
+{
+ BOOL bResult;
+ DWORD dwBufferLength;
+ LUID luid;
+ TOKEN_PRIVILEGES tpPreviousState;
+ TOKEN_PRIVILEGES tpNewState;
+
+ dwBufferLength = 16;
+ bResult = LookupPrivilegeValueA(0, lpName, &luid);
+ if (bResult) {
+ tpNewState.PrivilegeCount = 1;
+ tpNewState.Privileges[0].Luid = luid;
+ tpNewState.Privileges[0].Attributes = 0;
+ bResult = AdjustTokenPrivileges(TokenHandle, 0, &tpNewState,
+ (DWORD)((LPBYTE)&(tpNewState.Privileges[1]) - (LPBYTE)&tpNewState),
+ &tpPreviousState, &dwBufferLength);
+ if (bResult) {
+ tpPreviousState.PrivilegeCount = 1;
+ tpPreviousState.Privileges[0].Luid = luid;
+ tpPreviousState.Privileges[0].Attributes = flags != 0 ? 2 : 0;
+ bResult = AdjustTokenPrivileges(TokenHandle, 0, &tpPreviousState,
+ dwBufferLength, 0, 0);
+ }
+ }
+ return bResult;
+}
+
+static int cmd_dropcaches(void)
+{
+ HANDLE hProcess = GetCurrentProcess();
+ HANDLE hToken;
+ HMODULE ntdll;
+ DWORD(WINAPI *NtSetSystemInformation)(INT, PVOID, ULONG);
+ SYSTEM_MEMORY_LIST_COMMAND command;
+ int status;
+
+ if (!OpenProcessToken(hProcess, TOKEN_QUERY | TOKEN_ADJUST_PRIVILEGES, &hToken))
+ return error("Can't open current process token");
+
+ if (!GetPrivilege(hToken, "SeProfileSingleProcessPrivilege", 1))
+ return error("Can't get SeProfileSingleProcessPrivilege");
+
+ CloseHandle(hToken);
+
+ ntdll = LoadLibrary("ntdll.dll");
+ if (!ntdll)
+ return error("Can't load ntdll.dll, wrong Windows version?");
+
+ NtSetSystemInformation =
+ (DWORD(WINAPI *)(INT, PVOID, ULONG))GetProcAddress(ntdll, "NtSetSystemInformation");
+ if (!NtSetSystemInformation)
+ return error("Can't get function addresses, wrong Windows version?");
+
+ command = MemoryPurgeStandbyList;
+ status = NtSetSystemInformation(
+ SystemMemoryListInformation,
+ &command,
+ sizeof(SYSTEM_MEMORY_LIST_COMMAND)
+ );
+ if (status == STATUS_PRIVILEGE_NOT_HELD)
+ error("Insufficient privileges to purge the standby list, need admin access");
+ else if (status != STATUS_SUCCESS)
+ error("Unable to execute the memory list command %d", status);
+
+ FreeLibrary(ntdll);
+
+ return status;
+}
+
+#elif defined(__linux__)
+
+static int cmd_sync(void)
+{
+ return system("sync");
+}
+
+static int cmd_dropcaches(void)
+{
+ return system("echo 3 | sudo tee /proc/sys/vm/drop_caches");
+}
+
+#elif defined(__APPLE__)
+
+static int cmd_sync(void)
+{
+ return system("sync");
+}
+
+static int cmd_dropcaches(void)
+{
+ return system("sudo purge");
+}
+
+#else
+
+static int cmd_sync(void)
+{
+ return 0;
+}
+
+static int cmd_dropcaches(void)
+{
+ return error("drop caches not implemented on this platform");
+}
+
+#endif
+
+int cmd_main(int argc, const char **argv)
+{
+ cmd_sync();
+ return cmd_dropcaches();
+}
diff --git a/t/helper/test-dump-fsmonitor.c b/t/helper/test-dump-fsmonitor.c
new file mode 100644
index 0000000..ad45270
--- /dev/null
+++ b/t/helper/test-dump-fsmonitor.c
@@ -0,0 +1,21 @@
+#include "cache.h"
+
+int cmd_main(int ac, const char **av)
+{
+ struct index_state *istate = &the_index;
+ int i;
+
+ setup_git_directory();
+ if (do_read_index(istate, get_index_file(), 0) < 0)
+ die("unable to read index file");
+ if (!istate->fsmonitor_last_update) {
+ printf("no fsmonitor\n");
+ return 0;
+ }
+ printf("fsmonitor last update %"PRIuMAX"\n", (uintmax_t)istate->fsmonitor_last_update);
+
+ for (i = 0; i < istate->cache_nr; i++)
+ printf((istate->cache[i]->ce_flags & CE_FSMONITOR_VALID) ? "+" : "-");
+
+ return 0;
+}
diff --git a/t/helper/test-example-decorate.c b/t/helper/test-example-decorate.c
new file mode 100644
index 0000000..90dc97a
--- /dev/null
+++ b/t/helper/test-example-decorate.c
@@ -0,0 +1,74 @@
+#include "cache.h"
+#include "object.h"
+#include "decorate.h"
+
+int cmd_main(int argc, const char **argv)
+{
+ struct decoration n;
+ struct object_id one_oid = { {1} };
+ struct object_id two_oid = { {2} };
+ struct object_id three_oid = { {3} };
+ struct object *one, *two, *three;
+
+ int decoration_a, decoration_b;
+
+ void *ret;
+
+ int i, objects_noticed = 0;
+
+ /*
+ * The struct must be zero-initialized.
+ */
+ memset(&n, 0, sizeof(n));
+
+ /*
+ * Add 2 objects, one with a non-NULL decoration and one with a NULL
+ * decoration.
+ */
+ one = lookup_unknown_object(one_oid.hash);
+ two = lookup_unknown_object(two_oid.hash);
+ ret = add_decoration(&n, one, &decoration_a);
+ if (ret)
+ die("BUG: when adding a brand-new object, NULL should be returned");
+ ret = add_decoration(&n, two, NULL);
+ if (ret)
+ die("BUG: when adding a brand-new object, NULL should be returned");
+
+ /*
+ * When re-adding an already existing object, the old decoration is
+ * returned.
+ */
+ ret = add_decoration(&n, one, NULL);
+ if (ret != &decoration_a)
+ die("BUG: when readding an already existing object, existing decoration should be returned");
+ ret = add_decoration(&n, two, &decoration_b);
+ if (ret)
+ die("BUG: when readding an already existing object, existing decoration should be returned");
+
+ /*
+ * Lookup returns the added declarations, or NULL if the object was
+ * never added.
+ */
+ ret = lookup_decoration(&n, one);
+ if (ret)
+ die("BUG: lookup should return added declaration");
+ ret = lookup_decoration(&n, two);
+ if (ret != &decoration_b)
+ die("BUG: lookup should return added declaration");
+ three = lookup_unknown_object(three_oid.hash);
+ ret = lookup_decoration(&n, three);
+ if (ret)
+ die("BUG: lookup for unknown object should return NULL");
+
+ /*
+ * The user can also loop through all entries.
+ */
+ for (i = 0; i < n.size; i++) {
+ if (n.entries[i].base)
+ objects_noticed++;
+ }
+ if (objects_noticed != 2)
+ die("BUG: should have 2 objects");
+
+ return 0;
+}
diff --git a/t/helper/test-hashmap.c b/t/helper/test-hashmap.c
index 095d739..1145d51 100644
--- a/t/helper/test-hashmap.c
+++ b/t/helper/test-hashmap.c
@@ -13,20 +13,20 @@
return e->key + strlen(e->key) + 1;
}
-static int test_entry_cmp(const void *unused_cmp_data,
- const struct test_entry *e1,
- const struct test_entry *e2,
- const char* key)
+static int test_entry_cmp(const void *cmp_data,
+ const void *entry,
+ const void *entry_or_key,
+ const void *keydata)
{
- return strcmp(e1->key, key ? key : e2->key);
-}
+ const int ignore_case = cmp_data ? *((int *)cmp_data) : 0;
+ const struct test_entry *e1 = entry;
+ const struct test_entry *e2 = entry_or_key;
+ const char *key = keydata;
-static int test_entry_cmp_icase(const void *unused_cmp_data,
- const struct test_entry *e1,
- const struct test_entry *e2,
- const char* key)
-{
- return strcasecmp(e1->key, key ? key : e2->key);
+ if (ignore_case)
+ return strcasecmp(e1->key, key ? key : e2->key);
+ else
+ return strcmp(e1->key, key ? key : e2->key);
}
static struct test_entry *alloc_test_entry(int hash, char *key, int klen,
@@ -96,8 +96,7 @@
if (method & TEST_ADD) {
/* test adding to the map */
for (j = 0; j < rounds; j++) {
- hashmap_init(&map, (hashmap_cmp_fn) test_entry_cmp,
- NULL, 0);
+ hashmap_init(&map, test_entry_cmp, NULL, 0);
/* add entries */
for (i = 0; i < TEST_SIZE; i++) {
@@ -109,7 +108,7 @@
}
} else {
/* test map lookups */
- hashmap_init(&map, (hashmap_cmp_fn) test_entry_cmp, NULL, 0);
+ hashmap_init(&map, test_entry_cmp, NULL, 0);
/* fill the map (sparsely if specified) */
j = (method & TEST_SPARSE) ? TEST_SIZE / 10 : TEST_SIZE;
@@ -151,8 +150,7 @@
/* init hash map */
icase = argc > 1 && !strcmp("ignorecase", argv[1]);
- hashmap_init(&map, (hashmap_cmp_fn) (icase ? test_entry_cmp_icase
- : test_entry_cmp), NULL, 0);
+ hashmap_init(&map, test_entry_cmp, &icase, 0);
/* process commands from stdin */
while (fgets(line, sizeof(line), stdin)) {
@@ -237,7 +235,8 @@
} else if (!strcmp("size", cmd)) {
/* print table sizes */
- printf("%u %u\n", map.tablesize, map.size);
+ printf("%u %u\n", map.tablesize,
+ hashmap_get_size(&map));
} else if (!strcmp("intern", cmd) && l1) {
diff --git a/t/helper/test-lazy-init-name-hash.c b/t/helper/test-lazy-init-name-hash.c
index 6368a89..297fb01 100644
--- a/t/helper/test-lazy-init-name-hash.c
+++ b/t/helper/test-lazy-init-name-hash.c
@@ -112,7 +112,7 @@
{
uint64_t t1s, t1m, t2s, t2m;
int cache_nr_limit;
- int nr_threads_used;
+ int nr_threads_used = 0;
int i;
int nr;
diff --git a/t/helper/test-line-buffer.c b/t/helper/test-line-buffer.c
index 81575fe..078dd7e 100644
--- a/t/helper/test-line-buffer.c
+++ b/t/helper/test-line-buffer.c
@@ -17,27 +17,17 @@
static void handle_command(const char *command, const char *arg, struct line_buffer *buf)
{
- switch (*command) {
- case 'b':
- if (starts_with(command, "binary ")) {
- struct strbuf sb = STRBUF_INIT;
- strbuf_addch(&sb, '>');
- buffer_read_binary(buf, &sb, strtouint32(arg));
- fwrite(sb.buf, 1, sb.len, stdout);
- strbuf_release(&sb);
- return;
- }
- case 'c':
- if (starts_with(command, "copy ")) {
- buffer_copy_bytes(buf, strtouint32(arg));
- return;
- }
- case 's':
- if (starts_with(command, "skip ")) {
- buffer_skip_bytes(buf, strtouint32(arg));
- return;
- }
- default:
+ if (starts_with(command, "binary ")) {
+ struct strbuf sb = STRBUF_INIT;
+ strbuf_addch(&sb, '>');
+ buffer_read_binary(buf, &sb, strtouint32(arg));
+ fwrite(sb.buf, 1, sb.len, stdout);
+ strbuf_release(&sb);
+ } else if (starts_with(command, "copy ")) {
+ buffer_copy_bytes(buf, strtouint32(arg));
+ } else if (starts_with(command, "skip ")) {
+ buffer_skip_bytes(buf, strtouint32(arg));
+ } else {
die("unrecognized command: %s", command);
}
}
diff --git a/t/helper/test-parse-options.c b/t/helper/test-parse-options.c
index 75fe883..630c76d 100644
--- a/t/helper/test-parse-options.c
+++ b/t/helper/test-parse-options.c
@@ -99,6 +99,8 @@
const char *prefix = "prefix/";
const char *usage[] = {
"test-parse-options <options>",
+ "",
+ "A helper function for the parse-options API.",
NULL
};
struct string_list expect = STRING_LIST_INIT_NODUP;
diff --git a/t/helper/test-ref-store.c b/t/helper/test-ref-store.c
index 05d8c4d..7120634 100644
--- a/t/helper/test-ref-store.c
+++ b/t/helper/test-ref-store.c
@@ -72,12 +72,12 @@
static int cmd_peel_ref(struct ref_store *refs, const char **argv)
{
const char *refname = notnull(*argv++, "refname");
- unsigned char sha1[20];
+ struct object_id oid;
int ret;
- ret = refs_peel_ref(refs, refname, sha1);
+ ret = refs_peel_ref(refs, refname, &oid);
if (!ret)
- puts(sha1_to_hex(sha1));
+ puts(oid_to_hex(&oid));
return ret;
}
@@ -127,15 +127,15 @@
static int cmd_resolve_ref(struct ref_store *refs, const char **argv)
{
- unsigned char sha1[20];
+ struct object_id oid;
const char *refname = notnull(*argv++, "refname");
int resolve_flags = arg_flags(*argv++, "resolve-flags");
int flags;
const char *ref;
ref = refs_resolve_ref_unsafe(refs, refname, resolve_flags,
- sha1, &flags);
- printf("%s %s 0x%x\n", sha1_to_hex(sha1), ref, flags);
+ &oid, &flags);
+ printf("%s %s 0x%x\n", oid_to_hex(&oid), ref ? ref : "(null)", flags);
return ref ? 0 : 1;
}
@@ -218,12 +218,12 @@
const char *refname = notnull(*argv++, "refname");
const char *sha1_buf = notnull(*argv++, "old-sha1");
unsigned int flags = arg_flags(*argv++, "flags");
- unsigned char old_sha1[20];
+ struct object_id old_oid;
- if (get_sha1_hex(sha1_buf, old_sha1))
+ if (get_oid_hex(sha1_buf, &old_oid))
die("not sha-1");
- return refs_delete_ref(refs, msg, refname, old_sha1, flags);
+ return refs_delete_ref(refs, msg, refname, &old_oid, flags);
}
static int cmd_update_ref(struct ref_store *refs, const char **argv)
@@ -233,15 +233,15 @@
const char *new_sha1_buf = notnull(*argv++, "old-sha1");
const char *old_sha1_buf = notnull(*argv++, "old-sha1");
unsigned int flags = arg_flags(*argv++, "flags");
- unsigned char old_sha1[20];
- unsigned char new_sha1[20];
+ struct object_id old_oid;
+ struct object_id new_oid;
- if (get_sha1_hex(old_sha1_buf, old_sha1) ||
- get_sha1_hex(new_sha1_buf, new_sha1))
+ if (get_oid_hex(old_sha1_buf, &old_oid) ||
+ get_oid_hex(new_sha1_buf, &new_oid))
die("not sha-1");
return refs_update_ref(refs, msg, refname,
- new_sha1, old_sha1,
+ &new_oid, &old_oid,
flags, UPDATE_REFS_DIE_ON_ERR);
}
diff --git a/t/helper/test-submodule-config.c b/t/helper/test-submodule-config.c
index c6c57bb..f23db3b 100644
--- a/t/helper/test-submodule-config.c
+++ b/t/helper/test-submodule-config.c
@@ -10,11 +10,6 @@
exit(1);
}
-static int git_test_config(const char *var, const char *value, void *cb)
-{
- return parse_submodule_config_option(var, value);
-}
-
int cmd_main(int argc, const char **argv)
{
const char **arg = argv;
@@ -37,11 +32,9 @@
die_usage(argc, argv, "Wrong number of arguments.");
setup_git_directory();
- gitmodules_config();
- git_config(git_test_config, NULL);
while (*arg) {
- unsigned char commit_sha1[20];
+ struct object_id commit_oid;
const struct submodule *submodule;
const char *commit;
const char *path_or_name;
@@ -50,14 +43,14 @@
path_or_name = arg[1];
if (commit[0] == '\0')
- hashclr(commit_sha1);
- else if (get_sha1(commit, commit_sha1) < 0)
+ oidclr(&commit_oid);
+ else if (get_oid(commit, &commit_oid) < 0)
die_usage(argc, argv, "Commit not found.");
if (lookup_name) {
- submodule = submodule_from_name(commit_sha1, path_or_name);
+ submodule = submodule_from_name(&commit_oid, path_or_name);
} else
- submodule = submodule_from_path(commit_sha1, path_or_name);
+ submodule = submodule_from_path(&commit_oid, path_or_name);
if (!submodule)
die_usage(argc, argv, "Submodule not found.");
diff --git a/t/helper/test-write-cache.c b/t/helper/test-write-cache.c
new file mode 100644
index 0000000..b7ee039
--- /dev/null
+++ b/t/helper/test-write-cache.c
@@ -0,0 +1,23 @@
+#include "cache.h"
+#include "lockfile.h"
+
+static struct lock_file index_lock;
+
+int cmd_main(int argc, const char **argv)
+{
+ int i, cnt = 1, lockfd;
+ if (argc == 2)
+ cnt = strtol(argv[1], NULL, 0);
+ setup_git_directory();
+ read_cache();
+ for (i = 0; i < cnt; i++) {
+ lockfd = hold_locked_index(&index_lock, LOCK_DIE_ON_ERROR);
+ if (0 <= lockfd) {
+ write_locked_index(&the_index, &index_lock, COMMIT_LOCK);
+ } else {
+ rollback_lock_file(&index_lock);
+ }
+ }
+
+ return 0;
+}
diff --git a/t/interop/i5700-protocol-transition.sh b/t/interop/i5700-protocol-transition.sh
new file mode 100755
index 0000000..97e8e58
--- /dev/null
+++ b/t/interop/i5700-protocol-transition.sh
@@ -0,0 +1,68 @@
+#!/bin/sh
+
+VERSION_A=.
+VERSION_B=v2.0.0
+
+: ${LIB_GIT_DAEMON_PORT:=5700}
+LIB_GIT_DAEMON_COMMAND='git.b daemon'
+
+test_description='clone and fetch by client who is trying to use a new protocol'
+. ./interop-lib.sh
+. "$TEST_DIRECTORY"/lib-git-daemon.sh
+
+start_git_daemon --export-all
+
+repo=$GIT_DAEMON_DOCUMENT_ROOT_PATH/repo
+
+test_expect_success "create repo served by $VERSION_B" '
+ git.b init "$repo" &&
+ git.b -C "$repo" commit --allow-empty -m one
+'
+
+test_expect_success "git:// clone with $VERSION_A and protocol v1" '
+ GIT_TRACE_PACKET=1 git.a -c protocol.version=1 clone "$GIT_DAEMON_URL/repo" child 2>log &&
+ git.a -C child log -1 --format=%s >actual &&
+ git.b -C "$repo" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+ grep "version=1" log
+'
+
+test_expect_success "git:// fetch with $VERSION_A and protocol v1" '
+ git.b -C "$repo" commit --allow-empty -m two &&
+ git.b -C "$repo" log -1 --format=%s >expect &&
+
+ GIT_TRACE_PACKET=1 git.a -C child -c protocol.version=1 fetch 2>log &&
+ git.a -C child log -1 --format=%s FETCH_HEAD >actual &&
+
+ test_cmp expect actual &&
+ grep "version=1" log &&
+ ! grep "version 1" log
+'
+
+stop_git_daemon
+
+test_expect_success "create repo served by $VERSION_B" '
+ git.b init parent &&
+ git.b -C parent commit --allow-empty -m one
+'
+
+test_expect_success "file:// clone with $VERSION_A and protocol v1" '
+ GIT_TRACE_PACKET=1 git.a -c protocol.version=1 clone --upload-pack="git.b upload-pack" parent child2 2>log &&
+ git.a -C child2 log -1 --format=%s >actual &&
+ git.b -C parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+ ! grep "version 1" log
+'
+
+test_expect_success "file:// fetch with $VERSION_A and protocol v1" '
+ git.b -C parent commit --allow-empty -m two &&
+ git.b -C parent log -1 --format=%s >expect &&
+
+ GIT_TRACE_PACKET=1 git.a -C child2 -c protocol.version=1 fetch --upload-pack="git.b upload-pack" 2>log &&
+ git.a -C child2 log -1 --format=%s FETCH_HEAD >actual &&
+
+ test_cmp expect actual &&
+ ! grep "version 1" log
+'
+
+test_done
diff --git a/t/lib-credential.sh b/t/lib-credential.sh
index d8e41f7..937b831 100755
--- a/t/lib-credential.sh
+++ b/t/lib-credential.sh
@@ -44,6 +44,7 @@
reject $1 https example.com user2
reject $1 http path.tld user
reject $1 https timeout.tld user
+ reject $1 https sso.tld
}
reject() {
@@ -250,6 +251,24 @@
password=pass2
EOF
'
+
+ test_expect_success "helper ($HELPER) can store empty username" '
+ check approve $HELPER <<-\EOF &&
+ protocol=https
+ host=sso.tld
+ username=
+ password=
+ EOF
+ check fill $HELPER <<-\EOF
+ protocol=https
+ host=sso.tld
+ --
+ protocol=https
+ host=sso.tld
+ username=
+ password=
+ EOF
+ '
}
helper_test_timeout() {
diff --git a/t/lib-git-daemon.sh b/t/lib-git-daemon.sh
index 987d406..edbea2d 100644
--- a/t/lib-git-daemon.sh
+++ b/t/lib-git-daemon.sh
@@ -32,7 +32,8 @@
GIT_DAEMON_PID=
GIT_DAEMON_DOCUMENT_ROOT_PATH="$PWD"/repo
-GIT_DAEMON_URL=git://127.0.0.1:$LIB_GIT_DAEMON_PORT
+GIT_DAEMON_HOST_PORT=127.0.0.1:$LIB_GIT_DAEMON_PORT
+GIT_DAEMON_URL=git://$GIT_DAEMON_HOST_PORT
start_git_daemon() {
if test -n "$GIT_DAEMON_PID"
@@ -53,11 +54,19 @@
"$@" "$GIT_DAEMON_DOCUMENT_ROOT_PATH" \
>&3 2>git_daemon_output &
GIT_DAEMON_PID=$!
+ >daemon.log
{
- read line <&7
- echo >&4 "$line"
- cat <&7 >&4 &
- } 7<git_daemon_output &&
+ read -r line <&7
+ printf "%s\n" "$line"
+ printf >&4 "%s\n" "$line"
+ (
+ while read -r line <&7
+ do
+ printf "%s\n" "$line"
+ printf >&4 "%s\n" "$line"
+ done
+ ) &
+ } 7<git_daemon_output >>"$TRASH_DIRECTORY/daemon.log" &&
# Check expected output
if test x"$(expr "$line" : "\[[0-9]*\] \(.*\)")" != x"Ready to rumble"
@@ -90,3 +99,25 @@
GIT_DAEMON_PID=
rm -f git_daemon_output
}
+
+# A stripped-down version of a netcat client, that connects to a "host:port"
+# given in $1, sends its stdin followed by EOF, then dumps the response (until
+# EOF) to stdout.
+fake_nc() {
+ if ! test_declared_prereq FAKENC
+ then
+ echo >&4 "fake_nc: need to declare FAKENC prerequisite"
+ return 127
+ fi
+ perl -Mstrict -MIO::Socket::INET -e '
+ my $s = IO::Socket::INET->new(shift)
+ or die "unable to open socket: $!";
+ print $s <STDIN>;
+ $s->shutdown(1);
+ print <$s>;
+ ' "$@"
+}
+
+test_lazy_prereq FAKENC '
+ perl -MIO::Socket::INET -e "exit 0"
+'
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 688313e..4c1f81f 100644
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -17,8 +17,8 @@
svn >/dev/null 2>&1
if test $? -ne 1
then
- skip_all='skipping git svn tests, svn not found'
- test_done
+ skip_all='skipping git svn tests, svn not found'
+ test_done
fi
svnrepo=$PWD/svnrepo
@@ -110,18 +110,20 @@
}
require_svnserve () {
- if test -z "$SVNSERVE_PORT"
- then
- skip_all='skipping svnserve test. (set $SVNSERVE_PORT to enable)'
- test_done
- fi
+ test_tristate GIT_TEST_SVNSERVE
+ if ! test "$GIT_TEST_SVNSERVE" = true
+ then
+ skip_all='skipping svnserve test. (set $GIT_TEST_SVNSERVE to enable)'
+ test_done
+ fi
}
start_svnserve () {
- svnserve --listen-port $SVNSERVE_PORT \
- --root "$rawsvnrepo" \
- --listen-once \
- --listen-host 127.0.0.1 &
+ SVNSERVE_PORT=${SVNSERVE_PORT-${this_test#t}}
+ svnserve --listen-port $SVNSERVE_PORT \
+ --root "$rawsvnrepo" \
+ --listen-once \
+ --listen-host 127.0.0.1 &
}
prepare_a_utf8_locale () {
diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
index 43679a4..a5d3b2c 100755
--- a/t/lib-gpg.sh
+++ b/t/lib-gpg.sh
@@ -31,7 +31,7 @@
chmod 0700 ./gpghome &&
GNUPGHOME="$(pwd)/gpghome" &&
export GNUPGHOME &&
- (gpgconf --kill gpg-agent 2>&1 >/dev/null || : ) &&
+ (gpgconf --kill gpg-agent >/dev/null 2>&1 || : ) &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import \
"$TEST_DIRECTORY"/lib-gpg/keyring.gpg &&
gpg --homedir "${GNUPGHOME}" 2>/dev/null --import-ownertrust \
diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 0642ae7..724d9ae 100644
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -25,6 +25,9 @@
<IfModule !mod_headers.c>
LoadModule headers_module modules/mod_headers.so
</IfModule>
+<IfModule !mod_setenvif.c>
+ LoadModule setenvif_module modules/mod_setenvif.so
+</IfModule>
<IfVersion < 2.4>
LockFile accept.lock
@@ -76,6 +79,8 @@
PassEnv GIT_TRACE
PassEnv GIT_CONFIG_NOSYSTEM
+SetEnvIf Git-Protocol ".*" GIT_PROTOCOL=$0
+
Alias /dumb/ www/
Alias /auth/dumb/ www/auth/dumb/
diff --git a/t/lib-submodule-update.sh b/t/lib-submodule-update.sh
index 2d26f86..1f38a85 100755
--- a/t/lib-submodule-update.sh
+++ b/t/lib-submodule-update.sh
@@ -306,9 +306,9 @@
# to protect the history!
#
-# Test that submodule contents are currently not updated when switching
-# between commits that change a submodule.
-test_submodule_switch () {
+# Internal function; use test_submodule_switch() or
+# test_submodule_forced_switch() instead.
+test_submodule_switch_common() {
command="$1"
######################### Appearing submodule #########################
# Switching to a commit letting a submodule appear creates empty dir ...
@@ -332,7 +332,7 @@
test_submodule_content sub1 origin/add_sub1
)
'
- # ... and doesn't care if it already exists ...
+ # ... and doesn't care if it already exists.
test_expect_$RESULT "$command: added submodule leaves existing empty directory alone" '
prolog &&
reset_work_tree_to no_submodule &&
@@ -347,19 +347,6 @@
test_submodule_content sub1 origin/add_sub1
)
'
- # ... unless there is an untracked file in its place.
- test_expect_success "$command: added submodule doesn't remove untracked unignored file with same name" '
- prolog &&
- reset_work_tree_to no_submodule &&
- (
- cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- >sub1 &&
- test_must_fail $command add_sub1 &&
- test_superproject_content origin/no_submodule &&
- test_must_be_empty sub1
- )
- '
# Replacing a tracked file with a submodule produces an empty
# directory ...
test_expect_$RESULT "$command: replace tracked file with submodule creates empty directory" '
@@ -441,6 +428,11 @@
# submodule files with the newly checked out ones in the
# directory of the same name while it shouldn't.
RESULT="failure"
+ elif test "$KNOWN_FAILURE_FORCED_SWITCH_TESTS" = 1
+ then
+ # All existing tests that use test_submodule_forced_switch()
+ # require this.
+ RESULT="failure"
else
RESULT="success"
fi
@@ -522,7 +514,6 @@
test_submodule_content sub1 origin/modify_sub1
)
'
-
# Updating a submodule to an invalid sha1 doesn't update the
# submodule's work tree, subsequent update will fail
test_expect_$RESULT "$command: modified submodule does not update submodule work tree to invalid commit" '
@@ -555,42 +546,55 @@
'
}
-# Test that submodule contents are currently not updated when switching
-# between commits that change a submodule, but throwing away local changes in
+# Declares and invokes several tests that, in various situations, checks that
+# the provided transition function:
+# - succeeds in updating the worktree and index of a superproject to a target
+# commit, or fails atomically (depending on the test situation)
+# - if succeeds, the contents of submodule directories are unchanged
+# - if succeeds, once "git submodule update" is invoked, the contents of
+# submodule directories are updated
+#
+# If the command under test is known to not work with submodules in certain
+# conditions, set the appropriate KNOWN_FAILURE_* variable used in the tests
+# below to 1.
+#
+# Use as follows:
+#
+# my_func () {
+# target=$1
+# # Do something here that updates the worktree and index to match target,
+# # but not any submodule directories.
+# }
+# test_submodule_switch "my_func"
+test_submodule_switch () {
+ command="$1"
+ test_submodule_switch_common "$command"
+
+ # An empty directory does not prevent the creation of a submodule of
+ # the same name, but a file does.
+ test_expect_success "$command: added submodule doesn't remove untracked unignored file with same name" '
+ prolog &&
+ reset_work_tree_to no_submodule &&
+ (
+ cd submodule_update &&
+ git branch -t add_sub1 origin/add_sub1 &&
+ >sub1 &&
+ test_must_fail $command add_sub1 &&
+ test_superproject_content origin/no_submodule &&
+ test_must_be_empty sub1
+ )
+ '
+}
+
+# Same as test_submodule_switch(), except that throwing away local changes in
# the superproject is allowed.
test_submodule_forced_switch () {
command="$1"
- ######################### Appearing submodule #########################
- # Switching to a commit letting a submodule appear creates empty dir ...
- test_expect_success "$command: added submodule creates empty directory" '
- prolog &&
- reset_work_tree_to no_submodule &&
- (
- cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- $command add_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_dir_is_empty sub1 &&
- git submodule update --init --recursive &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... and doesn't care if it already exists ...
- test_expect_success "$command: added submodule leaves existing empty directory alone" '
- prolog &&
- reset_work_tree_to no_submodule &&
- (
- cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- mkdir sub1 &&
- $command add_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_dir_is_empty sub1 &&
- git submodule update --init --recursive &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... unless there is an untracked file in its place.
+ KNOWN_FAILURE_FORCED_SWITCH_TESTS=1
+ test_submodule_switch_common "$command"
+
+ # When forced, a file in the superproject does not prevent creating a
+ # submodule of the same name.
test_expect_success "$command: added submodule does remove untracked unignored file with same name when forced" '
prolog &&
reset_work_tree_to no_submodule &&
@@ -603,165 +607,6 @@
test_dir_is_empty sub1
)
'
- # Replacing a tracked file with a submodule produces an empty
- # directory ...
- test_expect_success "$command: replace tracked file with submodule creates empty directory" '
- prolog &&
- reset_work_tree_to replace_sub1_with_file &&
- (
- cd submodule_update &&
- git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
- $command replace_file_with_sub1 &&
- test_superproject_content origin/replace_file_with_sub1 &&
- test_dir_is_empty sub1 &&
- git submodule update --init --recursive &&
- test_submodule_content sub1 origin/replace_file_with_sub1
- )
- '
- # ... as does removing a directory with tracked files with a
- # submodule.
- test_expect_success "$command: replace directory with submodule" '
- prolog &&
- reset_work_tree_to replace_sub1_with_directory &&
- (
- cd submodule_update &&
- git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
- $command replace_directory_with_sub1 &&
- test_superproject_content origin/replace_directory_with_sub1 &&
- test_dir_is_empty sub1 &&
- git submodule update --init --recursive &&
- test_submodule_content sub1 origin/replace_directory_with_sub1
- )
- '
-
- ######################## Disappearing submodule #######################
- # Removing a submodule doesn't remove its work tree ...
- test_expect_success "$command: removed submodule leaves submodule directory and its contents in place" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t remove_sub1 origin/remove_sub1 &&
- $command remove_sub1 &&
- test_superproject_content origin/remove_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... especially when it contains a .git directory.
- test_expect_success "$command: removed submodule leaves submodule containing a .git directory alone" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t remove_sub1 origin/remove_sub1 &&
- replace_gitfile_with_git_dir sub1 &&
- $command remove_sub1 &&
- test_superproject_content origin/remove_sub1 &&
- test_git_directory_is_unchanged sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # Replacing a submodule with files in a directory must fail as the
- # submodule work tree isn't removed ...
- test_expect_failure "$command: replace submodule with a directory must fail" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
- test_must_fail $command replace_sub1_with_directory &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... especially when it contains a .git directory.
- test_expect_failure "$command: replace submodule containing a .git directory with a directory must fail" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_directory origin/replace_sub1_with_directory &&
- replace_gitfile_with_git_dir sub1 &&
- test_must_fail $command replace_sub1_with_directory &&
- test_superproject_content origin/add_sub1 &&
- test_git_directory_is_unchanged sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # Replacing it with a file must fail as it could throw away any local
- # work tree changes ...
- test_expect_failure "$command: replace submodule with a file must fail" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
- test_must_fail $command replace_sub1_with_file &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... or even destroy unpushed parts of submodule history if that
- # still uses a .git directory.
- test_expect_failure "$command: replace submodule containing a .git directory with a file must fail" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
- replace_gitfile_with_git_dir sub1 &&
- test_must_fail $command replace_sub1_with_file &&
- test_superproject_content origin/add_sub1 &&
- test_git_directory_is_unchanged sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
-
- ########################## Modified submodule #########################
- # Updating a submodule sha1 doesn't update the submodule's work tree
- test_expect_success "$command: modified submodule does not update submodule work tree" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t modify_sub1 origin/modify_sub1 &&
- $command modify_sub1 &&
- test_superproject_content origin/modify_sub1 &&
- test_submodule_content sub1 origin/add_sub1 &&
- git submodule update &&
- test_submodule_content sub1 origin/modify_sub1
- )
- '
- # Updating a submodule to an invalid sha1 doesn't update the
- # submodule's work tree, subsequent update will fail
- test_expect_success "$command: modified submodule does not update submodule work tree to invalid commit" '
- prolog &&
- reset_work_tree_to add_sub1 &&
- (
- cd submodule_update &&
- git branch -t invalid_sub1 origin/invalid_sub1 &&
- $command invalid_sub1 &&
- test_superproject_content origin/invalid_sub1 &&
- test_submodule_content sub1 origin/add_sub1 &&
- test_must_fail git submodule update &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # Updating a submodule from an invalid sha1 doesn't update the
- # submodule's work tree, subsequent update will succeed
- test_expect_success "$command: modified submodule does not update submodule work tree from invalid commit" '
- prolog &&
- reset_work_tree_to invalid_sub1 &&
- (
- cd submodule_update &&
- git branch -t valid_sub1 origin/valid_sub1 &&
- $command valid_sub1 &&
- test_superproject_content origin/valid_sub1 &&
- test_dir_is_empty sub1 &&
- git submodule update --init --recursive &&
- test_submodule_content sub1 origin/valid_sub1
- )
- '
}
# Test that submodule contents are correctly updated when switching
@@ -781,19 +626,11 @@
# - Removing a submodule with a git directory absorbs the submodules
# git directory first into the superproject.
-test_submodule_switch_recursing_with_args () {
- cmd_args="$1"
- command="git $cmd_args --recurse-submodules"
- RESULTDS=success
- if test "$KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS" = 1
- then
- RESULTDS=failure
- fi
- RESULTOI=success
- if test "$KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED" = 1
- then
- RESULTOI=failure
- fi
+# Internal function; use test_submodule_switch_recursing_with_args() or
+# test_submodule_forced_switch_recursing_with_args() instead.
+test_submodule_recursing_with_args_common() {
+ command="$1"
+
######################### Appearing submodule #########################
# Switching to a commit letting a submodule appear checks it out ...
test_expect_success "$command: added submodule is checked out" '
@@ -807,7 +644,7 @@
test_submodule_content sub1 origin/add_sub1
)
'
- # ... ignoring an empty existing directory ...
+ # ... ignoring an empty existing directory.
test_expect_success "$command: added submodule is checked out in empty dir" '
prolog &&
reset_work_tree_to_interested no_submodule &&
@@ -820,34 +657,23 @@
test_submodule_content sub1 origin/add_sub1
)
'
- # ... unless there is an untracked file in its place.
- test_expect_success "$command: added submodule doesn't remove untracked file with same name" '
+ test_expect_success "$command: submodule branch is not changed, detach HEAD instead" '
prolog &&
- reset_work_tree_to_interested no_submodule &&
+ reset_work_tree_to_interested add_sub1 &&
(
cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- : >sub1 &&
- test_must_fail $command add_sub1 &&
- test_superproject_content origin/no_submodule &&
- test_must_be_empty sub1
+ git -C sub1 checkout -b keep_branch &&
+ git -C sub1 rev-parse HEAD >expect &&
+ git branch -t modify_sub1 origin/modify_sub1 &&
+ $command modify_sub1 &&
+ test_superproject_content origin/modify_sub1 &&
+ test_submodule_content sub1 origin/modify_sub1 &&
+ git -C sub1 rev-parse keep_branch >actual &&
+ test_cmp expect actual &&
+ test_must_fail git -C sub1 symbolic-ref HEAD
)
'
- # ... but an ignored file is fine.
- test_expect_$RESULTOI "$command: added submodule removes an untracked ignored file" '
- test_when_finished "rm submodule_update/.git/info/exclude" &&
- prolog &&
- reset_work_tree_to_interested no_submodule &&
- (
- cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- : >sub1 &&
- echo sub1 >.git/info/exclude
- $command add_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
+
# Replacing a tracked file with a submodule produces a checked out submodule
test_expect_success "$command: replace tracked file with submodule checks out submodule" '
prolog &&
@@ -901,6 +727,128 @@
test_git_directory_exists sub1
)
'
+
+ # Replacing it with a file ...
+ test_expect_success "$command: replace submodule with a file" '
+ prolog &&
+ reset_work_tree_to_interested add_sub1 &&
+ (
+ cd submodule_update &&
+ git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+ $command replace_sub1_with_file &&
+ test_superproject_content origin/replace_sub1_with_file &&
+ test -f sub1
+ )
+ '
+ RESULTDS=success
+ if test "$KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS" = 1
+ then
+ RESULTDS=failure
+ fi
+ # ... must check its local work tree for untracked files
+ test_expect_$RESULTDS "$command: replace submodule with a file must fail with untracked files" '
+ prolog &&
+ reset_work_tree_to_interested add_sub1 &&
+ (
+ cd submodule_update &&
+ git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+ : >sub1/untrackedfile &&
+ test_must_fail $command replace_sub1_with_file &&
+ test_superproject_content origin/add_sub1 &&
+ test_submodule_content sub1 origin/add_sub1
+ test -f sub1/untracked_file
+ )
+ '
+
+ ########################## Modified submodule #########################
+ # Updating a submodule sha1 updates the submodule's work tree
+ test_expect_success "$command: modified submodule updates submodule work tree" '
+ prolog &&
+ reset_work_tree_to_interested add_sub1 &&
+ (
+ cd submodule_update &&
+ git branch -t modify_sub1 origin/modify_sub1 &&
+ $command modify_sub1 &&
+ test_superproject_content origin/modify_sub1 &&
+ test_submodule_content sub1 origin/modify_sub1
+ )
+ '
+ # Updating a submodule to an invalid sha1 doesn't update the
+ # superproject nor the submodule's work tree.
+ test_expect_success "$command: updating to a missing submodule commit fails" '
+ prolog &&
+ reset_work_tree_to_interested add_sub1 &&
+ (
+ cd submodule_update &&
+ git branch -t invalid_sub1 origin/invalid_sub1 &&
+ test_must_fail $command invalid_sub1 &&
+ test_superproject_content origin/add_sub1 &&
+ test_submodule_content sub1 origin/add_sub1
+ )
+ '
+}
+
+# Declares and invokes several tests that, in various situations, checks that
+# the provided Git command, when invoked with --recurse-submodules:
+# - succeeds in updating the worktree and index of a superproject to a target
+# commit, or fails atomically (depending on the test situation)
+# - if succeeds, the contents of submodule directories are updated
+#
+# Specify the Git command so that "git $GIT_COMMAND --recurse-submodules"
+# works.
+#
+# If the command under test is known to not work with submodules in certain
+# conditions, set the appropriate KNOWN_FAILURE_* variable used in the tests
+# below to 1.
+#
+# Use as follows:
+#
+# test_submodule_switch_recursing_with_args "$GIT_COMMAND"
+test_submodule_switch_recursing_with_args () {
+ cmd_args="$1"
+ command="git $cmd_args --recurse-submodules"
+ test_submodule_recursing_with_args_common "$command"
+
+ RESULTDS=success
+ if test "$KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS" = 1
+ then
+ RESULTDS=failure
+ fi
+ RESULTOI=success
+ if test "$KNOWN_FAILURE_SUBMODULE_OVERWRITE_IGNORED_UNTRACKED" = 1
+ then
+ RESULTOI=failure
+ fi
+ # Switching to a commit letting a submodule appear cannot override an
+ # untracked file.
+ test_expect_success "$command: added submodule doesn't remove untracked file with same name" '
+ prolog &&
+ reset_work_tree_to_interested no_submodule &&
+ (
+ cd submodule_update &&
+ git branch -t add_sub1 origin/add_sub1 &&
+ : >sub1 &&
+ test_must_fail $command add_sub1 &&
+ test_superproject_content origin/no_submodule &&
+ test_must_be_empty sub1
+ )
+ '
+ # ... but an ignored file is fine.
+ test_expect_$RESULTOI "$command: added submodule removes an untracked ignored file" '
+ test_when_finished "rm submodule_update/.git/info/exclude" &&
+ prolog &&
+ reset_work_tree_to_interested no_submodule &&
+ (
+ cd submodule_update &&
+ git branch -t add_sub1 origin/add_sub1 &&
+ : >sub1 &&
+ echo sub1 >.git/info/exclude
+ $command add_sub1 &&
+ test_superproject_content origin/add_sub1 &&
+ test_submodule_content sub1 origin/add_sub1
+ )
+ '
+
# Replacing a submodule with files in a directory must succeeds
# when the submodule is clean
test_expect_$RESULTDS "$command: replace submodule with a directory" '
@@ -929,33 +877,6 @@
)
'
- # Replacing it with a file ...
- test_expect_success "$command: replace submodule with a file" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
- $command replace_sub1_with_file &&
- test_superproject_content origin/replace_sub1_with_file &&
- test -f sub1
- )
- '
-
- # ... must check its local work tree for untracked files
- test_expect_$RESULTDS "$command: replace submodule with a file must fail with untracked files" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
- : >sub1/untrackedfile &&
- test_must_fail $command replace_sub1_with_file &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
-
# ... and ignored files are ignored
test_expect_success "$command: replace submodule with a file works ignores ignored files in submodule" '
test_when_finished "rm submodule_update/.git/modules/sub1/info/exclude" &&
@@ -964,6 +885,7 @@
(
cd submodule_update &&
git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
+ echo ignored >.git/modules/sub1/info/exclude &&
: >sub1/ignored &&
$command replace_sub1_with_file &&
test_superproject_content origin/replace_sub1_with_file &&
@@ -971,20 +893,6 @@
)
'
- ########################## Modified submodule #########################
- # Updating a submodule sha1 updates the submodule's work tree
- test_expect_success "$command: modified submodule updates submodule work tree" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t modify_sub1 origin/modify_sub1 &&
- $command modify_sub1 &&
- test_superproject_content origin/modify_sub1 &&
- test_submodule_content sub1 origin/modify_sub1
- )
- '
-
test_expect_success "git -c submodule.recurse=true $cmd_args: modified submodule updates submodule work tree" '
prolog &&
reset_work_tree_to_interested add_sub1 &&
@@ -997,20 +905,6 @@
)
'
- # Updating a submodule to an invalid sha1 doesn't update the
- # superproject nor the submodule's work tree.
- test_expect_success "$command: updating to a missing submodule commit fails" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t invalid_sub1 origin/invalid_sub1 &&
- test_must_fail $command invalid_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
-
# recursing deeper than one level doesn't work yet.
test_expect_success "$command: modified submodule updates submodule recursively" '
prolog &&
@@ -1026,44 +920,20 @@
'
}
-# Test that submodule contents are updated when switching between commits
-# that change a submodule, but throwing away local changes in
-# the superproject as well as the submodule is allowed.
+# Same as test_submodule_switch_recursing_with_args(), except that throwing
+# away local changes in the superproject is allowed.
test_submodule_forced_switch_recursing_with_args () {
cmd_args="$1"
command="git $cmd_args --recurse-submodules"
+ test_submodule_recursing_with_args_common "$command"
+
RESULT=success
if test "$KNOWN_FAILURE_DIRECTORY_SUBMODULE_CONFLICTS" = 1
then
RESULT=failure
fi
- ######################### Appearing submodule #########################
- # Switching to a commit letting a submodule appear creates empty dir ...
- test_expect_success "$command: added submodule is checked out" '
- prolog &&
- reset_work_tree_to_interested no_submodule &&
- (
- cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- $command add_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... and doesn't care if it already exists ...
- test_expect_success "$command: added submodule ignores empty directory" '
- prolog &&
- reset_work_tree_to_interested no_submodule &&
- (
- cd submodule_update &&
- git branch -t add_sub1 origin/add_sub1 &&
- mkdir sub1 &&
- $command add_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
- # ... not caring about an untracked file either
+ # Switching to a commit letting a submodule appear does not care about
+ # an untracked file.
test_expect_success "$command: added submodule does remove untracked unignored file with same name when forced" '
prolog &&
reset_work_tree_to_interested no_submodule &&
@@ -1076,60 +946,7 @@
test_submodule_content sub1 origin/add_sub1
)
'
- # Replacing a tracked file with a submodule checks out the submodule
- test_expect_success "$command: replace tracked file with submodule populates the submodule" '
- prolog &&
- reset_work_tree_to_interested replace_sub1_with_file &&
- (
- cd submodule_update &&
- git branch -t replace_file_with_sub1 origin/replace_file_with_sub1 &&
- $command replace_file_with_sub1 &&
- test_superproject_content origin/replace_file_with_sub1 &&
- test_submodule_content sub1 origin/replace_file_with_sub1
- )
- '
- # ... as does removing a directory with tracked files with a
- # submodule.
- test_expect_success "$command: replace directory with submodule" '
- prolog &&
- reset_work_tree_to_interested replace_sub1_with_directory &&
- (
- cd submodule_update &&
- git branch -t replace_directory_with_sub1 origin/replace_directory_with_sub1 &&
- $command replace_directory_with_sub1 &&
- test_superproject_content origin/replace_directory_with_sub1 &&
- test_submodule_content sub1 origin/replace_directory_with_sub1
- )
- '
- ######################## Disappearing submodule #######################
- # Removing a submodule doesn't remove its work tree ...
- test_expect_success "$command: removed submodule leaves submodule directory and its contents in place" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t remove_sub1 origin/remove_sub1 &&
- $command remove_sub1 &&
- test_superproject_content origin/remove_sub1 &&
- ! test -e sub1
- )
- '
- # ... especially when it contains a .git directory.
- test_expect_success "$command: removed submodule leaves submodule containing a .git directory alone" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t remove_sub1 origin/remove_sub1 &&
- replace_gitfile_with_git_dir sub1 &&
- rm -rf .git/modules/sub1 &&
- $command remove_sub1 &&
- test_superproject_content origin/remove_sub1 &&
- test_git_directory_exists sub1 &&
- ! test -e sub1
- )
- '
# Replacing a submodule with files in a directory ...
test_expect_success "$command: replace submodule with a directory" '
prolog &&
@@ -1156,17 +973,6 @@
test_git_directory_exists sub1
)
'
- # Replacing it with a file
- test_expect_success "$command: replace submodule with a file" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
- $command replace_sub1_with_file &&
- test_superproject_content origin/replace_sub1_with_file
- )
- '
# ... even if the submodule contains ignored files
test_expect_success "$command: replace submodule with a file ignoring ignored files" '
@@ -1181,46 +987,6 @@
)
'
- # ... but stops for untracked files that would be lost
- test_expect_$RESULT "$command: replace submodule with a file stops for untracked files" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t replace_sub1_with_file origin/replace_sub1_with_file &&
- : >sub1/untracked_file &&
- test_must_fail $command replace_sub1_with_file &&
- test_superproject_content origin/add_sub1 &&
- test -f sub1/untracked_file
- )
- '
-
- ########################## Modified submodule #########################
- # Updating a submodule sha1 updates the submodule's work tree
- test_expect_success "$command: modified submodule updates submodule work tree" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t modify_sub1 origin/modify_sub1 &&
- $command modify_sub1 &&
- test_superproject_content origin/modify_sub1 &&
- test_submodule_content sub1 origin/modify_sub1
- )
- '
- # Updating a submodule to an invalid sha1 doesn't update the
- # submodule's work tree, subsequent update will fail
- test_expect_success "$command: modified submodule does not update submodule work tree to invalid commit" '
- prolog &&
- reset_work_tree_to_interested add_sub1 &&
- (
- cd submodule_update &&
- git branch -t invalid_sub1 origin/invalid_sub1 &&
- test_must_fail $command invalid_sub1 &&
- test_superproject_content origin/add_sub1 &&
- test_submodule_content sub1 origin/add_sub1
- )
- '
# Updating a submodule from an invalid sha1 updates
test_expect_success "$command: modified submodule does update submodule work tree from invalid commit" '
prolog &&
@@ -1249,4 +1015,18 @@
test_submodule_content sub1 origin/modify_sub1
)
'
+
+ test_expect_success "$command: changed submodule worktree is reset" '
+ prolog &&
+ reset_work_tree_to_interested add_sub1 &&
+ (
+ cd submodule_update &&
+ rm sub1/file1 &&
+ : >sub1/new_file &&
+ git -C sub1 add new_file &&
+ $command HEAD &&
+ test_path_is_file sub1/file1 &&
+ test_path_is_missing sub1/new_file
+ )
+ '
}
diff --git a/t/perf/aggregate.perl b/t/perf/aggregate.perl
index 1dbc85b..e401208 100755
--- a/t/perf/aggregate.perl
+++ b/t/perf/aggregate.perl
@@ -69,12 +69,17 @@
@tests = glob "p????-*.sh";
}
+my $resultsdir = "test-results";
+if ($ENV{GIT_PERF_SUBSECTION} ne "") {
+ $resultsdir .= "/" . $ENV{GIT_PERF_SUBSECTION};
+}
+
my @subtests;
my %shorttests;
for my $t (@tests) {
$t =~ s{(?:.*/)?(p(\d+)-[^/]+)\.sh$}{$1} or die "bad test name: $t";
my $n = $2;
- my $fname = "test-results/$t.subtests";
+ my $fname = "$resultsdir/$t.subtests";
open my $fp, "<", $fname or die "cannot open $fname: $!";
for (<$fp>) {
chomp;
@@ -98,7 +103,7 @@
my %descrs;
my $descrlen = 4; # "Test"
for my $t (@subtests) {
- $descrs{$t} = $shorttests{$t}.": ".read_descr("test-results/$t.descr");
+ $descrs{$t} = $shorttests{$t}.": ".read_descr("$resultsdir/$t.descr");
$descrlen = length $descrs{$t} if length $descrs{$t}>$descrlen;
}
@@ -138,7 +143,7 @@
my $firstr;
for my $i (0..$#dirs) {
my $d = $dirs[$i];
- $times{$prefixes{$d}.$t} = [get_times("test-results/$prefixes{$d}$t.times")];
+ $times{$prefixes{$d}.$t} = [get_times("$resultsdir/$prefixes{$d}$t.times")];
my ($r,$u,$s) = @{$times{$prefixes{$d}.$t}};
my $w = length format_times($r,$u,$s,$firstr);
$colwidth[$i] = $w if $w > $colwidth[$i];
diff --git a/t/perf/lib-pack.sh b/t/perf/lib-pack.sh
new file mode 100644
index 0000000..d3865db
--- /dev/null
+++ b/t/perf/lib-pack.sh
@@ -0,0 +1,25 @@
+# Helpers for dealing with large numbers of packs.
+
+# create $1 nonsense packs, each with a single blob
+create_packs () {
+ perl -le '
+ my ($n) = @ARGV;
+ for (1..$n) {
+ print "blob";
+ print "data <<EOF";
+ print "$_";
+ print "EOF";
+ print "checkpoint"
+ }
+ ' "$@" |
+ git fast-import
+}
+
+# create a large number of packs, disabling any gc which might
+# cause us to repack them
+setup_many_packs () {
+ git config gc.auto 0 &&
+ git config gc.autopacklimit 0 &&
+ git config fastimport.unpacklimit 0 &&
+ create_packs 500
+}
diff --git a/t/perf/p0007-write-cache.sh b/t/perf/p0007-write-cache.sh
new file mode 100755
index 0000000..261fe92
--- /dev/null
+++ b/t/perf/p0007-write-cache.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+test_description="Tests performance of writing the index"
+
+. ./perf-lib.sh
+
+test_perf_default_repo
+
+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
+ cat >.git/info/sparse-checkout <<-EOF
+ /*
+ !ballast/*
+ EOF
+ else
+ echo Assuming non-synthetic repo...
+ fi &&
+ nr_files=$(git ls-files | wc -l)
+'
+
+count=3
+test_perf "write_locked_index $count times ($nr_files files)" "
+ test-write-cache $count
+"
+
+test_done
diff --git a/t/perf/p4211-line-log.sh b/t/perf/p4211-line-log.sh
index b7ff68d..392bcc0 100755
--- a/t/perf/p4211-line-log.sh
+++ b/t/perf/p4211-line-log.sh
@@ -31,4 +31,12 @@
git log -M -L 1:"$file" >/dev/null
'
+test_perf 'git log --oneline --raw --parents' '
+ git log --oneline --raw --parents >/dev/null
+'
+
+test_perf 'git log --oneline --raw --parents -1000' '
+ git log --oneline --raw --parents -1000 >/dev/null
+'
+
test_done
diff --git a/t/perf/p5550-fetch-tags.sh b/t/perf/p5550-fetch-tags.sh
index a5dc39f..d0e0e01 100755
--- a/t/perf/p5550-fetch-tags.sh
+++ b/t/perf/p5550-fetch-tags.sh
@@ -20,6 +20,7 @@
taking too long to set up and run the tests.
'
. ./perf-lib.sh
+. "$TEST_DIRECTORY/perf/lib-pack.sh"
# make a long nonsense history on branch $1, consisting of $2 commits, each
# with a unique file pointing to the blob at $2.
@@ -44,26 +45,6 @@
git update-ref --stdin
}
-# create $1 nonsense packs, each with a single blob
-create_packs () {
- perl -le '
- my ($n) = @ARGV;
- for (1..$n) {
- print "blob";
- print "data <<EOF";
- print "$_";
- print "EOF";
- }
- ' "$@" |
- git fast-import &&
-
- git cat-file --batch-all-objects --batch-check='%(objectname)' |
- while read sha1
- do
- echo $sha1 | git pack-objects .git/objects/pack/pack
- done
-}
-
test_expect_success 'create parent and child' '
git init parent &&
git -C parent commit --allow-empty -m base &&
@@ -84,9 +65,7 @@
test_expect_success 'create child packs' '
(
cd child &&
- git config gc.auto 0 &&
- git config gc.autopacklimit 0 &&
- create_packs 500
+ setup_many_packs
)
'
diff --git a/t/perf/p5551-fetch-rescan.sh b/t/perf/p5551-fetch-rescan.sh
new file mode 100755
index 0000000..b99dc23
--- /dev/null
+++ b/t/perf/p5551-fetch-rescan.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+test_description='fetch performance with many packs
+
+It is common for fetch to consider objects that we might not have, and it is an
+easy mistake for the code to use a function like `parse_object` that might
+give the correct _answer_ on such an object, but do so slowly (due to
+re-scanning the pack directory for lookup failures).
+
+The resulting performance drop can be hard to notice in a real repository, but
+becomes quite large in a repository with a large number of packs. So this
+test creates a more pathological case, since any mistakes would produce a more
+noticeable slowdown.
+'
+. ./perf-lib.sh
+. "$TEST_DIRECTORY"/perf/lib-pack.sh
+
+test_expect_success 'create parent and child' '
+ git init parent &&
+ git clone parent child
+'
+
+
+test_expect_success 'create refs in the parent' '
+ (
+ cd parent &&
+ git commit --allow-empty -m foo &&
+ head=$(git rev-parse HEAD) &&
+ test_seq 1000 |
+ sed "s,.*,update refs/heads/& $head," |
+ $MODERN_GIT update-ref --stdin
+ )
+'
+
+test_expect_success 'create many packs in the child' '
+ (
+ cd child &&
+ setup_many_packs
+ )
+'
+
+test_perf 'fetch' '
+ # start at the same state for each iteration
+ obj=$($MODERN_GIT -C parent rev-parse HEAD) &&
+ (
+ cd child &&
+ $MODERN_GIT for-each-ref --format="delete %(refname)" refs/remotes |
+ $MODERN_GIT update-ref --stdin &&
+ rm -vf .git/objects/$(echo $obj | sed "s|^..|&/|") &&
+
+ git fetch
+ )
+'
+
+test_done
diff --git a/t/perf/p7519-fsmonitor.sh b/t/perf/p7519-fsmonitor.sh
new file mode 100755
index 0000000..65e145c
--- /dev/null
+++ b/t/perf/p7519-fsmonitor.sh
@@ -0,0 +1,183 @@
+#!/bin/sh
+
+test_description="Test core.fsmonitor"
+
+. ./perf-lib.sh
+
+#
+# Performance test for the fsmonitor feature which enables git to talk to a
+# file system change monitor and avoid having to scan the working directory
+# for new or modified files.
+#
+# By default, the performance test will utilize the Watchman file system
+# monitor if it is installed. If Watchman is not installed, it will use a
+# dummy integration script that does not report any new or modified files.
+# The dummy script has very little overhead which provides optimistic results.
+#
+# The performance test will also use the untracked cache feature if it is
+# available as fsmonitor uses it to speed up scanning for untracked files.
+#
+# There are 3 environment variables that can be used to alter the default
+# behavior of the performance test:
+#
+# GIT_PERF_7519_UNTRACKED_CACHE: used to configure core.untrackedCache
+# GIT_PERF_7519_SPLIT_INDEX: used to configure core.splitIndex
+# GIT_PERF_7519_FSMONITOR: used to configure core.fsMonitor
+#
+# The big win for using fsmonitor is the elimination of the need to scan the
+# working directory looking for changed and untracked files. If the file
+# information is all cached in RAM, the benefits are reduced.
+#
+# GIT_PERF_7519_DROP_CACHE: if set, the OS caches are dropped between tests
+#
+
+test_perf_large_repo
+test_checkout_worktree
+
+test_lazy_prereq UNTRACKED_CACHE '
+ { git update-index --test-untracked-cache; ret=$?; } &&
+ test $ret -ne 1
+'
+
+test_lazy_prereq WATCHMAN '
+ command -v watchman
+'
+
+if test_have_prereq WATCHMAN
+then
+ # Convert unix style paths to escaped Windows style paths for Watchman
+ case "$(uname -s)" in
+ MSYS_NT*)
+ GIT_WORK_TREE="$(cygpath -aw "$PWD" | sed 's,\\,/,g')"
+ ;;
+ *)
+ GIT_WORK_TREE="$PWD"
+ ;;
+ 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
+
+test_expect_success "setup for fsmonitor" '
+ # set untrackedCache depending on the environment
+ if test -n "$GIT_PERF_7519_UNTRACKED_CACHE"
+ then
+ git config core.untrackedCache "$GIT_PERF_7519_UNTRACKED_CACHE"
+ else
+ if test_have_prereq UNTRACKED_CACHE
+ then
+ git config core.untrackedCache true
+ else
+ git config core.untrackedCache false
+ fi
+ fi &&
+
+ # set core.splitindex depending on the environment
+ if test -n "$GIT_PERF_7519_SPLIT_INDEX"
+ then
+ git config core.splitIndex "$GIT_PERF_7519_SPLIT_INDEX"
+ fi &&
+
+ # set INTEGRATION_SCRIPT depending on the environment
+ if test -n "$GIT_PERF_7519_FSMONITOR"
+ then
+ INTEGRATION_SCRIPT="$GIT_PERF_7519_FSMONITOR"
+ else
+ #
+ # Choose integration script based on existence of Watchman.
+ # If Watchman exists, watch the work tree and attempt a query.
+ # If everything succeeds, use Watchman integration script,
+ # else fall back to an empty integration script.
+ #
+ mkdir .git/hooks &&
+ if test_have_prereq WATCHMAN
+ then
+ INTEGRATION_SCRIPT=".git/hooks/fsmonitor-watchman" &&
+ cp "$TEST_DIRECTORY/../templates/hooks--fsmonitor-watchman.sample" "$INTEGRATION_SCRIPT" &&
+ watchman watch "$GIT_WORK_TREE" &&
+ watchman watch-list | grep -q -F "$GIT_WORK_TREE"
+ else
+ INTEGRATION_SCRIPT=".git/hooks/fsmonitor-empty" &&
+ write_script "$INTEGRATION_SCRIPT"<<-\EOF
+ EOF
+ fi
+ fi &&
+
+ git config core.fsmonitor "$INTEGRATION_SCRIPT" &&
+ git update-index --fsmonitor
+'
+
+if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-drop-caches
+fi
+
+test_perf "status (fsmonitor=$INTEGRATION_SCRIPT)" '
+ git status
+'
+
+if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-drop-caches
+fi
+
+test_perf "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" '
+ git status -uno
+'
+
+if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-drop-caches
+fi
+
+test_perf "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" '
+ git status -uall
+'
+
+test_expect_success "setup without fsmonitor" '
+ unset INTEGRATION_SCRIPT &&
+ git config --unset core.fsmonitor &&
+ git update-index --no-fsmonitor
+'
+
+if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-drop-caches
+fi
+
+test_perf "status (fsmonitor=$INTEGRATION_SCRIPT)" '
+ git status
+'
+
+if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-drop-caches
+fi
+
+test_perf "status -uno (fsmonitor=$INTEGRATION_SCRIPT)" '
+ git status -uno
+'
+
+if test -n "$GIT_PERF_7519_DROP_CACHE"; then
+ test-drop-caches
+fi
+
+test_perf "status -uall (fsmonitor=$INTEGRATION_SCRIPT)" '
+ git status -uall
+'
+
+if test_have_prereq WATCHMAN
+then
+ watchman watch-del "$GIT_WORK_TREE" >/dev/null 2>&1 &&
+
+ # Work around Watchman bug on Windows where it holds on to handles
+ # preventing the removal of the trash directory
+ watchman shutdown-server >/dev/null 2>&1
+fi
+
+test_done
diff --git a/t/perf/p7820-grep-engines.sh b/t/perf/p7820-grep-engines.sh
index 62aba19..8b09c5b 100755
--- a/t/perf/p7820-grep-engines.sh
+++ b/t/perf/p7820-grep-engines.sh
@@ -12,6 +12,9 @@
-vi
-vw
-viw
+
+If GIT_PERF_GREP_THREADS is set to a list of threads (e.g. '1 4 8'
+etc.) we will test the patterns under those numbers of threads.
"
. ./perf-lib.sh
@@ -19,6 +22,11 @@
test_perf_large_repo
test_checkout_worktree
+if test -n "$GIT_PERF_GREP_THREADS"
+then
+ test_set_prereq PERF_GREP_ENGINES_THREADS
+fi
+
for pattern in \
'how.to' \
'^how to' \
@@ -39,18 +47,42 @@
else
prereq=""
fi
- test_perf $prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" "
- git -c grep.patternType=$engine grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine' || :
- "
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
+ then
+ test_perf $prereq "$engine grep$GIT_PERF_7820_GREP_OPTS '$pattern'" "
+ 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" "
+ git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7820_GREP_OPTS -- '$pattern' >'out.$engine.$threads' || :
+ "
+ done
+ fi
done
- test_expect_success "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern'" '
- test_cmp out.basic out.extended &&
- if test_have_prereq PCRE
- then
- test_cmp out.basic out.perl
- fi
- '
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
+ then
+ test_expect_success "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern'" '
+ test_cmp out.basic out.extended &&
+ if test_have_prereq PCRE
+ then
+ test_cmp out.basic out.perl
+ fi
+ '
+ else
+ for threads in $GIT_PERF_GREP_THREADS
+ do
+ test_expect_success PTHREADS "assert that all engines found the same for$GIT_PERF_7820_GREP_OPTS '$pattern' under threading" "
+ test_cmp out.basic.$threads out.extended.$threads &&
+ if test_have_prereq PCRE
+ then
+ test_cmp out.basic.$threads out.perl.$threads
+ fi
+ "
+ done
+ fi
done
test_done
diff --git a/t/perf/p7821-grep-engines-fixed.sh b/t/perf/p7821-grep-engines-fixed.sh
index c7ef1e1..61e41b8 100755
--- a/t/perf/p7821-grep-engines-fixed.sh
+++ b/t/perf/p7821-grep-engines-fixed.sh
@@ -6,6 +6,9 @@
git-grep. Make sure to include a leading space,
e.g. GIT_PERF_7821_GREP_OPTS=' -w'. See p7820-grep-engines.sh for more
options to try.
+
+If GIT_PERF_7821_THREADS is set to a list of threads (e.g. '1 4 8'
+etc.) we will test the patterns under those numbers of threads.
"
. ./perf-lib.sh
@@ -13,6 +16,11 @@
test_perf_large_repo
test_checkout_worktree
+if test -n "$GIT_PERF_GREP_THREADS"
+then
+ test_set_prereq PERF_GREP_ENGINES_THREADS
+fi
+
for pattern in 'int' 'uncommon' 'æ'
do
for engine in fixed basic extended perl
@@ -23,19 +31,44 @@
else
prereq=""
fi
- test_perf $prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" "
- git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || :
- "
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
+ then
+ test_perf $prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern" "
+ git -c grep.patternType=$engine grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine' || :
+ "
+ else
+ for threads in $GIT_PERF_GREP_THREADS
+ do
+ test_perf PTHREADS,$prereq "$engine grep$GIT_PERF_7821_GREP_OPTS $pattern with $threads threads" "
+ git -c grep.patternType=$engine -c grep.threads=$threads grep$GIT_PERF_7821_GREP_OPTS $pattern >'out.$engine.$threads' || :
+ "
+ done
+ fi
done
- test_expect_success "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern" '
- test_cmp out.fixed out.basic &&
- test_cmp out.fixed out.extended &&
- if test_have_prereq PCRE
- then
- test_cmp out.fixed out.perl
- fi
- '
+ if ! test_have_prereq PERF_GREP_ENGINES_THREADS
+ then
+ test_expect_success "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern" '
+ test_cmp out.fixed out.basic &&
+ test_cmp out.fixed out.extended &&
+ if test_have_prereq PCRE
+ then
+ test_cmp out.fixed out.perl
+ fi
+ '
+ else
+ for threads in $GIT_PERF_GREP_THREADS
+ do
+ test_expect_success PTHREADS "assert that all engines found the same for$GIT_PERF_7821_GREP_OPTS $pattern under threading" "
+ test_cmp out.fixed.$threads out.basic.$threads &&
+ test_cmp out.fixed.$threads out.extended.$threads &&
+ if test_have_prereq PCRE
+ then
+ test_cmp out.fixed.$threads out.perl.$threads
+ fi
+ "
+ done
+ fi
done
test_done
diff --git a/t/perf/perf-lib.sh b/t/perf/perf-lib.sh
index b50211b..e4c343a 100644
--- a/t/perf/perf-lib.sh
+++ b/t/perf/perf-lib.sh
@@ -56,12 +56,10 @@
export MODERN_GIT
perf_results_dir=$TEST_OUTPUT_DIRECTORY/test-results
+test -n "$GIT_PERF_SUBSECTION" && perf_results_dir="$perf_results_dir/$GIT_PERF_SUBSECTION"
mkdir -p "$perf_results_dir"
rm -f "$perf_results_dir"/$(basename "$0" .sh).subtests
-if test -z "$GIT_PERF_REPEAT_COUNT"; then
- GIT_PERF_REPEAT_COUNT=3
-fi
die_if_build_dir_not_repo () {
if ! ( cd "$TEST_DIRECTORY/.." &&
git rev-parse --build-dir >/dev/null 2>&1 ); then
diff --git a/t/perf/run b/t/perf/run
index beb4acc..43e4de4 100755
--- a/t/perf/run
+++ b/t/perf/run
@@ -2,9 +2,14 @@
case "$1" in
--help)
- echo "usage: $0 [other_git_tree...] [--] [test_scripts]"
+ echo "usage: $0 [--config file] [other_git_tree...] [--] [test_scripts]"
exit 0
;;
+ --config)
+ shift
+ GIT_PERF_CONFIG_FILE=$(cd "$(dirname "$1")"; pwd)/$(basename "$1")
+ export GIT_PERF_CONFIG_FILE
+ shift ;;
esac
die () {
@@ -29,8 +34,10 @@
(cd "$(git rev-parse --show-cdup)" && git archive --format=tar $rev) |
(cd build/$rev && tar x)
}
+
build_git_rev () {
rev=$1
+ name="$2"
for config in config.mak config.mak.autogen config.status
do
if test -e "../../$config"
@@ -38,7 +45,7 @@
cp "../../$config" "build/$rev/"
fi
done
- echo "=== Building $rev ==="
+ echo "=== Building $rev ($name) ==="
(
cd build/$rev &&
if test -n "$GIT_PERF_MAKE_COMMAND"
@@ -65,7 +72,7 @@
if [ ! -d build/$rev ]; then
unpack_git_rev $rev
fi
- build_git_rev $rev
+ build_git_rev $rev "$mydir"
mydir=build/$rev
fi
if test "$mydir" = .; then
@@ -87,14 +94,78 @@
done
}
-GIT_PERF_AGGREGATING_LATER=t
-export GIT_PERF_AGGREGATING_LATER
+get_subsections () {
+ section="$1"
+ test -z "$GIT_PERF_CONFIG_FILE" && return
+ git config -f "$GIT_PERF_CONFIG_FILE" --name-only --get-regex "$section\..*\.[^.]+" |
+ sed -e "s/$section\.\(.*\)\..*/\1/" | sort | uniq
+}
+
+get_var_from_env_or_config () {
+ env_var="$1"
+ conf_sec="$2"
+ conf_var="$3"
+ # $4 can be set to a default value
+
+ # Do nothing if the env variable is already set
+ eval "test -z \"\${$env_var+x}\"" || return
+
+ test -z "$GIT_PERF_CONFIG_FILE" && return
+
+ # Check if the variable is in the config file
+ if test -n "$GIT_PERF_SUBSECTION"
+ then
+ var="$conf_sec.$GIT_PERF_SUBSECTION.$conf_var"
+ conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$var") &&
+ eval "$env_var=\"$conf_value\"" && return
+ fi
+ var="$conf_sec.$conf_var"
+ conf_value=$(git config -f "$GIT_PERF_CONFIG_FILE" "$var") &&
+ eval "$env_var=\"$conf_value\"" && return
+
+ test -n "${4+x}" && eval "$env_var=\"$4\""
+}
+
+run_subsection () {
+ get_var_from_env_or_config "GIT_PERF_REPEAT_COUNT" "perf" "repeatCount" 3
+ export GIT_PERF_REPEAT_COUNT
+
+ get_var_from_env_or_config "GIT_PERF_DIRS_OR_REVS" "perf" "dirsOrRevs"
+ set -- $GIT_PERF_DIRS_OR_REVS "$@"
+
+ get_var_from_env_or_config "GIT_PERF_MAKE_COMMAND" "perf" "makeCommand"
+ get_var_from_env_or_config "GIT_PERF_MAKE_OPTS" "perf" "makeOpts"
+
+ GIT_PERF_AGGREGATING_LATER=t
+ export GIT_PERF_AGGREGATING_LATER
+
+ if test $# = 0 -o "$1" = -- -o -f "$1"; then
+ set -- . "$@"
+ fi
+
+ run_dirs "$@"
+ ./aggregate.perl "$@"
+}
cd "$(dirname $0)"
. ../../GIT-BUILD-OPTIONS
-if test $# = 0 -o "$1" = -- -o -f "$1"; then
- set -- . "$@"
+mkdir -p test-results
+get_subsections "perf" >test-results/run_subsections.names
+
+if test $(wc -l <test-results/run_subsections.names) -eq 0
+then
+ (
+ run_subsection "$@"
+ )
+else
+ while read -r subsec
+ do
+ (
+ GIT_PERF_SUBSECTION="$subsec"
+ export GIT_PERF_SUBSECTION
+ echo "======== Run for subsection '$GIT_PERF_SUBSECTION' ========"
+ run_subsection "$@"
+ )
+ done <test-results/run_subsections.names
fi
-run_dirs "$@"
-./aggregate.perl "$@"
diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
index 1aa5093..7fd87dd 100755
--- a/t/t0000-basic.sh
+++ b/t/t0000-basic.sh
@@ -20,6 +20,31 @@
. ./test-lib.sh
+try_local_x () {
+ local x="local" &&
+ echo "$x"
+}
+
+# This test is an experiment to check whether any Git users are using
+# Shells that don't support the "local" keyword. "local" is not
+# POSIX-standard, but it is very widely supported by POSIX-compliant
+# shells, and if it doesn't cause problems for people, we would like
+# to be able to use it in Git code.
+#
+# For now, this is the only test that requires "local". If your shell
+# fails this test, you can ignore the failure, but please report the
+# problem to the Git mailing list <git@vger.kernel.org>, as it might
+# convince us to continue avoiding the use of "local".
+test_expect_success 'verify that the running shell supports "local"' '
+ x="notlocal" &&
+ echo "local" >expected1 &&
+ try_local_x >actual1 &&
+ test_cmp expected1 actual1 &&
+ echo "notlocal" >expected2 &&
+ echo "$x" >actual2 &&
+ test_cmp expected2 actual2
+'
+
################################################################
# git init has been done in an empty repository.
# make sure it is empty.
diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index 86c1a51..c413bff 100755
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -453,4 +453,16 @@
)
'
+test_expect_success MINGW 'redirect std handles' '
+ GIT_REDIRECT_STDOUT=output.txt git rev-parse --git-dir &&
+ test .git = "$(cat output.txt)" &&
+ test -z "$(GIT_REDIRECT_STDOUT=off git rev-parse --git-dir)" &&
+ test_must_fail env \
+ GIT_REDIRECT_STDOUT=output.txt \
+ GIT_REDIRECT_STDERR="2>&1" \
+ git rev-parse --git-dir --verify refs/invalid &&
+ printf ".git\nfatal: Needed a single revision\n" >expect &&
+ test_cmp expect output.txt
+'
+
test_done
diff --git a/t/t0021/rot13-filter.pl b/t/t0021/rot13-filter.pl
index ad685d9..4701072 100644
--- a/t/t0021/rot13-filter.pl
+++ b/t/t0021/rot13-filter.pl
@@ -30,9 +30,27 @@
# to the "list_available_blobs" response.
#
+use 5.008;
+sub gitperllib {
+ # Git assumes that all path lists are Unix-y colon-separated ones. But
+ # when the Git for Windows executes the test suite, its MSYS2 Bash
+ # calls git.exe, and colon-separated path lists are converted into
+ # Windows-y semicolon-separated lists of *Windows* paths (which
+ # naturally contain a colon after the drive letter, so splitting by
+ # colons simply does not cut it).
+ #
+ # Detect semicolon-separated path list and handle them appropriately.
+
+ if ($ENV{GITPERLLIB} =~ /;/) {
+ return split(/;/, $ENV{GITPERLLIB});
+ }
+ return split(/:/, $ENV{GITPERLLIB});
+}
+use lib (gitperllib());
use strict;
use warnings;
use IO::File;
+use Git::Packet;
my $MAX_PACKET_CONTENT_SIZE = 65516;
my $log_file = shift @ARGV;
@@ -55,89 +73,30 @@
return $str;
}
-sub packet_bin_read {
- my $buffer;
- my $bytes_read = read STDIN, $buffer, 4;
- if ( $bytes_read == 0 ) {
- # EOF - Git stopped talking to us!
- print $debug "STOP\n";
- exit();
- }
- elsif ( $bytes_read != 4 ) {
- die "invalid packet: '$buffer'";
- }
- my $pkt_size = hex($buffer);
- if ( $pkt_size == 0 ) {
- return ( 1, "" );
- }
- elsif ( $pkt_size > 4 ) {
- my $content_size = $pkt_size - 4;
- $bytes_read = read STDIN, $buffer, $content_size;
- if ( $bytes_read != $content_size ) {
- die "invalid packet ($content_size bytes expected; $bytes_read bytes read)";
- }
- return ( 0, $buffer );
- }
- else {
- die "invalid packet size: $pkt_size";
- }
-}
-
-sub packet_txt_read {
- my ( $res, $buf ) = packet_bin_read();
- unless ( $buf eq '' or $buf =~ s/\n$// ) {
- die "A non-binary line MUST be terminated by an LF.";
- }
- return ( $res, $buf );
-}
-
-sub packet_bin_write {
- my $buf = shift;
- print STDOUT sprintf( "%04x", length($buf) + 4 );
- print STDOUT $buf;
- STDOUT->flush();
-}
-
-sub packet_txt_write {
- packet_bin_write( $_[0] . "\n" );
-}
-
-sub packet_flush {
- print STDOUT sprintf( "%04x", 0 );
- STDOUT->flush();
-}
-
print $debug "START\n";
$debug->flush();
-( packet_txt_read() eq ( 0, "git-filter-client" ) ) || die "bad initialize";
-( packet_txt_read() eq ( 0, "version=2" ) ) || die "bad version";
-( packet_bin_read() eq ( 1, "" ) ) || die "bad version end";
+packet_initialize("git-filter", 2);
-packet_txt_write("git-filter-server");
-packet_txt_write("version=2");
-packet_flush();
+my %remote_caps = packet_read_and_check_capabilities("clean", "smudge", "delay");
+packet_check_and_write_capabilities(\%remote_caps, @capabilities);
-( packet_txt_read() eq ( 0, "capability=clean" ) ) || die "bad capability";
-( packet_txt_read() eq ( 0, "capability=smudge" ) ) || die "bad capability";
-( packet_txt_read() eq ( 0, "capability=delay" ) ) || die "bad capability";
-( packet_bin_read() eq ( 1, "" ) ) || die "bad capability end";
-
-foreach (@capabilities) {
- packet_txt_write( "capability=" . $_ );
-}
-packet_flush();
print $debug "init handshake complete\n";
$debug->flush();
while (1) {
- my ( $command ) = packet_txt_read() =~ /^command=(.+)$/;
+ my ( $res, $command ) = packet_key_val_read("command");
+ if ( $res == -1 ) {
+ print $debug "STOP\n";
+ exit();
+ }
print $debug "IN: $command";
$debug->flush();
if ( $command eq "list_available_blobs" ) {
# Flush
- packet_bin_read();
+ packet_compare_lists([1, ""], packet_bin_read()) ||
+ die "bad list_available_blobs end";
foreach my $pathname ( sort keys %DELAY ) {
if ( $DELAY{$pathname}{"requested"} >= 1 ) {
@@ -161,16 +120,14 @@
$debug->flush();
packet_txt_write("status=success");
packet_flush();
- }
- else {
- my ( $pathname ) = packet_txt_read() =~ /^pathname=(.+)$/;
+ } else {
+ my ( $res, $pathname ) = packet_key_val_read("pathname");
+ if ( $res == -1 ) {
+ die "unexpected EOF while expecting pathname";
+ }
print $debug " $pathname";
$debug->flush();
- if ( $pathname eq "" ) {
- die "bad pathname '$pathname'";
- }
-
# Read until flush
my ( $done, $buffer ) = packet_txt_read();
while ( $buffer ne '' ) {
@@ -184,6 +141,9 @@
( $done, $buffer ) = packet_txt_read();
}
+ if ( $done == -1 ) {
+ die "unexpected EOF after pathname '$pathname'";
+ }
my $input = "";
{
@@ -194,6 +154,9 @@
( $done, $buffer ) = packet_bin_read();
$input .= $buffer;
}
+ if ( $done == -1 ) {
+ die "unexpected EOF while reading input for '$pathname'";
+ }
print $debug " " . length($input) . " [OK] -- ";
$debug->flush();
}
@@ -201,17 +164,13 @@
my $output;
if ( exists $DELAY{$pathname} and exists $DELAY{$pathname}{"output"} ) {
$output = $DELAY{$pathname}{"output"}
- }
- elsif ( $pathname eq "error.r" or $pathname eq "abort.r" ) {
+ } elsif ( $pathname eq "error.r" or $pathname eq "abort.r" ) {
$output = "";
- }
- elsif ( $command eq "clean" and grep( /^clean$/, @capabilities ) ) {
+ } elsif ( $command eq "clean" and grep( /^clean$/, @capabilities ) ) {
$output = rot13($input);
- }
- elsif ( $command eq "smudge" and grep( /^smudge$/, @capabilities ) ) {
+ } elsif ( $command eq "smudge" and grep( /^smudge$/, @capabilities ) ) {
$output = rot13($input);
- }
- else {
+ } else {
die "bad command '$command'";
}
@@ -220,25 +179,21 @@
$debug->flush();
packet_txt_write("status=error");
packet_flush();
- }
- elsif ( $pathname eq "abort.r" ) {
+ } elsif ( $pathname eq "abort.r" ) {
print $debug "[ABORT]\n";
$debug->flush();
packet_txt_write("status=abort");
packet_flush();
- }
- elsif ( $command eq "smudge" and
+ } elsif ( $command eq "smudge" and
exists $DELAY{$pathname} and
- $DELAY{$pathname}{"requested"} == 1
- ) {
+ $DELAY{$pathname}{"requested"} == 1 ) {
print $debug "[DELAYED]\n";
$debug->flush();
packet_txt_write("status=delayed");
packet_flush();
$DELAY{$pathname}{"requested"} = 2;
$DELAY{$pathname}{"output"} = $output;
- }
- else {
+ } else {
packet_txt_write("status=success");
packet_flush();
@@ -258,8 +213,7 @@
print $debug ".";
if ( length($output) > $MAX_PACKET_CONTENT_SIZE ) {
$output = substr( $output, $MAX_PACKET_CONTENT_SIZE );
- }
- else {
+ } else {
$output = "";
}
}
diff --git a/t/t0025-crlf-renormalize.sh b/t/t0025-crlf-renormalize.sh
new file mode 100755
index 0000000..9d9e02a
--- /dev/null
+++ b/t/t0025-crlf-renormalize.sh
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+test_description='CRLF renormalization'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ git config core.autocrlf false &&
+ printf "LINEONE\nLINETWO\nLINETHREE\n" >LF.txt &&
+ printf "LINEONE\r\nLINETWO\r\nLINETHREE\r\n" >CRLF.txt &&
+ printf "LINEONE\r\nLINETWO\nLINETHREE\n" >CRLF_mix_LF.txt &&
+ git add . &&
+ git commit -m initial
+'
+
+test_expect_success 'renormalize CRLF in repo' '
+ echo "*.txt text=auto" >.gitattributes &&
+ git add --renormalize "*.txt" &&
+ cat >expect <<-\EOF &&
+ i/lf w/crlf attr/text=auto CRLF.txt
+ 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" |
+ sort >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t0027-auto-crlf.sh b/t/t0027-auto-crlf.sh
index deb3ae7..beb5927 100755
--- a/t/t0027-auto-crlf.sh
+++ b/t/t0027-auto-crlf.sh
@@ -43,19 +43,31 @@
} >.gitattributes
}
-create_NNO_files () {
+# Create 2 sets of files:
+# The NNO files are "Not NOrmalized in the repo. We use CRLF_mix_LF and store
+# it under different names for the different test cases, see ${pfx}
+# Depending on .gitattributes they are normalized at the next commit (or not)
+# The MIX files have different contents in the repo.
+# Depending on its contents, the "new safer autocrlf" may kick in.
+create_NNO_MIX_files () {
for crlf in false true input
do
for attr in "" auto text -text
do
for aeol in "" lf crlf
do
- pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf}
+ pfx=NNO_attr_${attr}_aeol_${aeol}_${crlf} &&
cp CRLF_mix_LF ${pfx}_LF.txt &&
cp CRLF_mix_LF ${pfx}_CRLF.txt &&
cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt &&
cp CRLF_mix_LF ${pfx}_LF_mix_CR.txt &&
- cp CRLF_mix_LF ${pfx}_CRLF_nul.txt
+ cp CRLF_mix_LF ${pfx}_CRLF_nul.txt &&
+ pfx=MIX_attr_${attr}_aeol_${aeol}_${crlf} &&
+ cp LF ${pfx}_LF.txt &&
+ cp CRLF ${pfx}_CRLF.txt &&
+ cp CRLF_mix_LF ${pfx}_CRLF_mix_LF.txt &&
+ cp LF_mix_CR ${pfx}_LF_mix_CR.txt &&
+ cp CRLF_nul ${pfx}_CRLF_nul.txt
done
done
done
@@ -136,6 +148,49 @@
'
}
+# Commit a file with mixed line endings on top of different files
+# in the index. Check for warnings
+commit_MIX_chkwrn () {
+ attr=$1 ; shift
+ aeol=$1 ; shift
+ crlf=$1 ; shift
+ lfwarn=$1 ; shift
+ crlfwarn=$1 ; shift
+ lfmixcrlf=$1 ; shift
+ lfmixcr=$1 ; shift
+ crlfnul=$1 ; shift
+ pfx=MIX_attr_${attr}_aeol_${aeol}_${crlf}
+ #Commit file with CLRF_mix_LF on top of existing file
+ create_gitattributes "$attr" $aeol &&
+ for f in LF CRLF CRLF_mix_LF LF_mix_CR CRLF_nul
+ do
+ fname=${pfx}_$f.txt &&
+ cp CRLF_mix_LF $fname &&
+ printf Z >>"$fname" &&
+ git -c core.autocrlf=$crlf add $fname 2>"${pfx}_$f.err"
+ done
+
+ test_expect_success "commit file with mixed EOL onto LF crlf=$crlf attr=$attr" '
+ check_warning "$lfwarn" ${pfx}_LF.err
+ '
+ test_expect_success "commit file with mixed EOL onto CLRF attr=$attr aeol=$aeol crlf=$crlf" '
+ check_warning "$crlfwarn" ${pfx}_CRLF.err
+ '
+
+ test_expect_success "commit file with mixed EOL onto CRLF_mix_LF attr=$attr aeol=$aeol crlf=$crlf" '
+ check_warning "$lfmixcrlf" ${pfx}_CRLF_mix_LF.err
+ '
+
+ test_expect_success "commit file with mixed EOL onto LF_mix_cr attr=$attr aeol=$aeol crlf=$crlf " '
+ check_warning "$lfmixcr" ${pfx}_LF_mix_CR.err
+ '
+
+ test_expect_success "commit file with mixed EOL onto CRLF_nul attr=$attr aeol=$aeol crlf=$crlf" '
+ check_warning "$crlfnul" ${pfx}_CRLF_nul.err
+ '
+}
+
+
stats_ascii () {
case "$1" in
LF)
@@ -315,7 +370,7 @@
echo >.gitattributes &&
git checkout -b master &&
git add .gitattributes &&
- git commit -m "add .gitattributes" "" &&
+ git commit -m "add .gitattributes" . &&
printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\nLINETWO\nLINETHREE" >LF &&
printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\r\nLINETHREE" >CRLF &&
printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONE\r\nLINETWO\nLINETHREE" >CRLF_mix_LF &&
@@ -323,8 +378,8 @@
printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONE\r\nLINETWO\rLINETHREE" >CRLF_mix_CR &&
printf "\$Id: 0000000000000000000000000000000000000000 \$\r\nLINEONEQ\r\nLINETWO\r\nLINETHREE" | q_to_nul >CRLF_nul &&
printf "\$Id: 0000000000000000000000000000000000000000 \$\nLINEONEQ\nLINETWO\nLINETHREE" | q_to_nul >LF_nul &&
- create_NNO_files CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF CRLF_mix_LF &&
- git -c core.autocrlf=false add NNO_*.txt &&
+ create_NNO_MIX_files &&
+ git -c core.autocrlf=false add NNO_*.txt MIX_*.txt &&
git commit -m "mixed line endings" &&
test_tick
'
@@ -385,6 +440,18 @@
commit_check_warn input "crlf" "LF_CRLF" "" "LF_CRLF" "LF_CRLF" ""
'
+# Commit "CRLFmixLF" on top of these files already in the repo:
+# mixed mixed mixed mixed mixed
+# onto onto onto onto onto
+# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL
+commit_MIX_chkwrn "" "" false "" "" "" "" ""
+commit_MIX_chkwrn "" "" true "LF_CRLF" "" "" "LF_CRLF" "LF_CRLF"
+commit_MIX_chkwrn "" "" input "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF"
+
+commit_MIX_chkwrn "auto" "" false "$WAMIX" "" "" "$WAMIX" "$WAMIX"
+commit_MIX_chkwrn "auto" "" true "LF_CRLF" "" "" "LF_CRLF" "LF_CRLF"
+commit_MIX_chkwrn "auto" "" input "CRLF_LF" "" "" "CRLF_LF" "CRLF_LF"
+
# attr LF CRLF CRLFmixLF LF_mix_CR CRLFNUL
commit_chk_wrnNNO "" "" false "" "" "" "" ""
commit_chk_wrnNNO "" "" true LF_CRLF "" "" "" ""
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh
index 74d2cd7..0c2fc81 100755
--- a/t/t0040-parse-options.sh
+++ b/t/t0040-parse-options.sh
@@ -10,6 +10,8 @@
cat >expect <<\EOF
usage: test-parse-options <options>
+ A helper function for the parse-options API.
+
--yes get a boolean
-D, --no-doubt begins with 'no-'
-B, --no-fear be brave
diff --git a/t/t0205-gettext-poison.sh b/t/t0205-gettext-poison.sh
index 2361590..438e778 100755
--- a/t/t0205-gettext-poison.sh
+++ b/t/t0205-gettext-poison.sh
@@ -7,10 +7,6 @@
. ./lib-gettext.sh
-test_expect_success GETTEXT_POISON "sanity: \$GIT_INTERNAL_GETTEXT_SH_SCHEME is set (to $GIT_INTERNAL_GETTEXT_SH_SCHEME)" '
- test -n "$GIT_INTERNAL_GETTEXT_SH_SCHEME"
-'
-
test_expect_success GETTEXT_POISON 'sanity: $GIT_INTERNAL_GETTEXT_SH_SCHEME" is poison' '
test "$GIT_INTERNAL_GETTEXT_SH_SCHEME" = "poison"
'
diff --git a/t/t0302-credential-store.sh b/t/t0302-credential-store.sh
index 1d8d1f2..d6b54e8 100755
--- a/t/t0302-credential-store.sh
+++ b/t/t0302-credential-store.sh
@@ -37,7 +37,7 @@
unset XDG_CONFIG_HOME
test_expect_success 'if custom xdg file exists, home and xdg files not created' '
- test_when_finished "rm -f $HOME/xdg/git/credentials" &&
+ test_when_finished "rm -f \"$HOME/xdg/git/credentials\"" &&
test -s "$HOME/xdg/git/credentials" &&
test_path_is_missing "$HOME/.git-credentials" &&
test_path_is_missing "$HOME/.config/git/credentials"
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c70cf42..c7ce5d8 100755
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -218,7 +218,7 @@
echo "100644 $a 2 subdir/file2"
echo "100644 $b 3 subdir/file2/another"
) >expect &&
- test_cmp actual expect
+ test_cmp expect actual
'
diff --git a/t/t1200-tutorial.sh b/t/t1200-tutorial.sh
deleted file mode 100755
index 397ccb6..0000000
--- a/t/t1200-tutorial.sh
+++ /dev/null
@@ -1,268 +0,0 @@
-#!/bin/sh
-#
-# Copyright (c) 2005 Johannes Schindelin
-#
-
-test_description='A simple turial in the form of a test case'
-
-. ./test-lib.sh
-
-test_expect_success 'blob' '
- echo "Hello World" > hello &&
- echo "Silly example" > example &&
-
- git update-index --add hello example &&
-
- test blob = "$(git cat-file -t 557db03)"
-'
-
-test_expect_success 'blob 557db03' '
- test "Hello World" = "$(git cat-file blob 557db03)"
-'
-
-echo "It's a new day for git" >>hello
-cat > diff.expect << EOF
-diff --git a/hello b/hello
-index 557db03..263414f 100644
---- a/hello
-+++ b/hello
-@@ -1 +1,2 @@
- Hello World
-+It's a new day for git
-EOF
-
-test_expect_success 'git diff-files -p' '
- git diff-files -p > diff.output &&
- test_cmp diff.expect diff.output
-'
-
-test_expect_success 'git diff' '
- git diff > diff.output &&
- test_cmp diff.expect diff.output
-'
-
-test_expect_success 'tree' '
- tree=$(git write-tree 2>/dev/null) &&
- test 8988da15d077d4829fc51d8544c097def6644dbb = $tree
-'
-
-test_expect_success 'git diff-index -p HEAD' '
- test_tick &&
- tree=$(git write-tree) &&
- commit=$(echo "Initial commit" | git commit-tree $tree) &&
- git update-ref HEAD $commit &&
- git diff-index -p HEAD > diff.output &&
- test_cmp diff.expect diff.output
-'
-
-test_expect_success 'git diff HEAD' '
- git diff HEAD > diff.output &&
- test_cmp diff.expect diff.output
-'
-
-cat > whatchanged.expect << EOF
-commit VARIABLE
-Author: VARIABLE
-Date: VARIABLE
-
- Initial commit
-
-diff --git a/example b/example
-new file mode 100644
-index 0000000..f24c74a
---- /dev/null
-+++ b/example
-@@ -0,0 +1 @@
-+Silly example
-diff --git a/hello b/hello
-new file mode 100644
-index 0000000..557db03
---- /dev/null
-+++ b/hello
-@@ -0,0 +1 @@
-+Hello World
-EOF
-
-test_expect_success 'git whatchanged -p --root' '
- git whatchanged -p --root |
- sed -e "1s/^\(.\{7\}\).\{40\}/\1VARIABLE/" \
- -e "2,3s/^\(.\{8\}\).*$/\1VARIABLE/" \
- > whatchanged.output &&
- test_cmp whatchanged.expect whatchanged.output
-'
-
-test_expect_success 'git tag my-first-tag' '
- git tag my-first-tag &&
- test_cmp .git/refs/heads/master .git/refs/tags/my-first-tag
-'
-
-test_expect_success 'git checkout -b mybranch' '
- git checkout -b mybranch &&
- test_cmp .git/refs/heads/master .git/refs/heads/mybranch
-'
-
-cat > branch.expect <<EOF
- master
-* mybranch
-EOF
-
-test_expect_success 'git branch' '
- git branch > branch.output &&
- test_cmp branch.expect branch.output
-'
-
-test_expect_success 'git resolve now fails' '
- git checkout mybranch &&
- echo "Work, work, work" >>hello &&
- test_tick &&
- git commit -m "Some work." -i hello &&
-
- git checkout master &&
-
- echo "Play, play, play" >>hello &&
- echo "Lots of fun" >>example &&
- test_tick &&
- git commit -m "Some fun." -i hello example &&
-
- test_must_fail git merge -m "Merge work in mybranch" mybranch
-'
-
-cat > hello << EOF
-Hello World
-It's a new day for git
-Play, play, play
-Work, work, work
-EOF
-
-cat > show-branch.expect << EOF
-* [master] Merge work in mybranch
- ! [mybranch] Some work.
---
-- [master] Merge work in mybranch
-*+ [mybranch] Some work.
-* [master^] Some fun.
-EOF
-
-test_expect_success 'git show-branch' '
- test_tick &&
- git commit -m "Merge work in mybranch" -i hello &&
- git show-branch --topo-order --more=1 master mybranch \
- > show-branch.output &&
- test_cmp show-branch.expect show-branch.output
-'
-
-cat > resolve.expect << EOF
-Updating VARIABLE..VARIABLE
-FASTFORWARD (no commit created; -m option ignored)
- example | 1 +
- hello | 1 +
- 2 files changed, 2 insertions(+)
-EOF
-
-test_expect_success 'git resolve' '
- git checkout mybranch &&
- git merge -m "Merge upstream changes." master |
- sed -e "1s/[0-9a-f]\{7\}/VARIABLE/g" \
- -e "s/^Fast[- ]forward /FASTFORWARD /" >resolve.output
-'
-
-test_expect_success 'git resolve output' '
- test_i18ncmp resolve.expect resolve.output
-'
-
-cat > show-branch2.expect << EOF
-! [master] Merge work in mybranch
- * [mybranch] Merge work in mybranch
---
--- [master] Merge work in mybranch
-EOF
-
-test_expect_success 'git show-branch (part 2)' '
- git show-branch --topo-order master mybranch > show-branch2.output &&
- test_cmp show-branch2.expect show-branch2.output
-'
-
-cat > show-branch3.expect << EOF
-! [master] Merge work in mybranch
- * [mybranch] Merge work in mybranch
---
--- [master] Merge work in mybranch
-+* [master^2] Some work.
-+* [master^] Some fun.
-EOF
-
-test_expect_success 'git show-branch (part 3)' '
- git show-branch --topo-order --more=2 master mybranch \
- > show-branch3.output &&
- test_cmp show-branch3.expect show-branch3.output
-'
-
-test_expect_success 'rewind to "Some fun." and "Some work."' '
- git checkout mybranch &&
- git reset --hard master^2 &&
- git checkout master &&
- git reset --hard master^
-'
-
-cat > show-branch4.expect << EOF
-* [master] Some fun.
- ! [mybranch] Some work.
---
-* [master] Some fun.
- + [mybranch] Some work.
-*+ [master^] Initial commit
-EOF
-
-test_expect_success 'git show-branch (part 4)' '
- git show-branch --topo-order > show-branch4.output &&
- test_cmp show-branch4.expect show-branch4.output
-'
-
-test_expect_success 'manual merge' '
- mb=$(git merge-base HEAD mybranch) &&
- git name-rev --name-only --tags $mb > name-rev.output &&
- test "my-first-tag" = $(cat name-rev.output) &&
-
- git read-tree -m -u $mb HEAD mybranch
-'
-
-cat > ls-files.expect << EOF
-100644 7f8b141b65fdcee47321e399a2598a235a032422 0 example
-100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
-100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
-EOF
-
-test_expect_success 'git ls-files --stage' '
- git ls-files --stage > ls-files.output &&
- test_cmp ls-files.expect ls-files.output
-'
-
-cat > ls-files-unmerged.expect << EOF
-100644 557db03de997c86a4a028e1ebd3a1ceb225be238 1 hello
-100644 ba42a2a96e3027f3333e13ede4ccf4498c3ae942 2 hello
-100644 cc44c73eb783565da5831b4d820c962954019b69 3 hello
-EOF
-
-test_expect_success 'git ls-files --unmerged' '
- git ls-files --unmerged > ls-files-unmerged.output &&
- test_cmp ls-files-unmerged.expect ls-files-unmerged.output
-'
-
-test_expect_success 'git-merge-index' '
- test_must_fail git merge-index git-merge-one-file hello
-'
-
-test_expect_success 'git ls-files --stage (part 2)' '
- git ls-files --stage > ls-files.output2 &&
- test_cmp ls-files.expect ls-files.output2
-'
-
-test_expect_success 'git repack' 'git repack'
-test_expect_success 'git prune-packed' 'git prune-packed'
-test_expect_success '-> only packed objects' '
- git prune && # Remove conflict marked blobs
- test $(find .git/objects/[0-9a-f][0-9a-f] -type f -print 2>/dev/null | wc -l) = 0
-'
-
-test_done
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 364a537..cbeb9be 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -901,6 +901,36 @@
test_must_fail git config --get --path path.bool
'
+test_expect_success 'get --expiry-date' '
+ rel="3.weeks.5.days.00:00" &&
+ rel_out="$rel ->" &&
+ cat >.git/config <<-\EOF &&
+ [date]
+ valid1 = "3.weeks.5.days 00:00"
+ valid2 = "Fri Jun 4 15:46:55 2010"
+ valid3 = "2017/11/11 11:11:11PM"
+ valid4 = "2017/11/10 09:08:07 PM"
+ valid5 = "never"
+ invalid1 = "abc"
+ EOF
+ cat >expect <<-EOF &&
+ $(test-date timestamp $rel)
+ 1275666415
+ 1510441871
+ 1510348087
+ 0
+ EOF
+ {
+ 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 &&
+ git config --expiry-date date.valid5
+ } >actual &&
+ test_cmp expect actual &&
+ test_must_fail git config --expiry-date date.invalid1
+'
+
cat > expect << EOF
[quote]
leading = " test"
diff --git a/t/t1400-update-ref.sh b/t/t1400-update-ref.sh
index dc98b4b..664a3a4 100755
--- a/t/t1400-update-ref.sh
+++ b/t/t1400-update-ref.sh
@@ -1253,7 +1253,10 @@
(ulimit -n 32 && "$@")
}
-test_lazy_prereq ULIMIT_FILE_DESCRIPTORS 'run_with_limited_open_files true'
+test_lazy_prereq ULIMIT_FILE_DESCRIPTORS '
+ test_have_prereq !MINGW,!CYGWIN &&
+ run_with_limited_open_files true
+'
test_expect_success ULIMIT_FILE_DESCRIPTORS 'large transaction creating branches does not burst open file limit' '
(
diff --git a/t/t1401-symbolic-ref.sh b/t/t1401-symbolic-ref.sh
index eec3e90..9e782a8 100755
--- a/t/t1401-symbolic-ref.sh
+++ b/t/t1401-symbolic-ref.sh
@@ -129,11 +129,35 @@
test_must_fail git symbolic-ref refs/heads/df/conflict refs/heads/df
'
-test_expect_success 'symbolic-ref handles existing pointer to invalid name' '
+test_expect_success 'symbolic-ref can overwrite pointer to invalid name' '
+ test_when_finished reset_to_sane &&
head=$(git rev-parse HEAD) &&
git symbolic-ref HEAD refs/heads/outer &&
+ test_when_finished "git update-ref -d refs/heads/outer/inner" &&
git update-ref refs/heads/outer/inner $head &&
git symbolic-ref HEAD refs/heads/unrelated
'
+test_expect_success 'symbolic-ref can resolve d/f name (EISDIR)' '
+ test_when_finished reset_to_sane &&
+ head=$(git rev-parse HEAD) &&
+ git symbolic-ref HEAD refs/heads/outer/inner &&
+ test_when_finished "git update-ref -d refs/heads/outer" &&
+ git update-ref refs/heads/outer $head &&
+ echo refs/heads/outer/inner >expect &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'symbolic-ref can resolve d/f name (ENOTDIR)' '
+ test_when_finished reset_to_sane &&
+ head=$(git rev-parse HEAD) &&
+ git symbolic-ref HEAD refs/heads/outer &&
+ test_when_finished "git update-ref -d refs/heads/outer/inner" &&
+ git update-ref refs/heads/outer/inner $head &&
+ echo refs/heads/outer >expect &&
+ git symbolic-ref HEAD >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index 0790edf..98e4a86 100755
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh
@@ -144,6 +144,11 @@
refname2=$(git check-ref-format --branch @{-2}) &&
test "$refname2" = master'
+test_expect_success 'check-ref-format --branch -naster' '
+ test_must_fail git check-ref-format --branch -naster >actual &&
+ test_must_be_empty actual
+'
+
test_expect_success 'check-ref-format --branch from subdir' '
mkdir subdir &&
@@ -161,6 +166,17 @@
test "$refname" = "$sha1"
'
+test_expect_success 'check-ref-format --branch @{-1} from non-repo' '
+ nongit test_must_fail git check-ref-format --branch @{-1} >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'check-ref-format --branch master from non-repo' '
+ echo master >expect &&
+ nongit git check-ref-format --branch master >actual &&
+ test_cmp expect actual
+'
+
valid_ref_normalized() {
prereq=
case $1 in
diff --git a/t/t1404-update-ref-errors.sh b/t/t1404-update-ref-errors.sh
index c34ece4..3a887b5 100755
--- a/t/t1404-update-ref-errors.sh
+++ b/t/t1404-update-ref-errors.sh
@@ -34,6 +34,81 @@
Q="'"
+# Test adding and deleting D/F-conflicting references in a single
+# transaction.
+df_test() {
+ prefix="$1"
+ pack=: symadd=false symdel=false add_del=false addref= delref=
+ shift
+ while test $# -gt 0
+ do
+ case "$1" in
+ --pack)
+ pack="git pack-refs --all"
+ shift
+ ;;
+ --sym-add)
+ # Perform the add via a symbolic reference
+ symadd=true
+ shift
+ ;;
+ --sym-del)
+ # Perform the del via a symbolic reference
+ symdel=true
+ shift
+ ;;
+ --del-add)
+ # Delete first reference then add second
+ add_del=false
+ delref="$prefix/r/$2"
+ addref="$prefix/r/$3"
+ shift 3
+ ;;
+ --add-del)
+ # Add first reference then delete second
+ add_del=true
+ addref="$prefix/r/$2"
+ delref="$prefix/r/$3"
+ shift 3
+ ;;
+ *)
+ echo 1>&2 "Extra args to df_test: $*"
+ return 1
+ ;;
+ esac
+ done
+ git update-ref "$delref" $C &&
+ if $symadd
+ then
+ addname="$prefix/s/symadd" &&
+ git symbolic-ref "$addname" "$addref"
+ else
+ addname="$addref"
+ fi &&
+ if $symdel
+ then
+ delname="$prefix/s/symdel" &&
+ git symbolic-ref "$delname" "$delref"
+ else
+ delname="$delref"
+ fi &&
+ cat >expected-err <<-EOF &&
+ fatal: cannot lock ref $Q$addname$Q: $Q$delref$Q exists; cannot create $Q$addref$Q
+ EOF
+ $pack &&
+ if $add_del
+ then
+ printf "%s\n" "create $addname $D" "delete $delname"
+ else
+ printf "%s\n" "delete $delname" "create $addname $D"
+ fi >commands &&
+ test_must_fail git update-ref --stdin <commands 2>output.err &&
+ test_cmp expected-err output.err &&
+ printf "%s\n" "$C $delref" >expected-refs &&
+ git for-each-ref --format="%(objectname) %(refname)" $prefix/r >actual-refs &&
+ test_cmp expected-refs actual-refs
+}
+
test_expect_success 'setup' '
git commit --allow-empty -m Initial &&
@@ -188,6 +263,72 @@
git update-ref --stdin
'
+test_expect_success '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' '
+ df_test refs/df-as-dl --add-del foo foo/bar
+'
+
+test_expect_success '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' '
+ df_test refs/df-ds-al --del-add foo foo/bar
+'
+
+test_expect_success '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' '
+ df_test refs/df-as-dlp --pack --add-del foo foo/bar
+'
+
+test_expect_success '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' '
+ 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' '
+ 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' '
+ 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' '
+ 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' '
+ 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' '
+ 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' '
+ 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' '
+ 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' '
+ df_test refs/df-idlp-ias --sym-add --sym-del --pack --del-add foo/bar foo
+'
+
# Test various errors when reading the old values of references...
test_expect_success 'missing old value blocks update' '
@@ -404,4 +545,77 @@
test_cmp expected output.err
'
+test_expect_success 'no bogus intermediate values during delete' '
+ prefix=refs/slow-transaction &&
+ # Set up a reference with differing loose and packed versions:
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ git update-ref $prefix/foo $D &&
+ git for-each-ref $prefix >unchanged &&
+ # Now try to update the reference, but hold the `packed-refs` lock
+ # for a while to see what happens while the process is blocked:
+ : >.git/packed-refs.lock &&
+ test_when_finished "rm -f .git/packed-refs.lock" &&
+ {
+ # Note: the following command is intentionally run in the
+ # background. We increase the timeout so that `update-ref`
+ # attempts to acquire the `packed-refs` lock for longer than
+ # it takes for us to do the check then delete it:
+ git -c core.packedrefstimeout=3000 update-ref -d $prefix/foo &
+ } &&
+ pid2=$! &&
+ # Give update-ref plenty of time to get to the point where it tries
+ # to lock packed-refs:
+ sleep 1 &&
+ # Make sure that update-ref did not complete despite the lock:
+ kill -0 $pid2 &&
+ # Verify that the reference still has its old value:
+ sha1=$(git rev-parse --verify --quiet $prefix/foo || echo undefined) &&
+ case "$sha1" in
+ $D)
+ # This is what we hope for; it means that nothing
+ # user-visible has changed yet.
+ : ;;
+ undefined)
+ # This is not correct; it means the deletion has happened
+ # already even though update-ref should not have been
+ # able to acquire the lock yet.
+ echo "$prefix/foo deleted prematurely" &&
+ break
+ ;;
+ $C)
+ # This value should never be seen. Probably the loose
+ # reference has been deleted but the packed reference
+ # is still there:
+ echo "$prefix/foo incorrectly observed to be C" &&
+ break
+ ;;
+ *)
+ # WTF?
+ echo "unexpected value observed for $prefix/foo: $sha1" &&
+ break
+ ;;
+ esac >out &&
+ rm -f .git/packed-refs.lock &&
+ wait $pid2 &&
+ test_must_be_empty out &&
+ test_must_fail git rev-parse --verify --quiet $prefix/foo
+'
+
+test_expect_success 'delete fails cleanly if packed-refs file is locked' '
+ prefix=refs/locked-packed-refs &&
+ # Set up a reference with differing loose and packed versions:
+ git update-ref $prefix/foo $C &&
+ git pack-refs --all &&
+ git update-ref $prefix/foo $D &&
+ git for-each-ref $prefix >unchanged &&
+ # Now try to delete it while the `packed-refs` lock is held:
+ : >.git/packed-refs.lock &&
+ test_when_finished "rm -f .git/packed-refs.lock" &&
+ test_must_fail git update-ref -d $prefix/foo >out 2>err &&
+ git for-each-ref $prefix >actual &&
+ test_i18ngrep "Unable to create $Q.*packed-refs.lock$Q: File exists" err &&
+ test_cmp unchanged actual
+'
+
test_done
diff --git a/t/t1407-worktree-ref-store.sh b/t/t1407-worktree-ref-store.sh
index 5df06f3..8842d03 100755
--- a/t/t1407-worktree-ref-store.sh
+++ b/t/t1407-worktree-ref-store.sh
@@ -49,4 +49,34 @@
test_cmp expected actual
'
+test_expect_success 'for_each_reflog()' '
+ echo $_z40 > .git/logs/PSEUDO-MAIN &&
+ mkdir -p .git/logs/refs/bisect &&
+ echo $_z40 > .git/logs/refs/bisect/random &&
+
+ echo $_z40 > .git/worktrees/wt/logs/PSEUDO-WT &&
+ mkdir -p .git/worktrees/wt/logs/refs/bisect &&
+ echo $_z40 > .git/worktrees/wt/logs/refs/bisect/wt-random &&
+
+ $RWT for-each-reflog | cut -c 42- | sort >actual &&
+ cat >expected <<-\EOF &&
+ HEAD 0x1
+ PSEUDO-WT 0x0
+ refs/bisect/wt-random 0x0
+ refs/heads/master 0x0
+ refs/heads/wt-master 0x0
+ EOF
+ test_cmp expected actual &&
+
+ $RMAIN for-each-reflog | cut -c 42- | sort >actual &&
+ cat >expected <<-\EOF &&
+ HEAD 0x1
+ PSEUDO-MAIN 0x0
+ refs/bisect/random 0x0
+ refs/heads/master 0x0
+ refs/heads/wt-master 0x0
+ EOF
+ test_cmp expected actual
+'
+
test_done
diff --git a/t/t1408-packed-refs.sh b/t/t1408-packed-refs.sh
new file mode 100755
index 0000000..1e44a17
--- /dev/null
+++ b/t/t1408-packed-refs.sh
@@ -0,0 +1,42 @@
+#!/bin/sh
+
+test_description='packed-refs entries are covered by loose refs'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ test_tick &&
+ git commit --allow-empty -m one &&
+ one=$(git rev-parse HEAD) &&
+ git for-each-ref >actual &&
+ echo "$one commit refs/heads/master" >expect &&
+ test_cmp expect actual &&
+
+ git pack-refs --all &&
+ git for-each-ref >actual &&
+ echo "$one commit refs/heads/master" >expect &&
+ test_cmp expect actual &&
+
+ git checkout --orphan another &&
+ test_tick &&
+ git commit --allow-empty -m two &&
+ two=$(git rev-parse HEAD) &&
+ git checkout -B master &&
+ git branch -D another &&
+
+ git for-each-ref >actual &&
+ echo "$two commit refs/heads/master" >expect &&
+ test_cmp expect actual &&
+
+ git reflog expire --expire=now --all &&
+ git prune &&
+ git tag -m v1.0 v1.0 master
+'
+
+test_expect_success 'no error from stale entry in packed-refs' '
+ git describe master >actual 2>&1 &&
+ echo "v1.0" >expect &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t1409-avoid-packing-refs.sh b/t/t1409-avoid-packing-refs.sh
new file mode 100755
index 0000000..e5cb8a2
--- /dev/null
+++ b/t/t1409-avoid-packing-refs.sh
@@ -0,0 +1,118 @@
+#!/bin/sh
+
+test_description='avoid rewriting packed-refs unnecessarily'
+
+. ./test-lib.sh
+
+# Add an identifying mark to the packed-refs file header line. This
+# shouldn't upset readers, and it should be omitted if the file is
+# ever rewritten.
+mark_packed_refs () {
+ sed -e "s/^\(#.*\)/\1 t1409 /" <.git/packed-refs >.git/packed-refs.new &&
+ mv .git/packed-refs.new .git/packed-refs
+}
+
+# Verify that the packed-refs file is still marked.
+check_packed_refs_marked () {
+ grep -q '^#.* t1409 ' .git/packed-refs
+}
+
+test_expect_success 'setup' '
+ git commit --allow-empty -m "Commit A" &&
+ A=$(git rev-parse HEAD) &&
+ git commit --allow-empty -m "Commit B" &&
+ B=$(git rev-parse HEAD) &&
+ git commit --allow-empty -m "Commit C" &&
+ C=$(git rev-parse HEAD)
+'
+
+test_expect_success 'do not create packed-refs file gratuitously' '
+ test_must_fail test -f .git/packed-refs &&
+ git update-ref refs/heads/foo $A &&
+ test_must_fail test -f .git/packed-refs &&
+ git update-ref refs/heads/foo $B &&
+ test_must_fail test -f .git/packed-refs &&
+ git update-ref refs/heads/foo $C $B &&
+ test_must_fail test -f .git/packed-refs &&
+ git update-ref -d refs/heads/foo &&
+ test_must_fail test -f .git/packed-refs
+'
+
+test_expect_success 'check that marking the packed-refs file works' '
+ git for-each-ref >expected &&
+ git pack-refs --all &&
+ mark_packed_refs &&
+ check_packed_refs_marked &&
+ git for-each-ref >actual &&
+ test_cmp expected actual &&
+ git pack-refs --all &&
+ test_must_fail check_packed_refs_marked &&
+ git for-each-ref >actual2 &&
+ test_cmp expected actual2
+'
+
+test_expect_success 'leave packed-refs untouched on update of packed' '
+ git update-ref refs/heads/packed-update $A &&
+ git pack-refs --all &&
+ mark_packed_refs &&
+ git update-ref refs/heads/packed-update $B &&
+ check_packed_refs_marked
+'
+
+test_expect_success 'leave packed-refs untouched on checked update of packed' '
+ git update-ref refs/heads/packed-checked-update $A &&
+ git pack-refs --all &&
+ mark_packed_refs &&
+ git update-ref refs/heads/packed-checked-update $B $A &&
+ check_packed_refs_marked
+'
+
+test_expect_success 'leave packed-refs untouched on verify of packed' '
+ git update-ref refs/heads/packed-verify $A &&
+ git pack-refs --all &&
+ mark_packed_refs &&
+ echo "verify refs/heads/packed-verify $A" | git update-ref --stdin &&
+ check_packed_refs_marked
+'
+
+test_expect_success 'touch packed-refs on delete of packed' '
+ git update-ref refs/heads/packed-delete $A &&
+ git pack-refs --all &&
+ mark_packed_refs &&
+ git update-ref -d refs/heads/packed-delete &&
+ test_must_fail check_packed_refs_marked
+'
+
+test_expect_success 'leave packed-refs untouched on update of loose' '
+ git pack-refs --all &&
+ git update-ref refs/heads/loose-update $A &&
+ mark_packed_refs &&
+ git update-ref refs/heads/loose-update $B &&
+ check_packed_refs_marked
+'
+
+test_expect_success 'leave packed-refs untouched on checked update of loose' '
+ git pack-refs --all &&
+ git update-ref refs/heads/loose-checked-update $A &&
+ mark_packed_refs &&
+ git update-ref refs/heads/loose-checked-update $B $A &&
+ check_packed_refs_marked
+'
+
+test_expect_success 'leave packed-refs untouched on verify of loose' '
+ git pack-refs --all &&
+ git update-ref refs/heads/loose-verify $A &&
+ mark_packed_refs &&
+ echo "verify refs/heads/loose-verify $A" | git update-ref --stdin &&
+ check_packed_refs_marked
+'
+
+test_expect_success 'leave packed-refs untouched on delete of loose' '
+ git pack-refs --all &&
+ git update-ref refs/heads/loose-delete $A &&
+ mark_packed_refs &&
+ git update-ref -d refs/heads/loose-delete &&
+ check_packed_refs_marked
+'
+
+test_done
diff --git a/t/t1430-bad-ref-name.sh b/t/t1430-bad-ref-name.sh
index e88349c..c7878a6 100755
--- a/t/t1430-bad-ref-name.sh
+++ b/t/t1430-bad-ref-name.sh
@@ -331,4 +331,47 @@
grep "fatal: invalid ref format: ~a" err
'
+test_expect_success 'branch rejects HEAD as a branch name' '
+ test_must_fail git branch HEAD HEAD^ &&
+ test_must_fail git show-ref refs/heads/HEAD
+'
+
+test_expect_success 'checkout -b rejects HEAD as a branch name' '
+ test_must_fail git checkout -B HEAD HEAD^ &&
+ test_must_fail git show-ref refs/heads/HEAD
+'
+
+test_expect_success 'update-ref can operate on refs/heads/HEAD' '
+ git update-ref refs/heads/HEAD HEAD^ &&
+ git show-ref refs/heads/HEAD &&
+ git update-ref -d refs/heads/HEAD &&
+ test_must_fail git show-ref refs/heads/HEAD
+'
+
+test_expect_success 'branch -d can remove refs/heads/HEAD' '
+ git update-ref refs/heads/HEAD HEAD^ &&
+ git branch -d HEAD &&
+ test_must_fail git show-ref refs/heads/HEAD
+'
+
+test_expect_success 'branch -m can rename refs/heads/HEAD' '
+ git update-ref refs/heads/HEAD HEAD^ &&
+ git branch -m HEAD tail &&
+ test_must_fail git show-ref refs/heads/HEAD &&
+ git show-ref refs/heads/tail
+'
+
+test_expect_success 'branch -d can remove refs/heads/-dash' '
+ git update-ref refs/heads/-dash HEAD^ &&
+ git branch -d -- -dash &&
+ test_must_fail git show-ref refs/heads/-dash
+'
+
+test_expect_success 'branch -m can rename refs/heads/-dash' '
+ git update-ref refs/heads/-dash HEAD^ &&
+ git branch -m -- -dash dash &&
+ test_must_fail git show-ref refs/heads/-dash &&
+ git show-ref refs/heads/dash
+'
+
test_done
diff --git a/t/t1500-rev-parse.sh b/t/t1500-rev-parse.sh
index 03d3c7f..5c715fe 100755
--- a/t/t1500-rev-parse.sh
+++ b/t/t1500-rev-parse.sh
@@ -116,6 +116,21 @@
test_cmp expect actual
'
+test_expect_success 'rev-parse --is-shallow-repository in shallow repo' '
+ test_commit test_commit &&
+ echo true >expect &&
+ git clone --depth 1 --no-local . shallow &&
+ test_when_finished "rm -rf shallow" &&
+ git -C shallow rev-parse --is-shallow-repository >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'rev-parse --is-shallow-repository in non-shallow repo' '
+ echo false >expect &&
+ git rev-parse --is-shallow-repository >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'showing the superproject correctly' '
git rev-parse --show-superproject-working-tree >out &&
test_must_be_empty out &&
diff --git a/t/t1502-rev-parse-parseopt.sh b/t/t1502-rev-parse-parseopt.sh
index 310f93f..a859abe 100755
--- a/t/t1502-rev-parse-parseopt.sh
+++ b/t/t1502-rev-parse-parseopt.sh
@@ -28,6 +28,9 @@
|g,fluf?path short and long option optional argument
|longest=very-long-argument-hint a very long argument hint
|pair=key=value with an equals sign in the hint
+|aswitch help te=t contains? fl*g characters!`
+|bswitch=hint hint has trailing tab character
+|cswitch switch has trailing tab character
|short-hint=a with a one symbol hint
|
|Extras
@@ -35,6 +38,25 @@
EOF
'
+test_expect_success 'setup optionspec-no-switches' '
+ sed -e "s/^|//" >optionspec_no_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+EOF
+'
+
+test_expect_success 'setup optionspec-only-hidden-switches' '
+ sed -e "s/^|//" >optionspec_only_hidden_switches <<\EOF
+|some-command [options] <args>...
+|
+|some-command does foo and bar!
+|--
+|hidden1* A hidden switch
+EOF
+'
+
test_expect_success 'test --parseopt help output' '
sed -e "s/^|//" >expect <<\END_EXPECT &&
|cat <<\EOF
@@ -62,6 +84,9 @@
| --longest <very-long-argument-hint>
| a very long argument hint
| --pair <key=value> with an equals sign in the hint
+| --aswitch help te=t contains? fl*g characters!`
+| --bswitch <hint> hint has trailing tab character
+| --cswitch switch has trailing tab character
| --short-hint <a> with a one symbol hint
|
|Extras
@@ -73,19 +98,100 @@
test_i18ncmp expect output
'
+test_expect_success 'test --parseopt help output no switches' '
+ sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+| some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+ test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_no_switches &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'test --parseopt help output hidden switches' '
+ sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+| some-command does foo and bar!
+|
+|EOF
+END_EXPECT
+ test_expect_code 129 git rev-parse --parseopt -- -h > output < optionspec_only_hidden_switches &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'test --parseopt help-all output hidden switches' '
+ sed -e "s/^|//" >expect <<\END_EXPECT &&
+|cat <<\EOF
+|usage: some-command [options] <args>...
+|
+| some-command does foo and bar!
+|
+| --hidden1 A hidden switch
+|
+|EOF
+END_EXPECT
+ test_expect_code 129 git rev-parse --parseopt -- --help-all > output < optionspec_only_hidden_switches &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'test --parseopt invalid switch help output' '
+ sed -e "s/^|//" >expect <<\END_EXPECT &&
+|error: unknown option `does-not-exist'\''
+|usage: some-command [options] <args>...
+|
+| some-command does foo and bar!
+|
+| -h, --help show the help
+| --foo some nifty option --foo
+| --bar ... some cool option --bar with an argument
+| -b, --baz a short and long option
+|
+|An option group Header
+| -C[...] option C with an optional argument
+| -d, --data[=...] short and long option with an optional argument
+|
+|Argument hints
+| -B <arg> short option required argument
+| --bar2 <arg> long option required argument
+| -e, --fuz <with-space>
+| short and long option required argument
+| -s[<some>] short option optional argument
+| --long[=<data>] long option optional argument
+| -g, --fluf[=<path>] short and long option optional argument
+| --longest <very-long-argument-hint>
+| a very long argument hint
+| --pair <key=value> with an equals sign in the hint
+| --aswitch help te=t contains? fl*g characters!`
+| --bswitch <hint> hint has trailing tab character
+| --cswitch switch has trailing tab character
+| --short-hint <a> with a one symbol hint
+|
+|Extras
+| --extra1 line above used to cause a segfault but no longer does
+|
+END_EXPECT
+ test_expect_code 129 git rev-parse --parseopt -- --does-not-exist 1>/dev/null 2>output < optionspec &&
+ test_i18ncmp expect output
+'
+
test_expect_success 'setup expect.1' "
cat > expect <<EOF
-set -- --foo --bar 'ham' -b -- 'arg'
+set -- --foo --bar 'ham' -b --aswitch -- 'arg'
EOF
"
test_expect_success 'test --parseopt' '
- git rev-parse --parseopt -- --foo --bar=ham --baz arg < optionspec > output &&
+ git rev-parse --parseopt -- --foo --bar=ham --baz --aswitch arg < optionspec > output &&
test_cmp expect output
'
test_expect_success 'test --parseopt with mixed options and arguments' '
- git rev-parse --parseopt -- --foo arg --bar=ham --baz < optionspec > output &&
+ git rev-parse --parseopt -- --foo arg --bar=ham --baz --aswitch < optionspec > output &&
test_cmp expect output
'
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index 22f69a4..a66936f 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -6,6 +6,7 @@
# We need total control of index splitting here
sane_unset GIT_TEST_SPLIT_INDEX
+sane_unset GIT_FSMONITOR_TEST
test_expect_success 'enable split index' '
git config splitIndex.maxPercentChange 100 &&
@@ -400,4 +401,42 @@
0642 -rw-r---w-
EOF
+test_expect_success POSIXPERM,SANITY 'graceful handling when splitting index is not allowed' '
+ test_create_repo ro &&
+ (
+ cd ro &&
+ test_commit initial &&
+ git update-index --split-index &&
+ test -f .git/sharedindex.*
+ ) &&
+ cp ro/.git/index new-index &&
+ test_when_finished "chmod u+w ro/.git" &&
+ chmod u-w ro/.git &&
+ GIT_INDEX_FILE="$(pwd)/new-index" git -C ro update-index --split-index &&
+ chmod u+w ro/.git &&
+ rm ro/.git/sharedindex.* &&
+ GIT_INDEX_FILE=new-index git ls-files >actual &&
+ echo initial.t >expected &&
+ test_cmp expected actual
+'
+
+test_expect_success 'writing split index with null sha1 does not write cache tree' '
+ git config core.splitIndex true &&
+ git config splitIndex.maxPercentChange 0 &&
+ git commit -m "commit" &&
+ {
+ git ls-tree HEAD &&
+ printf "160000 commit $_z40\\tbroken\\n"
+ } >broken-tree &&
+ echo "add broken entry" >msg &&
+
+ tree=$(git mktree <broken-tree) &&
+ test_tick &&
+ commit=$(git commit-tree $tree -p HEAD <msg) &&
+ git update-ref HEAD "$commit" &&
+ GIT_ALLOW_NULL_SHA1=1 git reset --hard &&
+ (test-dump-cache-tree >cache-tree.out || true) &&
+ test_line_count = 0 cache-tree.out
+'
+
test_done
diff --git a/t/t2020-checkout-detach.sh b/t/t2020-checkout-detach.sh
index fbb4ee9..bb4f2e0 100755
--- a/t/t2020-checkout-detach.sh
+++ b/t/t2020-checkout-detach.sh
@@ -186,4 +186,127 @@
test_cmp expect.no-advice actual
'
+# Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (new format)
+test_expect_success 'describe_detached_head prints no SHA-1 ellipsis when not asked to' "
+
+ # The first detach operation is more chatty than the following ones.
+ cat >1st_detach <<-'EOF' &&
+ Note: checking out 'HEAD^'.
+
+ You are in 'detached HEAD' state. You can look around, make experimental
+ changes and commit them, and you can discard any commits you make in this
+ state without impacting any branches by performing another checkout.
+
+ If you want to create a new branch to retain commits you create, you may
+ do so (now or later) by using -b with the checkout command again. Example:
+
+ git checkout -b <new-branch-name>
+
+ HEAD is now at 7c7cd714e262 three
+ EOF
+
+ # The remaining ones just show info about previous and current HEADs.
+ cat >2nd_detach <<-'EOF' &&
+ Previous HEAD position was 7c7cd714e262 three
+ HEAD is now at 139b20d8e6c5 two
+ EOF
+
+ cat >3rd_detach <<-'EOF' &&
+ Previous HEAD position was 139b20d8e6c5 two
+ HEAD is now at d79ce1670bdc one
+ EOF
+
+ reset &&
+ check_not_detached &&
+
+ # Various ways of *not* asking for ellipses
+
+ sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
+ git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 1st_detach actual &&
+
+ GIT_PRINT_SHA1_ELLIPSIS="no" git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 2nd_detach actual &&
+
+ GIT_PRINT_SHA1_ELLIPSIS= git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 3rd_detach actual &&
+
+ sane_unset GIT_PRINT_SHA1_ELLIPSIS &&
+
+ # We only have four commits, but we can re-use them
+ reset &&
+ check_not_detached &&
+
+ # Make no mention of the env var at all
+ git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 1st_detach actual &&
+
+ GIT_PRINT_SHA1_ELLIPSIS='nope' &&
+ git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 2nd_detach actual &&
+
+ GIT_PRINT_SHA1_ELLIPSIS=nein &&
+ git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 3rd_detach actual &&
+
+ true
+"
+
+# Detached HEAD tests for GIT_PRINT_SHA1_ELLIPSIS (old format)
+test_expect_success 'describe_detached_head does print SHA-1 ellipsis when asked to' "
+
+ # The first detach operation is more chatty than the following ones.
+ cat >1st_detach <<-'EOF' &&
+ Note: checking out 'HEAD^'.
+
+ You are in 'detached HEAD' state. You can look around, make experimental
+ changes and commit them, and you can discard any commits you make in this
+ state without impacting any branches by performing another checkout.
+
+ If you want to create a new branch to retain commits you create, you may
+ do so (now or later) by using -b with the checkout command again. Example:
+
+ git checkout -b <new-branch-name>
+
+ HEAD is now at 7c7cd714e262... three
+ EOF
+
+ # The remaining ones just show info about previous and current HEADs.
+ cat >2nd_detach <<-'EOF' &&
+ Previous HEAD position was 7c7cd714e262... three
+ HEAD is now at 139b20d8e6c5... two
+ EOF
+
+ cat >3rd_detach <<-'EOF' &&
+ Previous HEAD position was 139b20d8e6c5... two
+ HEAD is now at d79ce1670bdc... one
+ EOF
+
+ reset &&
+ check_not_detached &&
+
+ # Various ways of asking for ellipses...
+ # The user can just use any kind of quoting (including none).
+
+ GIT_PRINT_SHA1_ELLIPSIS=yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 1st_detach actual &&
+
+ GIT_PRINT_SHA1_ELLIPSIS=Yes git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 2nd_detach actual &&
+
+ GIT_PRINT_SHA1_ELLIPSIS=YES git -c 'core.abbrev=12' checkout HEAD^ >actual 2>&1 &&
+ check_detached &&
+ test_i18ncmp 3rd_detach actual &&
+
+ true
+"
+
test_done
diff --git a/t/t2025-worktree-add.sh b/t/t2025-worktree-add.sh
index b5c47ac..2b95944 100755
--- a/t/t2025-worktree-add.sh
+++ b/t/t2025-worktree-add.sh
@@ -245,6 +245,12 @@
( cd here-clone && git fsck )
'
+test_expect_success 'local clone --shared from linked checkout' '
+ git -C bare worktree add --detach ../baretree &&
+ git clone --local --shared baretree bare-clone &&
+ grep /bare/ bare-clone/.git/objects/info/alternates
+'
+
test_expect_success '"add" worktree with --no-checkout' '
git worktree add --no-checkout -b swamp swamp &&
! test -e swamp/init.t &&
@@ -313,5 +319,164 @@
test_expect_success 'rename a branch under bisect not allowed' '
test_must_fail git branch -M under-bisect bisect-with-new-name
'
+# Is branch "refs/heads/$1" set to pull from "$2/$3"?
+test_branch_upstream () {
+ printf "%s\n" "$2" "refs/heads/$3" >expect.upstream &&
+ {
+ git config "branch.$1.remote" &&
+ git config "branch.$1.merge"
+ } >actual.upstream &&
+ test_cmp expect.upstream actual.upstream
+}
+
+test_expect_success '--track sets up tracking' '
+ test_when_finished rm -rf track &&
+ git worktree add --track -b track track master &&
+ test_branch_upstream track . master
+'
+
+# setup remote repository $1 and repository $2 with $1 set up as
+# remote. The remote has two branches, master and foo.
+setup_remote_repo () {
+ git init $1 &&
+ (
+ cd $1 &&
+ test_commit $1_master &&
+ git checkout -b foo &&
+ test_commit upstream_foo
+ ) &&
+ git init $2 &&
+ (
+ cd $2 &&
+ test_commit $2_master &&
+ git remote add $1 ../$1 &&
+ git config remote.$1.fetch \
+ "refs/heads/*:refs/remotes/$1/*" &&
+ git fetch --all
+ )
+}
+
+test_expect_success '--no-track avoids setting up tracking' '
+ test_when_finished rm -rf repo_upstream repo_local foo &&
+ setup_remote_repo repo_upstream repo_local &&
+ (
+ cd repo_local &&
+ git worktree add --no-track -b foo ../foo repo_upstream/foo
+ ) &&
+ (
+ cd foo &&
+ test_must_fail git config "branch.foo.remote" &&
+ test_must_fail git config "branch.foo.merge" &&
+ test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
+ )
+'
+
+test_expect_success '"add" <path> <non-existent-branch> fails' '
+ test_must_fail git worktree add foo non-existent
+'
+
+test_expect_success '"add" <path> <branch> dwims' '
+ test_when_finished rm -rf repo_upstream repo_dwim foo &&
+ setup_remote_repo repo_upstream repo_dwim &&
+ git init repo_dwim &&
+ (
+ cd repo_dwim &&
+ git worktree add ../foo foo
+ ) &&
+ (
+ cd foo &&
+ test_branch_upstream foo repo_upstream foo &&
+ test_cmp_rev refs/remotes/repo_upstream/foo refs/heads/foo
+ )
+'
+
+test_expect_success 'git worktree add does not match remote' '
+ test_when_finished rm -rf repo_a repo_b foo &&
+ setup_remote_repo repo_a repo_b &&
+ (
+ cd repo_b &&
+ git worktree add ../foo
+ ) &&
+ (
+ cd foo &&
+ test_must_fail git config "branch.foo.remote" &&
+ test_must_fail git config "branch.foo.merge" &&
+ ! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+ )
+'
+
+test_expect_success 'git worktree add --guess-remote sets up tracking' '
+ test_when_finished rm -rf repo_a repo_b foo &&
+ setup_remote_repo repo_a repo_b &&
+ (
+ cd repo_b &&
+ git worktree add --guess-remote ../foo
+ ) &&
+ (
+ cd foo &&
+ test_branch_upstream foo repo_a foo &&
+ test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+ )
+'
+
+test_expect_success 'git worktree add with worktree.guessRemote sets up tracking' '
+ test_when_finished rm -rf repo_a repo_b foo &&
+ setup_remote_repo repo_a repo_b &&
+ (
+ cd repo_b &&
+ git config worktree.guessRemote true &&
+ git worktree add ../foo
+ ) &&
+ (
+ cd foo &&
+ test_branch_upstream foo repo_a foo &&
+ test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+ )
+'
+
+test_expect_success 'git worktree --no-guess-remote option overrides config' '
+ test_when_finished rm -rf repo_a repo_b foo &&
+ setup_remote_repo repo_a repo_b &&
+ (
+ cd repo_b &&
+ git config worktree.guessRemote true &&
+ git worktree add --no-guess-remote ../foo
+ ) &&
+ (
+ cd foo &&
+ test_must_fail git config "branch.foo.remote" &&
+ test_must_fail git config "branch.foo.merge" &&
+ ! test_cmp_rev refs/remotes/repo_a/foo refs/heads/foo
+ )
+'
+
+post_checkout_hook () {
+ test_when_finished "rm -f .git/hooks/post-checkout" &&
+ mkdir -p .git/hooks &&
+ write_script .git/hooks/post-checkout <<-\EOF
+ echo $* >hook.actual
+ EOF
+}
+
+test_expect_success '"add" invokes post-checkout hook (branch)' '
+ post_checkout_hook &&
+ printf "%s %s 1\n" $_z40 $(git rev-parse HEAD) >hook.expect &&
+ git worktree add gumby &&
+ test_cmp hook.expect hook.actual
+'
+
+test_expect_success '"add" invokes post-checkout hook (detached)' '
+ post_checkout_hook &&
+ printf "%s %s 1\n" $_z40 $(git rev-parse HEAD) >hook.expect &&
+ git worktree add --detach grumpy &&
+ test_cmp hook.expect hook.actual
+'
+
+test_expect_success '"add --no-checkout" suppresses post-checkout hook' '
+ post_checkout_hook &&
+ rm -f hook.actual &&
+ git worktree add --no-checkout gloopy &&
+ test_path_is_missing hook.actual
+'
test_done
diff --git a/t/t2203-add-intent.sh b/t/t2203-add-intent.sh
index 1bdf38e..78236dc 100755
--- a/t/t2203-add-intent.sh
+++ b/t/t2203-add-intent.sh
@@ -25,6 +25,18 @@
test_cmp expect actual
'
+test_expect_success 'git status with porcelain v2' '
+ git status --porcelain=v2 | grep -v "^?" >actual &&
+ nam1=d00491fd7e5bb6fa28c517a0bb32b8b506539d4d &&
+ nam2=ce013625030ba8dba906f756967f9e9ca394464a &&
+ cat >expect <<-EOF &&
+ 1 DA N... 100644 000000 100644 $nam1 $_z40 1.t
+ 1 A. N... 000000 100644 100644 $_z40 $nam2 elif
+ 1 .A N... 000000 000000 100644 $_z40 $_z40 file
+ EOF
+ test_cmp expect actual
+'
+
test_expect_success 'check result of "add -N"' '
git ls-files -s file >actual &&
empty=$(git hash-object --stdin </dev/null) &&
@@ -150,5 +162,65 @@
)
'
+test_expect_success 'rename detection finds the right names' '
+ git init rename-detection &&
+ (
+ cd rename-detection &&
+ echo contents >first &&
+ git add first &&
+ git commit -m first &&
+ mv first third &&
+ git add -N third &&
+
+ git status | grep -v "^?" >actual.1 &&
+ test_i18ngrep "renamed: *first -> third" actual.1 &&
+
+ git status --porcelain | grep -v "^?" >actual.2 &&
+ cat >expected.2 <<-\EOF &&
+ R first -> third
+ EOF
+ test_cmp expected.2 actual.2 &&
+
+ hash=12f00e90b6ef79117ce6e650416b8cf517099b78 &&
+ git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+ cat >expected.3 <<-EOF &&
+ 2 .R N... 100644 100644 100644 $hash $hash R100 third first
+ EOF
+ test_cmp expected.3 actual.3
+ )
+'
+
+test_expect_success 'double rename detection in status' '
+ git init rename-detection-2 &&
+ (
+ cd rename-detection-2 &&
+ echo contents >first &&
+ git add first &&
+ git commit -m first &&
+ git mv first second &&
+ mv second third &&
+ git add -N third &&
+
+ git status | grep -v "^?" >actual.1 &&
+ test_i18ngrep "renamed: *first -> second" actual.1 &&
+ test_i18ngrep "renamed: *second -> third" actual.1 &&
+
+ git status --porcelain | grep -v "^?" >actual.2 &&
+ cat >expected.2 <<-\EOF &&
+ R first -> second
+ R second -> third
+ EOF
+ test_cmp expected.2 actual.2 &&
+
+ hash=12f00e90b6ef79117ce6e650416b8cf517099b78 &&
+ git status --porcelain=v2 | grep -v "^?" >actual.3 &&
+ cat >expected.3 <<-EOF &&
+ 2 R. N... 100644 100644 100644 $hash $hash R100 second first
+ 2 .R N... 100644 100644 100644 $hash $hash R100 third second
+ EOF
+ test_cmp expected.3 actual.3
+ )
+'
+
test_done
diff --git a/t/t3030-merge-recursive.sh b/t/t3030-merge-recursive.sh
index 9a893b5..cdc38fe 100755
--- a/t/t3030-merge-recursive.sh
+++ b/t/t3030-merge-recursive.sh
@@ -678,4 +678,54 @@
test_cmp expect actual
'
+test_expect_success 'merge-recursive internal merge resolves to the sameness' '
+ git reset --hard HEAD &&
+
+ # We are going to create a history leading to two criss-cross
+ # branches A and B. The common ancestor at the bottom, O0,
+ # has two child commits O1 and O2, both of which will be merge
+ # base between A and B, like so:
+ #
+ # O1---A
+ # / \ /
+ # O0 .
+ # \ / \
+ # O2---B
+ #
+ # The recently added "check to see if the index is different from
+ # the tree into which something else is getting merged" check must
+ # NOT kick in when an inner merge between O1 and O2 is made. Both
+ # O1 and O2 happen to have the same tree as O0 in this test to
+ # trigger the bug---whether the inner merge is made by merging O2
+ # into O1 or O1 into O2, their common ancestor O0 and the branch
+ # being merged have the same tree. We should not trigger the "is
+ # the index dirty?" check in this case.
+
+ echo "zero" >file &&
+ git add file &&
+ test_tick &&
+ git commit -m "O0" &&
+ O0=$(git rev-parse HEAD) &&
+
+ test_tick &&
+ git commit --allow-empty -m "O1" &&
+ O1=$(git rev-parse HEAD) &&
+
+ git reset --hard $O0 &&
+ test_tick &&
+ git commit --allow-empty -m "O2" &&
+ O2=$(git rev-parse HEAD) &&
+
+ test_tick &&
+ git merge -s ours $O1 &&
+ B=$(git rev-parse HEAD) &&
+
+ git reset --hard $O1 &&
+ test_tick &&
+ git merge -s ours $O2 &&
+ A=$(git rev-parse HEAD) &&
+
+ git merge $B
+'
+
test_done
diff --git a/t/t3040-subprojects-basic.sh b/t/t3040-subprojects-basic.sh
index 0a4ff6d..b81eb5f 100755
--- a/t/t3040-subprojects-basic.sh
+++ b/t/t3040-subprojects-basic.sh
@@ -19,7 +19,7 @@
git update-index --add sub1 &&
git add sub2 &&
git commit -q -m "subprojects added" &&
- git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
+ GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev=5 HEAD^ HEAD |cut -d" " -f-3,5- >current &&
git branch save HEAD &&
cat >expected <<-\EOF &&
:000000 160000 00000... A sub1
diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh
index 5fc2fb4..503a88d 100755
--- a/t/t3200-branch.sh
+++ b/t/t3200-branch.sh
@@ -117,6 +117,16 @@
test_cmp expect actual
'
+test_expect_success 'renaming checked out branch works with d/f conflict' '
+ test_when_finished "git branch -D foo/bar || git branch -D foo" &&
+ test_when_finished git checkout master &&
+ git checkout -b foo &&
+ git branch -m foo/bar &&
+ git symbolic-ref HEAD >actual &&
+ echo refs/heads/foo/bar >expect &&
+ test_cmp expect actual
+'
+
test_expect_success 'git branch -m o/o o should fail when o/p exists' '
git branch o/o &&
git branch o/p &&
@@ -381,6 +391,262 @@
test_must_fail git config branch.s/s.dummy
'
+test_expect_success 'git branch -m correctly renames multiple config sections' '
+ test_when_finished "git checkout master" &&
+ git checkout -b source master &&
+
+ # Assert that a config file with multiple config sections has
+ # those sections preserved...
+ cat >expect <<-\EOF &&
+ branch.dest.key1=value1
+ some.gar.b=age
+ branch.dest.key2=value2
+ EOF
+ cat >config.branch <<\EOF &&
+;; Note the lack of -\EOF above & mixed indenting here. This is
+;; intentional, we are also testing that the formatting of copied
+;; sections is preserved.
+
+;; Comment for source. Tabs
+[branch "source"]
+ ;; Comment for the source value
+ key1 = value1
+;; Comment for some.gar. Spaces
+[some "gar"]
+ ;; Comment for the some.gar value
+ b = age
+;; Comment for source, again. Mixed tabs/spaces.
+[branch "source"]
+ ;; Comment for the source value, again
+ key2 = value2
+EOF
+ cat config.branch >>.git/config &&
+ git branch -m source dest &&
+ git config -f .git/config -l | grep -F -e source -e dest -e some.gar >actual &&
+ test_cmp expect actual &&
+
+ # ...and that the comments for those sections are also
+ # preserved.
+ cat config.branch | sed "s/\"source\"/\"dest\"/" >expect &&
+ sed -n -e "/Note the lack/,\$p" .git/config >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch -c dumps usage' '
+ test_expect_code 128 git branch -c 2>err &&
+ test_i18ngrep "branch name required" err
+'
+
+test_expect_success 'git branch --copy dumps usage' '
+ test_expect_code 128 git branch --copy 2>err &&
+ test_i18ngrep "branch name required" err
+'
+
+test_expect_success 'git branch -c d e should work' '
+ git branch -l d &&
+ git reflog exists refs/heads/d &&
+ git config branch.d.dummy Hello &&
+ git branch -c d e &&
+ git reflog exists refs/heads/d &&
+ git reflog exists refs/heads/e &&
+ echo Hello >expect &&
+ git config branch.e.dummy >actual &&
+ test_cmp expect actual &&
+ echo Hello >expect &&
+ git config branch.d.dummy >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch --copy is a synonym for -c' '
+ git branch -l copy &&
+ git reflog exists refs/heads/copy &&
+ git config branch.copy.dummy Hello &&
+ git branch --copy copy copy-to &&
+ git reflog exists refs/heads/copy &&
+ git reflog exists refs/heads/copy-to &&
+ echo Hello >expect &&
+ git config branch.copy.dummy >actual &&
+ test_cmp expect actual &&
+ echo Hello >expect &&
+ git config branch.copy-to.dummy >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'git branch -c ee ef should copy ee to create branch ef' '
+ git checkout -b ee &&
+ git reflog exists refs/heads/ee &&
+ git config branch.ee.dummy Hello &&
+ git branch -c ee ef &&
+ git reflog exists refs/heads/ee &&
+ git reflog exists refs/heads/ef &&
+ test $(git config branch.ee.dummy) = Hello &&
+ test $(git config branch.ef.dummy) = Hello &&
+ test $(git rev-parse --abbrev-ref HEAD) = ee
+'
+
+test_expect_success 'git branch -c f/f g/g should work' '
+ git branch -l f/f &&
+ git reflog exists refs/heads/f/f &&
+ git config branch.f/f.dummy Hello &&
+ git branch -c f/f g/g &&
+ git reflog exists refs/heads/f/f &&
+ git reflog exists refs/heads/g/g &&
+ test $(git config branch.f/f.dummy) = Hello &&
+ test $(git config branch.g/g.dummy) = Hello
+'
+
+test_expect_success 'git branch -c m2 m2 should work' '
+ git branch -l m2 &&
+ git reflog exists refs/heads/m2 &&
+ git config branch.m2.dummy Hello &&
+ git branch -c m2 m2 &&
+ git reflog exists refs/heads/m2 &&
+ test $(git config branch.m2.dummy) = Hello
+'
+
+test_expect_success 'git branch -c zz zz/zz should fail' '
+ git branch -l zz &&
+ git reflog exists refs/heads/zz &&
+ test_must_fail git branch -c zz zz/zz
+'
+
+test_expect_success 'git branch -c b/b b should fail' '
+ git branch -l b/b &&
+ test_must_fail git branch -c b/b b
+'
+
+test_expect_success 'git branch -C o/q o/p should work when o/p exists' '
+ git branch -l o/q &&
+ git reflog exists refs/heads/o/q &&
+ git reflog exists refs/heads/o/p &&
+ git branch -C o/q o/p
+'
+
+test_expect_success 'git branch -c -f o/q o/p should work when o/p exists' '
+ git reflog exists refs/heads/o/q &&
+ git reflog exists refs/heads/o/p &&
+ git branch -c -f o/q o/p
+'
+
+test_expect_success 'git branch -c qq rr/qq should fail when r exists' '
+ git branch qq &&
+ git branch rr &&
+ test_must_fail git branch -c qq rr/qq
+'
+
+test_expect_success 'git branch -C b1 b2 should fail when b2 is checked out' '
+ git branch b1 &&
+ git checkout -b b2 &&
+ test_must_fail git branch -C b1 b2
+'
+
+test_expect_success 'git branch -C c1 c2 should succeed when c1 is checked out' '
+ git checkout -b c1 &&
+ git branch c2 &&
+ git branch -C c1 c2 &&
+ test $(git rev-parse --abbrev-ref HEAD) = c1
+'
+
+test_expect_success 'git branch -C c1 c2 should never touch HEAD' '
+ msg="Branch: copied refs/heads/c1 to refs/heads/c2" &&
+ ! grep "$msg$" .git/logs/HEAD
+'
+
+test_expect_success 'git branch -C master should work when master is checked out' '
+ git checkout master &&
+ git branch -C master
+'
+
+test_expect_success 'git branch -C master master should work when master is checked out' '
+ git checkout master &&
+ git branch -C master master
+'
+
+test_expect_success 'git branch -C master5 master5 should work when master is checked out' '
+ git checkout master &&
+ git branch master5 &&
+ git branch -C master5 master5
+'
+
+test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '
+ git branch -l cd &&
+ git reflog exists refs/heads/cd &&
+ git config branch.cd.dummy CD &&
+ git branch -l ab &&
+ git reflog exists refs/heads/ab &&
+ git config branch.ab.dummy AB &&
+ git branch -C ab cd &&
+ git reflog exists refs/heads/ab &&
+ git reflog exists refs/heads/cd &&
+ test $(git config branch.ab.dummy) = AB &&
+ test $(git config branch.cd.dummy) = AB
+'
+
+test_expect_success 'git branch -c correctly copies multiple config sections' '
+ FOO=1 &&
+ export FOO &&
+ test_when_finished "git checkout master" &&
+ git checkout -b source2 master &&
+
+ # Assert that a config file with multiple config sections has
+ # those sections preserved...
+ cat >expect <<-\EOF &&
+ branch.source2.key1=value1
+ branch.dest2.key1=value1
+ more.gar.b=age
+ branch.source2.key2=value2
+ branch.dest2.key2=value2
+ EOF
+ cat >config.branch <<\EOF &&
+;; Note the lack of -\EOF above & mixed indenting here. This is
+;; intentional, we are also testing that the formatting of copied
+;; sections is preserved.
+
+;; Comment for source2. Tabs
+[branch "source2"]
+ ;; Comment for the source2 value
+ key1 = value1
+;; Comment for more.gar. Spaces
+[more "gar"]
+ ;; Comment for the more.gar value
+ b = age
+;; Comment for source2, again. Mixed tabs/spaces.
+[branch "source2"]
+ ;; Comment for the source2 value, again
+ key2 = value2
+EOF
+ cat config.branch >>.git/config &&
+ git branch -c source2 dest2 &&
+ git config -f .git/config -l | grep -F -e source2 -e dest2 -e more.gar >actual &&
+ test_cmp expect actual &&
+
+ # ...and that the comments and formatting for those sections
+ # is also preserved.
+ cat >expect <<\EOF &&
+;; Comment for source2. Tabs
+[branch "source2"]
+ ;; Comment for the source2 value
+ key1 = value1
+;; Comment for more.gar. Spaces
+[branch "dest2"]
+ ;; Comment for the source2 value
+ key1 = value1
+;; Comment for more.gar. Spaces
+[more "gar"]
+ ;; Comment for the more.gar value
+ b = age
+;; Comment for source2, again. Mixed tabs/spaces.
+[branch "source2"]
+ ;; Comment for the source2 value, again
+ key2 = value2
+[branch "dest2"]
+ ;; Comment for the source2 value, again
+ key2 = value2
+EOF
+ sed -n -e "/Comment for source2/,\$p" .git/config >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'deleting a symref' '
git branch target &&
git symbolic-ref refs/heads/symref refs/heads/target &&
@@ -572,6 +838,7 @@
test_expect_success 'use --set-upstream-to modify a particular branch' '
git branch my13 &&
git branch --set-upstream-to master my13 &&
+ test_when_finished "git branch --unset-upstream my13" &&
test "$(git config branch.my13.remote)" = "." &&
test "$(git config branch.my13.merge)" = "refs/heads/master"
'
@@ -617,38 +884,8 @@
test_must_fail git config branch.my14.merge
'
-test_expect_success '--set-upstream shows message when creating a new branch that exists as remote-tracking' '
- git update-ref refs/remotes/origin/master HEAD &&
- git branch --set-upstream origin/master 2>actual &&
- test_when_finished git update-ref -d refs/remotes/origin/master &&
- test_when_finished git branch -d origin/master &&
- cat >expected <<EOF &&
-The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
-
-If you wanted to make '"'master'"' track '"'origin/master'"', do this:
-
- git branch -d origin/master
- git branch --set-upstream-to origin/master
-EOF
- test_i18ncmp expected actual
-'
-
-test_expect_success '--set-upstream with two args only shows the deprecation message' '
- git branch --set-upstream master my13 2>actual &&
- test_when_finished git branch --unset-upstream master &&
- cat >expected <<EOF &&
-The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
-EOF
- test_i18ncmp expected actual
-'
-
-test_expect_success '--set-upstream with one arg only shows the deprecation message if the branch existed' '
- git branch --set-upstream my13 2>actual &&
- test_when_finished git branch --unset-upstream my13 &&
- cat >expected <<EOF &&
-The --set-upstream flag is deprecated and will be removed. Consider using --track or --set-upstream-to
-EOF
- test_i18ncmp expected actual
+test_expect_success '--set-upstream fails' '
+ test_must_fail git branch --set-upstream origin/master
'
test_expect_success '--set-upstream-to notices an error to set branch as own upstream' '
@@ -973,19 +1210,6 @@
test_must_fail git branch -d my10
'
-test_expect_success 'use set-upstream on the current branch' '
- git checkout master &&
- git --bare init myupstream.git &&
- git push myupstream.git master:refs/heads/frotz &&
- git remote add origin myupstream.git &&
- git fetch &&
- git branch --set-upstream master origin/frotz &&
-
- test "z$(git config branch.master.remote)" = "zorigin" &&
- test "z$(git config branch.master.merge)" = "zrefs/heads/frotz"
-
-'
-
test_expect_success 'use --edit-description' '
write_script editor <<-\EOF &&
echo "New contents" >"$1"
diff --git a/t/t3210-pack-refs.sh b/t/t3210-pack-refs.sh
index 9b182a0..afa27ff 100755
--- a/t/t3210-pack-refs.sh
+++ b/t/t3210-pack-refs.sh
@@ -194,6 +194,33 @@
test_must_fail git branch foo/bar/baz/lots/of/extra/components
'
+test_expect_success 'reject packed-refs with unterminated line' '
+ cp .git/packed-refs .git/packed-refs.bak &&
+ test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+ printf "%s" "$HEAD refs/zzzzz" >>.git/packed-refs &&
+ echo "fatal: unterminated line in .git/packed-refs: $HEAD refs/zzzzz" >expected_err &&
+ test_must_fail git for-each-ref >out 2>err &&
+ test_cmp expected_err err
+'
+
+test_expect_success 'reject packed-refs containing junk' '
+ cp .git/packed-refs .git/packed-refs.bak &&
+ test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+ printf "%s\n" "bogus content" >>.git/packed-refs &&
+ echo "fatal: unexpected line in .git/packed-refs: bogus content" >expected_err &&
+ test_must_fail git for-each-ref >out 2>err &&
+ test_cmp expected_err err
+'
+
+test_expect_success 'reject packed-refs with a short SHA-1' '
+ cp .git/packed-refs .git/packed-refs.bak &&
+ test_when_finished "mv .git/packed-refs.bak .git/packed-refs" &&
+ printf "%.7s %s\n" $HEAD refs/zzzzz >>.git/packed-refs &&
+ printf "fatal: unexpected line in .git/packed-refs: %.7s %s\n" $HEAD refs/zzzzz >expected_err &&
+ test_must_fail git for-each-ref >out 2>err &&
+ test_cmp expected_err err
+'
+
test_expect_success 'timeout if packed-refs.lock exists' '
LOCK=.git/packed-refs.lock &&
>"$LOCK" &&
@@ -211,4 +238,19 @@
git -c core.packedrefstimeout=3000 pack-refs --all --prune
'
+test_expect_success SYMLINKS 'pack symlinked packed-refs' '
+ # First make sure that symlinking works when reading:
+ git update-ref refs/heads/loosy refs/heads/master &&
+ git for-each-ref >all-refs-before &&
+ mv .git/packed-refs .git/my-deviant-packed-refs &&
+ ln -s my-deviant-packed-refs .git/packed-refs &&
+ git for-each-ref >all-refs-linked &&
+ test_cmp all-refs-before all-refs-linked &&
+ git pack-refs --all --prune &&
+ git for-each-ref >all-refs-packed &&
+ test_cmp all-refs-before all-refs-packed &&
+ test -h .git/packed-refs &&
+ test "$(readlink .git/packed-refs)" = "my-deviant-packed-refs"
+'
+
test_done
diff --git a/t/t3308-notes-merge.sh b/t/t3308-notes-merge.sh
index 19aed7e..ab946a5 100755
--- a/t/t3308-notes-merge.sh
+++ b/t/t3308-notes-merge.sh
@@ -79,7 +79,7 @@
test_expect_success 'fail to merge into various non-notes refs' '
test_must_fail git -c "core.notesRef=refs/notes" notes merge x &&
test_must_fail git -c "core.notesRef=refs/notes/" notes merge x &&
- mkdir -p .git/refs/notes/dir &&
+ git update-ref refs/notes/dir/foo HEAD &&
test_must_fail git -c "core.notesRef=refs/notes/dir" notes merge x &&
test_must_fail git -c "core.notesRef=refs/notes/dir/" notes merge x &&
test_must_fail git -c "core.notesRef=refs/heads/master" notes merge x &&
diff --git a/t/t3310-notes-merge-manual-resolve.sh b/t/t3310-notes-merge-manual-resolve.sh
index baef2d6..9c1bf6e 100755
--- a/t/t3310-notes-merge-manual-resolve.sh
+++ b/t/t3310-notes-merge-manual-resolve.sh
@@ -176,7 +176,7 @@
test_expect_success 'merge z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
git config core.notesRef refs/notes/m &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -379,7 +379,7 @@
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
git config core.notesRef refs/notes/m &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -413,7 +413,7 @@
git rev-parse refs/notes/z > pre_merge_z
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
@@ -494,7 +494,7 @@
test_expect_success 'redo merge of z into m (== y) with default ("manual") resolver => Conflicting 3-way merge' '
git update-ref refs/notes/m refs/notes/y &&
- test_must_fail git notes merge z >output &&
+ test_must_fail git notes merge z >output 2>&1 &&
# Output should point to where to resolve conflicts
test_i18ngrep "\\.git/NOTES_MERGE_WORKTREE" output &&
# Inspect merge conflicts
diff --git a/t/t3320-notes-merge-worktrees.sh b/t/t3320-notes-merge-worktrees.sh
index b9c3bc2..10bfc8b 100755
--- a/t/t3320-notes-merge-worktrees.sh
+++ b/t/t3320-notes-merge-worktrees.sh
@@ -61,7 +61,7 @@
(
cd worktree2 &&
git config core.notesRef refs/notes/x &&
- test_must_fail git notes merge z 2>&1 >out &&
+ test_must_fail git notes merge z >out 2>&1 &&
test_i18ngrep "Automatic notes merge failed" out &&
grep -v "A notes merge into refs/notes/x is already in-progress in" out
) &&
diff --git a/t/t3400-rebase.sh b/t/t3400-rebase.sh
index f5fd15e..8ac58d5 100755
--- a/t/t3400-rebase.sh
+++ b/t/t3400-rebase.sh
@@ -255,4 +255,26 @@
grep "author .* 34567 +0600$" actual
'
+test_expect_success 'rebase with "From " line in commit message' '
+ git checkout -b preserve-from master~1 &&
+ cat >From_.msg <<EOF &&
+Somebody embedded an mbox in a commit message
+
+This is from so-and-so:
+
+From a@b Mon Sep 17 00:00:00 2001
+From: John Doe <nobody@example.com>
+Date: Sat, 11 Nov 2017 00:00:00 +0000
+Subject: not this message
+
+something
+EOF
+ >From_ &&
+ git add From_ &&
+ git commit -F From_.msg &&
+ git rebase master &&
+ git log -1 --pretty=format:%B >out &&
+ test_cmp From_.msg out
+'
+
test_done
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 37821d2..481a350 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -108,6 +108,17 @@
rm -fr subdir
'
+test_expect_success 'rebase -i with exec allows git commands in subdirs' '
+ test_when_finished "rm -rf subdir" &&
+ test_when_finished "git rebase --abort ||:" &&
+ git checkout master &&
+ mkdir subdir && (cd subdir &&
+ set_fake_editor &&
+ FAKE_LINES="1 exec_cd_subdir_&&_git_rev-parse_--is-inside-work-tree" \
+ git rebase -i HEAD^
+ )
+'
+
test_expect_success 'rebase -i with the exec command checks tree cleanness' '
git checkout master &&
set_fake_editor &&
@@ -1249,20 +1260,35 @@
test B = $(git cat-file commit HEAD^ | sed -ne \$p)
'
-cat >expect <<EOF
-Warning: the command isn't recognized in the following line:
- - badcmd $(git rev-list --oneline -1 master~1)
-
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-EOF
+test_expect_success 'respects rebase.abbreviateCommands with fixup, squash and exec' '
+ rebase_setup_and_clean abbrevcmd &&
+ test_commit "first" file1.txt "first line" first &&
+ test_commit "second" file1.txt "another line" second &&
+ test_commit "fixup! first" file2.txt "first line again" first_fixup &&
+ test_commit "squash! second" file1.txt "another line here" second_squash &&
+ cat >expected <<-EOF &&
+ p $(git rev-list --abbrev-commit -1 first) first
+ f $(git rev-list --abbrev-commit -1 first_fixup) fixup! first
+ x git show HEAD
+ p $(git rev-list --abbrev-commit -1 second) second
+ s $(git rev-list --abbrev-commit -1 second_squash) squash! second
+ x git show HEAD
+ EOF
+ git checkout abbrevcmd &&
+ set_cat_todo_editor &&
+ test_config rebase.abbreviateCommands true &&
+ test_must_fail git rebase -i --exec "git show HEAD" \
+ --autosquash master >actual &&
+ test_cmp expected actual
+'
test_expect_success 'static check of bad command' '
rebase_setup_and_clean bad-cmd &&
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 3 bad 4 5" \
git rebase -i --root 2>actual &&
- test_i18ncmp expect actual &&
+ test_i18ngrep "badcmd $(git rev-list --oneline -1 master~1)" actual &&
+ test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
FAKE_LINES="1 2 3 drop 4 5" git rebase --edit-todo &&
git rebase --continue &&
test E = $(git cat-file commit HEAD | sed -ne \$p) &&
@@ -1284,20 +1310,13 @@
test E = $(git cat-file commit HEAD | sed -ne \$p)
'
-cat >expect <<EOF
-Warning: the SHA-1 is missing or isn't a commit in the following line:
- - edit XXXXXXX False commit
-
-You can fix this with 'git rebase --edit-todo' and then run 'git rebase --continue'.
-Or you can abort the rebase with 'git rebase --abort'.
-EOF
-
test_expect_success 'static check of bad SHA-1' '
rebase_setup_and_clean bad-sha &&
set_fake_editor &&
test_must_fail env FAKE_LINES="1 2 edit fakesha 3 4 5 #" \
git rebase -i --root 2>actual &&
- test_i18ncmp expect actual &&
+ test_i18ngrep "edit XXXXXXX False commit" actual &&
+ test_i18ngrep "You can fix this with .git rebase --edit-todo.." actual &&
FAKE_LINES="1 2 4 5 6" git rebase --edit-todo &&
git rebase --continue &&
test E = $(git cat-file commit HEAD | sed -ne \$p)
diff --git a/t/t3415-rebase-autosquash.sh b/t/t3415-rebase-autosquash.sh
index 5848949..e364c12 100755
--- a/t/t3415-rebase-autosquash.sh
+++ b/t/t3415-rebase-autosquash.sh
@@ -271,6 +271,18 @@
test 2 = $(git cat-file commit HEAD^ | grep squash | wc -l)
'
+test_expect_success 'autosquash with empty custom instructionFormat' '
+ git reset --hard base &&
+ test_commit empty-instructionFormat-test &&
+ (
+ set_cat_todo_editor &&
+ test_must_fail git -c rebase.instructionFormat= \
+ rebase --autosquash --force -i HEAD^ >actual &&
+ git log -1 --format="pick %h %s" >expect &&
+ test_cmp expect actual
+ )
+'
+
set_backup_editor () {
write_script backup-editor.sh <<-\EOF
cp "$1" .git/backup-"$(basename "$1")"
@@ -278,7 +290,7 @@
test_set_editor "$PWD/backup-editor.sh"
}
-test_expect_failure 'autosquash with multiple empty patches' '
+test_expect_success 'autosquash with multiple empty patches' '
test_tick &&
git commit --allow-empty -m "empty" &&
test_tick &&
@@ -304,4 +316,18 @@
test $base = $parent
'
+test_expect_success 'wrapped original subject' '
+ if test -d .git/rebase-merge; then git rebase --abort; fi &&
+ base=$(git rev-parse HEAD) &&
+ echo "wrapped subject" >wrapped &&
+ git add wrapped &&
+ test_tick &&
+ git commit --allow-empty -m "$(printf "To\nfixup")" &&
+ test_tick &&
+ git commit --allow-empty -m "fixup! To fixup" &&
+ git rebase -i --autosquash --keep-empty HEAD~2 &&
+ parent=$(git rev-parse HEAD^) &&
+ test $base = $parent
+'
+
test_done
diff --git a/t/t3418-rebase-continue.sh b/t/t3418-rebase-continue.sh
index fcfdd19..7c91a85 100755
--- a/t/t3418-rebase-continue.sh
+++ b/t/t3418-rebase-continue.sh
@@ -74,6 +74,20 @@
test -f funny.was.run
'
+test_expect_success '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 'setup rerere database' '
rm -fr .git/rebase-* &&
git reset --hard commit-new-file-F3-on-topic-branch &&
diff --git a/t/t3426-rebase-submodule.sh b/t/t3426-rebase-submodule.sh
index ebf4f5e..a2bba04 100755
--- a/t/t3426-rebase-submodule.sh
+++ b/t/t3426-rebase-submodule.sh
@@ -40,4 +40,21 @@
test_submodule_switch "git_rebase_interactive"
+test_expect_success 'rebase interactive ignores modified submodules' '
+ test_when_finished "rm -rf super sub" &&
+ git init sub &&
+ git -C sub commit --allow-empty -m "Initial commit" &&
+ git init super &&
+ git -C super submodule add ../sub &&
+ git -C super config submodule.sub.ignore dirty &&
+ >super/foo &&
+ git -C super add foo &&
+ git -C super commit -m "Initial commit" &&
+ test_commit -C super a &&
+ test_commit -C super b &&
+ test_commit -C super/sub c &&
+ set_fake_editor &&
+ git -C super rebase -i HEAD^^
+'
+
test_done
diff --git a/t/t3512-cherry-pick-submodule.sh b/t/t3512-cherry-pick-submodule.sh
index 6863b7b..ce48c4f 100755
--- a/t/t3512-cherry-pick-submodule.sh
+++ b/t/t3512-cherry-pick-submodule.sh
@@ -10,4 +10,40 @@
KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
test_submodule_switch "git cherry-pick"
+test_expect_success 'unrelated submodule/file conflict is ignored' '
+ test_create_repo sub &&
+
+ touch sub/file &&
+ git -C sub add file &&
+ git -C sub commit -m "add a file in a submodule" &&
+
+ test_create_repo a_repo &&
+ (
+ cd a_repo &&
+ >a_file &&
+ git add a_file &&
+ git commit -m "add a file" &&
+
+ git branch test &&
+ git checkout test &&
+
+ mkdir sub &&
+ >sub/content &&
+ git add sub/content &&
+ git commit -m "add a regular folder with name sub" &&
+
+ echo "123" >a_file &&
+ git add a_file &&
+ git commit -m "modify a file" &&
+
+ git checkout master &&
+
+ git submodule add ../sub sub &&
+ git submodule update sub &&
+ git commit -m "add a submodule info folder with name sub" &&
+
+ git cherry-pick test
+ )
+'
+
test_done
diff --git a/t/t3600-rm.sh b/t/t3600-rm.sh
index f8568f8..46f1516 100755
--- a/t/t3600-rm.sh
+++ b/t/t3600-rm.sh
@@ -688,7 +688,7 @@
git submodule update &&
git checkout -q HEAD^ &&
git checkout -q master 2>actual &&
- test_i18ngrep "^warning: unable to rmdir submod:" actual &&
+ test_i18ngrep "^warning: unable to rmdir '\''submod'\'':" actual &&
git status -s submod >actual &&
echo "?? submod/" >expected &&
test_cmp expected actual &&
@@ -858,9 +858,8 @@
test_i18ncmp expect actual
'
-test_expect_success 'rm empty string should invoke warning' '
- git rm -rf "" 2>output &&
- test_i18ngrep "warning: empty strings" output
+test_expect_success 'rm empty string should fail' '
+ test_must_fail git rm -rf ""
'
test_done
diff --git a/t/t3700-add.sh b/t/t3700-add.sh
index 0aae21d..2748805 100755
--- a/t/t3700-add.sh
+++ b/t/t3700-add.sh
@@ -331,9 +331,8 @@
test_i18ncmp expect.err actual.err
'
-test_expect_success 'git add empty string should invoke warning' '
- git add "" 2>output &&
- test_i18ngrep "warning: empty strings" output
+test_expect_success 'git add empty string should fail' '
+ test_must_fail git add ""
'
test_expect_success 'git add --chmod=[+-]x stages correctly' '
diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index a49c12c..058698d 100755
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -493,4 +493,52 @@
test_cmp expect actual
'
+test_expect_success 'setup different kinds of dirty submodules' '
+ test_create_repo for-submodules &&
+ (
+ cd for-submodules &&
+ test_commit initial &&
+ test_create_repo dirty-head &&
+ (
+ cd dirty-head &&
+ test_commit initial
+ ) &&
+ cp -R dirty-head dirty-otherwise &&
+ cp -R dirty-head dirty-both-ways &&
+ git add dirty-head &&
+ git add dirty-otherwise dirty-both-ways &&
+ git commit -m initial &&
+
+ cd dirty-head &&
+ test_commit updated &&
+ cd ../dirty-both-ways &&
+ test_commit updated &&
+ echo dirty >>initial &&
+ : >untracked &&
+ cd ../dirty-otherwise &&
+ echo dirty >>initial &&
+ : >untracked
+ ) &&
+ git -C for-submodules diff-files --name-only >actual &&
+ cat >expected <<-\EOF &&
+ dirty-both-ways
+ dirty-head
+ dirty-otherwise
+ EOF
+ test_cmp expected actual &&
+ git -C for-submodules diff-files --name-only --ignore-submodules=dirty >actual &&
+ cat >expected <<-\EOF &&
+ dirty-both-ways
+ dirty-head
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'status ignores dirty submodules (except HEAD)' '
+ git -C for-submodules add -i </dev/null >output &&
+ grep dirty-head output &&
+ grep dirty-both-ways output &&
+ ! grep dirty-otherwise output
+'
+
test_done
diff --git a/t/t3900-i18n-commit.sh b/t/t3900-i18n-commit.sh
index 3b94283..b92ff95 100755
--- a/t/t3900-i18n-commit.sh
+++ b/t/t3900-i18n-commit.sh
@@ -40,7 +40,7 @@
'
test_expect_success 'UTF-8 invalid characters refused' '
- test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+ test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
echo "UTF-8 characters" >F &&
printf "Commit message\n\nInvalid surrogate:\355\240\200\n" \
>"$HOME/invalid" &&
@@ -49,7 +49,7 @@
'
test_expect_success 'UTF-8 overlong sequences rejected' '
- test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+ test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
rm -f "$HOME/stderr" "$HOME/invalid" &&
echo "UTF-8 overlong" >F &&
printf "\340\202\251ommit message\n\nThis is not a space:\300\240\n" \
@@ -59,7 +59,7 @@
'
test_expect_success 'UTF-8 non-characters refused' '
- test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+ test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
echo "UTF-8 non-character 1" >F &&
printf "Commit message\n\nNon-character:\364\217\277\276\n" \
>"$HOME/invalid" &&
@@ -68,7 +68,7 @@
'
test_expect_success 'UTF-8 non-characters refused' '
- test_when_finished "rm -f $HOME/stderr $HOME/invalid" &&
+ test_when_finished "rm -f \"\$HOME/stderr\" \"\$HOME/invalid\"" &&
echo "UTF-8 non-character 2." >F &&
printf "Commit message\n\nNon-character:\357\267\220\n" \
>"$HOME/invalid" &&
diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
index 4046817..aefde7b 100755
--- a/t/t3903-stash.sh
+++ b/t/t3903-stash.sh
@@ -444,6 +444,14 @@
test foo = "$(cat file/file)"
'
+test_expect_success 'stash create - no changes' '
+ git stash clear &&
+ test_when_finished "git reset --hard HEAD" &&
+ git reset --hard &&
+ git stash create >actual &&
+ test_must_be_empty actual
+'
+
test_expect_success 'stash branch - no stashes on stack, stash-like argument' '
git stash clear &&
test_when_finished "git reset --hard HEAD" &&
@@ -648,6 +656,20 @@
git rev-parse stash@{0} --
'
+test_expect_success 'stash branch should not drop the stash if the apply fails' '
+ git stash clear &&
+ git reset HEAD~1 --hard &&
+ echo foo >file &&
+ git add file &&
+ git commit -m initial &&
+ echo bar >file &&
+ git stash &&
+ echo baz >file &&
+ test_when_finished "git checkout master" &&
+ test_must_fail git stash branch new_branch stash@{0} &&
+ git rev-parse stash@{0} --
+'
+
test_expect_success 'stash apply shows status same as git status (relative to current directory)' '
git stash clear &&
echo 1 >subdir/subfile1 &&
@@ -782,6 +804,99 @@
test_cmp expect actual
'
+test_expect_success 'push -m also works without space' '
+ >foo &&
+ git add foo &&
+ git stash push -m"unspaced test message" &&
+ echo "stash@{0}: On master: unspaced test message" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'store -m foo shows right message' '
+ git stash clear &&
+ git reset --hard &&
+ echo quux >bazzy &&
+ git add bazzy &&
+ STASH_ID=$(git stash create) &&
+ git stash store -m "store m" $STASH_ID &&
+ echo "stash@{0}: store m" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'store -mfoo shows right message' '
+ git stash clear &&
+ git reset --hard &&
+ echo quux >bazzy &&
+ git add bazzy &&
+ STASH_ID=$(git stash create) &&
+ git stash store -m"store mfoo" $STASH_ID &&
+ echo "stash@{0}: store mfoo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'store --message=foo shows right message' '
+ git stash clear &&
+ git reset --hard &&
+ echo quux >bazzy &&
+ git add bazzy &&
+ STASH_ID=$(git stash create) &&
+ git stash store --message="store message=foo" $STASH_ID &&
+ echo "stash@{0}: store message=foo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'store --message foo shows right message' '
+ git stash clear &&
+ git reset --hard &&
+ echo quux >bazzy &&
+ git add bazzy &&
+ STASH_ID=$(git stash create) &&
+ git stash store --message "store message foo" $STASH_ID &&
+ echo "stash@{0}: store message foo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'push -mfoo uses right message' '
+ >foo &&
+ git add foo &&
+ git stash push -m"test mfoo" &&
+ echo "stash@{0}: On master: test mfoo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'push --message foo is synonym for -mfoo' '
+ >foo &&
+ git add foo &&
+ git stash push --message "test message foo" &&
+ echo "stash@{0}: On master: test message foo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'push --message=foo is synonym for -mfoo' '
+ >foo &&
+ git add foo &&
+ git stash push --message="test message=foo" &&
+ echo "stash@{0}: On master: test message=foo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'push -m shows right message' '
+ >foo &&
+ git add foo &&
+ git stash push -m "test m foo" &&
+ echo "stash@{0}: On master: test m foo" >expect &&
+ git stash list -1 >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'create stores correct message' '
>foo &&
git add foo &&
@@ -800,6 +915,18 @@
test_cmp expect actual
'
+test_expect_success 'create in a detached state' '
+ test_when_finished "git checkout master" &&
+ git checkout HEAD~1 &&
+ >foo &&
+ git add foo &&
+ STASH_ID=$(git stash create) &&
+ HEAD_ID=$(git rev-parse --short HEAD) &&
+ echo "WIP on (no branch): ${HEAD_ID} initial" >expect &&
+ git show --pretty=%s -s ${STASH_ID} >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'stash -- <pathspec> stashes and restores the file' '
>foo &&
>bar &&
@@ -937,4 +1064,36 @@
test foo,bar = $(cat foo),$(cat bar)
'
+test_expect_success 'stash -- <subdir> leaves untracked files in subdir intact' '
+ git reset &&
+ >subdir/untracked &&
+ >subdir/tracked1 &&
+ >subdir/tracked2 &&
+ git add subdir/tracked* &&
+ git stash -- subdir/ &&
+ test_path_is_missing subdir/tracked1 &&
+ test_path_is_missing subdir/tracked2 &&
+ test_path_is_file subdir/untracked &&
+ git stash pop &&
+ test_path_is_file subdir/tracked1 &&
+ test_path_is_file subdir/tracked2 &&
+ test_path_is_file subdir/untracked
+'
+
+test_expect_success 'stash -- <subdir> works with binary files' '
+ git reset &&
+ >subdir/untracked &&
+ >subdir/tracked &&
+ cp "$TEST_DIRECTORY"/test-binary-1.png subdir/tracked-binary &&
+ git add subdir/tracked* &&
+ git stash -- subdir/ &&
+ test_path_is_missing subdir/tracked &&
+ test_path_is_missing subdir/tracked-binary &&
+ test_path_is_file subdir/untracked &&
+ git stash pop &&
+ test_path_is_file subdir/tracked &&
+ test_path_is_file subdir/tracked-binary &&
+ test_path_is_file subdir/untracked
+'
+
test_done
diff --git a/t/t3905-stash-include-untracked.sh b/t/t3905-stash-include-untracked.sh
index 193adc7..bfde405 100755
--- a/t/t3905-stash-include-untracked.sh
+++ b/t/t3905-stash-include-untracked.sh
@@ -211,4 +211,21 @@
test_path_is_file bar
'
+cat > .gitignore <<EOF
+ignored
+ignored.d/*
+EOF
+
+test_expect_success 'stash previously ignored file' '
+ git reset HEAD &&
+ git add .gitignore &&
+ git commit -m "Add .gitignore" &&
+ >ignored.d/foo &&
+ echo "!ignored.d/foo" >> .gitignore &&
+ git stash save --include-untracked &&
+ test_path_is_missing ignored.d/foo &&
+ git stash pop &&
+ test_path_is_file ignored.d/foo
+'
+
test_done
diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh
index 0d1fa45..a07816d 100755
--- a/t/t4001-diff-rename.sh
+++ b/t/t4001-diff-rename.sh
@@ -134,11 +134,15 @@
git rm path1 &&
mkdir subdir &&
git mv another-path subdir/path1 &&
- git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
+ git status >out &&
+ test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+'
test_expect_success 'favour same basenames even with minor differences' '
git show HEAD:path1 | sed "s/15/16/" > subdir/path1 &&
- git status | test_i18ngrep "renamed: .*path1 -> subdir/path1"'
+ git status >out &&
+ test_i18ngrep "renamed: .*path1 -> subdir/path1" out
+'
test_expect_success 'two files with same basename and same content' '
git reset --hard &&
@@ -148,7 +152,8 @@
git add dir &&
git commit -m 2 &&
git mv dir other-dir &&
- git status | test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file"
+ git status >out &&
+ test_i18ngrep "renamed: .*dir/A/file -> other-dir/A/file" out
'
test_expect_success 'setup for many rename source candidates' '
@@ -230,4 +235,19 @@
test_i18ngrep " d/f/{ => f}/e " output
'
+test_expect_success 'diff-tree -l0 defaults to a big rename limit, not zero' '
+ test_write_lines line1 line2 line3 >myfile &&
+ git add myfile &&
+ git commit -m x &&
+
+ test_write_lines line1 line2 line4 >myotherfile &&
+ git rm myfile &&
+ git add myotherfile &&
+ git commit -m x &&
+
+ git diff-tree -M -l0 HEAD HEAD^ >actual &&
+ # Verify that a rename from myotherfile to myfile was detected
+ grep "myotherfile.*myfile" actual
+'
+
test_done
diff --git a/t/t4013-diff-various.sh b/t/t4013-diff-various.sh
index d09acfe..f10798b 100755
--- a/t/t4013-diff-various.sh
+++ b/t/t4013-diff-various.sh
@@ -90,6 +90,14 @@
git commit -m "Rearranged lines in dir/sub" &&
git checkout master &&
+ GIT_AUTHOR_DATE="2006-06-26 00:06:00 +0000" &&
+ GIT_COMMITTER_DATE="2006-06-26 00:06:00 +0000" &&
+ export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&
+ git checkout -b mode initial &&
+ git update-index --chmod=+x file0 &&
+ git commit -m "update mode" &&
+ git checkout -f master &&
+
git config diff.renames false &&
git show-branch
@@ -110,20 +118,37 @@
EOF
V=$(git version | sed -e 's/^git version //' -e 's/\./\\./g')
-while read cmd
+while read magic cmd
do
- case "$cmd" in
- '' | '#'*) continue ;;
+ case "$magic" in
+ '' | '#'*)
+ continue ;;
+ :*)
+ magic=${magic#:}
+ label="$magic-$cmd"
+ case "$magic" in
+ noellipses) ;;
+ *)
+ die "bug in t4103: unknown magic $magic" ;;
+ esac ;;
+ *)
+ cmd="$magic $cmd" magic=
+ label="$cmd" ;;
esac
- test=$(echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g')
+ test=$(echo "$label" | sed -e 's|[/ ][/ ]*|_|g')
pfx=$(printf "%04d" $test_count)
expect="$TEST_DIRECTORY/t4013/diff.$test"
actual="$pfx-diff.$test"
- test_expect_success "git $cmd" '
+ test_expect_success "git $cmd # magic is ${magic:-"(not used)"}" '
{
- echo "\$ git $cmd"
- git $cmd |
+ echo "$ git $cmd"
+ case "$magic" in
+ "")
+ GIT_PRINT_SHA1_ELLIPSIS=yes git $cmd ;;
+ noellipses)
+ git $cmd ;;
+ esac |
sed -e "s/^\\(-*\\)$V\\(-*\\)\$/\\1g-i-t--v-e-r-s-i-o-n\2/" \
-e "s/^\\(.*mixed; boundary=\"-*\\)$V\\(-*\\)\"\$/\\1g-i-t--v-e-r-s-i-o-n\2\"/"
echo "\$"
@@ -150,9 +175,12 @@
diff-tree -r --abbrev=4 initial
diff-tree --root initial
diff-tree --root --abbrev initial
+:noellipses diff-tree --root --abbrev initial
diff-tree --root -r initial
diff-tree --root -r --abbrev initial
+:noellipses diff-tree --root -r --abbrev initial
diff-tree --root -r --abbrev=4 initial
+:noellipses diff-tree --root -r --abbrev=4 initial
diff-tree -p initial
diff-tree --root -p initial
diff-tree --patch-with-stat initial
@@ -192,11 +220,16 @@
diff-tree --pretty -p side
diff-tree --pretty --patch-with-stat side
+diff-tree initial mode
+diff-tree --stat initial mode
+diff-tree --summary initial mode
+
diff-tree master
diff-tree -p master
diff-tree -p -m master
diff-tree -c master
diff-tree -c --abbrev master
+:noellipses diff-tree -c --abbrev master
diff-tree --cc master
# stat only should show the diffstat with the first parent
diff-tree -c --stat master
@@ -243,8 +276,10 @@
rev-list --children HEAD
whatchanged master
+:noellipses whatchanged master
whatchanged -p master
whatchanged --root master
+:noellipses whatchanged --root master
whatchanged --root -p master
whatchanged --patch-with-stat master
whatchanged --root --patch-with-stat master
@@ -254,6 +289,7 @@
# improved by Timo's patch
whatchanged --root --cc --patch-with-stat --summary master
whatchanged -SF master
+:noellipses whatchanged -SF master
whatchanged -SF -p master
log --patch-with-stat master -- dir/
@@ -272,6 +308,7 @@
show --stat --summary side
show --patch-with-stat side
show --patch-with-raw side
+:noellipses show --patch-with-raw side
show --patch-with-stat --summary side
format-patch --stdout initial..side
@@ -299,8 +336,10 @@
diff initial..side
diff --patch-with-stat initial..side
diff --patch-with-raw initial..side
+:noellipses diff --patch-with-raw initial..side
diff --patch-with-stat -r initial..side
diff --patch-with-raw -r initial..side
+:noellipses diff --patch-with-raw -r initial..side
diff --name-status dir2 dir
diff --no-index --name-status dir2 dir
diff --no-index --name-status -- dir2 dir
@@ -313,10 +352,14 @@
diff --dirstat-by-file initial rearrange
# No-index --abbrev and --no-abbrev
diff --raw initial
+:noellipses diff --raw initial
diff --raw --abbrev=4 initial
+:noellipses diff --raw --abbrev=4 initial
diff --raw --no-abbrev initial
diff --no-index --raw dir2 dir
+:noellipses diff --no-index --raw dir2 dir
diff --no-index --raw --abbrev=4 dir2 dir
+:noellipses diff --no-index --raw --abbrev=4 dir2 dir
diff --no-index --raw --no-abbrev dir2 dir
EOF
diff --git a/t/t4013/diff.diff-tree_--stat_initial_mode b/t/t4013/diff.diff-tree_--stat_initial_mode
new file mode 100644
index 0000000..0e5943c
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--stat_initial_mode
@@ -0,0 +1,4 @@
+$ git diff-tree --stat initial mode
+ file0 | 0
+ 1 file changed, 0 insertions(+), 0 deletions(-)
+$
diff --git a/t/t4013/diff.diff-tree_--summary_initial_mode b/t/t4013/diff.diff-tree_--summary_initial_mode
new file mode 100644
index 0000000..25846b6a
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--summary_initial_mode
@@ -0,0 +1,3 @@
+$ git diff-tree --summary initial mode
+ mode change 100644 => 100755 file0
+$
diff --git a/t/t4013/diff.diff-tree_initial_mode b/t/t4013/diff.diff-tree_initial_mode
new file mode 100644
index 0000000..c47c094
--- /dev/null
+++ b/t/t4013/diff.diff-tree_initial_mode
@@ -0,0 +1,3 @@
+$ git diff-tree initial mode
+:100644 100755 01e79c32a8c99c557f0757da7cb6d65b3414466d 01e79c32a8c99c557f0757da7cb6d65b3414466d M file0
+$
diff --git a/t/t4013/diff.log_--decorate=full_--all b/t/t4013/diff.log_--decorate=full_--all
index b345b2e..2afe91f 100644
--- a/t/t4013/diff.log_--decorate=full_--all
+++ b/t/t4013/diff.log_--decorate=full_--all
@@ -1,4 +1,10 @@
$ git log --decorate=full --all
+commit b7e0bc69303b488b47deca799a7d723971dfa6cd (refs/heads/mode)
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:06:00 2006 +0000
+
+ update mode
+
commit cd4e72fd96faed3f0ba949dc42967430374e2290 (refs/heads/rearrange)
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:06:00 2006 +0000
diff --git a/t/t4013/diff.log_--decorate_--all b/t/t4013/diff.log_--decorate_--all
index 3aa16a9..d0f308a 100644
--- a/t/t4013/diff.log_--decorate_--all
+++ b/t/t4013/diff.log_--decorate_--all
@@ -1,4 +1,10 @@
$ git log --decorate --all
+commit b7e0bc69303b488b47deca799a7d723971dfa6cd (mode)
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:06:00 2006 +0000
+
+ update mode
+
commit cd4e72fd96faed3f0ba949dc42967430374e2290 (rearrange)
Author: A U Thor <author@example.com>
Date: Mon Jun 26 00:06:00 2006 +0000
diff --git a/t/t4013/diff.noellipses-diff-tree_--root_--abbrev_initial b/t/t4013/diff.noellipses-diff-tree_--root_--abbrev_initial
new file mode 100644
index 0000000..4bdad40
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff-tree_--root_--abbrev_initial
@@ -0,0 +1,6 @@
+$ git diff-tree --root --abbrev initial
+444ac553ac7612cc88969031b02b3767fb8a353a
+:000000 040000 0000000 da7a33f A dir
+:000000 100644 0000000 01e79c3 A file0
+:000000 100644 0000000 01e79c3 A file2
+$
diff --git a/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial b/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial
new file mode 100644
index 0000000..26fbfeb
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev=4_initial
@@ -0,0 +1,6 @@
+$ git diff-tree --root -r --abbrev=4 initial
+444ac553ac7612cc88969031b02b3767fb8a353a
+:000000 100644 0000 35d2 A dir/sub
+:000000 100644 0000 01e7 A file0
+:000000 100644 0000 01e7 A file2
+$
diff --git a/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev_initial b/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev_initial
new file mode 100644
index 0000000..2ac8561
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff-tree_--root_-r_--abbrev_initial
@@ -0,0 +1,6 @@
+$ git diff-tree --root -r --abbrev initial
+444ac553ac7612cc88969031b02b3767fb8a353a
+:000000 100644 0000000 35d242b A dir/sub
+:000000 100644 0000000 01e79c3 A file0
+:000000 100644 0000000 01e79c3 A file2
+$
diff --git a/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
new file mode 100644
index 0000000..bb80f01
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff-tree_-c_--abbrev_master
@@ -0,0 +1,5 @@
+$ git diff-tree -c --abbrev master
+59d314ad6f356dd08601a4cd5e530381da3e3c64
+::100644 100644 100644 cead32e 7289e35 992913c MM dir/sub
+::100644 100644 100644 b414108 f4615da 10a8a9f MM file0
+$
diff --git a/t/t4013/diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir b/t/t4013/diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir
new file mode 100644
index 0000000..41b7baf
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff_--no-index_--raw_--abbrev=4_dir2_dir
@@ -0,0 +1,3 @@
+$ git diff --no-index --raw --abbrev=4 dir2 dir
+:000000 100644 0000 0000 A dir/sub
+$
diff --git a/t/t4013/diff.noellipses-diff_--no-index_--raw_dir2_dir b/t/t4013/diff.noellipses-diff_--no-index_--raw_dir2_dir
new file mode 100644
index 0000000..0cf3a3e
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff_--no-index_--raw_dir2_dir
@@ -0,0 +1,3 @@
+$ git diff --no-index --raw dir2 dir
+:000000 100644 0000000 0000000 A dir/sub
+$
diff --git a/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side b/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side
new file mode 100644
index 0000000..8d1f1e3
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff_--patch-with-raw_-r_initial..side
@@ -0,0 +1,36 @@
+$ git diff --patch-with-raw -r initial..side
+:100644 100644 35d242b 7289e35 M dir/sub
+:100644 100644 01e79c3 f4615da M file0
+:000000 100644 0000000 7289e35 A file3
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+$
diff --git a/t/t4013/diff.noellipses-diff_--patch-with-raw_initial..side b/t/t4013/diff.noellipses-diff_--patch-with-raw_initial..side
new file mode 100644
index 0000000..50d8aee
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff_--patch-with-raw_initial..side
@@ -0,0 +1,36 @@
+$ git diff --patch-with-raw initial..side
+:100644 100644 35d242b 7289e35 M dir/sub
+:100644 100644 01e79c3 f4615da M file0
+:000000 100644 0000000 7289e35 A file3
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+$
diff --git a/t/t4013/diff.noellipses-diff_--raw_--abbrev=4_initial b/t/t4013/diff.noellipses-diff_--raw_--abbrev=4_initial
new file mode 100644
index 0000000..8ae44d6
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff_--raw_--abbrev=4_initial
@@ -0,0 +1,6 @@
+$ git diff --raw --abbrev=4 initial
+:100644 100644 35d2 9929 M dir/sub
+:100644 100644 01e7 10a8 M file0
+:000000 100644 0000 b1e6 A file1
+:100644 000000 01e7 0000 D file2
+$
diff --git a/t/t4013/diff.noellipses-diff_--raw_initial b/t/t4013/diff.noellipses-diff_--raw_initial
new file mode 100644
index 0000000..0175bfb
--- /dev/null
+++ b/t/t4013/diff.noellipses-diff_--raw_initial
@@ -0,0 +1,6 @@
+$ git diff --raw initial
+:100644 100644 35d242b 992913c M dir/sub
+:100644 100644 01e79c3 10a8a9f M file0
+:000000 100644 0000000 b1e6722 A file1
+:100644 000000 01e79c3 0000000 D file2
+$
diff --git a/t/t4013/diff.noellipses-show_--patch-with-raw_side b/t/t4013/diff.noellipses-show_--patch-with-raw_side
new file mode 100644
index 0000000..32fed3d
--- /dev/null
+++ b/t/t4013/diff.noellipses-show_--patch-with-raw_side
@@ -0,0 +1,42 @@
+$ git show --patch-with-raw side
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+:100644 100644 35d242b 7289e35 M dir/sub
+:100644 100644 01e79c3 f4615da M file0
+:000000 100644 0000000 7289e35 A file3
+
+diff --git a/dir/sub b/dir/sub
+index 35d242b..7289e35 100644
+--- a/dir/sub
++++ b/dir/sub
+@@ -1,2 +1,4 @@
+ A
+ B
++1
++2
+diff --git a/file0 b/file0
+index 01e79c3..f4615da 100644
+--- a/file0
++++ b/file0
+@@ -1,3 +1,6 @@
+ 1
+ 2
+ 3
++A
++B
++C
+diff --git a/file3 b/file3
+new file mode 100644
+index 0000000..7289e35
+--- /dev/null
++++ b/file3
+@@ -0,0 +1,4 @@
++A
++B
++1
++2
+$
diff --git a/t/t4013/diff.noellipses-whatchanged_--root_master b/t/t4013/diff.noellipses-whatchanged_--root_master
new file mode 100644
index 0000000..c2cfd4e
--- /dev/null
+++ b/t/t4013/diff.noellipses-whatchanged_--root_master
@@ -0,0 +1,42 @@
+$ git whatchanged --root master
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+:100644 100644 35d242b 7289e35 M dir/sub
+:100644 100644 01e79c3 f4615da M file0
+:000000 100644 0000000 7289e35 A file3
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+
+:100644 100644 8422d40 cead32e M dir/sub
+:000000 100644 0000000 b1e6722 A file1
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:01:00 2006 +0000
+
+ Second
+
+ This is the second commit.
+
+:100644 100644 35d242b 8422d40 M dir/sub
+:100644 100644 01e79c3 b414108 M file0
+:100644 000000 01e79c3 0000000 D file2
+
+commit 444ac553ac7612cc88969031b02b3767fb8a353a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:00:00 2006 +0000
+
+ Initial
+
+:000000 100644 0000000 35d242b A dir/sub
+:000000 100644 0000000 01e79c3 A file0
+:000000 100644 0000000 01e79c3 A file2
+$
diff --git a/t/t4013/diff.noellipses-whatchanged_-SF_master b/t/t4013/diff.noellipses-whatchanged_-SF_master
new file mode 100644
index 0000000..b36ce58
--- /dev/null
+++ b/t/t4013/diff.noellipses-whatchanged_-SF_master
@@ -0,0 +1,9 @@
+$ git whatchanged -SF master
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+
+:100644 100644 8422d40 cead32e M dir/sub
+$
diff --git a/t/t4013/diff.noellipses-whatchanged_master b/t/t4013/diff.noellipses-whatchanged_master
new file mode 100644
index 0000000..55e500f
--- /dev/null
+++ b/t/t4013/diff.noellipses-whatchanged_master
@@ -0,0 +1,32 @@
+$ git whatchanged master
+commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:03:00 2006 +0000
+
+ Side
+
+:100644 100644 35d242b 7289e35 M dir/sub
+:100644 100644 01e79c3 f4615da M file0
+:000000 100644 0000000 7289e35 A file3
+
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:02:00 2006 +0000
+
+ Third
+
+:100644 100644 8422d40 cead32e M dir/sub
+:000000 100644 0000000 b1e6722 A file1
+
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
+Author: A U Thor <author@example.com>
+Date: Mon Jun 26 00:01:00 2006 +0000
+
+ Second
+
+ This is the second commit.
+
+:100644 100644 35d242b 8422d40 M dir/sub
+:100644 100644 01e79c3 b414108 M file0
+:100644 000000 01e79c3 0000000 D file2
+$
diff --git a/t/t4015-diff-whitespace.sh b/t/t4015-diff-whitespace.sh
index 94597ff..17df491 100755
--- a/t/t4015-diff-whitespace.sh
+++ b/t/t4015-diff-whitespace.sh
@@ -106,6 +106,8 @@
git diff -w -b --ignore-space-at-eol >out &&
test_cmp expect out &&
+ git diff -w --ignore-cr-at-eol >out &&
+ test_cmp expect out &&
tr "Q_" "\015 " <<-\EOF >expect &&
diff --git a/x b/x
@@ -128,6 +130,9 @@
git diff -b --ignore-space-at-eol >out &&
test_cmp expect out &&
+ git diff -b --ignore-cr-at-eol >out &&
+ test_cmp expect out &&
+
tr "Q_" "\015 " <<-\EOF >expect &&
diff --git a/x b/x
index d99af23..22d9f73 100644
@@ -145,6 +150,29 @@
CR at end
EOF
git diff --ignore-space-at-eol >out &&
+ test_cmp expect out &&
+
+ git diff --ignore-space-at-eol --ignore-cr-at-eol >out &&
+ test_cmp expect out &&
+
+ tr "Q_" "\015 " <<-\EOF >expect &&
+ diff --git a/x b/x
+ index_d99af23..22d9f73 100644
+ --- a/x
+ +++ b/x
+ @@ -1,6 +1,6 @@
+ -whitespace at beginning
+ -whitespace change
+ -whitespace in the middle
+ -whitespace at end
+ +_ whitespace at beginning
+ +whitespace_ _change
+ +white space in the middle
+ +whitespace at end__
+ unchanged line
+ CR at end
+ EOF
+ git diff --ignore-cr-at-eol >out &&
test_cmp expect out
'
@@ -155,7 +183,7 @@
" >x &&
git diff --ignore-blank-lines >out &&
>expect &&
- test_cmp out expect
+ test_cmp expect out
'
test_expect_success 'ignore-blank-lines: only new lines with space' '
@@ -165,7 +193,7 @@
" >x &&
git diff -w --ignore-blank-lines >out &&
>expect &&
- test_cmp out expect
+ test_cmp expect out
'
test_expect_success 'ignore-blank-lines: after change' '
@@ -608,6 +636,23 @@
test_must_fail git diff-tree --check HEAD^ HEAD
'
+test_expect_success 'check with ignored trailing whitespace attr (diff-tree)' '
+ test_when_finished "git reset --hard HEAD^" &&
+
+ # create a whitespace error that should be ignored
+ echo "* -whitespace" >.gitattributes &&
+ git add .gitattributes &&
+ echo "foo(); " >x &&
+ git add x &&
+ git commit -m "add trailing space" &&
+
+ # with a worktree diff-tree ignores the whitespace error
+ git diff-tree --root --check HEAD &&
+
+ # without a worktree diff-tree still ignores the whitespace error
+ git -C .git diff-tree --root --check HEAD
+'
+
test_expect_success 'check trailing whitespace (trailing-space: off)' '
git config core.whitespace "-trailing-space" &&
echo "foo (); " >x &&
@@ -802,7 +847,6 @@
# Start testing the colored format for whitespace checks
test_expect_success 'setup diff colors' '
- git config color.diff always &&
git config color.diff.plain normal &&
git config color.diff.meta bold &&
git config color.diff.frag cyan &&
@@ -972,4 +1016,713 @@
'
+test_expect_success 'detect moved code, complete file' '
+ git reset --hard &&
+ cat <<-\EOF >test.c &&
+ #include<stdio.h>
+ main()
+ {
+ printf("Hello World");
+ }
+ EOF
+ git add test.c &&
+ git commit -m "add main function" &&
+ git mv test.c main.c &&
+ test_config color.diff.oldMoved "normal red" &&
+ test_config color.diff.newMoved "normal green" &&
+ git diff HEAD --color-moved=zebra --color --no-renames | test_decode_color >actual &&
+ cat >expected <<-\EOF &&
+ <BOLD>diff --git a/main.c b/main.c<RESET>
+ <BOLD>new file mode 100644<RESET>
+ <BOLD>index 0000000..a986c57<RESET>
+ <BOLD>--- /dev/null<RESET>
+ <BOLD>+++ b/main.c<RESET>
+ <CYAN>@@ -0,0 +1,5 @@<RESET>
+ <BGREEN>+<RESET><BGREEN>#include<stdio.h><RESET>
+ <BGREEN>+<RESET><BGREEN>main()<RESET>
+ <BGREEN>+<RESET><BGREEN>{<RESET>
+ <BGREEN>+<RESET><BGREEN>printf("Hello World");<RESET>
+ <BGREEN>+<RESET><BGREEN>}<RESET>
+ <BOLD>diff --git a/test.c b/test.c<RESET>
+ <BOLD>deleted file mode 100644<RESET>
+ <BOLD>index a986c57..0000000<RESET>
+ <BOLD>--- a/test.c<RESET>
+ <BOLD>+++ /dev/null<RESET>
+ <CYAN>@@ -1,5 +0,0 @@<RESET>
+ <BRED>-#include<stdio.h><RESET>
+ <BRED>-main()<RESET>
+ <BRED>-{<RESET>
+ <BRED>-printf("Hello World");<RESET>
+ <BRED>-}<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success 'detect malicious moved code, inside file' '
+ test_config color.diff.oldMoved "normal red" &&
+ test_config color.diff.newMoved "normal green" &&
+ test_config color.diff.oldMovedAlternative "blue" &&
+ test_config color.diff.newMovedAlternative "yellow" &&
+ git reset --hard &&
+ cat <<-\EOF >main.c &&
+ #include<stdio.h>
+ int stuff()
+ {
+ printf("Hello ");
+ printf("World\n");
+ }
+
+ int secure_foo(struct user *u)
+ {
+ if (!u->is_allowed_foo)
+ return;
+ foo(u);
+ }
+
+ int main()
+ {
+ foo();
+ }
+ EOF
+ cat <<-\EOF >test.c &&
+ #include<stdio.h>
+ int bar()
+ {
+ printf("Hello World, but different\n");
+ }
+
+ int another_function()
+ {
+ bar();
+ }
+ EOF
+ git add main.c test.c &&
+ git commit -m "add main and test file" &&
+ cat <<-\EOF >main.c &&
+ #include<stdio.h>
+ int stuff()
+ {
+ printf("Hello ");
+ printf("World\n");
+ }
+
+ int main()
+ {
+ foo();
+ }
+ EOF
+ cat <<-\EOF >test.c &&
+ #include<stdio.h>
+ int bar()
+ {
+ printf("Hello World, but different\n");
+ }
+
+ int secure_foo(struct user *u)
+ {
+ foo(u);
+ if (!u->is_allowed_foo)
+ return;
+ }
+
+ int another_function()
+ {
+ bar();
+ }
+ EOF
+ git diff HEAD --no-renames --color-moved=zebra --color | test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/main.c b/main.c<RESET>
+ <BOLD>index 27a619c..7cf9336 100644<RESET>
+ <BOLD>--- a/main.c<RESET>
+ <BOLD>+++ b/main.c<RESET>
+ <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
+ printf("World\n");<RESET>
+ }<RESET>
+ <RESET>
+ <BRED>-int secure_foo(struct user *u)<RESET>
+ <BRED>-{<RESET>
+ <BLUE>-if (!u->is_allowed_foo)<RESET>
+ <BLUE>-return;<RESET>
+ <RED>-foo(u);<RESET>
+ <RED>-}<RESET>
+ <RED>-<RESET>
+ int main()<RESET>
+ {<RESET>
+ foo();<RESET>
+ <BOLD>diff --git a/test.c b/test.c<RESET>
+ <BOLD>index 1dc1d85..2bedec9 100644<RESET>
+ <BOLD>--- a/test.c<RESET>
+ <BOLD>+++ b/test.c<RESET>
+ <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
+ printf("Hello World, but different\n");<RESET>
+ }<RESET>
+ <RESET>
+ <BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
+ <BGREEN>+<RESET><BGREEN>{<RESET>
+ <GREEN>+<RESET><GREEN>foo(u);<RESET>
+ <BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
+ <BGREEN>+<RESET><BGREEN>return;<RESET>
+ <GREEN>+<RESET><GREEN>}<RESET>
+ <GREEN>+<RESET>
+ int another_function()<RESET>
+ {<RESET>
+ bar();<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success 'plain moved code, inside file' '
+ test_config color.diff.oldMoved "normal red" &&
+ test_config color.diff.newMoved "normal green" &&
+ test_config color.diff.oldMovedAlternative "blue" &&
+ test_config color.diff.newMovedAlternative "yellow" &&
+ # needs previous test as setup
+ git diff HEAD --no-renames --color-moved=plain --color | test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/main.c b/main.c<RESET>
+ <BOLD>index 27a619c..7cf9336 100644<RESET>
+ <BOLD>--- a/main.c<RESET>
+ <BOLD>+++ b/main.c<RESET>
+ <CYAN>@@ -5,13 +5,6 @@<RESET> <RESET>printf("Hello ");<RESET>
+ printf("World\n");<RESET>
+ }<RESET>
+ <RESET>
+ <BRED>-int secure_foo(struct user *u)<RESET>
+ <BRED>-{<RESET>
+ <BRED>-if (!u->is_allowed_foo)<RESET>
+ <BRED>-return;<RESET>
+ <BRED>-foo(u);<RESET>
+ <BRED>-}<RESET>
+ <BRED>-<RESET>
+ int main()<RESET>
+ {<RESET>
+ foo();<RESET>
+ <BOLD>diff --git a/test.c b/test.c<RESET>
+ <BOLD>index 1dc1d85..2bedec9 100644<RESET>
+ <BOLD>--- a/test.c<RESET>
+ <BOLD>+++ b/test.c<RESET>
+ <CYAN>@@ -4,6 +4,13 @@<RESET> <RESET>int bar()<RESET>
+ printf("Hello World, but different\n");<RESET>
+ }<RESET>
+ <RESET>
+ <BGREEN>+<RESET><BGREEN>int secure_foo(struct user *u)<RESET>
+ <BGREEN>+<RESET><BGREEN>{<RESET>
+ <BGREEN>+<RESET><BGREEN>foo(u);<RESET>
+ <BGREEN>+<RESET><BGREEN>if (!u->is_allowed_foo)<RESET>
+ <BGREEN>+<RESET><BGREEN>return;<RESET>
+ <BGREEN>+<RESET><BGREEN>}<RESET>
+ <BGREEN>+<RESET>
+ int another_function()<RESET>
+ {<RESET>
+ bar();<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success 'detect permutations inside moved code -- dimmed_zebra' '
+ git reset --hard &&
+ cat <<-\EOF >lines.txt &&
+ long line 1
+ long line 2
+ long line 3
+ line 4
+ line 5
+ line 6
+ line 7
+ line 8
+ line 9
+ line 10
+ line 11
+ line 12
+ line 13
+ long line 14
+ long line 15
+ long line 16
+ EOF
+ git add lines.txt &&
+ git commit -m "add poetry" &&
+ cat <<-\EOF >lines.txt &&
+ line 4
+ line 5
+ line 6
+ line 7
+ line 8
+ line 9
+ long line 1
+ long line 2
+ long line 3
+ long line 14
+ long line 15
+ long line 16
+ line 10
+ line 11
+ line 12
+ line 13
+ EOF
+ test_config color.diff.oldMoved "magenta" &&
+ test_config color.diff.newMoved "cyan" &&
+ test_config color.diff.oldMovedAlternative "blue" &&
+ test_config color.diff.newMovedAlternative "yellow" &&
+ test_config color.diff.oldMovedDimmed "normal magenta" &&
+ test_config color.diff.newMovedDimmed "normal cyan" &&
+ test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+ test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+ git diff HEAD --no-renames --color-moved=dimmed_zebra --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,16 +1,16 @@<RESET>
+ <BMAGENTA>-long line 1<RESET>
+ <BMAGENTA>-long line 2<RESET>
+ <BMAGENTA>-long line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ line 6<RESET>
+ line 7<RESET>
+ line 8<RESET>
+ line 9<RESET>
+ <BCYAN>+<RESET><BCYAN>long line 1<RESET>
+ <BCYAN>+<RESET><BCYAN>long line 2<RESET>
+ <CYAN>+<RESET><CYAN>long line 3<RESET>
+ <YELLOW>+<RESET><YELLOW>long line 14<RESET>
+ <BYELLOW>+<RESET><BYELLOW>long line 15<RESET>
+ <BYELLOW>+<RESET><BYELLOW>long line 16<RESET>
+ line 10<RESET>
+ line 11<RESET>
+ line 12<RESET>
+ line 13<RESET>
+ <BMAGENTA>-long line 14<RESET>
+ <BMAGENTA>-long line 15<RESET>
+ <BMAGENTA>-long line 16<RESET>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'cmd option assumes configured colored-moved' '
+ test_config color.diff.oldMoved "magenta" &&
+ test_config color.diff.newMoved "cyan" &&
+ test_config color.diff.oldMovedAlternative "blue" &&
+ test_config color.diff.newMovedAlternative "yellow" &&
+ test_config color.diff.oldMovedDimmed "normal magenta" &&
+ test_config color.diff.newMovedDimmed "normal cyan" &&
+ test_config color.diff.oldMovedAlternativeDimmed "normal blue" &&
+ test_config color.diff.newMovedAlternativeDimmed "normal yellow" &&
+ test_config diff.colorMoved zebra &&
+ git diff HEAD --no-renames --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,16 +1,16 @@<RESET>
+ <MAGENTA>-long line 1<RESET>
+ <MAGENTA>-long line 2<RESET>
+ <MAGENTA>-long line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ line 6<RESET>
+ line 7<RESET>
+ line 8<RESET>
+ line 9<RESET>
+ <CYAN>+<RESET><CYAN>long line 1<RESET>
+ <CYAN>+<RESET><CYAN>long line 2<RESET>
+ <CYAN>+<RESET><CYAN>long line 3<RESET>
+ <YELLOW>+<RESET><YELLOW>long line 14<RESET>
+ <YELLOW>+<RESET><YELLOW>long line 15<RESET>
+ <YELLOW>+<RESET><YELLOW>long line 16<RESET>
+ line 10<RESET>
+ line 11<RESET>
+ line 12<RESET>
+ line 13<RESET>
+ <MAGENTA>-long line 14<RESET>
+ <MAGENTA>-long line 15<RESET>
+ <MAGENTA>-long line 16<RESET>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'no effect from --color-moved with --word-diff' '
+ cat <<-\EOF >text.txt &&
+ Lorem Ipsum is simply dummy text of the printing and typesetting industry.
+ EOF
+ git add text.txt &&
+ git commit -a -m "clean state" &&
+ cat <<-\EOF >text.txt &&
+ simply Lorem Ipsum dummy is text of the typesetting and printing industry.
+ EOF
+ git diff --color-moved --word-diff >actual &&
+ git diff --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.
+ cat <<-\EOF >lines.txt &&
+ line 1
+ line 2
+ line 3
+ line 4
+ line 5
+ long line 6
+ long line 7
+ long line 8
+ long line 9
+ EOF
+ git add lines.txt &&
+ git commit -m "add poetry" &&
+ git config color.diff.oldMoved "magenta" &&
+ git config color.diff.newMoved "cyan"
+'
+
+test_expect_success 'move detection ignoring whitespace ' '
+ q_to_tab <<-\EOF >lines.txt &&
+ Qlong line 6
+ Qlong line 7
+ Qlong line 8
+ Qchanged long line 9
+ line 1
+ line 2
+ line 3
+ line 4
+ line 5
+ EOF
+ git diff HEAD --no-renames --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,9 +1,9 @@<RESET>
+ <GREEN>+<RESET> <GREEN>long line 6<RESET>
+ <GREEN>+<RESET> <GREEN>long line 7<RESET>
+ <GREEN>+<RESET> <GREEN>long line 8<RESET>
+ <GREEN>+<RESET> <GREEN>changed long line 9<RESET>
+ line 1<RESET>
+ line 2<RESET>
+ line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ <RED>-long line 6<RESET>
+ <RED>-long line 7<RESET>
+ <RED>-long line 8<RESET>
+ <RED>-long line 9<RESET>
+ EOF
+ test_cmp expected actual &&
+
+ git diff HEAD --no-renames -w --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,9 +1,9 @@<RESET>
+ <CYAN>+<RESET> <CYAN>long line 6<RESET>
+ <CYAN>+<RESET> <CYAN>long line 7<RESET>
+ <CYAN>+<RESET> <CYAN>long line 8<RESET>
+ <GREEN>+<RESET> <GREEN>changed long line 9<RESET>
+ line 1<RESET>
+ line 2<RESET>
+ line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ <MAGENTA>-long line 6<RESET>
+ <MAGENTA>-long line 7<RESET>
+ <MAGENTA>-long line 8<RESET>
+ <RED>-long line 9<RESET>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'move detection ignoring whitespace changes' '
+ git reset --hard &&
+ # Lines 6-8 have a space change, but 9 is new whitespace
+ q_to_tab <<-\EOF >lines.txt &&
+ longQline 6
+ longQline 7
+ longQline 8
+ long liQne 9
+ line 1
+ line 2
+ line 3
+ line 4
+ line 5
+ EOF
+
+ git diff HEAD --no-renames --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,9 +1,9 @@<RESET>
+ <GREEN>+<RESET><GREEN>long line 6<RESET>
+ <GREEN>+<RESET><GREEN>long line 7<RESET>
+ <GREEN>+<RESET><GREEN>long line 8<RESET>
+ <GREEN>+<RESET><GREEN>long li ne 9<RESET>
+ line 1<RESET>
+ line 2<RESET>
+ line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ <RED>-long line 6<RESET>
+ <RED>-long line 7<RESET>
+ <RED>-long line 8<RESET>
+ <RED>-long line 9<RESET>
+ EOF
+ test_cmp expected actual &&
+
+ git diff HEAD --no-renames -b --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,9 +1,9 @@<RESET>
+ <CYAN>+<RESET><CYAN>long line 6<RESET>
+ <CYAN>+<RESET><CYAN>long line 7<RESET>
+ <CYAN>+<RESET><CYAN>long line 8<RESET>
+ <GREEN>+<RESET><GREEN>long li ne 9<RESET>
+ line 1<RESET>
+ line 2<RESET>
+ line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ <MAGENTA>-long line 6<RESET>
+ <MAGENTA>-long line 7<RESET>
+ <MAGENTA>-long line 8<RESET>
+ <RED>-long line 9<RESET>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'move detection ignoring whitespace at eol' '
+ git reset --hard &&
+ # Lines 6-9 have new eol whitespace, but 9 also has it in the middle
+ q_to_tab <<-\EOF >lines.txt &&
+ long line 6Q
+ long line 7Q
+ long line 8Q
+ longQline 9Q
+ line 1
+ line 2
+ line 3
+ line 4
+ line 5
+ EOF
+
+ # avoid cluttering the output with complaints about our eol whitespace
+ test_config core.whitespace -blank-at-eol &&
+
+ git diff HEAD --no-renames --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,9 +1,9 @@<RESET>
+ <GREEN>+<RESET><GREEN>long line 6 <RESET>
+ <GREEN>+<RESET><GREEN>long line 7 <RESET>
+ <GREEN>+<RESET><GREEN>long line 8 <RESET>
+ <GREEN>+<RESET><GREEN>long line 9 <RESET>
+ line 1<RESET>
+ line 2<RESET>
+ line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ <RED>-long line 6<RESET>
+ <RED>-long line 7<RESET>
+ <RED>-long line 8<RESET>
+ <RED>-long line 9<RESET>
+ EOF
+ test_cmp expected actual &&
+
+ git diff HEAD --no-renames --ignore-space-at-eol --color-moved --color |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat <<-\EOF >expected &&
+ <BOLD>diff --git a/lines.txt b/lines.txt<RESET>
+ <BOLD>--- a/lines.txt<RESET>
+ <BOLD>+++ b/lines.txt<RESET>
+ <CYAN>@@ -1,9 +1,9 @@<RESET>
+ <CYAN>+<RESET><CYAN>long line 6 <RESET>
+ <CYAN>+<RESET><CYAN>long line 7 <RESET>
+ <CYAN>+<RESET><CYAN>long line 8 <RESET>
+ <GREEN>+<RESET><GREEN>long line 9 <RESET>
+ line 1<RESET>
+ line 2<RESET>
+ line 3<RESET>
+ line 4<RESET>
+ line 5<RESET>
+ <MAGENTA>-long line 6<RESET>
+ <MAGENTA>-long line 7<RESET>
+ <MAGENTA>-long line 8<RESET>
+ <RED>-long line 9<RESET>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'clean up whitespace-test colors' '
+ git config --unset color.diff.oldMoved &&
+ git config --unset color.diff.newMoved
+'
+
+test_expect_success '--color-moved block at end of diff output respects MIN_ALNUM_COUNT' '
+ git reset --hard &&
+ >bar &&
+ cat <<-\EOF >foo &&
+ irrelevant_line
+ line1
+ EOF
+ git add foo bar &&
+ git commit -m x &&
+
+ cat <<-\EOF >bar &&
+ line1
+ EOF
+ cat <<-\EOF >foo &&
+ irrelevant_line
+ EOF
+
+ git diff HEAD --color-moved=zebra --color --no-renames |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat >expected <<-\EOF &&
+ <BOLD>diff --git a/bar b/bar<RESET>
+ <BOLD>--- a/bar<RESET>
+ <BOLD>+++ b/bar<RESET>
+ <CYAN>@@ -0,0 +1 @@<RESET>
+ <GREEN>+<RESET><GREEN>line1<RESET>
+ <BOLD>diff --git a/foo b/foo<RESET>
+ <BOLD>--- a/foo<RESET>
+ <BOLD>+++ b/foo<RESET>
+ <CYAN>@@ -1,2 +1 @@<RESET>
+ irrelevant_line<RESET>
+ <RED>-line1<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success '--color-moved respects MIN_ALNUM_COUNT' '
+ git reset --hard &&
+ cat <<-\EOF >foo &&
+ nineteen chars 456789
+ irrelevant_line
+ twenty chars 234567890
+ EOF
+ >bar &&
+ git add foo bar &&
+ git commit -m x &&
+
+ cat <<-\EOF >foo &&
+ irrelevant_line
+ EOF
+ cat <<-\EOF >bar &&
+ twenty chars 234567890
+ nineteen chars 456789
+ EOF
+
+ git diff HEAD --color-moved=zebra --color --no-renames |
+ grep -v "index" |
+ test_decode_color >actual &&
+ cat >expected <<-\EOF &&
+ <BOLD>diff --git a/bar b/bar<RESET>
+ <BOLD>--- a/bar<RESET>
+ <BOLD>+++ b/bar<RESET>
+ <CYAN>@@ -0,0 +1,2 @@<RESET>
+ <BOLD;CYAN>+<RESET><BOLD;CYAN>twenty chars 234567890<RESET>
+ <GREEN>+<RESET><GREEN>nineteen chars 456789<RESET>
+ <BOLD>diff --git a/foo b/foo<RESET>
+ <BOLD>--- a/foo<RESET>
+ <BOLD>+++ b/foo<RESET>
+ <CYAN>@@ -1,3 +1 @@<RESET>
+ <RED>-nineteen chars 456789<RESET>
+ irrelevant_line<RESET>
+ <BOLD;MAGENTA>-twenty chars 234567890<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success '--color-moved treats adjacent blocks as separate for MIN_ALNUM_COUNT' '
+ git reset --hard &&
+ cat <<-\EOF >foo &&
+ 7charsA
+ irrelevant_line
+ 7charsB
+ 7charsC
+ EOF
+ >bar &&
+ git add foo bar &&
+ git commit -m x &&
+
+ cat <<-\EOF >foo &&
+ irrelevant_line
+ EOF
+ cat <<-\EOF >bar &&
+ 7charsB
+ 7charsC
+ 7charsA
+ EOF
+
+ git diff HEAD --color-moved=zebra --color --no-renames | grep -v "index" | test_decode_color >actual &&
+ cat >expected <<-\EOF &&
+ <BOLD>diff --git a/bar b/bar<RESET>
+ <BOLD>--- a/bar<RESET>
+ <BOLD>+++ b/bar<RESET>
+ <CYAN>@@ -0,0 +1,3 @@<RESET>
+ <GREEN>+<RESET><GREEN>7charsB<RESET>
+ <GREEN>+<RESET><GREEN>7charsC<RESET>
+ <GREEN>+<RESET><GREEN>7charsA<RESET>
+ <BOLD>diff --git a/foo b/foo<RESET>
+ <BOLD>--- a/foo<RESET>
+ <BOLD>+++ b/foo<RESET>
+ <CYAN>@@ -1,4 +1 @@<RESET>
+ <RED>-7charsA<RESET>
+ irrelevant_line<RESET>
+ <RED>-7charsB<RESET>
+ <RED>-7charsC<RESET>
+ EOF
+
+ test_cmp expected actual
+'
+
+test_expect_success 'move detection with submodules' '
+ test_create_repo bananas &&
+ echo ripe >bananas/recipe &&
+ git -C bananas add recipe &&
+ test_commit fruit &&
+ test_commit -C bananas recipe &&
+ git submodule add ./bananas &&
+ git add bananas &&
+ git commit -a -m "bananas are like a heavy library?" &&
+ echo foul >bananas/recipe &&
+ echo ripe >fruit.t &&
+
+ git diff --submodule=diff --color-moved --color >actual &&
+
+ # no move detection as the moved line is across repository boundaries.
+ test_decode_color <actual >decoded_actual &&
+ ! grep BGREEN decoded_actual &&
+ ! grep BRED decoded_actual &&
+
+ # nor did we mess with it another way
+ git diff --submodule=diff --color | test_decode_color >expect &&
+ test_cmp expect decoded_actual
+'
+
test_done
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 518bf95..2ffd11a 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -113,35 +113,6 @@
! test -s actual4
'
-test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.git/config]' '
- git config diff.ignoreSubmodules all &&
- git diff HEAD >actual &&
- ! test -s actual &&
- git config submodule.subname.ignore none &&
- git config submodule.subname.path sub &&
- git diff HEAD >actual &&
- sed -e "1,/^@@/d" actual >actual.body &&
- expect_from_to >expect.body $subprev $subprev-dirty &&
- test_cmp expect.body actual.body &&
- git config submodule.subname.ignore all &&
- git diff HEAD >actual2 &&
- ! test -s actual2 &&
- git config submodule.subname.ignore untracked &&
- git diff HEAD >actual3 &&
- sed -e "1,/^@@/d" actual3 >actual3.body &&
- expect_from_to >expect.body $subprev $subprev-dirty &&
- test_cmp expect.body actual3.body &&
- git config submodule.subname.ignore dirty &&
- git diff HEAD >actual4 &&
- ! test -s actual4 &&
- git diff HEAD --ignore-submodules=none >actual &&
- sed -e "1,/^@@/d" actual >actual.body &&
- expect_from_to >expect.body $subprev $subprev-dirty &&
- test_cmp expect.body actual.body &&
- git config --remove-section submodule.subname &&
- git config --unset diff.ignoreSubmodules
-'
-
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
git config diff.ignoreSubmodules dirty &&
git diff HEAD >actual &&
@@ -208,24 +179,6 @@
! test -s actual4
'
-test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.git/config]' '
- git config submodule.subname.ignore all &&
- git config submodule.subname.path sub &&
- git diff HEAD >actual2 &&
- ! test -s actual2 &&
- git config submodule.subname.ignore untracked &&
- git diff HEAD >actual3 &&
- ! test -s actual3 &&
- git config submodule.subname.ignore dirty &&
- git diff HEAD >actual4 &&
- ! test -s actual4 &&
- git diff --ignore-submodules=none HEAD >actual &&
- sed -e "1,/^@@/d" actual >actual.body &&
- expect_from_to >expect.body $subprev $subprev-dirty &&
- test_cmp expect.body actual.body &&
- git config --remove-section submodule.subname
-'
-
test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
git config --add -f .gitmodules submodule.subname.ignore all &&
git config --add -f .gitmodules submodule.subname.path sub &&
@@ -261,26 +214,6 @@
! test -s actual
'
-test_expect_success 'git diff between submodule commits [.git/config]' '
- git diff HEAD^..HEAD >actual &&
- sed -e "1,/^@@/d" actual >actual.body &&
- expect_from_to >expect.body $subtip $subprev &&
- test_cmp expect.body actual.body &&
- git config submodule.subname.ignore dirty &&
- git config submodule.subname.path sub &&
- git diff HEAD^..HEAD >actual &&
- sed -e "1,/^@@/d" actual >actual.body &&
- expect_from_to >expect.body $subtip $subprev &&
- test_cmp expect.body actual.body &&
- git config submodule.subname.ignore all &&
- git diff HEAD^..HEAD >actual &&
- ! test -s actual &&
- git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
- sed -e "1,/^@@/d" actual >actual.body &&
- expect_from_to >expect.body $subtip $subprev &&
- git config --remove-section submodule.subname
-'
-
test_expect_success 'git diff between submodule commits [.gitmodules]' '
git diff HEAD^..HEAD >actual &&
sed -e "1,/^@@/d" actual >actual.body &&
diff --git a/t/t4045-diff-relative.sh b/t/t4045-diff-relative.sh
index 3950f50..6471a68 100755
--- a/t/t4045-diff-relative.sh
+++ b/t/t4045-diff-relative.sh
@@ -12,62 +12,76 @@
git commit -m one
'
-check_diff() {
-expect=$1; shift
-cat >expected <<EOF
-diff --git a/$expect b/$expect
-new file mode 100644
-index 0000000..25c05ef
---- /dev/null
-+++ b/$expect
-@@ -0,0 +1 @@
-+other content
-EOF
-test_expect_success "-p $*" "
- git diff -p $* HEAD^ >actual &&
- test_cmp expected actual
-"
+check_diff () {
+ dir=$1
+ shift
+ expect=$1
+ shift
+ cat >expected <<-EOF
+ diff --git a/$expect b/$expect
+ new file mode 100644
+ index 0000000..25c05ef
+ --- /dev/null
+ +++ b/$expect
+ @@ -0,0 +1 @@
+ +other content
+ EOF
+ test_expect_success "-p $*" "
+ git -C '$dir' diff -p $* HEAD^ >actual &&
+ test_cmp expected actual
+ "
}
-check_numstat() {
-expect=$1; shift
-cat >expected <<EOF
-1 0 $expect
-EOF
-test_expect_success "--numstat $*" "
- echo '1 0 $expect' >expected &&
- git diff --numstat $* HEAD^ >actual &&
- test_cmp expected actual
-"
+check_numstat () {
+ dir=$1
+ shift
+ expect=$1
+ shift
+ cat >expected <<-EOF
+ 1 0 $expect
+ EOF
+ test_expect_success "--numstat $*" "
+ echo '1 0 $expect' >expected &&
+ git -C '$dir' diff --numstat $* HEAD^ >actual &&
+ test_cmp expected actual
+ "
}
-check_stat() {
-expect=$1; shift
-cat >expected <<EOF
- $expect | 1 +
- 1 file changed, 1 insertion(+)
-EOF
-test_expect_success "--stat $*" "
- git diff --stat $* HEAD^ >actual &&
- test_i18ncmp expected actual
-"
+check_stat () {
+ dir=$1
+ shift
+ expect=$1
+ shift
+ cat >expected <<-EOF
+ $expect | 1 +
+ 1 file changed, 1 insertion(+)
+ EOF
+ test_expect_success "--stat $*" "
+ git -C '$dir' diff --stat $* HEAD^ >actual &&
+ test_i18ncmp expected actual
+ "
}
-check_raw() {
-expect=$1; shift
-cat >expected <<EOF
-:000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect
-EOF
-test_expect_success "--raw $*" "
- git diff --no-abbrev --raw $* HEAD^ >actual &&
- test_cmp expected actual
-"
+check_raw () {
+ dir=$1
+ shift
+ expect=$1
+ shift
+ cat >expected <<-EOF
+ :000000 100644 0000000000000000000000000000000000000000 25c05ef3639d2d270e7fe765a67668f098092bc5 A $expect
+ EOF
+ test_expect_success "--raw $*" "
+ git -C '$dir' diff --no-abbrev --raw $* HEAD^ >actual &&
+ test_cmp expected actual
+ "
}
-for type in diff numstat stat raw; do
- check_$type file2 --relative=subdir/
- check_$type file2 --relative=subdir
- check_$type dir/file2 --relative=sub
+for type in diff numstat stat raw
+do
+ check_$type . file2 --relative=subdir/
+ check_$type . file2 --relative=subdir
+ check_$type subdir file2 --relative
+ check_$type . dir/file2 --relative=sub
done
test_done
diff --git a/t/t4051-diff-function-context.sh b/t/t4051-diff-function-context.sh
index 3e6b485..2d76a97 100755
--- a/t/t4051-diff-function-context.sh
+++ b/t/t4051-diff-function-context.sh
@@ -85,6 +85,10 @@
check_diff changed_hello 'changed function'
+test_expect_success ' context includes comment' '
+ grep "^ .*Hello comment" changed_hello.diff
+'
+
test_expect_success ' context includes begin' '
grep "^ .*Begin of hello" changed_hello.diff
'
diff --git a/t/t4051/hello.c b/t/t4051/hello.c
index 63b1a1e..73e767e 100644
--- a/t/t4051/hello.c
+++ b/t/t4051/hello.c
@@ -1,4 +1,7 @@
+/*
+ * Hello comment.
+ */
static void hello(void) // Begin of hello
{
/*
diff --git a/t/t4059-diff-submodule-not-initialized.sh b/t/t4059-diff-submodule-not-initialized.sh
index cd70fd5..49bca7b 100755
--- a/t/t4059-diff-submodule-not-initialized.sh
+++ b/t/t4059-diff-submodule-not-initialized.sh
@@ -95,7 +95,7 @@
git clone . sm3 &&
git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
cat >expected <<-EOF &&
- Submodule sm1 $smhead1...$smhead2 (not initialized)
+ Submodule sm1 $smhead1...$smhead2 (commits not present)
EOF
test_cmp expected actual
'
diff --git a/t/t4065-diff-anchored.sh b/t/t4065-diff-anchored.sh
new file mode 100755
index 0000000..b3f510f
--- /dev/null
+++ b/t/t4065-diff-anchored.sh
@@ -0,0 +1,94 @@
+#!/bin/sh
+
+test_description='anchored diff algorithm'
+
+. ./test-lib.sh
+
+test_expect_success '--anchored' '
+ printf "a\nb\nc\n" >pre &&
+ printf "c\na\nb\n" >post &&
+
+ # normally, c is moved to produce the smallest diff
+ test_expect_code 1 git diff --no-index pre post >diff &&
+ grep "^+c" diff &&
+
+ # with anchor, a is moved
+ test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+ grep "^+a" diff
+'
+
+test_expect_success '--anchored multiple' '
+ printf "a\nb\nc\nd\ne\nf\n" >pre &&
+ printf "c\na\nb\nf\nd\ne\n" >post &&
+
+ # with 1 anchor, c is not moved, but f is moved
+ test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+ grep "^+a" diff && # a is moved instead of c
+ grep "^+f" diff &&
+
+ # with 2 anchors, c and f are not moved
+ test_expect_code 1 git diff --no-index --anchored=c --anchored=f pre post >diff &&
+ grep "^+a" diff &&
+ grep "^+d" diff # d is moved instead of f
+'
+
+test_expect_success '--anchored with nonexistent line has no effect' '
+ printf "a\nb\nc\n" >pre &&
+ printf "c\na\nb\n" >post &&
+
+ test_expect_code 1 git diff --no-index --anchored=x pre post >diff &&
+ grep "^+c" diff
+'
+
+test_expect_success '--anchored with non-unique line has no effect' '
+ printf "a\nb\nc\nd\ne\nc\n" >pre &&
+ printf "c\na\nb\nc\nd\ne\n" >post &&
+
+ test_expect_code 1 git diff --no-index --anchored=c pre post >diff &&
+ grep "^+c" diff
+'
+
+test_expect_success 'diff still produced with impossible multiple --anchored' '
+ printf "a\nb\nc\n" >pre &&
+ printf "c\na\nb\n" >post &&
+
+ test_expect_code 1 git diff --no-index --anchored=a --anchored=c pre post >diff &&
+ mv post expected_post &&
+
+ # Ensure that the diff is correct by applying it and then
+ # comparing the result with the original
+ git apply diff &&
+ diff expected_post post
+'
+
+test_expect_success 'later algorithm arguments override earlier ones' '
+ printf "a\nb\nc\n" >pre &&
+ printf "c\na\nb\n" >post &&
+
+ test_expect_code 1 git diff --no-index --patience --anchored=c pre post >diff &&
+ grep "^+a" diff &&
+
+ test_expect_code 1 git diff --no-index --anchored=c --patience pre post >diff &&
+ grep "^+c" diff &&
+
+ test_expect_code 1 git diff --no-index --histogram --anchored=c pre post >diff &&
+ grep "^+a" diff &&
+
+ test_expect_code 1 git diff --no-index --anchored=c --histogram pre post >diff &&
+ grep "^+c" diff
+'
+
+test_expect_success '--anchored works with other commands like "git show"' '
+ printf "a\nb\nc\n" >file &&
+ git add file &&
+ git commit -m foo &&
+ printf "c\na\nb\n" >file &&
+ git add file &&
+ git commit -m foo &&
+
+ # with anchor, a is moved
+ git show --patience --anchored=c >diff &&
+ grep "^+a" diff
+'
+
+test_done
diff --git a/t/t4107-apply-ignore-whitespace.sh b/t/t4107-apply-ignore-whitespace.sh
index 9e29b52..ac72eea 100755
--- a/t/t4107-apply-ignore-whitespace.sh
+++ b/t/t4107-apply-ignore-whitespace.sh
@@ -178,4 +178,18 @@
test_must_fail git apply --no-ignore-whitespace patch5.patch
'
+test_expect_success 'apply --ignore-space-change --inaccurate-eof' '
+ echo 1 >file &&
+ git apply --ignore-space-change --inaccurate-eof <<-\EOF &&
+ diff --git a/file b/file
+ --- a/file
+ +++ b/file
+ @@ -1 +1 @@
+ -1
+ +2
+ EOF
+ printf 2 >expect &&
+ test_cmp expect file
+'
+
test_done
diff --git a/t/t4200-rerere.sh b/t/t4200-rerere.sh
index 1a080e7..d97d2be 100755
--- a/t/t4200-rerere.sh
+++ b/t/t4200-rerere.sh
@@ -239,6 +239,43 @@
! test -f $rr2/preimage
'
+rerere_gc_custom_expiry_test () {
+ five_days="$1" right_now="$2"
+ test_expect_success "rerere gc with custom expiry ($five_days, $right_now)" '
+ rm -fr .git/rr-cache &&
+ rr=.git/rr-cache/$_z40 &&
+ mkdir -p "$rr" &&
+ >"$rr/preimage" &&
+ >"$rr/postimage" &&
+
+ two_days_ago=$((-2*86400)) &&
+ test-chmtime =$two_days_ago "$rr/preimage" &&
+ test-chmtime =$two_days_ago "$rr/postimage" &&
+
+ find .git/rr-cache -type f | sort >original &&
+
+ git -c "gc.rerereresolved=$five_days" \
+ -c "gc.rerereunresolved=$five_days" rerere gc &&
+ find .git/rr-cache -type f | sort >actual &&
+ test_cmp original actual &&
+
+ git -c "gc.rerereresolved=$five_days" \
+ -c "gc.rerereunresolved=$right_now" rerere gc &&
+ find .git/rr-cache -type f | sort >actual &&
+ test_cmp original actual &&
+
+ git -c "gc.rerereresolved=$right_now" \
+ -c "gc.rerereunresolved=$right_now" rerere gc &&
+ find .git/rr-cache -type f | sort >actual &&
+ >expect &&
+ test_cmp expect actual
+ '
+}
+
+rerere_gc_custom_expiry_test 5 0
+
+rerere_gc_custom_expiry_test 5.days.ago now
+
test_expect_success 'setup: file2 added differently in two branches' '
git reset --hard &&
@@ -419,24 +456,6 @@
test_line_count = "$2" actual
}
-test_expect_success 'rerere gc' '
- find .git/rr-cache -type f >original &&
- xargs test-chmtime -172800 <original &&
-
- git -c gc.rerereresolved=5 -c gc.rerereunresolved=5 rerere gc &&
- find .git/rr-cache -type f >actual &&
- test_cmp original actual &&
-
- git -c gc.rerereresolved=5 -c gc.rerereunresolved=0 rerere gc &&
- find .git/rr-cache -type f >actual &&
- test_cmp original actual &&
-
- git -c gc.rerereresolved=0 -c gc.rerereunresolved=0 rerere gc &&
- find .git/rr-cache -type f >actual &&
- >expect &&
- test_cmp expect actual
-'
-
merge_conflict_resolve () {
git reset --hard &&
test_must_fail git merge six.1 &&
@@ -446,6 +465,8 @@
}
test_expect_success 'multiple identical conflicts' '
+ rm -fr .git/rr-cache &&
+ mkdir .git/rr-cache &&
git reset --hard &&
test_seq 1 6 >early &&
diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 9df054b..da10478 100755
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -9,6 +9,7 @@
. ./test-lib.sh
test_expect_success 'setup' '
+ test_tick &&
echo 1 >a1 &&
git add a1 &&
tree=$(git write-tree) &&
@@ -59,7 +60,7 @@
file=$1 &&
sed "
s/$_x40/OBJECT_NAME/g
- s/$_x05/OBJID/g
+ s/$_x35/OBJID/g
s/^ \{6\}[CTa].*/ SUBJECT/g
s/^ \{8\}[^ ].*/ CONTINUATION/g
" <"$file" >"$file.fuzzy" &&
@@ -81,7 +82,7 @@
test_expect_success '--abbrev' '
sed s/SUBJECT/OBJID/ expect.template >expect &&
- git shortlog --format="%h" --abbrev=5 HEAD >log &&
+ git shortlog --format="%h" --abbrev=35 HEAD >log &&
fuzz log >log.predictable &&
test_cmp expect log.predictable
'
diff --git a/t/t4202-log.sh b/t/t4202-log.sh
index 8f155da..25b1f8c 100755
--- a/t/t4202-log.sh
+++ b/t/t4202-log.sh
@@ -737,6 +737,107 @@
'
+test_expect_success 'decorate-refs with glob' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach
+ Merge-tags-octopus-a-and-octopus-b
+ seventh
+ octopus-b (octopus-b)
+ octopus-a (octopus-a)
+ reach
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs="heads/octopus*" >actual &&
+ test_cmp expect.decorate actual
+'
+
+test_expect_success 'decorate-refs without globs' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach
+ Merge-tags-octopus-a-and-octopus-b
+ seventh
+ octopus-b
+ octopus-a
+ reach (tag: reach)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs="tags/reach" >actual &&
+ test_cmp expect.decorate actual
+'
+
+test_expect_success 'multiple decorate-refs' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach
+ Merge-tags-octopus-a-and-octopus-b
+ seventh
+ octopus-b (octopus-b)
+ octopus-a (octopus-a)
+ reach (tag: reach)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs="heads/octopus*" \
+ --decorate-refs="tags/reach" >actual &&
+ test_cmp expect.decorate actual
+'
+
+test_expect_success 'decorate-refs-exclude with glob' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach (HEAD -> master)
+ Merge-tags-octopus-a-and-octopus-b
+ seventh (tag: seventh)
+ octopus-b (tag: octopus-b)
+ octopus-a (tag: octopus-a)
+ reach (tag: reach, reach)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs-exclude="heads/octopus*" >actual &&
+ test_cmp expect.decorate actual
+'
+
+test_expect_success 'decorate-refs-exclude without globs' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach (HEAD -> master)
+ Merge-tags-octopus-a-and-octopus-b
+ seventh (tag: seventh)
+ octopus-b (tag: octopus-b, octopus-b)
+ octopus-a (tag: octopus-a, octopus-a)
+ reach (reach)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs-exclude="tags/reach" >actual &&
+ test_cmp expect.decorate actual
+'
+
+test_expect_success 'multiple decorate-refs-exclude' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach (HEAD -> master)
+ Merge-tags-octopus-a-and-octopus-b
+ seventh (tag: seventh)
+ octopus-b (tag: octopus-b)
+ octopus-a (tag: octopus-a)
+ reach (reach)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs-exclude="heads/octopus*" \
+ --decorate-refs-exclude="tags/reach" >actual &&
+ test_cmp expect.decorate actual
+'
+
+test_expect_success 'decorate-refs and decorate-refs-exclude' '
+ cat >expect.decorate <<-\EOF &&
+ Merge-tag-reach (master)
+ Merge-tags-octopus-a-and-octopus-b
+ seventh
+ octopus-b
+ octopus-a
+ reach (reach)
+ EOF
+ git log -n6 --decorate=short --pretty="tformat:%f%d" \
+ --decorate-refs="heads/*" \
+ --decorate-refs-exclude="heads/oc*" >actual &&
+ test_cmp expect.decorate actual
+'
+
test_expect_success 'log.decorate config parsing' '
git log --oneline --decorate=full >expect.full &&
git log --oneline --decorate=short >expect.short &&
diff --git a/t/t4205-log-pretty-formats.sh b/t/t4205-log-pretty-formats.sh
index 18aa1b5..591f35d 100755
--- a/t/t4205-log-pretty-formats.sh
+++ b/t/t4205-log-pretty-formats.sh
@@ -539,25 +539,62 @@
Signed-off-by: A U Thor <author@example.com>
Acked-by: A U Thor <author@example.com>
[ v2 updated patch description ]
-Signed-off-by: A U Thor <author@example.com>
+Signed-off-by: A U Thor
+ <author@example.com>
EOF
-test_expect_success 'pretty format %(trailers) shows trailers' '
+unfold () {
+ perl -0pe 's/\n\s+/ /g'
+}
+
+test_expect_success 'set up trailer tests' '
echo "Some contents" >trailerfile &&
git add trailerfile &&
- git commit -F - <<-EOF &&
+ git commit -F - <<-EOF
trailers: this commit message has trailers
This commit is a test commit with trailers at the end. We parse this
- message and display the trailers using %bT
+ message and display the trailers using %(trailers).
$(cat trailers)
EOF
+'
+
+test_expect_success 'pretty format %(trailers) shows trailers' '
git log --no-walk --pretty="%(trailers)" >actual &&
- cat >expect <<-EOF &&
- $(cat trailers)
+ {
+ cat trailers &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
- EOF
+test_expect_success '%(trailers:only) shows only "key: value" trailers' '
+ git log --no-walk --pretty="%(trailers:only)" >actual &&
+ {
+ grep -v patch.description <trailers &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:unfold) unfolds trailers' '
+ git log --no-walk --pretty="%(trailers:unfold)" >actual &&
+ {
+ unfold <trailers &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success ':only and :unfold work together' '
+ git log --no-walk --pretty="%(trailers:only,unfold)" >actual &&
+ git log --no-walk --pretty="%(trailers:unfold,only)" >reverse &&
+ test_cmp actual reverse &&
+ {
+ grep -v patch.description <trailers | unfold &&
+ echo
+ } >expect &&
test_cmp expect actual
'
diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh
index 935df6a6..a1705f7 100755
--- a/t/t4208-log-magic-pathspec.sh
+++ b/t/t4208-log-magic-pathspec.sh
@@ -93,4 +93,23 @@
git log --merge -- a
'
+test_expect_success 'tree_entry_interesting does not match past submodule boundaries' '
+ test_when_finished "rm -rf repo submodule" &&
+ git init submodule &&
+ test_commit -C submodule initial &&
+ git init repo &&
+ >"repo/[bracket]" &&
+ git -C repo add "[bracket]" &&
+ test_tick &&
+ git -C repo commit -m bracket &&
+ git -C repo rev-list HEAD -- "[bracket]" >expect &&
+
+ git -C repo submodule add ../submodule &&
+ test_tick &&
+ git -C repo commit -m submodule &&
+
+ git -C repo rev-list HEAD -- "[bracket]" >actual &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh
index 133b584..6694c19 100755
--- a/t/t5304-prune.sh
+++ b/t/t5304-prune.sh
@@ -283,4 +283,41 @@
git -C B prune
'
+test_expect_success 'prune: handle index in multiple worktrees' '
+ git worktree add second-worktree &&
+ echo "new blob for second-worktree" >second-worktree/blob &&
+ git -C second-worktree add blob &&
+ git prune --expire=now &&
+ git -C second-worktree show :blob >actual &&
+ test_cmp second-worktree/blob actual
+'
+
+test_expect_success 'prune: handle HEAD in multiple worktrees' '
+ git worktree add --detach third-worktree &&
+ echo "new blob for third-worktree" >third-worktree/blob &&
+ git -C third-worktree add blob &&
+ git -C third-worktree commit -m "third" &&
+ rm .git/worktrees/third-worktree/index &&
+ test_must_fail git -C third-worktree show :blob &&
+ git prune --expire=now &&
+ git -C third-worktree show HEAD:blob >actual &&
+ test_cmp third-worktree/blob actual
+'
+
+test_expect_success 'prune: handle HEAD reflog in multiple worktrees' '
+ git config core.logAllRefUpdates true &&
+ echo "lost blob for third-worktree" >expected &&
+ (
+ cd third-worktree &&
+ cat ../expected >blob &&
+ git add blob &&
+ git commit -m "second commit in third" &&
+ git reset --hard HEAD^
+ ) &&
+ git prune --expire=now &&
+ SHA1=`git hash-object expected` &&
+ git -C third-worktree show "$SHA1" >actual &&
+ test_cmp expected actual
+'
+
test_done
diff --git a/t/t5317-pack-objects-filter-objects.sh b/t/t5317-pack-objects-filter-objects.sh
new file mode 100755
index 0000000..1b0acc3
--- /dev/null
+++ b/t/t5317-pack-objects-filter-objects.sh
@@ -0,0 +1,375 @@
+#!/bin/sh
+
+test_description='git pack-objects using object filtering'
+
+. ./test-lib.sh
+
+# 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"
+ done
+'
+
+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 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r1 pack-objects --rev --stdout >all.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r1 index-pack ../all.pack &&
+ git -C r1 verify-pack -v ../all.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:none packfile has no blobs' '
+ git -C r1 pack-objects --rev --stdout --filter=blob:none >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r1 index-pack ../filter.pack &&
+ git -C r1 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ nr=$(wc -l <observed) &&
+ test 0 -eq $nr
+'
+
+test_expect_success 'verify normal and blob:none packfiles have same commits/trees' '
+ git -C r1 verify-pack -v ../all.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >expected &&
+ git -C r1 verify-pack -v ../filter.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Test blob:limit=<n>[kmg] filter.
+# We boundary test around the size parameter. The filter is strictly less than
+# the value, so size 500 and 1000 should have the same results, but 1001 should
+# filter more.
+
+test_expect_success 'setup r2' '
+ 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"
+ done
+'
+
+test_expect_success 'verify blob count in normal packfile' '
+ git -C r2 ls-files -s large.1000 large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 pack-objects --rev --stdout >all.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../all.pack &&
+ git -C r2 verify-pack -v ../all.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=500 omits all blobs' '
+ git -C r2 pack-objects --rev --stdout --filter=blob:limit=500 >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../filter.pack &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ nr=$(wc -l <observed) &&
+ test 0 -eq $nr
+'
+
+test_expect_success 'verify blob:limit=1000' '
+ git -C r2 pack-objects --rev --stdout --filter=blob:limit=1000 >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../filter.pack &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ nr=$(wc -l <observed) &&
+ test 0 -eq $nr
+'
+
+test_expect_success 'verify blob:limit=1001' '
+ git -C r2 ls-files -s large.1000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 pack-objects --rev --stdout --filter=blob:limit=1001 >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../filter.pack &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=10001' '
+ git -C r2 ls-files -s large.1000 large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 pack-objects --rev --stdout --filter=blob:limit=10001 >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../filter.pack &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=1k' '
+ git -C r2 ls-files -s large.1000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 pack-objects --rev --stdout --filter=blob:limit=1k >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../filter.pack &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=1m' '
+ git -C r2 ls-files -s large.1000 large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 pack-objects --rev --stdout --filter=blob:limit=1m >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r2 index-pack ../filter.pack &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify normal and blob:limit packfiles have same commits/trees' '
+ git -C r2 verify-pack -v ../all.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >expected &&
+ git -C r2 verify-pack -v ../filter.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Test sparse:path=<path> filter.
+# Use a local file containing a sparse-checkout specification to filter
+# out blobs not required for the corresponding sparse-checkout. We do not
+# require sparse-checkout to actually be enabled.
+
+test_expect_success 'setup r3' '
+ git init r3 &&
+ 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
+ done &&
+ git -C r3 commit -m "sparse" &&
+ echo dir1/ >pattern1 &&
+ echo sparse1 >pattern2
+'
+
+test_expect_success 'verify blob count in normal packfile' '
+ git -C r3 ls-files -s sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r3 pack-objects --rev --stdout >all.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r3 index-pack ../all.pack &&
+ git -C r3 verify-pack -v ../all.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify sparse:path=pattern1' '
+ git -C r3 ls-files -s dir1/sparse1 dir1/sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern1 >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r3 index-pack ../filter.pack &&
+ git -C r3 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify normal and sparse:path=pattern1 packfiles have same commits/trees' '
+ git -C r3 verify-pack -v ../all.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >expected &&
+ git -C r3 verify-pack -v ../filter.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify sparse:path=pattern2' '
+ git -C r3 ls-files -s sparse1 dir1/sparse1 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r3 pack-objects --rev --stdout --filter=sparse:path=../pattern2 >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r3 index-pack ../filter.pack &&
+ git -C r3 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify normal and sparse:path=pattern2 packfiles have same commits/trees' '
+ git -C r3 verify-pack -v ../all.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >expected &&
+ git -C r3 verify-pack -v ../filter.pack \
+ | grep -E "commit|tree" \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Test sparse:oid=<oid-ish> filter.
+# Like sparse:path, but we get the sparse-checkout specification from
+# a blob rather than a file on disk.
+
+test_expect_success 'setup r4' '
+ git init r4 &&
+ 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
+ done &&
+ echo dir1/ >r4/pattern &&
+ git -C r4 add pattern &&
+ git -C r4 commit -m "pattern"
+'
+
+test_expect_success 'verify blob count in normal packfile' '
+ git -C r4 ls-files -s pattern sparse1 sparse2 dir1/sparse1 dir1/sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r4 pack-objects --rev --stdout >all.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r4 index-pack ../all.pack &&
+ git -C r4 verify-pack -v ../all.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify sparse:oid=OID' '
+ git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ oid=$(git -C r4 ls-files -s pattern | awk -f print_2.awk) &&
+ git -C r4 pack-objects --rev --stdout --filter=sparse:oid=$oid >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r4 index-pack ../filter.pack &&
+ git -C r4 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify sparse:oid=oid-ish' '
+ git -C r4 ls-files -s dir1/sparse1 dir1/sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r4 pack-objects --rev --stdout --filter=sparse:oid=master:pattern >filter.pack <<-EOF &&
+ HEAD
+ EOF
+ git -C r4 index-pack ../filter.pack &&
+ git -C r4 verify-pack -v ../filter.pack \
+ | grep blob \
+ | awk -f print_1.awk \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Delete some loose objects and use pack-objects, but WITHOUT any filtering.
+# 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 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ for id in `cat expected | sed "s|..|&/|"`
+ do
+ rm r1/.git/objects/$id
+ done
+'
+
+test_expect_success 'verify pack-objects fails w/ missing objects' '
+ test_must_fail git -C r1 pack-objects --rev --stdout >miss.pack <<-EOF
+ HEAD
+ EOF
+'
+
+test_expect_success 'verify pack-objects fails w/ --missing=error' '
+ test_must_fail git -C r1 pack-objects --rev --stdout --missing=error >miss.pack <<-EOF
+ HEAD
+ EOF
+'
+
+test_expect_success 'verify pack-objects w/ --missing=allow-any' '
+ git -C r1 pack-objects --rev --stdout --missing=allow-any >miss.pack <<-EOF
+ HEAD
+ EOF
+'
+
+test_done
diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh
index 668c54b..3debc87 100755
--- a/t/t5510-fetch.sh
+++ b/t/t5510-fetch.sh
@@ -222,12 +222,9 @@
(
cd descriptive &&
git fetch o 2>actual &&
- grep " -> refs/crazyheads/descriptive-branch$" actual |
- test_i18ngrep "new branch" &&
- grep " -> descriptive-tag$" actual |
- test_i18ngrep "new tag" &&
- grep " -> crazy$" actual |
- test_i18ngrep "new ref"
+ test_i18ngrep "new branch.* -> refs/crazyheads/descriptive-branch$" actual &&
+ test_i18ngrep "new tag.* -> descriptive-tag$" actual &&
+ test_i18ngrep "new ref.* -> crazy$" actual
) &&
git checkout master
'
diff --git a/t/t5520-pull.sh b/t/t5520-pull.sh
index f15f7a3..59c4b77 100755
--- a/t/t5520-pull.sh
+++ b/t/t5520-pull.sh
@@ -305,7 +305,7 @@
test_tick &&
git commit -m "Create conflict" seq.txt &&
test_must_fail git pull --rebase . seq 2>err >out &&
- test_i18ngrep "When you have resolved this problem" out
+ test_i18ngrep "Resolve all conflicts manually" out
'
test_expect_success 'failed --rebase shows advice' '
@@ -319,7 +319,7 @@
git checkout -f -b fails-to-rebase HEAD^ &&
test_commit v2-without-cr file "2" file2-lf &&
test_must_fail git pull --rebase . diverging 2>err >out &&
- test_i18ngrep "When you have resolved this problem" out
+ test_i18ngrep "Resolve all conflicts manually" out
'
test_expect_success '--rebase fails with multiple branches' '
diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh
index ded8f98..c19d8db 100755
--- a/t/t5521-pull-options.sh
+++ b/t/t5521-pull-options.sh
@@ -165,4 +165,49 @@
)
'
+test_expect_success 'git pull does not add a sign-off line' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ test_commit -C src two &&
+ git -C dst pull --no-ff &&
+ git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'git pull --no-signoff does not add sign-off line' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ test_commit -C src two &&
+ git -C dst pull --no-signoff --no-ff &&
+ git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+ test_must_be_empty actual
+'
+
+test_expect_success 'git pull --signoff add a sign-off line' '
+ test_when_finished "rm -fr src dst expected actual" &&
+ echo "Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL>" >expected &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ test_commit -C src two &&
+ git -C dst pull --signoff --no-ff &&
+ git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'git pull --no-signoff flag cancels --signoff flag' '
+ test_when_finished "rm -fr src dst actual" &&
+ git init src &&
+ test_commit -C src one &&
+ git clone src dst &&
+ test_commit -C src two &&
+ git -C dst pull --signoff --no-signoff --no-ff &&
+ git -C dst show -s --pretty="format:%(trailers)" HEAD >actual &&
+ test_must_be_empty actual
+'
+
test_done
diff --git a/t/t5526-fetch-submodules.sh b/t/t5526-fetch-submodules.sh
index 42251f7..74486c7 100755
--- a/t/t5526-fetch-submodules.sh
+++ b/t/t5526-fetch-submodules.sh
@@ -478,7 +478,47 @@
git fetch >../actual.out 2>../actual.err
) &&
! test -s actual.out &&
- test_i18ncmp expect.err actual.err
+ test_i18ncmp expect.err actual.err &&
+ (
+ cd submodule &&
+ git checkout -q master
+ )
+'
+
+test_expect_success "'fetch.recurseSubmodules=on-demand' works also without .gitmodules entry" '
+ (
+ cd downstream &&
+ git fetch --recurse-submodules
+ ) &&
+ add_upstream_commit &&
+ head1=$(git rev-parse --short HEAD) &&
+ git add submodule &&
+ git rm .gitmodules &&
+ git commit -m "new submodule without .gitmodules" &&
+ printf "" >expect.out &&
+ head2=$(git rev-parse --short HEAD) &&
+ echo "From $pwd/." >expect.err.2 &&
+ echo " $head1..$head2 master -> origin/master" >>expect.err.2 &&
+ head -3 expect.err >>expect.err.2 &&
+ (
+ cd downstream &&
+ rm .gitmodules &&
+ git config fetch.recurseSubmodules on-demand &&
+ # fake submodule configuration to avoid skipping submodule handling
+ git config -f .gitmodules submodule.fake.path fake &&
+ git config -f .gitmodules submodule.fake.url fakeurl &&
+ git add .gitmodules &&
+ git config --unset submodule.submodule.url &&
+ git fetch >../actual.out 2>../actual.err &&
+ # cleanup
+ git config --unset fetch.recurseSubmodules &&
+ git reset --hard
+ ) &&
+ test_i18ncmp expect.out actual.out &&
+ test_i18ncmp expect.err.2 actual.err &&
+ git checkout HEAD^ -- .gitmodules &&
+ git add .gitmodules &&
+ git commit -m "new submodule restored .gitmodules"
'
test_expect_success 'fetching submodules respects parallel settings' '
@@ -530,4 +570,39 @@
test_must_fail git -C dst fetch --recurse-submodules
'
+test_expect_success "fetch new commits when submodule got renamed" '
+ git clone . downstream_rename &&
+ (
+ cd downstream_rename &&
+ git submodule update --init &&
+# NEEDSWORK: we omitted --recursive for the submodule update here since
+# that does not work. See test 7001 for mv "moving nested submodules"
+# for details. Once that is fixed we should add the --recursive option
+# here.
+ git checkout -b rename &&
+ git mv submodule submodule_renamed &&
+ (
+ cd submodule_renamed &&
+ git checkout -b rename_sub &&
+ echo a >a &&
+ git add a &&
+ git commit -ma &&
+ git push origin rename_sub &&
+ git rev-parse HEAD >../../expect
+ ) &&
+ git add submodule_renamed &&
+ git commit -m "update renamed submodule" &&
+ git push origin rename
+ ) &&
+ (
+ cd downstream &&
+ git fetch --recurse-submodules=on-demand &&
+ (
+ cd submodule &&
+ git rev-parse origin/rename_sub >../../actual
+ )
+ ) &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t5531-deep-submodule-push.sh b/t/t5531-deep-submodule-push.sh
index 0f84a53..39cb2c1 100755
--- a/t/t5531-deep-submodule-push.sh
+++ b/t/t5531-deep-submodule-push.sh
@@ -298,6 +298,16 @@
)
'
+test_expect_success 'submodule entry pointing at a tag is error' '
+ git -C work/gar/bage tag -a test1 -m "tag" &&
+ tag=$(git -C work/gar/bage rev-parse test1^{tag}) &&
+ git -C work update-index --cacheinfo 160000 "$tag" gar/bage &&
+ git -C work commit -m "bad commit" &&
+ test_when_finished "git -C work reset --hard HEAD^" &&
+ test_must_fail git -C work push --recurse-submodules=on-demand ../pub.git master 2>err &&
+ test_i18ngrep "is a tag, not a commit" err
+'
+
test_expect_success 'push fails if recurse submodules option passed as yes' '
(
cd work/gar/bage &&
diff --git a/t/t5534-push-signed.sh b/t/t5534-push-signed.sh
index 464ffdd..1cea758 100755
--- a/t/t5534-push-signed.sh
+++ b/t/t5534-push-signed.sh
@@ -71,6 +71,13 @@
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 &&
diff --git a/t/t5536-fetch-conflicts.sh b/t/t5536-fetch-conflicts.sh
index 2e42cf3..644736b 100755
--- a/t/t5536-fetch-conflicts.sh
+++ b/t/t5536-fetch-conflicts.sh
@@ -22,7 +22,7 @@
cat >expected &&
# We're not interested in the error
# "fatal: The remote end hung up unexpectedly":
- test_i18ngrep -E '^(fatal|warning):' <error | grep -v 'hung up' >actual | sort &&
+ test_i18ngrep -E '^(fatal|warning):' error | grep -v 'hung up' >actual | sort &&
test_i18ncmp expected actual
}
diff --git a/t/t5541-http-push-smart.sh b/t/t5541-http-push-smart.sh
index d38bf32..21340e8 100755
--- a/t/t5541-http-push-smart.sh
+++ b/t/t5541-http-push-smart.sh
@@ -234,7 +234,7 @@
test_commit no-progress &&
test_terminal git push --no-progress >output 2>&1 &&
test_i18ngrep "^To http" output &&
- test_i18ngrep ! "^Writing objects"
+ test_i18ngrep ! "^Writing objects" output
'
test_expect_success 'push --progress shows progress to non-tty' '
diff --git a/t/t5545-push-options.sh b/t/t5545-push-options.sh
index 90a4b0d..4637837 100755
--- a/t/t5545-push-options.sh
+++ b/t/t5545-push-options.sh
@@ -140,6 +140,83 @@
test_cmp expect parent_upstream/.git/hooks/post-receive.push_options
'
+test_expect_success 'default push option' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ git -c push.pushOption=default push up master
+ ) &&
+ test_refs master master &&
+ echo "default" >expect &&
+ test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+ test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_expect_success 'two default push options' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ git -c push.pushOption=default1 -c push.pushOption=default2 push up master
+ ) &&
+ test_refs master master &&
+ printf "default1\ndefault2\n" >expect &&
+ test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+ test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_expect_success 'push option from command line overrides from-config push option' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ git -c push.pushOption=default push --push-option=manual up master
+ ) &&
+ test_refs master master &&
+ echo "manual" >expect &&
+ test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+ test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_expect_success 'empty value of push.pushOption in config clears the list' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ git -c push.pushOption=default1 -c push.pushOption= -c push.pushOption=default2 push up master
+ ) &&
+ test_refs master master &&
+ echo "default2" >expect &&
+ test_cmp expect upstream/.git/hooks/pre-receive.push_options &&
+ test_cmp expect upstream/.git/hooks/post-receive.push_options
+'
+
+test_expect_success 'invalid push option in config' '
+ mk_repo_pair &&
+ git -C upstream config receive.advertisePushOptions true &&
+ (
+ cd workbench &&
+ test_commit one &&
+ git push --mirror up &&
+ test_commit two &&
+ test_must_fail git -c push.pushOption push up master
+ ) &&
+ test_refs master HEAD@{1}
+'
+
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
diff --git a/t/t5551-http-fetch-smart.sh b/t/t5551-http-fetch-smart.sh
index a51b7e2..f5721b4 100755
--- a/t/t5551-http-fetch-smart.sh
+++ b/t/t5551-http-fetch-smart.sh
@@ -364,5 +364,38 @@
submodule update sub
'
+test_expect_success 'GIT_REDACT_COOKIES redacts cookies' '
+ rm -rf clone &&
+ echo "Set-Cookie: Foo=1" >cookies &&
+ echo "Set-Cookie: Bar=2" >>cookies &&
+ GIT_TRACE_CURL=true GIT_REDACT_COOKIES=Bar,Baz \
+ git -c "http.cookieFile=$(pwd)/cookies" clone \
+ $HTTPD_URL/smart/repo.git clone 2>err &&
+ grep "Cookie:.*Foo=1" err &&
+ grep "Cookie:.*Bar=<redacted>" err &&
+ ! grep "Cookie:.*Bar=2" err
+'
+
+test_expect_success 'GIT_REDACT_COOKIES handles empty values' '
+ rm -rf clone &&
+ echo "Set-Cookie: Foo=" >cookies &&
+ GIT_TRACE_CURL=true GIT_REDACT_COOKIES=Foo \
+ git -c "http.cookieFile=$(pwd)/cookies" clone \
+ $HTTPD_URL/smart/repo.git clone 2>err &&
+ grep "Cookie:.*Foo=<redacted>" err
+'
+
+test_expect_success 'GIT_TRACE_CURL_NO_DATA prevents data from being traced' '
+ rm -rf clone &&
+ GIT_TRACE_CURL=true \
+ git clone $HTTPD_URL/smart/repo.git clone 2>err &&
+ grep "=> Send data" err &&
+
+ rm -rf clone &&
+ GIT_TRACE_CURL=true GIT_TRACE_CURL_NO_DATA=1 \
+ git clone $HTTPD_URL/smart/repo.git clone 2>err &&
+ ! grep "=> Send data" err
+'
+
stop_httpd
test_done
diff --git a/t/t5570-git-daemon.sh b/t/t5570-git-daemon.sh
index 225a022..755b05a 100755
--- a/t/t5570-git-daemon.sh
+++ b/t/t5570-git-daemon.sh
@@ -167,23 +167,48 @@
git init --bare "$repo" &&
git push "$repo" HEAD &&
>"$repo"/git-daemon-export-ok &&
- rm -rf tmp.git &&
GIT_OVERRIDE_VIRTUAL_HOST=localhost \
- git clone --bare "$GIT_DAEMON_URL/interp.git" tmp.git &&
- rm -rf tmp.git &&
+ git ls-remote "$GIT_DAEMON_URL/interp.git" &&
GIT_OVERRIDE_VIRTUAL_HOST=LOCALHOST \
- git clone --bare "$GIT_DAEMON_URL/interp.git" tmp.git
+ git ls-remote "$GIT_DAEMON_URL/interp.git"
'
test_expect_success 'hostname cannot break out of directory' '
- rm -rf tmp.git &&
repo="$GIT_DAEMON_DOCUMENT_ROOT_PATH/../escape.git" &&
git init --bare "$repo" &&
git push "$repo" HEAD &&
>"$repo"/git-daemon-export-ok &&
test_must_fail \
env GIT_OVERRIDE_VIRTUAL_HOST=.. \
- git clone --bare "$GIT_DAEMON_URL/escape.git" tmp.git
+ git ls-remote "$GIT_DAEMON_URL/escape.git"
+'
+
+test_expect_success 'daemon log records all attributes' '
+ cat >expect <<-\EOF &&
+ Extended attribute "host": localhost
+ Extended attribute "protocol": version=1
+ EOF
+ >daemon.log &&
+ GIT_OVERRIDE_VIRTUAL_HOST=localhost \
+ git -c protocol.version=1 \
+ ls-remote "$GIT_DAEMON_URL/interp.git" &&
+ grep -i extended.attribute daemon.log | cut -d" " -f2- >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success FAKENC 'hostname interpolation works after LF-stripping' '
+ {
+ printf "git-upload-pack /interp.git\n\0host=localhost" | packetize
+ printf "0000"
+ } >input &&
+ fake_nc "$GIT_DAEMON_HOST_PORT" <input >output &&
+ depacketize <output >output.raw &&
+
+ # just pick out the value of master, which avoids any protocol
+ # particulars
+ perl -lne "print \$1 if m{^(\\S+) refs/heads/master}" <output.raw >actual &&
+ git -C "$repo" rev-parse master >expect &&
+ test_cmp expect actual
'
stop_git_daemon
diff --git a/t/t5572-pull-submodule.sh b/t/t5572-pull-submodule.sh
index 077eb07..321bd37 100755
--- a/t/t5572-pull-submodule.sh
+++ b/t/t5572-pull-submodule.sh
@@ -65,6 +65,38 @@
test_path_is_file super/sub/merge_strategy.t
'
+test_expect_success "submodule.recurse option triggers recursive pull" '
+ test_commit -C child merge_strategy_2 &&
+ git -C parent submodule update --remote &&
+ git -C parent add sub &&
+ git -C parent commit -m "update submodule" &&
+
+ git -C super -c submodule.recurse pull --no-rebase &&
+ test_path_is_file super/sub/merge_strategy_2.t
+'
+
+test_expect_success " --[no-]recurse-submodule and submodule.recurse" '
+ test_commit -C child merge_strategy_3 &&
+ git -C parent submodule update --remote &&
+ git -C parent add sub &&
+ git -C parent commit -m "update submodule" &&
+
+ git -C super -c submodule.recurse pull --no-recurse-submodules --no-rebase &&
+ test_path_is_missing super/sub/merge_strategy_3.t &&
+ git -C super -c submodule.recurse=false pull --recurse-submodules --no-rebase &&
+ test_path_is_file super/sub/merge_strategy_3.t &&
+
+ test_commit -C child merge_strategy_4 &&
+ git -C parent submodule update --remote &&
+ git -C parent add sub &&
+ git -C parent commit -m "update submodule" &&
+
+ git -C super -c submodule.recurse=false pull --no-recurse-submodules --no-rebase &&
+ test_path_is_missing super/sub/merge_strategy_4.t &&
+ git -C super -c submodule.recurse=true pull --recurse-submodules --no-rebase &&
+ test_path_is_file super/sub/merge_strategy_4.t
+'
+
test_expect_success 'recursive rebasing pull' '
# change upstream
test_commit -C child rebase_strategy &&
diff --git a/t/t5573-pull-verify-signatures.sh b/t/t5573-pull-verify-signatures.sh
new file mode 100755
index 0000000..9594e89
--- /dev/null
+++ b/t/t5573-pull-verify-signatures.sh
@@ -0,0 +1,81 @@
+#!/bin/sh
+
+test_description='pull signature verification tests'
+. ./test-lib.sh
+. "$TEST_DIRECTORY/lib-gpg.sh"
+
+test_expect_success GPG 'create repositories with signed commits' '
+ echo 1 >a && git add a &&
+ test_tick && git commit -m initial &&
+ git tag initial &&
+
+ git clone . signed &&
+ (
+ cd signed &&
+ echo 2 >b && git add b &&
+ test_tick && git commit -S -m "signed"
+ ) &&
+
+ git clone . unsigned &&
+ (
+ cd unsigned &&
+ echo 3 >c && git add c &&
+ test_tick && git commit -m "unsigned"
+ ) &&
+
+ git clone . bad &&
+ (
+ cd bad &&
+ echo 4 >d && git add d &&
+ test_tick && git commit -S -m "bad" &&
+ git cat-file commit HEAD >raw &&
+ sed -e "s/bad/forged bad/" raw >forged &&
+ git hash-object -w -t commit forged >forged.commit &&
+ git checkout $(cat forged.commit)
+ ) &&
+
+ git clone . untrusted &&
+ (
+ cd untrusted &&
+ echo 5 >e && git add e &&
+ test_tick && git commit -SB7227189 -m "untrusted"
+ )
+'
+
+test_expect_success GPG 'pull unsigned commit with --verify-signatures' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_must_fail git pull --ff-only --verify-signatures unsigned 2>pullerror &&
+ test_i18ngrep "does not have a GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit with bad signature with --verify-signatures' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_must_fail git pull --ff-only --verify-signatures bad 2>pullerror &&
+ test_i18ngrep "has a bad GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull commit with untrusted signature with --verify-signatures' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_must_fail git pull --ff-only --verify-signatures untrusted 2>pullerror &&
+ test_i18ngrep "has an untrusted GPG signature" pullerror
+'
+
+test_expect_success GPG 'pull signed commit with --verify-signatures' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ git pull --verify-signatures signed >pulloutput &&
+ test_i18ngrep "has a good GPG signature" pulloutput
+'
+
+test_expect_success GPG 'pull commit with bad signature without verification' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ git pull --ff-only bad 2>pullerror
+'
+
+test_expect_success GPG 'pull commit with bad signature with --no-verify-signatures' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures true &&
+ test_config pull.verifySignatures true &&
+ git pull --ff-only --no-verify-signatures bad 2>pullerror
+'
+
+test_done
diff --git a/t/t5580-clone-push-unc.sh b/t/t5580-clone-push-unc.sh
index b322c2f..ba548df 100755
--- a/t/t5580-clone-push-unc.sh
+++ b/t/t5580-clone-push-unc.sh
@@ -3,12 +3,18 @@
test_description='various Windows-only path tests'
. ./test-lib.sh
-if ! test_have_prereq MINGW; then
+if test_have_prereq CYGWIN
+then
+ alias winpwd='cygpath -aw .'
+elif test_have_prereq MINGW
+then
+ alias winpwd=pwd
+else
skip_all='skipping Windows-only path tests'
test_done
fi
-UNCPATH="$(pwd)"
+UNCPATH="$(winpwd)"
case "$UNCPATH" in
[A-Z]:*)
# Use administrative share e.g. \\localhost\C$\git-sdk-64\usr\src\git
@@ -45,8 +51,8 @@
test "$rev" = "$(git rev-parse --verify refs/heads/to-push)"
'
-test_expect_success 'remote nick cannot contain backslashes' '
- BACKSLASHED="$(pwd | tr / \\\\)" &&
+test_expect_success MINGW 'remote nick cannot contain backslashes' '
+ BACKSLASHED="$(winpwd | tr / \\\\)" &&
git ls-remote "$BACKSLASHED" >out 2>err &&
test_i18ngrep ! "unable to access" err
'
diff --git a/t/t5600-clone-fail-cleanup.sh b/t/t5600-clone-fail-cleanup.sh
index 4435693..4a1a912 100755
--- a/t/t5600-clone-fail-cleanup.sh
+++ b/t/t5600-clone-fail-cleanup.sh
@@ -7,46 +7,94 @@
This test covers the fact that if git clone fails, it should remove
the directory it created, to avoid the user having to manually
-remove the directory before attempting a clone again.'
+remove the directory before attempting a clone again.
+
+Unless the directory already exists, in which case we clean up only what we
+wrote.
+'
. ./test-lib.sh
-test_expect_success \
- 'clone of non-existent source should fail' \
- 'test_must_fail git clone foo bar'
+corrupt_repo () {
+ test_when_finished "rmdir foo/.git/objects.bak" &&
+ mkdir foo/.git/objects.bak/ &&
+ test_when_finished "mv foo/.git/objects.bak/* foo/.git/objects/" &&
+ mv foo/.git/objects/* foo/.git/objects.bak/
+}
-test_expect_success \
- 'failed clone should not leave a directory' \
- '! test -d bar'
+test_expect_success 'clone of non-existent source should fail' '
+ test_must_fail git clone foo bar
+'
-# Need a repo to clone
-test_create_repo foo
+test_expect_success 'failed clone should not leave a directory' '
+ test_path_is_missing bar
+'
-# clone doesn't like it if there is no HEAD. Is that a bug?
-(cd foo && touch file && git add file && git commit -m 'add file' >/dev/null 2>&1)
+test_expect_success 'create a repo to clone' '
+ test_create_repo foo
+'
+
+test_expect_success 'create objects in repo for later corruption' '
+ test_commit -C foo file
+'
# source repository given to git clone should be relative to the
# current path not to the target dir
-test_expect_success \
- 'clone of non-existent (relative to $PWD) source should fail' \
- 'test_must_fail git clone ../foo baz'
+test_expect_success 'clone of non-existent (relative to $PWD) source should fail' '
+ test_must_fail git clone ../foo baz
+'
-test_expect_success \
- 'clone should work now that source exists' \
- 'git clone foo bar'
+test_expect_success 'clone should work now that source exists' '
+ git clone foo bar
+'
-test_expect_success \
- 'successful clone must leave the directory' \
- 'test -d bar'
+test_expect_success 'successful clone must leave the directory' '
+ test_path_is_dir bar
+'
test_expect_success 'failed clone --separate-git-dir should not leave any directories' '
- mkdir foo/.git/objects.bak/ &&
- mv foo/.git/objects/* foo/.git/objects.bak/ &&
+ corrupt_repo &&
test_must_fail git clone --separate-git-dir gitdir foo worktree &&
- test_must_fail test -e gitdir &&
- test_must_fail test -e worktree &&
- mv foo/.git/objects.bak/* foo/.git/objects/ &&
- rmdir foo/.git/objects.bak
+ test_path_is_missing gitdir &&
+ test_path_is_missing worktree
+'
+
+test_expect_success 'failed clone into empty leaves directory (vanilla)' '
+ mkdir -p empty &&
+ corrupt_repo &&
+ test_must_fail git clone foo empty &&
+ test_dir_is_empty empty
+'
+
+test_expect_success 'failed clone into empty leaves directory (bare)' '
+ mkdir -p empty &&
+ corrupt_repo &&
+ test_must_fail git clone --bare foo empty &&
+ test_dir_is_empty empty
+'
+
+test_expect_success 'failed clone into empty leaves directory (separate)' '
+ mkdir -p empty-git empty-wt &&
+ corrupt_repo &&
+ test_must_fail git clone --separate-git-dir empty-git foo empty-wt &&
+ test_dir_is_empty empty-git &&
+ test_dir_is_empty empty-wt
+'
+
+test_expect_success 'failed clone into empty leaves directory (separate, git)' '
+ mkdir -p empty-git &&
+ corrupt_repo &&
+ test_must_fail git clone --separate-git-dir empty-git foo no-wt &&
+ test_dir_is_empty empty-git &&
+ test_path_is_missing no-wt
+'
+
+test_expect_success 'failed clone into empty leaves directory (separate, wt)' '
+ mkdir -p empty-wt &&
+ corrupt_repo &&
+ test_must_fail git clone --separate-git-dir no-git foo empty-wt &&
+ test_path_is_missing no-git &&
+ test_dir_is_empty empty-wt
'
test_done
diff --git a/t/t5601-clone.sh b/t/t5601-clone.sh
index 9c56f77..8c437bf 100755
--- a/t/t5601-clone.sh
+++ b/t/t5601-clone.sh
@@ -306,21 +306,21 @@
test_cmp fetch.expected fetch.actual
'
-setup_ssh_wrapper () {
- test_expect_success 'setup ssh wrapper' '
- cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \
- "$TRASH_DIRECTORY/ssh-wrapper$X" &&
- GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper$X" &&
- export GIT_SSH &&
- export TRASH_DIRECTORY &&
- >"$TRASH_DIRECTORY"/ssh-output
- '
-}
+test_expect_success 'set up ssh wrapper' '
+ cp "$GIT_BUILD_DIR/t/helper/test-fake-ssh$X" \
+ "$TRASH_DIRECTORY/ssh$X" &&
+ GIT_SSH="$TRASH_DIRECTORY/ssh$X" &&
+ export GIT_SSH &&
+ export TRASH_DIRECTORY &&
+ >"$TRASH_DIRECTORY"/ssh-output
+'
copy_ssh_wrapper_as () {
- cp "$TRASH_DIRECTORY/ssh-wrapper$X" "${1%$X}$X" &&
+ rm -f "${1%$X}$X" &&
+ cp "$TRASH_DIRECTORY/ssh$X" "${1%$X}$X" &&
+ test_when_finished "rm $(git rev-parse --sq-quote "${1%$X}$X")" &&
GIT_SSH="${1%$X}$X" &&
- export GIT_SSH
+ test_when_finished "GIT_SSH=\"\$TRASH_DIRECTORY/ssh\$X\""
}
expect_ssh () {
@@ -344,8 +344,6 @@
(cd "$TRASH_DIRECTORY" && test_cmp ssh-expect ssh-output)
}
-setup_ssh_wrapper
-
test_expect_success 'clone myhost:src uses ssh' '
git clone myhost:src ssh-clone &&
expect_ssh myhost src
@@ -362,9 +360,52 @@
expect_ssh "-p 123" myhost src
'
-test_expect_success 'uplink is not treated as putty' '
+test_expect_success 'OpenSSH variant passes -4' '
+ git clone -4 "[myhost:123]:src" ssh-ipv4-clone &&
+ expect_ssh "-4 -p 123" myhost src
+'
+
+test_expect_success 'variant can be overridden' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/putty" &&
+ git -c ssh.variant=putty clone -4 "[myhost:123]:src" ssh-putty-clone &&
+ expect_ssh "-4 -P 123" myhost src
+'
+
+test_expect_success 'variant=auto picks based on basename' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink" &&
+ git -c ssh.variant=auto clone -4 "[myhost:123]:src" ssh-auto-clone &&
+ expect_ssh "-4 -P 123" myhost src
+'
+
+test_expect_success 'simple does not support -4/-6' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/simple" &&
+ test_must_fail git clone -4 "myhost:src" ssh-4-clone-simple
+'
+
+test_expect_success 'simple does not support port' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/simple" &&
+ test_must_fail git clone "[myhost:123]:src" ssh-bracket-clone-simple
+'
+
+test_expect_success 'uplink is treated as simple' '
copy_ssh_wrapper_as "$TRASH_DIRECTORY/uplink" &&
- git clone "[myhost:123]:src" ssh-bracket-clone-uplink &&
+ test_must_fail git clone "[myhost:123]:src" ssh-bracket-clone-uplink &&
+ git clone "myhost:src" ssh-clone-uplink &&
+ expect_ssh myhost src
+'
+
+test_expect_success 'OpenSSH-like uplink is treated as ssh' '
+ write_script "$TRASH_DIRECTORY/uplink" <<-EOF &&
+ if test "\$1" = "-G"
+ then
+ exit 0
+ fi &&
+ exec "\$TRASH_DIRECTORY/ssh$X" "\$@"
+ EOF
+ test_when_finished "rm -f \"\$TRASH_DIRECTORY/uplink\"" &&
+ GIT_SSH="$TRASH_DIRECTORY/uplink" &&
+ test_when_finished "GIT_SSH=\"\$TRASH_DIRECTORY/ssh\$X\"" &&
+ git clone "[myhost:123]:src" ssh-bracket-clone-sshlike-uplink &&
expect_ssh "-p 123" myhost src
'
@@ -416,12 +457,14 @@
'
test_expect_success 'GIT_SSH_VARIANT overrides plink detection to plink' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink" &&
GIT_SSH_VARIANT=plink \
git clone "[myhost:123]:src" ssh-bracket-clone-variant-3 &&
expect_ssh "-P 123" myhost src
'
test_expect_success 'GIT_SSH_VARIANT overrides plink to tortoiseplink' '
+ copy_ssh_wrapper_as "$TRASH_DIRECTORY/plink" &&
GIT_SSH_VARIANT=tortoiseplink \
git clone "[myhost:123]:src" ssh-bracket-clone-variant-4 &&
expect_ssh "-batch -P 123" myhost src
@@ -433,9 +476,6 @@
git clone "[myhost:123]:src" sq-failure
'
-# Reset the GIT_SSH environment variable for clone tests.
-setup_ssh_wrapper
-
counter=0
# $1 url
# $2 none|host
@@ -571,4 +611,21 @@
git -C replay.git index-pack -v --stdin <tmp.pack
'
+hex2oct () {
+ perl -ne 'printf "\\%03o", hex for /../g'
+}
+
+test_expect_success 'clone on case-insensitive fs' '
+ git init icasefs &&
+ (
+ cd icasefs
+ o=$(git hash-object -w --stdin </dev/null | hex2oct) &&
+ t=$(printf "100644 X\0${o}100644 x\0${o}" |
+ git hash-object -w -t tree --stdin) &&
+ c=$(git commit-tree -m bogus $t) &&
+ git update-ref refs/heads/bogus $c &&
+ git clone -b bogus . bogus
+ )
+'
+
test_done
diff --git a/t/t5603-clone-dirname.sh b/t/t5603-clone-dirname.sh
index d5af758..13b5e5e 100755
--- a/t/t5603-clone-dirname.sh
+++ b/t/t5603-clone-dirname.sh
@@ -11,7 +11,9 @@
git upload-pack "$TRASH_DIRECTORY"
EOF
GIT_SSH="$TRASH_DIRECTORY/ssh-wrapper" &&
+ GIT_SSH_VARIANT=ssh &&
export GIT_SSH &&
+ export GIT_SSH_VARIANT &&
export TRASH_DIRECTORY
'
diff --git a/t/t5615-alternate-env.sh b/t/t5615-alternate-env.sh
index d2d883f..b4905b8 100755
--- a/t/t5615-alternate-env.sh
+++ b/t/t5615-alternate-env.sh
@@ -7,9 +7,9 @@
alt=$1; shift
while read obj expect
do
- echo "$obj" >&3 &&
- echo "$obj $expect" >&4
- done 3>input 4>expect &&
+ echo "$obj" >&5 &&
+ echo "$obj $expect" >&6
+ done 5>input 6>expect &&
GIT_ALTERNATE_OBJECT_DIRECTORIES=$alt \
git "$@" cat-file --batch-check='%(objectname) %(objecttype)' \
<input >actual &&
diff --git a/t/t5700-protocol-v1.sh b/t/t5700-protocol-v1.sh
new file mode 100755
index 0000000..ba86a44
--- /dev/null
+++ b/t/t5700-protocol-v1.sh
@@ -0,0 +1,294 @@
+#!/bin/sh
+
+test_description='test git wire-protocol transition'
+
+TEST_NO_CREATE_REPO=1
+
+. ./test-lib.sh
+
+# Test protocol v1 with 'git://' transport
+#
+. "$TEST_DIRECTORY"/lib-git-daemon.sh
+start_git_daemon --export-all --enable=receive-pack
+daemon_parent=$GIT_DAEMON_DOCUMENT_ROOT_PATH/parent
+
+test_expect_success 'create repo to be served by git-daemon' '
+ git init "$daemon_parent" &&
+ test_commit -C "$daemon_parent" one
+'
+
+test_expect_success 'clone with git:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+ clone "$GIT_DAEMON_URL/parent" daemon_child 2>log &&
+
+ git -C daemon_child log -1 --format=%s >actual &&
+ git -C "$daemon_parent" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Client requested to use protocol v1
+ grep "clone> .*\\\0\\\0version=1\\\0$" log &&
+ # Server responded using protocol v1
+ grep "clone< version 1" log
+'
+
+test_expect_success 'fetch with git:// using protocol v1' '
+ test_commit -C "$daemon_parent" two &&
+
+ GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+ fetch 2>log &&
+
+ git -C daemon_child log -1 --format=%s origin/master >actual &&
+ git -C "$daemon_parent" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Client requested to use protocol v1
+ grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+ # Server responded using protocol v1
+ grep "fetch< version 1" log
+'
+
+test_expect_success 'pull with git:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+ pull 2>log &&
+
+ git -C daemon_child log -1 --format=%s >actual &&
+ git -C "$daemon_parent" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Client requested to use protocol v1
+ grep "fetch> .*\\\0\\\0version=1\\\0$" log &&
+ # Server responded using protocol v1
+ grep "fetch< version 1" log
+'
+
+test_expect_success 'push with git:// using protocol v1' '
+ test_commit -C daemon_child three &&
+
+ # Push to another branch, as the target repository has the
+ # master branch checked out and we cannot push into it.
+ GIT_TRACE_PACKET=1 git -C daemon_child -c protocol.version=1 \
+ push origin HEAD:client_branch 2>log &&
+
+ git -C daemon_child log -1 --format=%s >actual &&
+ git -C "$daemon_parent" log -1 --format=%s client_branch >expect &&
+ test_cmp expect actual &&
+
+ # Client requested to use protocol v1
+ grep "push> .*\\\0\\\0version=1\\\0$" log &&
+ # Server responded using protocol v1
+ grep "push< version 1" log
+'
+
+stop_git_daemon
+
+# Test protocol v1 with 'file://' transport
+#
+test_expect_success 'create repo to be served by file:// transport' '
+ git init file_parent &&
+ test_commit -C file_parent one
+'
+
+test_expect_success 'clone with file:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+ clone "file://$(pwd)/file_parent" file_child 2>log &&
+
+ git -C file_child log -1 --format=%s >actual &&
+ git -C file_parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "clone< version 1" log
+'
+
+test_expect_success 'fetch with file:// using protocol v1' '
+ test_commit -C file_parent two &&
+
+ GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+ fetch 2>log &&
+
+ git -C file_child log -1 --format=%s origin/master >actual &&
+ git -C file_parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "fetch< version 1" log
+'
+
+test_expect_success 'pull with file:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+ pull 2>log &&
+
+ git -C file_child log -1 --format=%s >actual &&
+ git -C file_parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "fetch< version 1" log
+'
+
+test_expect_success 'push with file:// using protocol v1' '
+ test_commit -C file_child three &&
+
+ # Push to another branch, as the target repository has the
+ # master branch checked out and we cannot push into it.
+ GIT_TRACE_PACKET=1 git -C file_child -c protocol.version=1 \
+ push origin HEAD:client_branch 2>log &&
+
+ git -C file_child log -1 --format=%s >actual &&
+ git -C file_parent log -1 --format=%s client_branch >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "push< version 1" log
+'
+
+# Test protocol v1 with 'ssh://' transport
+#
+test_expect_success 'setup ssh wrapper' '
+ GIT_SSH="$GIT_BUILD_DIR/t/helper/test-fake-ssh" &&
+ export GIT_SSH &&
+ GIT_SSH_VARIANT=ssh &&
+ export GIT_SSH_VARIANT &&
+ export TRASH_DIRECTORY &&
+ >"$TRASH_DIRECTORY"/ssh-output
+'
+
+expect_ssh () {
+ test_when_finished '(cd "$TRASH_DIRECTORY" && rm -f ssh-expect && >ssh-output)' &&
+ echo "ssh: -o SendEnv=GIT_PROTOCOL myhost $1 '$PWD/ssh_parent'" >"$TRASH_DIRECTORY/ssh-expect" &&
+ (cd "$TRASH_DIRECTORY" && test_cmp ssh-expect ssh-output)
+}
+
+test_expect_success 'create repo to be served by ssh:// transport' '
+ git init ssh_parent &&
+ test_commit -C ssh_parent one
+'
+
+test_expect_success 'clone with ssh:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -c protocol.version=1 \
+ clone "ssh://myhost:$(pwd)/ssh_parent" ssh_child 2>log &&
+ expect_ssh git-upload-pack &&
+
+ git -C ssh_child log -1 --format=%s >actual &&
+ git -C ssh_parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "clone< version 1" log
+'
+
+test_expect_success 'fetch with ssh:// using protocol v1' '
+ test_commit -C ssh_parent two &&
+
+ GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+ fetch 2>log &&
+ expect_ssh git-upload-pack &&
+
+ git -C ssh_child log -1 --format=%s origin/master >actual &&
+ git -C ssh_parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "fetch< version 1" log
+'
+
+test_expect_success 'pull with ssh:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+ pull 2>log &&
+ expect_ssh git-upload-pack &&
+
+ git -C ssh_child log -1 --format=%s >actual &&
+ git -C ssh_parent log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "fetch< version 1" log
+'
+
+test_expect_success 'push with ssh:// using protocol v1' '
+ test_commit -C ssh_child three &&
+
+ # Push to another branch, as the target repository has the
+ # master branch checked out and we cannot push into it.
+ GIT_TRACE_PACKET=1 git -C ssh_child -c protocol.version=1 \
+ push origin HEAD:client_branch 2>log &&
+ expect_ssh git-receive-pack &&
+
+ git -C ssh_child log -1 --format=%s >actual &&
+ git -C ssh_parent log -1 --format=%s client_branch >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "push< version 1" log
+'
+
+# Test protocol v1 with 'http://' transport
+#
+. "$TEST_DIRECTORY"/lib-httpd.sh
+start_httpd
+
+test_expect_success 'create repo to be served by http:// transport' '
+ git init "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" config http.receivepack true &&
+ test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" one
+'
+
+test_expect_success 'clone with http:// using protocol v1' '
+ GIT_TRACE_PACKET=1 GIT_TRACE_CURL=1 git -c protocol.version=1 \
+ clone "$HTTPD_URL/smart/http_parent" http_child 2>log &&
+
+ git -C http_child log -1 --format=%s >actual &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Client requested to use protocol v1
+ grep "Git-Protocol: version=1" log &&
+ # Server responded using protocol v1
+ grep "git< version 1" log
+'
+
+test_expect_success 'fetch with http:// using protocol v1' '
+ test_commit -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" two &&
+
+ GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
+ fetch 2>log &&
+
+ git -C http_child log -1 --format=%s origin/master >actual &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "git< version 1" log
+'
+
+test_expect_success 'pull with http:// using protocol v1' '
+ GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
+ pull 2>log &&
+
+ git -C http_child log -1 --format=%s >actual &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "git< version 1" log
+'
+
+test_expect_success 'push with http:// using protocol v1' '
+ test_commit -C http_child three &&
+
+ # Push to another branch, as the target repository has the
+ # master branch checked out and we cannot push into it.
+ GIT_TRACE_PACKET=1 git -C http_child -c protocol.version=1 \
+ push origin HEAD:client_branch && #2>log &&
+
+ git -C http_child log -1 --format=%s >actual &&
+ git -C "$HTTPD_DOCUMENT_ROOT_PATH/http_parent" log -1 --format=%s client_branch >expect &&
+ test_cmp expect actual &&
+
+ # Server responded using protocol v1
+ grep "git< version 1" log
+'
+
+stop_httpd
+
+test_done
diff --git a/t/t5812-proto-disable-http.sh b/t/t5812-proto-disable-http.sh
index d911afd..872788a 100755
--- a/t/t5812-proto-disable-http.sh
+++ b/t/t5812-proto-disable-http.sh
@@ -20,10 +20,7 @@
test_must_fail env GIT_ALLOW_PROTOCOL=http:https \
GIT_SMART_HTTP=0 \
git clone "$HTTPD_URL/ftp-redir/repo.git" 2>stderr &&
- {
- test_i18ngrep "ftp.*disabled" stderr ||
- test_i18ngrep "your curl version is too old"
- }
+ test_i18ngrep -E "(ftp.*disabled|your curl version is too old)" stderr
'
test_expect_success 'curl limits redirects' '
diff --git a/t/t6007-rev-list-cherry-pick-file.sh b/t/t6007-rev-list-cherry-pick-file.sh
index 2959745..f026837 100755
--- a/t/t6007-rev-list-cherry-pick-file.sh
+++ b/t/t6007-rev-list-cherry-pick-file.sh
@@ -57,7 +57,7 @@
git rev-list --left-right B...C > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
test_expect_success '--count' '
@@ -77,14 +77,14 @@
git rev-list --left-right --cherry-pick B...C -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ 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/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -96,14 +96,14 @@
git rev-list --left-right --cherry-pick F...E -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ 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" \
<actual >actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -115,7 +115,7 @@
git rev-list --left-right --cherry-pick F...E -- bar >actual &&
git name-rev --stdin --name-only --refs="*tags/F" \
<actual >actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -127,14 +127,14 @@
git rev-list --left-right --cherry-pick F...E -- bar >actual &&
git name-rev --stdin --name-only --refs="*tags/*" --exclude="*E" \
<actual >actual.named &&
- test_cmp actual.named expect
+ 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" \
<expect >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -148,7 +148,7 @@
git rev-list --cherry-mark F...E -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -162,7 +162,7 @@
git rev-list --cherry-mark --left-right F...E -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -173,14 +173,14 @@
git rev-list --cherry-pick --right-only F...E -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ 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/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -192,7 +192,7 @@
git rev-list --cherry F...E -- bar > actual &&
git name-rev --stdin --name-only --refs="*tags/*" \
< actual > actual.named &&
- test_cmp actual.named expect
+ test_cmp expect actual.named
'
cat >expect <<EOF
@@ -201,7 +201,7 @@
test_expect_success '--cherry --count' '
git rev-list --cherry --count F...E -- bar > actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -210,7 +210,7 @@
test_expect_success '--cherry-mark --count' '
git rev-list --cherry-mark --count F...E -- bar > actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
cat >expect <<EOF
@@ -219,7 +219,7 @@
test_expect_success '--cherry-mark --left-right --count' '
git rev-list --cherry-mark --left-right --count F...E -- bar > actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
test_expect_success '--cherry-pick with independent, but identical branches' '
diff --git a/t/t6013-rev-list-reverse-parents.sh b/t/t6013-rev-list-reverse-parents.sh
index 59fc2f0..89458d3 100755
--- a/t/t6013-rev-list-reverse-parents.sh
+++ b/t/t6013-rev-list-reverse-parents.sh
@@ -28,7 +28,7 @@
perl -e "print reverse <>" > expected &&
git rev-list --reverse --parents --full-history master -- foo \
> actual &&
- test_cmp actual expected
+ test_cmp expected actual
'
test_expect_success '--boundary does too' '
@@ -36,7 +36,7 @@
perl -e "print reverse <>" > expected &&
git rev-list --boundary --reverse --parents --full-history \
master ^root -- foo > actual &&
- test_cmp actual expected
+ test_cmp expected actual
'
test_done
diff --git a/t/t6022-merge-rename.sh b/t/t6022-merge-rename.sh
index 05ebba7..c01f721 100755
--- a/t/t6022-merge-rename.sh
+++ b/t/t6022-merge-rename.sh
@@ -242,10 +242,12 @@
rm -f A M N &&
git reset --hard &&
git checkout change+rename &&
- GIT_MERGE_VERBOSITY=3 git merge change | test_i18ngrep "^Skipped B" &&
+ GIT_MERGE_VERBOSITY=3 git merge change >out &&
+ test_i18ngrep "^Skipped B" out &&
git reset --hard HEAD^ &&
git checkout change &&
- GIT_MERGE_VERBOSITY=3 git merge change+rename | test_i18ngrep "^Skipped B"
+ GIT_MERGE_VERBOSITY=3 git merge change+rename >out &&
+ test_i18ngrep "^Skipped B" out
'
test_expect_success 'setup for rename + d/f conflicts' '
diff --git a/t/t6030-bisect-porcelain.sh b/t/t6030-bisect-porcelain.sh
index 8c2c6ea..f84ff94 100755
--- a/t/t6030-bisect-porcelain.sh
+++ b/t/t6030-bisect-porcelain.sh
@@ -894,4 +894,21 @@
test_cmp expected actual
'
+test_expect_success 'git bisect reset cleans bisection state properly' '
+ git bisect reset &&
+ git bisect start &&
+ git bisect good $HASH1 &&
+ git bisect bad $HASH4 &&
+ git bisect reset &&
+ test -z "$(git for-each-ref "refs/bisect/*")" &&
+ test_path_is_missing "$GIT_DIR/BISECT_EXPECTED_REV" &&
+ test_path_is_missing "$GIT_DIR/BISECT_ANCESTORS_OK" &&
+ test_path_is_missing "$GIT_DIR/BISECT_LOG" &&
+ test_path_is_missing "$GIT_DIR/BISECT_RUN" &&
+ test_path_is_missing "$GIT_DIR/BISECT_TERMS" &&
+ test_path_is_missing "$GIT_DIR/head-name" &&
+ test_path_is_missing "$GIT_DIR/BISECT_HEAD" &&
+ test_path_is_missing "$GIT_DIR/BISECT_START"
+'
+
test_done
diff --git a/t/t6037-merge-ours-theirs.sh b/t/t6037-merge-ours-theirs.sh
index 3889eca..0aebc6c 100755
--- a/t/t6037-merge-ours-theirs.sh
+++ b/t/t6037-merge-ours-theirs.sh
@@ -73,4 +73,36 @@
git reset --hard master && test_must_fail git pull -s recursive -X bork . side
'
+test_expect_success SYMLINKS 'symlink with -Xours/-Xtheirs' '
+ git reset --hard master &&
+ git checkout -b two master &&
+ ln -s target-zero link &&
+ git add link &&
+ git commit -m "add link pointing to zero" &&
+
+ ln -f -s target-two link &&
+ git commit -m "add link pointing to two" link &&
+
+ git checkout -b one HEAD^ &&
+ ln -f -s target-one link &&
+ git commit -m "add link pointing to one" link &&
+
+ # we expect symbolic links not to resolve automatically, of course
+ git checkout one^0 &&
+ test_must_fail git merge -s recursive two &&
+
+ # favor theirs to resolve to target-two?
+ git reset --hard &&
+ git checkout one^0 &&
+ git merge -s recursive -X theirs two &&
+ git diff --exit-code two HEAD link &&
+
+ # favor ours to resolve to target-one?
+ git reset --hard &&
+ git checkout one^0 &&
+ git merge -s recursive -X ours two &&
+ git diff --exit-code one HEAD link
+
+'
+
test_done
diff --git a/t/t6040-tracking-info.sh b/t/t6040-tracking-info.sh
index 97a0765..8f17fd9 100755
--- a/t/t6040-tracking-info.sh
+++ b/t/t6040-tracking-info.sh
@@ -100,7 +100,7 @@
(
cd test && git checkout b6
) >actual &&
- test_i18ngrep "Your branch is up-to-date with .origin/master" actual
+ test_i18ngrep "Your branch is up to date with .origin/master" actual
'
test_expect_success 'status (diverged from upstream)' '
@@ -130,7 +130,7 @@
# reports nothing to commit
test_must_fail git commit --dry-run
) >actual &&
- test_i18ngrep "Your branch is up-to-date with .origin/master" actual
+ test_i18ngrep "Your branch is up to date with .origin/master" actual
'
cat >expect <<\EOF
@@ -188,35 +188,29 @@
test_must_fail git checkout heavytrack
'
-test_expect_success 'setup tracking with branch --set-upstream on existing branch' '
+test_expect_success '--set-upstream-to does not change branch' '
git branch from-master master &&
- test_must_fail git config branch.from-master.merge > actual &&
- git branch --set-upstream from-master master &&
- git config branch.from-master.merge > actual &&
- grep -q "^refs/heads/master$" actual
-'
-
-test_expect_success '--set-upstream does not change branch' '
+ git branch --set-upstream-to master from-master &&
git branch from-master2 master &&
test_must_fail git config branch.from-master2.merge > actual &&
git rev-list from-master2 &&
git update-ref refs/heads/from-master2 from-master2^ &&
git rev-parse from-master2 >expect2 &&
- git branch --set-upstream from-master2 master &&
+ git branch --set-upstream-to master from-master2 &&
git config branch.from-master.merge > actual &&
git rev-parse from-master2 >actual2 &&
grep -q "^refs/heads/master$" actual &&
cmp expect2 actual2
'
-test_expect_success '--set-upstream @{-1}' '
- git checkout from-master &&
+test_expect_success '--set-upstream-to @{-1}' '
+ git checkout follower &&
git checkout from-master2 &&
git config branch.from-master2.merge > expect2 &&
- git branch --set-upstream @{-1} follower &&
+ git branch --set-upstream-to @{-1} from-master &&
git config branch.from-master.merge > actual &&
git config branch.from-master2.merge > actual2 &&
- git branch --set-upstream from-master follower &&
+ git branch --set-upstream-to follower from-master &&
git config branch.from-master.merge > expect &&
test_cmp expect2 actual2 &&
test_cmp expect actual
diff --git a/t/t6044-merge-unrelated-index-changes.sh b/t/t6044-merge-unrelated-index-changes.sh
index 0102348..23b86fb 100755
--- a/t/t6044-merge-unrelated-index-changes.sh
+++ b/t/t6044-merge-unrelated-index-changes.sh
@@ -6,18 +6,21 @@
# Testcase for some simple merges
# A
-# o-----o B
+# o-------o B
# \
-# \---o C
+# \-----o C
# \
-# \-o D
+# \---o D
# \
-# o E
+# \-o E
+# \
+# o F
# Commit A: some file a
# Commit B: adds file b, modifies end of a
# Commit C: adds file c
# Commit D: adds file d, modifies beginning of a
# Commit E: renames a->subdir/a, adds subdir/e
+# Commit F: empty commit
test_expect_success 'setup trivial merges' '
test_seq 1 10 >a &&
@@ -29,6 +32,7 @@
git branch C &&
git branch D &&
git branch E &&
+ git branch F &&
git checkout B &&
echo b >b &&
@@ -52,7 +56,10 @@
git mv a subdir/a &&
echo e >subdir/e &&
git add subdir &&
- test_tick && git commit -m E
+ test_tick && git commit -m E &&
+
+ git checkout F &&
+ test_tick && git commit --allow-empty -m F
'
test_expect_success 'ff update' '
@@ -105,6 +112,15 @@
test_must_fail git merge -s recursive C^0
'
+test_expect_success 'recursive, when merge branch matches merge base' '
+ git reset --hard &&
+ git checkout B^0 &&
+
+ touch random_file && git add random_file &&
+
+ test_must_fail git merge -s recursive F^0
+'
+
test_expect_success 'octopus, unrelated file touched' '
git reset --hard &&
git checkout B^0 &&
diff --git a/t/t6100-rev-list-in-order.sh b/t/t6100-rev-list-in-order.sh
new file mode 100755
index 0000000..b2bb0a7
--- /dev/null
+++ b/t/t6100-rev-list-in-order.sh
@@ -0,0 +1,77 @@
+#!/bin/sh
+
+test_description='rev-list testing in-commit-order'
+
+. ./test-lib.sh
+
+test_expect_success 'setup a commit history with trees, blobs' '
+ for x in one two three four
+ do
+ echo $x >$x &&
+ git add $x &&
+ git commit -m "add file $x" ||
+ return 1
+ done &&
+ for x in four three
+ do
+ git rm $x &&
+ git commit -m "remove $x" ||
+ return 1
+ done
+'
+
+test_expect_success 'rev-list --in-commit-order' '
+ git rev-list --in-commit-order --objects HEAD >actual.raw &&
+ cut -c 1-40 >actual <actual.raw &&
+
+ git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+ HEAD^{commit}
+ HEAD^{tree}
+ HEAD^{tree}:one
+ HEAD^{tree}:two
+ HEAD~1^{commit}
+ HEAD~1^{tree}
+ HEAD~1^{tree}:three
+ HEAD~2^{commit}
+ HEAD~2^{tree}
+ HEAD~2^{tree}:four
+ HEAD~3^{commit}
+ # HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+ HEAD~4^{commit}
+ # HEAD~4^{tree} skipped, same as HEAD^{tree}
+ HEAD~5^{commit}
+ HEAD~5^{tree}
+ EOF
+ grep -v "#" >expect <expect.raw &&
+
+ test_cmp expect actual
+'
+
+test_expect_success 'rev-list lists blobs and trees after commits' '
+ git rev-list --objects HEAD >actual.raw &&
+ cut -c 1-40 >actual <actual.raw &&
+
+ git cat-file --batch-check="%(objectname)" >expect.raw <<-\EOF &&
+ HEAD^{commit}
+ HEAD~1^{commit}
+ HEAD~2^{commit}
+ HEAD~3^{commit}
+ HEAD~4^{commit}
+ HEAD~5^{commit}
+ HEAD^{tree}
+ HEAD^{tree}:one
+ HEAD^{tree}:two
+ HEAD~1^{tree}
+ HEAD~1^{tree}:three
+ HEAD~2^{tree}
+ HEAD~2^{tree}:four
+ # HEAD~3^{tree} skipped, same as HEAD~1^{tree}
+ # HEAD~4^{tree} skipped, same as HEAD^{tree}
+ HEAD~5^{tree}
+ EOF
+ grep -v "#" >expect <expect.raw &&
+
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t6112-rev-list-filters-objects.sh b/t/t6112-rev-list-filters-objects.sh
new file mode 100755
index 0000000..0a37dd5
--- /dev/null
+++ b/t/t6112-rev-list-filters-objects.sh
@@ -0,0 +1,225 @@
+#!/bin/sh
+
+test_description='git rev-list using object filtering'
+
+. ./test-lib.sh
+
+# Test the 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"
+ done
+'
+
+test_expect_success 'verify blob:none omits all 5 blobs' '
+ git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r1 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:none \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify emitted+omitted == all' '
+ git -C r1 rev-list HEAD --objects \
+ | awk -f print_1.awk \
+ | sort >expected &&
+ git -C r1 rev-list HEAD --objects --filter-print-omitted --filter=blob:none \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+
+# Test blob:limit=<n>[kmg] filter.
+# We boundary test around the size parameter. The filter is strictly less than
+# the value, so size 500 and 1000 should have the same results, but 1001 should
+# filter more.
+
+test_expect_success 'setup r2' '
+ 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"
+ done
+'
+
+test_expect_success 'verify blob:limit=500 omits all blobs' '
+ git -C r2 ls-files -s large.1000 large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=500 \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify emitted+omitted == all' '
+ git -C r2 rev-list HEAD --objects \
+ | awk -f print_1.awk \
+ | sort >expected &&
+ git -C r2 rev-list HEAD --objects --filter-print-omitted --filter=blob:limit=500 \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=1000' '
+ git -C r2 ls-files -s large.1000 large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1000 \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=1001' '
+ git -C r2 ls-files -s large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1001 \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=1k' '
+ git -C r2 ls-files -s large.10000 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1k \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify blob:limit=1m' '
+ cat </dev/null >expected &&
+ git -C r2 rev-list HEAD --quiet --objects --filter-print-omitted --filter=blob:limit=1m \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Test sparse:path=<path> filter.
+# Use a local file containing a sparse-checkout specification to filter
+# out blobs not required for the corresponding sparse-checkout. We do not
+# require sparse-checkout to actually be enabled.
+
+test_expect_success 'setup r3' '
+ git init r3 &&
+ 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
+ done &&
+ git -C r3 commit -m "sparse" &&
+ echo dir1/ >pattern1 &&
+ echo sparse1 >pattern2
+'
+
+test_expect_success 'verify sparse:path=pattern1 omits top-level files' '
+ git -C r3 ls-files -s sparse1 sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern1 \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify sparse:path=pattern2 omits both sparse2 files' '
+ git -C r3 ls-files -s sparse2 dir1/sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:path=../pattern2 \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Test sparse:oid=<oid-ish> filter.
+# Like sparse:path, but we get the sparse-checkout specification from
+# a blob rather than a file on disk.
+
+test_expect_success 'setup r3 part 2' '
+ echo dir1/ >r3/pattern &&
+ git -C r3 add pattern &&
+ git -C r3 commit -m "pattern"
+'
+
+test_expect_success 'verify sparse:oid=OID omits top-level files' '
+ git -C r3 ls-files -s pattern sparse1 sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ oid=$(git -C r3 ls-files -s pattern | awk -f print_2.awk) &&
+ git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=$oid \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'verify sparse:oid=oid-ish omits top-level files' '
+ git -C r3 ls-files -s pattern sparse1 sparse2 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ git -C r3 rev-list HEAD --quiet --objects --filter-print-omitted --filter=sparse:oid=master:pattern \
+ | awk -f print_1.awk \
+ | sed "s/~//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+# Delete some loose objects and use rev-list, but WITHOUT any filtering.
+# This models previously omitted objects that we did not receive.
+
+test_expect_success 'rev-list W/ --missing=print' '
+ git -C r1 ls-files -s file.1 file.2 file.3 file.4 file.5 \
+ | awk -f print_2.awk \
+ | sort >expected &&
+ for id in `cat expected | sed "s|..|&/|"`
+ do
+ rm r1/.git/objects/$id
+ done &&
+ git -C r1 rev-list --quiet HEAD --missing=print --objects \
+ | awk -f print_1.awk \
+ | sed "s/?//" \
+ | sort >observed &&
+ test_cmp observed expected
+'
+
+test_expect_success 'rev-list W/O --missing fails' '
+ test_must_fail git -C r1 rev-list --quiet --objects HEAD
+'
+
+test_expect_success 'rev-list W/ missing=allow-any' '
+ git -C r1 rev-list --quiet --missing=allow-any --objects HEAD
+'
+
+test_done
diff --git a/t/t6120-describe.sh b/t/t6120-describe.sh
index 25110ea..a5d9015 100755
--- a/t/t6120-describe.sh
+++ b/t/t6120-describe.sh
@@ -122,7 +122,7 @@
'
: >err.expect
-check_describe A --all A^0
+check_describe tags/A --all A^0
test_expect_success 'no warning was displayed for A' '
test_cmp err.expect err.actual
'
@@ -190,6 +190,33 @@
check_describe "test1-lightweight-*" --long --tags --match="test3-*" --match="test1-*" HEAD
+test_expect_success 'set-up branches' '
+ git branch branch_A A &&
+ git branch branch_C c &&
+ git update-ref refs/remotes/origin/remote_branch_A "A^{commit}" &&
+ git update-ref refs/remotes/origin/remote_branch_C "c^{commit}" &&
+ git update-ref refs/original/original_branch_A test-annotated~2
+'
+
+check_describe "heads/branch_A*" --all --match="branch_*" --exclude="branch_C" HEAD
+
+check_describe "remotes/origin/remote_branch_A*" --all --match="origin/remote_branch_*" --exclude="origin/remote_branch_C" HEAD
+
+check_describe "original/original_branch_A*" --all test-annotated~1
+
+test_expect_success '--match does not work for other types' '
+ test_must_fail git describe --all --match="*original_branch_*" test-annotated~1
+'
+
+test_expect_success '--exclude does not work for other types' '
+ R=$(git describe --all --exclude="any_pattern_even_not_matching" test-annotated~1) &&
+ case "$R" in
+ *original_branch_A*) echo "fail: Found unknown reference $R with --exclude"
+ false;;
+ *) echo ok: Found some known type;;
+ esac
+'
+
test_expect_success 'name-rev with exact tags' '
echo A >expect &&
tag_object=$(git rev-parse refs/tags/A) &&
@@ -202,6 +229,31 @@
test_cmp expect actual
'
+test_expect_success 'name-rev --all' '
+ >expect.unsorted &&
+ for rev in $(git rev-list --all)
+ do
+ git name-rev $rev >>expect.unsorted
+ done &&
+ sort <expect.unsorted >expect &&
+ git name-rev --all >actual.unsorted &&
+ sort <actual.unsorted >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success 'name-rev --stdin' '
+ >expect.unsorted &&
+ for rev in $(git rev-list --all)
+ do
+ name=$(git name-rev --name-only $rev) &&
+ echo "$rev ($name)" >>expect.unsorted
+ done &&
+ sort <expect.unsorted >expect &&
+ git rev-list --all | git name-rev --stdin >actual.unsorted &&
+ sort <actual.unsorted >actual &&
+ test_cmp expect actual
+'
+
test_expect_success 'describe --contains with the exact tags' '
echo "A^0" >expect &&
tag_object=$(git rev-parse refs/tags/A) &&
@@ -252,9 +304,78 @@
mv .git/modules/sub1/ .git/modules/sub_moved &&
test_must_fail git describe --dirty
'
-test_expect_success 'describe ignoring a borken submodule' '
+test_expect_success 'describe ignoring a broken submodule' '
git describe --broken >out &&
+ test_when_finished "mv .git/modules/sub_moved .git/modules/sub1" &&
grep broken out
'
+test_expect_success 'describe a blob at a directly tagged commit' '
+ echo "make it a unique blob" >file &&
+ git add file && git commit -m "content in file" &&
+ git tag -a -m "latest annotated tag" unique-file &&
+ git describe HEAD:file >actual &&
+ echo "unique-file:file" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'describe a blob with its first introduction' '
+ git commit --allow-empty -m "empty commit" &&
+ git rm file &&
+ git commit -m "delete blob" &&
+ git revert HEAD &&
+ git commit --allow-empty -m "empty commit" &&
+ git describe HEAD:file >actual &&
+ echo "unique-file:file" >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success 'describe directly tagged blob' '
+ git tag test-blob unique-file:file &&
+ git describe test-blob >actual &&
+ echo "unique-file:file" >expect &&
+ # suboptimal: we rather want to see "test-blob"
+ test_cmp expect actual
+'
+
+test_expect_success 'describe tag object' '
+ git tag test-blob-1 -a -m msg unique-file:file &&
+ test_must_fail git describe test-blob-1 2>actual &&
+ test_i18ngrep "fatal: test-blob-1 is neither a commit nor blob" actual
+'
+
+test_expect_failure ULIMIT_STACK_SIZE 'name-rev works in a deep repo' '
+ i=1 &&
+ while test $i -lt 8000
+ do
+ echo "commit refs/heads/master
+committer A U Thor <author@example.com> $((1000000000 + $i * 100)) +0200
+data <<EOF
+commit #$i
+EOF"
+ test $i = 1 && echo "from refs/heads/master^0"
+ i=$(($i + 1))
+ done | git fast-import &&
+ git checkout master &&
+ git tag far-far-away HEAD^ &&
+ echo "HEAD~4000 tags/far-far-away~3999" >expect &&
+ git name-rev HEAD~4000 >actual &&
+ test_cmp expect actual &&
+ run_with_limited_stack git name-rev HEAD~4000 >actual &&
+ test_cmp expect actual
+'
+
+test_expect_success ULIMIT_STACK_SIZE 'describe works in a deep repo' '
+ git tag -f far-far-away HEAD~7999 &&
+ echo "far-far-away" >expect &&
+ git describe --tags --abbrev=0 HEAD~4000 >actual &&
+ test_cmp expect actual &&
+ run_with_limited_stack git describe --tags --abbrev=0 HEAD~4000 >actual &&
+ test_cmp expect actual
+'
+
+check_describe tags/A --all A
+check_describe tags/c --all c
+check_describe heads/branch_A --all --match='branch_*' branch_A
+
test_done
diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
index d0ad902..c128dfc 100755
--- a/t/t6300-for-each-ref.sh
+++ b/t/t6300-for-each-ref.sh
@@ -610,18 +610,104 @@
cat >trailers <<EOF
Reviewed-by: A U Thor <author@example.com>
Signed-off-by: A U Thor <author@example.com>
+[ v2 updated patch description ]
+Acked-by: A U Thor
+ <author@example.com>
EOF
-test_expect_success 'basic atom: head contents:trailers' '
+unfold () {
+ perl -0pe 's/\n\s+/ /g'
+}
+
+test_expect_success 'set up trailers for next test' '
echo "Some contents" > two &&
git add two &&
- git commit -F - <<-EOF &&
+ git commit -F - <<-EOF
trailers: this commit message has trailers
Some message contents
$(cat trailers)
EOF
+'
+
+test_expect_success '%(trailers:unfold) unfolds trailers' '
+ git for-each-ref --format="%(trailers:unfold)" refs/heads/master >actual &&
+ {
+ unfold <trailers
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:only) shows only "key: value" trailers' '
+ git for-each-ref --format="%(trailers:only)" refs/heads/master >actual &&
+ {
+ grep -v patch.description <trailers &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers:only) and %(trailers:unfold) work together' '
+ git for-each-ref --format="%(trailers:only,unfold)" refs/heads/master >actual &&
+ git for-each-ref --format="%(trailers:unfold,only)" refs/heads/master >reverse &&
+ test_cmp actual reverse &&
+ {
+ grep -v patch.description <trailers | unfold &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(contents:trailers:unfold) unfolds trailers' '
+ git for-each-ref --format="%(contents:trailers:unfold)" refs/heads/master >actual &&
+ {
+ unfold <trailers
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(contents:trailers:only) shows only "key: value" trailers' '
+ git for-each-ref --format="%(contents:trailers:only)" refs/heads/master >actual &&
+ {
+ grep -v patch.description <trailers &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(contents:trailers:only) and %(contents:trailers:unfold) work together' '
+ git for-each-ref --format="%(contents:trailers:only,unfold)" refs/heads/master >actual &&
+ git for-each-ref --format="%(contents:trailers:unfold,only)" refs/heads/master >reverse &&
+ test_cmp actual reverse &&
+ {
+ grep -v patch.description <trailers | unfold &&
+ echo
+ } >expect &&
+ test_cmp expect actual
+'
+
+test_expect_success '%(trailers) rejects unknown trailers arguments' '
+ # error message cannot be checked under i18n
+ cat >expect <<-EOF &&
+ fatal: unknown %(trailers) argument: unsupported
+ EOF
+ test_must_fail git for-each-ref --format="%(trailers:unsupported)" 2>actual &&
+ test_i18ncmp expect actual
+'
+
+test_expect_success '%(contents:trailers) rejects unknown trailers arguments' '
+ # error message cannot be checked under i18n
+ cat >expect <<-EOF &&
+ fatal: unknown %(trailers) argument: unsupported
+ EOF
+ test_must_fail git for-each-ref --format="%(contents:trailers:unsupported)" 2>actual &&
+ test_i18ncmp expect actual
+'
+
+test_expect_success 'basic atom: head contents:trailers' '
git for-each-ref --format="%(contents:trailers)" refs/heads/master >actual &&
sanitize_pgp <actual >actual.clean &&
# git for-each-ref ends with a blank line
@@ -680,4 +766,36 @@
test_cmp expected actual
'
+test_expect_success ':remotename and :remoteref' '
+ git init remote-tests &&
+ (
+ cd remote-tests &&
+ test_commit initial &&
+ git remote add from fifth.coffee:blub &&
+ git config branch.master.remote from &&
+ git config branch.master.merge refs/heads/stable &&
+ git remote add to southridge.audio:repo &&
+ git config remote.to.push "refs/heads/*:refs/heads/pushed/*" &&
+ git config branch.master.pushRemote to &&
+ for pair in "%(upstream)=refs/remotes/from/stable" \
+ "%(upstream:remotename)=from" \
+ "%(upstream:remoteref)=refs/heads/stable" \
+ "%(push)=refs/remotes/to/pushed/master" \
+ "%(push:remotename)=to" \
+ "%(push:remoteref)=refs/heads/pushed/master"
+ do
+ echo "${pair#*=}" >expect &&
+ git for-each-ref --format="${pair%=*}" \
+ refs/heads/master >actual &&
+ test_cmp expect actual
+ done &&
+ git branch push-simple &&
+ git config branch.push-simple.pushRemote from &&
+ actual="$(git for-each-ref \
+ --format="%(push:remotename),%(push:remoteref)" \
+ refs/heads/push-simple)" &&
+ test from, = "$actual"
+ )
+'
+
test_done
diff --git a/t/t7001-mv.sh b/t/t7001-mv.sh
index 1744ed4..d4e6485 100755
--- a/t/t7001-mv.sh
+++ b/t/t7001-mv.sh
@@ -458,7 +458,7 @@
git mv sub sub2 &&
git commit -m "moved sub to sub2" &&
git checkout -q HEAD^ 2>actual &&
- test_i18ngrep "^warning: unable to rmdir sub2:" actual &&
+ test_i18ngrep "^warning: unable to rmdir '\''sub2'\'':" actual &&
git status -s sub2 >actual &&
echo "?? sub2/" >expected &&
test_cmp expected actual &&
@@ -494,7 +494,32 @@
git config -f ../.gitmodules submodule.deep/directory/hierarchy/sub.path >../actual &&
echo "directory/hierarchy/sub" >../expect
) &&
- test_cmp actual expect
+ test_cmp expect actual
+'
+
+test_expect_failure 'moving nested submodules' '
+ git commit -am "cleanup commit" &&
+ mkdir sub_nested_nested &&
+ (cd sub_nested_nested &&
+ touch nested_level2 &&
+ git init &&
+ git add . &&
+ git commit -m "nested level 2"
+ ) &&
+ mkdir sub_nested &&
+ (cd sub_nested &&
+ touch nested_level1 &&
+ git init &&
+ git add . &&
+ git commit -m "nested level 1"
+ git submodule add ../sub_nested_nested &&
+ git commit -m "add nested level 2"
+ ) &&
+ git submodule add ./sub_nested nested_move &&
+ git commit -m "add nested_move" &&
+ git submodule update --init --recursive &&
+ git mv nested_move sub_nested_moved &&
+ git status
'
test_done
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
index 62aa322..a9af2de 100755
--- a/t/t7004-tag.sh
+++ b/t/t7004-tag.sh
@@ -1863,13 +1863,6 @@
git tag -l --sort=version:refname
'
-run_with_limited_stack () {
- (ulimit -s 128 && "$@")
-}
-
-test_lazy_prereq ULIMIT_STACK_SIZE 'run_with_limited_stack true'
-
-# we require ulimit, this excludes Windows
test_expect_success ULIMIT_STACK_SIZE '--contains and --no-contains work in a deep repo' '
>expect &&
i=1 &&
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh
index 1b530b5..29e5043 100755
--- a/t/t7005-editor.sh
+++ b/t/t7005-editor.sh
@@ -38,7 +38,7 @@
test_commit "$msg" &&
echo "$msg" >expect &&
git show -s --format=%s > actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
@@ -85,7 +85,7 @@
git --exec-path=. commit --amend &&
git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
done
@@ -107,7 +107,7 @@
git --exec-path=. commit --amend &&
git show -s --pretty=oneline |
sed -e "s/^[0-9a-f]* //" >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
done
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index f0f1abd..f5f46a9 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -214,6 +214,44 @@
! test -e paginated.out
'
+test_expect_success TTY 'git branch defaults to paging' '
+ rm -f paginated.out &&
+ test_terminal git branch &&
+ test -e paginated.out
+'
+
+test_expect_success TTY 'git branch respects pager.branch' '
+ rm -f paginated.out &&
+ test_terminal git -c pager.branch=false branch &&
+ ! test -e paginated.out
+'
+
+test_expect_success TTY 'git branch respects --no-pager' '
+ rm -f paginated.out &&
+ test_terminal git --no-pager branch &&
+ ! test -e paginated.out
+'
+
+test_expect_success TTY 'git branch --edit-description ignores pager.branch' '
+ rm -f paginated.out editor.used &&
+ write_script editor <<-\EOF &&
+ echo "New description" >"$1"
+ touch editor.used
+ EOF
+ EDITOR=./editor test_terminal git -c pager.branch branch --edit-description &&
+ ! test -e paginated.out &&
+ test -e editor.used
+'
+
+test_expect_success TTY 'git branch --set-upstream-to ignores pager.branch' '
+ rm -f paginated.out &&
+ git branch other &&
+ test_when_finished "git branch -D other" &&
+ test_terminal git -c pager.branch branch --set-upstream-to=other &&
+ test_when_finished "git branch --unset-upstream" &&
+ ! test -e paginated.out
+'
+
# A colored commit log will begin with an appropriate ANSI escape
# for the first color; the text "commit" comes later.
colorful() {
@@ -570,4 +608,18 @@
test_cmp expect actual
'
+test_expect_success TTY 'git tag with auto-columns ' '
+ test_commit one &&
+ test_commit two &&
+ test_commit three &&
+ test_commit four &&
+ test_commit five &&
+ cat >expect <<-\EOF &&
+ initial one two three four five
+ EOF
+ test_terminal env PAGER="cat >actual" COLUMNS=80 \
+ git -c column.ui=auto tag --sort=authordate &&
+ test_cmp expect actual
+'
+
test_done
diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh
index fc6013b..0c394cf 100755
--- a/t/t7061-wtstatus-ignore.sh
+++ b/t/t7061-wtstatus-ignore.sh
@@ -272,4 +272,15 @@
test_cmp expected actual
'
+cat >expected <<\EOF
+!! tracked/submodule/
+EOF
+
+test_expect_success 'status ignores submodule in excluded directory' '
+ git init tracked/submodule &&
+ test_commit -C tracked/submodule initial &&
+ git status --porcelain --ignored -u tracked/submodule >actual &&
+ test_cmp expected actual
+'
+
test_done
diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh
index 86f23be..95653a0 100755
--- a/t/t7102-reset.sh
+++ b/t/t7102-reset.sh
@@ -428,9 +428,9 @@
git reset HEAD -- file1 file2 file3 &&
test_must_fail git diff --quiet &&
git diff > output &&
- test_cmp output expect &&
+ test_cmp expect output &&
git diff --cached > output &&
- test_cmp output cached_expect
+ test_cmp cached_expect output
'
test_expect_success 'test resetting the index at give paths' '
diff --git a/t/t7201-co.sh b/t/t7201-co.sh
index d4b217b..76c223c 100755
--- a/t/t7201-co.sh
+++ b/t/t7201-co.sh
@@ -187,7 +187,7 @@
d
>>>>>>> local
EOF
- test_cmp two expect
+ test_cmp expect two
'
test_expect_success 'checkout --merge --conflict=diff3 <branch>' '
@@ -213,7 +213,7 @@
d
>>>>>>> local
EOF
- test_cmp two expect
+ test_cmp expect two
'
test_expect_success 'switch to another branch while carrying a deletion' '
diff --git a/t/t7301-clean-interactive.sh b/t/t7301-clean-interactive.sh
index 3ae394e..1bf9789 100755
--- a/t/t7301-clean-interactive.sh
+++ b/t/t7301-clean-interactive.sh
@@ -3,6 +3,7 @@
test_description='git clean -i basic tests'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
test_expect_success 'setup' '
@@ -472,4 +473,14 @@
'
+test_expect_success TTY 'git clean -i paints the header in HEADER color' '
+ >a.out &&
+ echo q |
+ test_terminal git clean -i |
+ test_decode_color |
+ head -n 1 >header &&
+ # not i18ngrep
+ grep "^<BOLD>" header
+'
+
test_done
diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index e9c3335..a39e69a 100755
--- a/t/t7400-submodule-basic.sh
+++ b/t/t7400-submodule-basic.sh
@@ -46,16 +46,6 @@
test_must_fail git submodule init
'
-test_expect_success 'configuration parsing' '
- test_when_finished "rm -f .gitmodules" &&
- cat >.gitmodules <<-\EOF &&
- [submodule "s"]
- path
- ignore
- EOF
- test_must_fail git status
-'
-
test_expect_success 'setup - repository in init subdirectory' '
mkdir init &&
(
@@ -1221,7 +1211,7 @@
git clone --recurse-submodules="sub0" multisuper multisuper_clone &&
git -C multisuper_clone submodule status |cut -c1,43- >actual &&
- test_cmp actual expected
+ test_cmp expected actual
'
test_expect_success 'clone with multiple --recurse-submodules options' '
diff --git a/t/t7405-submodule-merge.sh b/t/t7405-submodule-merge.sh
index 0d5b42a..7bfb2f4 100755
--- a/t/t7405-submodule-merge.sh
+++ b/t/t7405-submodule-merge.sh
@@ -119,7 +119,7 @@
git ls-tree test-forward sub | cut -f1 | cut -f3 -d" " > actual &&
(cd sub &&
git rev-parse sub-d > ../expect) &&
- test_cmp actual expect)
+ test_cmp expect actual)
'
test_expect_success 'merging should conflict for non fast-forward' '
diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh
index 034914a..6f083c4 100755
--- a/t/t7406-submodule-update.sh
+++ b/t/t7406-submodule-update.sh
@@ -406,6 +406,14 @@
)
'
+test_expect_success 'submodule update - command in .gitmodules is ignored' '
+ test_when_finished "git -C super reset --hard HEAD^" &&
+ git -C super config -f .gitmodules submodule.submodule.update "!false" &&
+ git -C super commit -a -m "add command to .gitmodules file" &&
+ git -C super/submodule reset --hard $submodulesha1^ &&
+ git -C super submodule update submodule
+'
+
cat << EOF >expect
Execution of 'false $submodulesha1' failed in submodule path 'submodule'
EOF
diff --git a/t/t7409-submodule-detached-work-tree.sh b/t/t7409-submodule-detached-work-tree.sh
index c207171..fc018e3 100755
--- a/t/t7409-submodule-detached-work-tree.sh
+++ b/t/t7409-submodule-detached-work-tree.sh
@@ -6,7 +6,7 @@
test_description='Test submodules on detached working tree
This test verifies that "git submodule" initialization, update and addition works
-on detahced working trees
+on detached working trees
'
TEST_NO_CREATE_REPO=1
diff --git a/t/t7411-submodule-config.sh b/t/t7411-submodule-config.sh
index eea36f1..46c09c7 100755
--- a/t/t7411-submodule-config.sh
+++ b/t/t7411-submodule-config.sh
@@ -31,6 +31,21 @@
)
'
+test_expect_success 'configuration parsing with error' '
+ test_when_finished "rm -rf repo" &&
+ test_create_repo repo &&
+ cat >repo/.gitmodules <<-\EOF &&
+ [submodule "s"]
+ path
+ ignore
+ EOF
+ (
+ cd repo &&
+ test_must_fail test-submodule-config "" s 2>actual &&
+ test_i18ngrep "bad config" actual
+ )
+'
+
cat >super/expect <<EOF
Submodule name: 'a' for path 'a'
Submodule name: 'a' for path 'b'
@@ -107,78 +122,6 @@
)
'
-cat >super/expect_url <<EOF
-Submodule url: 'git@somewhere.else.net:a.git' for path 'b'
-Submodule url: 'git@somewhere.else.net:submodule.git' for path 'submodule'
-EOF
-
-cat >super/expect_local_path <<EOF
-Submodule name: 'a' for path 'c'
-Submodule name: 'submodule' for path 'submodule'
-EOF
-
-test_expect_success 'reading of local configuration' '
- (cd super &&
- old_a=$(git config submodule.a.url) &&
- old_submodule=$(git config submodule.submodule.url) &&
- git config submodule.a.url git@somewhere.else.net:a.git &&
- git config submodule.submodule.url git@somewhere.else.net:submodule.git &&
- test-submodule-config --url \
- "" b \
- "" submodule \
- >actual &&
- test_cmp expect_url actual &&
- git config submodule.a.path c &&
- test-submodule-config \
- "" c \
- "" submodule \
- >actual &&
- test_cmp expect_local_path actual &&
- git config submodule.a.url "$old_a" &&
- git config submodule.submodule.url "$old_submodule" &&
- git config --unset submodule.a.path c
- )
-'
-
-cat >super/expect_url <<EOF
-Submodule url: '../submodule' for path 'b'
-Submodule url: 'git@somewhere.else.net:submodule.git' for path 'submodule'
-EOF
-
-test_expect_success 'reading of local configuration for uninitialized submodules' '
- (
- cd super &&
- git submodule deinit -f b &&
- old_submodule=$(git config submodule.submodule.url) &&
- git config submodule.submodule.url git@somewhere.else.net:submodule.git &&
- test-submodule-config --url \
- "" b \
- "" submodule \
- >actual &&
- test_cmp expect_url actual &&
- git config submodule.submodule.url "$old_submodule" &&
- git submodule init b
- )
-'
-
-cat >super/expect_fetchrecurse_die.err <<EOF
-fatal: bad submodule.submodule.fetchrecursesubmodules argument: blabla
-EOF
-
-test_expect_success 'local error in fetchrecursesubmodule dies early' '
- (cd super &&
- git config submodule.submodule.fetchrecursesubmodules blabla &&
- test_must_fail test-submodule-config \
- "" b \
- "" submodule \
- >actual.out 2>actual.err &&
- touch expect_fetchrecurse_die.out &&
- test_cmp expect_fetchrecurse_die.out actual.out &&
- test_cmp expect_fetchrecurse_die.err actual.err &&
- git config --unset submodule.submodule.fetchrecursesubmodules
- )
-'
-
test_expect_success 'error in history in fetchrecursesubmodule lets continue' '
(cd super &&
git config -f .gitmodules \
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 5739d3e..170b481 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -130,8 +130,8 @@
test_expect_success 'commit message from template with whitespace issue' '
echo "content galore" >>foo &&
git add foo &&
- GIT_EDITOR="$TEST_DIRECTORY"/t7500/add-whitespaced-content git commit \
- --template "$TEMPLATE" &&
+ GIT_EDITOR=\""$TEST_DIRECTORY"\"/t7500/add-whitespaced-content \
+ git commit --template "$TEMPLATE" &&
commit_msg_is "commit message"
'
@@ -272,6 +272,14 @@
commit_msg_is "fixup! target message subject line"
'
+test_expect_success 'commit --fixup -m"something" -m"extra"' '
+ commit_for_rebase_autosquash_setup &&
+ git commit --fixup HEAD~1 -m"something" -m"extra" &&
+ commit_msg_is "fixup! target message subject linesomething
+
+extra"
+'
+
test_expect_success 'commit --squash works with -F' '
commit_for_rebase_autosquash_setup &&
echo "log message from file" >msgfile &&
@@ -325,7 +333,6 @@
test_must_fail git commit --fixup HEAD~1 --squash HEAD~2 &&
test_must_fail git commit --fixup HEAD~1 -C HEAD~2 &&
test_must_fail git commit --fixup HEAD~1 -c HEAD~2 &&
- test_must_fail git commit --fixup HEAD~1 -m "cmdline message" &&
test_must_fail git commit --fixup HEAD~1 -F log
'
diff --git a/t/t7504-commit-msg-hook.sh b/t/t7504-commit-msg-hook.sh
index 88d4cda..302a3a2 100755
--- a/t/t7504-commit-msg-hook.sh
+++ b/t/t7504-commit-msg-hook.sh
@@ -101,6 +101,10 @@
exit 1
EOF
+commit_msg_is () {
+ test "$(git log --pretty=format:%s%b -1)" = "$1"
+}
+
test_expect_success 'with failing hook' '
echo "another" >> file &&
@@ -135,6 +139,32 @@
'
+test_expect_success 'merge fails with failing hook' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ test_must_fail git merge --allow-unrelated-histories master &&
+ commit_msg_is "in-side-branch" # HEAD before merge
+
+'
+
+test_expect_success 'merge bypasses failing hook with --no-verify' '
+
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify --allow-unrelated-histories master &&
+ commit_msg_is "Merge branch '\''master'\'' into newbranch"
+'
+
+
chmod -x "$HOOK"
test_expect_success POSIXPERM 'with non-executable hook' '
@@ -178,10 +208,6 @@
EOF
chmod +x "$HOOK"
-commit_msg_is () {
- test "$(git log --pretty=format:%s%b -1)" = "$1"
-}
-
test_expect_success 'hook edits commit message' '
echo "additional" >> file &&
@@ -217,7 +243,36 @@
echo "more plus" > FAKE_MSG &&
GIT_EDITOR="\"\$FAKE_EDITOR\"" git commit --no-verify &&
commit_msg_is "more plus"
+'
+test_expect_success 'hook called in git-merge picks up commit message' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout --orphan newbranch &&
+ : >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --allow-unrelated-histories master &&
+ commit_msg_is "new message"
+'
+
+test_expect_failure 'merge --continue remembers --no-verify' '
+ test_when_finished "git branch -D newbranch" &&
+ test_when_finished "git checkout -f master" &&
+ git checkout master &&
+ echo a >file2 &&
+ git add file2 &&
+ git commit --no-verify -m "add file2 to master" &&
+ git checkout -b newbranch master^ &&
+ echo b >file2 &&
+ git add file2 &&
+ git commit --no-verify file2 -m in-side-branch &&
+ git merge --no-verify -m not-rewritten-by-hook master &&
+ # resolve conflict:
+ echo c >file2 &&
+ git add file2 &&
+ git merge --continue &&
+ commit_msg_is not-rewritten-by-hook
'
# set up fake editor to replace `pick` by `reword`
@@ -237,4 +292,5 @@
'
+
test_done
diff --git a/t/t7506-status-submodule.sh b/t/t7506-status-submodule.sh
index 055c907..9edf657 100755
--- a/t/t7506-status-submodule.sh
+++ b/t/t7506-status-submodule.sh
@@ -306,7 +306,7 @@
cd super &&
git diff >../diff_actual 2>&1
) &&
- test_cmp diff_actual diff_expect
+ test_cmp diff_expect diff_actual
'
test_expect_success 'diff --submodule with merge conflict in .gitmodules' '
@@ -314,7 +314,7 @@
cd super &&
git diff --submodule >../diff_submodule_actual 2>&1
) &&
- test_cmp diff_submodule_actual diff_submodule_expect
+ test_cmp diff_submodule_expect diff_submodule_actual
'
# We'll setup different cases for further testing:
diff --git a/t/t7508-status.sh b/t/t7508-status.sh
index a3d760e..50052e2 100755
--- a/t/t7508-status.sh
+++ b/t/t7508-status.sh
@@ -1671,4 +1671,14 @@
test_i18ngrep ! "Initial commit" output
'
+test_expect_success '--no-optional-locks prevents index update' '
+ test-chmtime =1234567890 .git/index &&
+ git --no-optional-locks status &&
+ test-chmtime -v +0 .git/index >out &&
+ grep ^1234567890 out &&
+ git status &&
+ test-chmtime -v +0 .git/index >out &&
+ ! grep ^1234567890 out
+'
+
test_done
diff --git a/t/t7513-interpret-trailers.sh b/t/t7513-interpret-trailers.sh
index 0c6f91c..164719d 100755
--- a/t/t7513-interpret-trailers.sh
+++ b/t/t7513-interpret-trailers.sh
@@ -681,6 +681,36 @@
test_cmp expected actual
'
+test_expect_success 'overriding configuration with "--where after"' '
+ git config trailer.ack.where "before" &&
+ cat complex_message_body >expected &&
+ sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+ Fixes: Z
+ Acked-by= Z
+ Acked-by= Peff
+ Reviewed-by: Z
+ Signed-off-by: Z
+ EOF
+ git interpret-trailers --where after --trailer "ack: Peff" \
+ complex_message >actual &&
+ test_cmp expected actual
+'
+
+test_expect_success 'using "where = before" with "--no-where"' '
+ cat complex_message_body >expected &&
+ sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+ Bug #42
+ Fixes: Z
+ Acked-by= Peff
+ Acked-by= Z
+ Reviewed-by: Z
+ Signed-off-by: Z
+ EOF
+ git interpret-trailers --where after --no-where --trailer "ack: Peff" \
+ --trailer "bug: 42" complex_message >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'using "where = after"' '
git config trailer.ack.where "after" &&
cat complex_message_body >expected &&
@@ -947,6 +977,23 @@
test_cmp expected actual
'
+test_expect_success 'overriding configuration with "--if-exists replace"' '
+ git config trailer.fix.key "Fixes: " &&
+ git config trailer.fix.ifExists "add" &&
+ cat complex_message_body >expected &&
+ sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+ Bug #42
+ Acked-by= Z
+ Reviewed-by:
+ Signed-off-by: Z
+ Fixes: 22
+ EOF
+ git interpret-trailers --if-exists replace --trailer "review:" \
+ --trailer "fix=53" --trailer "fix=22" --trailer "bug: 42" \
+ <complex_message >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'using "ifExists = replace"' '
git config trailer.fix.key "Fixes: " &&
git config trailer.fix.ifExists "replace" &&
@@ -1026,6 +1073,25 @@
test_cmp expected actual
'
+test_expect_success 'overriding configuration with "--if-missing doNothing"' '
+ git config trailer.ifmissing "add" &&
+ cat complex_message_body >expected &&
+ sed -e "s/ Z\$/ /" >>expected <<-\EOF &&
+ Fixes: Z
+ Acked-by= Z
+ Acked-by= Junio
+ Acked-by= Peff
+ Reviewed-by:
+ Signed-off-by: Z
+ EOF
+ git interpret-trailers --if-missing doNothing \
+ --trailer "review:" --trailer "fix=53" \
+ --trailer "cc=Linus" --trailer "ack: Junio" \
+ --trailer "fix=22" --trailer "bug: 42" --trailer "ack: Peff" \
+ <complex_message >actual &&
+ test_cmp expected actual
+'
+
test_expect_success 'when default "ifMissing" is "doNothing"' '
git config trailer.ifmissing "doNothing" &&
cat complex_message_body >expected &&
@@ -1275,4 +1341,80 @@
test_cmp expected actual
'
+test_expect_success 'only trailers' '
+ git config trailer.sign.command "echo config-value" &&
+ cat >expected <<-\EOF &&
+ existing: existing-value
+ sign: config-value
+ added: added-value
+ EOF
+ git interpret-trailers \
+ --trailer added:added-value \
+ --only-trailers >actual <<-\EOF &&
+ my subject
+
+ my body
+
+ existing: existing-value
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'only-trailers omits non-trailer in middle of block' '
+ git config trailer.sign.command "echo config-value" &&
+ cat >expected <<-\EOF &&
+ Signed-off-by: nobody <nobody@nowhere>
+ Signed-off-by: somebody <somebody@somewhere>
+ sign: config-value
+ EOF
+ git interpret-trailers --only-trailers >actual <<-\EOF &&
+ subject
+
+ it is important that the trailers below are signed-off-by
+ so that they meet the "25% trailers Git knows about" heuristic
+
+ Signed-off-by: nobody <nobody@nowhere>
+ this is not a trailer
+ Signed-off-by: somebody <somebody@somewhere>
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'only input' '
+ git config trailer.sign.command "echo config-value" &&
+ cat >expected <<-\EOF &&
+ existing: existing-value
+ EOF
+ git interpret-trailers \
+ --only-trailers --only-input >actual <<-\EOF &&
+ my subject
+
+ my body
+
+ existing: existing-value
+ EOF
+ test_cmp expected actual
+'
+
+test_expect_success 'unfold' '
+ cat >expected <<-\EOF &&
+ foo: continued across several lines
+ EOF
+ # pass through tr to make leading and trailing whitespace more obvious
+ tr _ " " <<-\EOF |
+ my subject
+
+ my body
+
+ foo:_
+ __continued
+ ___across
+ ____several
+ _____lines
+ ___
+ EOF
+ git interpret-trailers --only-trailers --only-input --unfold >actual &&
+ test_cmp expected actual
+'
+
test_done
diff --git a/t/t7519-status-fsmonitor.sh b/t/t7519-status-fsmonitor.sh
new file mode 100755
index 0000000..eb2d13b
--- /dev/null
+++ b/t/t7519-status-fsmonitor.sh
@@ -0,0 +1,317 @@
+#!/bin/sh
+
+test_description='git status with file system watcher'
+
+. ./test-lib.sh
+
+#
+# To run the entire git test suite using fsmonitor:
+#
+# copy t/t7519/fsmonitor-all to a location in your path and then set
+# GIT_FSMONITOR_TEST=fsmonitor-all and run your tests.
+#
+
+# Note, after "git reset --hard HEAD" no extensions exist other than 'TREE'
+# "git update-index --fsmonitor" can be used to get the extension written
+# before testing the results.
+
+clean_repo () {
+ git reset --hard HEAD &&
+ git clean -fd
+}
+
+dirty_repo () {
+ : >untracked &&
+ : >dir1/untracked &&
+ : >dir2/untracked &&
+ echo 1 >modified &&
+ echo 2 >dir1/modified &&
+ echo 3 >dir2/modified &&
+ echo 4 >new &&
+ echo 5 >dir1/new &&
+ echo 6 >dir2/new
+}
+
+write_integration_script () {
+ write_script .git/hooks/fsmonitor-test<<-\EOF
+ if test "$#" -ne 2
+ then
+ echo "$0: exactly 2 arguments expected"
+ exit 2
+ fi
+ if test "$1" != 1
+ then
+ echo "Unsupported core.fsmonitor hook version." >&2
+ exit 1
+ fi
+ printf "untracked\0"
+ printf "dir1/untracked\0"
+ printf "dir2/untracked\0"
+ printf "modified\0"
+ printf "dir1/modified\0"
+ printf "dir2/modified\0"
+ printf "new\0"
+ printf "dir1/new\0"
+ printf "dir2/new\0"
+ EOF
+}
+
+test_lazy_prereq UNTRACKED_CACHE '
+ { git update-index --test-untracked-cache; ret=$?; } &&
+ test $ret -ne 1
+'
+
+test_expect_success 'setup' '
+ mkdir -p .git/hooks &&
+ : >tracked &&
+ : >modified &&
+ mkdir dir1 &&
+ : >dir1/tracked &&
+ : >dir1/modified &&
+ mkdir dir2 &&
+ : >dir2/tracked &&
+ : >dir2/modified &&
+ git -c core.fsmonitor= add . &&
+ git -c core.fsmonitor= commit -m initial &&
+ git config core.fsmonitor .git/hooks/fsmonitor-test &&
+ cat >.gitignore <<-\EOF
+ .gitignore
+ expect*
+ actual*
+ marker*
+ EOF
+'
+
+# test that the fsmonitor extension is off by default
+test_expect_success 'fsmonitor extension is off by default' '
+ test-dump-fsmonitor >actual &&
+ grep "^no fsmonitor" actual
+'
+
+# test that "update-index --fsmonitor" adds the fsmonitor extension
+test_expect_success 'update-index --fsmonitor" adds the fsmonitor extension' '
+ git update-index --fsmonitor &&
+ test-dump-fsmonitor >actual &&
+ grep "^fsmonitor last update" actual
+'
+
+# test that "update-index --no-fsmonitor" removes the fsmonitor extension
+test_expect_success 'update-index --no-fsmonitor" removes the fsmonitor extension' '
+ git update-index --no-fsmonitor &&
+ test-dump-fsmonitor >actual &&
+ grep "^no fsmonitor" actual
+'
+
+cat >expect <<EOF &&
+h dir1/modified
+H dir1/tracked
+h dir2/modified
+H dir2/tracked
+h modified
+H tracked
+EOF
+
+# test that "update-index --fsmonitor-valid" sets the fsmonitor valid bit
+test_expect_success 'update-index --fsmonitor-valid" sets the fsmonitor valid bit' '
+ git update-index --fsmonitor &&
+ git update-index --fsmonitor-valid dir1/modified &&
+ git update-index --fsmonitor-valid dir2/modified &&
+ git update-index --fsmonitor-valid modified &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<EOF &&
+H dir1/modified
+H dir1/tracked
+H dir2/modified
+H dir2/tracked
+H modified
+H tracked
+EOF
+
+# test that "update-index --no-fsmonitor-valid" clears the fsmonitor valid bit
+test_expect_success 'update-index --no-fsmonitor-valid" clears the fsmonitor valid bit' '
+ git update-index --no-fsmonitor-valid dir1/modified &&
+ git update-index --no-fsmonitor-valid dir2/modified &&
+ git update-index --no-fsmonitor-valid modified &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<EOF &&
+H dir1/modified
+H dir1/tracked
+H dir2/modified
+H dir2/tracked
+H modified
+H tracked
+EOF
+
+# test that all files returned by the script get flagged as invalid
+test_expect_success 'all files returned by integration script get flagged as invalid' '
+ write_integration_script &&
+ dirty_repo &&
+ git update-index --fsmonitor &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<EOF &&
+H dir1/modified
+h dir1/new
+H dir1/tracked
+H dir2/modified
+h dir2/new
+H dir2/tracked
+H modified
+h new
+H tracked
+EOF
+
+# test that newly added files are marked valid
+test_expect_success 'newly added files are marked valid' '
+ git add new &&
+ git add dir1/new &&
+ git add dir2/new &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<EOF &&
+H dir1/modified
+h dir1/new
+h dir1/tracked
+H dir2/modified
+h dir2/new
+h dir2/tracked
+H modified
+h new
+h tracked
+EOF
+
+# test that all unmodified files get marked valid
+test_expect_success 'all unmodified files get marked valid' '
+ # modified files result in update-index returning 1
+ test_must_fail git update-index --refresh --force-write-index &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+cat >expect <<EOF &&
+H dir1/modified
+h dir1/tracked
+h dir2/modified
+h dir2/tracked
+h modified
+h tracked
+EOF
+
+# test that *only* files returned by the integration script get flagged as invalid
+test_expect_success '*only* files returned by the integration script get flagged as invalid' '
+ write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ printf "dir1/modified\0"
+ EOF
+ clean_repo &&
+ git update-index --refresh --force-write-index &&
+ echo 1 >modified &&
+ echo 2 >dir1/modified &&
+ echo 3 >dir2/modified &&
+ test_must_fail git update-index --refresh --force-write-index &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+# Ensure commands that call refresh_index() to move the index back in time
+# properly invalidate the fsmonitor cache
+test_expect_success 'refresh_index() invalidates fsmonitor cache' '
+ write_script .git/hooks/fsmonitor-test<<-\EOF &&
+ EOF
+ clean_repo &&
+ dirty_repo &&
+ git add . &&
+ git commit -m "to reset" &&
+ git reset HEAD~1 &&
+ git status >actual &&
+ git -c core.fsmonitor= status >expect &&
+ test_i18ncmp expect actual
+'
+
+# test fsmonitor with and without preloadIndex
+preload_values="false true"
+for preload_val in $preload_values
+do
+ test_expect_success "setup preloadIndex to $preload_val" '
+ git config core.preloadIndex $preload_val &&
+ if test $preload_val = true
+ then
+ GIT_FORCE_PRELOAD_TEST=$preload_val; export GIT_FORCE_PRELOAD_TEST
+ else
+ unset GIT_FORCE_PRELOAD_TEST
+ fi
+ '
+
+ # test fsmonitor with and without the untracked cache (if available)
+ uc_values="false"
+ test_have_prereq UNTRACKED_CACHE && uc_values="false true"
+ for uc_val in $uc_values
+ do
+ test_expect_success "setup untracked cache to $uc_val" '
+ git config core.untrackedcache $uc_val
+ '
+
+ # Status is well tested elsewhere so we'll just ensure that the results are
+ # the same when using core.fsmonitor.
+ test_expect_success 'compare status with and without fsmonitor' '
+ write_integration_script &&
+ clean_repo &&
+ dirty_repo &&
+ git add new &&
+ git add dir1/new &&
+ git add dir2/new &&
+ git status >actual &&
+ git -c core.fsmonitor= status >expect &&
+ test_i18ncmp expect actual
+ '
+
+ # 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 &&
+ :>marker
+ EOF
+ clean_repo &&
+ git status &&
+ test_path_is_file marker &&
+ dirty_repo &&
+ rm -f marker &&
+ git status >actual &&
+ test_path_is_file marker &&
+ test_i18ngrep ! "Changes not staged for commit:" actual &&
+ if test $uc_val = true
+ then
+ test_i18ngrep ! "Untracked files:" actual
+ fi &&
+ if test $uc_val = false
+ then
+ test_i18ngrep "Untracked files:" actual
+ fi &&
+ rm -f marker
+ '
+ done
+done
+
+# test that splitting the index dosn't interfere
+test_expect_success 'splitting the index results in the same state' '
+ write_integration_script &&
+ dirty_repo &&
+ git update-index --fsmonitor &&
+ git ls-files -f >expect &&
+ test-dump-fsmonitor >&2 && echo &&
+ git update-index --fsmonitor --split-index &&
+ test-dump-fsmonitor >&2 && echo &&
+ git ls-files -f >actual &&
+ test_cmp expect actual
+'
+
+test_done
diff --git a/t/t7519/fsmonitor-all b/t/t7519/fsmonitor-all
new file mode 100755
index 0000000..691bc94
--- /dev/null
+++ b/t/t7519/fsmonitor-all
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An test hook script to integrate with git to test fsmonitor.
+#
+# The hook is passed a version (currently 1) and a time in nanoseconds
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+#echo "$0 $*" >&2
+
+if test "$#" -ne 2
+then
+ echo "$0: exactly 2 arguments expected" >&2
+ exit 2
+fi
+
+if test "$1" != 1
+then
+ echo "Unsupported core.fsmonitor hook version." >&2
+ exit 1
+fi
+
+echo "/"
diff --git a/t/t7519/fsmonitor-none b/t/t7519/fsmonitor-none
new file mode 100755
index 0000000..ed9cf5a
--- /dev/null
+++ b/t/t7519/fsmonitor-none
@@ -0,0 +1,22 @@
+#!/bin/sh
+#
+# An test hook script to integrate with git to test fsmonitor.
+#
+# The hook is passed a version (currently 1) and a time in nanoseconds
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+#echo "$0 $*" >&2
+
+if test "$#" -ne 2
+then
+ echo "$0: exactly 2 arguments expected" >&2
+ exit 2
+fi
+
+if test "$1" != 1
+then
+ echo "Unsupported core.fsmonitor hook version." >&2
+ exit 1
+fi
diff --git a/t/t7519/fsmonitor-watchman b/t/t7519/fsmonitor-watchman
new file mode 100755
index 0000000..5514edc
--- /dev/null
+++ b/t/t7519/fsmonitor-watchman
@@ -0,0 +1,133 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 1) and a time in nanoseconds
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $time) = @ARGV;
+#print STDERR "$0 $version $time\n";
+
+# Check the hook interface version
+
+if ($version == 1) {
+ # convert nanoseconds to seconds
+ $time = int $time / 1000000000;
+} else {
+ die "Unsupported query-fsmonitor hook version '$version'.\n" .
+ "Falling back to scanning...\n";
+}
+
+my $git_work_tree;
+if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+ $git_work_tree = Win32::GetCwd();
+ $git_work_tree =~ tr/\\/\//;
+} else {
+ require Cwd;
+ $git_work_tree = Cwd::cwd();
+}
+
+my $retry = 1;
+
+launch_watchman();
+
+sub launch_watchman {
+
+ my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j')
+ or die "open2() failed: $!\n" .
+ "Falling back to scanning...\n";
+
+ # In the query expression below we're asking for names of files that
+ # changed since $time but were not transient (ie created after
+ # $time but no longer exist).
+ #
+ # To accomplish this, we're using the "since" generator to use the
+ # recency index to select candidate nodes and "fields" to limit the
+ # output to file names only. Then we're using the "expression" term to
+ # further constrain the results.
+ #
+ # The category of transient files that we want to ignore will have a
+ # creation clock (cclock) newer than $time_t value and will also not
+ # currently exist.
+
+ my $query = <<" END";
+ ["query", "$git_work_tree", {
+ "since": $time,
+ "fields": ["name"],
+ "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+ }]
+ END
+
+ open (my $fh, ">", ".git/watchman-query.json");
+ print $fh $query;
+ close $fh;
+
+ print CHLD_IN $query;
+ close CHLD_IN;
+ my $response = do {local $/; <CHLD_OUT>};
+
+ open ($fh, ">", ".git/watchman-response.json");
+ print $fh $response;
+ close $fh;
+
+ die "Watchman: command returned no output.\n" .
+ "Falling back to scanning...\n" if $response eq "";
+ die "Watchman: command returned invalid output: $response\n" .
+ "Falling back to scanning...\n" unless $response =~ /^\{/;
+
+ my $json_pkg;
+ eval {
+ require JSON::XS;
+ $json_pkg = "JSON::XS";
+ 1;
+ } or do {
+ require JSON::PP;
+ $json_pkg = "JSON::PP";
+ };
+
+ my $o = $json_pkg->new->utf8->decode($response);
+
+ if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
+ print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
+ $retry--;
+ qx/watchman watch "$git_work_tree"/;
+ die "Failed to make watchman watch '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+
+ # Watchman will always return all files on the first query so
+ # return the fast "everything is dirty" flag to git and do the
+ # Watchman query just to get it over with now so we won't pay
+ # the cost in git to look up each individual file.
+
+ open ($fh, ">", ".git/watchman-output.out");
+ print "/\0";
+ close $fh;
+
+ print "/\0";
+ eval { launch_watchman() };
+ exit 0;
+ }
+
+ die "Watchman: $o->{error}.\n" .
+ "Falling back to scanning...\n" if $o->{error};
+
+ open ($fh, ">", ".git/watchman-output.out");
+ binmode $fh, ":utf8";
+ print $fh @{$o->{files}};
+ close $fh;
+
+ binmode STDOUT, ":utf8";
+ local $, = "\0";
+ print @{$o->{files}};
+}
diff --git a/t/t7520-ignored-hook-warning.sh b/t/t7520-ignored-hook-warning.sh
new file mode 100755
index 0000000..634fb7f
--- /dev/null
+++ b/t/t7520-ignored-hook-warning.sh
@@ -0,0 +1,41 @@
+#!/bin/sh
+
+test_description='ignored hook warning'
+
+. ./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
+ exit 0
+ EOF
+'
+
+test_expect_success 'no warning if hook is not ignored' '
+ git commit --allow-empty -m "more" 2>message &&
+ test_i18ngrep ! -e "hook was ignored" message
+'
+
+test_expect_success POSIXPERM 'warning if hook is ignored' '
+ chmod -x "$hook" &&
+ 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" &&
+ 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_unconfig advice.ignoredHook &&
+ git commit --allow-empty -m "even more" 2>message &&
+ test_i18ngrep ! -e "hook was ignored" message
+'
+
+test_done
diff --git a/t/t7521-ignored-mode.sh b/t/t7521-ignored-mode.sh
new file mode 100755
index 0000000..9179094
--- /dev/null
+++ b/t/t7521-ignored-mode.sh
@@ -0,0 +1,233 @@
+#!/bin/sh
+
+test_description='git status ignored modes'
+
+. ./test-lib.sh
+
+test_expect_success 'setup initial commit and ignore file' '
+ cat >.gitignore <<-\EOF &&
+ *.ign
+ ignored_dir/
+ !*.unignore
+ EOF
+ git add . &&
+ git commit -m "Initial commit"
+'
+
+test_expect_success 'Verify behavior of status on directories with ignored files' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! dir/ignored/ignored_1.ign
+ ! dir/ignored/ignored_2.ign
+ ! ignored/ignored_1.ign
+ ! ignored/ignored_2.ign
+ EOF
+
+ mkdir -p ignored dir/ignored &&
+ touch ignored/ignored_1.ign ignored/ignored_2.ign \
+ dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
+
+ git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify status behavior on directory with tracked & ignored files' '
+ test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! dir/tracked_ignored/ignored_1.ign
+ ! dir/tracked_ignored/ignored_2.ign
+ ! tracked_ignored/ignored_1.ign
+ ! tracked_ignored/ignored_2.ign
+ EOF
+
+ mkdir -p tracked_ignored dir/tracked_ignored &&
+ touch tracked_ignored/tracked_1 tracked_ignored/tracked_2 \
+ tracked_ignored/ignored_1.ign tracked_ignored/ignored_2.ign \
+ dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 \
+ dir/tracked_ignored/ignored_1.ign dir/tracked_ignored/ignored_2.ign &&
+
+ git add tracked_ignored/tracked_1 tracked_ignored/tracked_2 \
+ dir/tracked_ignored/tracked_1 dir/tracked_ignored/tracked_2 &&
+ git commit -m "commit tracked files" &&
+
+ git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify status behavior on directory with untracked and ignored files' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? dir/untracked_ignored/untracked_1
+ ? dir/untracked_ignored/untracked_2
+ ? expect
+ ? output
+ ? untracked_ignored/untracked_1
+ ? untracked_ignored/untracked_2
+ ! dir/untracked_ignored/ignored_1.ign
+ ! dir/untracked_ignored/ignored_2.ign
+ ! untracked_ignored/ignored_1.ign
+ ! untracked_ignored/ignored_2.ign
+ EOF
+
+ mkdir -p untracked_ignored dir/untracked_ignored &&
+ touch untracked_ignored/untracked_1 untracked_ignored/untracked_2 \
+ untracked_ignored/ignored_1.ign untracked_ignored/ignored_2.ign \
+ dir/untracked_ignored/untracked_1 dir/untracked_ignored/untracked_2 \
+ dir/untracked_ignored/ignored_1.ign dir/untracked_ignored/ignored_2.ign &&
+
+ git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify status matching ignored files on ignored directory' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! ignored_dir/
+ EOF
+
+ mkdir ignored_dir &&
+ touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
+ ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign &&
+
+ git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
+ test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! ignored_dir/ignored_1
+ ! ignored_dir/ignored_1.ign
+ ! ignored_dir/ignored_2
+ ! ignored_dir/ignored_2.ign
+ EOF
+
+ mkdir ignored_dir &&
+ touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
+ ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \
+ ignored_dir/tracked &&
+ git add -f ignored_dir/tracked &&
+ git commit -m "Force add file in ignored directory" &&
+ git status --porcelain=v2 --ignored=matching --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ? untracked_dir/
+ ! ignored_dir/
+ ! ignored_files/ignored_1.ign
+ ! ignored_files/ignored_2.ign
+ EOF
+
+ mkdir ignored_dir ignored_files untracked_dir &&
+ touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
+ ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
+ untracked_dir/untracked &&
+ git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify matching ignored files with --untracked-files=normal' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ? untracked_dir/
+ ! ignored_dir/
+ ! ignored_files/ignored_1.ign
+ ! ignored_files/ignored_2.ign
+ EOF
+
+ mkdir ignored_dir ignored_files untracked_dir &&
+ touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
+ ignored_files/ignored_1.ign ignored_files/ignored_2.ign \
+ untracked_dir/untracked &&
+ git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify status behavior on ignored directory containing tracked file' '
+ test_when_finished "git clean -fdx && git reset HEAD~1 --hard" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! ignored_dir/ignored_1
+ ! ignored_dir/ignored_1.ign
+ ! ignored_dir/ignored_2
+ ! ignored_dir/ignored_2.ign
+ EOF
+
+ mkdir ignored_dir &&
+ touch ignored_dir/ignored_1 ignored_dir/ignored_2 \
+ ignored_dir/ignored_1.ign ignored_dir/ignored_2.ign \
+ ignored_dir/tracked &&
+ git add -f ignored_dir/tracked &&
+ git commit -m "Force add file in ignored directory" &&
+ git status --porcelain=v2 --ignored=matching --untracked-files=normal >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify behavior of status with --ignored=no' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ EOF
+
+ mkdir -p ignored dir/ignored &&
+ touch ignored/ignored_1.ign ignored/ignored_2.ign \
+ dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
+
+ git status --porcelain=v2 --ignored=no --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=all' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! dir/ignored/ignored_1.ign
+ ! dir/ignored/ignored_2.ign
+ ! ignored/ignored_1.ign
+ ! ignored/ignored_2.ign
+ EOF
+
+ mkdir -p ignored dir/ignored &&
+ touch ignored/ignored_1.ign ignored/ignored_2.ign \
+ dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
+
+ git status --porcelain=v2 --ignored=traditional --untracked-files=all >output &&
+ test_i18ncmp expect output
+'
+
+test_expect_success 'Verify behavior of status with --ignored=traditional and --untracked-files=normal' '
+ test_when_finished "git clean -fdx" &&
+ cat >expect <<-\EOF &&
+ ? expect
+ ? output
+ ! dir/
+ ! ignored/
+ EOF
+
+ mkdir -p ignored dir/ignored &&
+ touch ignored/ignored_1.ign ignored/ignored_2.ign \
+ dir/ignored/ignored_1.ign dir/ignored/ignored_2.ign &&
+
+ git status --porcelain=v2 --ignored=traditional --untracked-files=normal >output &&
+ test_i18ncmp expect output
+'
+
+test_done
diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh
index 80194b7..dfde6a6 100755
--- a/t/t7600-merge.sh
+++ b/t/t7600-merge.sh
@@ -697,7 +697,7 @@
git cat-file commit HEAD >raw &&
grep "work done on the side branch" raw &&
sed "1,/^$/d" >actual raw &&
- test_cmp actual expected
+ test_cmp expected actual
'
test_expect_success GPG 'merge --ff-only tag' '
@@ -709,7 +709,7 @@
git merge --ff-only signed &&
git rev-parse signed^0 >expect &&
git rev-parse HEAD >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
test_expect_success GPG 'merge --no-edit tag should skip editor' '
@@ -721,7 +721,7 @@
EDITOR=false git merge --no-edit signed &&
git rev-parse signed^0 >expect &&
git rev-parse HEAD^2 >actual &&
- test_cmp actual expect
+ test_cmp expect actual
'
test_expect_success 'set up mod-256 conflict scenario' '
diff --git a/t/t7610-mergetool.sh b/t/t7610-mergetool.sh
index 381b7df..1a430b9 100755
--- a/t/t7610-mergetool.sh
+++ b/t/t7610-mergetool.sh
@@ -621,7 +621,7 @@
test_must_fail git merge master &&
git mergetool --no-prompt --tool mybase -- both &&
>expected &&
- test_cmp both expected
+ test_cmp expected both
'
test_expect_success 'custom commands override built-ins' '
@@ -632,7 +632,7 @@
test_must_fail git merge master &&
git mergetool --no-prompt --tool defaults -- both &&
echo master both added >expected &&
- test_cmp both expected
+ test_cmp expected both
'
test_expect_success 'filenames seen by tools start with ./' '
diff --git a/t/t7612-merge-verify-signatures.sh b/t/t7612-merge-verify-signatures.sh
index 8ae69a6..e797c74 100755
--- a/t/t7612-merge-verify-signatures.sh
+++ b/t/t7612-merge-verify-signatures.sh
@@ -35,27 +35,72 @@
'
test_expect_success GPG 'merge unsigned commit with verification' '
+ test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git merge --ff-only --verify-signatures side-unsigned 2>mergeerror &&
test_i18ngrep "does not have a GPG signature" mergeerror
'
+test_expect_success GPG 'merge unsigned commit with merge.verifySignatures=true' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures true &&
+ test_must_fail git merge --ff-only side-unsigned 2>mergeerror &&
+ test_i18ngrep "does not have a GPG signature" mergeerror
+'
+
test_expect_success GPG 'merge commit with bad signature with verification' '
+ test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git merge --ff-only --verify-signatures $(cat forged.commit) 2>mergeerror &&
test_i18ngrep "has a bad GPG signature" mergeerror
'
+test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures true &&
+ test_must_fail git merge --ff-only $(cat forged.commit) 2>mergeerror &&
+ test_i18ngrep "has a bad GPG signature" mergeerror
+'
+
test_expect_success GPG 'merge commit with untrusted signature with verification' '
+ test_when_finished "git reset --hard && git checkout initial" &&
test_must_fail git merge --ff-only --verify-signatures side-untrusted 2>mergeerror &&
test_i18ngrep "has an untrusted GPG signature" mergeerror
'
+test_expect_success GPG 'merge commit with untrusted signature with merge.verifySignatures=true' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures true &&
+ test_must_fail git merge --ff-only side-untrusted 2>mergeerror &&
+ test_i18ngrep "has an untrusted GPG signature" mergeerror
+'
+
test_expect_success GPG 'merge signed commit with verification' '
+ test_when_finished "git reset --hard && git checkout initial" &&
git merge --verbose --ff-only --verify-signatures side-signed >mergeoutput &&
test_i18ngrep "has a good GPG signature" mergeoutput
'
+test_expect_success GPG 'merge signed commit with merge.verifySignatures=true' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures true &&
+ git merge --verbose --ff-only side-signed >mergeoutput &&
+ test_i18ngrep "has a good GPG signature" mergeoutput
+'
+
test_expect_success GPG 'merge commit with bad signature without verification' '
+ test_when_finished "git reset --hard && git checkout initial" &&
git merge $(cat forged.commit)
'
+test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=false' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures false &&
+ git merge $(cat forged.commit)
+'
+
+test_expect_success GPG 'merge commit with bad signature with merge.verifySignatures=true and --no-verify-signatures' '
+ test_when_finished "git reset --hard && git checkout initial" &&
+ test_config merge.verifySignatures true &&
+ git merge --no-verify-signatures $(cat forged.commit)
+'
+
test_done
diff --git a/t/t7614-merge-signoff.sh b/t/t7614-merge-signoff.sh
new file mode 100755
index 0000000..c1b8446
--- /dev/null
+++ b/t/t7614-merge-signoff.sh
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='git merge --signoff
+
+This test runs git merge --signoff and makes sure that it works.
+'
+
+. ./test-lib.sh
+
+# Setup test files
+test_setup() {
+ # Expected commit message after merge --signoff
+ cat >expected-signed <<EOF &&
+Merge branch 'master' into other-branch
+
+Signed-off-by: $(git var GIT_COMMITTER_IDENT | sed -e "s/>.*/>/")
+EOF
+
+ # Expected commit message after merge without --signoff (or with --no-signoff)
+ cat >expected-unsigned <<EOF &&
+Merge branch 'master' into other-branch
+EOF
+
+ # Initial commit and feature branch to merge master into it.
+ git commit --allow-empty -m "Initial empty commit" &&
+ git checkout -b other-branch &&
+ test_commit other-branch file1 1
+}
+
+# Setup repository, files & feature branch
+# This step must be run if You want to test 2,3 or 4
+# Order of 2,3,4 is not important, but 1 must be run before
+# For example `-r 1,4` or `-r 1,4,2 -v` etc
+# But not `-r 2` or `-r 4,3,2,1`
+test_expect_success 'setup' '
+ test_setup
+'
+
+# Test with --signoff flag
+test_expect_success 'git merge --signoff adds a sign-off line' '
+ git checkout master &&
+ test_commit master-branch-2 file2 2 &&
+ git checkout other-branch &&
+ git merge master --signoff --no-edit &&
+ git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+ test_cmp expected-signed actual
+'
+
+# Test without --signoff flag
+test_expect_success 'git merge does not add a sign-off line' '
+ git checkout master &&
+ test_commit master-branch-3 file3 3 &&
+ git checkout other-branch &&
+ git merge master --no-edit &&
+ git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+ test_cmp expected-unsigned actual
+'
+
+# Test for --no-signoff flag
+test_expect_success 'git merge --no-signoff flag cancels --signoff flag' '
+ git checkout master &&
+ test_commit master-branch-4 file4 4 &&
+ git checkout other-branch &&
+ git merge master --no-edit --signoff --no-signoff &&
+ git cat-file commit HEAD | sed -e "1,/^\$/d" >actual &&
+ test_cmp expected-unsigned actual
+'
+
+test_done
diff --git a/t/t7810-grep.sh b/t/t7810-grep.sh
index 2a6679c..1797f63 100755
--- a/t/t7810-grep.sh
+++ b/t/t7810-grep.sh
@@ -60,6 +60,18 @@
echo " line with leading space3"
echo "line without leading space2"
} >space &&
+ cat >hello.ps1 <<-\EOF &&
+ # No-op.
+ function dummy() {}
+
+ # Say hello.
+ function hello() {
+ echo "Hello world."
+ } # hello
+
+ # Still a no-op.
+ function dummy() {}
+ EOF
git add . &&
test_tick &&
git commit -m initial
@@ -766,18 +778,27 @@
test_cmp expected actual
'
-cat >expected <<EOF
-hello.c= printf("Hello world.\n");
-hello.c: return 0;
-hello.c- /* char ?? */
-EOF
-
test_expect_success 'grep -W with userdiff' '
test_when_finished "rm -f .gitattributes" &&
- git config diff.custom.xfuncname "(printf.*|})$" &&
- echo "hello.c diff=custom" >.gitattributes &&
- git grep -W return >actual &&
- test_cmp expected actual
+ git config diff.custom.xfuncname "^function .*$" &&
+ echo "hello.ps1 diff=custom" >.gitattributes &&
+ git grep -W echo >function-context-userdiff-actual
+'
+
+test_expect_success ' includes preceding comment' '
+ grep "# Say hello" function-context-userdiff-actual
+'
+
+test_expect_success ' includes function line' '
+ grep "=function hello" function-context-userdiff-actual
+'
+
+test_expect_success ' includes matching line' '
+ grep ": echo" function-context-userdiff-actual
+'
+
+test_expect_success ' includes last line of the function' '
+ grep "} # hello" function-context-userdiff-actual
'
for threads in $(test_seq 0 10)
@@ -1110,6 +1131,12 @@
test_cmp expected actual
'
+test_expect_success LIBPCRE2 "grep -P with (*NO_JIT) doesn't error out" '
+ git grep -P "(*NO_JIT)\p{Ps}.*?\p{Pe}" hello.c >actual &&
+ test_cmp expected actual
+
+'
+
test_expect_success !PCRE 'grep -P pattern errors without PCRE' '
test_must_fail git grep -P "foo.*bar"
'
diff --git a/t/t9001-send-email.sh b/t/t9001-send-email.sh
index f309808..81869d8 100755
--- a/t/t9001-send-email.sh
+++ b/t/t9001-send-email.sh
@@ -6,6 +6,12 @@
# May be altered later in the test
PREREQ="PERL"
+replace_variable_fields () {
+ sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
+ -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
+ -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
+}
+
test_expect_success $PREREQ 'prepare reference tree' '
echo "1A quick brown fox jumps over the" >file &&
echo "lazy dog" >>file &&
@@ -296,10 +302,7 @@
--bcc=bcc@example.com \
--in-reply-to="<unique-message-id@example.com>" \
--smtp-server relay.example.com \
- $patches |
- sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
- -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
- -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/" \
+ $patches | replace_variable_fields \
>actual-show-all-headers &&
test_cmp expected-show-all-headers actual-show-all-headers
'
@@ -554,12 +557,6 @@
EOF
"
-replace_variable_fields () {
- sed -e "s/^\(Date:\).*/\1 DATE-STRING/" \
- -e "s/^\(Message-Id:\).*/\1 MESSAGE-ID-STRING/" \
- -e "s/^\(X-Mailer:\).*/\1 X-MAILER-STRING/"
-}
-
test_suppression () {
git send-email \
--dry-run \
@@ -1266,7 +1263,7 @@
grep email-using-8bit stdout &&
grep "Which 8bit encoding" stdout &&
egrep "Content|MIME" msgtxt1 >actual &&
- test_cmp actual content-type-decl
+ test_cmp content-type-decl actual
'
test_expect_success $PREREQ 'sendemail.8bitEncoding works' '
@@ -1277,7 +1274,7 @@
--smtp-server="$(pwd)/fake.sendmail" \
email-using-8bit >stdout &&
egrep "Content|MIME" msgtxt1 >actual &&
- test_cmp actual content-type-decl
+ test_cmp content-type-decl actual
'
test_expect_success $PREREQ '--8bit-encoding overrides sendemail.8bitEncoding' '
@@ -1289,7 +1286,7 @@
--8bit-encoding=UTF-8 \
email-using-8bit >stdout &&
egrep "Content|MIME" msgtxt1 >actual &&
- test_cmp actual content-type-decl
+ test_cmp content-type-decl actual
'
test_expect_success $PREREQ 'setup expect' '
diff --git a/t/t9004-example.sh b/t/t9004-example.sh
new file mode 100755
index 0000000..b28a028
--- /dev/null
+++ b/t/t9004-example.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+test_description='check that example code compiles and runs'
+. ./test-lib.sh
+
+test_expect_success 'decorate' '
+ test-example-decorate
+'
+
+test_done
diff --git a/t/t9010-svn-fe.sh b/t/t9010-svn-fe.sh
index 6dafe7e..8eaaca6 100755
--- a/t/t9010-svn-fe.sh
+++ b/t/t9010-svn-fe.sh
@@ -4,12 +4,13 @@
. ./test-lib.sh
+if test_have_prereq !PIPE
+then
+ skip_all="svn dumpfile importer testing requires the PIPE prerequisite"
+ test_done
+fi
+
reinit_git () {
- if ! test_declared_prereq PIPE
- then
- echo >&4 "reinit_git: need to declare PIPE prerequisite"
- return 127
- fi
rm -fr .git &&
rm -f stream backflow &&
git init &&
@@ -54,19 +55,19 @@
>empty
-test_expect_success PIPE 'empty dump' '
+test_expect_success 'empty dump' '
reinit_git &&
echo "SVN-fs-dump-format-version: 2" >input &&
try_dump input
'
-test_expect_success PIPE 'v4 dumps not supported' '
+test_expect_success 'v4 dumps not supported' '
reinit_git &&
echo "SVN-fs-dump-format-version: 4" >v4.dump &&
try_dump v4.dump must_fail
'
-test_expect_failure PIPE 'empty revision' '
+test_expect_failure 'empty revision' '
reinit_git &&
printf "rev <nobody, nobody@local>: %s\n" "" "" >expect &&
cat >emptyrev.dump <<-\EOF &&
@@ -86,7 +87,7 @@
test_cmp expect actual
'
-test_expect_success PIPE 'empty properties' '
+test_expect_success 'empty properties' '
reinit_git &&
printf "rev <nobody, nobody@local>: %s\n" "" "" >expect &&
cat >emptyprop.dump <<-\EOF &&
@@ -109,7 +110,7 @@
test_cmp expect actual
'
-test_expect_success PIPE 'author name and commit message' '
+test_expect_success 'author name and commit message' '
reinit_git &&
echo "<author@example.com, author@example.com@local>" >expect.author &&
cat >message <<-\EOF &&
@@ -143,7 +144,7 @@
test_cmp expect.author actual.author
'
-test_expect_success PIPE 'unsupported properties are ignored' '
+test_expect_success 'unsupported properties are ignored' '
reinit_git &&
echo author >expect &&
cat >extraprop.dump <<-\EOF &&
@@ -168,7 +169,7 @@
test_cmp expect actual
'
-test_expect_failure PIPE 'timestamp and empty file' '
+test_expect_failure 'timestamp and empty file' '
echo author@example.com >expect.author &&
echo 1999-01-01 >expect.date &&
echo file >expect.files &&
@@ -210,7 +211,7 @@
test_cmp empty file
'
-test_expect_success PIPE 'directory with files' '
+test_expect_success 'directory with files' '
reinit_git &&
printf "%s\n" directory/file1 directory/file2 >expect.files &&
echo hi >hi &&
@@ -263,7 +264,7 @@
test_cmp hi directory/file2
'
-test_expect_success PIPE 'branch name with backslash' '
+test_expect_success 'branch name with backslash' '
reinit_git &&
sort <<-\EOF >expect.branch-files &&
trunk/file1
@@ -362,7 +363,7 @@
test_cmp expect.branch-files actual.branch-files
'
-test_expect_success PIPE 'node without action' '
+test_expect_success 'node without action' '
reinit_git &&
cat >inaction.dump <<-\EOF &&
SVN-fs-dump-format-version: 3
@@ -383,7 +384,7 @@
try_dump inaction.dump must_fail
'
-test_expect_success PIPE 'action: add node without text' '
+test_expect_success 'action: add node without text' '
reinit_git &&
cat >textless.dump <<-\EOF &&
SVN-fs-dump-format-version: 3
@@ -405,7 +406,7 @@
try_dump textless.dump must_fail
'
-test_expect_failure PIPE 'change file mode but keep old content' '
+test_expect_failure 'change file mode but keep old content' '
reinit_git &&
cat >expect <<-\EOF &&
OBJID
@@ -481,7 +482,7 @@
test_cmp hello actual.target
'
-test_expect_success PIPE 'NUL in property value' '
+test_expect_success 'NUL in property value' '
reinit_git &&
echo "commit message" >expect.message &&
{
@@ -507,7 +508,7 @@
test_cmp expect.message actual.message
'
-test_expect_success PIPE 'NUL in log message, file content, and property name' '
+test_expect_success 'NUL in log message, file content, and property name' '
# Caveat: svnadmin 1.6.16 (r1073529) truncates at \0 in the
# svn:specialQnotreally example.
reinit_git &&
@@ -587,7 +588,7 @@
test_cmp expect.hello2 actual.hello2
'
-test_expect_success PIPE 'change file mode and reiterate content' '
+test_expect_success 'change file mode and reiterate content' '
reinit_git &&
cat >expect <<-\EOF &&
OBJID
@@ -667,7 +668,7 @@
test_cmp hello actual.target
'
-test_expect_success PIPE 'deltas supported' '
+test_expect_success 'deltas supported' '
reinit_git &&
{
# (old) h + (inline) ello + (old) \n
@@ -731,7 +732,7 @@
try_dump delta.dump
'
-test_expect_success PIPE 'property deltas supported' '
+test_expect_success 'property deltas supported' '
reinit_git &&
cat >expect <<-\EOF &&
OBJID
@@ -796,7 +797,7 @@
test_cmp expect actual
'
-test_expect_success PIPE 'properties on /' '
+test_expect_success 'properties on /' '
reinit_git &&
cat <<-\EOF >expect &&
OBJID
@@ -850,7 +851,7 @@
test_cmp expect actual
'
-test_expect_success PIPE 'deltas for typechange' '
+test_expect_success 'deltas for typechange' '
reinit_git &&
cat >expect <<-\EOF &&
OBJID
@@ -935,7 +936,7 @@
test_cmp expect actual
'
-test_expect_success PIPE 'deltas need not consume the whole preimage' '
+test_expect_success 'deltas need not consume the whole preimage' '
reinit_git &&
cat >expect <<-\EOF &&
OBJID
@@ -1040,7 +1041,7 @@
test_cmp expect.3 actual.3
'
-test_expect_success PIPE 'no hang for delta trying to read past end of preimage' '
+test_expect_success 'no hang for delta trying to read past end of preimage' '
reinit_git &&
{
# COPY 1
@@ -1087,7 +1088,7 @@
fi
'
-test_expect_success SVNREPO,PIPE 't9135/svn.dump' '
+test_expect_success SVNREPO 't9135/svn.dump' '
mkdir -p simple-git &&
(
cd simple-git &&
diff --git a/t/t9020-remote-svn.sh b/t/t9020-remote-svn.sh
index 4d81ba1..6fca08e 100755
--- a/t/t9020-remote-svn.sh
+++ b/t/t9020-remote-svn.sh
@@ -25,8 +25,8 @@
git init &&
#git remote add svnsim testsvn::sim:///$TEST_DIRECTORY/t9020/example.svnrdump
# let's reuse an existing dump file!?
- git remote add svnsim testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump
- git remote add svnfile testsvn::file://$TEST_DIRECTORY/t9154/svn.dump
+ git remote add svnsim "testsvn::sim://$TEST_DIRECTORY/t9154/svn.dump"
+ git remote add svnfile "testsvn::file://$TEST_DIRECTORY/t9154/svn.dump"
}
if test -e "$GIT_BUILD_DIR/git-remote-testsvn"
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-git-svn-migrate.sh
index 9f3ef8f..ceaa5ba 100755
--- a/t/t9107-git-svn-migrate.sh
+++ b/t/t9107-git-svn-migrate.sh
@@ -28,7 +28,7 @@
git rev-parse --verify refs/heads/git-svn-HEAD^0
'
-svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/')
+svnrepo_escaped=$(echo $svnrepo | sed 's/ /%20/g')
test_expect_success 'initialize old-style (v0) git svn layout' '
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
diff --git a/t/t9114-git-svn-dcommit-merge.sh b/t/t9114-git-svn-dcommit-merge.sh
index a3d3882..50bca62 100755
--- a/t/t9114-git-svn-dcommit-merge.sh
+++ b/t/t9114-git-svn-dcommit-merge.sh
@@ -27,9 +27,7 @@
# 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
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
#
EOF
}
diff --git a/t/t9169-git-svn-dcommit-crlf.sh b/t/t9169-git-svn-dcommit-crlf.sh
new file mode 100755
index 0000000..54b1f61
--- /dev/null
+++ b/t/t9169-git-svn-dcommit-crlf.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+test_description='git svn dcommit CRLF'
+. ./lib-git-svn.sh
+
+test_expect_success 'setup commit repository' '
+ svn_cmd mkdir -m "$test_description" "$svnrepo/dir" &&
+ git svn clone "$svnrepo" work &&
+ (
+ cd work &&
+ echo foo >>foo &&
+ git update-index --add foo &&
+ printf "a\\r\\n\\r\\nb\\r\\nc\\r\\n" >cmt &&
+ p=$(git rev-parse HEAD) &&
+ t=$(git write-tree) &&
+ cmt=$(git commit-tree -p $p $t <cmt) &&
+ git update-ref refs/heads/master $cmt &&
+ git cat-file commit HEAD | tail -n4 >out &&
+ test_cmp cmt out &&
+ git svn dcommit &&
+ printf "a\\n\\nb\\nc\\n" >exp &&
+ git cat-file commit HEAD | sed -ne 6,9p >out &&
+ test_cmp exp out
+ )
+'
+
+test_done
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index d47560b..e4d06ac 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -876,7 +876,7 @@
EXPECT_END
git fast-import <input &&
- git diff-tree --abbrev --raw L^ L >output &&
+ GIT_PRINT_SHA1_ELLIPSIS="yes" git diff-tree --abbrev --raw L^ L >output &&
test_cmp expect output
'
diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh
index 3457d5d..71cae28 100755
--- a/t/t9807-git-p4-submit.sh
+++ b/t/t9807-git-p4-submit.sh
@@ -460,7 +460,13 @@
)
'
-# Update an existing shelved changelist
+make_shelved_cl() {
+ test_commit "$1" >/dev/null &&
+ git p4 submit --origin HEAD^ --shelve >/dev/null &&
+ p4 -G changes -s shelved -m 1 | marshal_dump change
+}
+
+# Update existing shelved changelists
test_expect_success 'submit --update-shelve' '
test_when_finished cleanup_git &&
@@ -470,21 +476,19 @@
p4 revert ... &&
cd "$git" &&
git config git-p4.skipSubmitEdit true &&
- test_commit "test-update-shelved-change" &&
- git p4 submit --origin=HEAD^ --shelve &&
+ shelved_cl0=$(make_shelved_cl "shelved-change-0") &&
+ echo shelved_cl0=$shelved_cl0 &&
+ shelved_cl1=$(make_shelved_cl "shelved-change-1") &&
- shelf_cl=$(p4 -G changes -s shelved -m 1 |\
- marshal_dump change) &&
- test -n $shelf_cl &&
- echo "updating shelved change list $shelf_cl" &&
+ echo "updating shelved change lists $shelved_cl0 and $shelved_cl1" &&
echo "updated-line" >>shelf.t &&
echo added-file.t >added-file.t &&
git add shelf.t added-file.t &&
- git rm -f test-update-shelved-change.t &&
+ git rm -f shelved-change-1.t &&
git commit --amend -C HEAD &&
git show --stat HEAD &&
- git p4 submit -v --origin HEAD^ --update-shelve $shelf_cl &&
+ git p4 submit -v --origin HEAD~2 --update-shelve $shelved_cl0 --update-shelve $shelved_cl1 &&
echo "done git p4 submit"
) &&
(
@@ -494,7 +498,7 @@
p4 unshelve -c $change -s $change &&
grep -q updated-line shelf.t &&
p4 describe -S $change | grep added-file.t &&
- test_path_is_missing test-update-shelved-change.t
+ test_path_is_missing shelved-change-1.t
)
'
diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh
index 2cb999e..fc614dc 100755
--- a/t/t9902-completion.sh
+++ b/t/t9902-completion.sh
@@ -1245,6 +1245,10 @@
--conflict=
--orphan Z
--patch Z
+ --detach Z
+ --ignore-skip-worktree-bits Z
+ --recurse-submodules Z
+ --no-recurse-submodules Z
EOF
'
diff --git a/t/test-lib-functions.sh b/t/test-lib-functions.sh
index 1701fe2..8a8a932 100644
--- a/t/test-lib-functions.sh
+++ b/t/test-lib-functions.sh
@@ -610,6 +610,14 @@
#
# Writing this as "! git checkout ../outerspace" is wrong, because
# the failure could be due to a segv. We want a controlled failure.
+#
+# Accepts the following options:
+#
+# ok=<signal-name>[,<...>]:
+# Don't treat an exit caused by the given signal as error.
+# Multiple signals can be specified as a comma separated list.
+# Currently recognized signal names are: sigpipe, success.
+# (Don't use 'success', use 'test_might_fail' instead.)
test_must_fail () {
case "$1" in
@@ -656,6 +664,8 @@
#
# Writing "git config --unset all.configuration || :" would be wrong,
# because we want to notice if it fails due to segv.
+#
+# Accepts the same options as test_must_fail.
test_might_fail () {
test_must_fail ok=success "$@"
@@ -705,6 +715,60 @@
cmp "$@"
}
+# Use this instead of test_cmp to compare files that contain expected and
+# actual output from git commands that can be translated. When running
+# under GETTEXT_POISON this pretends that the command produced expected
+# results.
+test_i18ncmp () {
+ test -n "$GETTEXT_POISON" || test_cmp "$@"
+}
+
+# Use this instead of "grep expected-string actual" to see if the
+# output from a git command that can be translated either contains an
+# expected string, or does not contain an unwanted one. When running
+# under GETTEXT_POISON this pretends that the command produced expected
+# results.
+test_i18ngrep () {
+ eval "last_arg=\${$#}"
+
+ test -f "$last_arg" ||
+ error "bug in the test script: test_i18ngrep requires a file" \
+ "to read as the last parameter"
+
+ if test $# -lt 2 ||
+ { test "x!" = "x$1" && test $# -lt 3 ; }
+ then
+ error "bug in the test script: too few parameters to test_i18ngrep"
+ fi
+
+ if test -n "$GETTEXT_POISON"
+ then
+ # pretend success
+ return 0
+ fi
+
+ if test "x!" = "x$1"
+ then
+ shift
+ ! grep "$@" && return 0
+
+ echo >&2 "error: '! grep $@' did find a match in:"
+ else
+ grep "$@" && return 0
+
+ echo >&2 "error: 'grep $@' didn't find a match in:"
+ fi
+
+ if test -s "$last_arg"
+ then
+ cat >&2 "$last_arg"
+ else
+ echo >&2 "<File '$last_arg' is empty>"
+ fi
+
+ return 1
+}
+
# Call any command "$@" but be more verbose about its
# failure. This is handy for commands like "test" which do
# not output anything when they fail.
@@ -1020,3 +1084,37 @@
"$@"
)
}
+
+# convert stdin to pktline representation; note that empty input becomes an
+# empty packet, not a flush packet (for that you can just print 0000 yourself).
+packetize() {
+ cat >packetize.tmp &&
+ len=$(wc -c <packetize.tmp) &&
+ printf '%04x%s' "$(($len + 4))" &&
+ cat packetize.tmp &&
+ rm -f packetize.tmp
+}
+
+# Parse the input as a series of pktlines, writing the result to stdout.
+# Sideband markers are removed automatically, and the output is routed to
+# stderr if appropriate.
+#
+# NUL bytes are converted to "\\0" for ease of parsing with text tools.
+depacketize () {
+ perl -e '
+ while (read(STDIN, $len, 4) == 4) {
+ if ($len eq "0000") {
+ print "FLUSH\n";
+ } else {
+ read(STDIN, $buf, hex($len) - 4);
+ $buf =~ s/\0/\\0/g;
+ if ($buf =~ s/^[\x2\x3]//) {
+ print STDERR $buf;
+ } else {
+ $buf =~ s/^\x1//;
+ print $buf;
+ }
+ }
+ }
+ '
+}
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 5fbd8d4..816e692 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -44,6 +44,11 @@
: ${ASAN_OPTIONS=detect_leaks=0:abort_on_error=1}
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}
+export LSAN_OPTIONS
+
################################################################
# It appears that people try to run tests without building...
"$GIT_BUILD_DIR/git" >/dev/null
@@ -75,7 +80,7 @@
# from any previous runs.
>"$GIT_TEST_TEE_OUTPUT_FILE"
- (GIT_TEST_TEE_STARTED=done ${SHELL_PATH} "$0" "$@" 2>&1;
+ (GIT_TEST_TEE_STARTED=done ${TEST_SHELL_PATH} "$0" "$@" 2>&1;
echo $? >"$BASE.exit") | tee -a "$GIT_TEST_TEE_OUTPUT_FILE"
test "$(cat "$BASE.exit")" = 0
exit
@@ -111,6 +116,7 @@
my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
print join("\n", @vars);
')
+unset XDG_CACHE_HOME
unset XDG_CONFIG_HOME
unset GITPERLLIB
GIT_AUTHOR_EMAIL=author@example.com
@@ -170,9 +176,10 @@
# Convenience
#
-# A regexp to match 5 and 40 hexdigits
+# A regexp to match 5, 35 and 40 hexdigits
_x05='[0-9a-f][0-9a-f][0-9a-f][0-9a-f][0-9a-f]'
-_x40="$_x05$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
+_x35="$_x05$_x05$_x05$_x05$_x05$_x05$_x05"
+_x40="$_x35$_x05"
# Zero SHA-1
_z40=0000000000000000000000000000000000000000
@@ -188,7 +195,7 @@
# when case-folding filenames
u200c=$(printf '\342\200\214')
-export _x05 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB
+export _x05 _x35 _x40 _z40 LF u200c EMPTY_TREE EMPTY_BLOB
# Each test should start with something like this, after copyright notices:
#
@@ -258,7 +265,6 @@
shift ;;
-x)
trace=t
- verbose=t
shift ;;
--verbose-log)
verbose_log=t
@@ -274,6 +280,11 @@
test -z "$verbose" && verbose_only="$valgrind_only"
elif test -n "$valgrind"
then
+ test -z "$verbose_log" && verbose=t
+fi
+
+if test -n "$trace" && test -z "$verbose_log"
+then
verbose=t
fi
@@ -580,7 +591,9 @@
}
want_trace () {
- test "$trace" = t && test "$verbose" = t
+ test "$trace" = t && {
+ test "$verbose" = t || test "$verbose_log" = t
+ }
}
# This is a separate function because some tests use
@@ -595,26 +608,40 @@
}
test_eval_ () {
- # We run this block with stderr redirected to avoid extra cruft
- # during a "-x" trace. Once in "set -x" mode, we cannot prevent
+ # If "-x" tracing is in effect, then we want to avoid polluting stderr
+ # with non-test commands. But once in "set -x" mode, we cannot prevent
# the shell from printing the "set +x" to turn it off (nor the saving
# of $? before that). But we can make sure that the output goes to
# /dev/null.
#
- # The test itself is run with stderr put back to &4 (so either to
- # /dev/null, or to the original stderr if --verbose was used).
+ # There are a few subtleties here:
+ #
+ # - we have to redirect descriptor 4 in addition to 2, to cover
+ # BASH_XTRACEFD
+ #
+ # - the actual eval has to come before the redirection block (since
+ # it needs to see descriptor 4 to set up its stderr)
+ #
+ # - likewise, any error message we print must be outside the block to
+ # access descriptor 4
+ #
+ # - checking $? has to come immediately after the eval, but it must
+ # be _inside_ the block to avoid polluting the "set -x" output
+ #
+
+ test_eval_inner_ "$@" </dev/null >&3 2>&4
{
- test_eval_inner_ "$@" </dev/null >&3 2>&4
test_eval_ret_=$?
if want_trace
then
set +x
- if test "$test_eval_ret_" != 0
- then
- say_color error >&4 "error: last command exited with \$?=$test_eval_ret_"
- fi
fi
- } 2>/dev/null
+ } 2>/dev/null 4>&2
+
+ if test "$test_eval_ret_" != 0 && want_trace
+ then
+ say_color error >&4 "error: last command exited with \$?=$test_eval_ret_"
+ fi
return $test_eval_ret_
}
@@ -1022,6 +1049,8 @@
test -z "$NO_PTHREADS" && test_set_prereq PTHREADS
test -z "$NO_PYTHON" && test_set_prereq PYTHON
test -n "$USE_LIBPCRE1$USE_LIBPCRE2" && test_set_prereq PCRE
+test -n "$USE_LIBPCRE1" && test_set_prereq LIBPCRE1
+test -n "$USE_LIBPCRE2" && test_set_prereq LIBPCRE2
test -z "$NO_GETTEXT" && test_set_prereq GETTEXT
# Can we rely on git's output in the C locale?
@@ -1034,42 +1063,10 @@
test_set_prereq C_LOCALE_OUTPUT
fi
-# Use this instead of test_cmp to compare files that contain expected and
-# actual output from git commands that can be translated. When running
-# under GETTEXT_POISON this pretends that the command produced expected
-# results.
-test_i18ncmp () {
- test -n "$GETTEXT_POISON" || test_cmp "$@"
-}
-
-# Use this instead of "grep expected-string actual" to see if the
-# output from a git command that can be translated either contains an
-# expected string, or does not contain an unwanted one. When running
-# under GETTEXT_POISON this pretends that the command produced expected
-# results.
-test_i18ngrep () {
- if test -n "$GETTEXT_POISON"
- then
- : # pretend success
- elif test "x!" = "x$1"
- then
- shift
- ! grep "$@"
- else
- grep "$@"
- fi
-}
-
test_lazy_prereq PIPE '
# test whether the filesystem supports FIFOs
- case $(uname -s) in
- CYGWIN*|MINGW*)
- false
- ;;
- *)
- rm -f testfifo && mkfifo testfifo
- ;;
- esac
+ test_have_prereq !MINGW,!CYGWIN &&
+ rm -f testfifo && mkfifo testfifo
'
test_lazy_prereq SYMLINKS '
@@ -1165,7 +1162,19 @@
(ulimit -s 128 && "$@")
}
-test_lazy_prereq CMDLINE_LIMIT 'run_with_limited_cmdline true'
+test_lazy_prereq CMDLINE_LIMIT '
+ test_have_prereq !MINGW,!CYGWIN &&
+ run_with_limited_cmdline true
+'
+
+run_with_limited_stack () {
+ (ulimit -s 128 && "$@")
+}
+
+test_lazy_prereq ULIMIT_STACK_SIZE '
+ test_have_prereq !MINGW,!CYGWIN &&
+ run_with_limited_stack true
+'
build_option () {
git version --build-options |
diff --git a/tag.c b/tag.c
index a3ffffd..fcbe012 100644
--- a/tag.c
+++ b/tag.c
@@ -33,7 +33,7 @@
return ret;
}
-int gpg_verify_tag(const unsigned char *sha1, const char *name_to_report,
+int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
unsigned flags)
{
enum object_type type;
@@ -41,20 +41,20 @@
unsigned long size;
int ret;
- type = sha1_object_info(sha1, NULL);
+ type = sha1_object_info(oid->hash, NULL);
if (type != OBJ_TAG)
return error("%s: cannot verify a non-tag object of type %s.",
name_to_report ?
name_to_report :
- find_unique_abbrev(sha1, DEFAULT_ABBREV),
+ find_unique_abbrev(oid->hash, DEFAULT_ABBREV),
typename(type));
- buf = read_sha1_file(sha1, &type, &size);
+ buf = read_sha1_file(oid->hash, &type, &size);
if (!buf)
return error("%s: unable to read file.",
name_to_report ?
name_to_report :
- find_unique_abbrev(sha1, DEFAULT_ABBREV));
+ find_unique_abbrev(oid->hash, DEFAULT_ABBREV));
ret = run_gpg_verify(buf, size, flags);
diff --git a/tag.h b/tag.h
index fdfcb4a..d469534 100644
--- a/tag.h
+++ b/tag.h
@@ -17,7 +17,7 @@
extern int parse_tag(struct tag *item);
extern struct object *deref_tag(struct object *, const char *, int);
extern struct object *deref_tag_noverify(struct object *);
-extern int gpg_verify_tag(const unsigned char *sha1,
+extern int gpg_verify_tag(const struct object_id *oid,
const char *name_to_report, unsigned flags);
#endif /* TAG_H */
diff --git a/tempfile.c b/tempfile.c
index 6843710..5fdafdd 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -30,21 +30,19 @@
* `fdopen_tempfile()` has been called on the object
* - `owner` holds the PID of the process that created the file
*
- * - Active, file closed (after successful `close_tempfile()`). Same
+ * - Active, file closed (after `close_tempfile_gently()`). Same
* as the previous state, except that the temporary file is closed,
* `fd` is -1, and `fp` is `NULL`.
*
- * - Inactive (after `delete_tempfile()`, `rename_tempfile()`, a
- * failed attempt to create a temporary file, or a failed
- * `close_tempfile()`). In this state:
+ * - Inactive (after `delete_tempfile()`, `rename_tempfile()`, or a
+ * failed attempt to create a temporary file). In this state:
*
* - `active` is unset
* - `filename` is empty (usually, though there are transitory
* states in which this condition doesn't hold). Client code should
* *not* rely on the filename being empty in this state.
* - `fd` is -1 and `fp` is `NULL`
- * - the object is left registered in the `tempfile_list`, and
- * `on_list` is set.
+ * - the object is removed from `tempfile_list` (but could be used again)
*
* A temporary file is owned by the process that created it. The
* `tempfile` has an `owner` field that records the owner's PID. This
@@ -56,20 +54,28 @@
#include "tempfile.h"
#include "sigchain.h"
-static struct tempfile *volatile tempfile_list;
+static VOLATILE_LIST_HEAD(tempfile_list);
-static void remove_tempfiles(int skip_fclose)
+static void remove_tempfiles(int in_signal_handler)
{
pid_t me = getpid();
+ volatile struct volatile_list_head *pos;
- while (tempfile_list) {
- if (tempfile_list->owner == me) {
- /* fclose() is not safe to call in a signal handler */
- if (skip_fclose)
- tempfile_list->fp = NULL;
- delete_tempfile(tempfile_list);
- }
- tempfile_list = tempfile_list->next;
+ list_for_each(pos, &tempfile_list) {
+ struct tempfile *p = list_entry(pos, struct tempfile, list);
+
+ if (!is_tempfile_active(p) || p->owner != me)
+ continue;
+
+ if (p->fd >= 0)
+ close(p->fd);
+
+ if (in_signal_handler)
+ unlink(p->filename.buf);
+ else
+ unlink_or_warn(p->filename.buf);
+
+ p->active = 0;
}
}
@@ -85,39 +91,48 @@
raise(signo);
}
-/*
- * Initialize *tempfile if necessary and add it to tempfile_list.
- */
-static void prepare_tempfile_object(struct tempfile *tempfile)
+static struct tempfile *new_tempfile(void)
{
- if (!tempfile_list) {
- /* One-time initialization */
+ struct tempfile *tempfile = xmalloc(sizeof(*tempfile));
+ tempfile->fd = -1;
+ tempfile->fp = NULL;
+ tempfile->active = 0;
+ tempfile->owner = 0;
+ INIT_LIST_HEAD(&tempfile->list);
+ strbuf_init(&tempfile->filename, 0);
+ return tempfile;
+}
+
+static void activate_tempfile(struct tempfile *tempfile)
+{
+ static int initialized;
+
+ if (is_tempfile_active(tempfile))
+ BUG("activate_tempfile called for active object");
+
+ if (!initialized) {
sigchain_push_common(remove_tempfiles_on_signal);
atexit(remove_tempfiles_on_exit);
+ initialized = 1;
}
- if (tempfile->active)
- die("BUG: prepare_tempfile_object called for active object");
- if (!tempfile->on_list) {
- /* Initialize *tempfile and add it to tempfile_list: */
- tempfile->fd = -1;
- tempfile->fp = NULL;
- tempfile->active = 0;
- tempfile->owner = 0;
- strbuf_init(&tempfile->filename, 0);
- tempfile->next = tempfile_list;
- tempfile_list = tempfile;
- tempfile->on_list = 1;
- } else if (tempfile->filename.len) {
- /* This shouldn't happen, but better safe than sorry. */
- die("BUG: prepare_tempfile_object called for improperly-reset object");
- }
+ volatile_list_add(&tempfile->list, &tempfile_list);
+ tempfile->owner = getpid();
+ tempfile->active = 1;
+}
+
+static void deactivate_tempfile(struct tempfile *tempfile)
+{
+ tempfile->active = 0;
+ strbuf_release(&tempfile->filename);
+ volatile_list_del(&tempfile->list);
+ free(tempfile);
}
/* Make sure errno contains a meaningful value on error */
-int create_tempfile(struct tempfile *tempfile, const char *path)
+struct tempfile *create_tempfile(const char *path)
{
- prepare_tempfile_object(tempfile);
+ struct tempfile *tempfile = new_tempfile();
strbuf_add_absolute_path(&tempfile->filename, path);
tempfile->fd = open(tempfile->filename.buf,
@@ -127,52 +142,48 @@
tempfile->fd = open(tempfile->filename.buf,
O_RDWR | O_CREAT | O_EXCL, 0666);
if (tempfile->fd < 0) {
- strbuf_reset(&tempfile->filename);
- return -1;
+ deactivate_tempfile(tempfile);
+ return NULL;
}
- tempfile->owner = getpid();
- tempfile->active = 1;
+ activate_tempfile(tempfile);
if (adjust_shared_perm(tempfile->filename.buf)) {
int save_errno = errno;
error("cannot fix permission bits on %s", tempfile->filename.buf);
- delete_tempfile(tempfile);
+ delete_tempfile(&tempfile);
errno = save_errno;
- return -1;
+ return NULL;
}
- return tempfile->fd;
+
+ return tempfile;
}
-void register_tempfile(struct tempfile *tempfile, const char *path)
+struct tempfile *register_tempfile(const char *path)
{
- prepare_tempfile_object(tempfile);
+ struct tempfile *tempfile = new_tempfile();
strbuf_add_absolute_path(&tempfile->filename, path);
- tempfile->owner = getpid();
- tempfile->active = 1;
+ activate_tempfile(tempfile);
+ return tempfile;
}
-int mks_tempfile_sm(struct tempfile *tempfile,
- const char *template, int suffixlen, int mode)
+struct tempfile *mks_tempfile_sm(const char *template, int suffixlen, int mode)
{
- prepare_tempfile_object(tempfile);
+ struct tempfile *tempfile = new_tempfile();
strbuf_add_absolute_path(&tempfile->filename, template);
tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
if (tempfile->fd < 0) {
- strbuf_reset(&tempfile->filename);
- return -1;
+ deactivate_tempfile(tempfile);
+ return NULL;
}
- tempfile->owner = getpid();
- tempfile->active = 1;
- return tempfile->fd;
+ activate_tempfile(tempfile);
+ return tempfile;
}
-int mks_tempfile_tsm(struct tempfile *tempfile,
- const char *template, int suffixlen, int mode)
+struct tempfile *mks_tempfile_tsm(const char *template, int suffixlen, int mode)
{
+ struct tempfile *tempfile = new_tempfile();
const char *tmpdir;
- prepare_tempfile_object(tempfile);
-
tmpdir = getenv("TMPDIR");
if (!tmpdir)
tmpdir = "/tmp";
@@ -180,35 +191,34 @@
strbuf_addf(&tempfile->filename, "%s/%s", tmpdir, template);
tempfile->fd = git_mkstemps_mode(tempfile->filename.buf, suffixlen, mode);
if (tempfile->fd < 0) {
- strbuf_reset(&tempfile->filename);
- return -1;
+ deactivate_tempfile(tempfile);
+ return NULL;
}
- tempfile->owner = getpid();
- tempfile->active = 1;
- return tempfile->fd;
+ activate_tempfile(tempfile);
+ return tempfile;
}
-int xmks_tempfile_m(struct tempfile *tempfile, const char *template, int mode)
+struct tempfile *xmks_tempfile_m(const char *template, int mode)
{
- int fd;
+ struct tempfile *tempfile;
struct strbuf full_template = STRBUF_INIT;
strbuf_add_absolute_path(&full_template, template);
- fd = mks_tempfile_m(tempfile, full_template.buf, mode);
- if (fd < 0)
+ tempfile = mks_tempfile_m(full_template.buf, mode);
+ if (!tempfile)
die_errno("Unable to create temporary file '%s'",
full_template.buf);
strbuf_release(&full_template);
- return fd;
+ return tempfile;
}
FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode)
{
- if (!tempfile->active)
- die("BUG: fdopen_tempfile() called for inactive object");
+ if (!is_tempfile_active(tempfile))
+ BUG("fdopen_tempfile() called for inactive object");
if (tempfile->fp)
- die("BUG: fdopen_tempfile() called for open object");
+ BUG("fdopen_tempfile() called for open object");
tempfile->fp = fdopen(tempfile->fd, mode);
return tempfile->fp;
@@ -216,34 +226,36 @@
const char *get_tempfile_path(struct tempfile *tempfile)
{
- if (!tempfile->active)
- die("BUG: get_tempfile_path() called for inactive object");
+ if (!is_tempfile_active(tempfile))
+ BUG("get_tempfile_path() called for inactive object");
return tempfile->filename.buf;
}
int get_tempfile_fd(struct tempfile *tempfile)
{
- if (!tempfile->active)
- die("BUG: get_tempfile_fd() called for inactive object");
+ if (!is_tempfile_active(tempfile))
+ BUG("get_tempfile_fd() called for inactive object");
return tempfile->fd;
}
FILE *get_tempfile_fp(struct tempfile *tempfile)
{
- if (!tempfile->active)
- die("BUG: get_tempfile_fp() called for inactive object");
+ if (!is_tempfile_active(tempfile))
+ BUG("get_tempfile_fp() called for inactive object");
return tempfile->fp;
}
-int close_tempfile(struct tempfile *tempfile)
+int close_tempfile_gently(struct tempfile *tempfile)
{
- int fd = tempfile->fd;
- FILE *fp = tempfile->fp;
+ int fd;
+ FILE *fp;
int err;
- if (fd < 0)
+ if (!is_tempfile_active(tempfile) || tempfile->fd < 0)
return 0;
+ fd = tempfile->fd;
+ fp = tempfile->fp;
tempfile->fd = -1;
if (fp) {
tempfile->fp = NULL;
@@ -258,54 +270,52 @@
err = close(fd);
}
- if (err) {
- int save_errno = errno;
- delete_tempfile(tempfile);
- errno = save_errno;
- return -1;
- }
-
- return 0;
+ return err ? -1 : 0;
}
int reopen_tempfile(struct tempfile *tempfile)
{
+ if (!is_tempfile_active(tempfile))
+ BUG("reopen_tempfile called for an inactive object");
if (0 <= tempfile->fd)
- die("BUG: reopen_tempfile called for an open object");
- if (!tempfile->active)
- die("BUG: reopen_tempfile called for an inactive object");
+ BUG("reopen_tempfile called for an open object");
tempfile->fd = open(tempfile->filename.buf, O_WRONLY);
return tempfile->fd;
}
-int rename_tempfile(struct tempfile *tempfile, const char *path)
+int rename_tempfile(struct tempfile **tempfile_p, const char *path)
{
- if (!tempfile->active)
- die("BUG: rename_tempfile called for inactive object");
+ struct tempfile *tempfile = *tempfile_p;
- if (close_tempfile(tempfile))
+ if (!is_tempfile_active(tempfile))
+ BUG("rename_tempfile called for inactive object");
+
+ if (close_tempfile_gently(tempfile)) {
+ delete_tempfile(tempfile_p);
return -1;
+ }
if (rename(tempfile->filename.buf, path)) {
int save_errno = errno;
- delete_tempfile(tempfile);
+ delete_tempfile(tempfile_p);
errno = save_errno;
return -1;
}
- tempfile->active = 0;
- strbuf_reset(&tempfile->filename);
+ deactivate_tempfile(tempfile);
+ *tempfile_p = NULL;
return 0;
}
-void delete_tempfile(struct tempfile *tempfile)
+void delete_tempfile(struct tempfile **tempfile_p)
{
- if (!tempfile->active)
+ struct tempfile *tempfile = *tempfile_p;
+
+ if (!is_tempfile_active(tempfile))
return;
- if (!close_tempfile(tempfile)) {
- unlink_or_warn(tempfile->filename.buf);
- tempfile->active = 0;
- strbuf_reset(&tempfile->filename);
- }
+ close_tempfile_gently(tempfile);
+ unlink_or_warn(tempfile->filename.buf);
+ deactivate_tempfile(tempfile);
+ *tempfile_p = NULL;
}
diff --git a/tempfile.h b/tempfile.h
index 2f0038d..450908b 100644
--- a/tempfile.h
+++ b/tempfile.h
@@ -1,6 +1,8 @@
#ifndef TEMPFILE_H
#define TEMPFILE_H
+#include "list.h"
+
/*
* Handle temporary files.
*
@@ -15,25 +17,18 @@
*
* The caller:
*
- * * Allocates a `struct tempfile` either as a static variable or on
- * the heap, initialized to zeros. Once you use the structure to
- * call `create_tempfile()`, it belongs to the tempfile subsystem
- * and its storage must remain valid throughout the life of the
- * program (i.e. you cannot use an on-stack variable to hold this
- * structure).
- *
* * Attempts to create a temporary file by calling
- * `create_tempfile()`.
+ * `create_tempfile()`. The resources used for the temporary file are
+ * managed by the tempfile API.
*
* * Writes new content to the file by either:
*
- * * writing to the file descriptor returned by `create_tempfile()`
- * (also available via `tempfile->fd`).
+ * * writing to the `tempfile->fd` file descriptor
*
* * calling `fdopen_tempfile()` to get a `FILE` pointer for the
* open file and writing to the file using stdio.
*
- * Note that the file descriptor returned by create_tempfile()
+ * Note that the file descriptor created by create_tempfile()
* is marked O_CLOEXEC, so the new contents must be written by
* the current process, not any spawned one.
*
@@ -47,19 +42,18 @@
* control of the file.
*
* * Close the file descriptor without removing or renaming the
- * temporary file by calling `close_tempfile()`, and later call
+ * temporary file by calling `close_tempfile_gently()`, and later call
* `delete_tempfile()` or `rename_tempfile()`.
*
- * Even after the temporary file is renamed or deleted, the `tempfile`
- * object must not be freed or altered by the caller. However, it may
- * be reused; just pass it to another call of `create_tempfile()`.
+ * After the temporary file is renamed or deleted, the `tempfile`
+ * object is no longer valid and should not be reused.
*
* If the program exits before `rename_tempfile()` or
* `delete_tempfile()` is called, an `atexit(3)` handler will close
* and remove the temporary file.
*
* If you need to close the file descriptor yourself, do so by calling
- * `close_tempfile()`. You should never call `close(2)` or `fclose(3)`
+ * `close_tempfile_gently()`. You should never call `close(2)` or `fclose(3)`
* yourself, otherwise the `struct tempfile` structure would still
* think that the file descriptor needs to be closed, and a later
* cleanup would result in duplicate calls to `close(2)`. Worse yet,
@@ -71,30 +65,30 @@
* Error handling
* --------------
*
- * `create_tempfile()` returns a file descriptor on success or -1 on
- * failure. On errors, `errno` describes the reason for failure.
+ * `create_tempfile()` returns an allocated tempfile on success or NULL
+ * on failure. On errors, `errno` describes the reason for failure.
*
- * `delete_tempfile()`, `rename_tempfile()`, and `close_tempfile()`
- * return 0 on success. On failure they set `errno` appropriately, do
- * their best to delete the temporary file, and return -1.
+ * `rename_tempfile()` and `close_tempfile_gently()` return 0 on success.
+ * On failure they set `errno` appropriately and return -1.
+ * `delete_tempfile()` and `rename` (but not `close`) do their best to
+ * delete the temporary file before returning.
*/
struct tempfile {
- struct tempfile *volatile next;
+ volatile struct volatile_list_head list;
volatile sig_atomic_t active;
volatile int fd;
FILE *volatile fp;
volatile pid_t owner;
- char on_list;
struct strbuf filename;
};
/*
* Attempt to create a temporary file at the specified `path`. Return
- * a file descriptor for writing to it, or -1 on error. It is an error
- * if a file already exists at that path.
+ * a tempfile (whose "fd" member can be used for writing to it), or
+ * NULL on error. It is an error if a file already exists at that path.
*/
-extern int create_tempfile(struct tempfile *tempfile, const char *path);
+extern struct tempfile *create_tempfile(const char *path);
/*
* Register an existing file as a tempfile, meaning that it will be
@@ -102,7 +96,7 @@
* but it can be worked with like any other closed tempfile (for
* example, it can be opened using reopen_tempfile()).
*/
-extern void register_tempfile(struct tempfile *tempfile, const char *path);
+extern struct tempfile *register_tempfile(const char *path);
/*
@@ -134,83 +128,78 @@
* know the (absolute) path of the file that was created, it can be
* read from tempfile->filename.
*
- * On success, the functions return a file descriptor that is open for
- * writing the temporary file. On errors, they return -1 and set errno
- * appropriately (except for the "x" variants, which die() on errors).
+ * On success, the functions return a tempfile whose "fd" member is open
+ * for writing the temporary file. On errors, they return NULL and set
+ * errno appropriately (except for the "x" variants, which die() on
+ * errors).
*/
/* See "mks_tempfile functions" above. */
-extern int mks_tempfile_sm(struct tempfile *tempfile,
- const char *template, int suffixlen, int mode);
+extern struct tempfile *mks_tempfile_sm(const char *template,
+ int suffixlen, int mode);
/* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_s(struct tempfile *tempfile,
- const char *template, int suffixlen)
+static inline struct tempfile *mks_tempfile_s(const char *template,
+ int suffixlen)
{
- return mks_tempfile_sm(tempfile, template, suffixlen, 0600);
+ return mks_tempfile_sm(template, suffixlen, 0600);
}
/* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_m(struct tempfile *tempfile,
- const char *template, int mode)
+static inline struct tempfile *mks_tempfile_m(const char *template, int mode)
{
- return mks_tempfile_sm(tempfile, template, 0, mode);
+ return mks_tempfile_sm(template, 0, mode);
}
/* See "mks_tempfile functions" above. */
-static inline int mks_tempfile(struct tempfile *tempfile,
- const char *template)
+static inline struct tempfile *mks_tempfile(const char *template)
{
- return mks_tempfile_sm(tempfile, template, 0, 0600);
+ return mks_tempfile_sm(template, 0, 0600);
}
/* See "mks_tempfile functions" above. */
-extern int mks_tempfile_tsm(struct tempfile *tempfile,
- const char *template, int suffixlen, int mode);
+extern struct tempfile *mks_tempfile_tsm(const char *template,
+ int suffixlen, int mode);
/* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_ts(struct tempfile *tempfile,
- const char *template, int suffixlen)
+static inline struct tempfile *mks_tempfile_ts(const char *template,
+ int suffixlen)
{
- return mks_tempfile_tsm(tempfile, template, suffixlen, 0600);
+ return mks_tempfile_tsm(template, suffixlen, 0600);
}
/* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_tm(struct tempfile *tempfile,
- const char *template, int mode)
+static inline struct tempfile *mks_tempfile_tm(const char *template, int mode)
{
- return mks_tempfile_tsm(tempfile, template, 0, mode);
+ return mks_tempfile_tsm(template, 0, mode);
}
/* See "mks_tempfile functions" above. */
-static inline int mks_tempfile_t(struct tempfile *tempfile,
- const char *template)
+static inline struct tempfile *mks_tempfile_t(const char *template)
{
- return mks_tempfile_tsm(tempfile, template, 0, 0600);
+ return mks_tempfile_tsm(template, 0, 0600);
}
/* See "mks_tempfile functions" above. */
-extern int xmks_tempfile_m(struct tempfile *tempfile,
- const char *template, int mode);
+extern struct tempfile *xmks_tempfile_m(const char *template, int mode);
/* See "mks_tempfile functions" above. */
-static inline int xmks_tempfile(struct tempfile *tempfile,
- const char *template)
+static inline struct tempfile *xmks_tempfile(const char *template)
{
- return xmks_tempfile_m(tempfile, template, 0600);
+ return xmks_tempfile_m(template, 0600);
}
/*
* 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()` is called or
+ * stream is closed automatically when `close_tempfile_gently()` is called or
* when the file is deleted or renamed.
*/
extern FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode);
static inline int is_tempfile_active(struct tempfile *tempfile)
{
- return tempfile->active;
+ return tempfile && tempfile->active;
}
/*
@@ -226,20 +215,20 @@
* If the temporary file is still open, close it (and the file pointer
* too, if it has been opened using `fdopen_tempfile()`) without
* deleting the file. Return 0 upon success. On failure to `close(2)`,
- * return a negative value and delete the file. Usually
- * `delete_tempfile()` or `rename_tempfile()` should eventually be
- * called if `close_tempfile()` succeeds.
+ * return a negative value. Usually `delete_tempfile()` or `rename_tempfile()`
+ * should eventually be called regardless of whether `close_tempfile_gently()`
+ * succeeds.
*/
-extern int close_tempfile(struct tempfile *tempfile);
+extern int close_tempfile_gently(struct tempfile *tempfile);
/*
* Re-open a temporary file that has been closed using
- * `close_tempfile()` but not yet deleted or renamed. This can be used
+ * `close_tempfile_gently()` but not yet deleted or renamed. This can be used
* to implement a sequence of operations like the following:
*
* * Create temporary file.
*
- * * Write new contents to file, then `close_tempfile()` to cause the
+ * * Write new contents to file, then `close_tempfile_gently()` to cause the
* contents to be written to disk.
*
* * Pass the name of the temporary file to another program to allow
@@ -259,7 +248,7 @@
* `delete_tempfile()` for a `tempfile` object that has already been
* deleted or renamed.
*/
-extern void delete_tempfile(struct tempfile *tempfile);
+extern void delete_tempfile(struct tempfile **tempfile_p);
/*
* Close the file descriptor and/or file pointer if they are still
@@ -270,6 +259,6 @@
* `rename(2)`. It is a bug to call `rename_tempfile()` for a
* `tempfile` object that is not currently active.
*/
-extern int rename_tempfile(struct tempfile *tempfile, const char *path);
+extern int rename_tempfile(struct tempfile **tempfile_p, const char *path);
#endif /* TEMPFILE_H */
diff --git a/templates/hooks--fsmonitor-watchman.sample b/templates/hooks--fsmonitor-watchman.sample
new file mode 100755
index 0000000..e673bb3
--- /dev/null
+++ b/templates/hooks--fsmonitor-watchman.sample
@@ -0,0 +1,114 @@
+#!/usr/bin/perl
+
+use strict;
+use warnings;
+use IPC::Open2;
+
+# An example hook script to integrate Watchman
+# (https://facebook.github.io/watchman/) with git to speed up detecting
+# new and modified files.
+#
+# The hook is passed a version (currently 1) and a time in nanoseconds
+# formatted as a string and outputs to stdout all files that have been
+# modified since the given time. Paths must be relative to the root of
+# the working tree and separated by a single NUL.
+#
+# To enable this hook, rename this file to "query-watchman" and set
+# 'git config core.fsmonitor .git/hooks/query-watchman'
+#
+my ($version, $time) = @ARGV;
+
+# Check the hook interface version
+
+if ($version == 1) {
+ # convert nanoseconds to seconds
+ $time = int $time / 1000000000;
+} else {
+ die "Unsupported query-fsmonitor hook version '$version'.\n" .
+ "Falling back to scanning...\n";
+}
+
+my $git_work_tree;
+if ($^O =~ 'msys' || $^O =~ 'cygwin') {
+ $git_work_tree = Win32::GetCwd();
+ $git_work_tree =~ tr/\\/\//;
+} else {
+ require Cwd;
+ $git_work_tree = Cwd::cwd();
+}
+
+my $retry = 1;
+
+launch_watchman();
+
+sub launch_watchman {
+
+ my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty')
+ or die "open2() failed: $!\n" .
+ "Falling back to scanning...\n";
+
+ # In the query expression below we're asking for names of files that
+ # changed since $time but were not transient (ie created after
+ # $time but no longer exist).
+ #
+ # To accomplish this, we're using the "since" generator to use the
+ # recency index to select candidate nodes and "fields" to limit the
+ # output to file names only. Then we're using the "expression" term to
+ # further constrain the results.
+ #
+ # The category of transient files that we want to ignore will have a
+ # creation clock (cclock) newer than $time_t value and will also not
+ # currently exist.
+
+ my $query = <<" END";
+ ["query", "$git_work_tree", {
+ "since": $time,
+ "fields": ["name"],
+ "expression": ["not", ["allof", ["since", $time, "cclock"], ["not", "exists"]]]
+ }]
+ END
+
+ print CHLD_IN $query;
+ close CHLD_IN;
+ my $response = do {local $/; <CHLD_OUT>};
+
+ die "Watchman: command returned no output.\n" .
+ "Falling back to scanning...\n" if $response eq "";
+ die "Watchman: command returned invalid output: $response\n" .
+ "Falling back to scanning...\n" unless $response =~ /^\{/;
+
+ my $json_pkg;
+ eval {
+ require JSON::XS;
+ $json_pkg = "JSON::XS";
+ 1;
+ } or do {
+ require JSON::PP;
+ $json_pkg = "JSON::PP";
+ };
+
+ my $o = $json_pkg->new->utf8->decode($response);
+
+ if ($retry > 0 and $o->{error} and $o->{error} =~ m/unable to resolve root .* directory (.*) is not watched/) {
+ print STDERR "Adding '$git_work_tree' to watchman's watch list.\n";
+ $retry--;
+ qx/watchman watch "$git_work_tree"/;
+ die "Failed to make watchman watch '$git_work_tree'.\n" .
+ "Falling back to scanning...\n" if $? != 0;
+
+ # Watchman will always return all files on the first query so
+ # return the fast "everything is dirty" flag to git and do the
+ # Watchman query just to get it over with now so we won't pay
+ # the cost in git to look up each individual file.
+ print "/\0";
+ eval { launch_watchman() };
+ exit 0;
+ }
+
+ die "Watchman: $o->{error}.\n" .
+ "Falling back to scanning...\n" if $o->{error};
+
+ binmode STDOUT, ":utf8";
+ local $, = "\0";
+ print @{$o->{files}};
+}
diff --git a/templates/hooks--pre-rebase.sample b/templates/hooks--pre-rebase.sample
index b7f81c1..db5feab 100755
--- a/templates/hooks--pre-rebase.sample
+++ b/templates/hooks--pre-rebase.sample
@@ -58,7 +58,7 @@
not_in_topic=`git rev-list "^$topic" master`
if test -z "$not_in_topic"
then
- echo >&2 "$topic is already up-to-date with master"
+ echo >&2 "$topic is already up to date with master"
exit 1 ;# we could allow it, but there is no point.
else
exit 0
diff --git a/templates/hooks--prepare-commit-msg.sample b/templates/hooks--prepare-commit-msg.sample
index 86b8f22..318afe3 100755
--- a/templates/hooks--prepare-commit-msg.sample
+++ b/templates/hooks--prepare-commit-msg.sample
@@ -9,8 +9,8 @@
#
# To enable this hook, rename this file to "prepare-commit-msg".
-# This hook includes three examples. The first comments out the
-# "Conflicts:" part of a merge commit.
+# This hook includes three examples. The first one removes the
+# "# Please enter the commit message..." help message.
#
# The second includes the output of "git diff --name-status -r"
# into the message, just before the "git status" output. It is
@@ -20,17 +20,23 @@
# The third example adds a Signed-off-by line to the message, that can
# still be edited. This is rarely a good idea.
-case "$2,$3" in
- merge,)
- @PERL_PATH@ -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+COMMIT_MSG_FILE=$1
+COMMIT_SOURCE=$2
+SHA1=$3
-# ,|template,)
-# @PERL_PATH@ -i.bak -pe '
-# print "\n" . `git diff --cached --name-status -r`
-# if /^#/ && $first++ == 0' "$1" ;;
+@PERL_PATH@ -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE"
- *) ;;
-esac
+# case "$COMMIT_SOURCE,$SHA1" in
+# ,|template,)
+# @PERL_PATH@ -i.bak -pe '
+# print "\n" . `git diff --cached --name-status -r`
+# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;;
+# *) ;;
+# esac
-# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
-# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE"
+# if test -z "$COMMIT_SOURCE"
+# then
+# @PERL_PATH@ -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE"
+# fi
diff --git a/trace.c b/trace.c
index 7508aea..b7530b5 100644
--- a/trace.c
+++ b/trace.c
@@ -18,33 +18,20 @@
* 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
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "cache.h"
#include "quote.h"
-/*
- * "Normalize" a key argument by converting NULL to our trace_default,
- * and otherwise passing through the value. All caller-facing functions
- * should normalize their inputs in this way, though most get it
- * for free by calling get_trace_fd() (directly or indirectly).
- */
-static void normalize_trace_key(struct trace_key **key)
-{
- static struct trace_key trace_default = { "GIT_TRACE" };
- if (!*key)
- *key = &trace_default;
-}
+struct trace_key trace_default_key = { "GIT_TRACE", 0, 0, 0 };
+struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
/* Get a trace file descriptor from "key" env variable. */
static int get_trace_fd(struct trace_key *key)
{
const char *trace;
- normalize_trace_key(&key);
-
/* don't open twice */
if (key->initialized)
return key->fd;
@@ -82,8 +69,6 @@
void trace_disable(struct trace_key *key)
{
- normalize_trace_key(&key);
-
if (key->need_close)
close(key->fd);
key->fd = 0;
@@ -129,7 +114,6 @@
static void trace_write(struct trace_key *key, const void *buf, unsigned len)
{
if (write_in_full(get_trace_fd(key), buf, len) < 0) {
- normalize_trace_key(&key);
warning("unable to write trace for %s: %s",
key->key, strerror(errno));
trace_disable(key);
@@ -168,13 +152,13 @@
{
struct strbuf buf = STRBUF_INIT;
- if (!prepare_trace_line(file, line, NULL, &buf))
+ if (!prepare_trace_line(file, line, &trace_default_key, &buf))
return;
strbuf_vaddf(&buf, format, ap);
sq_quote_argv(&buf, argv, 0);
- print_trace_line(NULL, &buf);
+ print_trace_line(&trace_default_key, &buf);
}
void trace_strbuf_fl(const char *file, int line, struct trace_key *key,
@@ -189,8 +173,6 @@
print_trace_line(key, &buf);
}
-static struct trace_key trace_perf_key = TRACE_KEY_INIT(PERFORMANCE);
-
static void trace_performance_vprintf_fl(const char *file, int line,
uint64_t nanos, const char *format,
va_list ap)
@@ -216,7 +198,7 @@
{
va_list ap;
va_start(ap, format);
- trace_vprintf_fl(NULL, 0, NULL, format, ap);
+ trace_vprintf_fl(NULL, 0, &trace_default_key, format, ap);
va_end(ap);
}
diff --git a/trace.h b/trace.h
index 179b249..88055ab 100644
--- a/trace.h
+++ b/trace.h
@@ -11,7 +11,10 @@
unsigned int need_close : 1;
};
+extern struct trace_key trace_default_key;
+
#define TRACE_KEY_INIT(name) { "GIT_TRACE_" #name, 0, 0, 0 }
+extern struct trace_key trace_perf_key;
extern void trace_repo_setup(const char *prefix);
extern int trace_want(struct trace_key *key);
@@ -77,24 +80,42 @@
* comma, but this is non-standard.
*/
-#define trace_printf(...) \
- trace_printf_key_fl(TRACE_CONTEXT, __LINE__, NULL, __VA_ARGS__)
+#define trace_printf_key(key, ...) \
+ do { \
+ if (trace_pass_fl(key)) \
+ trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, \
+ __VA_ARGS__); \
+ } while (0)
-#define trace_printf_key(key, ...) \
- trace_printf_key_fl(TRACE_CONTEXT, __LINE__, key, __VA_ARGS__)
+#define trace_printf(...) trace_printf_key(&trace_default_key, __VA_ARGS__)
-#define trace_argv_printf(argv, ...) \
- trace_argv_printf_fl(TRACE_CONTEXT, __LINE__, argv, __VA_ARGS__)
+#define trace_argv_printf(argv, ...) \
+ do { \
+ if (trace_pass_fl(&trace_default_key)) \
+ trace_argv_printf_fl(TRACE_CONTEXT, __LINE__, \
+ argv, __VA_ARGS__); \
+ } while (0)
-#define trace_strbuf(key, data) \
- trace_strbuf_fl(TRACE_CONTEXT, __LINE__, key, data)
+#define trace_strbuf(key, data) \
+ do { \
+ if (trace_pass_fl(key)) \
+ trace_strbuf_fl(TRACE_CONTEXT, __LINE__, key, data);\
+ } while (0)
-#define trace_performance(nanos, ...) \
- trace_performance_fl(TRACE_CONTEXT, __LINE__, nanos, __VA_ARGS__)
+#define trace_performance(nanos, ...) \
+ do { \
+ if (trace_pass_fl(&trace_perf_key)) \
+ trace_performance_fl(TRACE_CONTEXT, __LINE__, nanos,\
+ __VA_ARGS__); \
+ } while (0)
-#define trace_performance_since(start, ...) \
- trace_performance_fl(TRACE_CONTEXT, __LINE__, getnanotime() - (start), \
- __VA_ARGS__)
+#define trace_performance_since(start, ...) \
+ do { \
+ if (trace_pass_fl(&trace_perf_key)) \
+ trace_performance_fl(TRACE_CONTEXT, __LINE__, \
+ getnanotime() - (start), \
+ __VA_ARGS__); \
+ } while (0)
/* backend functions, use non-*fl macros instead */
__attribute__((format (printf, 4, 5)))
@@ -108,6 +129,10 @@
__attribute__((format (printf, 4, 5)))
extern void trace_performance_fl(const char *file, int line,
uint64_t nanos, const char *fmt, ...);
+static inline int trace_pass_fl(struct trace_key *key)
+{
+ return key->fd || !key->initialized;
+}
#endif /* HAVE_VARIADIC_MACROS */
diff --git a/trailer.c b/trailer.c
index 751b56c..3ba157e 100644
--- a/trailer.c
+++ b/trailer.c
@@ -10,18 +10,13 @@
* Copyright (c) 2013, 2014 Christian Couder <chriscool@tuxfamily.org>
*/
-enum action_where { WHERE_END, WHERE_AFTER, WHERE_BEFORE, WHERE_START };
-enum action_if_exists { EXISTS_ADD_IF_DIFFERENT_NEIGHBOR, EXISTS_ADD_IF_DIFFERENT,
- EXISTS_ADD, EXISTS_REPLACE, EXISTS_DO_NOTHING };
-enum action_if_missing { MISSING_ADD, MISSING_DO_NOTHING };
-
struct conf_info {
char *name;
char *key;
char *command;
- enum action_where where;
- enum action_if_exists if_exists;
- enum action_if_missing if_missing;
+ enum trailer_where where;
+ enum trailer_if_exists if_exists;
+ enum trailer_if_missing if_missing;
};
static struct conf_info default_conf_info;
@@ -63,7 +58,7 @@
pos != (head); \
pos = is_reverse ? pos->prev : pos->next)
-static int after_or_end(enum action_where where)
+static int after_or_end(enum trailer_where where)
{
return (where == WHERE_AFTER) || (where == WHERE_END);
}
@@ -164,13 +159,15 @@
fprintf(outfile, "%s%c %s\n", tok, separators[0], val);
}
-static void print_all(FILE *outfile, struct list_head *head, int trim_empty)
+static void print_all(FILE *outfile, struct list_head *head,
+ const struct process_trailer_options *opts)
{
struct list_head *pos;
struct trailer_item *item;
list_for_each(pos, head) {
item = list_entry(pos, struct trailer_item, list);
- if (!trim_empty || strlen(item->value) > 0)
+ if ((!opts->trim_empty || strlen(item->value) > 0) &&
+ (!opts->only_trailers || item->token))
print_tok_val(outfile, item->token, item->value);
}
}
@@ -201,7 +198,7 @@
int check_all,
struct list_head *head)
{
- enum action_where where = arg_tok->conf.where;
+ enum trailer_where where = arg_tok->conf.where;
struct list_head *next_head;
do {
if (same_trailer(in_tok, arg_tok))
@@ -300,13 +297,16 @@
else
free_arg_item(arg_tok);
break;
+ default:
+ die("BUG: trailer.c: unhandled value %d",
+ arg_tok->conf.if_exists);
}
}
static void apply_arg_if_missing(struct list_head *head,
struct arg_item *arg_tok)
{
- enum action_where where;
+ enum trailer_where where;
struct trailer_item *to_add;
switch (arg_tok->conf.if_missing) {
@@ -321,6 +321,10 @@
list_add_tail(&to_add->list, head);
else
list_add(&to_add->list, head);
+ break;
+ default:
+ die("BUG: trailer.c: unhandled value %d",
+ arg_tok->conf.if_missing);
}
}
@@ -331,7 +335,7 @@
struct trailer_item *in_tok;
struct trailer_item *on_tok;
- enum action_where where = arg_tok->conf.where;
+ enum trailer_where where = arg_tok->conf.where;
int middle = (where == WHERE_AFTER) || (where == WHERE_BEFORE);
int backwards = after_or_end(where);
struct trailer_item *start_tok;
@@ -373,44 +377,50 @@
}
}
-static int set_where(struct conf_info *item, const char *value)
+int trailer_set_where(enum trailer_where *item, const char *value)
{
- if (!strcasecmp("after", value))
- item->where = WHERE_AFTER;
+ if (!value)
+ *item = WHERE_DEFAULT;
+ else if (!strcasecmp("after", value))
+ *item = WHERE_AFTER;
else if (!strcasecmp("before", value))
- item->where = WHERE_BEFORE;
+ *item = WHERE_BEFORE;
else if (!strcasecmp("end", value))
- item->where = WHERE_END;
+ *item = WHERE_END;
else if (!strcasecmp("start", value))
- item->where = WHERE_START;
+ *item = WHERE_START;
else
return -1;
return 0;
}
-static int set_if_exists(struct conf_info *item, const char *value)
+int trailer_set_if_exists(enum trailer_if_exists *item, const char *value)
{
- if (!strcasecmp("addIfDifferent", value))
- item->if_exists = EXISTS_ADD_IF_DIFFERENT;
+ if (!value)
+ *item = EXISTS_DEFAULT;
+ else if (!strcasecmp("addIfDifferent", value))
+ *item = EXISTS_ADD_IF_DIFFERENT;
else if (!strcasecmp("addIfDifferentNeighbor", value))
- item->if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
+ *item = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
else if (!strcasecmp("add", value))
- item->if_exists = EXISTS_ADD;
+ *item = EXISTS_ADD;
else if (!strcasecmp("replace", value))
- item->if_exists = EXISTS_REPLACE;
+ *item = EXISTS_REPLACE;
else if (!strcasecmp("doNothing", value))
- item->if_exists = EXISTS_DO_NOTHING;
+ *item = EXISTS_DO_NOTHING;
else
return -1;
return 0;
}
-static int set_if_missing(struct conf_info *item, const char *value)
+int trailer_set_if_missing(enum trailer_if_missing *item, const char *value)
{
- if (!strcasecmp("doNothing", value))
- item->if_missing = MISSING_DO_NOTHING;
+ if (!value)
+ *item = MISSING_DEFAULT;
+ else if (!strcasecmp("doNothing", value))
+ *item = MISSING_DO_NOTHING;
else if (!strcasecmp("add", value))
- item->if_missing = MISSING_ADD;
+ *item = MISSING_ADD;
else
return -1;
return 0;
@@ -470,15 +480,18 @@
variable_name = strrchr(trailer_item, '.');
if (!variable_name) {
if (!strcmp(trailer_item, "where")) {
- if (set_where(&default_conf_info, value) < 0)
+ if (trailer_set_where(&default_conf_info.where,
+ value) < 0)
warning(_("unknown value '%s' for key '%s'"),
value, conf_key);
} else if (!strcmp(trailer_item, "ifexists")) {
- if (set_if_exists(&default_conf_info, value) < 0)
+ if (trailer_set_if_exists(&default_conf_info.if_exists,
+ value) < 0)
warning(_("unknown value '%s' for key '%s'"),
value, conf_key);
} else if (!strcmp(trailer_item, "ifmissing")) {
- if (set_if_missing(&default_conf_info, value) < 0)
+ if (trailer_set_if_missing(&default_conf_info.if_missing,
+ value) < 0)
warning(_("unknown value '%s' for key '%s'"),
value, conf_key);
} else if (!strcmp(trailer_item, "separators")) {
@@ -532,15 +545,15 @@
conf->command = xstrdup(value);
break;
case TRAILER_WHERE:
- if (set_where(conf, value))
+ if (trailer_set_where(&conf->where, value))
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
break;
case TRAILER_IF_EXISTS:
- if (set_if_exists(conf, value))
+ if (trailer_set_if_exists(&conf->if_exists, value))
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
break;
case TRAILER_IF_MISSING:
- if (set_if_missing(conf, value))
+ if (trailer_set_if_missing(&conf->if_missing, value))
warning(_("unknown value '%s' for key '%s'"), value, conf_key);
break;
default:
@@ -555,6 +568,9 @@
return;
/* Default config must be setup first */
+ default_conf_info.where = WHERE_END;
+ default_conf_info.if_exists = EXISTS_ADD_IF_DIFFERENT_NEIGHBOR;
+ default_conf_info.if_missing = MISSING_ADD;
git_config(git_trailer_default_config, NULL);
git_config(git_trailer_config, NULL);
configured = 1;
@@ -658,19 +674,27 @@
}
static void add_arg_item(struct list_head *arg_head, char *tok, char *val,
- const struct conf_info *conf)
+ const struct conf_info *conf,
+ const struct new_trailer_item *new_trailer_item)
{
struct arg_item *new = xcalloc(sizeof(*new), 1);
new->token = tok;
new->value = val;
duplicate_conf(&new->conf, conf);
+ if (new_trailer_item) {
+ if (new_trailer_item->where != WHERE_DEFAULT)
+ new->conf.where = new_trailer_item->where;
+ if (new_trailer_item->if_exists != EXISTS_DEFAULT)
+ new->conf.if_exists = new_trailer_item->if_exists;
+ if (new_trailer_item->if_missing != MISSING_DEFAULT)
+ new->conf.if_missing = new_trailer_item->if_missing;
+ }
list_add_tail(&new->list, arg_head);
}
static void process_command_line_args(struct list_head *arg_head,
- struct string_list *trailers)
+ struct list_head *new_trailer_head)
{
- struct string_list_item *tr;
struct arg_item *item;
struct strbuf tok = STRBUF_INIT;
struct strbuf val = STRBUF_INIT;
@@ -690,26 +714,29 @@
add_arg_item(arg_head,
xstrdup(token_from_item(item, NULL)),
xstrdup(""),
- &item->conf);
+ &item->conf, NULL);
}
/* Add an arg item for each trailer on the command line */
- for_each_string_list_item(tr, trailers) {
- int separator_pos = find_separator(tr->string, cl_separators);
+ list_for_each(pos, new_trailer_head) {
+ struct new_trailer_item *tr =
+ list_entry(pos, struct new_trailer_item, list);
+ int separator_pos = find_separator(tr->text, cl_separators);
+
if (separator_pos == 0) {
struct strbuf sb = STRBUF_INIT;
- strbuf_addstr(&sb, tr->string);
+ strbuf_addstr(&sb, tr->text);
strbuf_trim(&sb);
error(_("empty trailer token in trailer '%.*s'"),
(int) sb.len, sb.buf);
strbuf_release(&sb);
} else {
- parse_trailer(&tok, &val, &conf, tr->string,
+ parse_trailer(&tok, &val, &conf, tr->text,
separator_pos);
add_arg_item(arg_head,
strbuf_detach(&tok, NULL),
strbuf_detach(&val, NULL),
- conf);
+ conf, tr);
}
}
@@ -885,9 +912,37 @@
return is_blank_line(buf + ll);
}
+static void unfold_value(struct strbuf *val)
+{
+ struct strbuf out = STRBUF_INIT;
+ size_t i;
+
+ strbuf_grow(&out, val->len);
+ i = 0;
+ while (i < val->len) {
+ char c = val->buf[i++];
+ if (c == '\n') {
+ /* Collapse continuation down to a single space. */
+ while (i < val->len && isspace(val->buf[i]))
+ i++;
+ strbuf_addch(&out, ' ');
+ } else {
+ strbuf_addch(&out, c);
+ }
+ }
+
+ /* Empty lines may have left us with whitespace cruft at the edges */
+ strbuf_trim(&out);
+
+ /* output goes back to val as if we modified it in-place */
+ strbuf_swap(&out, val);
+ strbuf_release(&out);
+}
+
static int process_input_file(FILE *outfile,
const char *str,
- struct list_head *head)
+ struct list_head *head,
+ const struct process_trailer_options *opts)
{
struct trailer_info info;
struct strbuf tok = STRBUF_INIT;
@@ -897,9 +952,10 @@
trailer_info_get(&info, str);
/* Print lines before the trailers as is */
- fwrite(str, 1, info.trailer_start - str, outfile);
+ if (!opts->only_trailers)
+ fwrite(str, 1, info.trailer_start - str, outfile);
- if (!info.blank_line_before_trailer)
+ if (!opts->only_trailers && !info.blank_line_before_trailer)
fprintf(outfile, "\n");
for (i = 0; i < info.trailer_nr; i++) {
@@ -911,10 +967,12 @@
if (separator_pos >= 1) {
parse_trailer(&tok, &val, NULL, trailer,
separator_pos);
+ if (opts->unfold)
+ unfold_value(&val);
add_trailer_item(head,
strbuf_detach(&tok, NULL),
strbuf_detach(&val, NULL));
- } else {
+ } else if (!opts->only_trailers) {
strbuf_addstr(&val, trailer);
strbuf_strip_suffix(&val, "\n");
add_trailer_item(head,
@@ -937,7 +995,7 @@
}
}
-static struct tempfile trailers_tempfile;
+static struct tempfile *trailers_tempfile;
static FILE *create_in_place_tempfile(const char *file)
{
@@ -959,19 +1017,20 @@
strbuf_add(&template, file, tail - file + 1);
strbuf_addstr(&template, "git-interpret-trailers-XXXXXX");
- xmks_tempfile_m(&trailers_tempfile, template.buf, st.st_mode);
+ trailers_tempfile = xmks_tempfile_m(template.buf, st.st_mode);
strbuf_release(&template);
- outfile = fdopen_tempfile(&trailers_tempfile, "w");
+ outfile = fdopen_tempfile(trailers_tempfile, "w");
if (!outfile)
die_errno(_("could not open temporary file"));
return outfile;
}
-void process_trailers(const char *file, int in_place, int trim_empty, struct string_list *trailers)
+void process_trailers(const char *file,
+ const struct process_trailer_options *opts,
+ struct list_head *new_trailer_head)
{
LIST_HEAD(head);
- LIST_HEAD(arg_head);
struct strbuf sb = STRBUF_INIT;
int trailer_end;
FILE *outfile = stdout;
@@ -980,24 +1039,27 @@
read_input_file(&sb, file);
- if (in_place)
+ if (opts->in_place)
outfile = create_in_place_tempfile(file);
/* Print the lines before the trailers */
- trailer_end = process_input_file(outfile, sb.buf, &head);
+ trailer_end = process_input_file(outfile, sb.buf, &head, opts);
- process_command_line_args(&arg_head, trailers);
+ if (!opts->only_input) {
+ LIST_HEAD(arg_head);
+ process_command_line_args(&arg_head, new_trailer_head);
+ process_trailers_lists(&head, &arg_head);
+ }
- process_trailers_lists(&head, &arg_head);
-
- print_all(outfile, &head, trim_empty);
+ print_all(outfile, &head, opts);
free_all(&head);
/* Print the lines after the trailers as is */
- fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
+ if (!opts->only_trailers)
+ fwrite(sb.buf + trailer_end, 1, sb.len - trailer_end, outfile);
- if (in_place)
+ if (opts->in_place)
if (rename_tempfile(&trailers_tempfile, file))
die_errno(_("could not rename temporary file to %s"), file);
@@ -1054,3 +1116,49 @@
free(info->trailers[i]);
free(info->trailers);
}
+
+static void format_trailer_info(struct strbuf *out,
+ const struct trailer_info *info,
+ const struct process_trailer_options *opts)
+{
+ int i;
+
+ /* If we want the whole block untouched, we can take the fast path. */
+ if (!opts->only_trailers && !opts->unfold) {
+ strbuf_add(out, info->trailer_start,
+ info->trailer_end - info->trailer_start);
+ return;
+ }
+
+ for (i = 0; i < info->trailer_nr; i++) {
+ char *trailer = info->trailers[i];
+ int separator_pos = find_separator(trailer, separators);
+
+ if (separator_pos >= 1) {
+ struct strbuf tok = STRBUF_INIT;
+ struct strbuf val = STRBUF_INIT;
+
+ parse_trailer(&tok, &val, NULL, trailer, separator_pos);
+ if (opts->unfold)
+ unfold_value(&val);
+
+ strbuf_addf(out, "%s: %s\n", tok.buf, val.buf);
+ strbuf_release(&tok);
+ strbuf_release(&val);
+
+ } else if (!opts->only_trailers) {
+ strbuf_addstr(out, trailer);
+ }
+ }
+
+}
+
+void format_trailers_from_commit(struct strbuf *out, const char *msg,
+ const struct process_trailer_options *opts)
+{
+ struct trailer_info info;
+
+ trailer_info_get(&info, msg);
+ format_trailer_info(out, &info, opts);
+ trailer_info_release(&info);
+}
diff --git a/trailer.h b/trailer.h
index 65cc5d7..6d7f8c2 100644
--- a/trailer.h
+++ b/trailer.h
@@ -1,6 +1,33 @@
#ifndef TRAILER_H
#define TRAILER_H
+#include "list.h"
+
+enum trailer_where {
+ WHERE_DEFAULT,
+ WHERE_END,
+ WHERE_AFTER,
+ WHERE_BEFORE,
+ WHERE_START
+};
+enum trailer_if_exists {
+ EXISTS_DEFAULT,
+ EXISTS_ADD_IF_DIFFERENT_NEIGHBOR,
+ EXISTS_ADD_IF_DIFFERENT,
+ EXISTS_ADD,
+ EXISTS_REPLACE,
+ EXISTS_DO_NOTHING
+};
+enum trailer_if_missing {
+ MISSING_DEFAULT,
+ MISSING_ADD,
+ MISSING_DO_NOTHING
+};
+
+int trailer_set_where(enum trailer_where *item, const char *value);
+int trailer_set_if_exists(enum trailer_if_exists *item, const char *value);
+int trailer_set_if_missing(enum trailer_if_missing *item, const char *value);
+
struct trailer_info {
/*
* True if there is a blank line before the location pointed to by
@@ -22,11 +49,50 @@
size_t trailer_nr;
};
-void process_trailers(const char *file, int in_place, int trim_empty,
- struct string_list *trailers);
+/*
+ * A list that represents newly-added trailers, such as those provided
+ * with the --trailer command line option of git-interpret-trailers.
+ */
+struct new_trailer_item {
+ struct list_head list;
+
+ const char *text;
+
+ enum trailer_where where;
+ enum trailer_if_exists if_exists;
+ enum trailer_if_missing if_missing;
+};
+
+struct process_trailer_options {
+ int in_place;
+ int trim_empty;
+ int only_trailers;
+ int only_input;
+ int unfold;
+};
+
+#define PROCESS_TRAILER_OPTIONS_INIT {0}
+
+void process_trailers(const char *file,
+ const struct process_trailer_options *opts,
+ struct list_head *new_trailer_head);
void trailer_info_get(struct trailer_info *info, const char *str);
void trailer_info_release(struct trailer_info *info);
+/*
+ * Format the trailers from the commit msg "msg" into the strbuf "out".
+ * Note two caveats about "opts":
+ *
+ * - this is primarily a helper for pretty.c, and not
+ * all of the flags are supported.
+ *
+ * - this differs from process_trailers slightly in that we always format
+ * only the trailer block itself, even if the "only_trailers" option is not
+ * set.
+ */
+void format_trailers_from_commit(struct strbuf *out, const char *msg,
+ const struct process_trailer_options *opts);
+
#endif /* TRAILER_H */
diff --git a/transport-helper.c b/transport-helper.c
index a72ed18..5080150 100644
--- a/transport-helper.c
+++ b/transport-helper.c
@@ -11,6 +11,7 @@
#include "sigchain.h"
#include "argv-array.h"
#include "refs.h"
+#include "transport-internal.h"
static int debug;
@@ -535,7 +536,7 @@
else
private = xstrdup(name);
if (private) {
- if (read_ref(private, posn->old_oid.hash) < 0)
+ if (read_ref(private, &posn->old_oid) < 0)
die("Could not read ref %s", private);
free(private);
}
@@ -603,6 +604,7 @@
cmdbuf.buf);
exit:
+ strbuf_release(&cmdbuf);
fclose(input);
return ret;
}
@@ -649,7 +651,7 @@
if (process_connect(transport, 0)) {
do_take_over(transport);
- return transport->fetch(transport, nr_heads, to_fetch);
+ return transport->vtable->fetch(transport, nr_heads, to_fetch);
}
count = 0;
@@ -794,7 +796,8 @@
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
if (!private)
continue;
- update_ref("update by helper", private, ref->new_oid.hash, NULL, 0, 0);
+ update_ref("update by helper", private, &ref->new_oid, NULL,
+ 0, 0);
free(private);
}
strbuf_release(&buf);
@@ -880,7 +883,8 @@
struct strbuf cas = STRBUF_INIT;
strbuf_addf(&cas, "%s:%s",
ref->name, oid_to_hex(&ref->old_oid_expect));
- string_list_append(&cas_options, strbuf_detach(&cas, NULL));
+ string_list_append_nodup(&cas_options,
+ strbuf_detach(&cas, NULL));
}
}
if (buf.len == 0) {
@@ -895,6 +899,7 @@
strbuf_addch(&buf, '\n');
sendline(data, &buf);
strbuf_release(&buf);
+ string_list_clear(&cas_options, 0);
return push_update_refs_status(data, remote_refs, flags);
}
@@ -926,9 +931,10 @@
struct object_id oid;
private = apply_refspecs(data->refspecs, data->refspec_nr, ref->name);
- if (private && !get_sha1(private, oid.hash)) {
+ if (private && !get_oid(private, &oid)) {
strbuf_addf(&buf, "^%s", private);
- string_list_append(&revlist_args, strbuf_detach(&buf, NULL));
+ string_list_append_nodup(&revlist_args,
+ strbuf_detach(&buf, NULL));
oidcpy(&ref->old_oid, &oid);
}
free(private);
@@ -940,10 +946,9 @@
int flag;
/* Follow symbolic refs (mainly for HEAD). */
- name = resolve_ref_unsafe(
- ref->peer_ref->name,
- RESOLVE_REF_READING,
- oid.hash, &flag);
+ name = resolve_ref_unsafe(ref->peer_ref->name,
+ RESOLVE_REF_READING,
+ &oid, &flag);
if (!name || !(flag & REF_ISSYMREF))
name = ref->peer_ref->name;
@@ -986,7 +991,7 @@
if (process_connect(transport, 1)) {
do_take_over(transport);
- return transport->push_refs(transport, remote_refs, flags);
+ return transport->vtable->push_refs(transport, remote_refs, flags);
}
if (!remote_refs) {
@@ -1034,7 +1039,7 @@
if (process_connect(transport, for_push)) {
do_take_over(transport);
- return transport->get_refs_list(transport, for_push);
+ return transport->vtable->get_refs_list(transport, for_push);
}
if (data->push && for_push)
@@ -1065,8 +1070,7 @@
if (eon) {
if (has_attribute(eon + 1, "unchanged")) {
(*tail)->status |= REF_STATUS_UPTODATE;
- if (read_ref((*tail)->name,
- (*tail)->old_oid.hash) < 0)
+ if (read_ref((*tail)->name, &(*tail)->old_oid) < 0)
die(_("Could not read ref %s"),
(*tail)->name);
}
@@ -1083,6 +1087,15 @@
return ret;
}
+static struct transport_vtable vtable = {
+ set_helper_option,
+ get_refs_list,
+ fetch,
+ push_refs,
+ connect_helper,
+ release_helper
+};
+
int transport_helper_init(struct transport *transport, const char *name)
{
struct helper_data *data = xcalloc(1, sizeof(*data));
@@ -1094,12 +1107,7 @@
debug = 1;
transport->data = data;
- transport->set_option = set_helper_option;
- transport->get_refs_list = get_refs_list;
- transport->fetch = fetch;
- transport->push_refs = push_refs;
- transport->disconnect = release_helper;
- transport->connect = connect_helper;
+ transport->vtable = &vtable;
transport->smart_options = &(data->transport_options);
return 0;
}
diff --git a/transport-internal.h b/transport-internal.h
new file mode 100644
index 0000000..3c1a29d
--- /dev/null
+++ b/transport-internal.h
@@ -0,0 +1,61 @@
+#ifndef TRANSPORT_INTERNAL_H
+#define TRANSPORT_INTERNAL_H
+
+struct ref;
+struct transport;
+
+struct transport_vtable {
+ /**
+ * Returns 0 if successful, positive if the option is not
+ * recognized or is inapplicable, and negative if the option
+ * is applicable but the value is invalid.
+ **/
+ int (*set_option)(struct transport *connection, const char *name,
+ const char *value);
+ /**
+ * Returns a list of the remote side's refs. In order to allow
+ * the transport to try to share connections, for_push is a
+ * hint as to whether the ultimate operation is a push or a fetch.
+ *
+ * If the transport is able to determine the remote hash for
+ * the ref without a huge amount of effort, it should store it
+ * in the ref's old_sha1 field; otherwise it should be all 0.
+ **/
+ struct ref *(*get_refs_list)(struct transport *transport, int for_push);
+
+ /**
+ * Fetch the objects for the given refs. Note that this gets
+ * an array, and should ignore the list structure.
+ *
+ * If the transport did not get hashes for refs in
+ * get_refs_list(), it should set the old_sha1 fields in the
+ * provided refs now.
+ **/
+ int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
+
+ /**
+ * Push the objects and refs. Send the necessary objects, and
+ * then, for any refs where peer_ref is set and
+ * peer_ref->new_oid is different from old_oid, tell the
+ * remote side to update each ref in the list from old_oid to
+ * peer_ref->new_oid.
+ *
+ * Where possible, set the status for each ref appropriately.
+ *
+ * The transport must modify new_sha1 in the ref to the new
+ * value if the remote accepted the change. Note that this
+ * could be a different value from peer_ref->new_oid if the
+ * process involved generating new commits.
+ **/
+ int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
+ int (*connect)(struct transport *connection, const char *name,
+ const char *executable, int fd[2]);
+
+ /** get_refs_list(), fetch(), and push_refs() can keep
+ * resources (such as a connection) reserved for further
+ * use. disconnect() releases these resources.
+ **/
+ int (*disconnect)(struct transport *connection);
+};
+
+#endif
diff --git a/transport.c b/transport.c
index d75ff05..fc80226 100644
--- a/transport.c
+++ b/transport.c
@@ -17,6 +17,7 @@
#include "string-list.h"
#include "sha1-array.h"
#include "sigchain.h"
+#include "transport-internal.h"
static void set_upstreams(struct transport *transport, struct ref *refs,
int pretend)
@@ -26,7 +27,6 @@
const char *localname;
const char *tmp;
const char *remotename;
- unsigned char sha[20];
int flag = 0;
/*
* Check suitability for tracking. Must be successful /
@@ -44,7 +44,7 @@
localname = ref->peer_ref->name;
remotename = ref->name;
tmp = resolve_ref_unsafe(localname, RESOLVE_REF_READING,
- sha, &flag);
+ NULL, &flag);
if (tmp && flag & REF_ISSYMREF &&
starts_with(tmp, "refs/heads/"))
localname = tmp;
@@ -306,8 +306,8 @@
if (ref->deletion) {
delete_ref(NULL, rs.dst, NULL, 0);
} else
- update_ref("update by push", rs.dst,
- ref->new_oid.hash, NULL, 0, 0);
+ update_ref("update by push", rs.dst, &ref->new_oid,
+ NULL, 0, 0);
free(rs.dst);
}
}
@@ -472,11 +472,10 @@
{
struct ref *ref;
int n = 0;
- struct object_id head_oid;
char *head;
int summary_width = transport_summary_width(refs);
- head = resolve_refdup("HEAD", RESOLVE_REF_READING, head_oid.hash, NULL);
+ head = resolve_refdup("HEAD", RESOLVE_REF_READING, NULL, NULL);
if (verbose) {
for (ref = refs; ref; ref = ref->next)
@@ -609,6 +608,15 @@
return 0;
}
+static struct transport_vtable taken_over_vtable = {
+ NULL,
+ get_refs_via_connect,
+ fetch_refs_via_pack,
+ git_transport_push,
+ NULL,
+ disconnect_git
+};
+
void transport_take_over(struct transport *transport,
struct child_process *child)
{
@@ -626,12 +634,7 @@
data->got_remote_heads = 0;
transport->data = data;
- transport->set_option = NULL;
- transport->get_refs_list = get_refs_via_connect;
- transport->fetch = fetch_refs_via_pack;
- transport->push = NULL;
- transport->push_refs = git_transport_push;
- transport->disconnect = disconnect_git;
+ transport->vtable = &taken_over_vtable;
transport->smart_options = &(data->options);
transport->cannot_reuse = 1;
@@ -754,6 +757,24 @@
die("transport '%s' not allowed", type);
}
+static struct transport_vtable bundle_vtable = {
+ NULL,
+ get_refs_from_bundle,
+ fetch_refs_from_bundle,
+ NULL,
+ NULL,
+ close_bundle
+};
+
+static struct transport_vtable builtin_smart_vtable = {
+ NULL,
+ get_refs_via_connect,
+ fetch_refs_via_pack,
+ git_transport_push,
+ connect_git,
+ disconnect_git
+};
+
struct transport *transport_get(struct remote *remote, const char *url)
{
const char *helper;
@@ -790,9 +811,7 @@
struct bundle_transport_data *data = xcalloc(1, sizeof(*data));
transport_check_allowed("file");
ret->data = data;
- ret->get_refs_list = get_refs_from_bundle;
- ret->fetch = fetch_refs_from_bundle;
- ret->disconnect = close_bundle;
+ ret->vtable = &bundle_vtable;
ret->smart_options = NULL;
} else if (!is_url(url)
|| starts_with(url, "file://")
@@ -807,12 +826,7 @@
*/
struct git_transport_data *data = xcalloc(1, sizeof(*data));
ret->data = data;
- ret->set_option = NULL;
- ret->get_refs_list = get_refs_via_connect;
- ret->fetch = fetch_refs_via_pack;
- ret->push_refs = git_transport_push;
- ret->connect = connect_git;
- ret->disconnect = disconnect_git;
+ ret->vtable = &builtin_smart_vtable;
ret->smart_options = &(data->options);
data->conn = NULL;
@@ -846,9 +860,9 @@
git_reports = set_git_option(transport->smart_options,
name, value);
- if (transport->set_option)
- protocol_reports = transport->set_option(transport, name,
- value);
+ if (transport->vtable->set_option)
+ protocol_reports = transport->vtable->set_option(transport,
+ name, value);
/* If either report is 0, report 0 (success). */
if (!git_reports || !protocol_reports)
@@ -971,13 +985,7 @@
*reject_reasons = 0;
transport_verify_remote_names(refspec_nr, refspec);
- if (transport->push) {
- /* Maybe FIXME. But no important transport uses this case. */
- if (flags & TRANSPORT_PUSH_SET_UPSTREAM)
- die("This transport does not support using --set-upstream");
-
- return transport->push(transport, refspec_nr, refspec, flags);
- } else if (transport->push_refs) {
+ if (transport->vtable->push_refs) {
struct ref *remote_refs;
struct ref *local_refs = get_local_heads();
int match_flags = MATCH_REFS_NONE;
@@ -990,7 +998,7 @@
if (check_push_refs(local_refs, refspec_nr, refspec) < 0)
return -1;
- remote_refs = transport->get_refs_list(transport, 1);
+ remote_refs = transport->vtable->get_refs_list(transport, 1);
if (flags & TRANSPORT_PUSH_ALL)
match_flags |= MATCH_REFS_ALL;
@@ -1065,7 +1073,7 @@
}
if (!(flags & TRANSPORT_RECURSE_SUBMODULES_ONLY))
- push_ret = transport->push_refs(transport, remote_refs, flags);
+ push_ret = transport->vtable->push_refs(transport, remote_refs, flags);
else
push_ret = 0;
err = push_had_errors(remote_refs);
@@ -1099,7 +1107,7 @@
const struct ref *transport_get_remote_refs(struct transport *transport)
{
if (!transport->got_remote_refs) {
- transport->remote_refs = transport->get_refs_list(transport, 0);
+ transport->remote_refs = transport->vtable->get_refs_list(transport, 0);
transport->got_remote_refs = 1;
}
@@ -1136,7 +1144,7 @@
heads[nr_heads++] = rm;
}
- rc = transport->fetch(transport, nr_heads, heads);
+ rc = transport->vtable->fetch(transport, nr_heads, heads);
free(heads);
return rc;
@@ -1153,8 +1161,8 @@
int transport_connect(struct transport *transport, const char *name,
const char *exec, int fd[2])
{
- if (transport->connect)
- return transport->connect(transport, name, exec, fd);
+ if (transport->vtable->connect)
+ return transport->vtable->connect(transport, name, exec, fd);
else
die("Operation not supported by protocol");
}
@@ -1162,8 +1170,8 @@
int transport_disconnect(struct transport *transport)
{
int ret = 0;
- if (transport->disconnect)
- ret = transport->disconnect(transport);
+ if (transport->vtable->disconnect)
+ ret = transport->vtable->disconnect(transport);
free(transport);
return ret;
}
diff --git a/transport.h b/transport.h
index bc55715..731c78b 100644
--- a/transport.h
+++ b/transport.h
@@ -30,6 +30,8 @@
};
struct transport {
+ const struct transport_vtable *vtable;
+
struct remote *remote;
const char *url;
void *data;
@@ -59,59 +61,6 @@
*/
const struct string_list *push_options;
- /**
- * Returns 0 if successful, positive if the option is not
- * recognized or is inapplicable, and negative if the option
- * is applicable but the value is invalid.
- **/
- int (*set_option)(struct transport *connection, const char *name,
- const char *value);
-
- /**
- * Returns a list of the remote side's refs. In order to allow
- * the transport to try to share connections, for_push is a
- * hint as to whether the ultimate operation is a push or a fetch.
- *
- * If the transport is able to determine the remote hash for
- * the ref without a huge amount of effort, it should store it
- * in the ref's old_sha1 field; otherwise it should be all 0.
- **/
- struct ref *(*get_refs_list)(struct transport *transport, int for_push);
-
- /**
- * Fetch the objects for the given refs. Note that this gets
- * an array, and should ignore the list structure.
- *
- * If the transport did not get hashes for refs in
- * get_refs_list(), it should set the old_sha1 fields in the
- * provided refs now.
- **/
- int (*fetch)(struct transport *transport, int refs_nr, struct ref **refs);
-
- /**
- * Push the objects and refs. Send the necessary objects, and
- * then, for any refs where peer_ref is set and
- * peer_ref->new_oid is different from old_oid, tell the
- * remote side to update each ref in the list from old_oid to
- * peer_ref->new_oid.
- *
- * Where possible, set the status for each ref appropriately.
- *
- * The transport must modify new_sha1 in the ref to the new
- * value if the remote accepted the change. Note that this
- * could be a different value from peer_ref->new_oid if the
- * process involved generating new commits.
- **/
- int (*push_refs)(struct transport *transport, struct ref *refs, int flags);
- int (*push)(struct transport *connection, int refspec_nr, const char **refspec, int flags);
- int (*connect)(struct transport *connection, const char *name,
- const char *executable, int fd[2]);
-
- /** get_refs_list(), fetch(), and push_refs() can keep
- * resources (such as a connection) reserved for further
- * use. disconnect() releases these resources.
- **/
- int (*disconnect)(struct transport *connection);
char *pack_lockfile;
signed verbose : 3;
/**
diff --git a/tree-diff.c b/tree-diff.c
index bd6d65a..fe2e466 100644
--- a/tree-diff.c
+++ b/tree-diff.c
@@ -212,9 +212,9 @@
mode = 0;
}
- if (DIFF_OPT_TST(opt, RECURSIVE) && isdir) {
+ if (opt->flags.recursive && isdir) {
recurse = 1;
- emitthis = DIFF_OPT_TST(opt, TREE_IN_RECURSIVE);
+ emitthis = opt->flags.tree_in_recursive;
}
if (emitthis) {
@@ -421,11 +421,11 @@
* diff_tree_oid(parent, commit) )
*/
for (i = 0; i < nparent; ++i)
- tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]->hash);
- ttree = fill_tree_descriptor(&t, oid->hash);
+ tptree[i] = fill_tree_descriptor(&tp[i], parents_oid[i]);
+ ttree = fill_tree_descriptor(&t, oid);
/* Enable recursion indefinitely */
- opt->pathspec.recursive = DIFF_OPT_TST(opt, RECURSIVE);
+ opt->pathspec.recursive = opt->flags.recursive;
for (;;) {
int imin, cmp;
@@ -484,7 +484,7 @@
/* t = p[imin] */
if (cmp == 0) {
/* are either pi > p[imin] or diff(t,pi) != ø ? */
- if (!DIFF_OPT_TST(opt, FIND_COPIES_HARDER)) {
+ if (!opt->flags.find_copies_harder) {
for (i = 0; i < nparent; ++i) {
/* p[i] > p[imin] */
if (tp[i].entry.mode & S_IFXMIN_NEQ)
@@ -522,7 +522,7 @@
/* t > p[imin] */
else {
/* ∀i pi=p[imin] -> D += "-p[imin]" */
- if (!DIFF_OPT_TST(opt, FIND_COPIES_HARDER)) {
+ if (!opt->flags.find_copies_harder) {
for (i = 0; i < nparent; ++i)
if (tp[i].entry.mode & S_IFXMIN_NEQ)
goto skip_emit_tp;
@@ -608,8 +608,8 @@
q->nr = 0;
diff_setup(&diff_opts);
- DIFF_OPT_SET(&diff_opts, RECURSIVE);
- DIFF_OPT_SET(&diff_opts, FIND_COPIES_HARDER);
+ diff_opts.flags.recursive = 1;
+ diff_opts.flags.find_copies_harder = 1;
diff_opts.output_format = DIFF_FORMAT_NO_OUTPUT;
diff_opts.single_follow = opt->pathspec.items[0].match;
diff_opts.break_opt = opt->break_opt;
@@ -706,7 +706,7 @@
strbuf_addstr(&base, base_str);
retval = ll_diff_tree_oid(old_oid, new_oid, &base, opt);
- if (!*base_str && DIFF_OPT_TST(opt, FOLLOW_RENAMES) && diff_might_be_rename())
+ if (!*base_str && opt->flags.follow_renames && diff_might_be_rename())
try_to_follow_renames(old_oid, new_oid, &base, opt);
strbuf_release(&base);
diff --git a/tree-walk.c b/tree-walk.c
index d459fed..63a87ed 100644
--- a/tree-walk.c
+++ b/tree-walk.c
@@ -78,15 +78,16 @@
return result;
}
-void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1)
+void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid)
{
unsigned long size = 0;
void *buf = NULL;
- if (sha1) {
- buf = read_object_with_reference(sha1, tree_type, &size, NULL);
+ if (oid) {
+ buf = read_object_with_reference(oid->hash, tree_type, &size,
+ NULL);
if (!buf)
- die("unable to read tree %s", sha1_to_hex(sha1));
+ die("unable to read tree %s", oid_to_hex(oid));
}
init_tree_desc(desc, buf, size);
return buf;
@@ -1010,7 +1011,8 @@
* character. More accurate matching can then
* be performed in the submodule itself.
*/
- if (ps->recursive && S_ISGITLINK(entry->mode) &&
+ if (ps->recurse_submodules &&
+ S_ISGITLINK(entry->mode) &&
!ps_strncmp(item, match + baselen,
entry->path,
item->nowildcard_len - baselen))
@@ -1059,7 +1061,7 @@
* character. More accurate matching can then
* be performed in the submodule itself.
*/
- if (ps->recursive && S_ISGITLINK(entry->mode) &&
+ if (ps->recurse_submodules && S_ISGITLINK(entry->mode) &&
!ps_strncmp(item, match, base->buf + base_offset,
item->nowildcard_len)) {
strbuf_setlen(base, base_offset + baselen);
diff --git a/tree-walk.h b/tree-walk.h
index 68bb78b..b6bd1b4 100644
--- a/tree-walk.h
+++ b/tree-walk.h
@@ -42,7 +42,7 @@
int tree_entry(struct tree_desc *, struct name_entry *);
int tree_entry_gently(struct tree_desc *, struct name_entry *);
-void *fill_tree_descriptor(struct tree_desc *desc, const unsigned char *sha1);
+void *fill_tree_descriptor(struct tree_desc *desc, const struct object_id *oid);
struct traverse_info;
typedef int (*traverse_callback_t)(int n, unsigned long mask, unsigned long dirmask, struct name_entry *entry, struct traverse_info *);
diff --git a/unpack-trees.c b/unpack-trees.c
index 862cfce..96c3327 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -1,5 +1,6 @@
#define NO_THE_INDEX_COMPATIBILITY_MACROS
#include "cache.h"
+#include "repository.h"
#include "config.h"
#include "dir.h"
#include "tree.h"
@@ -13,6 +14,7 @@
#include "dir.h"
#include "submodule.h"
#include "submodule-config.h"
+#include "fsmonitor.h"
/*
* Error messages expected by scripts out of plumbing commands such as
@@ -162,7 +164,7 @@
msgs[ERROR_BIND_OVERLAP] = _("Entry '%s' overlaps with '%s'. Cannot bind.");
msgs[ERROR_SPARSE_NOT_UPTODATE_FILE] =
- _("Cannot update sparse checkout: the following entries are not up-to-date:\n%s");
+ _("Cannot update sparse checkout: the following entries are not up to date:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_OVERWRITTEN] =
_("The following working tree files would be overwritten by sparse checkout update:\n%s");
msgs[ERROR_WOULD_LOSE_ORPHANED_REMOVED] =
@@ -255,47 +257,41 @@
{
unsigned flags = SUBMODULE_MOVE_HEAD_DRY_RUN;
const struct submodule *sub = submodule_from_ce(ce);
+
if (!sub)
return 0;
if (o->reset)
flags |= SUBMODULE_MOVE_HEAD_FORCE;
- switch (sub->update_strategy.type) {
- case SM_UPDATE_UNSPECIFIED:
- case SM_UPDATE_CHECKOUT:
- if (submodule_move_head(ce->name, old_id, new_id, flags))
- return o->gently ? -1 :
- add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
- return 0;
- case SM_UPDATE_NONE:
- return 0;
- case SM_UPDATE_REBASE:
- case SM_UPDATE_MERGE:
- case SM_UPDATE_COMMAND:
- default:
- warning(_("submodule update strategy not supported for submodule '%s'"), ce->name);
- return -1;
- }
+ if (submodule_move_head(ce->name, old_id, new_id, flags))
+ return o->gently ? -1 :
+ add_rejected_path(o, ERROR_WOULD_LOSE_SUBMODULE, ce->name);
+ return 0;
}
-static void reload_gitmodules_file(struct index_state *index,
- struct checkout *state)
+/*
+ * Preform the loading of the repository's gitmodules file. This function is
+ * used by 'check_update()' to perform loading of the gitmodules file in two
+ * differnt situations:
+ * (1) before removing entries from the working tree if the gitmodules file has
+ * been marked for removal. This situation is specified by 'state' == NULL.
+ * (2) before checking out entries to the working tree if the gitmodules file
+ * has been marked for update. This situation is specified by 'state' != NULL.
+ */
+static void load_gitmodules_file(struct index_state *index,
+ struct checkout *state)
{
- int i;
- for (i = 0; i < index->cache_nr; i++) {
- struct cache_entry *ce = index->cache[i];
- if (ce->ce_flags & CE_UPDATE) {
- int r = strcmp(ce->name, ".gitmodules");
- if (r < 0)
- continue;
- else if (r == 0) {
- submodule_free();
- checkout_entry(ce, state, NULL);
- gitmodules_config();
- git_config(submodule_config, NULL);
- } else
- break;
+ int pos = index_name_pos(index, GITMODULES_FILE, strlen(GITMODULES_FILE));
+
+ if (pos >= 0) {
+ struct cache_entry *ce = index->cache[pos];
+ if (!state && ce->ce_flags & CE_WT_REMOVE) {
+ repo_read_gitmodules(the_repository);
+ } else if (state && (ce->ce_flags & CE_UPDATE)) {
+ submodule_free();
+ checkout_entry(ce, state, NULL);
+ repo_read_gitmodules(the_repository);
}
}
}
@@ -308,19 +304,9 @@
{
const struct submodule *sub = submodule_from_ce(ce);
if (sub) {
- switch (sub->update_strategy.type) {
- case SM_UPDATE_UNSPECIFIED:
- case SM_UPDATE_CHECKOUT:
- case SM_UPDATE_REBASE:
- case SM_UPDATE_MERGE:
- /* state.force is set at the caller. */
- submodule_move_head(ce->name, "HEAD", NULL,
- SUBMODULE_MOVE_HEAD_FORCE);
- break;
- case SM_UPDATE_NONE:
- case SM_UPDATE_COMMAND:
- return; /* Do not touch the submodule. */
- }
+ /* state.force is set at the caller. */
+ submodule_move_head(ce->name, "HEAD", NULL,
+ SUBMODULE_MOVE_HEAD_FORCE);
}
if (!check_leading_path(ce->name, ce_namelen(ce)))
return;
@@ -343,8 +329,7 @@
total++;
}
- return start_progress_delay(_("Checking out files"),
- total, 50, 1);
+ return start_delayed_progress(_("Checking out files"), total);
}
static int check_updates(struct unpack_trees_options *o)
@@ -365,6 +350,10 @@
if (o->update)
git_attr_set_direction(GIT_ATTR_CHECKOUT, index);
+
+ if (should_update_submodules() && o->update && !o->dry_run)
+ load_gitmodules_file(index, NULL);
+
for (i = 0; i < index->cache_nr; i++) {
const struct cache_entry *ce = index->cache[i];
@@ -378,7 +367,7 @@
remove_scheduled_dirs();
if (should_update_submodules() && o->update && !o->dry_run)
- reload_gitmodules_file(index, &state);
+ load_gitmodules_file(index, &state);
enable_delayed_checkout(&state);
for (i = 0; i < index->cache_nr; i++) {
@@ -395,8 +384,8 @@
}
}
}
- errs |= finish_delayed_checkout(&state);
stop_progress(&progress);
+ errs |= finish_delayed_checkout(&state);
if (o->update)
git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
return errs != 0;
@@ -420,6 +409,7 @@
ce->ce_flags &= ~CE_SKIP_WORKTREE;
if (was_skip_worktree != ce_skip_worktree(ce)) {
ce->ce_flags |= CE_UPDATE_IN_BASE;
+ mark_fsmonitor_invalid(istate, ce);
istate->cache_changed |= CE_ENTRY_CHANGED;
}
@@ -662,10 +652,10 @@
else if (i > 1 && are_same_oid(&names[i], &names[i - 2]))
t[i] = t[i - 2];
else {
- const unsigned char *sha1 = NULL;
+ const struct object_id *oid = NULL;
if (dirmask & 1)
- sha1 = names[i].oid->hash;
- buf[nr_buf++] = fill_tree_descriptor(t+i, sha1);
+ oid = names[i].oid;
+ buf[nr_buf++] = fill_tree_descriptor(t + i, oid);
}
}
@@ -1553,15 +1543,15 @@
int cnt = 0;
if (S_ISGITLINK(ce->ce_mode)) {
- unsigned char sha1[20];
- int sub_head = resolve_gitlink_ref(ce->name, "HEAD", sha1);
+ struct object_id oid;
+ int sub_head = resolve_gitlink_ref(ce->name, "HEAD", &oid);
/*
* If we are not going to update the submodule, then
* we don't care.
*/
- if (!sub_head && !hashcmp(sha1, ce->oid.hash))
+ if (!sub_head && !oidcmp(&oid, &ce->oid))
return 0;
- return verify_clean_submodule(sub_head ? NULL : sha1_to_hex(sha1),
+ return verify_clean_submodule(sub_head ? NULL : oid_to_hex(&oid),
ce, error_type, o);
}
@@ -2149,6 +2139,9 @@
ie_match_stat(o->src_index, old, &st, CE_MATCH_IGNORE_VALID|CE_MATCH_IGNORE_SKIP_WORKTREE))
update |= CE_UPDATE;
}
+ if (o->update && S_ISGITLINK(old->ce_mode) &&
+ should_update_submodules() && !verify_uptodate(old, o))
+ update |= CE_UPDATE;
add_entry(o, old, update, 0);
return 0;
}
diff --git a/upload-pack.c b/upload-pack.c
index 7efff2f..d5de181 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -18,6 +18,7 @@
#include "parse-options.h"
#include "argv-array.h"
#include "prio-queue.h"
+#include "protocol.h"
static const char * const upload_pack_usage[] = {
N_("git upload-pack [<options>] <dir>"),
@@ -787,7 +788,7 @@
if (skip_prefix(line, "deepen-not ", &arg)) {
char *ref = NULL;
struct object_id oid;
- if (expand_ref(arg, strlen(arg), oid.hash, &ref) != 1)
+ if (expand_ref(arg, strlen(arg), &oid, &ref) != 1)
die("git upload-pack: ambiguous deepen-not: %s", line);
string_list_append(&deepen_not, ref);
free(ref);
@@ -888,7 +889,7 @@
}
shallow_nr += shallows.nr;
- free(shallows.objects);
+ object_array_clear(&shallows);
}
/* return non-zero if the ref is hidden, otherwise 0 */
@@ -955,7 +956,7 @@
packet_write_fmt(1, "%s %s\n", oid_to_hex(oid), refname_nons);
}
capabilities = NULL;
- if (!peel_ref(refname, peeled.hash))
+ if (!peel_ref(refname, &peeled))
packet_write_fmt(1, "%s %s^{}\n", oid_to_hex(&peeled), refname_nons);
return 0;
}
@@ -965,11 +966,10 @@
{
const char *symref_target;
struct string_list_item *item;
- struct object_id unused;
if ((flag & REF_ISSYMREF) == 0)
return 0;
- symref_target = resolve_ref_unsafe(refname, 0, unused.hash, &flag);
+ symref_target = resolve_ref_unsafe(refname, 0, NULL, &flag);
if (!symref_target || (flag & REF_ISSYMREF) == 0)
die("'%s' is a symref but it is not?", refname);
item = string_list_append(cb_data, refname);
@@ -1067,6 +1067,23 @@
die("'%s' does not appear to be a git repository", dir);
git_config(upload_pack_config, NULL);
- upload_pack();
+
+ switch (determine_protocol_version_server()) {
+ case protocol_v1:
+ /*
+ * v1 is just the original protocol with a version string,
+ * so just fall through after writing the version string.
+ */
+ if (advertise_refs || !stateless_rpc)
+ packet_write_fmt(1, "version 1\n");
+
+ /* fallthrough */
+ case protocol_v0:
+ upload_pack();
+ break;
+ case protocol_unknown_version:
+ BUG("unknown protocol version");
+ }
+
return 0;
}
diff --git a/usage.c b/usage.c
index 1ea7df9..cdd534c 100644
--- a/usage.c
+++ b/usage.c
@@ -241,3 +241,18 @@
va_end(ap);
}
#endif
+
+#ifdef SUPPRESS_ANNOTATED_LEAKS
+void unleak_memory(const void *ptr, size_t len)
+{
+ static struct suppressed_leak_root {
+ struct suppressed_leak_root *next;
+ char data[FLEX_ARRAY];
+ } *suppressed_leaks;
+ struct suppressed_leak_root *root;
+
+ FLEX_ALLOC_MEM(root, data, ptr, len);
+ root->next = suppressed_leaks;
+ suppressed_leaks = root;
+}
+#endif
diff --git a/userdiff.c b/userdiff.c
index d314667..dbfb4e1 100644
--- a/userdiff.c
+++ b/userdiff.c
@@ -293,6 +293,7 @@
strbuf_addf(&name, "textconv/%s", driver->name);
notes_cache_init(c, name.buf, driver->textconv);
driver->textconv_cache = c;
+ strbuf_release(&name);
}
return driver;
diff --git a/utf8.c b/utf8.c
index 0c8e011..2c27ce0 100644
--- a/utf8.c
+++ b/utf8.c
@@ -32,7 +32,7 @@
if (ucs < table[0].first || ucs > table[max].last)
return 0;
while (max >= min) {
- mid = (min + max) / 2;
+ mid = min + (max - min) / 2;
if (ucs > table[mid].last)
min = mid + 1;
else if (ucs < table[mid].first)
@@ -381,7 +381,7 @@
old = src;
n = utf8_width((const char**)&src, NULL);
if (!src) /* broken utf-8, do nothing */
- return;
+ goto out;
if (n && w >= pos && w < pos + width) {
if (subst) {
memcpy(dst, subst, subst_len);
@@ -397,6 +397,7 @@
}
strbuf_setlen(&sb_dst, dst - sb_dst.buf);
strbuf_swap(sb_src, &sb_dst);
+out:
strbuf_release(&sb_dst);
}
diff --git a/vcs-svn/svndump.c b/vcs-svn/svndump.c
index ec6b350..08d136b 100644
--- a/vcs-svn/svndump.c
+++ b/vcs-svn/svndump.c
@@ -318,6 +318,7 @@
strbuf_addf(&mark, ":%"PRIu32, rev_ctx.revision);
fast_export_note(mark.buf, "inline");
fast_export_buf_to_data(&rev_ctx.note);
+ strbuf_release(&mark);
}
}
diff --git a/version.c b/version.c
index 6106a80..41b718c 100644
--- a/version.c
+++ b/version.c
@@ -3,6 +3,7 @@
#include "strbuf.h"
const char git_version_string[] = GIT_VERSION;
+const char git_built_from_commit_string[] = GIT_BUILT_FROM_COMMIT;
const char *git_user_agent(void)
{
diff --git a/version.h b/version.h
index 6911a4f..7c62e80 100644
--- a/version.h
+++ b/version.h
@@ -2,6 +2,7 @@
#define VERSION_H
extern const char git_version_string[];
+extern const char git_built_from_commit_string[];
const char *git_user_agent(void);
const char *git_user_agent_sanitized(void);
diff --git a/walker.c b/walker.c
index 274f1a4..5d4d373 100644
--- a/walker.c
+++ b/walker.c
@@ -7,7 +7,7 @@
#include "blob.h"
#include "refs.h"
-static unsigned char current_commit_sha1[20];
+static struct object_id current_commit_oid;
void walker_say(struct walker *walker, const char *fmt, ...)
{
@@ -24,9 +24,9 @@
fprintf(stderr, "Cannot obtain needed %s %s\n",
obj->type ? typename(obj->type): "object",
oid_to_hex(&obj->oid));
- if (!is_null_sha1(current_commit_sha1))
+ if (!is_null_oid(¤t_commit_oid))
fprintf(stderr, "while processing commit %s.\n",
- sha1_to_hex(current_commit_sha1));
+ oid_to_hex(¤t_commit_oid));
}
static int process(struct walker *walker, struct object *obj);
@@ -82,7 +82,7 @@
if (commit->object.flags & COMPLETE)
return 0;
- hashcpy(current_commit_sha1, commit->object.oid.hash);
+ oidcpy(¤t_commit_oid, &commit->object.oid);
walker_say(walker, "walk %s\n", oid_to_hex(&commit->object.oid));
@@ -187,14 +187,14 @@
return 0;
}
-static int interpret_target(struct walker *walker, char *target, unsigned char *sha1)
+static int interpret_target(struct walker *walker, char *target, struct object_id *oid)
{
- if (!get_sha1_hex(target, sha1))
+ if (!get_oid_hex(target, oid))
return 0;
if (!check_refname_format(target, 0)) {
struct ref *ref = alloc_ref(target);
if (!walker->fetch_ref(walker, ref)) {
- hashcpy(sha1, ref->old_oid.hash);
+ oidcpy(oid, &ref->old_oid);
free(ref);
return 0;
}
@@ -259,7 +259,7 @@
struct strbuf refname = STRBUF_INIT;
struct strbuf err = STRBUF_INIT;
struct ref_transaction *transaction = NULL;
- unsigned char *sha1 = xmalloc(targets * 20);
+ struct object_id *oids = xmalloc(targets * sizeof(struct object_id));
char *msg = NULL;
int i, ret = -1;
@@ -279,11 +279,11 @@
}
for (i = 0; i < targets; i++) {
- if (interpret_target(walker, target[i], &sha1[20 * i])) {
+ if (interpret_target(walker, target[i], oids + i)) {
error("Could not interpret response from server '%s' as something to pull", target[i]);
goto done;
}
- if (process(walker, lookup_unknown_object(&sha1[20 * i])))
+ if (process(walker, lookup_unknown_object(oids[i].hash)))
goto done;
}
@@ -304,7 +304,7 @@
strbuf_reset(&refname);
strbuf_addf(&refname, "refs/%s", write_ref[i]);
if (ref_transaction_update(transaction, refname.buf,
- &sha1[20 * i], NULL, 0,
+ oids + i, NULL, 0,
msg ? msg : "fetch (unknown)",
&err)) {
error("%s", err.buf);
@@ -321,7 +321,7 @@
done:
ref_transaction_free(transaction);
free(msg);
- free(sha1);
+ free(oids);
strbuf_release(&err);
strbuf_release(&refname);
return ret;
diff --git a/worktree.c b/worktree.c
index c0c5a2b..f5da7d2 100644
--- a/worktree.c
+++ b/worktree.c
@@ -31,7 +31,7 @@
target = refs_resolve_ref_unsafe(get_worktree_ref_store(wt),
"HEAD",
0,
- wt->head_sha1, &flags);
+ &wt->head_oid, &flags);
if (!target)
return;
@@ -307,7 +307,6 @@
for (i = 0; worktrees[i]; i++) {
struct worktree *wt = worktrees[i];
const char *symref_target;
- unsigned char sha1[20];
struct ref_store *refs;
int flags;
@@ -327,8 +326,9 @@
refs = get_worktree_ref_store(wt);
symref_target = refs_resolve_ref_unsafe(refs, symref, 0,
- sha1, &flags);
- if ((flags & REF_ISSYMREF) && !strcmp(symref_target, target)) {
+ NULL, &flags);
+ if ((flags & REF_ISSYMREF) &&
+ symref_target && !strcmp(symref_target, target)) {
existing = wt;
break;
}
@@ -386,3 +386,25 @@
closedir(dir);
return ret;
}
+
+int other_head_refs(each_ref_fn fn, void *cb_data)
+{
+ struct worktree **worktrees, **p;
+ int ret = 0;
+
+ worktrees = get_worktrees(0);
+ for (p = worktrees; *p; p++) {
+ struct worktree *wt = *p;
+ struct ref_store *refs;
+
+ if (wt->is_current)
+ continue;
+
+ refs = get_worktree_ref_store(wt);
+ ret = refs_head_ref(refs, fn, cb_data);
+ if (ret)
+ break;
+ }
+ free_worktrees(worktrees);
+ return ret;
+}
diff --git a/worktree.h b/worktree.h
index 5ea5e50..c28a880 100644
--- a/worktree.h
+++ b/worktree.h
@@ -1,12 +1,14 @@
#ifndef WORKTREE_H
#define WORKTREE_H
+#include "refs.h"
+
struct worktree {
char *path;
char *id;
char *head_ref; /* NULL if HEAD is broken or detached */
char *lock_reason; /* internal use */
- unsigned char head_sha1[20];
+ struct object_id head_oid;
int is_detached;
int is_bare;
int is_current;
@@ -70,6 +72,12 @@
extern const struct worktree *find_shared_symref(const char *symref,
const char *target);
+/*
+ * Similar to head_ref() for all HEADs _except_ one from the current
+ * worktree, which is covered by head_ref().
+ */
+int other_head_refs(each_ref_fn fn, void *cb_data);
+
int is_worktree_being_rebased(const struct worktree *wt, const char *target);
int is_worktree_being_bisected(const struct worktree *wt, const char *target);
diff --git a/wrapper.c b/wrapper.c
index 61aba0b..d20356a 100644
--- a/wrapper.c
+++ b/wrapper.c
@@ -569,7 +569,7 @@
if (!rc || errno == ENOENT)
return 0;
err = errno;
- warning_errno("unable to %s %s", op, file);
+ warning_errno("unable to %s '%s'", op, file);
errno = err;
return rc;
}
@@ -583,7 +583,7 @@
if (!rc || errno == ENOENT)
return 0;
- strbuf_addf(err, "unable to unlink %s: %s",
+ strbuf_addf(err, "unable to unlink '%s': %s",
file, strerror(errno));
return -1;
}
@@ -653,9 +653,9 @@
{
int fd = xopen(path, O_WRONLY | O_CREAT | O_TRUNC, 0666);
if (write_in_full(fd, buf, len) < 0)
- die_errno(_("could not write to %s"), path);
+ die_errno(_("could not write to '%s'"), path);
if (close(fd))
- die_errno(_("could not close %s"), path);
+ die_errno(_("could not close '%s'"), path);
}
void write_file(const char *path, const char *fmt, ...)
diff --git a/wt-status.c b/wt-status.c
index 77c27c5..f5debcd 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -121,15 +121,13 @@
void wt_status_prepare(struct wt_status *s)
{
- struct object_id oid;
-
memset(s, 0, sizeof(*s));
memcpy(s->color_palette, default_wt_status_colors,
sizeof(default_wt_status_colors));
s->show_untracked_files = SHOW_NORMAL_UNTRACKED_FILES;
s->use_color = -1;
s->relative_paths = 1;
- s->branch = resolve_refdup("HEAD", 0, oid.hash, NULL);
+ s->branch = resolve_refdup("HEAD", 0, NULL, NULL);
s->reference = "HEAD";
s->fp = stdout;
s->index_file = get_index_file();
@@ -362,8 +360,6 @@
switch (change_type) {
case WT_STATUS_UPDATED:
status = d->index_status;
- if (d->head_path)
- one_name = d->head_path;
break;
case WT_STATUS_CHANGED:
if (d->new_submodule_commits || d->dirty_submodule) {
@@ -384,6 +380,14 @@
change_type);
}
+ /*
+ * Only pick up the rename it's relevant. If the rename is for
+ * the changed section and we're printing the updated section,
+ * ignore it.
+ */
+ if (d->rename_status == status)
+ one_name = d->rename_source;
+
one = quote_path(one_name, s->prefix, &onebuf);
two = quote_path(two_name, s->prefix, &twobuf);
@@ -393,7 +397,7 @@
die("BUG: unhandled diff status %c", status);
len = label_width - utf8_strwidth(what);
assert(len >= 0);
- if (status == DIFF_STATUS_COPIED || status == DIFF_STATUS_RENAMED)
+ if (one_name != two_name)
status_printf_more(s, c, "%s%.*s%s -> %s",
what, len, padding, one, two);
else
@@ -408,7 +412,8 @@
strbuf_release(&twobuf);
}
-static char short_submodule_status(struct wt_status_change_data *d) {
+static char short_submodule_status(struct wt_status_change_data *d)
+{
if (d->new_submodule_commits)
return 'M';
if (d->dirty_submodule & DIRTY_SUBMODULE_MODIFIED)
@@ -434,7 +439,7 @@
struct wt_status_change_data *d;
p = q->queue[i];
- it = string_list_insert(&s->change, p->one->path);
+ it = string_list_insert(&s->change, p->two->path);
d = it->util;
if (!d) {
d = xcalloc(1, sizeof(*d));
@@ -461,6 +466,14 @@
/* mode_worktree is zero for a delete. */
break;
+ case DIFF_STATUS_COPIED:
+ case DIFF_STATUS_RENAMED:
+ if (d->rename_status)
+ die("BUG: multiple renames on the same target? how?");
+ d->rename_source = xstrdup(p->one->path);
+ d->rename_score = p->score * 100 / MAX_SCORE;
+ d->rename_status = p->status;
+ /* fallthru */
case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED:
case DIFF_STATUS_UNMERGED:
@@ -469,8 +482,8 @@
oidcpy(&d->oid_index, &p->one->oid);
break;
- case DIFF_STATUS_UNKNOWN:
- die("BUG: worktree status unknown???");
+ default:
+ die("BUG: unhandled diff-files status '%c'", p->status);
break;
}
@@ -532,8 +545,11 @@
case DIFF_STATUS_COPIED:
case DIFF_STATUS_RENAMED:
- d->head_path = xstrdup(p->one->path);
- d->score = p->score * 100 / MAX_SCORE;
+ if (d->rename_status)
+ die("BUG: multiple renames on the same target? how?");
+ d->rename_source = xstrdup(p->one->path);
+ d->rename_score = p->score * 100 / MAX_SCORE;
+ d->rename_status = p->status;
/* fallthru */
case DIFF_STATUS_MODIFIED:
case DIFF_STATUS_TYPE_CHANGED:
@@ -550,6 +566,10 @@
* values in these fields.
*/
break;
+
+ default:
+ die("BUG: unhandled diff-index status '%c'", p->status);
+ break;
}
}
}
@@ -561,12 +581,12 @@
init_revisions(&rev, NULL);
setup_revisions(0, NULL, &rev, NULL);
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
- DIFF_OPT_SET(&rev.diffopt, DIRTY_SUBMODULES);
+ rev.diffopt.flags.dirty_submodules = 1;
rev.diffopt.ita_invisible_in_index = 1;
if (!s->show_untracked_files)
- DIFF_OPT_SET(&rev.diffopt, IGNORE_UNTRACKED_IN_SUBMODULES);
+ rev.diffopt.flags.ignore_untracked_in_submodules = 1;
if (s->ignore_submodule_arg) {
- DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
+ rev.diffopt.flags.override_submodule_config = 1;
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
}
rev.diffopt.format_callback = wt_status_collect_changed_cb;
@@ -585,7 +605,7 @@
opt.def = s->is_initial ? EMPTY_TREE_SHA1_HEX : s->reference;
setup_revisions(0, NULL, &rev, &opt);
- DIFF_OPT_SET(&rev.diffopt, OVERRIDE_SUBMODULE_CONFIG);
+ rev.diffopt.flags.override_submodule_config = 1;
rev.diffopt.ita_invisible_in_index = 1;
if (s->ignore_submodule_arg) {
handle_ignore_submodules_arg(&rev.diffopt, s->ignore_submodule_arg);
@@ -604,7 +624,7 @@
rev.diffopt.output_format |= DIFF_FORMAT_CALLBACK;
rev.diffopt.format_callback = wt_status_collect_updated_cb;
rev.diffopt.format_callback_data = s;
- rev.diffopt.detect_rename = 1;
+ rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
rev.diffopt.rename_limit = 200;
rev.diffopt.break_opt = 0;
copy_pathspec(&rev.prune_data, &s->pathspec);
@@ -660,10 +680,15 @@
if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES)
dir.flags |=
DIR_SHOW_OTHER_DIRECTORIES | DIR_HIDE_EMPTY_DIRECTORIES;
- if (s->show_ignored_files)
+ if (s->show_ignored_mode) {
dir.flags |= DIR_SHOW_IGNORED_TOO;
- else
+
+ if (s->show_ignored_mode == SHOW_MATCHING_IGNORED)
+ dir.flags |= DIR_SHOW_IGNORED_TOO_MODE_MATCHING;
+ } else {
dir.untracked = the_index.untracked;
+ }
+
setup_standard_excludes(&dir);
fill_directory(&dir, &the_index, &s->pathspec);
@@ -934,7 +959,7 @@
void wt_status_add_cut_line(FILE *fp)
{
- const char *explanation = _("Do not touch the line above.\nEverything below will be removed.");
+ const char *explanation = _("Do not modify or remove the line above.\nEverything below it will be ignored.");
struct strbuf buf = STRBUF_INIT;
fprintf(fp, "%c %s", comment_line_char, cut_line);
@@ -951,7 +976,7 @@
const char *c = color(WT_STATUS_HEADER, s);
init_revisions(&rev, NULL);
- DIFF_OPT_SET(&rev.diffopt, ALLOW_TEXTCONV);
+ rev.diffopt.flags.allow_textconv = 1;
rev.diffopt.ita_invisible_in_index = 1;
memset(&opt, 0, sizeof(opt));
@@ -959,7 +984,7 @@
setup_revisions(0, NULL, &rev, &opt);
rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
- rev.diffopt.detect_rename = 1;
+ rev.diffopt.detect_rename = DIFF_DETECT_RENAME;
rev.diffopt.file = s->fp;
rev.diffopt.close_file = 0;
/*
@@ -1026,6 +1051,7 @@
comment_line_char);
else
fputs("\n", s->fp);
+ strbuf_release(&sb);
}
static int has_unmerged(struct wt_status *s)
@@ -1193,6 +1219,7 @@
string_list_append(lines, line.buf);
}
fclose(f);
+ strbuf_release(&line);
return 0;
}
@@ -1449,7 +1476,7 @@
return;
}
- if (dwim_ref(cb.buf.buf, cb.buf.len, oid.hash, &ref) == 1 &&
+ if (dwim_ref(cb.buf.buf, cb.buf.len, &oid, &ref) == 1 &&
/* sha1 is a commit? match without further lookup */
(!oidcmp(&cb.noid, &oid) ||
/* perhaps sha1 is a tag, try to dereference to a commit */
@@ -1619,7 +1646,7 @@
}
if (s->show_untracked_files) {
wt_longstatus_print_other(s, &s->untracked, _("Untracked files"), "add");
- if (s->show_ignored_files)
+ if (s->show_ignored_mode)
wt_longstatus_print_other(s, &s->ignored, _("Ignored files"), "add -f");
if (advice_status_u_option && 2000 < s->untracked_in_ms) {
status_printf_ln(s, GIT_COLOR_NORMAL, "%s", "");
@@ -1714,13 +1741,14 @@
putchar(' ');
if (s->null_termination) {
fprintf(stdout, "%s%c", it->string, 0);
- if (d->head_path)
- fprintf(stdout, "%s%c", d->head_path, 0);
+ if (d->rename_source)
+ fprintf(stdout, "%s%c", d->rename_source, 0);
} else {
struct strbuf onebuf = STRBUF_INIT;
const char *one;
- if (d->head_path) {
- one = quote_path(d->head_path, s->prefix, &onebuf);
+
+ if (d->rename_source) {
+ one = quote_path(d->rename_source, s->prefix, &onebuf);
if (*one != '"' && strchr(one, ' ') != NULL) {
putchar('"');
strbuf_addch(&onebuf, '"');
@@ -2025,10 +2053,10 @@
struct wt_status *s)
{
struct wt_status_change_data *d = it->util;
- struct strbuf buf_index = STRBUF_INIT;
- struct strbuf buf_head = STRBUF_INIT;
- const char *path_index = NULL;
- const char *path_head = NULL;
+ struct strbuf buf = STRBUF_INIT;
+ struct strbuf buf_from = STRBUF_INIT;
+ const char *path = NULL;
+ const char *path_from = NULL;
char key[3];
char submodule_token[5];
char sep_char, eol_char;
@@ -2047,8 +2075,8 @@
*/
sep_char = '\0';
eol_char = '\0';
- path_index = it->string;
- path_head = d->head_path;
+ path = it->string;
+ path_from = d->rename_source;
} else {
/*
* Path(s) are C-quoted if necessary. Current path is ALWAYS first.
@@ -2058,27 +2086,27 @@
*/
sep_char = '\t';
eol_char = '\n';
- path_index = quote_path(it->string, s->prefix, &buf_index);
- if (d->head_path)
- path_head = quote_path(d->head_path, s->prefix, &buf_head);
+ path = quote_path(it->string, s->prefix, &buf);
+ if (d->rename_source)
+ path_from = quote_path(d->rename_source, s->prefix, &buf_from);
}
- if (path_head)
+ if (path_from)
fprintf(s->fp, "2 %s %s %06o %06o %06o %s %s %c%d %s%c%s%c",
key, submodule_token,
d->mode_head, d->mode_index, d->mode_worktree,
oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
- key[0], d->score,
- path_index, sep_char, path_head, eol_char);
+ d->rename_status, d->rename_score,
+ path, sep_char, path_from, eol_char);
else
fprintf(s->fp, "1 %s %s %06o %06o %06o %s %s %s%c",
key, submodule_token,
d->mode_head, d->mode_index, d->mode_worktree,
oid_to_hex(&d->oid_head), oid_to_hex(&d->oid_index),
- path_index, eol_char);
+ path, eol_char);
- strbuf_release(&buf_index);
- strbuf_release(&buf_head);
+ strbuf_release(&buf);
+ strbuf_release(&buf_from);
}
/*
@@ -2262,9 +2290,11 @@
int result;
init_revisions(&rev_info, NULL);
- if (ignore_submodules)
- DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
- DIFF_OPT_SET(&rev_info.diffopt, QUICK);
+ if (ignore_submodules) {
+ rev_info.diffopt.flags.ignore_submodules = 1;
+ rev_info.diffopt.flags.override_submodule_config = 1;
+ }
+ 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);
@@ -2283,8 +2313,8 @@
init_revisions(&rev_info, NULL);
if (ignore_submodules)
- DIFF_OPT_SET(&rev_info.diffopt, IGNORE_SUBMODULES);
- DIFF_OPT_SET(&rev_info.diffopt, QUICK);
+ rev_info.diffopt.flags.ignore_submodules = 1;
+ rev_info.diffopt.flags.quick = 1;
add_head_to_pending(&rev_info);
diff_setup_done(&rev_info.diffopt);
result = run_diff_index(&rev_info, 1);
@@ -2297,14 +2327,14 @@
*/
int require_clean_work_tree(const char *action, const char *hint, int ignore_submodules, int gently)
{
- struct lock_file *lock_file = xcalloc(1, sizeof(*lock_file));
+ struct lock_file lock_file = LOCK_INIT;
int err = 0, fd;
- fd = hold_locked_index(lock_file, 0);
+ fd = hold_locked_index(&lock_file, 0);
refresh_cache(REFRESH_QUIET);
if (0 <= fd)
- update_index_if_able(&the_index, lock_file);
- rollback_lock_file(lock_file);
+ update_index_if_able(&the_index, &lock_file);
+ rollback_lock_file(&lock_file);
if (has_unstaged_changes(ignore_submodules)) {
/* TRANSLATORS: the action is e.g. "pull with rebase" */
diff --git a/wt-status.h b/wt-status.h
index 64f4d33..3f84d5c 100644
--- a/wt-status.h
+++ b/wt-status.h
@@ -27,6 +27,12 @@
SHOW_ALL_UNTRACKED_FILES
};
+enum show_ignored_type {
+ SHOW_NO_IGNORED,
+ SHOW_TRADITIONAL_IGNORED,
+ SHOW_MATCHING_IGNORED,
+};
+
/* from where does this commit originate */
enum commit_whence {
FROM_COMMIT, /* normal */
@@ -38,10 +44,11 @@
int worktree_status;
int index_status;
int stagemask;
- int score;
int mode_head, mode_index, mode_worktree;
struct object_id oid_head, oid_index;
- char *head_path;
+ int rename_status;
+ int rename_score;
+ char *rename_source;
unsigned dirty_submodule : 2;
unsigned new_submodule_commits : 1;
};
@@ -70,7 +77,7 @@
int display_comment_prefix;
int relative_paths;
int submodule_summary;
- int show_ignored_files;
+ enum show_ignored_type show_ignored_mode;
enum untracked_status_type show_untracked_files;
const char *ignore_submodule_arg;
char color_palette[WT_STATUS_MAXSLOT][COLOR_MAXLEN];
diff --git a/xdiff-interface.c b/xdiff-interface.c
index 018e033..770e1f7 100644
--- a/xdiff-interface.c
+++ b/xdiff-interface.c
@@ -5,6 +5,7 @@
#include "xdiff/xdiffi.h"
#include "xdiff/xemit.h"
#include "xdiff/xmacros.h"
+#include "xdiff/xutils.h"
struct xdiff_emit_state {
xdiff_emit_consume_fn consume;
@@ -296,6 +297,17 @@
}
}
+unsigned long xdiff_hash_string(const char *s, size_t len, long flags)
+{
+ return xdl_hash_record(&s, s + len, flags);
+}
+
+int xdiff_compare_lines(const char *l1, long s1,
+ const char *l2, long s2, long flags)
+{
+ return xdl_recmatch(l1, s1, l2, s2, flags);
+}
+
int git_xmerge_style = -1;
int git_xmerge_config(const char *var, const char *value, void *cb)
diff --git a/xdiff-interface.h b/xdiff-interface.h
index 6f6ba90..135fc05 100644
--- a/xdiff-interface.h
+++ b/xdiff-interface.h
@@ -29,4 +29,20 @@
extern int git_xmerge_config(const char *var, const char *value, void *cb);
extern int git_xmerge_style;
+/*
+ * Compare the strings l1 with l2 which are of size s1 and s2 respectively.
+ * Returns 1 if the strings are deemed equal, 0 otherwise.
+ * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
+ * are treated for the comparision.
+ */
+extern int xdiff_compare_lines(const char *l1, long s1,
+ const char *l2, long s2, long flags);
+
+/*
+ * Returns a hash of the string s of length len.
+ * The `flags` given as XDF_WHITESPACE_FLAGS determine how white spaces
+ * are treated for the hash.
+ */
+extern unsigned long xdiff_hash_string(const char *s, size_t len, long flags);
+
#endif
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index b090ad8..c1937a2 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
@@ -27,22 +27,28 @@
extern "C" {
#endif /* #ifdef __cplusplus */
+/* xpparm_t.flags */
+#define XDF_NEED_MINIMAL (1 << 0)
-#define XDF_NEED_MINIMAL (1 << 1)
-#define XDF_IGNORE_WHITESPACE (1 << 2)
-#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
-#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
-#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
-
-#define XDF_PATIENCE_DIFF (1 << 5)
-#define XDF_HISTOGRAM_DIFF (1 << 6)
-#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
-#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
+#define XDF_IGNORE_WHITESPACE (1 << 1)
+#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
+#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
+#define XDF_IGNORE_CR_AT_EOL (1 << 4)
+#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
+ XDF_IGNORE_WHITESPACE_CHANGE | \
+ XDF_IGNORE_WHITESPACE_AT_EOL | \
+ XDF_IGNORE_CR_AT_EOL)
#define XDF_IGNORE_BLANK_LINES (1 << 7)
-#define XDF_INDENT_HEURISTIC (1 << 8)
+#define XDF_PATIENCE_DIFF (1 << 14)
+#define XDF_HISTOGRAM_DIFF (1 << 15)
+#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
+#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
+#define XDF_INDENT_HEURISTIC (1 << 23)
+
+/* xdemitconf_t.flags */
#define XDL_EMIT_FUNCNAMES (1 << 0)
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
@@ -80,6 +86,10 @@
typedef struct s_xpparam {
unsigned long flags;
+
+ /* See Documentation/diff-options.txt. */
+ char **anchors;
+ size_t anchors_nr;
} xpparam_t;
typedef struct s_xdemitcb {
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index 93a6568..0de1ef4 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xdiffi.h b/xdiff/xdiffi.h
index 8b81206..8f1c7c8 100644
--- a/xdiff/xdiffi.h
+++ b/xdiff/xdiffi.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xemit.c b/xdiff/xemit.c
index 8c88dbd..7778dc2 100644
--- a/xdiff/xemit.c
+++ b/xdiff/xemit.c
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
@@ -121,6 +121,12 @@
return xecfg->find_func(rec, len, buf, sz, xecfg->find_func_priv);
}
+static int is_func_rec(xdfile_t *xdf, xdemitconf_t const *xecfg, long ri)
+{
+ char dummy[1];
+ return match_func_rec(xdf, xecfg, ri, dummy, sizeof(dummy)) >= 0;
+}
+
struct func_line {
long len;
char buf[80];
@@ -178,7 +184,6 @@
/* Appended chunk? */
if (i1 >= xe->xdf1.nrec) {
- char dummy[1];
long i2 = xch->i2;
/*
@@ -186,8 +191,7 @@
* a whole function was added.
*/
while (i2 < xe->xdf2.nrec) {
- if (match_func_rec(&xe->xdf2, xecfg, i2,
- dummy, sizeof(dummy)) >= 0)
+ if (is_func_rec(&xe->xdf2, xecfg, i2))
goto post_context_calculation;
i2++;
}
@@ -200,6 +204,9 @@
}
fs1 = get_func_line(xe, xecfg, NULL, i1, -1);
+ while (fs1 > 0 && !is_empty_rec(&xe->xdf1, fs1 - 1) &&
+ !is_func_rec(&xe->xdf1, xecfg, fs1 - 1))
+ fs1--;
if (fs1 < 0)
fs1 = 0;
if (fs1 < s1) {
diff --git a/xdiff/xemit.h b/xdiff/xemit.h
index d297107..1b9887e 100644
--- a/xdiff/xemit.h
+++ b/xdiff/xemit.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xinclude.h b/xdiff/xinclude.h
index 526ccb3..f35c448 100644
--- a/xdiff/xinclude.h
+++ b/xdiff/xinclude.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xmacros.h b/xdiff/xmacros.h
index 165a895..2809a28 100644
--- a/xdiff/xmacros.h
+++ b/xdiff/xmacros.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xmerge.c b/xdiff/xmerge.c
index f338ad6..1659edb 100644
--- a/xdiff/xmerge.c
+++ b/xdiff/xmerge.c
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xpatience.c b/xdiff/xpatience.c
index a613efc..f3573d9 100644
--- a/xdiff/xpatience.c
+++ b/xdiff/xpatience.c
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
@@ -62,6 +62,12 @@
* initially, "next" reflects only the order in file1.
*/
struct entry *next, *previous;
+
+ /*
+ * If 1, this entry can serve as an anchor. See
+ * Documentation/diff-options.txt for more information.
+ */
+ unsigned anchor : 1;
} *entries, *first, *last;
/* were common records found? */
unsigned long has_matches;
@@ -70,8 +76,19 @@
xpparam_t const *xpp;
};
+static int is_anchor(xpparam_t const *xpp, const char *line)
+{
+ int i;
+ for (i = 0; i < xpp->anchors_nr; i++) {
+ if (!strncmp(line, xpp->anchors[i], strlen(xpp->anchors[i])))
+ return 1;
+ }
+ return 0;
+}
+
/* The argument "pass" is 1 for the first file, 2 for the second. */
-static void insert_record(int line, struct hashmap *map, int pass)
+static void insert_record(xpparam_t const *xpp, int line, struct hashmap *map,
+ int pass)
{
xrecord_t **records = pass == 1 ?
map->env->xdf1.recs : map->env->xdf2.recs;
@@ -110,6 +127,7 @@
return;
map->entries[index].line1 = line;
map->entries[index].hash = record->ha;
+ map->entries[index].anchor = is_anchor(xpp, map->env->xdf1.recs[line - 1]->ptr);
if (!map->first)
map->first = map->entries + index;
if (map->last) {
@@ -147,11 +165,11 @@
/* First, fill with entries from the first file */
while (count1--)
- insert_record(line1++, result, 1);
+ insert_record(xpp, line1++, result, 1);
/* Then search for matches in the second file */
while (count2--)
- insert_record(line2++, result, 2);
+ insert_record(xpp, line2++, result, 2);
return 0;
}
@@ -166,7 +184,7 @@
int left = -1, right = longest;
while (left + 1 < right) {
- int middle = (left + right) / 2;
+ int middle = left + (right - left) / 2;
/* by construction, no two entries can be equal */
if (sequence[middle]->line2 > entry->line2)
right = middle;
@@ -192,14 +210,28 @@
int longest = 0, i;
struct entry *entry;
+ /*
+ * If not -1, this entry in sequence must never be overridden.
+ * Therefore, overriding entries before this has no effect, so
+ * do not do that either.
+ */
+ int anchor_i = -1;
+
for (entry = map->first; entry; entry = entry->next) {
if (!entry->line2 || entry->line2 == NON_UNIQUE)
continue;
i = binary_search(sequence, longest, entry);
entry->previous = i < 0 ? NULL : sequence[i];
- sequence[++i] = entry;
- if (i == longest)
+ ++i;
+ if (i <= anchor_i)
+ continue;
+ sequence[i] = entry;
+ if (entry->anchor) {
+ anchor_i = i;
+ longest = anchor_i + 1;
+ } else if (i == longest) {
longest++;
+ }
}
/* No common unique lines were found */
diff --git a/xdiff/xprepare.c b/xdiff/xprepare.c
index 13b55ab..abeb8fb 100644
--- a/xdiff/xprepare.c
+++ b/xdiff/xprepare.c
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xprepare.h b/xdiff/xprepare.h
index 8fb06a5..947d9fc 100644
--- a/xdiff/xprepare.h
+++ b/xdiff/xprepare.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xtypes.h b/xdiff/xtypes.h
index 2511aef..8442bd4 100644
--- a/xdiff/xtypes.h
+++ b/xdiff/xtypes.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
diff --git a/xdiff/xutils.c b/xdiff/xutils.c
index 04d7b32..88e5995 100644
--- a/xdiff/xutils.c
+++ b/xdiff/xutils.c
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
@@ -156,6 +156,24 @@
return (i == size);
}
+/*
+ * Have we eaten everything on the line, except for an optional
+ * CR at the very end?
+ */
+static int ends_with_optional_cr(const char *l, long s, long i)
+{
+ int complete = s && l[s-1] == '\n';
+
+ if (complete)
+ s--;
+ if (s == i)
+ return 1;
+ /* do not ignore CR at the end of an incomplete line */
+ if (complete && s == i + 1 && l[i] == '\r')
+ return 1;
+ return 0;
+}
+
int xdl_recmatch(const char *l1, long s1, const char *l2, long s2, long flags)
{
int i1, i2;
@@ -170,7 +188,8 @@
/*
* -w matches everything that matches with -b, and -b in turn
- * matches everything that matches with --ignore-space-at-eol.
+ * matches everything that matches with --ignore-space-at-eol,
+ * which in turn matches everything that matches with --ignore-cr-at-eol.
*
* Each flavor of ignoring needs different logic to skip whitespaces
* while we have both sides to compare.
@@ -204,6 +223,14 @@
i1++;
i2++;
}
+ } else if (flags & XDF_IGNORE_CR_AT_EOL) {
+ /* Find the first difference and see how the line ends */
+ while (i1 < s1 && i2 < s2 && l1[i1] == l2[i2]) {
+ i1++;
+ i2++;
+ }
+ return (ends_with_optional_cr(l1, s1, i1) &&
+ ends_with_optional_cr(l2, s2, i2));
}
/*
@@ -230,9 +257,16 @@
char const *top, long flags) {
unsigned long ha = 5381;
char const *ptr = *data;
+ int cr_at_eol_only = (flags & XDF_WHITESPACE_FLAGS) == XDF_IGNORE_CR_AT_EOL;
for (; ptr < top && *ptr != '\n'; ptr++) {
- if (XDL_ISSPACE(*ptr)) {
+ if (cr_at_eol_only) {
+ /* do not ignore CR at the end of an incomplete line */
+ if (*ptr == '\r' &&
+ (ptr + 1 < top && ptr[1] == '\n'))
+ continue;
+ }
+ else if (XDL_ISSPACE(*ptr)) {
const char *ptr2 = ptr;
int at_eol;
while (ptr + 1 < top && XDL_ISSPACE(ptr[1])
diff --git a/xdiff/xutils.h b/xdiff/xutils.h
index 4646ce5..fba7bae 100644
--- a/xdiff/xutils.h
+++ b/xdiff/xutils.h
@@ -13,8 +13,8 @@
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * License along with this library; if not, see
+ * <http://www.gnu.org/licenses/>.
*
* Davide Libenzi <davidel@xmailserver.org>
*
