diff options
93 files changed, 20386 insertions, 3818 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 14286cb657..5d76a84078 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -280,6 +280,7 @@ technical/api-index.txt: technical/api-index-skel.txt \ technical/api-index.sh $(patsubst %,%.txt,$(API_DOCS)) $(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh +technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt $(QUIET_ASCIIDOC)$(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) $*.txt @@ -333,6 +334,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt WEBDOC_DEST = /pub/software/scm/git/docs +howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ sed -e '1,/^$$/d' $< | $(ASCIIDOC) $(ASCIIDOC_EXTRA) -b xhtml11 - >$@+ && \ diff --git a/Documentation/RelNotes/1.7.10.4.txt b/Documentation/RelNotes/1.7.10.4.txt new file mode 100644 index 0000000000..326670df6e --- /dev/null +++ b/Documentation/RelNotes/1.7.10.4.txt @@ -0,0 +1,29 @@ +Git v1.7.10.4 Release Notes +=========================== + +Fixes since v1.7.10.3 +--------------------- + + * The message file for Swedish translation has been updated a bit. + + * A name taken from mailmap was copied into an internal buffer + incorrectly and could overun the buffer if it is too long. + + * A malformed commit object that has a header line chomped in the + middle could kill git with a NULL pointer dereference. + + * An author/committer name that is a single character was mishandled + as an invalid name by mistake. + + * The progress indicator for a large "git checkout" was sent to + stderr even if it is not a terminal. + + * "git grep -e '$pattern'", unlike the case where the patterns are + read from a file, did not treat individual lines in the given + pattern argument as separate regular expressions as it should. + + * When "git rebase" was given a bad commit to replay the history on, + its error message did not correctly give the command line argument + it had trouble parsing. + +Also contains minor fixes and documentation updates. diff --git a/Documentation/RelNotes/1.7.10.5.txt b/Documentation/RelNotes/1.7.10.5.txt new file mode 100644 index 0000000000..4db1770e38 --- /dev/null +++ b/Documentation/RelNotes/1.7.10.5.txt @@ -0,0 +1,12 @@ +Git v1.7.10.5 Release Notes +=========================== + +Fixes since v1.7.10.4 +--------------------- + + * "git fast-export" did not give a readable error message when the + same mark erroneously appeared twice in the --import-marks input. + + * "git rebase -p" used to pay attention to rebase.autosquash which + was wrong. "git rebase -p -i" should, but "git rebase -p" by + itself should not. diff --git a/Documentation/RelNotes/1.7.11.txt b/Documentation/RelNotes/1.7.11.txt index 7931f77076..15b954ca4b 100644 --- a/Documentation/RelNotes/1.7.11.txt +++ b/Documentation/RelNotes/1.7.11.txt @@ -18,10 +18,13 @@ UI, Workflows & Features * A third-party tool "git subtree" is distributed in contrib/ + * A remote helper that acts as a proxy and caches ssl session for the + https:// transport is added to the contrib/ area. + * Error messages given when @{u} is used for a branch without its - upstream configured have been clatified. + upstream configured have been clarified. - * Even with "-q"uiet option, "checkout" used to report setting up + * Even with the "-q"uiet option, "checkout" used to report setting up tracking. Also "branch" learned the "-q"uiet option to squelch informational message. @@ -37,8 +40,8 @@ UI, Workflows & Features * "git am" learned the "--include" option, which is an opposite of existing the "--exclude" option. - * When "git am -3" needs to fall back to an application to a - synthesized preimage followed by a 3-way merge, the paths that + * When "git am -3" needs to fall back to an application of the patch + to a synthesized preimage followed by a 3-way merge, the paths that needed such treatment are now reported to the end user, so that the result in them can be eyeballed with extra care. @@ -50,8 +53,9 @@ UI, Workflows & Features after populating two temporary directories, instead of running an instance of the external tool once per a file pair. - * The "fmt-merge-msg" command learns to list the primary contributors - involved in the side topic you are merging. + * The "fmt-merge-msg" command learned to list the primary contributors + involved in the side topic you are merging in a comment in the merge + commit template. * "git rebase" learned to optionally keep commits that do not introduce any change in the original history. @@ -67,15 +71,15 @@ UI, Workflows & Features Foreign Interface - * "git svn" used to die with unwanted SIGPIPE when talking with HTTP + * "git svn" used to die with unwanted SIGPIPE when talking with an HTTP server that uses keep-alive. * "git svn" learned to use platform specific authentication providers, e.g. gnome-keyring, kwallet, etc. - * "git p4" has been moved out of contrib/ area and has seen more work - on importing labels as tags from (and exporting tags as labels to) - p4. + * "git p4" has been moved out of the contrib/ area and has seen more + work on importing labels as tags from (and exporting tags as labels + to) p4. Performance and Internal Implementation (please report possible regressions) @@ -106,12 +110,15 @@ Performance and Internal Implementation (please report possible regressions) * More lower-level commands learned to use the streaming API to read from the object store without keeping everything in core. + * The weighting parameters to suggestion command name typo have been + tweaked, so that "git tags" will suggest "tag?" and not "stage?". + * Because "sh" on the user's PATH may be utterly broken on some systems, run-command API now uses SHELL_PATH, not /bin/sh, when spawning an external command (not applicable to Windows port). - * The API to iterate over refs/ hierarchy has been tweaked to allow - walking only a subset of it more efficiently. + * The API to iterate over the refs/ hierarchy has been tweaked to + allow walking only a subset of it more efficiently. Also contains minor documentation updates and code clean-ups. @@ -123,26 +130,9 @@ Unless otherwise noted, all the fixes since v1.7.10 in the maintenance releases are contained in this release (see release notes to them for details). - * The progress indicator for a large "git checkout" was sent to - stderr even if it is not a terminal. - (merge e9fc64c ap/checkout-no-progress-for-non-tty later to maint). - - * A name taken from mailmap was copied into an internal buffer - incorrectly and could overun the buffer if it is too long. - (merge c9b4e9e jk/format-person-part-buffer-limit later to maint). - - * A malformed commit object that has a header line chomped in the - middle could kill git with a NULL pointer dereference. - (merge a9c7a8a jk/pretty-commit-header-incomplete-line later to maint). - - * An author/committer name that is a single character was mishandled - as an invalid name by mistake. - (merge d9955fd jk/ident-split-fix later to maint). - - * "git grep -e '$pattern'", unlike the case where the patterns are - read from a file, did not treat individual lines in the given - pattern argument as separate regular expressions as it should. - (merge ec83061 rs/maint-grep-F later to maint). + * "git submodule init" used to report "registered for path ..." + even for submodules that were registered earlier. + (cherry-pick c1c259e jl/submodule-report-new-path-once later to maint). * "git diff --stat" used to fully count a binary file with modified execution bits whose contents is unmodified, which was not quite diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index aea8627be0..a26d245ab4 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -90,6 +90,8 @@ endif::backend-docbook[] endif::doctype-manpage[] ifdef::backend-xhtml11[] +[attributes] +git-relative-html-prefix= [linkgit-inlinemacro] -<a href="{target}.html">{target}{0?({0})}</a> +<a href="{git-relative-html-prefix}{target}.html">{target}{0?({0})}</a> endif::backend-xhtml11[] diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 6aa1be0478..67a90a828c 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -54,7 +54,7 @@ and accumulating child directory counts in the parent directories: diff.statGraphWidth:: Limit the width of the graph part in --stat output. If set, applies - to all commands generating --stat outuput except format-patch. + to all commands generating --stat output except format-patch. diff.external:: If this config variable is set, diff generation is not diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 6e22522c4f..c1ddd4c2cc 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -46,13 +46,18 @@ OPTIONS mechanism and clones the repository by making a copy of HEAD and everything under objects and refs directories. The files under `.git/objects/` directory are hardlinked - to save space when possible. This is now the default when - the source repository is specified with `/path/to/repo` - syntax, so it essentially is a no-op option. To force - copying instead of hardlinking (which may be desirable - if you are trying to make a back-up of your repository), - but still avoid the usual "git aware" transport - mechanism, `--no-hardlinks` can be used. + to save space when possible. ++ +If the repository is specified as a local path (e.g., `/path/to/repo`), +this is the default, and --local is essentially a no-op. If the +repository is specified as a URL, then this flag is ignored (and we +never use the local optimizations). Specifying `--no-local` will +override the default when `/path/to/repo` is given, using the regular +git transport instead. ++ +To force copying instead of hardlinking (which may be desirable if you +are trying to make a back-up of your repository), but still avoid the +usual "git aware" transport mechanism, `--no-hardlinks` can be used. --no-hardlinks:: Optimize the cloning process from a repository on a diff --git a/Documentation/git-column.txt b/Documentation/git-column.txt index 9be16eea0e..5d6f1cc464 100644 --- a/Documentation/git-column.txt +++ b/Documentation/git-column.txt @@ -9,7 +9,7 @@ SYNOPSIS -------- [verse] 'git column' [--command=<name>] [--[raw-]mode=<mode>] [--width=<width>] - [--indent=<string>] [--nl=<string>] [--pading=<n>] + [--indent=<string>] [--nl=<string>] [--padding=<n>] DESCRIPTION ----------- diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index cfb9906bb5..ff73286509 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -10,7 +10,7 @@ SYNOPSIS -------- [verse] 'git commit-tree' <tree> [(-p <parent>)...] < changelog -'git commit-tree' [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] <tree> +'git commit-tree' <tree> [(-p <parent>)...] [(-m <message>)...] [(-F <file>)...] DESCRIPTION ----------- @@ -45,7 +45,7 @@ OPTIONS Each '-p' indicates the id of a parent commit object. -m <message>:: - A paragraph in the commig log message. This can be given more than + A paragraph in the commit log message. This can be given more than once and each <message> becomes its own paragraph. -F <file>:: @@ -88,15 +88,6 @@ for one to be entered and terminated with ^D. include::date-formats.txt[] -Diagnostics ------------ -You don't exist. Go away!:: - The passwd(5) gecos field couldn't be read -Your parents must have hated you!:: - The passwd(5) gecos field is longer than a giant static buffer. -Your sysadmin must hate you!:: - The passwd(5) name field is longer than a giant static buffer. - Discussion ---------- diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index 988a3234f4..67edf58689 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -59,15 +59,6 @@ ifdef::git-default-pager[] The build you are using chose '{git-default-pager}' as the default. endif::git-default-pager[] -Diagnostics ------------ -You don't exist. Go away!:: - The passwd(5) gecos field couldn't be read -Your parents must have hated you!:: - The passwd(5) gecos field is longer than a giant static buffer. -Your sysadmin must hate you!:: - The passwd(5) name field is longer than a giant static buffer. - SEE ALSO -------- linkgit:git-commit-tree[1] diff --git a/Documentation/git.txt b/Documentation/git.txt index c543213126..9589734b0e 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -44,9 +44,17 @@ unreleased) version of git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.7.10.2/git.html[documentation for release 1.7.10.2] +* link:v1.7.11/git.html[documentation for release 1.7.11] * release notes for + link:RelNotes/1.7.11.txt[1.7.11]. + +* link:v1.7.10.5/git.html[documentation for release 1.7.10.5] + +* release notes for + link:RelNotes/1.7.10.5.txt[1.7.10.5], + link:RelNotes/1.7.10.4.txt[1.7.10.4], + link:RelNotes/1.7.10.3.txt[1.7.10.3], link:RelNotes/1.7.10.2.txt[1.7.10.2], link:RelNotes/1.7.10.1.txt[1.7.10.1], link:RelNotes/1.7.10.txt[1.7.10]. @@ -726,7 +734,7 @@ other 'GIT_EDITOR':: This environment variable overrides `$EDITOR` and `$VISUAL`. - It is used by several git comands when, on interactive mode, + It is used by several git commands when, on interactive mode, an editor is to be launched. See also linkgit:git-var[1] and the `core.editor` option in linkgit:git-config[1]. diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index b9dd56753a..49474557d8 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -244,7 +244,7 @@ $highlight_bin:: By default set to 'highlight'; set it to full path to highlight executable if it is not installed on your web server's PATH. Note that 'highlight' feature must be set for gitweb to actually - use syntax hightlighting. + use syntax highlighting. + *NOTE*: if you want to add support for new file type (supported by "highlight" but not used by gitweb), you need to modify `%highlight_ext` diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index 21ca6a2553..adb6f0c896 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -6,8 +6,52 @@ password credentials from the user (even though credentials in the wider world can take many forms, in this document the word "credential" always refers to a username and password pair). +This document describes two interfaces: the C API that the credential +subsystem provides to the rest of git, and the protocol that git uses to +communicate with system-specific "credential helpers". If you are +writing git code that wants to look up or prompt for credentials, see +the section "C API" below. If you want to write your own helper, see +the section on "Credential Helpers" below. + +Typical setup +------------- + +------------ ++-----------------------+ +| git code (C) |--- to server requiring ---> +| | authentication +|.......................| +| C credential API |--- prompt ---> User ++-----------------------+ + ^ | + | pipe | + | v ++-----------------------+ +| git credential helper | ++-----------------------+ +------------ + +The git code (typically a remote-helper) will call the C API to obtain +credential data like a login/password pair (credential_fill). The +API will itself call a remote helper (e.g. "git credential-cache" or +"git credential-store") that may retrieve credential data from a +store. If the credential helper cannot find the information, the C API +will prompt the user. Then, the caller of the API takes care of +contacting the server, and does the actual authentication. + +C API +----- + +The credential C API is meant to be called by git code which needs to +acquire or store a credential. It is centered around an object +representing a single credential and provides three basic operations: +fill (acquire credentials by calling helpers and/or prompting the user), +approve (mark a credential as successfully used so that it can be stored +for later use), and reject (mark a credential as unsuccessful so that it +can be erased from any persistent storage). + Data Structures ---------------- +~~~~~~~~~~~~~~~ `struct credential`:: @@ -21,14 +65,17 @@ Data Structures The `helpers` member of the struct is a `string_list` of helpers. Each string specifies an external helper which will be run, in order, to either acquire or store credentials. See the section on credential -helpers below. +helpers below. This list is filled-in by the API functions +according to the corresponding configuration variables before +consulting helpers, so there usually is no need for a caller to +modify the helpers field at all. + This struct should always be initialized with `CREDENTIAL_INIT` or `credential_init`. Functions ---------- +~~~~~~~~~ `credential_init`:: @@ -72,7 +119,7 @@ Functions Parse a URL into broken-down credential fields. Example -------- +~~~~~~~ The example below shows how the functions of the credential API could be used to login to a fictitious "foo" service on a remote host: @@ -135,8 +182,10 @@ credentials from and to long-term storage (where "long-term" is simply longer than a single git process; e.g., credentials may be stored in-memory for a few minutes, or indefinitely on disk). -Each helper is specified by a single string. The string is transformed -by git into a command to be executed using these rules: +Each helper is specified by a single string in the configuration +variable `credential.helper` (and others, see linkgit:git-config[1]). +The string is transformed by git into a command to be executed using +these rules: 1. If the helper string begins with "!", it is considered a shell snippet, and everything after the "!" becomes the command. @@ -243,3 +292,10 @@ request. If a helper receives any other operation, it should silently ignore the request. This leaves room for future operations to be added (older helpers will just ignore the new requests). + +See also +-------- + +linkgit:gitcredentials[7] + +linkgit:git-config[5] (See configuration variables `credential.*`) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 1b942074b6..02ed5668e1 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -1600,7 +1600,7 @@ dangling tree b24c2473f1fd3d91352a624795be026d64c8841f You will see informational messages on dangling objects. They are objects that still exist in the repository but are no longer referenced by any of your branches, and can (and will) be removed after a while with "gc". -You can run `git fsck --no-dangling` to supress these messages, and still +You can run `git fsck --no-dangling` to suppress these messages, and still view real errors. [[recovering-lost-changes]] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index ebbe873494..fde74a68d5 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.11-rc0 +DEF_VER=v1.7.11.GIT LF=' ' @@ -161,11 +161,9 @@ Issues of note: makeinfo and docbook2X. Version 0.8.3 is known to work. Building and installing the pdf file additionally requires - dblatex. Version 0.2.7 with asciidoc >= 8.2.7 is known to work. + dblatex. Version >= 0.2.7 is known to work. - The documentation is written for AsciiDoc 7, but by default - uses some compatibility wrappers to work on AsciiDoc 8. If you have - AsciiDoc 7, try "make ASCIIDOC7=YesPlease". + All formats require at least asciidoc 8.4.1. There are also "make quick-install-doc", "make quick-install-man" and "make quick-install-html" which install preformatted man pages @@ -297,6 +297,9 @@ all:: # fast unaligned word loads. Does NOT work on big-endian systems! # Enabled by default on x86_64. # +# Define GIT_USER_AGENT if you want to change how git identifies itself during +# network interactions. The default is "git/$(GIT_VERSION)". +# # Define DEFAULT_HELP_FORMAT to "man", "info" or "html" # (defaults to "man") if you want to have a different default when # "git help" is called without a parameter specifying the format. @@ -803,6 +806,7 @@ LIB_OBJS += usage.o LIB_OBJS += userdiff.o LIB_OBJS += utf8.o LIB_OBJS += varint.o +LIB_OBJS += version.o LIB_OBJS += walker.o LIB_OBJS += wrapper.o LIB_OBJS += write_or_die.o @@ -908,6 +912,8 @@ BUILTIN_OBJS += builtin/write-tree.o GITLIBS = $(LIB_FILE) $(XDIFF_LIB) EXTLIBS = +GIT_USER_AGENT = git/$(GIT_VERSION) + # # Platform specific tweaks # @@ -1920,6 +1926,11 @@ SHELL_PATH_CQ_SQ = $(subst ','\'',$(SHELL_PATH_CQ)) BASIC_CFLAGS += -DSHELL_PATH='$(SHELL_PATH_CQ_SQ)' endif +GIT_USER_AGENT_SQ = $(subst ','\'',$(GIT_USER_AGENT)) +GIT_USER_AGENT_CQ = "$(subst ",\",$(subst \,\\,$(GIT_USER_AGENT)))" +GIT_USER_AGENT_CQ_SQ = $(subst ','\'',$(GIT_USER_AGENT_CQ)) +BASIC_CFLAGS += -DGIT_USER_AGENT='$(GIT_USER_AGENT_CQ_SQ)' + ifdef DEFAULT_HELP_FORMAT BASIC_CFLAGS += -DDEFAULT_HELP_FORMAT='"$(DEFAULT_HELP_FORMAT)"' endif @@ -1971,7 +1982,7 @@ strip: $(PROGRAMS) git$X $(STRIP) $(STRIP_OPTS) $(PROGRAMS) git$X git.o: common-cmds.h -git.sp git.s git.o: EXTRA_CPPFLAGS = -DGIT_VERSION='"$(GIT_VERSION)"' \ +git.sp git.s git.o: EXTRA_CPPFLAGS = \ '-DGIT_HTML_PATH="$(htmldir_SQ)"' \ '-DGIT_MAN_PATH="$(mandir_SQ)"' \ '-DGIT_INFO_PATH="$(infodir_SQ)"' @@ -1988,6 +1999,9 @@ builtin/help.sp builtin/help.s builtin/help.o: EXTRA_CPPFLAGS = \ '-DGIT_MAN_PATH="$(mandir_SQ)"' \ '-DGIT_INFO_PATH="$(infodir_SQ)"' +version.sp version.s version.o: EXTRA_CPPFLAGS = \ + '-DGIT_VERSION="$(GIT_VERSION)"' + $(BUILT_INS): git$X $(QUIET_BUILT_IN)$(RM) $@ && \ ln git$X $@ 2>/dev/null || \ @@ -2005,6 +2019,7 @@ sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \ -e 's|@SHELL_PATH@|$(SHELL_PATH_SQ)|' \ -e 's|@@DIFF@@|$(DIFF_SQ)|' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + -e 's|@@GIT_USER_AGENT@@|$(GIT_USER_AGENT_SQ)|g' \ -e 's|@@LOCALEDIR@@|$(localedir_SQ)|g' \ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \ -e 's/@@USE_GETTEXT_SCHEME@@/$(USE_GETTEXT_SCHEME)/g' \ @@ -2098,7 +2113,7 @@ configure: configure.ac $(RM) $<+ # These can record GIT_VERSION -git.o git.spec \ +version.o git.spec \ $(patsubst %.sh,%,$(SCRIPT_SH)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \ : GIT-VERSION-FILE @@ -2268,9 +2283,6 @@ attr.sp attr.s attr.o: EXTRA_CPPFLAGS = \ gettext.sp gettext.s gettext.o: EXTRA_CPPFLAGS = \ -DGIT_LOCALE_PATH='"$(localedir_SQ)"' -http.sp http.s http.o: EXTRA_CPPFLAGS = \ - -DGIT_HTTP_USER_AGENT='"git/$(GIT_VERSION)"' - ifdef NO_EXPAT http-walker.sp http-walker.s http-walker.o: EXTRA_CPPFLAGS = -DNO_EXPAT endif @@ -9,7 +9,6 @@ #define DEFAULT_MERGE_LOG_LEN 20 -extern const char git_version_string[]; extern const char git_usage_string[]; extern const char git_more_info_string[]; diff --git a/builtin/add.c b/builtin/add.c index b79336d712..87446cf92a 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -443,6 +443,9 @@ int cmd_add(int argc, const char **argv, const char *prefix) if (pathspec) { int i; + struct path_exclude_check check; + + path_exclude_check_init(&check, &dir); if (!seen) seen = find_used_pathspec(pathspec); for (i = 0; pathspec[i]; i++) { @@ -450,7 +453,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) && !file_exists(pathspec[i])) { if (ignore_missing) { int dtype = DT_UNKNOWN; - if (excluded(&dir, pathspec[i], &dtype)) + if (path_excluded(&check, pathspec[i], -1, &dtype)) dir_add_ignored(&dir, pathspec[i], strlen(pathspec[i])); } else die(_("pathspec '%s' did not match any files"), @@ -458,6 +461,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) } } free(seen); + path_exclude_check_clear(&check); } plug_bulk_checkin(); diff --git a/builtin/apply.c b/builtin/apply.c index dda9ea09c9..b4428ea34f 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -3262,10 +3262,18 @@ static int check_patch(struct patch *patch) int same = !strcmp(old_name, new_name); if (!patch->new_mode) patch->new_mode = patch->old_mode; - if ((patch->old_mode ^ patch->new_mode) & S_IFMT) - return error(_("new mode (%o) of %s does not match old mode (%o)%s%s"), - patch->new_mode, new_name, patch->old_mode, - same ? "" : " of ", same ? "" : old_name); + if ((patch->old_mode ^ patch->new_mode) & S_IFMT) { + if (same) + return error(_("new mode (%o) of %s does not " + "match old mode (%o)"), + patch->new_mode, new_name, + patch->old_mode); + else + return error(_("new mode (%o) of %s does not " + "match old mode (%o) of %s"), + patch->new_mode, new_name, + patch->old_mode, old_name); + } } if (apply_data(patch, &st, ce) < 0) diff --git a/builtin/clone.c b/builtin/clone.c index a4d8d25ee3..7f3b9823ce 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -38,7 +38,7 @@ static const char * const builtin_clone_usage[] = { }; static int option_no_checkout, option_bare, option_mirror, option_single_branch = -1; -static int option_local, option_no_hardlinks, option_shared, option_recursive; +static int option_local = -1, option_no_hardlinks, option_shared, option_recursive; static char *option_template, *option_depth; static char *option_origin = NULL; static char *option_branch = NULL; @@ -70,8 +70,8 @@ static struct option builtin_clone_options[] = { PARSE_OPT_NOARG | PARSE_OPT_HIDDEN }, OPT_BOOLEAN(0, "mirror", &option_mirror, "create a mirror repository (implies bare)"), - OPT_BOOLEAN('l', "local", &option_local, - "to clone from a local repository"), + OPT_BOOL('l', "local", &option_local, + "to clone from a local repository"), OPT_BOOLEAN(0, "no-hardlinks", &option_no_hardlinks, "don't use local hardlinks, always copy"), OPT_BOOLEAN('s', "shared", &option_shared, @@ -342,7 +342,7 @@ static void copy_or_link_directory(struct strbuf *src, struct strbuf *dest, if (!option_no_hardlinks) { if (!link(src->buf, dest->buf)) continue; - if (option_local) + if (option_local > 0) die_errno(_("failed to create link '%s'"), dest->buf); option_no_hardlinks = 1; } @@ -668,7 +668,7 @@ int cmd_clone(int argc, const char **argv, const char *prefix) die(_("repository '%s' does not exist"), repo_name); else repo = repo_name; - is_local = path && !is_bundle; + is_local = option_local != 0 && path && !is_bundle; if (is_local && option_depth) warning(_("--depth is ignored in local clones; use file:// instead.")); diff --git a/builtin/commit.c b/builtin/commit.c index a2ec73d738..f43eaafb3b 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -526,8 +526,7 @@ static void determine_author_info(struct strbuf *author_ident) if (force_date) date = force_date; - strbuf_addstr(author_ident, fmt_ident(name, email, date, - IDENT_ERROR_ON_NO_NAME)); + strbuf_addstr(author_ident, fmt_ident(name, email, date, IDENT_STRICT)); if (!split_ident_line(&author, author_ident->buf, author_ident->len)) { export_one("GIT_AUTHOR_NAME", author.name_begin, author.name_end, 0); export_one("GIT_AUTHOR_EMAIL", author.mail_begin, author.mail_end, 0); diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 19509ea754..ef7c012094 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -610,7 +610,7 @@ static void import_marks(char *input_file) die ("Could not read blob %s", sha1_to_hex(sha1)); if (object->flags & SHOWN) - error("Object %s already has a mark", sha1); + error("Object %s already has a mark", sha1_to_hex(sha1)); mark_object(object, mark); if (last_idnum < mark) diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 10db15b184..149db88726 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -528,6 +528,7 @@ static void filter_refs(struct ref **refs, int nr_match, char **match) struct ref **newtail = &newlist; struct ref *ref, *next; struct ref *fastarray[32]; + int match_pos; if (nr_match && !args.fetch_all) { if (ARRAY_SIZE(fastarray) < nr_match) @@ -540,6 +541,7 @@ static void filter_refs(struct ref **refs, int nr_match, char **match) else return_refs = NULL; + match_pos = 0; for (ref = *refs; ref; ref = next) { next = ref->next; if (!memcmp(ref->name, "refs/", 5) && @@ -553,15 +555,20 @@ static void filter_refs(struct ref **refs, int nr_match, char **match) continue; } else { - int i; - for (i = 0; i < nr_match; i++) { - if (!strcmp(ref->name, match[i])) { - match[i][0] = '\0'; - return_refs[i] = ref; + int cmp = -1; + while (match_pos < nr_match) { + cmp = strcmp(ref->name, match[match_pos]); + if (cmp < 0) /* definitely do not have it */ + break; + else if (cmp == 0) { /* definitely have it */ + match[match_pos][0] = '\0'; + return_refs[match_pos] = ref; break; } + else /* might have it; keep looking */ + match_pos++; } - if (i < nr_match) + if (!cmp) continue; /* we will link it later */ } free(ref); @@ -777,6 +784,8 @@ static struct ref *do_fetch_pack(int fd[2], struct ref *ref = copy_ref_list(orig_ref); unsigned char sha1[20]; + sort_ref_list(&ref, ref_compare_name); + if (is_repository_shallow() && !server_supports("shallow")) die("Server does not support shallow clients"); if (server_supports("multi_ack_detailed")) { @@ -834,21 +843,12 @@ static int remove_duplicates(int nr_heads, char **heads) { int src, dst; - for (src = dst = 0; src < nr_heads; src++) { - /* If heads[src] is different from any of - * heads[0..dst], push it in. - */ - int i; - for (i = 0; i < dst; i++) { - if (!strcmp(heads[i], heads[src])) - break; - } - if (i < dst) - continue; - if (src != dst) - heads[dst] = heads[src]; - dst++; - } + if (!nr_heads) + return 0; + + for (src = dst = 1; src < nr_heads; src++) + if (strcmp(heads[src], heads[dst-1])) + heads[dst++] = heads[src]; return dst; } @@ -899,9 +899,11 @@ static void fetch_pack_setup(void) int cmd_fetch_pack(int argc, const char **argv, const char *prefix) { - int i, ret, nr_heads; + int i, ret; struct ref *ref = NULL; - char *dest = NULL, **heads; + const char *dest = NULL; + int alloc_heads = 0, nr_heads = 0; + char **heads = NULL; int fd[2]; char *pack_lockfile = NULL; char **pack_lockfile_ptr = NULL; @@ -909,84 +911,79 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) packet_trace_identity("fetch-pack"); - nr_heads = 0; - heads = NULL; - for (i = 1; i < argc; i++) { + for (i = 1; i < argc && *argv[i] == '-'; i++) { const char *arg = argv[i]; - if (*arg == '-') { - if (!prefixcmp(arg, "--upload-pack=")) { - args.uploadpack = arg + 14; - continue; - } - if (!prefixcmp(arg, "--exec=")) { - args.uploadpack = arg + 7; - continue; - } - if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) { - args.quiet = 1; - continue; - } - if (!strcmp("--keep", arg) || !strcmp("-k", arg)) { - args.lock_pack = args.keep_pack; - args.keep_pack = 1; - continue; - } - if (!strcmp("--thin", arg)) { - args.use_thin_pack = 1; - continue; - } - if (!strcmp("--include-tag", arg)) { - args.include_tag = 1; - continue; - } - if (!strcmp("--all", arg)) { - args.fetch_all = 1; - continue; - } - if (!strcmp("--stdin", arg)) { - args.stdin_refs = 1; - continue; - } - if (!strcmp("-v", arg)) { - args.verbose = 1; - continue; - } - if (!prefixcmp(arg, "--depth=")) { - args.depth = strtol(arg + 8, NULL, 0); - continue; - } - if (!strcmp("--no-progress", arg)) { - args.no_progress = 1; - continue; - } - if (!strcmp("--stateless-rpc", arg)) { - args.stateless_rpc = 1; - continue; - } - if (!strcmp("--lock-pack", arg)) { - args.lock_pack = 1; - pack_lockfile_ptr = &pack_lockfile; - continue; - } - usage(fetch_pack_usage); + if (!prefixcmp(arg, "--upload-pack=")) { + args.uploadpack = arg + 14; + continue; } - dest = (char *)arg; - heads = (char **)(argv + i + 1); - nr_heads = argc - i - 1; - break; + if (!prefixcmp(arg, "--exec=")) { + args.uploadpack = arg + 7; + continue; + } + if (!strcmp("--quiet", arg) || !strcmp("-q", arg)) { + args.quiet = 1; + continue; + } + if (!strcmp("--keep", arg) || !strcmp("-k", arg)) { + args.lock_pack = args.keep_pack; + args.keep_pack = 1; + continue; + } + if (!strcmp("--thin", arg)) { + args.use_thin_pack = 1; + continue; + } + if (!strcmp("--include-tag", arg)) { + args.include_tag = 1; + continue; + } + if (!strcmp("--all", arg)) { + args.fetch_all = 1; + continue; + } + if (!strcmp("--stdin", arg)) { + args.stdin_refs = 1; + continue; + } + if (!strcmp("-v", arg)) { + args.verbose = 1; + continue; + } + if (!prefixcmp(arg, "--depth=")) { + args.depth = strtol(arg + 8, NULL, 0); + continue; + } + if (!strcmp("--no-progress", arg)) { + args.no_progress = 1; + continue; + } + if (!strcmp("--stateless-rpc", arg)) { + args.stateless_rpc = 1; + continue; + } + if (!strcmp("--lock-pack", arg)) { + args.lock_pack = 1; + pack_lockfile_ptr = &pack_lockfile; + continue; + } + usage(fetch_pack_usage); } - if (!dest) + + if (i < argc) + dest = argv[i++]; + else usage(fetch_pack_usage); + /* + * Copy refs from cmdline to growable list, then append any + * refs from the standard input: + */ + ALLOC_GROW(heads, argc - i, alloc_heads); + for (; i < argc; i++) + heads[nr_heads++] = xstrdup(argv[i]); if (args.stdin_refs) { - /* - * Copy refs from cmdline to new growable list, then - * append the refs from the standard input. - */ - int alloc_heads = nr_heads; - int size = nr_heads * sizeof(*heads); - heads = memcpy(xmalloc(size), heads, size); if (args.stateless_rpc) { /* in stateless RPC mode we use pkt-line to read * from stdin, until we get a flush packet @@ -1018,7 +1015,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) fd[0] = 0; fd[1] = 1; } else { - conn = git_connect(fd, (char *)dest, args.uploadpack, + conn = git_connect(fd, dest, args.uploadpack, args.verbose ? CONNECT_VERBOSE : 0); } @@ -1057,6 +1054,11 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) return ret; } +static int compare_heads(const void *a, const void *b) +{ + return strcmp(*(const char **)a, *(const char **)b); +} + struct ref *fetch_pack(struct fetch_pack_args *my_args, int fd[], struct child_process *conn, const struct ref *ref, @@ -1076,8 +1078,11 @@ struct ref *fetch_pack(struct fetch_pack_args *my_args, st.st_mtime = 0; } - if (heads && nr_heads) + if (heads && nr_heads) { + qsort(heads, nr_heads, sizeof(*heads), compare_heads); nr_heads = remove_duplicates(nr_heads, heads); + } + if (!ref) { packet_flush(fd[1]); die("no matching remote head"); diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index d42015d867..2c4d435da1 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -230,7 +230,7 @@ static void add_branch_desc(struct strbuf *out, const char *name) static void record_person(int which, struct string_list *people, struct commit *commit) { - char name_buf[MAX_GITNAME], *name, *name_end; + char *name_buf, *name, *name_end; struct string_list_item *elem; const char *field = (which == 'a') ? "\nauthor " : "\ncommitter "; @@ -243,10 +243,9 @@ static void record_person(int which, struct string_list *people, name_end--; while (isspace(*name_end) && name <= name_end) name_end--; - if (name_end < name || name + MAX_GITNAME <= name_end) + if (name_end < name) return; - memcpy(name_buf, name, name_end - name + 1); - name_buf[name_end - name + 1] = '\0'; + name_buf = xmemdupz(name, name_end - name + 1); elem = string_list_lookup(people, name_buf); if (!elem) { @@ -254,6 +253,7 @@ static void record_person(int which, struct string_list *people, elem->util = (void *)0; } elem->util = (void*)(util_as_integral(elem) + 1); + free(name_buf); } static int cmp_string_list_util_as_integral(const void *a_, const void *b_) @@ -286,10 +286,10 @@ static void credit_people(struct strbuf *out, const char *me; if (kind == 'a') { - label = "\nBy "; + label = "\n# By "; me = git_author_info(IDENT_NO_DATE); } else { - label = "\nvia "; + label = "\n# Via "; me = git_committer_info(IDENT_NO_DATE); } diff --git a/builtin/log.c b/builtin/log.c index 690caa7830..4f1b42a685 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -21,6 +21,7 @@ #include "parse-options.h" #include "branch.h" #include "streaming.h" +#include "version.h" /* Set a default date-time format for git log ("log.date" config variable) */ static const char *default_date_mode = NULL; @@ -663,7 +664,8 @@ static FILE *realstdout = NULL; static const char *output_directory = NULL; static int outdir_offset; -static int reopen_stdout(struct commit *commit, struct rev_info *rev, int quiet) +static int reopen_stdout(struct commit *commit, const char *subject, + struct rev_info *rev, int quiet) { struct strbuf filename = STRBUF_INIT; int suffix_len = strlen(fmt_patch_suffix) + 1; @@ -677,7 +679,7 @@ static int reopen_stdout(struct commit *commit, struct rev_info *rev, int quiet) strbuf_addch(&filename, '/'); } - get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename); + get_patch_filename(commit, subject, rev->nr, fmt_patch_suffix, &filename); if (!quiet) fprintf(realstdout, "%s\n", filename.buf + outdir_offset); @@ -737,15 +739,10 @@ static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const cha static void gen_message_id(struct rev_info *info, char *base) { - const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME); - const char *email_start = strrchr(committer, '<'); - const char *email_end = strrchr(committer, '>'); struct strbuf buf = STRBUF_INIT; - if (!email_start || !email_end || email_start > email_end - 1) - die(_("Could not extract email from committer identity.")); - strbuf_addf(&buf, "%s.%lu.git.%.*s", base, + strbuf_addf(&buf, "%s.%lu.git.%s", base, (unsigned long) time(NULL), - (int)(email_end - email_start - 1), email_start + 1); + git_committer_info(IDENT_NO_NAME|IDENT_NO_DATE|IDENT_STRICT)); info->message_id = strbuf_detach(&buf, NULL); } @@ -784,7 +781,6 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, const char *encoding = "UTF-8"; struct diff_options opts; int need_8bit_cte = 0; - struct commit *commit = NULL; struct pretty_print_context pp = {0}; if (rev->commit_format != CMIT_FMT_EMAIL) @@ -792,31 +788,10 @@ static void make_cover_letter(struct rev_info *rev, int use_stdout, committer = git_committer_info(0); - if (!numbered_files) { - /* - * We fake a commit for the cover letter so we get the filename - * desired. - */ - commit = xcalloc(1, sizeof(*commit)); - commit->buffer = xmalloc(400); - snprintf(commit->buffer, 400, - "tree 0000000000000000000000000000000000000000\n" - "parent %s\n" - "author %s\n" - "committer %s\n\n" - "cover letter\n", - sha1_to_hex(head->object.sha1), committer, committer); - } - - if (!use_stdout && reopen_stdout(commit, rev, quiet)) + if (!use_stdout && + reopen_stdout(NULL, numbered_files ? NULL : "cover-letter", rev, quiet)) return; - if (commit) { - - free(commit->buffer); - free(commit); - } - log_write_email_headers(rev, head, &pp.subject, &pp.after_subject, &need_8bit_cte); @@ -1173,7 +1148,7 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) if (do_signoff) { const char *committer; const char *endpos; - committer = git_committer_info(IDENT_ERROR_ON_NO_NAME); + committer = git_committer_info(IDENT_STRICT); endpos = strchr(committer, '>'); if (!endpos) die(_("bogus committer info %s"), committer); @@ -1411,8 +1386,8 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix) gen_message_id(&rev, sha1_to_hex(commit->object.sha1)); } - if (!use_stdout && reopen_stdout(numbered_files ? NULL : commit, - &rev, quiet)) + if (!use_stdout && + reopen_stdout(numbered_files ? NULL : commit, NULL, &rev, quiet)) die(_("Failed to create output files")); shown = log_tree_commit(&rev, commit); free(commit->buffer); diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 7cff175745..31b3f2d900 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -200,9 +200,19 @@ static void show_ru_info(void) } } +static int ce_excluded(struct path_exclude_check *check, struct cache_entry *ce) +{ + int dtype = ce_to_dtype(ce); + return path_excluded(check, ce->name, ce_namelen(ce), &dtype); +} + static void show_files(struct dir_struct *dir) { int i; + struct path_exclude_check check; + + if ((dir->flags & DIR_SHOW_IGNORED)) + path_exclude_check_init(&check, dir); /* For cached/deleted files we don't need to even do the readdir */ if (show_others || show_killed) { @@ -215,9 +225,8 @@ static void show_files(struct dir_struct *dir) if (show_cached | show_stage) { for (i = 0; i < active_nr; i++) { struct cache_entry *ce = active_cache[i]; - int dtype = ce_to_dtype(ce); - if (dir->flags & DIR_SHOW_IGNORED && - !excluded(dir, ce->name, &dtype)) + if ((dir->flags & DIR_SHOW_IGNORED) && + !ce_excluded(&check, ce)) continue; if (show_unmerged && !ce_stage(ce)) continue; @@ -232,9 +241,8 @@ static void show_files(struct dir_struct *dir) struct cache_entry *ce = active_cache[i]; struct stat st; int err; - int dtype = ce_to_dtype(ce); - if (dir->flags & DIR_SHOW_IGNORED && - !excluded(dir, ce->name, &dtype)) + if ((dir->flags & DIR_SHOW_IGNORED) && + !ce_excluded(&check, ce)) continue; if (ce->ce_flags & CE_UPDATE) continue; @@ -247,6 +255,9 @@ static void show_files(struct dir_struct *dir) show_ce_entry(tag_modified, ce); } } + + if ((dir->flags & DIR_SHOW_IGNORED)) + path_exclude_check_clear(&check); } /* diff --git a/builtin/merge.c b/builtin/merge.c index 470fc57c5d..dd50a0c57b 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1447,7 +1447,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) refresh_cache(REFRESH_QUIET); if (allow_trivial && !fast_forward_only) { /* See if it is really trivial. */ - git_committer_info(IDENT_ERROR_ON_NO_NAME); + git_committer_info(IDENT_STRICT); printf(_("Trying really trivial in-index merge...\n")); if (!read_tree_trivial(common->item->object.sha1, head_commit->object.sha1, @@ -1490,7 +1490,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) die(_("Not possible to fast-forward, aborting.")); /* We are going to make a new commit. */ - git_committer_info(IDENT_ERROR_ON_NO_NAME); + git_committer_info(IDENT_STRICT); /* * At this point, we need a real merge. No matter what strategy diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index 1861093e9d..ccfcbad146 100644 --- a/builtin/pack-objects.c +++ b/builtin/pack-objects.c @@ -200,22 +200,178 @@ static void copy_pack_data(struct sha1file *f, } /* Return 0 if we will bust the pack-size limit */ -static unsigned long write_object(struct sha1file *f, - struct object_entry *entry, - off_t write_offset) +static unsigned long write_no_reuse_object(struct sha1file *f, struct object_entry *entry, + unsigned long limit, int usable_delta) { - unsigned long size, limit, datalen; - void *buf; + unsigned long size, datalen; unsigned char header[10], dheader[10]; unsigned hdrlen; enum object_type type; + void *buf; + + if (!usable_delta) { + buf = read_sha1_file(entry->idx.sha1, &type, &size); + if (!buf) + die("unable to read %s", sha1_to_hex(entry->idx.sha1)); + /* + * make sure no cached delta data remains from a + * previous attempt before a pack split occurred. + */ + free(entry->delta_data); + entry->delta_data = NULL; + entry->z_delta_size = 0; + } else if (entry->delta_data) { + size = entry->delta_size; + buf = entry->delta_data; + entry->delta_data = NULL; + type = (allow_ofs_delta && entry->delta->idx.offset) ? + OBJ_OFS_DELTA : OBJ_REF_DELTA; + } else { + buf = get_delta(entry); + size = entry->delta_size; + type = (allow_ofs_delta && entry->delta->idx.offset) ? + OBJ_OFS_DELTA : OBJ_REF_DELTA; + } + + if (entry->z_delta_size) + datalen = entry->z_delta_size; + else + datalen = do_compress(&buf, size); + + /* + * The object header is a byte of 'type' followed by zero or + * more bytes of length. + */ + hdrlen = encode_in_pack_object_header(type, size, header); + + if (type == OBJ_OFS_DELTA) { + /* + * Deltas with relative base contain an additional + * encoding of the relative offset for the delta + * base from this object's position in the pack. + */ + off_t ofs = entry->idx.offset - entry->delta->idx.offset; + unsigned pos = sizeof(dheader) - 1; + dheader[pos] = ofs & 127; + while (ofs >>= 7) + dheader[--pos] = 128 | (--ofs & 127); + if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { + free(buf); + return 0; + } + sha1write(f, header, hdrlen); + sha1write(f, dheader + pos, sizeof(dheader) - pos); + hdrlen += sizeof(dheader) - pos; + } else if (type == OBJ_REF_DELTA) { + /* + * Deltas with a base reference contain + * an additional 20 bytes for the base sha1. + */ + if (limit && hdrlen + 20 + datalen + 20 >= limit) { + free(buf); + return 0; + } + sha1write(f, header, hdrlen); + sha1write(f, entry->delta->idx.sha1, 20); + hdrlen += 20; + } else { + if (limit && hdrlen + datalen + 20 >= limit) { + free(buf); + return 0; + } + sha1write(f, header, hdrlen); + } + sha1write(f, buf, datalen); + free(buf); + + return hdrlen + datalen; +} + +/* Return 0 if we will bust the pack-size limit */ +static unsigned long write_reuse_object(struct sha1file *f, struct object_entry *entry, + unsigned long limit, int usable_delta) +{ + struct packed_git *p = entry->in_pack; + struct pack_window *w_curs = NULL; + struct revindex_entry *revidx; + off_t offset; + enum object_type type = entry->type; + unsigned long datalen; + unsigned char header[10], dheader[10]; + unsigned hdrlen; + + if (entry->delta) + type = (allow_ofs_delta && entry->delta->idx.offset) ? + OBJ_OFS_DELTA : OBJ_REF_DELTA; + hdrlen = encode_in_pack_object_header(type, entry->size, header); + + offset = entry->in_pack_offset; + revidx = find_pack_revindex(p, offset); + datalen = revidx[1].offset - offset; + if (!pack_to_stdout && p->index_version > 1 && + check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) { + error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1)); + unuse_pack(&w_curs); + return write_no_reuse_object(f, entry, limit, usable_delta); + } + + offset += entry->in_pack_header_size; + datalen -= entry->in_pack_header_size; + + if (!pack_to_stdout && p->index_version == 1 && + check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) { + error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1)); + unuse_pack(&w_curs); + return write_no_reuse_object(f, entry, limit, usable_delta); + } + + if (type == OBJ_OFS_DELTA) { + off_t ofs = entry->idx.offset - entry->delta->idx.offset; + unsigned pos = sizeof(dheader) - 1; + dheader[pos] = ofs & 127; + while (ofs >>= 7) + dheader[--pos] = 128 | (--ofs & 127); + if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { + unuse_pack(&w_curs); + return 0; + } + sha1write(f, header, hdrlen); + sha1write(f, dheader + pos, sizeof(dheader) - pos); + hdrlen += sizeof(dheader) - pos; + reused_delta++; + } else if (type == OBJ_REF_DELTA) { + if (limit && hdrlen + 20 + datalen + 20 >= limit) { + unuse_pack(&w_curs); + return 0; + } + sha1write(f, header, hdrlen); + sha1write(f, entry->delta->idx.sha1, 20); + hdrlen += 20; + reused_delta++; + } else { + if (limit && hdrlen + datalen + 20 >= limit) { + unuse_pack(&w_curs); + return 0; + } + sha1write(f, header, hdrlen); + } + copy_pack_data(f, p, &w_curs, offset, datalen); + unuse_pack(&w_curs); + reused++; + return hdrlen + datalen; +} + +/* Return 0 if we will bust the pack-size limit */ +static unsigned long write_object(struct sha1file *f, + struct object_entry *entry, + off_t write_offset) +{ + unsigned long limit, len; int usable_delta, to_reuse; if (!pack_to_stdout) crc32_begin(f); - type = entry->type; - /* apply size limit if limited packsize and not first object */ if (!pack_size_limit || !nr_written) limit = 0; @@ -243,11 +399,11 @@ static unsigned long write_object(struct sha1file *f, to_reuse = 0; /* explicit */ else if (!entry->in_pack) to_reuse = 0; /* can't reuse what we don't have */ - else if (type == OBJ_REF_DELTA || type == OBJ_OFS_DELTA) + else if (entry->type == OBJ_REF_DELTA || entry->type == OBJ_OFS_DELTA) /* check_object() decided it for us ... */ to_reuse = usable_delta; /* ... but pack split may override that */ - else if (type != entry->in_pack_type) + else if (entry->type != entry->in_pack_type) to_reuse = 0; /* pack has delta which is unusable */ else if (entry->delta) to_reuse = 0; /* we want to pack afresh */ @@ -256,153 +412,19 @@ static unsigned long write_object(struct sha1file *f, * and we do not need to deltify it. */ - if (!to_reuse) { - no_reuse: - if (!usable_delta) { - buf = read_sha1_file(entry->idx.sha1, &type, &size); - if (!buf) - die("unable to read %s", sha1_to_hex(entry->idx.sha1)); - /* - * make sure no cached delta data remains from a - * previous attempt before a pack split occurred. - */ - free(entry->delta_data); - entry->delta_data = NULL; - entry->z_delta_size = 0; - } else if (entry->delta_data) { - size = entry->delta_size; - buf = entry->delta_data; - entry->delta_data = NULL; - type = (allow_ofs_delta && entry->delta->idx.offset) ? - OBJ_OFS_DELTA : OBJ_REF_DELTA; - } else { - buf = get_delta(entry); - size = entry->delta_size; - type = (allow_ofs_delta && entry->delta->idx.offset) ? - OBJ_OFS_DELTA : OBJ_REF_DELTA; - } - - if (entry->z_delta_size) - datalen = entry->z_delta_size; - else - datalen = do_compress(&buf, size); - - /* - * The object header is a byte of 'type' followed by zero or - * more bytes of length. - */ - hdrlen = encode_in_pack_object_header(type, size, header); - - if (type == OBJ_OFS_DELTA) { - /* - * Deltas with relative base contain an additional - * encoding of the relative offset for the delta - * base from this object's position in the pack. - */ - off_t ofs = entry->idx.offset - entry->delta->idx.offset; - unsigned pos = sizeof(dheader) - 1; - dheader[pos] = ofs & 127; - while (ofs >>= 7) - dheader[--pos] = 128 | (--ofs & 127); - if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { - free(buf); - return 0; - } - sha1write(f, header, hdrlen); - sha1write(f, dheader + pos, sizeof(dheader) - pos); - hdrlen += sizeof(dheader) - pos; - } else if (type == OBJ_REF_DELTA) { - /* - * Deltas with a base reference contain - * an additional 20 bytes for the base sha1. - */ - if (limit && hdrlen + 20 + datalen + 20 >= limit) { - free(buf); - return 0; - } - sha1write(f, header, hdrlen); - sha1write(f, entry->delta->idx.sha1, 20); - hdrlen += 20; - } else { - if (limit && hdrlen + datalen + 20 >= limit) { - free(buf); - return 0; - } - sha1write(f, header, hdrlen); - } - sha1write(f, buf, datalen); - free(buf); - } - else { - struct packed_git *p = entry->in_pack; - struct pack_window *w_curs = NULL; - struct revindex_entry *revidx; - off_t offset; - - if (entry->delta) - type = (allow_ofs_delta && entry->delta->idx.offset) ? - OBJ_OFS_DELTA : OBJ_REF_DELTA; - hdrlen = encode_in_pack_object_header(type, entry->size, header); - - offset = entry->in_pack_offset; - revidx = find_pack_revindex(p, offset); - datalen = revidx[1].offset - offset; - if (!pack_to_stdout && p->index_version > 1 && - check_pack_crc(p, &w_curs, offset, datalen, revidx->nr)) { - error("bad packed object CRC for %s", sha1_to_hex(entry->idx.sha1)); - unuse_pack(&w_curs); - goto no_reuse; - } - - offset += entry->in_pack_header_size; - datalen -= entry->in_pack_header_size; - if (!pack_to_stdout && p->index_version == 1 && - check_pack_inflate(p, &w_curs, offset, datalen, entry->size)) { - error("corrupt packed object for %s", sha1_to_hex(entry->idx.sha1)); - unuse_pack(&w_curs); - goto no_reuse; - } + if (!to_reuse) + len = write_no_reuse_object(f, entry, limit, usable_delta); + else + len = write_reuse_object(f, entry, limit, usable_delta); + if (!len) + return 0; - if (type == OBJ_OFS_DELTA) { - off_t ofs = entry->idx.offset - entry->delta->idx.offset; - unsigned pos = sizeof(dheader) - 1; - dheader[pos] = ofs & 127; - while (ofs >>= 7) - dheader[--pos] = 128 | (--ofs & 127); - if (limit && hdrlen + sizeof(dheader) - pos + datalen + 20 >= limit) { - unuse_pack(&w_curs); - return 0; - } - sha1write(f, header, hdrlen); - sha1write(f, dheader + pos, sizeof(dheader) - pos); - hdrlen += sizeof(dheader) - pos; - reused_delta++; - } else if (type == OBJ_REF_DELTA) { - if (limit && hdrlen + 20 + datalen + 20 >= limit) { - unuse_pack(&w_curs); - return 0; - } - sha1write(f, header, hdrlen); - sha1write(f, entry->delta->idx.sha1, 20); - hdrlen += 20; - reused_delta++; - } else { - if (limit && hdrlen + datalen + 20 >= limit) { - unuse_pack(&w_curs); - return 0; - } - sha1write(f, header, hdrlen); - } - copy_pack_data(f, p, &w_curs, offset, datalen); - unuse_pack(&w_curs); - reused++; - } if (usable_delta) written_delta++; written++; if (!pack_to_stdout) entry->idx.crc32 = crc32_end(f); - return hdrlen + datalen; + return len; } enum write_one_status { @@ -1327,7 +1349,7 @@ static void get_object_details(void) for (i = 0; i < nr_objects; i++) { struct object_entry *entry = sorted_by_offset[i]; check_object(entry); - if (big_file_threshold <= entry->size) + if (big_file_threshold < entry->size) entry->no_try_delta = 1; } diff --git a/builtin/tag.c b/builtin/tag.c index 4fb6bd7b3d..7b1be85e48 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -332,7 +332,7 @@ static void create_tag(const unsigned char *object, const char *tag, sha1_to_hex(object), typename(type), tag, - git_committer_info(IDENT_ERROR_ON_NO_NAME)); + git_committer_info(IDENT_STRICT)); if (header_len > sizeof(header_buf) - 1) die(_("tag header too big.")); diff --git a/builtin/var.c b/builtin/var.c index 99d068a532..aedbb53a2d 100644 --- a/builtin/var.c +++ b/builtin/var.c @@ -11,7 +11,7 @@ static const char *editor(int flag) { const char *pgm = git_editor(); - if (!pgm && flag & IDENT_ERROR_ON_NO_NAME) + if (!pgm && flag & IDENT_STRICT) die("Terminal is dumb, but EDITOR unset"); return pgm; @@ -55,7 +55,7 @@ static const char *read_var(const char *var) val = NULL; for (ptr = git_vars; ptr->read; ptr++) { if (strcmp(var, ptr->name) == 0) { - val = ptr->read(IDENT_ERROR_ON_NO_NAME); + val = ptr->read(IDENT_STRICT); break; } } @@ -188,12 +188,16 @@ int verify_bundle(struct bundle_header *header, int verbose) r->nr), r->nr); list_refs(r, 0, NULL); - r = &header->prerequisites; - printf_ln(Q_("The bundle requires this ref", - "The bundle requires these %d refs", - r->nr), - r->nr); - list_refs(r, 0, NULL); + if (!r->nr) { + printf_ln(_("The bundle records a complete history.")); + } else { + r = &header->prerequisites; + printf_ln(Q_("The bundle requires this ref", + "The bundle requires these %d refs", + r->nr), + r->nr); + list_refs(r, 0, NULL); + } } return ret; } @@ -887,15 +887,19 @@ unsigned long approxidate_careful(const char *, int *); unsigned long approxidate_relative(const char *date, const struct timeval *now); enum date_mode parse_date_format(const char *format); -#define IDENT_WARN_ON_NO_NAME 1 -#define IDENT_ERROR_ON_NO_NAME 2 -#define IDENT_NO_DATE 4 +#define IDENT_STRICT 1 +#define IDENT_NO_DATE 2 +#define IDENT_NO_NAME 4 extern const char *git_author_info(int); extern const char *git_committer_info(int); extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int); extern const char *fmt_name(const char *name, const char *email); +extern const char *ident_default_name(void); +extern const char *ident_default_email(void); +extern const char *ident_default_date(void); extern const char *git_editor(void); extern const char *git_pager(int stdout_is_tty); +extern int git_ident_config(const char *, const char *, void *); struct ident_split { const char *name_begin; @@ -1139,9 +1143,6 @@ struct config_include_data { #define CONFIG_INCLUDE_INIT { 0 } extern int git_config_include(const char *name, const char *value, void *data); -#define MAX_GITNAME (1000) -extern char git_default_email[MAX_GITNAME]; -extern char git_default_name[MAX_GITNAME]; #define IDENT_NAME_GIVEN 01 #define IDENT_MAIL_GIVEN 02 #define IDENT_ALL_GIVEN (IDENT_NAME_GIVEN|IDENT_MAIL_GIVEN) @@ -1154,9 +1154,9 @@ int commit_tree_extended(const struct strbuf *msg, unsigned char *tree, /* Person/date information */ if (!author) - author = git_author_info(IDENT_ERROR_ON_NO_NAME); + author = git_author_info(IDENT_STRICT); strbuf_addf(&buffer, "author %s\n", author); - strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME)); + strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT)); if (!encoding_is_utf8) strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding); @@ -762,28 +762,6 @@ static int git_default_core_config(const char *var, const char *value) return 0; } -static int git_default_user_config(const char *var, const char *value) -{ - if (!strcmp(var, "user.name")) { - if (!value) - return config_error_nonbool(var); - strlcpy(git_default_name, value, sizeof(git_default_name)); - user_ident_explicitly_given |= IDENT_NAME_GIVEN; - return 0; - } - - if (!strcmp(var, "user.email")) { - if (!value) - return config_error_nonbool(var); - strlcpy(git_default_email, value, sizeof(git_default_email)); - user_ident_explicitly_given |= IDENT_MAIL_GIVEN; - return 0; - } - - /* Add other config variables here and to Documentation/config.txt. */ - return 0; -} - static int git_default_i18n_config(const char *var, const char *value) { if (!strcmp(var, "i18n.commitencoding")) @@ -870,7 +848,7 @@ int git_default_config(const char *var, const char *value, void *dummy) return git_default_core_config(var, value); if (!prefixcmp(var, "user.")) - return git_default_user_config(var, value); + return git_ident_config(var, value, dummy); if (!prefixcmp(var, "i18n.")) return git_default_i18n_config(var, value); diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 1689f99539..2e1b5e14b9 100755 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -846,6 +846,8 @@ __git_list_porcelain_commands () checkout-index) : plumbing;; commit-tree) : plumbing;; count-objects) : infrequent;; + credential-cache) : credentials helper;; + credential-store) : credentials helper;; cvsexportcommit) : export;; cvsimport) : import;; cvsserver) : daemon;; @@ -2597,7 +2599,7 @@ _git_whatchanged () _git_log } -_main_git () +__git_main () { local i c=1 command __git_dir @@ -2648,7 +2650,7 @@ _main_git () fi } -_main_gitk () +__gitk_main () { __git_has_doubledash && return @@ -2703,22 +2705,22 @@ __git_complete () # wrapper for backwards compatibility _git () { - __git_wrap_main_git + __git_wrap__git_main } # wrapper for backwards compatibility _gitk () { - __git_wrap_main_gitk + __git_wrap__gitk_main } -__git_complete git _main_git -__git_complete gitk _main_gitk +__git_complete git __git_main +__git_complete gitk __gitk_main # The following are necessary only for Cygwin, and only are needed # when the user has tab-completed the executable name and consequently # included the '.exe' suffix. # if [ Cygwin = "$(uname -o 2>/dev/null)" ]; then -__git_complete git.exe _main_git +__git_complete git.exe __git_main fi diff --git a/contrib/persistent-https/LICENSE b/contrib/persistent-https/LICENSE new file mode 100644 index 0000000000..d645695673 --- /dev/null +++ b/contrib/persistent-https/LICENSE @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/contrib/persistent-https/Makefile b/contrib/persistent-https/Makefile new file mode 100644 index 0000000000..92baa3beee --- /dev/null +++ b/contrib/persistent-https/Makefile @@ -0,0 +1,38 @@ +# Copyright 2012 Google Inc. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +BUILD_LABEL=$(shell date +"%s") +TAR_OUT=$(shell go env GOOS)_$(shell go env GOARCH).tar.gz + +all: git-remote-persistent-https git-remote-persistent-https--proxy \ + git-remote-persistent-http + +git-remote-persistent-https--proxy: git-remote-persistent-https + ln -f -s git-remote-persistent-https git-remote-persistent-https--proxy + +git-remote-persistent-http: git-remote-persistent-https + ln -f -s git-remote-persistent-https git-remote-persistent-http + +git-remote-persistent-https: + go build -o git-remote-persistent-https \ + -ldflags "-X main._BUILD_EMBED_LABEL $(BUILD_LABEL)" + +clean: + rm -f git-remote-persistent-http* *.tar.gz + +tar: clean all + @chmod 555 git-remote-persistent-https + @tar -czf $(TAR_OUT) git-remote-persistent-http* README LICENSE + @echo + @echo "Created $(TAR_OUT)" diff --git a/contrib/persistent-https/README b/contrib/persistent-https/README new file mode 100644 index 0000000000..f784dd2e66 --- /dev/null +++ b/contrib/persistent-https/README @@ -0,0 +1,62 @@ +git-remote-persistent-https + +The git-remote-persistent-https binary speeds up SSL operations +by running a daemon job (git-remote-persistent-https--proxy) that +keeps a connection open to a server. + + +PRE-BUILT BINARIES + +Darwin amd64: +https://commondatastorage.googleapis.com/git-remote-persistent-https/darwin_amd64.tar.gz + +Linux amd64: +https://commondatastorage.googleapis.com/git-remote-persistent-https/linux_amd64.tar.gz + + +INSTALLING + +Move all of the git-remote-persistent-http* binaries to a directory +in PATH. + + +USAGE + +HTTPS requests can be delegated to the proxy by using the +"persistent-https" scheme, e.g. + +git clone persistent-https://kernel.googlesource.com/pub/scm/git/git + +Likewise, .gitconfig can be updated as follows to rewrite https urls +to use persistent-https: + +[url "persistent-https"] + insteadof = https +[url "persistent-http"] + insteadof = http + + +##################################################################### +# BUILDING FROM SOURCE +##################################################################### + +LOCATION + +The source is available in the contrib/persistent-https directory of +the Git source repository. The Git source repository is available at +git://git.kernel.org/pub/scm/git/git.git/ +https://kernel.googlesource.com/pub/scm/git/git + + +PREREQUISITES + +The code is written in Go (http://golang.org/) and the Go compiler is +required. Currently, the compiler must be built and installed from tip +of source, in order to include a fix in the reverse http proxy: +http://code.google.com/p/go/source/detail?r=a615b796570a2cd8591884767a7d67ede74f6648 + + +BUILDING + +Run "make" to build the binaries. See the section on +INSTALLING above. diff --git a/contrib/persistent-https/client.go b/contrib/persistent-https/client.go new file mode 100644 index 0000000000..71125b5832 --- /dev/null +++ b/contrib/persistent-https/client.go @@ -0,0 +1,189 @@ +// Copyright 2012 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "bufio" + "errors" + "fmt" + "net" + "net/url" + "os" + "os/exec" + "strings" + "syscall" + "time" +) + +type Client struct { + ProxyBin string + Args []string + + insecure bool +} + +func (c *Client) Run() error { + if err := c.resolveArgs(); err != nil { + return fmt.Errorf("resolveArgs() got error: %v", err) + } + + // Connect to the proxy. + uconn, hconn, addr, err := c.connect() + if err != nil { + return fmt.Errorf("connect() got error: %v", err) + } + // Keep the unix socket connection open for the duration of the request. + defer uconn.Close() + // Keep a connection to the HTTP server open, so no other user can + // bind on the same address so long as the process is running. + defer hconn.Close() + + // Start the git-remote-http subprocess. + cargs := []string{"-c", fmt.Sprintf("http.proxy=%v", addr), "remote-http"} + cargs = append(cargs, c.Args...) + cmd := exec.Command("git", cargs...) + + for _, v := range os.Environ() { + if !strings.HasPrefix(v, "GIT_PERSISTENT_HTTPS_SECURE=") { + cmd.Env = append(cmd.Env, v) + } + } + // Set the GIT_PERSISTENT_HTTPS_SECURE environment variable when + // the proxy is using a SSL connection. This allows credential helpers + // to identify secure proxy connections, despite being passed an HTTP + // scheme. + if !c.insecure { + cmd.Env = append(cmd.Env, "GIT_PERSISTENT_HTTPS_SECURE=1") + } + + cmd.Stdin = os.Stdin + cmd.Stdout = os.Stdout + cmd.Stderr = os.Stderr + if err := cmd.Run(); err != nil { + if eerr, ok := err.(*exec.ExitError); ok { + if stat, ok := eerr.ProcessState.Sys().(syscall.WaitStatus); ok && stat.ExitStatus() != 0 { + os.Exit(stat.ExitStatus()) + } + } + return fmt.Errorf("git-remote-http subprocess got error: %v", err) + } + return nil +} + +func (c *Client) connect() (uconn net.Conn, hconn net.Conn, addr string, err error) { + uconn, err = DefaultSocket.Dial() + if err != nil { + if e, ok := err.(*net.OpError); ok && (os.IsNotExist(e.Err) || e.Err == syscall.ECONNREFUSED) { + if err = c.startProxy(); err == nil { + uconn, err = DefaultSocket.Dial() + } + } + if err != nil { + return + } + } + + if addr, err = c.readAddr(uconn); err != nil { + return + } + + // Open a tcp connection to the proxy. + if hconn, err = net.Dial("tcp", addr); err != nil { + return + } + + // Verify the address hasn't changed ownership. + var addr2 string + if addr2, err = c.readAddr(uconn); err != nil { + return + } else if addr != addr2 { + err = fmt.Errorf("address changed after connect. got %q, want %q", addr2, addr) + return + } + return +} + +func (c *Client) readAddr(conn net.Conn) (string, error) { + conn.SetDeadline(time.Now().Add(5 * time.Second)) + data := make([]byte, 100) + n, err := conn.Read(data) + if err != nil { + return "", fmt.Errorf("error reading unix socket: %v", err) + } else if n == 0 { + return "", errors.New("empty data response") + } + conn.Write([]byte{1}) // Ack + + var addr string + if addrs := strings.Split(string(data[:n]), "\n"); len(addrs) != 2 { + return "", fmt.Errorf("got %q, wanted 2 addresses", data[:n]) + } else if c.insecure { + addr = addrs[1] + } else { + addr = addrs[0] + } + return addr, nil +} + +func (c *Client) startProxy() error { + cmd := exec.Command(c.ProxyBin) + cmd.SysProcAttr = &syscall.SysProcAttr{Setpgid: true} + stdout, err := cmd.StdoutPipe() + if err != nil { + return err + } + defer stdout.Close() + if err := cmd.Start(); err != nil { + return err + } + result := make(chan error) + go func() { + bytes, _, err := bufio.NewReader(stdout).ReadLine() + if line := string(bytes); err == nil && line != "OK" { + err = fmt.Errorf("proxy returned %q, want \"OK\"", line) + } + result <- err + }() + select { + case err := <-result: + return err + case <-time.After(5 * time.Second): + return errors.New("timeout waiting for proxy to start") + } + panic("not reachable") +} + +func (c *Client) resolveArgs() error { + if nargs := len(c.Args); nargs == 0 { + return errors.New("remote needed") + } else if nargs > 2 { + return fmt.Errorf("want at most 2 args, got %v", c.Args) + } + + // Rewrite the url scheme to be http. + idx := len(c.Args) - 1 + rawurl := c.Args[idx] + rurl, err := url.Parse(rawurl) + if err != nil { + return fmt.Errorf("invalid remote: %v", err) + } + c.insecure = rurl.Scheme == "persistent-http" + rurl.Scheme = "http" + c.Args[idx] = rurl.String() + if idx != 0 && c.Args[0] == rawurl { + c.Args[0] = c.Args[idx] + } + return nil +} diff --git a/contrib/persistent-https/main.go b/contrib/persistent-https/main.go new file mode 100644 index 0000000000..fd1b107743 --- /dev/null +++ b/contrib/persistent-https/main.go @@ -0,0 +1,82 @@ +// Copyright 2012 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +// The git-remote-persistent-https binary speeds up SSL operations by running +// a daemon job that keeps a connection open to a Git server. This ensures the +// git-remote-persistent-https--proxy is running and delegating execution +// to the git-remote-http binary with the http_proxy set to the daemon job. +// A unix socket is used to authenticate the proxy and discover the +// HTTP address. Note, both the client and proxy are included in the same +// binary. +package main + +import ( + "flag" + "fmt" + "log" + "os" + "strings" + "time" +) + +var ( + forceProxy = flag.Bool("proxy", false, "Whether to start the binary in proxy mode") + proxyBin = flag.String("proxy_bin", "git-remote-persistent-https--proxy", "Path to the proxy binary") + printLabel = flag.Bool("print_label", false, "Prints the build label for the binary") + + // Variable that should be defined through the -X linker flag. + _BUILD_EMBED_LABEL string +) + +const ( + defaultMaxIdleDuration = 24 * time.Hour + defaultPollUpdateInterval = 15 * time.Minute +) + +func main() { + flag.Parse() + if *printLabel { + // Short circuit execution to print the build label + fmt.Println(buildLabel()) + return + } + + var err error + if *forceProxy || strings.HasSuffix(os.Args[0], "--proxy") { + log.SetPrefix("git-remote-persistent-https--proxy: ") + proxy := &Proxy{ + BuildLabel: buildLabel(), + MaxIdleDuration: defaultMaxIdleDuration, + PollUpdateInterval: defaultPollUpdateInterval, + } + err = proxy.Run() + } else { + log.SetPrefix("git-remote-persistent-https: ") + client := &Client{ + ProxyBin: *proxyBin, + Args: flag.Args(), + } + err = client.Run() + } + if err != nil { + log.Fatalln(err) + } +} + +func buildLabel() string { + if _BUILD_EMBED_LABEL == "" { + log.Println(`unlabeled build; build with "make" to label`) + } + return _BUILD_EMBED_LABEL +} diff --git a/contrib/persistent-https/proxy.go b/contrib/persistent-https/proxy.go new file mode 100644 index 0000000000..bb0cdba386 --- /dev/null +++ b/contrib/persistent-https/proxy.go @@ -0,0 +1,190 @@ +// Copyright 2012 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "fmt" + "log" + "net" + "net/http" + "net/http/httputil" + "os" + "os/exec" + "os/signal" + "sync" + "syscall" + "time" +) + +type Proxy struct { + BuildLabel string + MaxIdleDuration time.Duration + PollUpdateInterval time.Duration + + ul net.Listener + httpAddr string + httpsAddr string +} + +func (p *Proxy) Run() error { + hl, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + return fmt.Errorf("http listen failed: %v", err) + } + defer hl.Close() + + hsl, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + return fmt.Errorf("https listen failed: %v", err) + } + defer hsl.Close() + + p.ul, err = DefaultSocket.Listen() + if err != nil { + c, derr := DefaultSocket.Dial() + if derr == nil { + c.Close() + fmt.Println("OK\nA proxy is already running... exiting") + return nil + } else if e, ok := derr.(*net.OpError); ok && e.Err == syscall.ECONNREFUSED { + // Nothing is listening on the socket, unlink it and try again. + syscall.Unlink(DefaultSocket.Path()) + p.ul, err = DefaultSocket.Listen() + } + if err != nil { + return fmt.Errorf("unix listen failed on %v: %v", DefaultSocket.Path(), err) + } + } + defer p.ul.Close() + go p.closeOnSignal() + go p.closeOnUpdate() + + p.httpAddr = hl.Addr().String() + p.httpsAddr = hsl.Addr().String() + fmt.Printf("OK\nListening on unix socket=%v http=%v https=%v\n", + p.ul.Addr(), p.httpAddr, p.httpsAddr) + + result := make(chan error, 2) + go p.serveUnix(result) + go func() { + result <- http.Serve(hl, &httputil.ReverseProxy{ + FlushInterval: 500 * time.Millisecond, + Director: func(r *http.Request) {}, + }) + }() + go func() { + result <- http.Serve(hsl, &httputil.ReverseProxy{ + FlushInterval: 500 * time.Millisecond, + Director: func(r *http.Request) { + r.URL.Scheme = "https" + }, + }) + }() + return <-result +} + +type socketContext struct { + sync.WaitGroup + mutex sync.Mutex + last time.Time +} + +func (sc *socketContext) Done() { + sc.mutex.Lock() + defer sc.mutex.Unlock() + sc.last = time.Now() + sc.WaitGroup.Done() +} + +func (p *Proxy) serveUnix(result chan<- error) { + sockCtx := &socketContext{} + go p.closeOnIdle(sockCtx) + + var err error + for { + var uconn net.Conn + uconn, err = p.ul.Accept() + if err != nil { + err = fmt.Errorf("accept failed: %v", err) + break + } + sockCtx.Add(1) + go p.handleUnixConn(sockCtx, uconn) + } + sockCtx.Wait() + result <- err +} + +func (p *Proxy) handleUnixConn(sockCtx *socketContext, uconn net.Conn) { + defer sockCtx.Done() + defer uconn.Close() + data := []byte(fmt.Sprintf("%v\n%v", p.httpsAddr, p.httpAddr)) + uconn.SetDeadline(time.Now().Add(5 * time.Second)) + for i := 0; i < 2; i++ { + if n, err := uconn.Write(data); err != nil { + log.Printf("error sending http addresses: %+v\n", err) + return + } else if n != len(data) { + log.Printf("sent %d data bytes, wanted %d\n", n, len(data)) + return + } + if _, err := uconn.Read([]byte{0, 0, 0, 0}); err != nil { + log.Printf("error waiting for Ack: %+v\n", err) + return + } + } + // Wait without a deadline for the client to finish via EOF + uconn.SetDeadline(time.Time{}) + uconn.Read([]byte{0, 0, 0, 0}) +} + +func (p *Proxy) closeOnIdle(sockCtx *socketContext) { + for d := p.MaxIdleDuration; d > 0; { + time.Sleep(d) + sockCtx.Wait() + sockCtx.mutex.Lock() + if d = sockCtx.last.Add(p.MaxIdleDuration).Sub(time.Now()); d <= 0 { + log.Println("graceful shutdown from idle timeout") + p.ul.Close() + } + sockCtx.mutex.Unlock() + } +} + +func (p *Proxy) closeOnUpdate() { + for { + time.Sleep(p.PollUpdateInterval) + if out, err := exec.Command(os.Args[0], "--print_label").Output(); err != nil { + log.Printf("error polling for updated binary: %v\n", err) + } else if s := string(out[:len(out)-1]); p.BuildLabel != s { + log.Printf("graceful shutdown from updated binary: %q --> %q\n", p.BuildLabel, s) + p.ul.Close() + break + } + } +} + +func (p *Proxy) closeOnSignal() { + ch := make(chan os.Signal, 10) + signal.Notify(ch, os.Interrupt, os.Kill, os.Signal(syscall.SIGTERM), os.Signal(syscall.SIGHUP)) + sig := <-ch + p.ul.Close() + switch sig { + case os.Signal(syscall.SIGHUP): + log.Printf("graceful shutdown from signal: %v\n", sig) + default: + log.Fatalf("exiting from signal: %v\n", sig) + } +} diff --git a/contrib/persistent-https/socket.go b/contrib/persistent-https/socket.go new file mode 100644 index 0000000000..193b911dd1 --- /dev/null +++ b/contrib/persistent-https/socket.go @@ -0,0 +1,97 @@ +// Copyright 2012 Google Inc. All Rights Reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package main + +import ( + "fmt" + "log" + "net" + "os" + "path/filepath" + "syscall" +) + +// A Socket is a wrapper around a Unix socket that verifies directory +// permissions. +type Socket struct { + Dir string +} + +func defaultDir() string { + sockPath := ".git-credential-cache" + if home := os.Getenv("HOME"); home != "" { + return filepath.Join(home, sockPath) + } + log.Printf("socket: cannot find HOME path. using relative directory %q for socket", sockPath) + return sockPath +} + +// DefaultSocket is a Socket in the $HOME/.git-credential-cache directory. +var DefaultSocket = Socket{Dir: defaultDir()} + +// Listen announces the local network address of the unix socket. The +// permissions on the socket directory are verified before attempting +// the actual listen. +func (s Socket) Listen() (net.Listener, error) { + network, addr := "unix", s.Path() + if err := s.mkdir(); err != nil { + return nil, &net.OpError{Op: "listen", Net: network, Addr: &net.UnixAddr{Name: addr, Net: network}, Err: err} + } + return net.Listen(network, addr) +} + +// Dial connects to the unix socket. The permissions on the socket directory +// are verified before attempting the actual dial. +func (s Socket) Dial() (net.Conn, error) { + network, addr := "unix", s.Path() + if err := s.checkPermissions(); err != nil { + return nil, &net.OpError{Op: "dial", Net: network, Addr: &net.UnixAddr{Name: addr, Net: network}, Err: err} + } + return net.Dial(network, addr) +} + +// Path returns the fully specified file name of the unix socket. +func (s Socket) Path() string { + return filepath.Join(s.Dir, "persistent-https-proxy-socket") +} + +func (s Socket) mkdir() error { + if err := s.checkPermissions(); err == nil { + return nil + } else if !os.IsNotExist(err) { + return err + } + if err := os.MkdirAll(s.Dir, 0700); err != nil { + return err + } + return s.checkPermissions() +} + +func (s Socket) checkPermissions() error { + fi, err := os.Stat(s.Dir) + if err != nil { + return err + } + if !fi.IsDir() { + return fmt.Errorf("socket: got file, want directory for %q", s.Dir) + } + if fi.Mode().Perm() != 0700 { + return fmt.Errorf("socket: got perm %o, want 700 for %q", fi.Mode().Perm(), s.Dir) + } + if st := fi.Sys().(*syscall.Stat_t); int(st.Uid) != os.Getuid() { + return fmt.Errorf("socket: got uid %d, want %d for %q", st.Uid, os.Getuid(), s.Dir) + } + return nil +} @@ -1700,7 +1700,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option continue; if (!data->files[i]->is_renamed && (added + deleted == 0)) { total_files--; - } else { + } else if (!data->files[i]->is_binary) { /* don't count bytes */ adds += added; dels += deleted; } @@ -553,7 +553,7 @@ int excluded_from_list(const char *pathname, return -1; /* undecided */ } -int excluded(struct dir_struct *dir, const char *pathname, int *dtype_p) +static int excluded(struct dir_struct *dir, const char *pathname, int *dtype_p) { int pathlen = strlen(pathname); int st; @@ -573,6 +573,64 @@ int excluded(struct dir_struct *dir, const char *pathname, int *dtype_p) return 0; } +void path_exclude_check_init(struct path_exclude_check *check, + struct dir_struct *dir) +{ + check->dir = dir; + strbuf_init(&check->path, 256); +} + +void path_exclude_check_clear(struct path_exclude_check *check) +{ + strbuf_release(&check->path); +} + +/* + * Is this name excluded? This is for a caller like show_files() that + * do not honor directory hierarchy and iterate through paths that are + * possibly in an ignored directory. + * + * A path to a directory known to be excluded is left in check->path to + * optimize for repeated checks for files in the same excluded directory. + */ +int path_excluded(struct path_exclude_check *check, + const char *name, int namelen, int *dtype) +{ + int i; + struct strbuf *path = &check->path; + + /* + * we allow the caller to pass namelen as an optimization; it + * must match the length of the name, as we eventually call + * excluded() on the whole name string. + */ + if (namelen < 0) + namelen = strlen(name); + + if (path->len && + path->len <= namelen && + !memcmp(name, path->buf, path->len) && + (!name[path->len] || name[path->len] == '/')) + return 1; + + strbuf_setlen(path, 0); + for (i = 0; name[i]; i++) { + int ch = name[i]; + + if (ch == '/') { + int dt = DT_DIR; + if (excluded(check->dir, path->buf, &dt)) + return 1; + } + strbuf_addch(path, ch); + } + + /* An entry in the index; cannot be a directory with subentries */ + strbuf_setlen(path, 0); + + return excluded(check->dir, name, dtype); +} + static struct dir_entry *dir_entry_new(const char *pathname, int len) { struct dir_entry *ent; @@ -1,6 +1,8 @@ #ifndef DIR_H #define DIR_H +#include "strbuf.h" + struct dir_entry { unsigned int len; char name[FLEX_ARRAY]; /* more */ @@ -76,8 +78,22 @@ extern int read_directory(struct dir_struct *, const char *path, int len, const extern int excluded_from_list(const char *pathname, int pathlen, const char *basename, int *dtype, struct exclude_list *el); -extern int excluded(struct dir_struct *, const char *, int *); struct dir_entry *dir_add_ignored(struct dir_struct *dir, const char *pathname, int len); + +/* + * The excluded() API is meant for callers that check each level of leading + * directory hierarchies with excluded() to avoid recursing into excluded + * directories. Callers that do not do so should use this API instead. + */ +struct path_exclude_check { + struct dir_struct *dir; + struct strbuf path; +}; +extern void path_exclude_check_init(struct path_exclude_check *, struct dir_struct *); +extern void path_exclude_check_clear(struct path_exclude_check *); +extern int path_excluded(struct path_exclude_check *, const char *, int namelen, int *dtype); + + extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, char **buf_p, struct exclude_list *which, int check_index); extern void add_excludes_from_file(struct dir_struct *, const char *fname); diff --git a/environment.c b/environment.c index d7e6c65763..669e498f5a 100644 --- a/environment.c +++ b/environment.c @@ -11,9 +11,6 @@ #include "refs.h" #include "fmt-merge-msg.h" -char git_default_email[MAX_GITNAME]; -char git_default_name[MAX_GITNAME]; -int user_ident_explicitly_given; int trust_executable_bit = 1; int trust_ctime = 1; int has_symlinks = 1; diff --git a/git-compat-util.h b/git-compat-util.h index ed11ad8119..5bd9ad7d2a 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -595,4 +595,7 @@ int rmdir_or_warn(const char *path); */ int remove_or_warn(unsigned int mode, const char *path); +/* Get the passwd entry for the UID of the current process. */ +struct passwd *xgetpwuid_self(void); + #endif diff --git a/git-rebase.sh b/git-rebase.sh index 24a2840033..e616737444 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -167,6 +167,7 @@ run_specific_rebase () { if [ "$interactive_rebase" = implied ]; then GIT_EDITOR=: export GIT_EDITOR + autosquash= fi . git-rebase--$type } @@ -423,7 +424,7 @@ case "$onto_name" in ;; *) onto=$(git rev-parse --verify "${onto_name}^0") || - die "Does not point to a valid commit: $1" + die "Does not point to a valid commit: $onto_name" ;; esac diff --git a/git-request-pull.sh b/git-request-pull.sh index e6438e24c7..d566015975 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -57,9 +57,13 @@ headrev=$(git rev-parse --verify "$head"^0) || exit merge_base=$(git merge-base $baserev $headrev) || die "fatal: No commits in common between $base and $head" -# $head is the token given from the command line. If a ref with that -# name exists at the remote and their values match, we should use it. -# Otherwise find a ref that matches $headrev. +# $head is the token given from the command line, and $tag_name, if +# exists, is the tag we are going to show the commit information for. +# If that tag exists at the remote and it points at the commit, use it. +# Otherwise, if a branch with the same name as $head exists at the remote +# and their values match, use that instead. +# +# Otherwise find a random ref that matches $headrev. find_matching_ref=' sub abbr { my $ref = shift; @@ -70,24 +74,29 @@ find_matching_ref=' } } - my ($exact, $found); + my ($tagged, $branch, $found); while (<STDIN>) { my ($sha1, $ref, $deref) = /^(\S+)\s+(\S+?)(\^\{\})?$/; next unless ($sha1 eq $ARGV[1]); $found = abbr($ref); + if ($deref && $ref eq "tags/$ARGV[2]") { + $tagged = $found; + last; + } if ($ref =~ m|/\Q$ARGV[0]\E$|) { $exact = $found; - last; } } - if ($exact) { + if ($tagged) { + print "$tagged\n"; + } elsif ($exact) { print "$exact\n"; } elsif ($found) { print "$found\n"; } ' -ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev") +ref=$(git ls-remote "$url" | perl -e "$find_matching_ref" "$head" "$headrev" "$tag_name") url=$(git ls-remote --get-url "$url") @@ -114,6 +123,12 @@ fi && if test -n "$tag_name" then + if test -z "$ref" || test "$ref" != "tags/$tag_name" + then + echo >&2 "warn: You locally have $tag_name but it does not (yet)" + echo >&2 "warn: appear to be at $url" + echo >&2 "warn: Do you want to push it there, perhaps?" + fi git cat-file tag "$tag_name" | sed -n -e '1,/^$/d' -e '/^-----BEGIN PGP /q' -e p echo diff --git a/git-submodule.sh b/git-submodule.sh index 64a70d621a..5c61ae2b43 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -396,8 +396,9 @@ cmd_init() module_list "$@" | while read mode sha1 stage sm_path do - # Skip already registered paths name=$(module_name "$sm_path") || exit + + # Copy url setting when it is not set yet if test -z "$(git config "submodule.$name.url")" then url=$(git config -f .gitmodules submodule."$name".url) @@ -412,6 +413,8 @@ cmd_init() esac git config submodule."$name".url "$url" || die "$(eval_gettext "Failed to register url for submodule path '\$sm_path'")" + + say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$sm_path'")" fi # Copy "update" setting when it is not set yet @@ -420,8 +423,6 @@ cmd_init() test -n "$(git config submodule."$name".update)" || git config submodule."$name".update "$upd" || die "$(eval_gettext "Failed to register update mode for submodule path '\$sm_path'")" - - say "$(eval_gettext "Submodule '\$name' (\$url) registered for path '\$sm_path'")" done } diff --git a/git-svn.perl b/git-svn.perl index c84842ff03..0b074c4c63 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -67,9 +67,6 @@ sub _req_svn { } } my $can_compress = eval { require Compress::Zlib; 1}; -push @Git::SVN::Ra::ISA, 'SVN::Ra'; -push @SVN::Git::Editor::ISA, 'SVN::Delta::Editor'; -push @SVN::Git::Fetcher::ISA, 'SVN::Delta::Editor'; use Carp qw/croak/; use Digest::MD5; use IO::File qw//; @@ -80,6 +77,10 @@ use File::Find; use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/; use IPC::Open3; use Git; +use Git::SVN::Editor qw//; +use Git::SVN::Fetcher qw//; +use Git::SVN::Ra qw//; +use Git::SVN::Prompt qw//; use Memoize; # core since 5.8.0, Jul 2002 BEGIN { @@ -88,8 +89,7 @@ BEGIN { foreach (qw/command command_oneline command_noisy command_output_pipe command_input_pipe command_close_pipe command_bidi_pipe command_close_bidi_pipe/) { - for my $package ( qw(SVN::Git::Editor SVN::Git::Fetcher - Git::SVN::Migration Git::SVN::Log Git::SVN), + for my $package ( qw(Git::SVN::Migration Git::SVN::Log Git::SVN), __PACKAGE__) { *{"${package}::$_"} = \&{"Git::$_"}; } @@ -110,12 +110,12 @@ my ($_stdin, $_help, $_edit, $_prefix, $_no_checkout, $_url, $_verbose, $_git_format, $_commit_url, $_tag, $_merge_info, $_interactive); $Git::SVN::_follow_parent = 1; -$SVN::Git::Fetcher::_placeholder_filename = ".gitignore"; +$Git::SVN::Fetcher::_placeholder_filename = ".gitignore"; $_q ||= 0; my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username, 'config-dir=s' => \$Git::SVN::Ra::config_dir, 'no-auth-cache' => \$Git::SVN::Prompt::_no_auth_cache, - 'ignore-paths=s' => \$SVN::Git::Fetcher::_ignore_regex, + 'ignore-paths=s' => \$Git::SVN::Fetcher::_ignore_regex, 'ignore-refs=s' => \$Git::SVN::Ra::_ignore_refs_regex ); my %fc_opts = ( 'follow-parent|follow!' => \$Git::SVN::_follow_parent, 'authors-file|A=s' => \$_authors, @@ -148,10 +148,10 @@ my %init_opts = ( 'template=s' => \$_template, 'shared:s' => \$_shared, 'rewrite-uuid=s' => sub { $icv{rewriteUUID} = $_[1] }, %remote_opts ); my %cmt_opts = ( 'edit|e' => \$_edit, - 'rmdir' => \$SVN::Git::Editor::_rmdir, - 'find-copies-harder' => \$SVN::Git::Editor::_find_copies_harder, - 'l=i' => \$SVN::Git::Editor::_rename_limit, - 'copy-similarity|C=i'=> \$SVN::Git::Editor::_cp_similarity + 'rmdir' => \$Git::SVN::Editor::_rmdir, + 'find-copies-harder' => \$Git::SVN::Editor::_find_copies_harder, + 'l=i' => \$Git::SVN::Editor::_rename_limit, + 'copy-similarity|C=i'=> \$Git::SVN::Editor::_cp_similarity ); my %cmd = ( @@ -163,9 +163,9 @@ my %cmd = ( clone => [ \&cmd_clone, "Initialize and fetch revisions", { 'revision|r=s' => \$_revision, 'preserve-empty-dirs' => - \$SVN::Git::Fetcher::_preserve_empty_dirs, + \$Git::SVN::Fetcher::_preserve_empty_dirs, 'placeholder-filename=s' => - \$SVN::Git::Fetcher::_placeholder_filename, + \$Git::SVN::Fetcher::_placeholder_filename, %fc_opts, %init_opts } ], init => [ \&cmd_init, "Initialize a repo for tracking" . " (requires URL argument)", @@ -463,15 +463,15 @@ sub do_git_init_db { command_noisy('config', "$pfx.$i", $icv{$i}); $set = $i; } - my $ignore_paths_regex = \$SVN::Git::Fetcher::_ignore_regex; + my $ignore_paths_regex = \$Git::SVN::Fetcher::_ignore_regex; command_noisy('config', "$pfx.ignore-paths", $$ignore_paths_regex) if defined $$ignore_paths_regex; my $ignore_refs_regex = \$Git::SVN::Ra::_ignore_refs_regex; command_noisy('config', "$pfx.ignore-refs", $$ignore_refs_regex) if defined $$ignore_refs_regex; - if (defined $SVN::Git::Fetcher::_preserve_empty_dirs) { - my $fname = \$SVN::Git::Fetcher::_placeholder_filename; + if (defined $Git::SVN::Fetcher::_preserve_empty_dirs) { + my $fname = \$Git::SVN::Fetcher::_placeholder_filename; command_noisy('config', "$pfx.preserve-empty-dirs", 'true'); command_noisy('config', "$pfx.placeholder-filename", $$fname); } @@ -941,7 +941,7 @@ sub cmd_dcommit { }, mergeinfo => $_merge_info, svn_path => ''); - if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) { + if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) { print "No changes\n$d~1 == $d\n"; } elsif ($parents->{$d} && @{$parents->{$d}}) { $gs->{inject_parents_dcommit}->{$cmt_rev} = @@ -1065,8 +1065,7 @@ sub cmd_branch { " with the --destination argument.\n"; } foreach my $g (@{$allglobs}) { - # SVN::Git::Editor could probably be moved to Git.pm.. - my $re = SVN::Git::Editor::glob2pat($g->{path}->{left}); + my $re = Git::SVN::Editor::glob2pat($g->{path}->{left}); if ($_branch_dest =~ /$re/) { $glob = $g; last; @@ -1424,7 +1423,7 @@ sub cmd_commit_diff { tree_b => $tb, editor_cb => sub { print "Committed r$_[0]\n" }, svn_path => $svn_path ); - if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) { + if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) { print "No changes\n$ta == $tb\n"; } } @@ -2056,6 +2055,10 @@ use Time::Local; use Memoize; # core since 5.8.0, Jul 2002 use Memoize::Storable; use POSIX qw(:signal_h); +my $can_use_yaml; +BEGIN { + $can_use_yaml = eval { require Git::SVN::Memoize::YAML; 1}; +} my ($_gc_nr, $_gc_period); @@ -3156,7 +3159,7 @@ sub find_parent_branch { # at the moment), so we can't rely on it $self->{last_rev} = $r0; $self->{last_commit} = $parent; - $ed = SVN::Git::Fetcher->new($self, $gs->{path}); + $ed = Git::SVN::Fetcher->new($self, $gs->{path}); $gs->ra->gs_do_switch($r0, $rev, $gs, $self->full_url, $ed) or die "SVN connection failed somewhere...\n"; @@ -3174,7 +3177,7 @@ sub find_parent_branch { } else { print STDERR "Following parent with do_update\n" unless $::_q > 1; - $ed = SVN::Git::Fetcher->new($self); + $ed = Git::SVN::Fetcher->new($self); $self->ra->gs_do_update($rev, $rev, $self, $ed) or die "SVN connection failed somewhere...\n"; } @@ -3197,7 +3200,7 @@ sub do_fetch { push @{$log_entry->{parents}}, $lc; return $log_entry; } - $ed = SVN::Git::Fetcher->new($self); + $ed = Git::SVN::Fetcher->new($self); $last_rev = $self->{last_rev}; $ed->{c} = $lc; @parents = ($lc); @@ -3206,7 +3209,7 @@ sub do_fetch { if (my $log_entry = $self->find_parent_branch($paths, $rev)) { return $log_entry; } - $ed = SVN::Git::Fetcher->new($self); + $ed = Git::SVN::Fetcher->new($self); } unless ($self->ra->gs_do_update($last_rev, $rev, $self, $ed)) { die "SVN connection failed somewhere...\n"; @@ -3578,6 +3581,17 @@ sub has_no_changes { command_oneline("rev-parse", "$commit~1^{tree}")); } +sub tie_for_persistent_memoization { + my $hash = shift; + my $path = shift; + + if ($can_use_yaml) { + tie %$hash => 'Git::SVN::Memoize::YAML', "$path.yaml"; + } else { + tie %$hash => 'Memoize::Storable', "$path.db", 'nstore'; + } +} + # The GIT_DIR environment variable is not always set until after the command # line arguments are processed, so we can't memoize in a BEGIN block. { @@ -3590,22 +3604,26 @@ sub has_no_changes { my $cache_path = "$ENV{GIT_DIR}/svn/.caches/"; mkpath([$cache_path]) unless -d $cache_path; - tie my %lookup_svn_merge_cache => 'Memoize::Storable', - "$cache_path/lookup_svn_merge.db", 'nstore'; + my %lookup_svn_merge_cache; + my %check_cherry_pick_cache; + my %has_no_changes_cache; + + tie_for_persistent_memoization(\%lookup_svn_merge_cache, + "$cache_path/lookup_svn_merge"); memoize 'lookup_svn_merge', SCALAR_CACHE => 'FAULT', LIST_CACHE => ['HASH' => \%lookup_svn_merge_cache], ; - tie my %check_cherry_pick_cache => 'Memoize::Storable', - "$cache_path/check_cherry_pick.db", 'nstore'; + tie_for_persistent_memoization(\%check_cherry_pick_cache, + "$cache_path/check_cherry_pick"); memoize 'check_cherry_pick', SCALAR_CACHE => 'FAULT', LIST_CACHE => ['HASH' => \%check_cherry_pick_cache], ; - tie my %has_no_changes_cache => 'Memoize::Storable', - "$cache_path/has_no_changes.db", 'nstore'; + tie_for_persistent_memoization(\%has_no_changes_cache, + "$cache_path/has_no_changes"); memoize 'has_no_changes', SCALAR_CACHE => ['HASH' => \%has_no_changes_cache], LIST_CACHE => 'FAULT', @@ -3911,7 +3929,7 @@ sub set_tree { editor_cb => sub { $self->set_tree_cb($log_entry, $tree, @_) }, svn_path => $self->{path} ); - if (!SVN::Git::Editor->new(\%ed_opts)->apply_diff) { + if (!Git::SVN::Editor->new(\%ed_opts)->apply_diff) { print "No changes\nr$self->{last_rev} = $tree\n"; } } @@ -4327,1729 +4345,6 @@ sub remove_username { $_[0] =~ s{^([^:]*://)[^@]+@}{$1}; } -package Git::SVN::Prompt; -use strict; -use warnings; -require SVN::Core; -use vars qw/$_no_auth_cache $_username/; - -sub simple { - my ($cred, $realm, $default_username, $may_save, $pool) = @_; - $may_save = undef if $_no_auth_cache; - $default_username = $_username if defined $_username; - if (defined $default_username && length $default_username) { - if (defined $realm && length $realm) { - print STDERR "Authentication realm: $realm\n"; - STDERR->flush; - } - $cred->username($default_username); - } else { - username($cred, $realm, $may_save, $pool); - } - $cred->password(_read_password("Password for '" . - $cred->username . "': ", $realm)); - $cred->may_save($may_save); - $SVN::_Core::SVN_NO_ERROR; -} - -sub ssl_server_trust { - my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_; - $may_save = undef if $_no_auth_cache; - print STDERR "Error validating server certificate for '$realm':\n"; - { - no warnings 'once'; - # All variables SVN::Auth::SSL::* are used only once, - # so we're shutting up Perl warnings about this. - if ($failures & $SVN::Auth::SSL::UNKNOWNCA) { - print STDERR " - The certificate is not issued ", - "by a trusted authority. Use the\n", - " fingerprint to validate ", - "the certificate manually!\n"; - } - if ($failures & $SVN::Auth::SSL::CNMISMATCH) { - print STDERR " - The certificate hostname ", - "does not match.\n"; - } - if ($failures & $SVN::Auth::SSL::NOTYETVALID) { - print STDERR " - The certificate is not yet valid.\n"; - } - if ($failures & $SVN::Auth::SSL::EXPIRED) { - print STDERR " - The certificate has expired.\n"; - } - if ($failures & $SVN::Auth::SSL::OTHER) { - print STDERR " - The certificate has ", - "an unknown error.\n"; - } - } # no warnings 'once' - printf STDERR - "Certificate information:\n". - " - Hostname: %s\n". - " - Valid: from %s until %s\n". - " - Issuer: %s\n". - " - Fingerprint: %s\n", - map $cert_info->$_, qw(hostname valid_from valid_until - issuer_dname fingerprint); - my $choice; -prompt: - print STDERR $may_save ? - "(R)eject, accept (t)emporarily or accept (p)ermanently? " : - "(R)eject or accept (t)emporarily? "; - STDERR->flush; - $choice = lc(substr(<STDIN> || 'R', 0, 1)); - if ($choice =~ /^t$/i) { - $cred->may_save(undef); - } elsif ($choice =~ /^r$/i) { - return -1; - } elsif ($may_save && $choice =~ /^p$/i) { - $cred->may_save($may_save); - } else { - goto prompt; - } - $cred->accepted_failures($failures); - $SVN::_Core::SVN_NO_ERROR; -} - -sub ssl_client_cert { - my ($cred, $realm, $may_save, $pool) = @_; - $may_save = undef if $_no_auth_cache; - print STDERR "Client certificate filename: "; - STDERR->flush; - chomp(my $filename = <STDIN>); - $cred->cert_file($filename); - $cred->may_save($may_save); - $SVN::_Core::SVN_NO_ERROR; -} - -sub ssl_client_cert_pw { - my ($cred, $realm, $may_save, $pool) = @_; - $may_save = undef if $_no_auth_cache; - $cred->password(_read_password("Password: ", $realm)); - $cred->may_save($may_save); - $SVN::_Core::SVN_NO_ERROR; -} - -sub username { - my ($cred, $realm, $may_save, $pool) = @_; - $may_save = undef if $_no_auth_cache; - if (defined $realm && length $realm) { - print STDERR "Authentication realm: $realm\n"; - } - my $username; - if (defined $_username) { - $username = $_username; - } else { - print STDERR "Username: "; - STDERR->flush; - chomp($username = <STDIN>); - } - $cred->username($username); - $cred->may_save($may_save); - $SVN::_Core::SVN_NO_ERROR; -} - -sub _read_password { - my ($prompt, $realm) = @_; - my $password = ''; - if (exists $ENV{GIT_ASKPASS}) { - open(PH, "-|", $ENV{GIT_ASKPASS}, $prompt); - $password = <PH>; - $password =~ s/[\012\015]//; # \n\r - close(PH); - } else { - print STDERR $prompt; - STDERR->flush; - require Term::ReadKey; - Term::ReadKey::ReadMode('noecho'); - while (defined(my $key = Term::ReadKey::ReadKey(0))) { - last if $key =~ /[\012\015]/; # \n\r - $password .= $key; - } - Term::ReadKey::ReadMode('restore'); - print STDERR "\n"; - STDERR->flush; - } - $password; -} - -package SVN::Git::Fetcher; -use vars qw/@ISA $_ignore_regex $_preserve_empty_dirs $_placeholder_filename - @deleted_gpath %added_placeholder $repo_id/; -use strict; -use warnings; -use Carp qw/croak/; -use File::Basename qw/dirname/; -use IO::File qw//; - -# file baton members: path, mode_a, mode_b, pool, fh, blob, base -sub new { - my ($class, $git_svn, $switch_path) = @_; - my $self = SVN::Delta::Editor->new; - bless $self, $class; - if (exists $git_svn->{last_commit}) { - $self->{c} = $git_svn->{last_commit}; - $self->{empty_symlinks} = - _mark_empty_symlinks($git_svn, $switch_path); - } - - # some options are read globally, but can be overridden locally - # per [svn-remote "..."] section. Command-line options will *NOT* - # override options set in an [svn-remote "..."] section - $repo_id = $git_svn->{repo_id}; - my $k = "svn-remote.$repo_id.ignore-paths"; - my $v = eval { command_oneline('config', '--get', $k) }; - $self->{ignore_regex} = $v; - - $k = "svn-remote.$repo_id.preserve-empty-dirs"; - $v = eval { command_oneline('config', '--get', '--bool', $k) }; - if ($v && $v eq 'true') { - $_preserve_empty_dirs = 1; - $k = "svn-remote.$repo_id.placeholder-filename"; - $v = eval { command_oneline('config', '--get', $k) }; - $_placeholder_filename = $v; - } - - # Load the list of placeholder files added during previous invocations. - $k = "svn-remote.$repo_id.added-placeholder"; - $v = eval { command_oneline('config', '--get-all', $k) }; - if ($_preserve_empty_dirs && $v) { - # command() prints errors to stderr, so we only call it if - # command_oneline() succeeded. - my @v = command('config', '--get-all', $k); - $added_placeholder{ dirname($_) } = $_ foreach @v; - } - - $self->{empty} = {}; - $self->{dir_prop} = {}; - $self->{file_prop} = {}; - $self->{absent_dir} = {}; - $self->{absent_file} = {}; - $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new }); - $self->{pathnameencoding} = Git::config('svn.pathnameencoding'); - $self; -} - -# this uses the Ra object, so it must be called before do_{switch,update}, -# not inside them (when the Git::SVN::Fetcher object is passed) to -# do_{switch,update} -sub _mark_empty_symlinks { - my ($git_svn, $switch_path) = @_; - my $bool = Git::config_bool('svn.brokenSymlinkWorkaround'); - return {} if (!defined($bool)) || (defined($bool) && ! $bool); - - my %ret; - my ($rev, $cmt) = $git_svn->last_rev_commit; - return {} unless ($rev && $cmt); - - # allow the warning to be printed for each revision we fetch to - # ensure the user sees it. The user can also disable the workaround - # on the repository even while git svn is running and the next - # revision fetched will skip this expensive function. - my $printed_warning; - chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`); - my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt); - local $/ = "\0"; - my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path}; - $pfx .= '/' if length($pfx); - while (<$ls>) { - chomp; - s/\A100644 blob $empty_blob\t//o or next; - unless ($printed_warning) { - print STDERR "Scanning for empty symlinks, ", - "this may take a while if you have ", - "many empty files\n", - "You may disable this with `", - "git config svn.brokenSymlinkWorkaround ", - "false'.\n", - "This may be done in a different ", - "terminal without restarting ", - "git svn\n"; - $printed_warning = 1; - } - my $path = $_; - my (undef, $props) = - $git_svn->ra->get_file($pfx.$path, $rev, undef); - if ($props->{'svn:special'}) { - $ret{$path} = 1; - } - } - command_close_pipe($ls, $ctx); - \%ret; -} - -# returns true if a given path is inside a ".git" directory -sub in_dot_git { - $_[0] =~ m{(?:^|/)\.git(?:/|$)}; -} - -# return value: 0 -- don't ignore, 1 -- ignore -sub is_path_ignored { - my ($self, $path) = @_; - return 1 if in_dot_git($path); - return 1 if defined($self->{ignore_regex}) && - $path =~ m!$self->{ignore_regex}!; - return 0 unless defined($_ignore_regex); - return 1 if $path =~ m!$_ignore_regex!o; - return 0; -} - -sub set_path_strip { - my ($self, $path) = @_; - $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path; -} - -sub open_root { - { path => '' }; -} - -sub open_directory { - my ($self, $path, $pb, $rev) = @_; - { path => $path }; -} - -sub git_path { - my ($self, $path) = @_; - if (my $enc = $self->{pathnameencoding}) { - require Encode; - Encode::from_to($path, 'UTF-8', $enc); - } - if ($self->{path_strip}) { - $path =~ s!$self->{path_strip}!! or - die "Failed to strip path '$path' ($self->{path_strip})\n"; - } - $path; -} - -sub delete_entry { - my ($self, $path, $rev, $pb) = @_; - return undef if $self->is_path_ignored($path); - - my $gpath = $self->git_path($path); - return undef if ($gpath eq ''); - - # remove entire directories. - my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath") - =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/); - if ($tree) { - my ($ls, $ctx) = command_output_pipe(qw/ls-tree - -r --name-only -z/, - $tree); - local $/ = "\0"; - while (<$ls>) { - chomp; - my $rmpath = "$gpath/$_"; - $self->{gii}->remove($rmpath); - print "\tD\t$rmpath\n" unless $::_q; - } - print "\tD\t$gpath/\n" unless $::_q; - command_close_pipe($ls, $ctx); - } else { - $self->{gii}->remove($gpath); - print "\tD\t$gpath\n" unless $::_q; - } - # Don't add to @deleted_gpath if we're deleting a placeholder file. - push @deleted_gpath, $gpath unless $added_placeholder{dirname($path)}; - $self->{empty}->{$path} = 0; - undef; -} - -sub open_file { - my ($self, $path, $pb, $rev) = @_; - my ($mode, $blob); - - goto out if $self->is_path_ignored($path); - - my $gpath = $self->git_path($path); - ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath") - =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/); - unless (defined $mode && defined $blob) { - die "$path was not found in commit $self->{c} (r$rev)\n"; - } - if ($mode eq '100644' && $self->{empty_symlinks}->{$path}) { - $mode = '120000'; - } -out: - { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob, - pool => SVN::Pool->new, action => 'M' }; -} - -sub add_file { - my ($self, $path, $pb, $cp_path, $cp_rev) = @_; - my $mode; - - if (!$self->is_path_ignored($path)) { - my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#); - delete $self->{empty}->{$dir}; - $mode = '100644'; - - if ($added_placeholder{$dir}) { - # Remove our placeholder file, if we created one. - delete_entry($self, $added_placeholder{$dir}) - unless $path eq $added_placeholder{$dir}; - delete $added_placeholder{$dir} - } - } - - { path => $path, mode_a => $mode, mode_b => $mode, - pool => SVN::Pool->new, action => 'A' }; -} - -sub add_directory { - my ($self, $path, $cp_path, $cp_rev) = @_; - goto out if $self->is_path_ignored($path); - my $gpath = $self->git_path($path); - if ($gpath eq '') { - my ($ls, $ctx) = command_output_pipe(qw/ls-tree - -r --name-only -z/, - $self->{c}); - local $/ = "\0"; - while (<$ls>) { - chomp; - $self->{gii}->remove($_); - print "\tD\t$_\n" unless $::_q; - push @deleted_gpath, $gpath; - } - command_close_pipe($ls, $ctx); - $self->{empty}->{$path} = 0; - } - my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#); - delete $self->{empty}->{$dir}; - $self->{empty}->{$path} = 1; - - if ($added_placeholder{$dir}) { - # Remove our placeholder file, if we created one. - delete_entry($self, $added_placeholder{$dir}); - delete $added_placeholder{$dir} - } - -out: - { path => $path }; -} - -sub change_dir_prop { - my ($self, $db, $prop, $value) = @_; - return undef if $self->is_path_ignored($db->{path}); - $self->{dir_prop}->{$db->{path}} ||= {}; - $self->{dir_prop}->{$db->{path}}->{$prop} = $value; - undef; -} - -sub absent_directory { - my ($self, $path, $pb) = @_; - return undef if $self->is_path_ignored($path); - $self->{absent_dir}->{$pb->{path}} ||= []; - push @{$self->{absent_dir}->{$pb->{path}}}, $path; - undef; -} - -sub absent_file { - my ($self, $path, $pb) = @_; - return undef if $self->is_path_ignored($path); - $self->{absent_file}->{$pb->{path}} ||= []; - push @{$self->{absent_file}->{$pb->{path}}}, $path; - undef; -} - -sub change_file_prop { - my ($self, $fb, $prop, $value) = @_; - return undef if $self->is_path_ignored($fb->{path}); - if ($prop eq 'svn:executable') { - if ($fb->{mode_b} != 120000) { - $fb->{mode_b} = defined $value ? 100755 : 100644; - } - } elsif ($prop eq 'svn:special') { - $fb->{mode_b} = defined $value ? 120000 : 100644; - } else { - $self->{file_prop}->{$fb->{path}} ||= {}; - $self->{file_prop}->{$fb->{path}}->{$prop} = $value; - } - undef; -} - -sub apply_textdelta { - my ($self, $fb, $exp) = @_; - return undef if $self->is_path_ignored($fb->{path}); - my $fh = $::_repository->temp_acquire('svn_delta'); - # $fh gets auto-closed() by SVN::TxDelta::apply(), - # (but $base does not,) so dup() it for reading in close_file - open my $dup, '<&', $fh or croak $!; - my $base = $::_repository->temp_acquire('git_blob'); - - if ($fb->{blob}) { - my ($base_is_link, $size); - - if ($fb->{mode_a} eq '120000' && - ! $self->{empty_symlinks}->{$fb->{path}}) { - print $base 'link ' or die "print $!\n"; - $base_is_link = 1; - } - retry: - $size = $::_repository->cat_blob($fb->{blob}, $base); - die "Failed to read object $fb->{blob}" if ($size < 0); - - if (defined $exp) { - seek $base, 0, 0 or croak $!; - my $got = ::md5sum($base); - if ($got ne $exp) { - my $err = "Checksum mismatch: ". - "$fb->{path} $fb->{blob}\n" . - "expected: $exp\n" . - " got: $got\n"; - if ($base_is_link) { - warn $err, - "Retrying... (possibly ", - "a bad symlink from SVN)\n"; - $::_repository->temp_reset($base); - $base_is_link = 0; - goto retry; - } - die $err; - } - } - } - seek $base, 0, 0 or croak $!; - $fb->{fh} = $fh; - $fb->{base} = $base; - [ SVN::TxDelta::apply($base, $dup, undef, $fb->{path}, $fb->{pool}) ]; -} - -sub close_file { - my ($self, $fb, $exp) = @_; - return undef if $self->is_path_ignored($fb->{path}); - - my $hash; - my $path = $self->git_path($fb->{path}); - if (my $fh = $fb->{fh}) { - if (defined $exp) { - seek($fh, 0, 0) or croak $!; - my $got = ::md5sum($fh); - if ($got ne $exp) { - die "Checksum mismatch: $path\n", - "expected: $exp\n got: $got\n"; - } - } - if ($fb->{mode_b} == 120000) { - sysseek($fh, 0, 0) or croak $!; - my $rd = sysread($fh, my $buf, 5); - - if (!defined $rd) { - croak "sysread: $!\n"; - } elsif ($rd == 0) { - warn "$path has mode 120000", - " but it points to nothing\n", - "converting to an empty file with mode", - " 100644\n"; - $fb->{mode_b} = '100644'; - } elsif ($buf ne 'link ') { - warn "$path has mode 120000", - " but is not a link\n"; - } else { - my $tmp_fh = $::_repository->temp_acquire( - 'svn_hash'); - my $res; - while ($res = sysread($fh, my $str, 1024)) { - my $out = syswrite($tmp_fh, $str, $res); - defined($out) && $out == $res - or croak("write ", - Git::temp_path($tmp_fh), - ": $!\n"); - } - defined $res or croak $!; - - ($fh, $tmp_fh) = ($tmp_fh, $fh); - Git::temp_release($tmp_fh, 1); - } - } - - $hash = $::_repository->hash_and_insert_object( - Git::temp_path($fh)); - $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n"; - - Git::temp_release($fb->{base}, 1); - Git::temp_release($fh, 1); - } else { - $hash = $fb->{blob} or die "no blob information\n"; - } - $fb->{pool}->clear; - $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!; - print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q; - undef; -} - -sub abort_edit { - my $self = shift; - $self->{nr} = $self->{gii}->{nr}; - delete $self->{gii}; - $self->SUPER::abort_edit(@_); -} - -sub close_edit { - my $self = shift; - - if ($_preserve_empty_dirs) { - my @empty_dirs; - - # Any entry flagged as empty that also has an associated - # dir_prop represents a newly created empty directory. - foreach my $i (keys %{$self->{empty}}) { - push @empty_dirs, $i if exists $self->{dir_prop}->{$i}; - } - - # Search for directories that have become empty due subsequent - # file deletes. - push @empty_dirs, $self->find_empty_directories(); - - # Finally, add a placeholder file to each empty directory. - $self->add_placeholder_file($_) foreach (@empty_dirs); - - $self->stash_placeholder_list(); - } - - $self->{git_commit_ok} = 1; - $self->{nr} = $self->{gii}->{nr}; - delete $self->{gii}; - $self->SUPER::close_edit(@_); -} - -sub find_empty_directories { - my ($self) = @_; - my @empty_dirs; - my %dirs = map { dirname($_) => 1 } @deleted_gpath; - - foreach my $dir (sort keys %dirs) { - next if $dir eq "."; - - # If there have been any additions to this directory, there is - # no reason to check if it is empty. - my $skip_added = 0; - foreach my $t (qw/dir_prop file_prop/) { - foreach my $path (keys %{ $self->{$t} }) { - if (exists $self->{$t}->{dirname($path)}) { - $skip_added = 1; - last; - } - } - last if $skip_added; - } - next if $skip_added; - - # Use `git ls-tree` to get the filenames of this directory - # that existed prior to this particular commit. - my $ls = command('ls-tree', '-z', '--name-only', - $self->{c}, "$dir/"); - my %files = map { $_ => 1 } split(/\0/, $ls); - - # Remove the filenames that were deleted during this commit. - delete $files{$_} foreach (@deleted_gpath); - - # Report the directory if there are no filenames left. - push @empty_dirs, $dir unless (scalar %files); - } - @empty_dirs; -} - -sub add_placeholder_file { - my ($self, $dir) = @_; - my $path = "$dir/$_placeholder_filename"; - my $gpath = $self->git_path($path); - - my $fh = $::_repository->temp_acquire($gpath); - my $hash = $::_repository->hash_and_insert_object(Git::temp_path($fh)); - Git::temp_release($fh, 1); - $self->{gii}->update('100644', $hash, $gpath) or croak $!; - - # The directory should no longer be considered empty. - delete $self->{empty}->{$dir} if exists $self->{empty}->{$dir}; - - # Keep track of any placeholder files we create. - $added_placeholder{$dir} = $path; -} - -sub stash_placeholder_list { - my ($self) = @_; - my $k = "svn-remote.$repo_id.added-placeholder"; - my $v = eval { command_oneline('config', '--get-all', $k) }; - command_noisy('config', '--unset-all', $k) if $v; - foreach (values %added_placeholder) { - command_noisy('config', '--add', $k, $_); - } -} - -package SVN::Git::Editor; -use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/; -use strict; -use warnings; -use Carp qw/croak/; -use IO::File; - -sub new { - my ($class, $opts) = @_; - foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) { - die "$_ required!\n" unless (defined $opts->{$_}); - } - - my $pool = SVN::Pool->new; - my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b}); - my $types = check_diff_paths($opts->{ra}, $opts->{svn_path}, - $opts->{r}, $mods); - - # $opts->{ra} functions should not be used after this: - my @ce = $opts->{ra}->get_commit_editor($opts->{log}, - $opts->{editor_cb}, $pool); - my $self = SVN::Delta::Editor->new(@ce, $pool); - bless $self, $class; - foreach (qw/svn_path r tree_a tree_b/) { - $self->{$_} = $opts->{$_}; - } - $self->{url} = $opts->{ra}->{url}; - $self->{mods} = $mods; - $self->{types} = $types; - $self->{pool} = $pool; - $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) }; - $self->{rm} = { }; - $self->{path_prefix} = length $self->{svn_path} ? - "$self->{svn_path}/" : ''; - $self->{config} = $opts->{config}; - $self->{mergeinfo} = $opts->{mergeinfo}; - return $self; -} - -sub generate_diff { - my ($tree_a, $tree_b) = @_; - my @diff_tree = qw(diff-tree -z -r); - if ($_cp_similarity) { - push @diff_tree, "-C$_cp_similarity"; - } else { - push @diff_tree, '-C'; - } - push @diff_tree, '--find-copies-harder' if $_find_copies_harder; - push @diff_tree, "-l$_rename_limit" if defined $_rename_limit; - push @diff_tree, $tree_a, $tree_b; - my ($diff_fh, $ctx) = command_output_pipe(@diff_tree); - local $/ = "\0"; - my $state = 'meta'; - my @mods; - while (<$diff_fh>) { - chomp $_; # this gets rid of the trailing "\0" - if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s - ($::sha1)\s($::sha1)\s - ([MTCRAD])\d*$/xo) { - push @mods, { mode_a => $1, mode_b => $2, - sha1_a => $3, sha1_b => $4, - chg => $5 }; - if ($5 =~ /^(?:C|R)$/) { - $state = 'file_a'; - } else { - $state = 'file_b'; - } - } elsif ($state eq 'file_a') { - my $x = $mods[$#mods] or croak "Empty array\n"; - if ($x->{chg} !~ /^(?:C|R)$/) { - croak "Error parsing $_, $x->{chg}\n"; - } - $x->{file_a} = $_; - $state = 'file_b'; - } elsif ($state eq 'file_b') { - my $x = $mods[$#mods] or croak "Empty array\n"; - if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) { - croak "Error parsing $_, $x->{chg}\n"; - } - if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) { - croak "Error parsing $_, $x->{chg}\n"; - } - $x->{file_b} = $_; - $state = 'meta'; - } else { - croak "Error parsing $_\n"; - } - } - command_close_pipe($diff_fh, $ctx); - \@mods; -} - -sub check_diff_paths { - my ($ra, $pfx, $rev, $mods) = @_; - my %types; - $pfx .= '/' if length $pfx; - - sub type_diff_paths { - my ($ra, $types, $path, $rev) = @_; - my @p = split m#/+#, $path; - my $c = shift @p; - unless (defined $types->{$c}) { - $types->{$c} = $ra->check_path($c, $rev); - } - while (@p) { - $c .= '/' . shift @p; - next if defined $types->{$c}; - $types->{$c} = $ra->check_path($c, $rev); - } - } - - foreach my $m (@$mods) { - foreach my $f (qw/file_a file_b/) { - next unless defined $m->{$f}; - my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#); - if (length $pfx.$dir && ! defined $types{$dir}) { - type_diff_paths($ra, \%types, $pfx.$dir, $rev); - } - } - } - \%types; -} - -sub split_path { - return ($_[0] =~ m#^(.*?)/?([^/]+)$#); -} - -sub repo_path { - my ($self, $path) = @_; - if (my $enc = $self->{pathnameencoding}) { - require Encode; - Encode::from_to($path, $enc, 'UTF-8'); - } - $self->{path_prefix}.(defined $path ? $path : ''); -} - -sub url_path { - my ($self, $path) = @_; - if ($self->{url} =~ m#^https?://#) { - $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg; - } - $self->{url} . '/' . $self->repo_path($path); -} - -sub rmdirs { - my ($self) = @_; - my $rm = $self->{rm}; - delete $rm->{''}; # we never delete the url we're tracking - return unless %$rm; - - foreach (keys %$rm) { - my @d = split m#/#, $_; - my $c = shift @d; - $rm->{$c} = 1; - while (@d) { - $c .= '/' . shift @d; - $rm->{$c} = 1; - } - } - delete $rm->{$self->{svn_path}}; - delete $rm->{''}; # we never delete the url we're tracking - return unless %$rm; - - my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/, - $self->{tree_b}); - local $/ = "\0"; - while (<$fh>) { - chomp; - my @dn = split m#/#, $_; - while (pop @dn) { - delete $rm->{join '/', @dn}; - } - unless (%$rm) { - close $fh; - return; - } - } - command_close_pipe($fh, $ctx); - - my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat}); - foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) { - $self->close_directory($bat->{$d}, $p); - my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#); - print "\tD+\t$d/\n" unless $::_q; - $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p); - delete $bat->{$d}; - } -} - -sub open_or_add_dir { - my ($self, $full_path, $baton, $deletions) = @_; - my $t = $self->{types}->{$full_path}; - if (!defined $t) { - die "$full_path not known in r$self->{r} or we have a bug!\n"; - } - { - no warnings 'once'; - # SVN::Node::none and SVN::Node::file are used only once, - # so we're shutting up Perl's warnings about them. - if ($t == $SVN::Node::none || defined($deletions->{$full_path})) { - return $self->add_directory($full_path, $baton, - undef, -1, $self->{pool}); - } elsif ($t == $SVN::Node::dir) { - return $self->open_directory($full_path, $baton, - $self->{r}, $self->{pool}); - } # no warnings 'once' - print STDERR "$full_path already exists in repository at ", - "r$self->{r} and it is not a directory (", - ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n"; - } # no warnings 'once' - exit 1; -} - -sub ensure_path { - my ($self, $path, $deletions) = @_; - my $bat = $self->{bat}; - my $repo_path = $self->repo_path($path); - return $bat->{''} unless (length $repo_path); - - my @p = split m#/+#, $repo_path; - my $c = shift @p; - $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''}, $deletions); - while (@p) { - my $c0 = $c; - $c .= '/' . shift @p; - $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0}, $deletions); - } - return $bat->{$c}; -} - -# Subroutine to convert a globbing pattern to a regular expression. -# From perl cookbook. -sub glob2pat { - my $globstr = shift; - my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']'); - $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge; - return '^' . $globstr . '$'; -} - -sub check_autoprop { - my ($self, $pattern, $properties, $file, $fbat) = @_; - # Convert the globbing pattern to a regular expression. - my $regex = glob2pat($pattern); - # Check if the pattern matches the file name. - if($file =~ m/($regex)/) { - # Parse the list of properties to set. - my @props = split(/;/, $properties); - foreach my $prop (@props) { - # Parse 'name=value' syntax and set the property. - if ($prop =~ /([^=]+)=(.*)/) { - my ($n,$v) = ($1,$2); - for ($n, $v) { - s/^\s+//; s/\s+$//; - } - $self->change_file_prop($fbat, $n, $v); - } - } - } -} - -sub apply_autoprops { - my ($self, $file, $fbat) = @_; - my $conf_t = ${$self->{config}}{'config'}; - no warnings 'once'; - # Check [miscellany]/enable-auto-props in svn configuration. - if (SVN::_Core::svn_config_get_bool( - $conf_t, - $SVN::_Core::SVN_CONFIG_SECTION_MISCELLANY, - $SVN::_Core::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS, - 0)) { - # Auto-props are enabled. Enumerate them to look for matches. - my $callback = sub { - $self->check_autoprop($_[0], $_[1], $file, $fbat); - }; - SVN::_Core::svn_config_enumerate( - $conf_t, - $SVN::_Core::SVN_CONFIG_SECTION_AUTO_PROPS, - $callback); - } -} - -sub A { - my ($self, $m, $deletions) = @_; - my ($dir, $file) = split_path($m->{file_b}); - my $pbat = $self->ensure_path($dir, $deletions); - my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, - undef, -1); - print "\tA\t$m->{file_b}\n" unless $::_q; - $self->apply_autoprops($file, $fbat); - $self->chg_file($fbat, $m); - $self->close_file($fbat,undef,$self->{pool}); -} - -sub C { - my ($self, $m, $deletions) = @_; - my ($dir, $file) = split_path($m->{file_b}); - my $pbat = $self->ensure_path($dir, $deletions); - my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, - $self->url_path($m->{file_a}), $self->{r}); - print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q; - $self->chg_file($fbat, $m); - $self->close_file($fbat,undef,$self->{pool}); -} - -sub delete_entry { - my ($self, $path, $pbat) = @_; - my $rpath = $self->repo_path($path); - my ($dir, $file) = split_path($rpath); - $self->{rm}->{$dir} = 1; - $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool}); -} - -sub R { - my ($self, $m, $deletions) = @_; - my ($dir, $file) = split_path($m->{file_b}); - my $pbat = $self->ensure_path($dir, $deletions); - my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, - $self->url_path($m->{file_a}), $self->{r}); - print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q; - $self->apply_autoprops($file, $fbat); - $self->chg_file($fbat, $m); - $self->close_file($fbat,undef,$self->{pool}); - - ($dir, $file) = split_path($m->{file_a}); - $pbat = $self->ensure_path($dir, $deletions); - $self->delete_entry($m->{file_a}, $pbat); -} - -sub M { - my ($self, $m, $deletions) = @_; - my ($dir, $file) = split_path($m->{file_b}); - my $pbat = $self->ensure_path($dir, $deletions); - my $fbat = $self->open_file($self->repo_path($m->{file_b}), - $pbat,$self->{r},$self->{pool}); - print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q; - $self->chg_file($fbat, $m); - $self->close_file($fbat,undef,$self->{pool}); -} - -sub T { shift->M(@_) } - -sub change_file_prop { - my ($self, $fbat, $pname, $pval) = @_; - $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool}); -} - -sub change_dir_prop { - my ($self, $pbat, $pname, $pval) = @_; - $self->SUPER::change_dir_prop($pbat, $pname, $pval, $self->{pool}); -} - -sub _chg_file_get_blob ($$$$) { - my ($self, $fbat, $m, $which) = @_; - my $fh = $::_repository->temp_acquire("git_blob_$which"); - if ($m->{"mode_$which"} =~ /^120/) { - print $fh 'link ' or croak $!; - $self->change_file_prop($fbat,'svn:special','*'); - } elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) { - $self->change_file_prop($fbat,'svn:special',undef); - } - my $blob = $m->{"sha1_$which"}; - return ($fh,) if ($blob =~ /^0{40}$/); - my $size = $::_repository->cat_blob($blob, $fh); - croak "Failed to read object $blob" if ($size < 0); - $fh->flush == 0 or croak $!; - seek $fh, 0, 0 or croak $!; - - my $exp = ::md5sum($fh); - seek $fh, 0, 0 or croak $!; - return ($fh, $exp); -} - -sub chg_file { - my ($self, $fbat, $m) = @_; - if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) { - $self->change_file_prop($fbat,'svn:executable','*'); - } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) { - $self->change_file_prop($fbat,'svn:executable',undef); - } - my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a'; - my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b'; - my $pool = SVN::Pool->new; - my $atd = $self->apply_textdelta($fbat, $exp_a, $pool); - if (-s $fh_a) { - my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool); - my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool); - if (defined $res) { - die "Unexpected result from send_txstream: $res\n", - "(SVN::Core::VERSION: $SVN::Core::VERSION)\n"; - } - } else { - my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool); - die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n" - if ($got ne $exp_b); - } - Git::temp_release($fh_b, 1); - Git::temp_release($fh_a, 1); - $pool->clear; -} - -sub D { - my ($self, $m, $deletions) = @_; - my ($dir, $file) = split_path($m->{file_b}); - my $pbat = $self->ensure_path($dir, $deletions); - print "\tD\t$m->{file_b}\n" unless $::_q; - $self->delete_entry($m->{file_b}, $pbat); -} - -sub close_edit { - my ($self) = @_; - my ($p,$bat) = ($self->{pool}, $self->{bat}); - foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) { - next if $_ eq ''; - $self->close_directory($bat->{$_}, $p); - } - $self->close_directory($bat->{''}, $p); - $self->SUPER::close_edit($p); - $p->clear; -} - -sub abort_edit { - my ($self) = @_; - $self->SUPER::abort_edit($self->{pool}); -} - -sub DESTROY { - my $self = shift; - $self->SUPER::DESTROY(@_); - $self->{pool}->clear; -} - -# this drives the editor -sub apply_diff { - my ($self) = @_; - my $mods = $self->{mods}; - my %o = ( D => 0, C => 1, R => 2, A => 3, M => 4, T => 5 ); - my %deletions; - - foreach my $m (@$mods) { - if ($m->{chg} eq "D") { - $deletions{$m->{file_b}} = 1; - } - } - - foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) { - my $f = $m->{chg}; - if (defined $o{$f}) { - $self->$f($m, \%deletions); - } else { - fatal("Invalid change type: $f"); - } - } - - if (defined($self->{mergeinfo})) { - $self->change_dir_prop($self->{bat}{''}, "svn:mergeinfo", - $self->{mergeinfo}); - } - $self->rmdirs if $_rmdir; - if (@$mods == 0 && !defined($self->{mergeinfo})) { - $self->abort_edit; - } else { - $self->close_edit; - } - return scalar @$mods; -} - -package Git::SVN::Ra; -use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/; -use strict; -use warnings; -my ($ra_invalid, $can_do_switch, %ignored_err, $RA); - -BEGIN { - # enforce temporary pool usage for some simple functions - no strict 'refs'; - for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root - get_file/) { - my $SUPER = "SUPER::$f"; - *$f = sub { - my $self = shift; - my $pool = SVN::Pool->new; - my @ret = $self->$SUPER(@_,$pool); - $pool->clear; - wantarray ? @ret : $ret[0]; - }; - } -} - -sub _auth_providers () { - my @rv = ( - SVN::Client::get_simple_provider(), - SVN::Client::get_ssl_server_trust_file_provider(), - SVN::Client::get_simple_prompt_provider( - \&Git::SVN::Prompt::simple, 2), - SVN::Client::get_ssl_client_cert_file_provider(), - SVN::Client::get_ssl_client_cert_prompt_provider( - \&Git::SVN::Prompt::ssl_client_cert, 2), - SVN::Client::get_ssl_client_cert_pw_file_provider(), - SVN::Client::get_ssl_client_cert_pw_prompt_provider( - \&Git::SVN::Prompt::ssl_client_cert_pw, 2), - SVN::Client::get_username_provider(), - SVN::Client::get_ssl_server_trust_prompt_provider( - \&Git::SVN::Prompt::ssl_server_trust), - SVN::Client::get_username_prompt_provider( - \&Git::SVN::Prompt::username, 2) - ); - - # earlier 1.6.x versions would segfault, and <= 1.5.x didn't have - # this function - if (::compare_svn_version('1.6.12') > 0) { - my $config = SVN::Core::config_get_config($config_dir); - my ($p, @a); - # config_get_config returns all config files from - # ~/.subversion, auth_get_platform_specific_client_providers - # just wants the config "file". - @a = ($config->{'config'}, undef); - $p = SVN::Core::auth_get_platform_specific_client_providers(@a); - # Insert the return value from - # auth_get_platform_specific_providers - unshift @rv, @$p; - } - \@rv; -} - -sub escape_uri_only { - my ($uri) = @_; - my @tmp; - foreach (split m{/}, $uri) { - s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; - push @tmp, $_; - } - join('/', @tmp); -} - -sub escape_url { - my ($url) = @_; - if ($url =~ m#^(https?)://([^/]+)(.*)$#) { - my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3)); - $url = "$scheme://$domain$uri"; - } - $url; -} - -sub new { - my ($class, $url) = @_; - $url =~ s!/+$!!; - return $RA if ($RA && $RA->{url} eq $url); - - ::_req_svn(); - - SVN::_Core::svn_config_ensure($config_dir, undef); - my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers); - my $config = SVN::Core::config_get_config($config_dir); - $RA = undef; - my $dont_store_passwords = 1; - my $conf_t = ${$config}{'config'}; - { - no warnings 'once'; - # The usage of $SVN::_Core::SVN_CONFIG_* variables - # produces warnings that variables are used only once. - # I had not found the better way to shut them up, so - # the warnings of type 'once' are disabled in this block. - if (SVN::_Core::svn_config_get_bool($conf_t, - $SVN::_Core::SVN_CONFIG_SECTION_AUTH, - $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS, - 1) == 0) { - SVN::_Core::svn_auth_set_parameter($baton, - $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, - bless (\$dont_store_passwords, "_p_void")); - } - if (SVN::_Core::svn_config_get_bool($conf_t, - $SVN::_Core::SVN_CONFIG_SECTION_AUTH, - $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS, - 1) == 0) { - $Git::SVN::Prompt::_no_auth_cache = 1; - } - } # no warnings 'once' - my $self = SVN::Ra->new(url => escape_url($url), auth => $baton, - config => $config, - pool => SVN::Pool->new, - auth_provider_callbacks => $callbacks); - $self->{url} = $url; - $self->{svn_path} = $url; - $self->{repos_root} = $self->get_repos_root; - $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##; - $self->{cache} = { check_path => { r => 0, data => {} }, - get_dir => { r => 0, data => {} } }; - $RA = bless $self, $class; -} - -sub check_path { - my ($self, $path, $r) = @_; - my $cache = $self->{cache}->{check_path}; - if ($r == $cache->{r} && exists $cache->{data}->{$path}) { - return $cache->{data}->{$path}; - } - my $pool = SVN::Pool->new; - my $t = $self->SUPER::check_path($path, $r, $pool); - $pool->clear; - if ($r != $cache->{r}) { - %{$cache->{data}} = (); - $cache->{r} = $r; - } - $cache->{data}->{$path} = $t; -} - -sub get_dir { - my ($self, $dir, $r) = @_; - my $cache = $self->{cache}->{get_dir}; - if ($r == $cache->{r}) { - if (my $x = $cache->{data}->{$dir}) { - return wantarray ? @$x : $x->[0]; - } - } - my $pool = SVN::Pool->new; - my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool); - my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d; - $pool->clear; - if ($r != $cache->{r}) { - %{$cache->{data}} = (); - $cache->{r} = $r; - } - $cache->{data}->{$dir} = [ \%dirents, $r, $props ]; - wantarray ? (\%dirents, $r, $props) : \%dirents; -} - -sub DESTROY { - # do not call the real DESTROY since we store ourselves in $RA -} - -# get_log(paths, start, end, limit, -# discover_changed_paths, strict_node_history, receiver) -sub get_log { - my ($self, @args) = @_; - my $pool = SVN::Pool->new; - - # svn_log_changed_path_t objects passed to get_log are likely to be - # overwritten even if only the refs are copied to an external variable, - # so we should dup the structures in their entirety. Using an - # externally passed pool (instead of our temporary and quickly cleared - # pool in Git::SVN::Ra) does not help matters at all... - my $receiver = pop @args; - my $prefix = "/".$self->{svn_path}; - $prefix =~ s#/+($)##; - my $prefix_regex = qr#^\Q$prefix\E#; - push(@args, sub { - my ($paths) = $_[0]; - return &$receiver(@_) unless $paths; - $_[0] = (); - foreach my $p (keys %$paths) { - my $i = $paths->{$p}; - # Make path relative to our url, not repos_root - $p =~ s/$prefix_regex//; - my %s = map { $_ => $i->$_; } - qw/copyfrom_path copyfrom_rev action/; - if ($s{'copyfrom_path'}) { - $s{'copyfrom_path'} =~ s/$prefix_regex//; - } - $_[0]{$p} = \%s; - } - &$receiver(@_); - }); - - - # the limit parameter was not supported in SVN 1.1.x, so we - # drop it. Therefore, the receiver callback passed to it - # is made aware of this limitation by being wrapped if - # the limit passed to is being wrapped. - if (::compare_svn_version('1.2.0') <= 0) { - my $limit = splice(@args, 3, 1); - if ($limit > 0) { - my $receiver = pop @args; - push(@args, sub { &$receiver(@_) if (--$limit >= 0) }); - } - } - my $ret = $self->SUPER::get_log(@args, $pool); - $pool->clear; - $ret; -} - -sub trees_match { - my ($self, $url1, $rev1, $url2, $rev2) = @_; - my $ctx = SVN::Client->new(auth => _auth_providers); - my $out = IO::File->new_tmpfile; - - # older SVN (1.1.x) doesn't take $pool as the last parameter for - # $ctx->diff(), so we'll create a default one - my $pool = SVN::Pool->new_default_sub; - - $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1 - $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out); - $out->flush; - my $ret = (($out->stat)[7] == 0); - close $out or croak $!; - - $ret; -} - -sub get_commit_editor { - my ($self, $log, $cb, $pool) = @_; - - my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef, 0) : (); - $self->SUPER::get_commit_editor($log, $cb, @lock, $pool); -} - -sub gs_do_update { - my ($self, $rev_a, $rev_b, $gs, $editor) = @_; - my $new = ($rev_a == $rev_b); - my $path = $gs->{path}; - - if ($new && -e $gs->{index}) { - unlink $gs->{index} or die - "Couldn't unlink index: $gs->{index}: $!\n"; - } - my $pool = SVN::Pool->new; - $editor->set_path_strip($path); - my (@pc) = split m#/#, $path; - my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''), - 1, $editor, $pool); - my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef) : (); - - # Since we can't rely on svn_ra_reparent being available, we'll - # just have to do some magic with set_path to make it so - # we only want a partial path. - my $sp = ''; - my $final = join('/', @pc); - while (@pc) { - $reporter->set_path($sp, $rev_b, 0, @lock, $pool); - $sp .= '/' if length $sp; - $sp .= shift @pc; - } - die "BUG: '$sp' != '$final'\n" if ($sp ne $final); - - $reporter->set_path($sp, $rev_a, $new, @lock, $pool); - - $reporter->finish_report($pool); - $pool->clear; - $editor->{git_commit_ok}; -} - -# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and -# svn_ra_reparent didn't work before 1.4) -sub gs_do_switch { - my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_; - my $path = $gs->{path}; - my $pool = SVN::Pool->new; - - my $full_url = $self->{url}; - my $old_url = $full_url; - $full_url .= '/' . $path if length $path; - my ($ra, $reparented); - - if ($old_url =~ m#^svn(\+ssh)?://# || - ($full_url =~ m#^https?://# && - escape_url($full_url) ne $full_url)) { - $_[0] = undef; - $self = undef; - $RA = undef; - $ra = Git::SVN::Ra->new($full_url); - $ra_invalid = 1; - } elsif ($old_url ne $full_url) { - SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool); - $self->{url} = $full_url; - $reparented = 1; - } - - $ra ||= $self; - $url_b = escape_url($url_b); - my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool); - my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef) : (); - $reporter->set_path('', $rev_a, 0, @lock, $pool); - $reporter->finish_report($pool); - - if ($reparented) { - SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool); - $self->{url} = $old_url; - } - - $pool->clear; - $editor->{git_commit_ok}; -} - -sub longest_common_path { - my ($gsv, $globs) = @_; - my %common; - my $common_max = scalar @$gsv; - - foreach my $gs (@$gsv) { - my @tmp = split m#/#, $gs->{path}; - my $p = ''; - foreach (@tmp) { - $p .= length($p) ? "/$_" : $_; - $common{$p} ||= 0; - $common{$p}++; - } - } - $globs ||= []; - $common_max += scalar @$globs; - foreach my $glob (@$globs) { - my @tmp = split m#/#, $glob->{path}->{left}; - my $p = ''; - foreach (@tmp) { - $p .= length($p) ? "/$_" : $_; - $common{$p} ||= 0; - $common{$p}++; - } - } - - my $longest_path = ''; - foreach (sort {length $b <=> length $a} keys %common) { - if ($common{$_} == $common_max) { - $longest_path = $_; - last; - } - } - $longest_path; -} - -sub gs_fetch_loop_common { - my ($self, $base, $head, $gsv, $globs) = @_; - return if ($base > $head); - my $inc = $_log_window_size; - my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc); - my $longest_path = longest_common_path($gsv, $globs); - my $ra_url = $self->{url}; - my $find_trailing_edge; - while (1) { - my %revs; - my $err; - my $err_handler = $SVN::Error::handler; - $SVN::Error::handler = sub { - ($err) = @_; - skip_unknown_revs($err); - }; - sub _cb { - my ($paths, $r, $author, $date, $log) = @_; - [ $paths, - { author => $author, date => $date, log => $log } ]; - } - $self->get_log([$longest_path], $min, $max, 0, 1, 1, - sub { $revs{$_[1]} = _cb(@_) }); - if ($err) { - print "Checked through r$max\r"; - } else { - $find_trailing_edge = 1; - } - if ($err and $find_trailing_edge) { - print STDERR "Path '$longest_path' ", - "was probably deleted:\n", - $err->expanded_message, - "\nWill attempt to follow ", - "revisions r$min .. r$max ", - "committed before the deletion\n"; - my $hi = $max; - while (--$hi >= $min) { - my $ok; - $self->get_log([$longest_path], $min, $hi, - 0, 1, 1, sub { - $ok = $_[1]; - $revs{$_[1]} = _cb(@_) }); - if ($ok) { - print STDERR "r$min .. r$ok OK\n"; - last; - } - } - $find_trailing_edge = 0; - } - $SVN::Error::handler = $err_handler; - - my %exists = map { $_->{path} => $_ } @$gsv; - foreach my $r (sort {$a <=> $b} keys %revs) { - my ($paths, $logged) = @{$revs{$r}}; - - foreach my $gs ($self->match_globs(\%exists, $paths, - $globs, $r)) { - if ($gs->rev_map_max >= $r) { - next; - } - next unless $gs->match_paths($paths, $r); - $gs->{logged_rev_props} = $logged; - if (my $last_commit = $gs->last_commit) { - $gs->assert_index_clean($last_commit); - } - my $log_entry = $gs->do_fetch($paths, $r); - if ($log_entry) { - $gs->do_git_commit($log_entry); - } - $INDEX_FILES{$gs->{index}} = 1; - } - foreach my $g (@$globs) { - my $k = "svn-remote.$g->{remote}." . - "$g->{t}-maxRev"; - Git::SVN::tmp_config($k, $r); - } - if ($ra_invalid) { - $_[0] = undef; - $self = undef; - $RA = undef; - $self = Git::SVN::Ra->new($ra_url); - $ra_invalid = undef; - } - } - # pre-fill the .rev_db since it'll eventually get filled in - # with '0' x40 if something new gets committed - foreach my $gs (@$gsv) { - next if $gs->rev_map_max >= $max; - next if defined $gs->rev_map_get($max); - $gs->rev_map_set($max, 0 x40); - } - foreach my $g (@$globs) { - my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev"; - Git::SVN::tmp_config($k, $max); - } - last if $max >= $head; - $min = $max + 1; - $max += $inc; - $max = $head if ($max > $head); - } - Git::SVN::gc(); -} - -sub get_dir_globbed { - my ($self, $left, $depth, $r) = @_; - - my @x = eval { $self->get_dir($left, $r) }; - return unless scalar @x == 3; - my $dirents = $x[0]; - my @finalents; - foreach my $de (keys %$dirents) { - next if $dirents->{$de}->{kind} != $SVN::Node::dir; - if ($depth > 1) { - my @args = ("$left/$de", $depth - 1, $r); - foreach my $dir ($self->get_dir_globbed(@args)) { - push @finalents, "$de/$dir"; - } - } else { - push @finalents, $de; - } - } - @finalents; -} - -# return value: 0 -- don't ignore, 1 -- ignore -sub is_ref_ignored { - my ($g, $p) = @_; - my $refname = $g->{ref}->full_path($p); - return 1 if defined($g->{ignore_refs_regex}) && - $refname =~ m!$g->{ignore_refs_regex}!; - return 0 unless defined($_ignore_refs_regex); - return 1 if $refname =~ m!$_ignore_refs_regex!o; - return 0; -} - -sub match_globs { - my ($self, $exists, $paths, $globs, $r) = @_; - - sub get_dir_check { - my ($self, $exists, $g, $r) = @_; - - my @dirs = $self->get_dir_globbed($g->{path}->{left}, - $g->{path}->{depth}, - $r); - - foreach my $de (@dirs) { - my $p = $g->{path}->full_path($de); - next if $exists->{$p}; - next if (length $g->{path}->{right} && - ($self->check_path($p, $r) != - $SVN::Node::dir)); - next unless $p =~ /$g->{path}->{regex}/; - $exists->{$p} = Git::SVN->init($self->{url}, $p, undef, - $g->{ref}->full_path($de), 1); - } - } - foreach my $g (@$globs) { - if (my $path = $paths->{"/$g->{path}->{left}"}) { - if ($path->{action} =~ /^[AR]$/) { - get_dir_check($self, $exists, $g, $r); - } - } - foreach (keys %$paths) { - if (/$g->{path}->{left_regex}/ && - !/$g->{path}->{regex}/) { - next if $paths->{$_}->{action} !~ /^[AR]$/; - get_dir_check($self, $exists, $g, $r); - } - next unless /$g->{path}->{regex}/; - my $p = $1; - my $pathname = $g->{path}->full_path($p); - next if is_ref_ignored($g, $p); - next if $exists->{$pathname}; - next if ($self->check_path($pathname, $r) != - $SVN::Node::dir); - $exists->{$pathname} = Git::SVN->init( - $self->{url}, $pathname, undef, - $g->{ref}->full_path($p), 1); - } - my $c = ''; - foreach (split m#/#, $g->{path}->{left}) { - $c .= "/$_"; - next unless ($paths->{$c} && - ($paths->{$c}->{action} =~ /^[AR]$/)); - get_dir_check($self, $exists, $g, $r); - } - } - values %$exists; -} - -sub minimize_url { - my ($self) = @_; - return $self->{url} if ($self->{url} eq $self->{repos_root}); - my $url = $self->{repos_root}; - my @components = split(m!/!, $self->{svn_path}); - my $c = ''; - do { - $url .= "/$c" if length $c; - eval { - my $ra = (ref $self)->new($url); - my $latest = $ra->get_latest_revnum; - $ra->get_log("", $latest, 0, 1, 0, 1, sub {}); - }; - } while ($@ && ($c = shift @components)); - $url; -} - -sub can_do_switch { - my $self = shift; - unless (defined $can_do_switch) { - my $pool = SVN::Pool->new; - my $rep = eval { - $self->do_switch(1, '', 0, $self->{url}, - SVN::Delta::Editor->new, $pool); - }; - if ($@) { - $can_do_switch = 0; - } else { - $rep->abort_report($pool); - $can_do_switch = 1; - } - $pool->clear; - } - $can_do_switch; -} - -sub skip_unknown_revs { - my ($err) = @_; - my $errno = $err->apr_err(); - # Maybe the branch we're tracking didn't - # exist when the repo started, so it's - # not an error if it doesn't, just continue - # - # Wonderfully consistent library, eh? - # 160013 - svn:// and file:// - # 175002 - http(s):// - # 175007 - http(s):// (this repo required authorization, too...) - # More codes may be discovered later... - if ($errno == 175007 || $errno == 175002 || $errno == 160013) { - my $err_key = $err->expanded_message; - # revision numbers change every time, filter them out - $err_key =~ s/\d+/\0/g; - $err_key = "$errno\0$err_key"; - unless ($ignored_err{$err_key}) { - warn "W: Ignoring error from SVN, path probably ", - "does not exist: ($errno): ", - $err->expanded_message,"\n"; - warn "W: Do not be alarmed at the above message ", - "git-svn is just searching aggressively for ", - "old history.\n", - "This may take a while on large repositories\n"; - $ignored_err{$err_key} = 1; - } - return; - } - die "Error from SVN, ($errno): ", $err->expanded_message,"\n"; -} - package Git::SVN::Log; use strict; use warnings; @@ -256,8 +256,6 @@ static int handle_alias(int *argcp, const char ***argv) return ret; } -const char git_version_string[] = GIT_VERSION; - #define RUN_SETUP (1<<0) #define RUN_SETUP_GENTLY (1<<1) #define USE_PAGER (1<<2) diff --git a/gpg-interface.c b/gpg-interface.c index 09ab64aa24..0863c61800 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -30,7 +30,7 @@ const char *get_signing_key(void) { if (configured_signing_key) return configured_signing_key; - return git_committer_info(IDENT_ERROR_ON_NO_NAME|IDENT_NO_DATE); + return git_committer_info(IDENT_STRICT|IDENT_NO_DATE); } /* @@ -6,6 +6,7 @@ #include "common-cmds.h" #include "string-list.h" #include "column.h" +#include "version.h" void add_cmdname(struct cmdnames *cmds, const char *name, int len) { @@ -317,7 +318,7 @@ const char *help_unknown_cmd(const char *cmd) } main_cmds.names[i]->len = - levenshtein(cmd, candidate, 0, 2, 1, 4) + 1; + levenshtein(cmd, candidate, 0, 2, 1, 3) + 1; } qsort(main_cmds.names, main_cmds.cnt, diff --git a/http-push.c b/http-push.c index 1df7ab5670..a832ca77a3 100644 --- a/http-push.c +++ b/http-push.c @@ -904,7 +904,7 @@ static struct remote_lock *lock_remote(const char *path, long timeout) ep = strchr(ep + 1, '/'); } - escaped = xml_entities(git_default_email); + escaped = xml_entities(ident_default_email()); strbuf_addf(&out_buffer.buf, LOCK_REQUEST, escaped); free(escaped); @@ -4,6 +4,7 @@ #include "run-command.h" #include "url.h" #include "credential.h" +#include "version.h" int active_requests; int http_is_verbose; @@ -299,7 +300,7 @@ static CURL *get_curl_handle(void) curl_easy_setopt(result, CURLOPT_VERBOSE, 1); curl_easy_setopt(result, CURLOPT_USERAGENT, - user_agent ? user_agent : GIT_HTTP_USER_AGENT); + user_agent ? user_agent : git_user_agent()); if (curl_ftp_no_epsv) curl_easy_setopt(result, CURLOPT_FTP_USE_EPSV, 0); @@ -7,7 +7,10 @@ */ #include "cache.h" +static struct strbuf git_default_name = STRBUF_INIT; +static struct strbuf git_default_email = STRBUF_INIT; static char git_default_date[50]; +int user_ident_explicitly_given; #ifdef NO_GECOS_IN_PWENT #define get_gecos(ignored) "&" @@ -15,42 +18,27 @@ static char git_default_date[50]; #define get_gecos(struct_passwd) ((struct_passwd)->pw_gecos) #endif -static void copy_gecos(const struct passwd *w, char *name, size_t sz) +static void copy_gecos(const struct passwd *w, struct strbuf *name) { - char *src, *dst; - size_t len, nlen; - - nlen = strlen(w->pw_name); + char *src; /* Traditionally GECOS field had office phone numbers etc, separated * with commas. Also & stands for capitalized form of the login name. */ - for (len = 0, dst = name, src = get_gecos(w); len < sz; src++) { + for (src = get_gecos(w); *src && *src != ','; src++) { int ch = *src; - if (ch != '&') { - *dst++ = ch; - if (ch == 0 || ch == ',') - break; - len++; - continue; - } - if (len + nlen < sz) { + if (ch != '&') + strbuf_addch(name, ch); + else { /* Sorry, Mr. McDonald... */ - *dst++ = toupper(*w->pw_name); - memcpy(dst, w->pw_name + 1, nlen - 1); - dst += nlen - 1; - len += nlen; + strbuf_addch(name, toupper(*w->pw_name)); + strbuf_addstr(name, w->pw_name + 1); } } - if (len < sz) - name[len] = 0; - else - die("Your parents must have hated you!"); - } -static int add_mailname_host(char *buf, size_t len) +static int add_mailname_host(struct strbuf *buf) { FILE *mailname; @@ -61,7 +49,7 @@ static int add_mailname_host(char *buf, size_t len) strerror(errno)); return -1; } - if (!fgets(buf, len, mailname)) { + if (strbuf_getline(buf, mailname, '\n') == EOF) { if (ferror(mailname)) warning("cannot read /etc/mailname: %s", strerror(errno)); @@ -73,94 +61,67 @@ static int add_mailname_host(char *buf, size_t len) return 0; } -static void add_domainname(char *buf, size_t len) +static void add_domainname(struct strbuf *out) { + char buf[1024]; struct hostent *he; - size_t namelen; - const char *domainname; - if (gethostname(buf, len)) { + if (gethostname(buf, sizeof(buf))) { warning("cannot get host name: %s", strerror(errno)); - strlcpy(buf, "(none)", len); + strbuf_addstr(out, "(none)"); return; } - namelen = strlen(buf); - if (memchr(buf, '.', namelen)) - return; - - he = gethostbyname(buf); - buf[namelen++] = '.'; - buf += namelen; - len -= namelen; - if (he && (domainname = strchr(he->h_name, '.'))) - strlcpy(buf, domainname + 1, len); + if (strchr(buf, '.')) + strbuf_addstr(out, buf); + else if ((he = gethostbyname(buf)) && strchr(he->h_name, '.')) + strbuf_addstr(out, he->h_name); else - strlcpy(buf, "(none)", len); + strbuf_addf(out, "%s.(none)", buf); } -static void copy_email(const struct passwd *pw) +static void copy_email(const struct passwd *pw, struct strbuf *email) { /* * Make up a fake email address * (name + '@' + hostname [+ '.' + domainname]) */ - size_t len = strlen(pw->pw_name); - if (len > sizeof(git_default_email)/2) - die("Your sysadmin must hate you!"); - memcpy(git_default_email, pw->pw_name, len); - git_default_email[len++] = '@'; - - if (!add_mailname_host(git_default_email + len, - sizeof(git_default_email) - len)) + strbuf_addstr(email, pw->pw_name); + strbuf_addch(email, '@'); + + if (!add_mailname_host(email)) return; /* read from "/etc/mailname" (Debian) */ - add_domainname(git_default_email + len, - sizeof(git_default_email) - len); + add_domainname(email); } -static void setup_ident(const char **name, const char **emailp) +const char *ident_default_name(void) { - struct passwd *pw = NULL; - - /* Get the name ("gecos") */ - if (!*name && !git_default_name[0]) { - pw = getpwuid(getuid()); - if (!pw) - die("You don't exist. Go away!"); - copy_gecos(pw, git_default_name, sizeof(git_default_name)); + if (!git_default_name.len) { + copy_gecos(xgetpwuid_self(), &git_default_name); + strbuf_trim(&git_default_name); } - if (!*name) - *name = git_default_name; + return git_default_name.buf; +} - if (!*emailp && !git_default_email[0]) { +const char *ident_default_email(void) +{ + if (!git_default_email.len) { const char *email = getenv("EMAIL"); if (email && email[0]) { - strlcpy(git_default_email, email, - sizeof(git_default_email)); + strbuf_addstr(&git_default_email, email); user_ident_explicitly_given |= IDENT_MAIL_GIVEN; - } else { - if (!pw) - pw = getpwuid(getuid()); - if (!pw) - die("You don't exist. Go away!"); - copy_email(pw); - } + } else + copy_email(xgetpwuid_self(), &git_default_email); + strbuf_trim(&git_default_email); } - if (!*emailp) - *emailp = git_default_email; - - /* And set the default date */ - if (!git_default_date[0]) - datestamp(git_default_date, sizeof(git_default_date)); + return git_default_email.buf; } -static int add_raw(char *buf, size_t size, int offset, const char *str) +const char *ident_default_date(void) { - size_t len = strlen(str); - if (offset + len > size) - return size; - memcpy(buf + offset, str, len); - return offset + len; + if (!git_default_date[0]) + datestamp(git_default_date, sizeof(git_default_date)); + return git_default_date; } static int crud(unsigned char c) @@ -181,7 +142,7 @@ static int crud(unsigned char c) * Copy over a string to the destination, but avoid special * characters ('\n', '<' and '>') and remove crud at the end */ -static int copy(char *buf, size_t size, int offset, const char *src) +static void strbuf_addstr_without_crud(struct strbuf *sb, const char *src) { size_t i, len; unsigned char c; @@ -205,19 +166,19 @@ static int copy(char *buf, size_t size, int offset, const char *src) /* * Copy the rest to the buffer, but avoid the special * characters '\n' '<' and '>' that act as delimiters on - * an identification line + * an identification line. We can only remove crud, never add it, + * so 'len' is our maximum. */ + strbuf_grow(sb, len); for (i = 0; i < len; i++) { c = *src++; switch (c) { case '\n': case '<': case '>': continue; } - if (offset >= size) - return size; - buf[offset++] = c; + sb->buf[sb->len++] = c; } - return offset; + sb->buf[sb->len] = '\0'; } /* @@ -304,57 +265,62 @@ static const char *env_hint = const char *fmt_ident(const char *name, const char *email, const char *date_str, int flag) { - static char buffer[1000]; + static struct strbuf ident = STRBUF_INIT; char date[50]; - int i; - int error_on_no_name = (flag & IDENT_ERROR_ON_NO_NAME); - int warn_on_no_name = (flag & IDENT_WARN_ON_NO_NAME); - int name_addr_only = (flag & IDENT_NO_DATE); + int strict = (flag & IDENT_STRICT); + int want_date = !(flag & IDENT_NO_DATE); + int want_name = !(flag & IDENT_NO_NAME); - setup_ident(&name, &email); + if (want_name && !name) + name = ident_default_name(); + if (!email) + email = ident_default_email(); - if (!*name) { + if (want_name && !*name) { struct passwd *pw; - if ((warn_on_no_name || error_on_no_name) && - name == git_default_name && env_hint) { - fputs(env_hint, stderr); - env_hint = NULL; /* warn only once */ + if (strict) { + if (name == git_default_name.buf) + fputs(env_hint, stderr); + die("empty ident name (for <%s>) not allowed", email); } - if (error_on_no_name) - die("empty ident %s <%s> not allowed", name, email); - pw = getpwuid(getuid()); - if (!pw) - die("You don't exist. Go away!"); - strlcpy(git_default_name, pw->pw_name, - sizeof(git_default_name)); - name = git_default_name; + pw = xgetpwuid_self(); + name = pw->pw_name; + } + + if (strict && email == git_default_email.buf && + strstr(email, "(none)")) { + fputs(env_hint, stderr); + die("unable to auto-detect email address (got '%s')", email); } - strcpy(date, git_default_date); - if (!name_addr_only && date_str && date_str[0]) { - if (parse_date(date_str, date, sizeof(date)) < 0) - die("invalid date format: %s", date_str); + if (want_date) { + if (date_str && date_str[0]) { + if (parse_date(date_str, date, sizeof(date)) < 0) + die("invalid date format: %s", date_str); + } + else + strcpy(date, ident_default_date()); } - i = copy(buffer, sizeof(buffer), 0, name); - i = add_raw(buffer, sizeof(buffer), i, " <"); - i = copy(buffer, sizeof(buffer), i, email); - if (!name_addr_only) { - i = add_raw(buffer, sizeof(buffer), i, "> "); - i = copy(buffer, sizeof(buffer), i, date); - } else { - i = add_raw(buffer, sizeof(buffer), i, ">"); + strbuf_reset(&ident); + if (want_name) { + strbuf_addstr_without_crud(&ident, name); + strbuf_addstr(&ident, " <"); } - if (i >= sizeof(buffer)) - die("Impossibly long personal identifier"); - buffer[i] = 0; - return buffer; + strbuf_addstr_without_crud(&ident, email); + if (want_name) + strbuf_addch(&ident, '>'); + if (want_date) { + strbuf_addch(&ident, ' '); + strbuf_addstr_without_crud(&ident, date); + } + return ident.buf; } const char *fmt_name(const char *name, const char *email) { - return fmt_ident(name, email, NULL, IDENT_ERROR_ON_NO_NAME | IDENT_NO_DATE); + return fmt_ident(name, email, NULL, IDENT_STRICT | IDENT_NO_DATE); } const char *git_author_info(int flag) @@ -385,3 +351,26 @@ int user_ident_sufficiently_given(void) return (user_ident_explicitly_given == IDENT_ALL_GIVEN); #endif } + +int git_ident_config(const char *var, const char *value, void *data) +{ + if (!strcmp(var, "user.name")) { + if (!value) + return config_error_nonbool(var); + strbuf_reset(&git_default_name); + strbuf_addstr(&git_default_name, value); + user_ident_explicitly_given |= IDENT_NAME_GIVEN; + return 0; + } + + if (!strcmp(var, "user.email")) { + if (!value) + return config_error_nonbool(var); + strbuf_reset(&git_default_email); + strbuf_addstr(&git_default_email, value); + user_ident_explicitly_given |= IDENT_MAIL_GIVEN; + return 0; + } + + return 0; +} diff --git a/log-tree.c b/log-tree.c index 376d973176..c894930c18 100644 --- a/log-tree.c +++ b/log-tree.c @@ -299,19 +299,22 @@ static unsigned int digits_in_number(unsigned int number) return result; } -void get_patch_filename(struct commit *commit, int nr, const char *suffix, - struct strbuf *buf) +void get_patch_filename(struct commit *commit, const char *subject, int nr, + const char *suffix, struct strbuf *buf) { int suffix_len = strlen(suffix) + 1; int start_len = buf->len; - strbuf_addf(buf, commit ? "%04d-" : "%d", nr); - if (commit) { + strbuf_addf(buf, commit || subject ? "%04d-" : "%d", nr); + if (commit || subject) { int max_len = start_len + FORMAT_PATCH_NAME_MAX - suffix_len; struct pretty_print_context ctx = {0}; - ctx.date_mode = DATE_NORMAL; - format_commit_message(commit, "%f", buf, &ctx); + if (subject) + strbuf_addstr(buf, subject); + else if (commit) + format_commit_message(commit, "%f", buf, &ctx); + if (max_len < buf->len) strbuf_setlen(buf, max_len); strbuf_addstr(buf, suffix); @@ -384,8 +387,8 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, mime_boundary_leader, opt->mime_boundary); extra_headers = subject_buffer; - get_patch_filename(opt->numbered_files ? NULL : commit, opt->nr, - opt->patch_suffix, &filename); + get_patch_filename(opt->numbered_files ? NULL : commit, NULL, + opt->nr, opt->patch_suffix, &filename); snprintf(buffer, sizeof(buffer) - 1, "\n--%s%s\n" "Content-Type: text/x-patch;" diff --git a/log-tree.h b/log-tree.h index 5c4cf7cac3..f5ac238bba 100644 --- a/log-tree.h +++ b/log-tree.h @@ -21,7 +21,7 @@ void log_write_email_headers(struct rev_info *opt, struct commit *commit, void load_ref_decorations(int flags); #define FORMAT_PATCH_NAME_MAX 64 -void get_patch_filename(struct commit *commit, int nr, const char *suffix, - struct strbuf *buf); +void get_patch_filename(struct commit *commit, const char *subject, int nr, + const char *suffix, struct strbuf *buf); #endif diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm new file mode 100644 index 0000000000..755092fdff --- /dev/null +++ b/perl/Git/SVN/Editor.pm @@ -0,0 +1,536 @@ +package Git::SVN::Editor; +use vars qw/@ISA $_rmdir $_cp_similarity $_find_copies_harder $_rename_limit/; +use strict; +use warnings; +use SVN::Core; +use SVN::Delta; +use Carp qw/croak/; +use IO::File; +use Git qw/command command_oneline command_noisy command_output_pipe + command_input_pipe command_close_pipe + command_bidi_pipe command_close_bidi_pipe/; +BEGIN { + @ISA = qw(SVN::Delta::Editor); +} + +sub new { + my ($class, $opts) = @_; + foreach (qw/svn_path r ra tree_a tree_b log editor_cb/) { + die "$_ required!\n" unless (defined $opts->{$_}); + } + + my $pool = SVN::Pool->new; + my $mods = generate_diff($opts->{tree_a}, $opts->{tree_b}); + my $types = check_diff_paths($opts->{ra}, $opts->{svn_path}, + $opts->{r}, $mods); + + # $opts->{ra} functions should not be used after this: + my @ce = $opts->{ra}->get_commit_editor($opts->{log}, + $opts->{editor_cb}, $pool); + my $self = SVN::Delta::Editor->new(@ce, $pool); + bless $self, $class; + foreach (qw/svn_path r tree_a tree_b/) { + $self->{$_} = $opts->{$_}; + } + $self->{url} = $opts->{ra}->{url}; + $self->{mods} = $mods; + $self->{types} = $types; + $self->{pool} = $pool; + $self->{bat} = { '' => $self->open_root($self->{r}, $self->{pool}) }; + $self->{rm} = { }; + $self->{path_prefix} = length $self->{svn_path} ? + "$self->{svn_path}/" : ''; + $self->{config} = $opts->{config}; + $self->{mergeinfo} = $opts->{mergeinfo}; + return $self; +} + +sub generate_diff { + my ($tree_a, $tree_b) = @_; + my @diff_tree = qw(diff-tree -z -r); + if ($_cp_similarity) { + push @diff_tree, "-C$_cp_similarity"; + } else { + push @diff_tree, '-C'; + } + push @diff_tree, '--find-copies-harder' if $_find_copies_harder; + push @diff_tree, "-l$_rename_limit" if defined $_rename_limit; + push @diff_tree, $tree_a, $tree_b; + my ($diff_fh, $ctx) = command_output_pipe(@diff_tree); + local $/ = "\0"; + my $state = 'meta'; + my @mods; + while (<$diff_fh>) { + chomp $_; # this gets rid of the trailing "\0" + if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s + ($::sha1)\s($::sha1)\s + ([MTCRAD])\d*$/xo) { + push @mods, { mode_a => $1, mode_b => $2, + sha1_a => $3, sha1_b => $4, + chg => $5 }; + if ($5 =~ /^(?:C|R)$/) { + $state = 'file_a'; + } else { + $state = 'file_b'; + } + } elsif ($state eq 'file_a') { + my $x = $mods[$#mods] or croak "Empty array\n"; + if ($x->{chg} !~ /^(?:C|R)$/) { + croak "Error parsing $_, $x->{chg}\n"; + } + $x->{file_a} = $_; + $state = 'file_b'; + } elsif ($state eq 'file_b') { + my $x = $mods[$#mods] or croak "Empty array\n"; + if (exists $x->{file_a} && $x->{chg} !~ /^(?:C|R)$/) { + croak "Error parsing $_, $x->{chg}\n"; + } + if (!exists $x->{file_a} && $x->{chg} =~ /^(?:C|R)$/) { + croak "Error parsing $_, $x->{chg}\n"; + } + $x->{file_b} = $_; + $state = 'meta'; + } else { + croak "Error parsing $_\n"; + } + } + command_close_pipe($diff_fh, $ctx); + \@mods; +} + +sub check_diff_paths { + my ($ra, $pfx, $rev, $mods) = @_; + my %types; + $pfx .= '/' if length $pfx; + + sub type_diff_paths { + my ($ra, $types, $path, $rev) = @_; + my @p = split m#/+#, $path; + my $c = shift @p; + unless (defined $types->{$c}) { + $types->{$c} = $ra->check_path($c, $rev); + } + while (@p) { + $c .= '/' . shift @p; + next if defined $types->{$c}; + $types->{$c} = $ra->check_path($c, $rev); + } + } + + foreach my $m (@$mods) { + foreach my $f (qw/file_a file_b/) { + next unless defined $m->{$f}; + my ($dir) = ($m->{$f} =~ m#^(.*?)/?(?:[^/]+)$#); + if (length $pfx.$dir && ! defined $types{$dir}) { + type_diff_paths($ra, \%types, $pfx.$dir, $rev); + } + } + } + \%types; +} + +sub split_path { + return ($_[0] =~ m#^(.*?)/?([^/]+)$#); +} + +sub repo_path { + my ($self, $path) = @_; + if (my $enc = $self->{pathnameencoding}) { + require Encode; + Encode::from_to($path, $enc, 'UTF-8'); + } + $self->{path_prefix}.(defined $path ? $path : ''); +} + +sub url_path { + my ($self, $path) = @_; + if ($self->{url} =~ m#^https?://#) { + $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg; + } + $self->{url} . '/' . $self->repo_path($path); +} + +sub rmdirs { + my ($self) = @_; + my $rm = $self->{rm}; + delete $rm->{''}; # we never delete the url we're tracking + return unless %$rm; + + foreach (keys %$rm) { + my @d = split m#/#, $_; + my $c = shift @d; + $rm->{$c} = 1; + while (@d) { + $c .= '/' . shift @d; + $rm->{$c} = 1; + } + } + delete $rm->{$self->{svn_path}}; + delete $rm->{''}; # we never delete the url we're tracking + return unless %$rm; + + my ($fh, $ctx) = command_output_pipe(qw/ls-tree --name-only -r -z/, + $self->{tree_b}); + local $/ = "\0"; + while (<$fh>) { + chomp; + my @dn = split m#/#, $_; + while (pop @dn) { + delete $rm->{join '/', @dn}; + } + unless (%$rm) { + close $fh; + return; + } + } + command_close_pipe($fh, $ctx); + + my ($r, $p, $bat) = ($self->{r}, $self->{pool}, $self->{bat}); + foreach my $d (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$rm) { + $self->close_directory($bat->{$d}, $p); + my ($dn) = ($d =~ m#^(.*?)/?(?:[^/]+)$#); + print "\tD+\t$d/\n" unless $::_q; + $self->SUPER::delete_entry($d, $r, $bat->{$dn}, $p); + delete $bat->{$d}; + } +} + +sub open_or_add_dir { + my ($self, $full_path, $baton, $deletions) = @_; + my $t = $self->{types}->{$full_path}; + if (!defined $t) { + die "$full_path not known in r$self->{r} or we have a bug!\n"; + } + { + no warnings 'once'; + # SVN::Node::none and SVN::Node::file are used only once, + # so we're shutting up Perl's warnings about them. + if ($t == $SVN::Node::none || defined($deletions->{$full_path})) { + return $self->add_directory($full_path, $baton, + undef, -1, $self->{pool}); + } elsif ($t == $SVN::Node::dir) { + return $self->open_directory($full_path, $baton, + $self->{r}, $self->{pool}); + } # no warnings 'once' + print STDERR "$full_path already exists in repository at ", + "r$self->{r} and it is not a directory (", + ($t == $SVN::Node::file ? 'file' : 'unknown'),"/$t)\n"; + } # no warnings 'once' + exit 1; +} + +sub ensure_path { + my ($self, $path, $deletions) = @_; + my $bat = $self->{bat}; + my $repo_path = $self->repo_path($path); + return $bat->{''} unless (length $repo_path); + + my @p = split m#/+#, $repo_path; + my $c = shift @p; + $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{''}, $deletions); + while (@p) { + my $c0 = $c; + $c .= '/' . shift @p; + $bat->{$c} ||= $self->open_or_add_dir($c, $bat->{$c0}, $deletions); + } + return $bat->{$c}; +} + +# Subroutine to convert a globbing pattern to a regular expression. +# From perl cookbook. +sub glob2pat { + my $globstr = shift; + my %patmap = ('*' => '.*', '?' => '.', '[' => '[', ']' => ']'); + $globstr =~ s{(.)} { $patmap{$1} || "\Q$1" }ge; + return '^' . $globstr . '$'; +} + +sub check_autoprop { + my ($self, $pattern, $properties, $file, $fbat) = @_; + # Convert the globbing pattern to a regular expression. + my $regex = glob2pat($pattern); + # Check if the pattern matches the file name. + if($file =~ m/($regex)/) { + # Parse the list of properties to set. + my @props = split(/;/, $properties); + foreach my $prop (@props) { + # Parse 'name=value' syntax and set the property. + if ($prop =~ /([^=]+)=(.*)/) { + my ($n,$v) = ($1,$2); + for ($n, $v) { + s/^\s+//; s/\s+$//; + } + $self->change_file_prop($fbat, $n, $v); + } + } + } +} + +sub apply_autoprops { + my ($self, $file, $fbat) = @_; + my $conf_t = ${$self->{config}}{'config'}; + no warnings 'once'; + # Check [miscellany]/enable-auto-props in svn configuration. + if (SVN::_Core::svn_config_get_bool( + $conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_MISCELLANY, + $SVN::_Core::SVN_CONFIG_OPTION_ENABLE_AUTO_PROPS, + 0)) { + # Auto-props are enabled. Enumerate them to look for matches. + my $callback = sub { + $self->check_autoprop($_[0], $_[1], $file, $fbat); + }; + SVN::_Core::svn_config_enumerate( + $conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_AUTO_PROPS, + $callback); + } +} + +sub A { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, + undef, -1); + print "\tA\t$m->{file_b}\n" unless $::_q; + $self->apply_autoprops($file, $fbat); + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); +} + +sub C { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, + $self->url_path($m->{file_a}), $self->{r}); + print "\tC\t$m->{file_a} => $m->{file_b}\n" unless $::_q; + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); +} + +sub delete_entry { + my ($self, $path, $pbat) = @_; + my $rpath = $self->repo_path($path); + my ($dir, $file) = split_path($rpath); + $self->{rm}->{$dir} = 1; + $self->SUPER::delete_entry($rpath, $self->{r}, $pbat, $self->{pool}); +} + +sub R { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat, + $self->url_path($m->{file_a}), $self->{r}); + print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q; + $self->apply_autoprops($file, $fbat); + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); + + ($dir, $file) = split_path($m->{file_a}); + $pbat = $self->ensure_path($dir, $deletions); + $self->delete_entry($m->{file_a}, $pbat); +} + +sub M { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + my $fbat = $self->open_file($self->repo_path($m->{file_b}), + $pbat,$self->{r},$self->{pool}); + print "\t$m->{chg}\t$m->{file_b}\n" unless $::_q; + $self->chg_file($fbat, $m); + $self->close_file($fbat,undef,$self->{pool}); +} + +sub T { shift->M(@_) } + +sub change_file_prop { + my ($self, $fbat, $pname, $pval) = @_; + $self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool}); +} + +sub change_dir_prop { + my ($self, $pbat, $pname, $pval) = @_; + $self->SUPER::change_dir_prop($pbat, $pname, $pval, $self->{pool}); +} + +sub _chg_file_get_blob ($$$$) { + my ($self, $fbat, $m, $which) = @_; + my $fh = $::_repository->temp_acquire("git_blob_$which"); + if ($m->{"mode_$which"} =~ /^120/) { + print $fh 'link ' or croak $!; + $self->change_file_prop($fbat,'svn:special','*'); + } elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) { + $self->change_file_prop($fbat,'svn:special',undef); + } + my $blob = $m->{"sha1_$which"}; + return ($fh,) if ($blob =~ /^0{40}$/); + my $size = $::_repository->cat_blob($blob, $fh); + croak "Failed to read object $blob" if ($size < 0); + $fh->flush == 0 or croak $!; + seek $fh, 0, 0 or croak $!; + + my $exp = ::md5sum($fh); + seek $fh, 0, 0 or croak $!; + return ($fh, $exp); +} + +sub chg_file { + my ($self, $fbat, $m) = @_; + if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) { + $self->change_file_prop($fbat,'svn:executable','*'); + } elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) { + $self->change_file_prop($fbat,'svn:executable',undef); + } + my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a'; + my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b'; + my $pool = SVN::Pool->new; + my $atd = $self->apply_textdelta($fbat, $exp_a, $pool); + if (-s $fh_a) { + my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool); + my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool); + if (defined $res) { + die "Unexpected result from send_txstream: $res\n", + "(SVN::Core::VERSION: $SVN::Core::VERSION)\n"; + } + } else { + my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool); + die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n" + if ($got ne $exp_b); + } + Git::temp_release($fh_b, 1); + Git::temp_release($fh_a, 1); + $pool->clear; +} + +sub D { + my ($self, $m, $deletions) = @_; + my ($dir, $file) = split_path($m->{file_b}); + my $pbat = $self->ensure_path($dir, $deletions); + print "\tD\t$m->{file_b}\n" unless $::_q; + $self->delete_entry($m->{file_b}, $pbat); +} + +sub close_edit { + my ($self) = @_; + my ($p,$bat) = ($self->{pool}, $self->{bat}); + foreach (sort { $b =~ tr#/#/# <=> $a =~ tr#/#/# } keys %$bat) { + next if $_ eq ''; + $self->close_directory($bat->{$_}, $p); + } + $self->close_directory($bat->{''}, $p); + $self->SUPER::close_edit($p); + $p->clear; +} + +sub abort_edit { + my ($self) = @_; + $self->SUPER::abort_edit($self->{pool}); +} + +sub DESTROY { + my $self = shift; + $self->SUPER::DESTROY(@_); + $self->{pool}->clear; +} + +# this drives the editor +sub apply_diff { + my ($self) = @_; + my $mods = $self->{mods}; + my %o = ( D => 0, C => 1, R => 2, A => 3, M => 4, T => 5 ); + my %deletions; + + foreach my $m (@$mods) { + if ($m->{chg} eq "D") { + $deletions{$m->{file_b}} = 1; + } + } + + foreach my $m (sort { $o{$a->{chg}} <=> $o{$b->{chg}} } @$mods) { + my $f = $m->{chg}; + if (defined $o{$f}) { + $self->$f($m, \%deletions); + } else { + fatal("Invalid change type: $f"); + } + } + + if (defined($self->{mergeinfo})) { + $self->change_dir_prop($self->{bat}{''}, "svn:mergeinfo", + $self->{mergeinfo}); + } + $self->rmdirs if $_rmdir; + if (@$mods == 0 && !defined($self->{mergeinfo})) { + $self->abort_edit; + } else { + $self->close_edit; + } + return scalar @$mods; +} + +1; +__END__ + +Git::SVN::Editor - commit driver for "git svn set-tree" and dcommit + +=head1 SYNOPSIS + + use Git::SVN::Editor; + use Git::SVN::Ra; + + my $ra = Git::SVN::Ra->new($url); + my %opts = ( + r => 19, + log => "log message", + ra => $ra, + config => SVN::Core::config_get_config($svn_config_dir), + tree_a => "$commit^", + tree_b => "$commit", + editor_cb => sub { print "Committed r$_[0]\n"; }, + mergeinfo => "/branches/foo:1-10", + svn_path => "trunk" + ); + Git::SVN::Editor->new(\%opts)->apply_diff or print "No changes\n"; + + my $re = Git::SVN::Editor::glob2pat("trunk/*"); + if ($branchname =~ /$re/) { + print "matched!\n"; + } + +=head1 DESCRIPTION + +This module is an implementation detail of the "git svn" command. +Do not use it unless you are developing git-svn. + +This module adapts the C<SVN::Delta::Editor> object returned by +C<SVN::Delta::get_commit_editor> and drives it to convey the +difference between two git tree objects to a remote Subversion +repository. + +The interface will change as git-svn evolves. + +=head1 DEPENDENCIES + +Subversion perl bindings, +the core L<Carp> and L<IO::File> modules, +and git's L<Git> helper module. + +C<Git::SVN::Editor> has not been tested using callers other than +B<git-svn> itself. + +=head1 SEE ALSO + +L<SVN::Delta>, +L<Git::SVN::Fetcher>. + +=head1 INCOMPATIBILITIES + +None reported. + +=head1 BUGS + +None. diff --git a/perl/Git/SVN/Fetcher.pm b/perl/Git/SVN/Fetcher.pm new file mode 100644 index 0000000000..ef8e9ed2a5 --- /dev/null +++ b/perl/Git/SVN/Fetcher.pm @@ -0,0 +1,603 @@ +package Git::SVN::Fetcher; +use vars qw/@ISA $_ignore_regex $_preserve_empty_dirs $_placeholder_filename + @deleted_gpath %added_placeholder $repo_id/; +use strict; +use warnings; +use SVN::Delta; +use Carp qw/croak/; +use File::Basename qw/dirname/; +use IO::File qw//; +use Git qw/command command_oneline command_noisy command_output_pipe + command_input_pipe command_close_pipe + command_bidi_pipe command_close_bidi_pipe/; +BEGIN { + @ISA = qw(SVN::Delta::Editor); +} + +# file baton members: path, mode_a, mode_b, pool, fh, blob, base +sub new { + my ($class, $git_svn, $switch_path) = @_; + my $self = SVN::Delta::Editor->new; + bless $self, $class; + if (exists $git_svn->{last_commit}) { + $self->{c} = $git_svn->{last_commit}; + $self->{empty_symlinks} = + _mark_empty_symlinks($git_svn, $switch_path); + } + + # some options are read globally, but can be overridden locally + # per [svn-remote "..."] section. Command-line options will *NOT* + # override options set in an [svn-remote "..."] section + $repo_id = $git_svn->{repo_id}; + my $k = "svn-remote.$repo_id.ignore-paths"; + my $v = eval { command_oneline('config', '--get', $k) }; + $self->{ignore_regex} = $v; + + $k = "svn-remote.$repo_id.preserve-empty-dirs"; + $v = eval { command_oneline('config', '--get', '--bool', $k) }; + if ($v && $v eq 'true') { + $_preserve_empty_dirs = 1; + $k = "svn-remote.$repo_id.placeholder-filename"; + $v = eval { command_oneline('config', '--get', $k) }; + $_placeholder_filename = $v; + } + + # Load the list of placeholder files added during previous invocations. + $k = "svn-remote.$repo_id.added-placeholder"; + $v = eval { command_oneline('config', '--get-all', $k) }; + if ($_preserve_empty_dirs && $v) { + # command() prints errors to stderr, so we only call it if + # command_oneline() succeeded. + my @v = command('config', '--get-all', $k); + $added_placeholder{ dirname($_) } = $_ foreach @v; + } + + $self->{empty} = {}; + $self->{dir_prop} = {}; + $self->{file_prop} = {}; + $self->{absent_dir} = {}; + $self->{absent_file} = {}; + $self->{gii} = $git_svn->tmp_index_do(sub { Git::IndexInfo->new }); + $self->{pathnameencoding} = Git::config('svn.pathnameencoding'); + $self; +} + +# this uses the Ra object, so it must be called before do_{switch,update}, +# not inside them (when the Git::SVN::Fetcher object is passed) to +# do_{switch,update} +sub _mark_empty_symlinks { + my ($git_svn, $switch_path) = @_; + my $bool = Git::config_bool('svn.brokenSymlinkWorkaround'); + return {} if (!defined($bool)) || (defined($bool) && ! $bool); + + my %ret; + my ($rev, $cmt) = $git_svn->last_rev_commit; + return {} unless ($rev && $cmt); + + # allow the warning to be printed for each revision we fetch to + # ensure the user sees it. The user can also disable the workaround + # on the repository even while git svn is running and the next + # revision fetched will skip this expensive function. + my $printed_warning; + chomp(my $empty_blob = `git hash-object -t blob --stdin < /dev/null`); + my ($ls, $ctx) = command_output_pipe(qw/ls-tree -r -z/, $cmt); + local $/ = "\0"; + my $pfx = defined($switch_path) ? $switch_path : $git_svn->{path}; + $pfx .= '/' if length($pfx); + while (<$ls>) { + chomp; + s/\A100644 blob $empty_blob\t//o or next; + unless ($printed_warning) { + print STDERR "Scanning for empty symlinks, ", + "this may take a while if you have ", + "many empty files\n", + "You may disable this with `", + "git config svn.brokenSymlinkWorkaround ", + "false'.\n", + "This may be done in a different ", + "terminal without restarting ", + "git svn\n"; + $printed_warning = 1; + } + my $path = $_; + my (undef, $props) = + $git_svn->ra->get_file($pfx.$path, $rev, undef); + if ($props->{'svn:special'}) { + $ret{$path} = 1; + } + } + command_close_pipe($ls, $ctx); + \%ret; +} + +# returns true if a given path is inside a ".git" directory +sub in_dot_git { + $_[0] =~ m{(?:^|/)\.git(?:/|$)}; +} + +# return value: 0 -- don't ignore, 1 -- ignore +sub is_path_ignored { + my ($self, $path) = @_; + return 1 if in_dot_git($path); + return 1 if defined($self->{ignore_regex}) && + $path =~ m!$self->{ignore_regex}!; + return 0 unless defined($_ignore_regex); + return 1 if $path =~ m!$_ignore_regex!o; + return 0; +} + +sub set_path_strip { + my ($self, $path) = @_; + $self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path; +} + +sub open_root { + { path => '' }; +} + +sub open_directory { + my ($self, $path, $pb, $rev) = @_; + { path => $path }; +} + +sub git_path { + my ($self, $path) = @_; + if (my $enc = $self->{pathnameencoding}) { + require Encode; + Encode::from_to($path, 'UTF-8', $enc); + } + if ($self->{path_strip}) { + $path =~ s!$self->{path_strip}!! or + die "Failed to strip path '$path' ($self->{path_strip})\n"; + } + $path; +} + +sub delete_entry { + my ($self, $path, $rev, $pb) = @_; + return undef if $self->is_path_ignored($path); + + my $gpath = $self->git_path($path); + return undef if ($gpath eq ''); + + # remove entire directories. + my ($tree) = (command('ls-tree', '-z', $self->{c}, "./$gpath") + =~ /\A040000 tree ([a-f\d]{40})\t\Q$gpath\E\0/); + if ($tree) { + my ($ls, $ctx) = command_output_pipe(qw/ls-tree + -r --name-only -z/, + $tree); + local $/ = "\0"; + while (<$ls>) { + chomp; + my $rmpath = "$gpath/$_"; + $self->{gii}->remove($rmpath); + print "\tD\t$rmpath\n" unless $::_q; + } + print "\tD\t$gpath/\n" unless $::_q; + command_close_pipe($ls, $ctx); + } else { + $self->{gii}->remove($gpath); + print "\tD\t$gpath\n" unless $::_q; + } + # Don't add to @deleted_gpath if we're deleting a placeholder file. + push @deleted_gpath, $gpath unless $added_placeholder{dirname($path)}; + $self->{empty}->{$path} = 0; + undef; +} + +sub open_file { + my ($self, $path, $pb, $rev) = @_; + my ($mode, $blob); + + goto out if $self->is_path_ignored($path); + + my $gpath = $self->git_path($path); + ($mode, $blob) = (command('ls-tree', '-z', $self->{c}, "./$gpath") + =~ /\A(\d{6}) blob ([a-f\d]{40})\t\Q$gpath\E\0/); + unless (defined $mode && defined $blob) { + die "$path was not found in commit $self->{c} (r$rev)\n"; + } + if ($mode eq '100644' && $self->{empty_symlinks}->{$path}) { + $mode = '120000'; + } +out: + { path => $path, mode_a => $mode, mode_b => $mode, blob => $blob, + pool => SVN::Pool->new, action => 'M' }; +} + +sub add_file { + my ($self, $path, $pb, $cp_path, $cp_rev) = @_; + my $mode; + + if (!$self->is_path_ignored($path)) { + my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#); + delete $self->{empty}->{$dir}; + $mode = '100644'; + + if ($added_placeholder{$dir}) { + # Remove our placeholder file, if we created one. + delete_entry($self, $added_placeholder{$dir}) + unless $path eq $added_placeholder{$dir}; + delete $added_placeholder{$dir} + } + } + + { path => $path, mode_a => $mode, mode_b => $mode, + pool => SVN::Pool->new, action => 'A' }; +} + +sub add_directory { + my ($self, $path, $cp_path, $cp_rev) = @_; + goto out if $self->is_path_ignored($path); + my $gpath = $self->git_path($path); + if ($gpath eq '') { + my ($ls, $ctx) = command_output_pipe(qw/ls-tree + -r --name-only -z/, + $self->{c}); + local $/ = "\0"; + while (<$ls>) { + chomp; + $self->{gii}->remove($_); + print "\tD\t$_\n" unless $::_q; + push @deleted_gpath, $gpath; + } + command_close_pipe($ls, $ctx); + $self->{empty}->{$path} = 0; + } + my ($dir, $file) = ($path =~ m#^(.*?)/?([^/]+)$#); + delete $self->{empty}->{$dir}; + $self->{empty}->{$path} = 1; + + if ($added_placeholder{$dir}) { + # Remove our placeholder file, if we created one. + delete_entry($self, $added_placeholder{$dir}); + delete $added_placeholder{$dir} + } + +out: + { path => $path }; +} + +sub change_dir_prop { + my ($self, $db, $prop, $value) = @_; + return undef if $self->is_path_ignored($db->{path}); + $self->{dir_prop}->{$db->{path}} ||= {}; + $self->{dir_prop}->{$db->{path}}->{$prop} = $value; + undef; +} + +sub absent_directory { + my ($self, $path, $pb) = @_; + return undef if $self->is_path_ignored($path); + $self->{absent_dir}->{$pb->{path}} ||= []; + push @{$self->{absent_dir}->{$pb->{path}}}, $path; + undef; +} + +sub absent_file { + my ($self, $path, $pb) = @_; + return undef if $self->is_path_ignored($path); + $self->{absent_file}->{$pb->{path}} ||= []; + push @{$self->{absent_file}->{$pb->{path}}}, $path; + undef; +} + +sub change_file_prop { + my ($self, $fb, $prop, $value) = @_; + return undef if $self->is_path_ignored($fb->{path}); + if ($prop eq 'svn:executable') { + if ($fb->{mode_b} != 120000) { + $fb->{mode_b} = defined $value ? 100755 : 100644; + } + } elsif ($prop eq 'svn:special') { + $fb->{mode_b} = defined $value ? 120000 : 100644; + } else { + $self->{file_prop}->{$fb->{path}} ||= {}; + $self->{file_prop}->{$fb->{path}}->{$prop} = $value; + } + undef; +} + +sub apply_textdelta { + my ($self, $fb, $exp) = @_; + return undef if $self->is_path_ignored($fb->{path}); + my $fh = $::_repository->temp_acquire('svn_delta'); + # $fh gets auto-closed() by SVN::TxDelta::apply(), + # (but $base does not,) so dup() it for reading in close_file + open my $dup, '<&', $fh or croak $!; + my $base = $::_repository->temp_acquire('git_blob'); + + if ($fb->{blob}) { + my ($base_is_link, $size); + + if ($fb->{mode_a} eq '120000' && + ! $self->{empty_symlinks}->{$fb->{path}}) { + print $base 'link ' or die "print $!\n"; + $base_is_link = 1; + } + retry: + $size = $::_repository->cat_blob($fb->{blob}, $base); + die "Failed to read object $fb->{blob}" if ($size < 0); + + if (defined $exp) { + seek $base, 0, 0 or croak $!; + my $got = ::md5sum($base); + if ($got ne $exp) { + my $err = "Checksum mismatch: ". + "$fb->{path} $fb->{blob}\n" . + "expected: $exp\n" . + " got: $got\n"; + if ($base_is_link) { + warn $err, + "Retrying... (possibly ", + "a bad symlink from SVN)\n"; + $::_repository->temp_reset($base); + $base_is_link = 0; + goto retry; + } + die $err; + } + } + } + seek $base, 0, 0 or croak $!; + $fb->{fh} = $fh; + $fb->{base} = $base; + [ SVN::TxDelta::apply($base, $dup, undef, $fb->{path}, $fb->{pool}) ]; +} + +sub close_file { + my ($self, $fb, $exp) = @_; + return undef if $self->is_path_ignored($fb->{path}); + + my $hash; + my $path = $self->git_path($fb->{path}); + if (my $fh = $fb->{fh}) { + if (defined $exp) { + seek($fh, 0, 0) or croak $!; + my $got = ::md5sum($fh); + if ($got ne $exp) { + die "Checksum mismatch: $path\n", + "expected: $exp\n got: $got\n"; + } + } + if ($fb->{mode_b} == 120000) { + sysseek($fh, 0, 0) or croak $!; + my $rd = sysread($fh, my $buf, 5); + + if (!defined $rd) { + croak "sysread: $!\n"; + } elsif ($rd == 0) { + warn "$path has mode 120000", + " but it points to nothing\n", + "converting to an empty file with mode", + " 100644\n"; + $fb->{mode_b} = '100644'; + } elsif ($buf ne 'link ') { + warn "$path has mode 120000", + " but is not a link\n"; + } else { + my $tmp_fh = $::_repository->temp_acquire( + 'svn_hash'); + my $res; + while ($res = sysread($fh, my $str, 1024)) { + my $out = syswrite($tmp_fh, $str, $res); + defined($out) && $out == $res + or croak("write ", + Git::temp_path($tmp_fh), + ": $!\n"); + } + defined $res or croak $!; + + ($fh, $tmp_fh) = ($tmp_fh, $fh); + Git::temp_release($tmp_fh, 1); + } + } + + $hash = $::_repository->hash_and_insert_object( + Git::temp_path($fh)); + $hash =~ /^[a-f\d]{40}$/ or die "not a sha1: $hash\n"; + + Git::temp_release($fb->{base}, 1); + Git::temp_release($fh, 1); + } else { + $hash = $fb->{blob} or die "no blob information\n"; + } + $fb->{pool}->clear; + $self->{gii}->update($fb->{mode_b}, $hash, $path) or croak $!; + print "\t$fb->{action}\t$path\n" if $fb->{action} && ! $::_q; + undef; +} + +sub abort_edit { + my $self = shift; + $self->{nr} = $self->{gii}->{nr}; + delete $self->{gii}; + $self->SUPER::abort_edit(@_); +} + +sub close_edit { + my $self = shift; + + if ($_preserve_empty_dirs) { + my @empty_dirs; + + # Any entry flagged as empty that also has an associated + # dir_prop represents a newly created empty directory. + foreach my $i (keys %{$self->{empty}}) { + push @empty_dirs, $i if exists $self->{dir_prop}->{$i}; + } + + # Search for directories that have become empty due subsequent + # file deletes. + push @empty_dirs, $self->find_empty_directories(); + + # Finally, add a placeholder file to each empty directory. + $self->add_placeholder_file($_) foreach (@empty_dirs); + + $self->stash_placeholder_list(); + } + + $self->{git_commit_ok} = 1; + $self->{nr} = $self->{gii}->{nr}; + delete $self->{gii}; + $self->SUPER::close_edit(@_); +} + +sub find_empty_directories { + my ($self) = @_; + my @empty_dirs; + my %dirs = map { dirname($_) => 1 } @deleted_gpath; + + foreach my $dir (sort keys %dirs) { + next if $dir eq "."; + + # If there have been any additions to this directory, there is + # no reason to check if it is empty. + my $skip_added = 0; + foreach my $t (qw/dir_prop file_prop/) { + foreach my $path (keys %{ $self->{$t} }) { + if (exists $self->{$t}->{dirname($path)}) { + $skip_added = 1; + last; + } + } + last if $skip_added; + } + next if $skip_added; + + # Use `git ls-tree` to get the filenames of this directory + # that existed prior to this particular commit. + my $ls = command('ls-tree', '-z', '--name-only', + $self->{c}, "$dir/"); + my %files = map { $_ => 1 } split(/\0/, $ls); + + # Remove the filenames that were deleted during this commit. + delete $files{$_} foreach (@deleted_gpath); + + # Report the directory if there are no filenames left. + push @empty_dirs, $dir unless (scalar %files); + } + @empty_dirs; +} + +sub add_placeholder_file { + my ($self, $dir) = @_; + my $path = "$dir/$_placeholder_filename"; + my $gpath = $self->git_path($path); + + my $fh = $::_repository->temp_acquire($gpath); + my $hash = $::_repository->hash_and_insert_object(Git::temp_path($fh)); + Git::temp_release($fh, 1); + $self->{gii}->update('100644', $hash, $gpath) or croak $!; + + # The directory should no longer be considered empty. + delete $self->{empty}->{$dir} if exists $self->{empty}->{$dir}; + + # Keep track of any placeholder files we create. + $added_placeholder{$dir} = $path; +} + +sub stash_placeholder_list { + my ($self) = @_; + my $k = "svn-remote.$repo_id.added-placeholder"; + my $v = eval { command_oneline('config', '--get-all', $k) }; + command_noisy('config', '--unset-all', $k) if $v; + foreach (values %added_placeholder) { + command_noisy('config', '--add', $k, $_); + } +} + +1; +__END__ + +Git::SVN::Fetcher - tree delta consumer for "git svn fetch" + +=head1 SYNOPSIS + + use SVN::Core; + use SVN::Ra; + use Git::SVN; + use Git::SVN::Fetcher; + use Git; + + my $gs = Git::SVN->find_by_url($url); + my $ra = SVN::Ra->new(url => $url); + my $editor = Git::SVN::Fetcher->new($gs); + my $reporter = $ra->do_update($SVN::Core::INVALID_REVNUM, '', + 1, $editor); + $reporter->set_path('', $old_rev, 0); + $reporter->finish_report; + my $tree = $gs->tmp_index_do(sub { command_oneline('write-tree') }); + + foreach my $path (keys %{$editor->{dir_prop}) { + my $props = $editor->{dir_prop}{$path}; + foreach my $prop (keys %$props) { + print "property $prop at $path changed to $props->{$prop}\n"; + } + } + foreach my $path (keys %{$editor->{empty}) { + my $action = $editor->{empty}{$path} ? 'added' : 'removed'; + print "empty directory $path $action\n"; + } + foreach my $path (keys %{$editor->{file_prop}) { ... } + foreach my $parent (keys %{$editor->{absent_dir}}) { + my @children = @{$editor->{abstent_dir}{$parent}}; + print "cannot fetch directory $parent/$_: not authorized?\n" + foreach @children; + } + foreach my $parent (keys %{$editor->{absent_file}) { ... } + +=head1 DESCRIPTION + +This is a subclass of C<SVN::Delta::Editor>, which means it implements +callbacks to act as a consumer of Subversion tree deltas. This +particular implementation of those callbacks is meant to store +information about the resulting content which B<git svn fetch> could +use to populate new commits and new entries for F<unhandled.log>. +More specifically: + +=over + +=item * Additions, removals, and modifications of files are propagated +to git-svn's index file F<$GIT_DIR/svn/$refname/index> using +B<git update-index>. + +=item * Changes in Subversion path properties are recorded in the +C<dir_prop> and C<file_prop> fields (which are hashes). + +=item * Addition and removal of empty directories are indicated by +entries with value 1 and 0 respectively in the C<empty> hash. + +=item * Paths that are present but cannot be conveyed (presumably due +to permissions) are recorded in the C<absent_file> and +C<absent_dirs> hashes. For each key, the corresponding value is +a list of paths under that directory that were present but +could not be conveyed. + +=back + +The interface is unstable. Do not use this module unless you are +developing git-svn. + +=head1 DEPENDENCIES + +L<SVN::Delta> from the Subversion perl bindings, +the core L<Carp>, L<File::Basename>, and L<IO::File> modules, +and git's L<Git> helper module. + +C<Git::SVN::Fetcher> has not been tested using callers other than +B<git-svn> itself. + +=head1 SEE ALSO + +L<SVN::Delta>, +L<Git::SVN::Editor>. + +=head1 INCOMPATIBILITIES + +None reported. + +=head1 BUGS + +None. diff --git a/perl/Git/SVN/Memoize/YAML.pm b/perl/Git/SVN/Memoize/YAML.pm new file mode 100644 index 0000000000..9676b8f2f7 --- /dev/null +++ b/perl/Git/SVN/Memoize/YAML.pm @@ -0,0 +1,93 @@ +package Git::SVN::Memoize::YAML; +use warnings; +use strict; +use YAML::Any (); + +# based on Memoize::Storable. + +sub TIEHASH { + my $package = shift; + my $filename = shift; + my $truehash = (-e $filename) ? YAML::Any::LoadFile($filename) : {}; + my $self = {FILENAME => $filename, H => $truehash}; + bless $self => $package; +} + +sub STORE { + my $self = shift; + $self->{H}{$_[0]} = $_[1]; +} + +sub FETCH { + my $self = shift; + $self->{H}{$_[0]}; +} + +sub EXISTS { + my $self = shift; + exists $self->{H}{$_[0]}; +} + +sub DESTROY { + my $self = shift; + YAML::Any::DumpFile($self->{FILENAME}, $self->{H}); +} + +sub SCALAR { + my $self = shift; + scalar(%{$self->{H}}); +} + +sub FIRSTKEY { + 'Fake hash from Git::SVN::Memoize::YAML'; +} + +sub NEXTKEY { + undef; +} + +1; +__END__ + +=head1 NAME + +Git::SVN::Memoize::YAML - store Memoized data in YAML format + +=head1 SYNOPSIS + + use Memoize; + use Git::SVN::Memoize::YAML; + + tie my %cache => 'Git::SVN::Memoize::YAML', $filename; + memoize('slow_function', SCALAR_CACHE => [HASH => \%cache]); + slow_function(arguments); + +=head1 DESCRIPTION + +This module provides a class that can be used to tie a hash to a +YAML file. The file is read when the hash is initialized and +rewritten when the hash is destroyed. + +The intent is to allow L<Memoize> to back its cache with a file in +YAML format, just like L<Memoize::Storable> allows L<Memoize> to +back its cache with a file in Storable format. Unlike the Storable +format, the YAML format is platform-independent and fairly stable. + +Carps on error. + +=head1 DIAGNOSTICS + +See L<YAML::Any>. + +=head1 DEPENDENCIES + +L<YAML::Any> from CPAN. + +=head1 INCOMPATIBILITIES + +None reported. + +=head1 BUGS + +The entire cache is read into a Perl hash when loading the file, +so this is not very scalable. diff --git a/perl/Git/SVN/Prompt.pm b/perl/Git/SVN/Prompt.pm new file mode 100644 index 0000000000..3a6f8af0d9 --- /dev/null +++ b/perl/Git/SVN/Prompt.pm @@ -0,0 +1,202 @@ +package Git::SVN::Prompt; +use strict; +use warnings; +require SVN::Core; +use vars qw/$_no_auth_cache $_username/; + +sub simple { + my ($cred, $realm, $default_username, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + $default_username = $_username if defined $_username; + if (defined $default_username && length $default_username) { + if (defined $realm && length $realm) { + print STDERR "Authentication realm: $realm\n"; + STDERR->flush; + } + $cred->username($default_username); + } else { + username($cred, $realm, $may_save, $pool); + } + $cred->password(_read_password("Password for '" . + $cred->username . "': ", $realm)); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub ssl_server_trust { + my ($cred, $realm, $failures, $cert_info, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + print STDERR "Error validating server certificate for '$realm':\n"; + { + no warnings 'once'; + # All variables SVN::Auth::SSL::* are used only once, + # so we're shutting up Perl warnings about this. + if ($failures & $SVN::Auth::SSL::UNKNOWNCA) { + print STDERR " - The certificate is not issued ", + "by a trusted authority. Use the\n", + " fingerprint to validate ", + "the certificate manually!\n"; + } + if ($failures & $SVN::Auth::SSL::CNMISMATCH) { + print STDERR " - The certificate hostname ", + "does not match.\n"; + } + if ($failures & $SVN::Auth::SSL::NOTYETVALID) { + print STDERR " - The certificate is not yet valid.\n"; + } + if ($failures & $SVN::Auth::SSL::EXPIRED) { + print STDERR " - The certificate has expired.\n"; + } + if ($failures & $SVN::Auth::SSL::OTHER) { + print STDERR " - The certificate has ", + "an unknown error.\n"; + } + } # no warnings 'once' + printf STDERR + "Certificate information:\n". + " - Hostname: %s\n". + " - Valid: from %s until %s\n". + " - Issuer: %s\n". + " - Fingerprint: %s\n", + map $cert_info->$_, qw(hostname valid_from valid_until + issuer_dname fingerprint); + my $choice; +prompt: + print STDERR $may_save ? + "(R)eject, accept (t)emporarily or accept (p)ermanently? " : + "(R)eject or accept (t)emporarily? "; + STDERR->flush; + $choice = lc(substr(<STDIN> || 'R', 0, 1)); + if ($choice =~ /^t$/i) { + $cred->may_save(undef); + } elsif ($choice =~ /^r$/i) { + return -1; + } elsif ($may_save && $choice =~ /^p$/i) { + $cred->may_save($may_save); + } else { + goto prompt; + } + $cred->accepted_failures($failures); + $SVN::_Core::SVN_NO_ERROR; +} + +sub ssl_client_cert { + my ($cred, $realm, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + print STDERR "Client certificate filename: "; + STDERR->flush; + chomp(my $filename = <STDIN>); + $cred->cert_file($filename); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub ssl_client_cert_pw { + my ($cred, $realm, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + $cred->password(_read_password("Password: ", $realm)); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub username { + my ($cred, $realm, $may_save, $pool) = @_; + $may_save = undef if $_no_auth_cache; + if (defined $realm && length $realm) { + print STDERR "Authentication realm: $realm\n"; + } + my $username; + if (defined $_username) { + $username = $_username; + } else { + print STDERR "Username: "; + STDERR->flush; + chomp($username = <STDIN>); + } + $cred->username($username); + $cred->may_save($may_save); + $SVN::_Core::SVN_NO_ERROR; +} + +sub _read_password { + my ($prompt, $realm) = @_; + my $password = ''; + if (exists $ENV{GIT_ASKPASS}) { + open(PH, "-|", $ENV{GIT_ASKPASS}, $prompt); + $password = <PH>; + $password =~ s/[\012\015]//; # \n\r + close(PH); + } else { + print STDERR $prompt; + STDERR->flush; + require Term::ReadKey; + Term::ReadKey::ReadMode('noecho'); + while (defined(my $key = Term::ReadKey::ReadKey(0))) { + last if $key =~ /[\012\015]/; # \n\r + $password .= $key; + } + Term::ReadKey::ReadMode('restore'); + print STDERR "\n"; + STDERR->flush; + } + $password; +} + +1; +__END__ + +Git::SVN::Prompt - authentication callbacks for git-svn + +=head1 SYNOPSIS + + use Git::SVN::Prompt qw(simple ssl_client_cert ssl_client_cert_pw + ssl_server_trust username); + use SVN::Client (); + + my $cached_simple = SVN::Client::get_simple_provider(); + my $git_simple = SVN::Client::get_simple_prompt_provider(\&simple, 2); + my $cached_ssl = SVN::Client::get_ssl_server_trust_file_provider(); + my $git_ssl = SVN::Client::get_ssl_server_trust_prompt_provider( + \&ssl_server_trust); + my $cached_cert = SVN::Client::get_ssl_client_cert_file_provider(); + my $git_cert = SVN::Client::get_ssl_client_cert_prompt_provider( + \&ssl_client_cert, 2); + my $cached_cert_pw = SVN::Client::get_ssl_client_cert_pw_file_provider(); + my $git_cert_pw = SVN::Client::get_ssl_client_cert_pw_prompt_provider( + \&ssl_client_cert_pw, 2); + my $cached_username = SVN::Client::get_username_provider(); + my $git_username = SVN::Client::get_username_prompt_provider( + \&username, 2); + + my $ctx = new SVN::Client( + auth => [ + $cached_simple, $git_simple, + $cached_ssl, $git_ssl, + $cached_cert, $git_cert, + $cached_cert_pw, $git_cert_pw, + $cached_username, $git_username + ]); + +=head1 DESCRIPTION + +This module is an implementation detail of the "git svn" command. +It implements git-svn's authentication policy. Do not use it unless +you are developing git-svn. + +The interface will change as git-svn evolves. + +=head1 DEPENDENCIES + +L<SVN::Core>. + +=head1 SEE ALSO + +L<SVN::Client>. + +=head1 INCOMPATIBILITIES + +None reported. + +=head1 BUGS + +None. diff --git a/perl/Git/SVN/Ra.pm b/perl/Git/SVN/Ra.pm new file mode 100644 index 0000000000..23ff43e86b --- /dev/null +++ b/perl/Git/SVN/Ra.pm @@ -0,0 +1,658 @@ +package Git::SVN::Ra; +use vars qw/@ISA $config_dir $_ignore_refs_regex $_log_window_size/; +use strict; +use warnings; +use SVN::Client; +use SVN::Ra; +BEGIN { + @ISA = qw(SVN::Ra); +} + +my ($ra_invalid, $can_do_switch, %ignored_err, $RA); + +BEGIN { + # enforce temporary pool usage for some simple functions + no strict 'refs'; + for my $f (qw/rev_proplist get_latest_revnum get_uuid get_repos_root + get_file/) { + my $SUPER = "SUPER::$f"; + *$f = sub { + my $self = shift; + my $pool = SVN::Pool->new; + my @ret = $self->$SUPER(@_,$pool); + $pool->clear; + wantarray ? @ret : $ret[0]; + }; + } +} + +sub _auth_providers () { + my @rv = ( + SVN::Client::get_simple_provider(), + SVN::Client::get_ssl_server_trust_file_provider(), + SVN::Client::get_simple_prompt_provider( + \&Git::SVN::Prompt::simple, 2), + SVN::Client::get_ssl_client_cert_file_provider(), + SVN::Client::get_ssl_client_cert_prompt_provider( + \&Git::SVN::Prompt::ssl_client_cert, 2), + SVN::Client::get_ssl_client_cert_pw_file_provider(), + SVN::Client::get_ssl_client_cert_pw_prompt_provider( + \&Git::SVN::Prompt::ssl_client_cert_pw, 2), + SVN::Client::get_username_provider(), + SVN::Client::get_ssl_server_trust_prompt_provider( + \&Git::SVN::Prompt::ssl_server_trust), + SVN::Client::get_username_prompt_provider( + \&Git::SVN::Prompt::username, 2) + ); + + # earlier 1.6.x versions would segfault, and <= 1.5.x didn't have + # this function + if (::compare_svn_version('1.6.15') >= 0) { + my $config = SVN::Core::config_get_config($config_dir); + my ($p, @a); + # config_get_config returns all config files from + # ~/.subversion, auth_get_platform_specific_client_providers + # just wants the config "file". + @a = ($config->{'config'}, undef); + $p = SVN::Core::auth_get_platform_specific_client_providers(@a); + # Insert the return value from + # auth_get_platform_specific_providers + unshift @rv, @$p; + } + \@rv; +} + +sub escape_uri_only { + my ($uri) = @_; + my @tmp; + foreach (split m{/}, $uri) { + s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; + push @tmp, $_; + } + join('/', @tmp); +} + +sub escape_url { + my ($url) = @_; + if ($url =~ m#^(https?)://([^/]+)(.*)$#) { + my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3)); + $url = "$scheme://$domain$uri"; + } + $url; +} + +sub new { + my ($class, $url) = @_; + $url =~ s!/+$!!; + return $RA if ($RA && $RA->{url} eq $url); + + ::_req_svn(); + + SVN::_Core::svn_config_ensure($config_dir, undef); + my ($baton, $callbacks) = SVN::Core::auth_open_helper(_auth_providers); + my $config = SVN::Core::config_get_config($config_dir); + $RA = undef; + my $dont_store_passwords = 1; + my $conf_t = ${$config}{'config'}; + { + no warnings 'once'; + # The usage of $SVN::_Core::SVN_CONFIG_* variables + # produces warnings that variables are used only once. + # I had not found the better way to shut them up, so + # the warnings of type 'once' are disabled in this block. + if (SVN::_Core::svn_config_get_bool($conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_AUTH, + $SVN::_Core::SVN_CONFIG_OPTION_STORE_PASSWORDS, + 1) == 0) { + SVN::_Core::svn_auth_set_parameter($baton, + $SVN::_Core::SVN_AUTH_PARAM_DONT_STORE_PASSWORDS, + bless (\$dont_store_passwords, "_p_void")); + } + if (SVN::_Core::svn_config_get_bool($conf_t, + $SVN::_Core::SVN_CONFIG_SECTION_AUTH, + $SVN::_Core::SVN_CONFIG_OPTION_STORE_AUTH_CREDS, + 1) == 0) { + $Git::SVN::Prompt::_no_auth_cache = 1; + } + } # no warnings 'once' + my $self = SVN::Ra->new(url => escape_url($url), auth => $baton, + config => $config, + pool => SVN::Pool->new, + auth_provider_callbacks => $callbacks); + $self->{url} = $url; + $self->{svn_path} = $url; + $self->{repos_root} = $self->get_repos_root; + $self->{svn_path} =~ s#^\Q$self->{repos_root}\E(/|$)##; + $self->{cache} = { check_path => { r => 0, data => {} }, + get_dir => { r => 0, data => {} } }; + $RA = bless $self, $class; +} + +sub check_path { + my ($self, $path, $r) = @_; + my $cache = $self->{cache}->{check_path}; + if ($r == $cache->{r} && exists $cache->{data}->{$path}) { + return $cache->{data}->{$path}; + } + my $pool = SVN::Pool->new; + my $t = $self->SUPER::check_path($path, $r, $pool); + $pool->clear; + if ($r != $cache->{r}) { + %{$cache->{data}} = (); + $cache->{r} = $r; + } + $cache->{data}->{$path} = $t; +} + +sub get_dir { + my ($self, $dir, $r) = @_; + my $cache = $self->{cache}->{get_dir}; + if ($r == $cache->{r}) { + if (my $x = $cache->{data}->{$dir}) { + return wantarray ? @$x : $x->[0]; + } + } + my $pool = SVN::Pool->new; + my ($d, undef, $props) = $self->SUPER::get_dir($dir, $r, $pool); + my %dirents = map { $_ => { kind => $d->{$_}->kind } } keys %$d; + $pool->clear; + if ($r != $cache->{r}) { + %{$cache->{data}} = (); + $cache->{r} = $r; + } + $cache->{data}->{$dir} = [ \%dirents, $r, $props ]; + wantarray ? (\%dirents, $r, $props) : \%dirents; +} + +sub DESTROY { + # do not call the real DESTROY since we store ourselves in $RA +} + +# get_log(paths, start, end, limit, +# discover_changed_paths, strict_node_history, receiver) +sub get_log { + my ($self, @args) = @_; + my $pool = SVN::Pool->new; + + # svn_log_changed_path_t objects passed to get_log are likely to be + # overwritten even if only the refs are copied to an external variable, + # so we should dup the structures in their entirety. Using an + # externally passed pool (instead of our temporary and quickly cleared + # pool in Git::SVN::Ra) does not help matters at all... + my $receiver = pop @args; + my $prefix = "/".$self->{svn_path}; + $prefix =~ s#/+($)##; + my $prefix_regex = qr#^\Q$prefix\E#; + push(@args, sub { + my ($paths) = $_[0]; + return &$receiver(@_) unless $paths; + $_[0] = (); + foreach my $p (keys %$paths) { + my $i = $paths->{$p}; + # Make path relative to our url, not repos_root + $p =~ s/$prefix_regex//; + my %s = map { $_ => $i->$_; } + qw/copyfrom_path copyfrom_rev action/; + if ($s{'copyfrom_path'}) { + $s{'copyfrom_path'} =~ s/$prefix_regex//; + } + $_[0]{$p} = \%s; + } + &$receiver(@_); + }); + + + # the limit parameter was not supported in SVN 1.1.x, so we + # drop it. Therefore, the receiver callback passed to it + # is made aware of this limitation by being wrapped if + # the limit passed to is being wrapped. + if (::compare_svn_version('1.2.0') <= 0) { + my $limit = splice(@args, 3, 1); + if ($limit > 0) { + my $receiver = pop @args; + push(@args, sub { &$receiver(@_) if (--$limit >= 0) }); + } + } + my $ret = $self->SUPER::get_log(@args, $pool); + $pool->clear; + $ret; +} + +sub trees_match { + my ($self, $url1, $rev1, $url2, $rev2) = @_; + my $ctx = SVN::Client->new(auth => _auth_providers); + my $out = IO::File->new_tmpfile; + + # older SVN (1.1.x) doesn't take $pool as the last parameter for + # $ctx->diff(), so we'll create a default one + my $pool = SVN::Pool->new_default_sub; + + $ra_invalid = 1; # this will open a new SVN::Ra connection to $url1 + $ctx->diff([], $url1, $rev1, $url2, $rev2, 1, 1, 0, $out, $out); + $out->flush; + my $ret = (($out->stat)[7] == 0); + close $out or croak $!; + + $ret; +} + +sub get_commit_editor { + my ($self, $log, $cb, $pool) = @_; + + my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef, 0) : (); + $self->SUPER::get_commit_editor($log, $cb, @lock, $pool); +} + +sub gs_do_update { + my ($self, $rev_a, $rev_b, $gs, $editor) = @_; + my $new = ($rev_a == $rev_b); + my $path = $gs->{path}; + + if ($new && -e $gs->{index}) { + unlink $gs->{index} or die + "Couldn't unlink index: $gs->{index}: $!\n"; + } + my $pool = SVN::Pool->new; + $editor->set_path_strip($path); + my (@pc) = split m#/#, $path; + my $reporter = $self->do_update($rev_b, (@pc ? shift @pc : ''), + 1, $editor, $pool); + my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef) : (); + + # Since we can't rely on svn_ra_reparent being available, we'll + # just have to do some magic with set_path to make it so + # we only want a partial path. + my $sp = ''; + my $final = join('/', @pc); + while (@pc) { + $reporter->set_path($sp, $rev_b, 0, @lock, $pool); + $sp .= '/' if length $sp; + $sp .= shift @pc; + } + die "BUG: '$sp' != '$final'\n" if ($sp ne $final); + + $reporter->set_path($sp, $rev_a, $new, @lock, $pool); + + $reporter->finish_report($pool); + $pool->clear; + $editor->{git_commit_ok}; +} + +# this requires SVN 1.4.3 or later (do_switch didn't work before 1.4.3, and +# svn_ra_reparent didn't work before 1.4) +sub gs_do_switch { + my ($self, $rev_a, $rev_b, $gs, $url_b, $editor) = @_; + my $path = $gs->{path}; + my $pool = SVN::Pool->new; + + my $full_url = $self->{url}; + my $old_url = $full_url; + $full_url .= '/' . $path if length $path; + my ($ra, $reparented); + + if ($old_url =~ m#^svn(\+ssh)?://# || + ($full_url =~ m#^https?://# && + escape_url($full_url) ne $full_url)) { + $_[0] = undef; + $self = undef; + $RA = undef; + $ra = Git::SVN::Ra->new($full_url); + $ra_invalid = 1; + } elsif ($old_url ne $full_url) { + SVN::_Ra::svn_ra_reparent($self->{session}, $full_url, $pool); + $self->{url} = $full_url; + $reparented = 1; + } + + $ra ||= $self; + $url_b = escape_url($url_b); + my $reporter = $ra->do_switch($rev_b, '', 1, $url_b, $editor, $pool); + my @lock = (::compare_svn_version('1.2.0') >= 0) ? (undef) : (); + $reporter->set_path('', $rev_a, 0, @lock, $pool); + $reporter->finish_report($pool); + + if ($reparented) { + SVN::_Ra::svn_ra_reparent($self->{session}, $old_url, $pool); + $self->{url} = $old_url; + } + + $pool->clear; + $editor->{git_commit_ok}; +} + +sub longest_common_path { + my ($gsv, $globs) = @_; + my %common; + my $common_max = scalar @$gsv; + + foreach my $gs (@$gsv) { + my @tmp = split m#/#, $gs->{path}; + my $p = ''; + foreach (@tmp) { + $p .= length($p) ? "/$_" : $_; + $common{$p} ||= 0; + $common{$p}++; + } + } + $globs ||= []; + $common_max += scalar @$globs; + foreach my $glob (@$globs) { + my @tmp = split m#/#, $glob->{path}->{left}; + my $p = ''; + foreach (@tmp) { + $p .= length($p) ? "/$_" : $_; + $common{$p} ||= 0; + $common{$p}++; + } + } + + my $longest_path = ''; + foreach (sort {length $b <=> length $a} keys %common) { + if ($common{$_} == $common_max) { + $longest_path = $_; + last; + } + } + $longest_path; +} + +sub gs_fetch_loop_common { + my ($self, $base, $head, $gsv, $globs) = @_; + return if ($base > $head); + my $inc = $_log_window_size; + my ($min, $max) = ($base, $head < $base + $inc ? $head : $base + $inc); + my $longest_path = longest_common_path($gsv, $globs); + my $ra_url = $self->{url}; + my $find_trailing_edge; + while (1) { + my %revs; + my $err; + my $err_handler = $SVN::Error::handler; + $SVN::Error::handler = sub { + ($err) = @_; + skip_unknown_revs($err); + }; + sub _cb { + my ($paths, $r, $author, $date, $log) = @_; + [ $paths, + { author => $author, date => $date, log => $log } ]; + } + $self->get_log([$longest_path], $min, $max, 0, 1, 1, + sub { $revs{$_[1]} = _cb(@_) }); + if ($err) { + print "Checked through r$max\r"; + } else { + $find_trailing_edge = 1; + } + if ($err and $find_trailing_edge) { + print STDERR "Path '$longest_path' ", + "was probably deleted:\n", + $err->expanded_message, + "\nWill attempt to follow ", + "revisions r$min .. r$max ", + "committed before the deletion\n"; + my $hi = $max; + while (--$hi >= $min) { + my $ok; + $self->get_log([$longest_path], $min, $hi, + 0, 1, 1, sub { + $ok = $_[1]; + $revs{$_[1]} = _cb(@_) }); + if ($ok) { + print STDERR "r$min .. r$ok OK\n"; + last; + } + } + $find_trailing_edge = 0; + } + $SVN::Error::handler = $err_handler; + + my %exists = map { $_->{path} => $_ } @$gsv; + foreach my $r (sort {$a <=> $b} keys %revs) { + my ($paths, $logged) = @{$revs{$r}}; + + foreach my $gs ($self->match_globs(\%exists, $paths, + $globs, $r)) { + if ($gs->rev_map_max >= $r) { + next; + } + next unless $gs->match_paths($paths, $r); + $gs->{logged_rev_props} = $logged; + if (my $last_commit = $gs->last_commit) { + $gs->assert_index_clean($last_commit); + } + my $log_entry = $gs->do_fetch($paths, $r); + if ($log_entry) { + $gs->do_git_commit($log_entry); + } + $Git::SVN::INDEX_FILES{$gs->{index}} = 1; + } + foreach my $g (@$globs) { + my $k = "svn-remote.$g->{remote}." . + "$g->{t}-maxRev"; + Git::SVN::tmp_config($k, $r); + } + if ($ra_invalid) { + $_[0] = undef; + $self = undef; + $RA = undef; + $self = Git::SVN::Ra->new($ra_url); + $ra_invalid = undef; + } + } + # pre-fill the .rev_db since it'll eventually get filled in + # with '0' x40 if something new gets committed + foreach my $gs (@$gsv) { + next if $gs->rev_map_max >= $max; + next if defined $gs->rev_map_get($max); + $gs->rev_map_set($max, 0 x40); + } + foreach my $g (@$globs) { + my $k = "svn-remote.$g->{remote}.$g->{t}-maxRev"; + Git::SVN::tmp_config($k, $max); + } + last if $max >= $head; + $min = $max + 1; + $max += $inc; + $max = $head if ($max > $head); + } + Git::SVN::gc(); +} + +sub get_dir_globbed { + my ($self, $left, $depth, $r) = @_; + + my @x = eval { $self->get_dir($left, $r) }; + return unless scalar @x == 3; + my $dirents = $x[0]; + my @finalents; + foreach my $de (keys %$dirents) { + next if $dirents->{$de}->{kind} != $SVN::Node::dir; + if ($depth > 1) { + my @args = ("$left/$de", $depth - 1, $r); + foreach my $dir ($self->get_dir_globbed(@args)) { + push @finalents, "$de/$dir"; + } + } else { + push @finalents, $de; + } + } + @finalents; +} + +# return value: 0 -- don't ignore, 1 -- ignore +sub is_ref_ignored { + my ($g, $p) = @_; + my $refname = $g->{ref}->full_path($p); + return 1 if defined($g->{ignore_refs_regex}) && + $refname =~ m!$g->{ignore_refs_regex}!; + return 0 unless defined($_ignore_refs_regex); + return 1 if $refname =~ m!$_ignore_refs_regex!o; + return 0; +} + +sub match_globs { + my ($self, $exists, $paths, $globs, $r) = @_; + + sub get_dir_check { + my ($self, $exists, $g, $r) = @_; + + my @dirs = $self->get_dir_globbed($g->{path}->{left}, + $g->{path}->{depth}, + $r); + + foreach my $de (@dirs) { + my $p = $g->{path}->full_path($de); + next if $exists->{$p}; + next if (length $g->{path}->{right} && + ($self->check_path($p, $r) != + $SVN::Node::dir)); + next unless $p =~ /$g->{path}->{regex}/; + $exists->{$p} = Git::SVN->init($self->{url}, $p, undef, + $g->{ref}->full_path($de), 1); + } + } + foreach my $g (@$globs) { + if (my $path = $paths->{"/$g->{path}->{left}"}) { + if ($path->{action} =~ /^[AR]$/) { + get_dir_check($self, $exists, $g, $r); + } + } + foreach (keys %$paths) { + if (/$g->{path}->{left_regex}/ && + !/$g->{path}->{regex}/) { + next if $paths->{$_}->{action} !~ /^[AR]$/; + get_dir_check($self, $exists, $g, $r); + } + next unless /$g->{path}->{regex}/; + my $p = $1; + my $pathname = $g->{path}->full_path($p); + next if is_ref_ignored($g, $p); + next if $exists->{$pathname}; + next if ($self->check_path($pathname, $r) != + $SVN::Node::dir); + $exists->{$pathname} = Git::SVN->init( + $self->{url}, $pathname, undef, + $g->{ref}->full_path($p), 1); + } + my $c = ''; + foreach (split m#/#, $g->{path}->{left}) { + $c .= "/$_"; + next unless ($paths->{$c} && + ($paths->{$c}->{action} =~ /^[AR]$/)); + get_dir_check($self, $exists, $g, $r); + } + } + values %$exists; +} + +sub minimize_url { + my ($self) = @_; + return $self->{url} if ($self->{url} eq $self->{repos_root}); + my $url = $self->{repos_root}; + my @components = split(m!/!, $self->{svn_path}); + my $c = ''; + do { + $url .= "/$c" if length $c; + eval { + my $ra = (ref $self)->new($url); + my $latest = $ra->get_latest_revnum; + $ra->get_log("", $latest, 0, 1, 0, 1, sub {}); + }; + } while ($@ && ($c = shift @components)); + $url; +} + +sub can_do_switch { + my $self = shift; + unless (defined $can_do_switch) { + my $pool = SVN::Pool->new; + my $rep = eval { + $self->do_switch(1, '', 0, $self->{url}, + SVN::Delta::Editor->new, $pool); + }; + if ($@) { + $can_do_switch = 0; + } else { + $rep->abort_report($pool); + $can_do_switch = 1; + } + $pool->clear; + } + $can_do_switch; +} + +sub skip_unknown_revs { + my ($err) = @_; + my $errno = $err->apr_err(); + # Maybe the branch we're tracking didn't + # exist when the repo started, so it's + # not an error if it doesn't, just continue + # + # Wonderfully consistent library, eh? + # 160013 - svn:// and file:// + # 175002 - http(s):// + # 175007 - http(s):// (this repo required authorization, too...) + # More codes may be discovered later... + if ($errno == 175007 || $errno == 175002 || $errno == 160013) { + my $err_key = $err->expanded_message; + # revision numbers change every time, filter them out + $err_key =~ s/\d+/\0/g; + $err_key = "$errno\0$err_key"; + unless ($ignored_err{$err_key}) { + warn "W: Ignoring error from SVN, path probably ", + "does not exist: ($errno): ", + $err->expanded_message,"\n"; + warn "W: Do not be alarmed at the above message ", + "git-svn is just searching aggressively for ", + "old history.\n", + "This may take a while on large repositories\n"; + $ignored_err{$err_key} = 1; + } + return; + } + die "Error from SVN, ($errno): ", $err->expanded_message,"\n"; +} + +1; +__END__ + +Git::SVN::Ra - Subversion remote access functions for git-svn + +=head1 SYNOPSIS + + use Git::SVN::Ra; + + my $ra = Git::SVN::Ra->new($branchurl); + my ($dirents, $fetched_revnum, $props) = + $ra->get_dir('.', $SVN::Core::INVALID_REVNUM); + +=head1 DESCRIPTION + +This is a wrapper around the L<SVN::Ra> module for use by B<git-svn>. +It fills in some default parameters (such as the authentication +scheme), smooths over incompatibilities between libsvn versions, adds +caching, and implements some functions specific to B<git-svn>. + +Do not use it unless you are developing git-svn. The interface will +change as git-svn evolves. + +=head1 DEPENDENCIES + +Subversion perl bindings, +L<Git::SVN>. + +C<Git::SVN::Ra> has not been tested using callers other than +B<git-svn> itself. + +=head1 SEE ALSO + +L<SVN::Ra>. + +=head1 INCOMPATIBILITIES + +None reported. + +=head1 BUGS + +None. diff --git a/perl/Makefile b/perl/Makefile index 3e21766d8f..fe7a486464 100644 --- a/perl/Makefile +++ b/perl/Makefile @@ -2,6 +2,7 @@ # Makefile for perl support modules and routine # makfile:=perl.mak +modules = PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) prefix_SQ = $(subst ','\'',$(prefix)) @@ -22,19 +23,35 @@ clean: ifdef NO_PERL_MAKEMAKER instdir_SQ = $(subst ','\'',$(prefix)/lib) + +modules += Git +modules += Git/I18N +modules += Git/SVN/Memoize/YAML +modules += Git/SVN/Fetcher +modules += Git/SVN/Editor +modules += Git/SVN/Prompt +modules += Git/SVN/Ra + $(makfile): ../GIT-CFLAGS Makefile echo all: private-Error.pm Git.pm Git/I18N.pm > $@ - echo ' mkdir -p blib/lib/Git' >> $@ - echo ' $(RM) blib/lib/Git.pm; cp Git.pm blib/lib/' >> $@ - echo ' $(RM) blib/lib/Git/I18N.pm; cp Git/I18N.pm blib/lib/Git/' >> $@ + echo ' mkdir -p blib/lib/Git/SVN/Memoize' >> $@ + set -e; \ + for i in $(modules); \ + do \ + echo ' $(RM) blib/lib/'$$i'.pm' >> $@; \ + echo ' cp '$$i'.pm blib/lib/'$$i'.pm' >> $@; \ + done echo ' $(RM) blib/lib/Error.pm' >> $@ '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ echo ' cp private-Error.pm blib/lib/Error.pm' >> $@ echo install: >> $@ - echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)"' >> $@ - echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@ - echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git.pm"; cp Git.pm "$$(DESTDIR)$(instdir_SQ)"' >> $@ - echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Git/I18N.pm"; cp Git/I18N.pm "$$(DESTDIR)$(instdir_SQ)/Git"' >> $@ + echo ' mkdir -p "$$(DESTDIR)$(instdir_SQ)/Git/SVN/Memoize"' >> $@ + set -e; \ + for i in $(modules); \ + do \ + echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \ + echo ' cp '$$i'.pm "$$(DESTDIR)$(instdir_SQ)/'$$i'.pm"' >> $@; \ + done echo ' $(RM) "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ '$(PERL_PATH_SQ)' -MError -e 'exit($$Error::VERSION < 0.15009)' || \ echo ' cp private-Error.pm "$$(DESTDIR)$(instdir_SQ)/Error.pm"' >> $@ diff --git a/perl/Makefile.PL b/perl/Makefile.PL index 456d45bf40..b54b04a619 100644 --- a/perl/Makefile.PL +++ b/perl/Makefile.PL @@ -24,9 +24,18 @@ endif MAKE_FRAG } +# XXX. When editing this list: +# +# * Please update perl/Makefile, too. +# * Don't forget to test with NO_PERL_MAKEMAKER=YesPlease my %pm = ( 'Git.pm' => '$(INST_LIBDIR)/Git.pm', 'Git/I18N.pm' => '$(INST_LIBDIR)/Git/I18N.pm', + 'Git/SVN/Memoize/YAML.pm' => '$(INST_LIBDIR)/Git/SVN/Memoize/YAML.pm', + 'Git/SVN/Fetcher.pm' => '$(INST_LIBDIR)/Git/SVN/Fetcher.pm', + 'Git/SVN/Editor.pm' => '$(INST_LIBDIR)/Git/SVN/Editor.pm', + 'Git/SVN/Prompt.pm' => '$(INST_LIBDIR)/Git/SVN/Prompt.pm', + 'Git/SVN/Ra.pm' => '$(INST_LIBDIR)/Git/SVN/Ra.pm', ); # We come with our own bundled Error.pm. It's not in the set of default @@ -15,6 +15,11 @@ Members: Thomas Rast <trast@student.ethz.ch> Language: is (Icelandic) Leader: Ævar Arnfjörð Bjarmason <avarab@gmail.com> +Language: it (Italian) +Repository: https://github.com/quizzlo/git-po-it/ +Leader: Marco Paolone <marcopaolone AT gmail.com> +Members: Stefano Lattarini <stefano.lattarini AT gmail.com> + Language: nl (Dutch) Repository: https://github.com/vfr-nl/git-po/ Leader: Vincent van Ravesteijn <vfr@lyx.org> @@ -27,6 +32,10 @@ Language: sv (Swedish) Repository: https://github.com/nafmo/git-l10n-sv/ Leader: Peter Krefting <peter@softwolves.pp.se> +Language: vi (Vietnamese) +Repository: https://github.com/vnwildman/git.git +Leader: Trần Ngọc Quân <vnwildman AT gmail.com> + Language: zh_CN (Simplified Chinese) Repository: https://github.com/gotgit/git-po-zh_CN/ Leader: Jiang Xin <worldhello.net@gmail.com> @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: git 1.7.10\n" +"Project-Id-Version: git 1.7.11\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-05-15 06:31+0800\n" +"POT-Creation-Date: 2012-06-08 10:20+0800\n" "PO-Revision-Date: 2012-03-28 18:46+0200\n" "Last-Translator: Ralf Thielow <ralf.thielow@googlemail.com>\n" "Language-Team: German\n" @@ -38,6 +38,80 @@ msgstr "" "um die Auflösung entsprechend zu markieren und einzutragen,\n" "oder benutze 'git commit -a'." +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' sieht nicht wie eine v2 Paketdatei aus" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "nicht erkannter Kopfbereich: %s%s (%d)" + +#: bundle.c:89 builtin/commit.c:696 +#, c-format +msgid "could not open '%s'" +msgstr "Konnte '%s' nicht öffnen" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "Dem Projektarchiv fehlen folgende vorrausgesetzte Versionen:" + +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289 +#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "Das Paket enthält %d Referenz" +msgstr[1] "Das Paket enthält %d Referenzen" + +#: bundle.c:192 +#, 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:290 +msgid "rev-list died" +msgstr "\"rev-list\" abgebrochen" + +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "nicht erkanntes Argument: %s" + +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "Referenz '%s' wird durch \"rev-list\" Optionen ausgeschlossen" + +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "Erstellung eines leeren Pakets zurückgewiesen." + +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "Konnte Paketobjekte nicht erstellen" + +#: bundle.c:412 +msgid "pack-objects died" +msgstr "Erstellung der Paketobjekte abgebrochen" + +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "kann '%s' nicht erstellen" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "Erstellung der Paketindexdatei abgebrochen" + #: commit.c:48 #, c-format msgid "could not parse %s" @@ -66,6 +140,73 @@ msgstr "Fehler beim Schreiben nach rev-list: %s" msgid "failed to close rev-list's stdin: %s" msgstr "Fehler beim Schließen von rev-list's Standard-Eingabe: %s" +#: date.c:95 +msgid "in the future" +msgstr "in der Zukunft" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "vor %lu Sekunde" +msgstr[1] "vor %lu Sekunden" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "vor %lu Minute" +msgstr[1] "vor %lu Minuten" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "vor %lu Stunde" +msgstr[1] "vor %lu Stunden" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "vor %lu Tag" +msgstr[1] "vor %lu Tagen" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "vor %lu Woche" +msgstr[1] "vor %lu Wochen" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "vor %lu Monat" +msgstr[1] "vor %lu Monaten" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "vor %lu Jahr" +msgstr[1] "vor %lu Jahren" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, und %lu Monat" +msgstr[1] "%s, und %lu Monaten" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "vor %lu Jahr" +msgstr[1] "vor %lu Jahren" + #: diff.c:105 #, c-format msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" @@ -111,7 +252,7 @@ msgid_plural ", %d deletions(-)" msgstr[0] ", %d Zeile entfernt(-)" msgstr[1] ", %d Zeilen entfernt(-)" -#: diff.c:3439 +#: diff.c:3478 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -132,22 +273,31 @@ msgstr "gpg hat die Daten nicht akzeptiert" msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" -#: grep.c:1280 +#: grep.c:1320 #, c-format msgid "'%s': unable to read %s" msgstr "'%s': konnte nicht lesen %s" -#: grep.c:1297 +#: grep.c:1337 #, c-format msgid "'%s': %s" msgstr "'%s': %s" -#: grep.c:1308 +#: grep.c:1348 #, c-format msgid "'%s': short read %s" msgstr "'%s': read() zu kurz %s" -#: help.c:287 +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "Vorhandene Git-Kommandos in '%s'" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "Vorhandene Git-Kommandos irgendwo in deinem $PATH" + +#: help.c:270 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -156,14 +306,72 @@ msgstr "" "'%s' scheint ein git-Kommando zu sein, konnte aber\n" "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" -#: remote.c:1607 +#: help.c:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Uh oh. Keine Git-Kommandos auf deinem System vorhanden." + +#: help.c:349 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "" +"Warnung: Du hast das nicht existierende Git-Kommando '%s' ausgeführt.\n" +"Setze fort unter der Annahme das du '%s' gemeint hast" + +#: help.c:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "automatisch in %0.1f Sekunden..." + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' ist kein Git-Kommando. Siehe 'git --help'." + +#: help.c:365 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Hast du das gemeint?" +msgstr[1] "" +"\n" +"Hast du eines von diesen gemeint?" + +#: parse-options.c:493 +msgid "..." +msgstr "..." + +#: parse-options.c:511 +#, c-format +msgid "usage: %s" +msgstr "Verwendung: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:515 +#, c-format +msgid " or: %s" +msgstr " oder: %s" + +#: parse-options.c:518 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1629 #, 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] "Dein Zweig ist vor '%s' um %d Version.\n" msgstr[1] "Dein Zweig ist vor '%s' um %d Versionen.\n" -#: remote.c:1613 +#: remote.c:1635 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -174,7 +382,7 @@ msgstr[1] "" "Dein Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " "werden.\n" -#: remote.c:1621 +#: remote.c:1643 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -189,19 +397,19 @@ msgstr[1] "" "Dein Zweig und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Versionen.\n" -#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978 +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 #: builtin/merge.c:1088 builtin/merge.c:1098 #, c-format msgid "Could not open '%s' for writing" msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 #: builtin/merge.c:1090 builtin/merge.c:1103 #, c-format msgid "Could not write to '%s'" msgstr "Konnte nicht nach '%s' schreiben." -#: sequencer.c:143 +#: sequencer.c:144 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -209,7 +417,7 @@ msgstr "" "nach Auflösung der Konflikte, markiere die korrigierten Pfade\n" "mit 'git add <Pfade>' oder 'git rm <Pfade>'" -#: sequencer.c:146 +#: sequencer.c:147 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -219,56 +427,74 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und trage das Ergebnis ein mit " "'git commit'" -#: sequencer.c:159 sequencer.c:685 sequencer.c:768 +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" -#: sequencer.c:162 +#: sequencer.c:163 #, c-format msgid "Error wrapping up %s" msgstr "Fehler bei Nachbereitung von %s" -#: sequencer.c:177 +#: sequencer.c:178 msgid "Your local changes would be overwritten by cherry-pick." msgstr "" "Deine lokalen Änderungen würden von \"cherry-pick\" überschrieben werden." -#: sequencer.c:179 +#: sequencer.c:180 msgid "Your local changes would be overwritten by revert." msgstr "Deine lokalen Änderungen würden von \"revert\" überschrieben werden." -#: sequencer.c:182 +#: sequencer.c:183 msgid "Commit your changes or stash them to proceed." msgstr "Trage deine Änderungen ein oder benutze \"stash\" um fortzufahren." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:232 +#: sequencer.c:233 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Bereitstellungsdatei nicht schreiben" -#: sequencer.c:298 +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "Konnte Version der Zweigspitze (HEAD) nicht auflösen\n" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "Konnte zwischengespeicherten Baum nicht aktualisieren\n" + +#: sequencer.c:324 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Konnte Version %s nicht parsen\n" + +#: sequencer.c:329 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Konnte Elternversion %s nicht parsen\n" + +#: sequencer.c:395 msgid "Your index file is unmerged." msgstr "Deine Bereitstellungsdatei ist nicht zusammengeführt." -#: sequencer.c:301 +#: sequencer.c:398 msgid "You do not have a valid HEAD" msgstr "Du hast keine gültige Zweigspitze (HEAD)" -#: sequencer.c:316 +#: sequencer.c:413 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" "Version %s ist eine Zusammenführung, aber die Option -m wurde nicht " "angegeben." -#: sequencer.c:324 +#: sequencer.c:421 #, c-format msgid "Commit %s does not have parent %d" msgstr "Version %s hat keinen Elternteil %d" -#: sequencer.c:328 +#: sequencer.c:425 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -276,151 +502,145 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:339 +#: sequencer.c:436 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Elternversion %s nicht parsen" -#: sequencer.c:343 +#: sequencer.c:440 #, c-format msgid "Cannot get commit message for %s" msgstr "Kann keine Versionsbeschreibung für %s bekommen" -#: sequencer.c:427 +#: sequencer.c:524 #, c-format msgid "could not revert %s... %s" msgstr "Konnte %s nicht zurücksetzen... %s" -#: sequencer.c:428 +#: sequencer.c:525 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s nicht anwenden... %s" -#: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347 -#: builtin/shortlog.c:181 -msgid "revision walk setup failed" -msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" - -#: sequencer.c:453 +#: sequencer.c:553 msgid "empty commit set passed" msgstr "leere Menge von Versionen übergeben" -#: sequencer.c:461 +#: sequencer.c:561 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen der Bereitstellung" -#: sequencer.c:466 +#: sequencer.c:566 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren der Bereitstellung" -#: sequencer.c:551 +#: sequencer.c:624 #, c-format msgid "Cannot %s during a %s" msgstr "Kann %s nicht während eines %s durchführen" -#: sequencer.c:573 +#: sequencer.c:646 #, c-format msgid "Could not parse line %d." msgstr "Konnte Zeile %d nicht parsen." -#: sequencer.c:578 +#: sequencer.c:651 msgid "No commits parsed." msgstr "Keine Versionen geparst." -#: sequencer.c:591 +#: sequencer.c:664 #, c-format msgid "Could not open %s" msgstr "Konnte %s nicht öffnen" -#: sequencer.c:595 +#: sequencer.c:668 #, c-format msgid "Could not read %s." msgstr "Konnte %s nicht lesen." -#: sequencer.c:602 +#: sequencer.c:675 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Unbenutzbares Instruktionsblatt: %s" -#: sequencer.c:630 +#: sequencer.c:703 #, c-format msgid "Invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:633 +#: sequencer.c:706 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:645 +#: sequencer.c:718 #, c-format msgid "Malformed options sheet: %s" msgstr "Fehlerhaftes Optionsblatt: %s" -#: sequencer.c:666 +#: sequencer.c:739 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:667 +#: sequencer.c:740 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuche \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:671 +#: sequencer.c:744 #, c-format msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:687 sequencer.c:772 +#: sequencer.c:760 sequencer.c:845 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:706 sequencer.c:840 +#: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:708 +#: sequencer.c:781 msgid "cannot resolve HEAD" msgstr "kann Zweigspitze (HEAD) nicht auflösen" -#: sequencer.c:710 +#: sequencer.c:783 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird" -#: sequencer.c:732 +#: sequencer.c:805 builtin/apply.c:3697 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" -#: sequencer.c:735 +#: sequencer.c:808 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:736 +#: sequencer.c:809 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:742 +#: sequencer.c:815 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" "gespeicherte \"pre-cherry-pick\" Datei der Zweigspitze (HEAD) '%s' ist " "beschädigt" -#: sequencer.c:765 +#: sequencer.c:838 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:927 +#: sequencer.c:1000 msgid "Can't revert as initial commit" msgstr "Kann nicht zu initialer Version zurücksetzen." -#: sequencer.c:928 +#: sequencer.c:1001 msgid "Can't cherry-pick into empty head" msgstr "Kann \"cherry-pick\" nicht in einem leerem Kopf ausführen." @@ -441,246 +661,255 @@ msgstr "Kein entferntes Projektarchiv für Zweig '%s' konfiguriert." #: sha1_name.c:872 #, c-format msgid "Upstream branch '%s' not stored as a remote-tracking branch" -msgstr "Zweig '%s' des entfernten Projektarchivs ist nicht als entfernter " -"Übernahmezweig gespeichert" +msgstr "" +"Zweig '%s' des entfernten Projektarchivs ist kein gefolgter Übernahmezweig" + +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "konnte aktuellen Benutzer nicht in Passwort-Datei finden: %s" + +#: wrapper.c:414 +msgid "no such user" +msgstr "kein solcher Benutzer" -#: wt-status.c:134 +#: wt-status.c:135 msgid "Unmerged paths:" msgstr "Nicht zusammengeführte Pfade:" -#: wt-status.c:140 wt-status.c:157 +#: wt-status.c:141 wt-status.c:158 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr "" " (benutze \"git reset %s <Datei>...\" zum Herausnehmen aus der " "Bereitstellung)" -#: wt-status.c:142 wt-status.c:159 +#: wt-status.c:143 wt-status.c:160 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr "" " (benutze \"git rm --cached <Datei>...\" zum Herausnehmen aus der " "Bereitstellung)" -#: wt-status.c:143 +#: wt-status.c:144 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr "" " (benutze \"git add/rm <Datei>...\" um die Auflösung entsprechend zu " "markieren)" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Changes to be committed:" msgstr "zum Eintragen bereitgestellte Änderungen:" -#: wt-status.c:169 +#: wt-status.c:170 msgid "Changes not staged for commit:" msgstr "Änderungen, die nicht zum Eintragen bereitgestellt sind:" -#: wt-status.c:173 +#: wt-status.c:174 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " (benutze \"git add <Datei>...\" zum Bereitstellen)" -#: wt-status.c:175 +#: wt-status.c:176 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " (benutze \"git add/rm <Datei>...\" zum Bereitstellen)" -#: wt-status.c:176 +#: wt-status.c:177 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr "" " (benutze \"git checkout -- <Datei>...\" um die Änderungen im " "Arbeitsverzeichnis zu verwerfen)" -#: wt-status.c:178 +#: wt-status.c:179 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" " (trage ein oder verwerfe den unbeobachteten oder geänderten Inhalt in den " "Unterprojekten)" -#: wt-status.c:187 +#: wt-status.c:188 #, c-format msgid "%s files:" msgstr "%s Dateien:" -#: wt-status.c:190 +#: wt-status.c:191 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " (benutze \"git %s <Datei>...\" zum Einfügen in die Eintragung)" -#: wt-status.c:207 +#: wt-status.c:208 msgid "bug" msgstr "Fehler" -#: wt-status.c:212 +#: wt-status.c:213 msgid "both deleted:" msgstr "beide gelöscht:" -#: wt-status.c:213 +#: wt-status.c:214 msgid "added by us:" msgstr "von uns hinzugefügt:" -#: wt-status.c:214 +#: wt-status.c:215 msgid "deleted by them:" msgstr "von denen gelöscht:" -#: wt-status.c:215 +#: wt-status.c:216 msgid "added by them:" msgstr "von denen hinzugefügt:" -#: wt-status.c:216 +#: wt-status.c:217 msgid "deleted by us:" msgstr "von uns gelöscht:" -#: wt-status.c:217 +#: wt-status.c:218 msgid "both added:" msgstr "von beiden hinzugefügt:" -#: wt-status.c:218 +#: wt-status.c:219 msgid "both modified:" msgstr "von beiden geändert:" -#: wt-status.c:248 +#: wt-status.c:249 msgid "new commits, " msgstr "neue Versionen, " -#: wt-status.c:250 +#: wt-status.c:251 msgid "modified content, " msgstr "geänderter Inhalt, " -#: wt-status.c:252 +#: wt-status.c:253 msgid "untracked content, " msgstr "unbeobachteter Inhalt, " -#: wt-status.c:266 +#: wt-status.c:267 #, c-format msgid "new file: %s" msgstr "neue Datei: %s" -#: wt-status.c:269 +#: wt-status.c:270 #, c-format msgid "copied: %s -> %s" msgstr "kopiert: %s -> %s" -#: wt-status.c:272 +#: wt-status.c:273 #, c-format msgid "deleted: %s" msgstr "gelöscht: %s" -#: wt-status.c:275 +#: wt-status.c:276 #, c-format msgid "modified: %s" msgstr "geändert: %s" -#: wt-status.c:278 +#: wt-status.c:279 #, c-format msgid "renamed: %s -> %s" msgstr "umbenannt: %s -> %s" -#: wt-status.c:281 +#: wt-status.c:282 #, c-format msgid "typechange: %s" msgstr "Typänderung: %s" -#: wt-status.c:284 +#: wt-status.c:285 #, c-format msgid "unknown: %s" msgstr "unbekannt: %s" -#: wt-status.c:287 +#: wt-status.c:288 #, c-format msgid "unmerged: %s" msgstr "nicht zusammengeführt: %s" -#: wt-status.c:290 +#: wt-status.c:291 #, c-format msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:713 +#: wt-status.c:737 msgid "On branch " msgstr "Auf Zweig " -#: wt-status.c:720 +#: wt-status.c:744 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Zweig." -#: wt-status.c:731 +#: wt-status.c:755 msgid "Initial commit" msgstr "Initiale Version" -#: wt-status.c:745 +#: wt-status.c:769 msgid "Untracked" msgstr "Unbeobachtete" -#: wt-status.c:747 +#: wt-status.c:771 msgid "Ignored" msgstr "Ignorierte" -#: wt-status.c:749 +#: wt-status.c:773 #, c-format msgid "Untracked files not listed%s" msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: wt-status.c:751 +#: wt-status.c:775 msgid " (use -u option to show untracked files)" msgstr " (benutze die Option -u um unbeobachteten Dateien anzuzeigen)" -#: wt-status.c:757 +#: wt-status.c:781 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:761 +#: wt-status.c:785 #, c-format msgid "no changes added to commit%s\n" msgstr "keine Änderungen zum Eintragen hinzugefügt%s\n" -#: wt-status.c:763 +#: wt-status.c:787 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr " (benutze \"git add\" und/oder \"git commit -a\")" -#: wt-status.c:765 +#: wt-status.c:789 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "" "nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien%s\n" -#: wt-status.c:767 +#: wt-status.c:791 msgid " (use \"git add\" to track)" msgstr " (benutze \"git add\" zum Beobachten)" -#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#: wt-status.c:793 wt-status.c:796 wt-status.c:799 #, c-format msgid "nothing to commit%s\n" msgstr "nichts zum Eintragen%s\n" -#: wt-status.c:770 +#: wt-status.c:794 msgid " (create/copy files and use \"git add\" to track)" msgstr " (Erstelle/Kopiere Dateien und benutze \"git add\" zum Beobachten)" -#: wt-status.c:773 +#: wt-status.c:797 msgid " (use -u to show untracked files)" msgstr " (benutze die Option -u um unbeobachtete Dateien anzuzeigen)" -#: wt-status.c:776 +#: wt-status.c:800 msgid " (working directory clean)" msgstr " (Arbeitsverzeichnis sauber)" -#: wt-status.c:884 +#: wt-status.c:908 msgid "HEAD (no branch)" msgstr "HEAD (kein Zweig)" -#: wt-status.c:890 +#: wt-status.c:914 msgid "Initial commit on " msgstr "Initiale Version auf " -#: wt-status.c:905 +#: wt-status.c:929 msgid "behind " msgstr "hinterher " -#: wt-status.c:908 wt-status.c:911 +#: wt-status.c:932 wt-status.c:935 msgid "ahead " msgstr "voraus " -#: wt-status.c:913 +#: wt-status.c:937 msgid ", behind " msgstr ", hinterher " @@ -689,7 +918,7 @@ msgstr ", hinterher " msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:67 builtin/commit.c:298 +#: builtin/add.c:67 builtin/commit.c:226 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" @@ -783,15 +1012,507 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wolltest du vielleicht 'git add .' sagen?\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "Bereitstellungsdatei beschädigt" -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." +#: builtin/apply.c:53 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [Optionen] [<Patch>...]" + +#: builtin/apply.c:106 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "nicht erkannte Option für Leerzeichen: '%s'" + +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "nicht erkannte Option zum Ignorieren von Leerzeichen: '%s'" + +#: builtin/apply.c:815 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "Kann regulären Ausdruck für Zeitstempel %s nicht verarbeiten" + +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "Ausführung des regulären Ausdrucks gab %d zurück. Eingabe: %s" + +#: builtin/apply.c:905 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "Konnte keinen Dateinamen in Zeile %d des Patches finden." + +#: builtin/apply.c:937 +#, 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" + +#: builtin/apply.c:941 +#, 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" + +#: builtin/apply.c:942 +#, 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" + +#: builtin/apply.c:949 +#, 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" + +#: builtin/apply.c:1394 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: unerwartete Zeile: %.*s" + +#: builtin/apply.c:1451 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" + +#: builtin/apply.c:1468 +#, 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] "" +"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " +"%d vorangestellter Teil des Pfades entfernt wird (Zeile %d)" +msgstr[1] "" +"Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " +"%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" + +#: builtin/apply.c:1628 +msgid "new file depends on old contents" +msgstr "neue Datei hängt von alten Inhalten ab" + +#: builtin/apply.c:1630 +msgid "deleted file still has contents" +msgstr "entfernte Datei hat noch Inhalte" + +#: builtin/apply.c:1656 +#, c-format +msgid "corrupt patch at line %d" +msgstr "fehlerhafter Patch bei Zeile %d" + +#: builtin/apply.c:1692 +#, c-format +msgid "new file %s depends on old contents" +msgstr "neue Datei %s hängt von alten Inhalten ab" + +#: builtin/apply.c:1694 +#, c-format +msgid "deleted file %s still has contents" +msgstr "entfernte Datei %s hat noch Inhalte" + +#: builtin/apply.c:1697 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." + +#: builtin/apply.c:1843 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "fehlerhafter Binär-Patch bei Zeile %d: %.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1872 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "nicht erkannter Binär-Patch bei Zeile %d" + +#: builtin/apply.c:1958 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "Patch mit nutzlosen Informationen bei Zeile %d" + +#: builtin/apply.c:2048 +#, c-format +msgid "unable to read symlink %s" +msgstr "konnte symbolische Verknüpfung %s nicht lesen" + +#: builtin/apply.c:2052 +#, c-format +msgid "unable to open or read %s" +msgstr "konnte %s nicht öffnen oder lesen" + +#: builtin/apply.c:2123 +msgid "oops" +msgstr "Ups" + +#: builtin/apply.c:2645 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "Ungültiger Zeilenanfang: '%c'" + +#: builtin/apply.c:2763 +#, c-format +msgid "Hunk #%d succeeded at %d (offset %d line)." +msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." +msgstr[0] "Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeile versetzt)" +msgstr[1] "" +"Patch-Bereich #%d erfolgreich angewendet bei %d (%d Zeilen versetzt)" + +#: builtin/apply.c:2775 +#, 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" + +#: builtin/apply.c:2781 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"bei der Suche nach:\n" +"%.*s" + +#: builtin/apply.c:2800 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "keine Daten in Binär-Patch für '%s'" + +#: builtin/apply.c:2903 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" + +#: builtin/apply.c:2909 +#, 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)" + +#: builtin/apply.c:2930 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" + +#: builtin/apply.c:3045 +#, c-format +msgid "patch %s has been renamed/deleted" +msgstr "Patch %s wurde umbenannt/gelöscht" + +#: builtin/apply.c:3052 builtin/apply.c:3069 +#, c-format +msgid "read of %s failed" +msgstr "Konnte %s nicht lesen" + +#: builtin/apply.c:3084 +msgid "removal patch leaves file contents" +msgstr "Lösch-Patch hinterlässt Dateiinhalte" + +#: builtin/apply.c:3105 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s existiert bereits im Arbeitsverzeichnis" + +#: builtin/apply.c:3143 +#, c-format +msgid "%s: has been deleted/renamed" +msgstr "%s wurde gelöscht/umbenannt" + +#: builtin/apply.c:3148 builtin/apply.c:3179 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3159 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s ist nicht bereitgestellt" + +#: builtin/apply.c:3173 +#, c-format +msgid "%s: does not match index" +msgstr "%s entspricht nicht der Bereitstellung" + +#: builtin/apply.c:3190 +#, c-format +msgid "%s: wrong type" +msgstr "%s: falscher Typ" + +#: builtin/apply.c:3192 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s ist vom Typ %o, erwartete %o" + +#: builtin/apply.c:3247 +#, c-format +msgid "%s: already exists in index" +msgstr "%s ist bereits bereitgestellt" + +#: builtin/apply.c:3267 +#, 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)" + +#: builtin/apply.c:3272 +#, 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" + +#: builtin/apply.c:3280 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: Patch konnte nicht angewendet werden" + +#: builtin/apply.c:3293 +#, c-format +msgid "Checking patch %s..." +msgstr "Prüfe Patch %s..." + +#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" + +#: builtin/apply.c:3491 +#, c-format +msgid "unable to remove %s from index" +msgstr "konnte %s nicht aus der Bereitstellung entfernen" + +#: builtin/apply.c:3518 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "fehlerhafter Patch für Unterprojekt %s" + +#: builtin/apply.c:3522 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "konnte neu erstellte Datei '%s' nicht lesen" + +#: builtin/apply.c:3527 +#, 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" + +#: builtin/apply.c:3530 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "kann für %s keinen Eintrag in den Zwischenspeicher hinzufügen" + +#: builtin/apply.c:3563 +#, c-format +msgid "closing file '%s'" +msgstr "schließe Datei '%s'" + +#: builtin/apply.c:3612 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" + +#: builtin/apply.c:3668 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Patch %s sauber angewendet" + +#: builtin/apply.c:3676 +msgid "internal error" +msgstr "interner Fehler" + +#. Say this even without --verbose +#: builtin/apply.c:3679 +#, 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..." + +#: builtin/apply.c:3689 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "Verkürze Name von .rej Datei zu %.*s.rej" + +#: builtin/apply.c:3710 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Patch-Bereich #%d sauber angewendet." + +#: builtin/apply.c:3713 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Patch-Bereich #%d zurückgewiesen." + +#: builtin/apply.c:3844 +msgid "unrecognized input" +msgstr "nicht erkannte Eingabe" + +#: builtin/apply.c:3855 +msgid "unable to read index file" +msgstr "Konnte Bereitstellungsdatei nicht lesen" + +#: builtin/apply.c:3970 builtin/apply.c:3973 +msgid "path" +msgstr "Pfad" + +#: builtin/apply.c:3971 +msgid "don't apply changes matching the given path" +msgstr "wendet keine Änderungen im angegebenen Pfad an" + +#: builtin/apply.c:3974 +msgid "apply changes matching the given path" +msgstr "wendet Änderungen nur im angegebenen Pfad an" + +#: builtin/apply.c:3976 +msgid "num" +msgstr "Anzahl" + +#: builtin/apply.c:3977 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" +"entfernt <Anzahl> vorrangestellte Schrägstriche von herkömmlichen " +"Differenzpfaden" + +#: builtin/apply.c:3980 +msgid "ignore additions made by the patch" +msgstr "ignoriert hinzugefügte Zeilen des Patches" + +#: builtin/apply.c:3982 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" +"anstatt der Anwendung des Patches, wird der \"diffstat\" für die Eingabe " +"ausgegeben" + +#: builtin/apply.c:3986 +msgid "shows number of added and deleted lines in decimal notation" +msgstr "" +"zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" + +#: builtin/apply.c:3988 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" +"anstatt der Anwendung des Patches, wird eine Zusammenfassung für die Eingabe " +"ausgegeben" + +#: builtin/apply.c:3990 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" +"anstatt der Anwendung des Patches, zeige ob Patch angewendet werden kann" + +#: builtin/apply.c:3992 +msgid "make sure the patch is applicable to the current index" +msgstr "" +"stellt sicher, dass der Patch in der aktuellen Bereitstellung angewendet " +"werden kann" + +#: builtin/apply.c:3994 +msgid "apply a patch without touching the working tree" +msgstr "wendet einen Patch an, ohne Änderungen im Arbeitszweig vorzunehmen" + +#: builtin/apply.c:3996 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" + +#: builtin/apply.c:3998 +msgid "build a temporary index based on embedded index information" +msgstr "" +"erstellt eine temporäre Bereitstellung basierend auf den integrierten " +"Bereitstellungsinformationen" + +#: builtin/apply.c:4000 +msgid "paths are separated with NUL character" +msgstr "Pfade sind getrennt durch NUL Zeichen" + +#: builtin/apply.c:4003 +msgid "ensure at least <n> lines of context match" +msgstr "" +"stellt sicher, dass mindestens <Anzahl> Zeilen des Kontextes übereinstimmen" + +#: builtin/apply.c:4004 +msgid "action" +msgstr "Aktion" + +#: builtin/apply.c:4005 +msgid "detect new or modified lines that have whitespace errors" +msgstr "ermittelt neue oder geänderte Zeilen die Fehler in Leerzeichen haben" + +#: builtin/apply.c:4008 builtin/apply.c:4011 +msgid "ignore changes in whitespace when finding context" +msgstr "ignoriert Änderungen in Leerzeichen bei der Suche des Kontextes" + +#: builtin/apply.c:4014 +msgid "apply the patch in reverse" +msgstr "wendet den Patch in umgekehrter Reihenfolge an" + +#: builtin/apply.c:4016 +msgid "don't expect at least one line of context" +msgstr "erwartet keinen Kontext" + +#: builtin/apply.c:4018 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" +"hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej " +"Dateien" + +#: builtin/apply.c:4020 +msgid "allow overlapping hunks" +msgstr "erlaubt sich überlappende Patch-Bereiche" + +#: builtin/apply.c:4021 +msgid "be verbose" +msgstr "erweiterte Ausgaben" + +#: builtin/apply.c:4023 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" + +#: builtin/apply.c:4026 +msgid "do not trust the line counts in the hunk headers" +msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Bereiches" + +#: builtin/apply.c:4028 +msgid "root" +msgstr "Wurzelverzeichnis" + +#: builtin/apply.c:4029 +msgid "prepend <root> to all filenames" +msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" + +#: builtin/apply.c:4050 +msgid "--index outside a repository" +msgstr "--index außerhalb eines Projektarchivs" + +#: builtin/apply.c:4053 +msgid "--cached outside a repository" +msgstr "--cached außerhalb eines Projektarchivs" + +#: builtin/apply.c:4069 +#, c-format +msgid "can't open patch '%s'" +msgstr "kann Patch '%s' nicht öffnen" + +#: builtin/apply.c:4083 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "unterdrückte %d Fehler in Leerzeichen" +msgstr[1] "unterdrückte %d Fehler in Leerzeichen" + +#: builtin/apply.c:4089 builtin/apply.c:4099 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d Zeile fügt Fehler in Leerzeichen hinzu." +msgstr[1] "%d Zeilen fügen Fehler in Leerzeichen hinzu." + #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -827,7 +1548,7 @@ msgstr "git archive: Protokollfehler" msgid "git archive: expected a flush" msgstr "git archive: erwartete eine Spülung (flush)" -#: builtin/branch.c:137 +#: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -837,7 +1558,7 @@ msgstr "" " '%s', aber noch nicht mit der Zweigspitze (HEAD) zusammengeführt " "wurde." -#: builtin/branch.c:141 +#: builtin/branch.c:148 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -846,36 +1567,36 @@ msgstr "" "entferne Zweig '%s' nicht, der noch nicht zusammengeführt wurde mit\n" " '%s', obwohl er mit der Zweigspitze (HEAD) zusammengeführt wurde." -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" -#: builtin/branch.c:164 -msgid "remote " -msgstr "externer " - -#: builtin/branch.c:172 +#: builtin/branch.c:180 msgid "cannot use -a with -d" msgstr "kann -a nicht mit -d benutzen" -#: builtin/branch.c:178 +#: builtin/branch.c:186 msgid "Couldn't look up commit object for HEAD" msgstr "Konnte Versionsobjekt für Zweigspitze (HEAD) nicht nachschlagen." -#: builtin/branch.c:183 +#: builtin/branch.c:191 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "" "Kann Zweig '%s' nicht entfernen, da du dich gerade auf diesem befindest." -#: builtin/branch.c:193 +#: builtin/branch.c:202 #, c-format -msgid "%sbranch '%s' not found." -msgstr "%sZweig '%s' nicht gefunden." +msgid "remote branch '%s' not found." +msgstr "externer Zweig '%s' nicht gefunden" -#: builtin/branch.c:201 +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "Zweig '%s' nicht gefunden." + +#: builtin/branch.c:210 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "Konnte Versionsobjekt für '%s' nicht nachschlagen." -#: builtin/branch.c:207 +#: builtin/branch.c:216 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -884,97 +1605,126 @@ msgstr "" "Der Zweig '%s' ist nicht vollständig zusammengeführt.\n" "Wenn du sicher bist diesen Zweig zu entfernen, führe 'git branch -D %s' aus." -#: builtin/branch.c:215 +#: builtin/branch.c:225 #, c-format -msgid "Error deleting %sbranch '%s'" -msgstr "Fehler beim Löschen von %sZweig '%s'" +msgid "Error deleting remote branch '%s'" +msgstr "Fehler beim Entfernen des externen Zweiges '%s'" -#: builtin/branch.c:221 +#: builtin/branch.c:226 #, c-format -msgid "Deleted %sbranch %s (was %s).\n" -msgstr "Entferne %sZweig %s (war %s).\n" +msgid "Error deleting branch '%s'" +msgstr "Fehler beim Entfernen des Zweiges '%s'" -#: builtin/branch.c:226 +#: builtin/branch.c:233 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Externer Zweig %s entfernt (war %s).\n" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Zweig %s entfernt (war %s).\n" + +#: builtin/branch.c:239 msgid "Update of config-file failed" msgstr "Aktualisierung der Konfigurationsdatei fehlgeschlagen." -#: builtin/branch.c:324 +#: builtin/branch.c:337 #, c-format msgid "branch '%s' does not point at a commit" msgstr "Zweig '%s' zeigt auf keine Version" -#: builtin/branch.c:396 +#: builtin/branch.c:409 #, c-format -msgid "behind %d] " -msgstr "%d hinterher] " +msgid "[%s: behind %d]" +msgstr "[%s: %d hinterher]" -#: builtin/branch.c:398 +#: builtin/branch.c:411 #, c-format -msgid "ahead %d] " -msgstr "%d voraus] " +msgid "[behind %d]" +msgstr "[%d hinterher]" -#: builtin/branch.c:400 +#: builtin/branch.c:415 #, c-format -msgid "ahead %d, behind %d] " -msgstr "%d voraus, %d hinterher] " +msgid "[%s: ahead %d]" +msgstr "[%s: %d voraus]" -#: builtin/branch.c:503 +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" +msgstr "[%d voraus]" + +#: builtin/branch.c:420 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: %d voraus, %d hinterher]" + +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[%d voraus, %d hinterher]" + +#: builtin/branch.c:535 msgid "(no branch)" msgstr "(kein Zweig)" -#: builtin/branch.c:568 +#: builtin/branch.c:600 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" -#: builtin/branch.c:581 +#: builtin/branch.c:613 msgid "cannot rename the current branch while not on any." msgstr "" "Kann aktuellen Zweig nicht umbennen, solange du dich auf keinem befindest." -#: builtin/branch.c:591 +#: builtin/branch.c:623 #, c-format msgid "Invalid branch name: '%s'" msgstr "Ungültiger Zweig-Name: '%s'" -#: builtin/branch.c:606 +#: builtin/branch.c:638 msgid "Branch rename failed" msgstr "Umbenennung des Zweiges fehlgeschlagen" -#: builtin/branch.c:610 +#: builtin/branch.c:642 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "falsch benannten Zweig '%s' umbenannt" -#: builtin/branch.c:614 +#: builtin/branch.c:646 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "Zweig umbenannt zu %s, aber Zweigspitze (HEAD) ist nicht aktualisiert!" -#: builtin/branch.c:621 +#: builtin/branch.c:653 msgid "Branch is renamed, but update of config-file failed" msgstr "" "Zweig ist umbenannt, aber die Aktualisierung der Konfigurationsdatei ist " "fehlgeschlagen." -#: builtin/branch.c:636 +#: builtin/branch.c:668 #, c-format msgid "malformed object name %s" msgstr "Missgebildeter Objektname %s" -#: builtin/branch.c:660 +#: builtin/branch.c:692 #, c-format -msgid "could not write branch description template: %s\n" -msgstr "Konnte Beschreibungsvorlage für Zweig nicht schreiben: %s\n" +msgid "could not write branch description template: %s" +msgstr "Konnte Beschreibungsvorlage für Zweig nicht schreiben: %s" -#: builtin/branch.c:750 +#: builtin/branch.c:783 msgid "Failed to resolve HEAD as a valid ref." msgstr "Konnte Zweigspitze (HEAD) nicht als gültige Referenz auflösen." -#: builtin/branch.c:755 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "Zweigspitze (HEAD) wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:813 +#: builtin/branch.c:808 +msgid "--column and --verbose are incompatible" +msgstr "--column und --verbose sind inkompatibel" + +#: builtin/branch.c:857 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' machen mit einem Zweignamen keinen " @@ -1023,11 +1773,6 @@ msgstr "Pfad '%s': kann nicht zusammenführen" msgid "Unable to add merge result for '%s'" msgstr "Konnte Ergebnis der Zusammenführung von '%s' nicht hinzufügen." -#: builtin/checkout.c:212 builtin/reset.c:158 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" - #: builtin/checkout.c:234 builtin/checkout.c:392 msgid "corrupt index file" msgstr "beschädigte Bereitstellungsdatei" @@ -1128,71 +1873,71 @@ msgstr "" " git branch neuer_zweig_name %s\n" "\n" -#: builtin/checkout.c:693 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "interner Fehler im Revisionsgang" -#: builtin/checkout.c:697 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "Vorherige Position der Zweigspitze (HEAD) war" -#: builtin/checkout.c:723 +#: builtin/checkout.c:724 msgid "You are on a branch yet to be born" msgstr "du bist auf einem Zweig, der noch geboren wird" #. case (1) -#: builtin/checkout.c:854 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "Ungültige Referenz: %s" #. case (1): want a tree -#: builtin/checkout.c:893 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "Referenz ist kein Baum: %s" -#: builtin/checkout.c:973 +#: builtin/checkout.c:974 msgid "-B cannot be used with -b" msgstr "-B kann nicht mit -b benutzt werden" -#: builtin/checkout.c:982 +#: builtin/checkout.c:983 msgid "--patch is incompatible with all other options" msgstr "--patch ist inkompatibel mit allen anderen Optionen" -#: builtin/checkout.c:985 +#: builtin/checkout.c:986 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach kann nicht mit -b/-B/--orphan benutzt werden" -#: builtin/checkout.c:987 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -t" msgstr "--detach kann nicht mit -t benutzt werden" -#: builtin/checkout.c:993 +#: builtin/checkout.c:994 msgid "--track needs a branch name" msgstr "--track benötigt einen Zweignamen" -#: builtin/checkout.c:1000 +#: builtin/checkout.c:1001 msgid "Missing branch name; try -b" msgstr "Vermisse Zweignamen; versuche -b" -#: builtin/checkout.c:1006 +#: builtin/checkout.c:1007 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan und -b|-B sind gegenseitig exklusiv" -#: builtin/checkout.c:1008 +#: builtin/checkout.c:1009 msgid "--orphan cannot be used with -t" msgstr "--orphan kann nicht mit -t benutzt werden" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1019 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f und -m sind inkompatibel" -#: builtin/checkout.c:1052 +#: builtin/checkout.c:1053 msgid "invalid path specification" msgstr "ungültige Pfadspezifikation" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1061 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1203,17 +1948,17 @@ msgstr "" "Hast du beabsichtigt '%s' auszuchecken, welcher nicht als Version aufgelöst " "werden kann?" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1063 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "" "git checkout: Die Aktualisierung von Pfaden ist inkompatibel mit dem Wechsel " "von Zweigen." -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1068 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach nimmt kein Pfad-Argument" -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1071 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -1221,11 +1966,11 @@ msgstr "" "git checkout: --ours/--theirs, --force and --merge sind inkompatibel wenn\n" "du aus der Bereitstellung auscheckst." -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1090 msgid "Cannot switch branch to a non-commit." msgstr "Kann Zweig nur zu einer Version wechseln." -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1093 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs ist inkompatibel mit den Wechseln von Zweigen." @@ -1400,7 +2145,11 @@ msgstr "externer Zweig %s nicht im anderen Projektarchiv %s gefunden" msgid "You appear to have cloned an empty repository." msgstr "Du scheinst ein leeres Projektarchiv geklont zu haben." -#: builtin/commit.c:42 +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "Option --command muss zuerst angegeben werden" + +#: builtin/commit.c:43 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -1426,7 +2175,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:54 +#: builtin/commit.c:55 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" @@ -1436,7 +2185,7 @@ msgstr "" "machen. Du kannst Dein Kommando mit --allow-empty wiederholen, oder die\n" "Version mit \"git reset HEAD^\" vollständig entfernen.\n" -#: builtin/commit.c:59 +#: builtin/commit.c:60 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -1453,295 +2202,304 @@ msgstr "" "\n" "Andernfalls benutze bitte 'git reset'\n" -#: builtin/commit.c:205 builtin/reset.c:33 -msgid "merge" -msgstr "zusammenführen" - -#: builtin/commit.c:208 -msgid "cherry-pick" -msgstr "cherry-pick" - -#: builtin/commit.c:325 +#: builtin/commit.c:253 msgid "failed to unpack HEAD tree object" msgstr "Fehler beim Entpacken des Baum-Objektes der Zweigspitze (HEAD)." -#: builtin/commit.c:367 +#: builtin/commit.c:295 msgid "unable to create temporary index" msgstr "Konnte temporäre Bereitstellung nicht erstellen." -#: builtin/commit.c:373 +#: builtin/commit.c:301 msgid "interactive add failed" msgstr "interaktives Hinzufügen fehlgeschlagen" -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 msgid "unable to write new_index file" msgstr "Konnte new_index Datei nicht schreiben" -#: builtin/commit.c:457 -#, c-format -msgid "cannot do a partial commit during a %s." -msgstr "Kann keine partielle Eintragung durchführen, während %s im Gange ist." +#: builtin/commit.c:386 +msgid "cannot do a partial commit during a merge." +msgstr "" +"Kann keine partielle Eintragung durchführen, während eine Zusammenführung im " +"Gange ist." + +#: builtin/commit.c:388 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "" +"Kann keine partielle Eintragung durchführen, während \"cherry-pick\" im " +"Gange ist." -#: builtin/commit.c:466 +#: builtin/commit.c:398 msgid "cannot read the index" msgstr "Kann Bereitstellung nicht lesen" -#: builtin/commit.c:486 +#: builtin/commit.c:418 msgid "unable to write temporary index file" msgstr "Konnte temporäre Bereitstellungsdatei nicht schreiben." -#: builtin/commit.c:561 builtin/commit.c:567 +#: builtin/commit.c:493 builtin/commit.c:499 #, c-format msgid "invalid commit: %s" msgstr "Ungültige Version: %s" -#: builtin/commit.c:590 +#: builtin/commit.c:522 msgid "malformed --author parameter" msgstr "Fehlerhafter --author Parameter" -#: builtin/commit.c:651 +#: builtin/commit.c:582 #, c-format msgid "Malformed ident string: '%s'" msgstr "Fehlerhafte Identifikations-String: '%s'" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033 +#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 #, c-format msgid "could not lookup commit %s" msgstr "Konnte Version %s nicht nachschlagen" -#: builtin/commit.c:701 builtin/shortlog.c:296 +#: builtin/commit.c:632 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" -#: builtin/commit.c:703 +#: builtin/commit.c:634 msgid "could not read log from standard input" msgstr "Konnte Log nicht von Standard-Eingabe lesen." -#: builtin/commit.c:707 +#: builtin/commit.c:638 #, c-format msgid "could not read log file '%s'" msgstr "Konnte Log-Datei '%s' nicht lesen" -#: builtin/commit.c:713 +#: builtin/commit.c:644 msgid "commit has empty message" msgstr "Version hat eine leere Beschreibung" -#: builtin/commit.c:729 +#: builtin/commit.c:660 msgid "could not read MERGE_MSG" msgstr "Konnte MERGE_MSG nicht lesen" -#: builtin/commit.c:733 +#: builtin/commit.c:664 msgid "could not read SQUASH_MSG" msgstr "Konnte SQUASH_MSG nicht lesen" -#: builtin/commit.c:737 +#: builtin/commit.c:668 #, c-format msgid "could not read '%s'" msgstr "Konnte '%s' nicht lesen" -#: builtin/commit.c:765 -#, c-format -msgid "could not open '%s'" -msgstr "Konnte '%s' nicht öffnen" - -#: builtin/commit.c:789 +#: builtin/commit.c:720 msgid "could not write commit template" msgstr "Konnte Versionsvorlage nicht schreiben" -#: builtin/commit.c:799 +#: builtin/commit.c:731 #, c-format msgid "" "\n" -"It looks like you may be committing a %s.\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" -"Es sieht so aus, als trägst du ein '%s' ein.\n" +"Es sieht so aus, als trägst du eine Zusammenführung ein.\n" "Falls das nicht korrekt ist, entferne bitte die Datei\n" "\t%s\n" "und versuche es erneut.\n" -#: builtin/commit.c:812 -msgid "Please enter the commit message for your changes." -msgstr "Bitte gebe die Versionsbeschreibung für deine Änderungen ein." +#: builtin/commit.c:736 +#, 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" +"Es sieht so aus, als trägst du ein \"cherry-pick\" ein.\n" +"Falls das nicht korrekt ist, entferne bitte die Datei\n" +"\t%s\n" +"und versuche es erneut.\n" -#: builtin/commit.c:815 +#: builtin/commit.c:748 msgid "" -" Lines starting\n" +"Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -" Zeilen, die mit '#'\n" -"beginnen, werden ignoriert, und eine leere Versionsbeschreibung bricht die " -"Eintragung ab.\n" +"Bitte gebe eine Versionsbeschreibung für deine Änderungen ein. Zeilen,\n" +"die mit '#' beginnen, werden ignoriert, und eine leere Versionsbeschreibung\n" +"bricht die Eintragung ab.\n" -#: builtin/commit.c:820 +#: builtin/commit.c:753 msgid "" -" Lines starting\n" +"Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -" Zeilen, die mit '#'\n" -"beginnen, werden beibehalten; wenn du möchtest, kannst du diese entfernen.\n" +"Bitte gebe eine Versionsbeschreibung für deine Änderungen ein. Zeilen, die\n" +"mit '#' beginnen, werden beibehalten; wenn du möchtest, kannst du diese " +"entfernen.\n" "Eine leere Versionsbeschreibung bricht die Eintragung ab.\n" -#: builtin/commit.c:832 +#: builtin/commit.c:766 #, c-format msgid "%sAuthor: %s" msgstr "%sAutor: %s" -#: builtin/commit.c:839 +#: builtin/commit.c:773 #, c-format msgid "%sCommitter: %s" msgstr "%sEintragender: %s" -#: builtin/commit.c:859 +#: builtin/commit.c:793 msgid "Cannot read index" msgstr "Kann Bereitstellung nicht lesen" -#: builtin/commit.c:896 +#: builtin/commit.c:830 msgid "Error building trees" msgstr "Fehler beim Erzeugen der Zweige" -#: builtin/commit.c:911 builtin/tag.c:357 +#: builtin/commit.c:845 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "Bitte liefere die Beschreibung entweder mit der Option -m oder -F.\n" +msgstr "Bitte liefere eine Beschreibung entweder mit der Option -m oder -F.\n" -#: builtin/commit.c:1008 +#: builtin/commit.c:942 #, c-format msgid "No existing author found with '%s'" msgstr "Kein existierender Autor mit '%s' gefunden." -#: builtin/commit.c:1023 builtin/commit.c:1217 +#: builtin/commit.c:957 builtin/commit.c:1157 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" -#: builtin/commit.c:1063 +#: builtin/commit.c:997 msgid "Using both --reset-author and --author does not make sense" msgstr "Verwendung von --reset-author und --author macht keinen Sinn." -#: builtin/commit.c:1074 +#: builtin/commit.c:1008 msgid "You have nothing to amend." msgstr "Du hast nichts zum nachbessern." -#: builtin/commit.c:1076 -#, c-format -msgid "You are in the middle of a %s -- cannot amend." -msgstr "%s ist im Gange -- kann nicht nachbessern." +#: builtin/commit.c:1011 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "Eine Zusammenführung ist im Gange -- kann nicht nachbessern." + +#: builtin/commit.c:1013 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "\"cherry-pick\" ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1078 +#: builtin/commit.c:1016 msgid "Options --squash and --fixup cannot be used together" msgstr "" "Die Optionen --squash und --fixup können nicht gemeinsam benutzt werden." -#: builtin/commit.c:1088 +#: builtin/commit.c:1026 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "Nur eines von -c/-C/-F/--fixup kann benutzt werden." -#: builtin/commit.c:1090 +#: builtin/commit.c:1028 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden" -#: builtin/commit.c:1098 +#: builtin/commit.c:1036 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset--author kann nur mit -C, -c oder --amend benutzt werden" -#: builtin/commit.c:1115 +#: builtin/commit.c:1053 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" "Nur eines von --include/--only/--all/--interactive/--patch kann benutzt " "werden." -#: builtin/commit.c:1117 +#: builtin/commit.c:1055 msgid "No paths with --include/--only does not make sense." msgstr "--include/--only machen ohne Pfade keinen Sinn." -#: builtin/commit.c:1119 +#: builtin/commit.c:1057 msgid "Clever... amending the last one with dirty index." msgstr "" "Klug... die letzte Version mit einer unsauberen Bereitstellung nachbessern." -#: builtin/commit.c:1121 +#: builtin/commit.c:1059 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" "Explizite Pfade ohne -i oder -o angegeben; unter der Annahme von --only " "Pfaden..." -#: builtin/commit.c:1131 builtin/tag.c:556 +#: builtin/commit.c:1069 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1136 +#: builtin/commit.c:1074 msgid "Paths with -a does not make sense." msgstr "Pfade mit -a machen keinen Sinn." -#: builtin/commit.c:1315 +#: builtin/commit.c:1257 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellte Version nicht nachschlagen." -#: builtin/commit.c:1317 +#: builtin/commit.c:1259 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellte Version nicht analysieren." -#: builtin/commit.c:1358 +#: builtin/commit.c:1300 msgid "detached HEAD" msgstr "losgelöste Zweigspitze (HEAD)" -#: builtin/commit.c:1360 +#: builtin/commit.c:1302 msgid " (root-commit)" msgstr " (Basis-Version)" -#: builtin/commit.c:1450 +#: builtin/commit.c:1446 msgid "could not parse HEAD commit" msgstr "Konnte Version der Zweigspitze (HEAD) nicht analysieren." -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1484 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1494 +#: builtin/commit.c:1491 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1498 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1520 +#: builtin/commit.c:1517 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Versionsbeschreibung nicht lesen: %s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Eintragung abgebrochen; du hast die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1536 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Eintragung aufgrund leerer Versionsbeschreibung abgebrochen.\n" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Versionsobjektes." -#: builtin/commit.c:1575 +#: builtin/commit.c:1572 msgid "cannot lock HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht sperren." -#: builtin/commit.c:1579 +#: builtin/commit.c:1576 msgid "cannot update HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht aktualisieren." -#: builtin/commit.c:1590 +#: builtin/commit.c:1587 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -1950,19 +2708,19 @@ msgstr "" #: builtin/fetch.c:549 #, c-format -msgid " (%s will become dangling)\n" -msgstr " (%s wird unreferenziert)\n" +msgid " (%s will become dangling)" +msgstr " (%s wird unreferenziert)" #: builtin/fetch.c:550 #, c-format -msgid " (%s has become dangling)\n" -msgstr " (%s wurde unreferenziert)\n" +msgid " (%s has become dangling)" +msgstr " (%s wurde unreferenziert)" #: builtin/fetch.c:557 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:558 +#: builtin/fetch.c:558 builtin/remote.c:1055 msgid "(none)" msgstr "(nichts)" @@ -1970,8 +2728,8 @@ msgstr "(nichts)" #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -"Das Anfordern in den aktuellen Zweig %s von einem nicht-bloßen" -"\"Projektarchiv wurde verweigert." +"Das Anfordern in den aktuellen Zweig %s von einem nicht-bloßen Projektarchiv " +"wurde verweigert." #: builtin/fetch.c:709 #, c-format @@ -1993,7 +2751,7 @@ msgstr "Option \"%s\" wird ignoriert für %s\n" msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:890 +#: builtin/fetch.c:890 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" @@ -2027,8 +2785,8 @@ msgstr "Kein externes Archiv (einzeln oder Gruppe): %s" #: builtin/fetch.c:1000 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -"Abholen einer Gruppe und Spezifizieren von Referenzspezifikationen macht " -"keinen Sinn." +"Abholen einer Gruppe mit Angabe von Referenzspezifikationen macht keinen " +"Sinn." #: builtin/gc.c:63 #, c-format @@ -2054,8 +2812,8 @@ msgid "" "run \"git gc\" manually. See \"git help gc\" for more information.\n" msgstr "" "Die Datenbank des Projektarchivs wird für eine optimale Performance\n" -"komprimiert. Du kannst auch \"git gc\" manuell ausführen. Siehe \"git help gc" -"\" für weitere Informationen.\n" +"komprimiert. Du kannst auch \"git gc\" manuell ausführen.\n" +"Siehe \"git help gc\" für weitere Informationen.\n" #: builtin/gc.c:251 msgid "" @@ -2082,7 +2840,7 @@ msgstr "konnte Zweig (%s) nicht lesen" #: builtin/grep.c:526 #, c-format msgid "unable to grep from object of type %s" -msgstr "kann \"grep\" nicht mit Objekten des Typs \"%s\" durchführen" +msgstr "kann \"grep\" nicht mit Objekten des Typs %s durchführen" #: builtin/grep.c:584 #, c-format @@ -2094,40 +2852,345 @@ msgstr "Schalter '%c' erwartet einen numerischen Wert" msgid "cannot open '%s'" msgstr "kann '%s' nicht öffnen" -#: builtin/grep.c:888 +#: builtin/grep.c:885 msgid "no pattern given." -msgstr "keine Muster gegeben" +msgstr "keine Muster angegeben" -#: builtin/grep.c:902 +#: builtin/grep.c:899 #, c-format msgid "bad object %s" msgstr "ungültiges Objekt %s" -#: builtin/grep.c:943 +#: builtin/grep.c:940 msgid "--open-files-in-pager only works on the worktree" -msgstr "--open-files-in-pager arbeitet nur auf dem Arbeitsbaum" +msgstr "--open-files-in-pager arbeitet nur innerhalb des Arbeitsbaums" -#: builtin/grep.c:966 +#: builtin/grep.c:963 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached oder --untracked kann nicht mit --no-index benutzt werden" -#: builtin/grep.c:971 +#: builtin/grep.c:968 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index oder --untracked kann nicht mit Revisionen benutzt werden" +msgstr "--no-index oder --untracked kann nicht mit Versionen benutzt werden" -#: builtin/grep.c:974 +#: builtin/grep.c:971 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" "--[no-]exlude-standard kann nicht mit beobachteten Inhalten benutzt werden" -#: builtin/grep.c:982 +#: builtin/grep.c:979 msgid "both --cached and trees are given." msgstr "sowohl --cached als auch Zweige gegeben" +#: builtin/help.c:59 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "nicht erkanntes Hilfeformat: %s" + +#: builtin/help.c:87 +msgid "Failed to start emacsclient." +msgstr "Konnte emacsclient nicht starten." + +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." +msgstr "Konnte Version des emacsclient nicht parsen." + +#: builtin/help.c:108 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "Version des emacsclient '%d' ist zu alt (< 22)." + +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "Fehler beim Ausführen von '%s': %s" + +#: builtin/help.c:211 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" +"Du könntest stattdessen 'man.<Werkzeug>.cmd' benutzen." + +#: builtin/help.c:223 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"'%s': Kommando für unterstützten Handbuchbetrachter.\n" +"Du könntest stattdessen 'man.<Werkzeug>.path' benutzen." + +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" +msgstr "Die allgemein verwendeten Git-Kommandos sind:" + +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': unbekannter Handbuch-Betrachter." + +#: builtin/help.c:372 +msgid "no man viewer handled the request" +msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" + +#: builtin/help.c:380 +msgid "no info viewer handled the request" +msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" + +#: builtin/help.c:391 +#, c-format +msgid "'%s': not a documentation directory." +msgstr "'%s' ist kein Dokumentationsverzeichnis" + +#: builtin/help.c:432 builtin/help.c:439 +#, c-format +msgid "usage: %s%s" +msgstr "Verwendung: %s%s" + +#: builtin/help.c:453 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "für `git %s' wurde der Alias `%s' angelegt" + +#: builtin/index-pack.c:169 +#, c-format +msgid "object type mismatch at %s" +msgstr "Objekt-Typen passen bei %s nicht zusammen" + +#: builtin/index-pack.c:189 +msgid "object of unexpected type" +msgstr "Objekt hat unerwarteten Typ" + +#: builtin/index-pack.c:226 +#, 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:236 +msgid "early EOF" +msgstr "zu frühes Dateiende" + +#: builtin/index-pack.c:237 +msgid "read error on input" +msgstr "Fehler beim Lesen der Eingabe" + +#: builtin/index-pack.c:249 +msgid "used more bytes than were available" +msgstr "verwendete mehr Bytes als verfügbar waren" + +#: builtin/index-pack.c:256 +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:272 +#, c-format +msgid "unable to create '%s'" +msgstr "konnte '%s' nicht erstellen" + +#: builtin/index-pack.c:277 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "Kann Paketdatei '%s' nicht öffnen" + +#: builtin/index-pack.c:291 +msgid "pack signature mismatch" +msgstr "Paketsignatur stimmt nicht überein" + +#: builtin/index-pack.c:311 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "Paket hat ein ungültiges Objekt bei Versatz %lu: %s" + +#: builtin/index-pack.c:405 +#, c-format +msgid "inflate returned %d" +msgstr "Dekomprimierung gab %d zurück" + +#: builtin/index-pack.c:450 +msgid "offset value overflow for delta base object" +msgstr "Wert für Versatz bei Differenzobjekt übergelaufen" + +#: builtin/index-pack.c:458 +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:466 +#, c-format +msgid "unknown object type %d" +msgstr "Unbekannter Objekt-Typ %d" + +#: builtin/index-pack.c:495 +msgid "cannot pread pack file" +msgstr "Kann Paketdatei %s nicht lesen" + +#: builtin/index-pack.c:497 +#, c-format +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "frühzeitiges Ende der Paketdatei, vermisse %lu Byte" +msgstr[1] "frühzeitiges Ende der Paketdatei, vermisse %lu Bytes" + +#: builtin/index-pack.c:510 +msgid "serious inflate inconsistency" +msgstr "ernsthafte Inkonsistenz nach Dekomprimierung" + +#: builtin/index-pack.c:583 +#, c-format +msgid "cannot read existing object %s" +msgstr "Kann existierendes Objekt %s nicht lesen." + +#: builtin/index-pack.c:586 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "SHA1 KOLLISION MIT %s GEFUNDEN !" + +#: builtin/index-pack.c:598 +#, c-format +msgid "invalid blob object %s" +msgstr "ungültiges Blob-Objekt %s" + +#: builtin/index-pack.c:610 +#, c-format +msgid "invalid %s" +msgstr "Ungültiger Objekt-Typ %s" + +#: builtin/index-pack.c:612 +msgid "Error in object" +msgstr "Fehler in Objekt" + +#: builtin/index-pack.c:614 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Nicht alle Kind-Objekte von %s sind erreichbar" + +#: builtin/index-pack.c:687 builtin/index-pack.c:713 +msgid "failed to apply delta" +msgstr "Konnte Dateiunterschied nicht anwenden" + +#: builtin/index-pack.c:850 +msgid "Receiving objects" +msgstr "Empfange Objekte" + +#: builtin/index-pack.c:850 +msgid "Indexing objects" +msgstr "Indiziere Objekte" + +#: builtin/index-pack.c:872 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "Paket ist beschädigt (SHA1 unterschiedlich)" + +#: builtin/index-pack.c:877 +msgid "cannot fstat packfile" +msgstr "kann Paketdatei nicht lesen" + +#: builtin/index-pack.c:880 +msgid "pack has junk at the end" +msgstr "Paketende enthält nicht verwendbaren Inhalt" + +#: builtin/index-pack.c:903 +msgid "Resolving deltas" +msgstr "Löse Unterschiede auf" + +#: builtin/index-pack.c:954 +msgid "confusion beyond insanity" +msgstr "Fehler beim Auflösen der Unterschiede" + +#: builtin/index-pack.c:973 +#, 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:998 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "Konnte angehängtes Objekt (%d) nicht komprimieren" + +#: builtin/index-pack.c:1077 +#, c-format +msgid "local object %s is corrupt" +msgstr "lokales Objekt %s ist beschädigt" + +#: builtin/index-pack.c:1101 +msgid "error while closing pack file" +msgstr "Fehler beim Schließen der Paketdatei" + +#: builtin/index-pack.c:1114 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "Kann Paketbeschreibungsdatei '%s' nicht schreiben" + +#: builtin/index-pack.c:1122 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "Kann eben erstellte Paketbeschreibungsdatei '%s' nicht schließen" + +#: builtin/index-pack.c:1135 +msgid "cannot store pack file" +msgstr "Kann Paketdatei nicht speichern" + +#: builtin/index-pack.c:1146 +msgid "cannot store index file" +msgstr "Kann Indexdatei nicht speichern" + +#: builtin/index-pack.c:1247 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Kann existierende Paketdatei '%s' nicht öffnen" + +#: builtin/index-pack.c:1249 +#, 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:1296 +#, 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:1303 +#, 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:1330 +msgid "Cannot come back to cwd" +msgstr "Kann nicht zurück zu Arbeitsverzeichnis wechseln" + +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393 +#, c-format +msgid "bad %s" +msgstr "%s ist ungültig" + +#: builtin/index-pack.c:1407 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin kann nicht ohne --stdin benutzt werden" + +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" + +#: builtin/index-pack.c:1430 +msgid "--verify with no packfile name given" +msgstr "--verify ohne Name der Paketdatei angegeben" + #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" -msgstr "Konnte %s nicht schreibbar für Gruppen machen" +msgstr "Konnte Gruppenschreibrecht für %s nicht setzen." #: builtin/init-db.c:62 #, c-format @@ -2152,7 +3215,7 @@ msgstr "kann Verzeichnis '%s' nicht öffnen" #: builtin/init-db.c:97 #, c-format msgid "cannot readlink '%s'" -msgstr "kann Verknüfpung '%s' nicht lesen" +msgstr "kann Verknüpfung '%s' nicht lesen" #: builtin/init-db.c:99 #, c-format @@ -2192,7 +3255,7 @@ msgstr "kopiere keine Vorlagen mit einer falschen Formatversion %d von '%s'" #: builtin/init-db.c:192 #, c-format msgid "insane git directory %s" -msgstr "ungültiges git Verzeichnis %s" +msgstr "ungültiges Git-Verzeichnis %s" #: builtin/init-db.c:322 builtin/init-db.c:325 #, c-format @@ -2234,11 +3297,11 @@ msgstr "Initialisierte leeres" #: builtin/init-db.c:421 msgid " shared" -msgstr " geteiltes" +msgstr " gemeinsames" #: builtin/init-db.c:440 msgid "cannot tell cwd" -msgstr "kann aktuelles Verzeichnis nicht bestimmen" +msgstr "kann aktuelles Arbeitsverzeichnis nicht ermitteln" #: builtin/init-db.c:521 builtin/init-db.c:528 #, c-format @@ -2287,84 +3350,75 @@ msgstr "Unbekannter Typ: %d" msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:675 +#: builtin/log.c:676 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:686 +#: builtin/log.c:687 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:700 +#: builtin/log.c:701 msgid "Need exactly one range." msgstr "Brauche genau einen Versionsbereich." -#: builtin/log.c:708 +#: builtin/log.c:709 msgid "Not a range." msgstr "Kein Versionsbereich." -#: builtin/log.c:745 -msgid "Could not extract email from committer identity." -msgstr "Konnte E-Mail-Adresse des Einreichers nicht extrahieren." - -#: builtin/log.c:791 +#: builtin/log.c:786 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:885 +#: builtin/log.c:859 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:958 +#: builtin/log.c:932 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1179 +#: builtin/log.c:1153 #, c-format msgid "bogus committer info %s" msgstr "unechte Einreicher-Informationen %s" -#: builtin/log.c:1224 +#: builtin/log.c:1198 msgid "-n and -k are mutually exclusive." msgstr "-n und -k schliessen sich gegenseitig aus" -#: builtin/log.c:1226 +#: builtin/log.c:1200 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix und -k schliessen sich gegenseitig aus" -#: builtin/log.c:1231 builtin/shortlog.c:284 -#, c-format -msgid "unrecognized argument: %s" -msgstr "nicht erkanntes Argument: %s" - -#: builtin/log.c:1234 +#: builtin/log.c:1208 msgid "--name-only does not make sense" msgstr "--name-only macht keinen Sinn" -#: builtin/log.c:1236 +#: builtin/log.c:1210 msgid "--name-status does not make sense" msgstr "--name-status macht keinen Sinn" -#: builtin/log.c:1238 +#: builtin/log.c:1212 msgid "--check does not make sense" msgstr "--check macht keinen Sinn" -#: builtin/log.c:1261 +#: builtin/log.c:1235 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1263 +#: builtin/log.c:1237 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1416 +#: builtin/log.c:1390 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1520 +#: builtin/log.c:1494 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -2372,7 +3426,7 @@ msgstr "" "Konnte gefolgten, externen Zweig nicht finden, bitte gebe <upstream> manuell " "an.\n" -#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524 #, c-format msgid "Unknown commit %s" msgstr "Unbekannte Version %s" @@ -2708,7 +3762,7 @@ msgstr "%s, Quelle=%s, Ziel=%s" msgid "Renaming %s to %s\n" msgstr "Benenne %s nach %s um\n" -#: builtin/mv.c:215 +#: builtin/mv.c:215 builtin/remote.c:731 #, c-format msgid "renaming '%s' failed" msgstr "Umbenennung von '%s' fehlgeschlagen" @@ -2732,7 +3786,7 @@ msgstr "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen. msgid "failed to finish 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht abschließen" -#: builtin/notes.c:175 builtin/tag.c:343 +#: builtin/notes.c:175 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" @@ -2755,12 +3809,12 @@ msgstr "Konnte Notiz-Objekt nicht schreiben" msgid "The note contents has been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen" -#: builtin/notes.c:251 builtin/tag.c:521 +#: builtin/notes.c:251 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:253 builtin/tag.c:524 +#: builtin/notes.c:253 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" @@ -2768,7 +3822,7 @@ msgstr "konnte '%s' nicht öffnen oder lesen" #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." @@ -2867,27 +3921,27 @@ msgstr "" msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:1103 +#: builtin/notes.c:1103 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekanntes Unterkommando: %s" -#: builtin/pack-objects.c:2315 +#: builtin/pack-objects.c:2337 #, c-format msgid "unsupported index version %s" msgstr "Nicht unterstützte Bereitstellungsversion %s" -#: builtin/pack-objects.c:2319 +#: builtin/pack-objects.c:2341 #, c-format msgid "bad index version '%s'" msgstr "Ungültige Bereitstellungsversion '%s'" -#: builtin/pack-objects.c:2342 +#: builtin/pack-objects.c:2364 #, c-format msgid "option %s does not accept negative form" msgstr "Option %s akzeptiert keine negative Form" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2368 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "konnte Wert '%s' für Option %s nicht parsen" @@ -2900,7 +3954,42 @@ msgstr "Kurzschrift für Markierung ohne <Markierung>" msgid "--delete only accepts plain target ref names" msgstr "--delete akzeptiert nur reine Referenz-Namen als Ziel" -#: builtin/push.c:84 +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"Um eine Variante permanent zu verwenden, siehe push.default in 'git help " +"config'." + +#: builtin/push.c:102 +#, 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 "" +"Der Name des externen Übernahmezweiges stimmt nicht mit dem Namen deines\n" +"aktuellen Zweiges überein. Um auf den Übernahmezweig in dem externen\n" +"Projektarchiv zu versenden, benutze:\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"Um auf den Zweig mit dem selben Namen in dem externen Projekarchiv\n" +"zu versenden, benutze:\n" +"\n" +" git push %s %s\n" +"%s" + +#: builtin/push.c:121 #, c-format msgid "" "You are not currently on a branch.\n" @@ -2915,7 +4004,7 @@ msgstr "" "\n" " git push %s HEAD:<Name-des-externen-Zweiges>\n" -#: builtin/push.c:91 +#: builtin/push.c:128 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -2929,12 +4018,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:99 +#: builtin/push.c:136 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "Der aktuelle Zweig %s hat mehrere externe Zweige, Versand verweigert." -#: builtin/push.c:102 +#: builtin/push.c:139 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -2945,14 +4034,14 @@ msgstr "" "aktuellen Zweiges '%s' ist, ohne mir mitzuteilen, was ich versenden\n" "soll, um welchen externen Zweig zu aktualisieren." -#: builtin/push.c:131 +#: builtin/push.c:174 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "" -"Du hast keine Referenzspezifikationen zum Versenden angegeben, und " -"push.default ist \"nothing\"." +"Du hast keine Referenzspezifikationen zum Versenden angegeben, und push." +"default ist \"nothing\"." -#: builtin/push.c:138 +#: builtin/push.c:181 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -2962,10 +4051,10 @@ msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze deines aktuellen\n" "Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Führe die\n" "externen Änderungen zusammen (z.B. 'git pull') bevor du erneut versendest.\n" -"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help' für\n" -"weitere Details." +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" +"für weitere Details." -#: builtin/push.c:144 +#: builtin/push.c:187 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -2974,11 +4063,13 @@ msgid "" msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" "Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn du nicht\n" -"beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu versendenden\n" -"Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu 'current'\n" +"beabsichtigt hast, diesen Zweig zu versenden, kannst du auch den zu " +"versendenden\n" +"Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu " +"'current'\n" "oder 'upstream' setzen, um nur den aktuellen Zweig zu versenden." -#: builtin/push.c:150 +#: builtin/push.c:193 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -2992,22 +4083,22 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:190 +#: builtin/push.c:233 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:194 +#: builtin/push.c:237 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:226 +#: builtin/push.c:269 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Projektarchiv '%s'" -#: builtin/push.c:227 +#: builtin/push.c:270 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -3029,34 +4120,395 @@ msgstr "" "\n" " git push <Name>\n" -#: builtin/push.c:242 +#: builtin/push.c:285 msgid "--all and --tags are incompatible" msgstr "--all und --tags sind inkompatibel" -#: builtin/push.c:243 +#: builtin/push.c:286 msgid "--all can't be combined with refspecs" msgstr "--all kann nicht mit Referenzspezifikationen kombiniert werden" -#: builtin/push.c:248 +#: builtin/push.c:291 msgid "--mirror and --tags are incompatible" msgstr "--mirror und --tags sind inkompatibel" -#: builtin/push.c:249 +#: builtin/push.c:292 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kann nicht mit Referenzspezifikationen kombiniert werden" -#: builtin/push.c:254 +#: builtin/push.c:297 msgid "--all and --mirror are incompatible" msgstr "--all und --mirror sind inkompatibel" -#: builtin/push.c:334 +#: builtin/push.c:385 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" -#: builtin/push.c:336 +#: builtin/push.c:387 msgid "--delete doesn't make sense without any refs" msgstr "--delete macht ohne irgendeine Referenz keinen Sinn" +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Aktualisiere %s" + +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"--mirror ist gefährlich und veraltet; bitte\n" +"\t benutze stattdessen --mirror=fetch oder --mirror=push" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "unbekanntes Argument für Option --mirror: %s" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "Angabe eines Hauptzweiges macht mit --mirror keinen Sinn" + +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "" +"die Angabe von zu folgenden Zweigen macht nur mit dem Abholen von " +"Spiegelarchiven Sinn" + +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "externes Projektarchiv %s existiert bereits" + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' ist kein gültiger Name für ein externes Projektarchiv" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Konnte symbolische Referenz für Hauptzweig von '%s' nicht einrichten" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "mehr als ein %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Konnte Abholungszuordnung für Referenzspezifikation %s nicht bekommen" + +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" +msgstr "(übereinstimmend)" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(lösche)" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Konnte '%s' nicht an '%s' anhängen." + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Kein solches externes Archiv: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Konnte Sektion '%s' in Konfiguration nicht nach '%s' umbenennen" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Konnte Sektion '%s' nicht aus Konfiguration entfernen" + +#: builtin/remote.c:677 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" +"Keine Aktualisierung der nicht standardmäßigen Referenzspezifikation zum " +"Abholen\n" +"\t%s\n" +"\tBitte aktualisiere, falls notwendig, die Konfiguration manuell." + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "Konnte '%s' nicht anhängen." + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Konnte '%s' nicht setzen" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "Konnte '%s' nicht löschen" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "Konnte '%s' nicht erstellen" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Konnte Zweig %s nicht entfernen" + +#: builtin/remote.c:834 +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] "" +"Hinweis: Ein Zweig außerhalb der /refs/remotes/ Hierachie wurde nicht " +"entfernt;\n" +"um diesen zu entfernen, benutze:" +msgstr[1] "" +"Hinweis: Einige Zweige außer der /refs/remotes/ Hierarchie wurden nicht " +"entfernt;\n" +"um diese zu entfernen, benutze:" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " neu (wird bei nächster Abholung in remotes/%s gespeichert)" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr " gefolgt" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " veraltet (benutze 'git remote prune' zum Entfernen)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "ungültiges branch.%s.merge; kann nicht auf > 1 Zweig neu aufbauen" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "baut neu auf externen Zweig %s auf" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " führt mit externem Zweig %s zusammen" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " und mit externem Zweig" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "führt mit externem Zweig %s zusammen" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " und mit externem Zweig" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "erstellt" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "gelöscht" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "aktuell" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "vorspulbar" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "lokal nicht aktuell" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s erzwingt Versandt nach %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s versendet nach %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s erzwingt Versand nach %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s versendet nach %s" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* externes Projektarchiv %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL zum Abholen: %s" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(keine URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " URL zum Versenden: %s" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " Hauptzweig: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" Hauptzweig (externer Hauptzweig ist mehrdeutig, könnte einer der folgenden " +"sein):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " externer Zweig:%s" +msgstr[1] " externe Zweige:%s" + +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" +msgstr " (Zustand nicht abgefragt)" + +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Lokaler Zweig konfiguriert für 'git pull':" +msgstr[1] " Lokale Zweige konfiguriert für 'git pull':" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr " Lokale Referenzen werden von 'git push' gespiegelt" + +#: builtin/remote.c:1178 +#, 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:1216 +msgid "Cannot determine remote HEAD" +msgstr "Kann Hauptzweig des externen Projektarchivs nicht bestimmen" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "" +"Mehrere Hauptzweige im externen Projektarchiv. Bitte wähle explizit einen " +"aus mit:" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "Konnte %s nicht entfernen" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "keine gültige Referenz: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Konnte %s nicht einrichten" + +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s wird unreferenziert!" + +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s wurde unreferenziert!" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "entferne veraltete Zweige von %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [würde veralteten Zweig entfernen] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr "* [veralteten Zweig entfernt] %s" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Kein solches externes Projektarchiv '%s'" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "kein externes Projektarchiv angegeben" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete macht keinen Sinn" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "ungültiges altes URL Format: %s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "Keine solche URL gefunden: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "Werde keine URLs entfernen, die nicht für den Versand bestimmt sind" + #: builtin/reset.c:33 msgid "mixed" msgstr "mixed" @@ -3070,6 +4522,10 @@ msgid "hard" msgstr "hard" #: builtin/reset.c:33 +msgid "merge" +msgstr "zusammenführen" + +#: builtin/reset.c:33 msgid "keep" msgstr "keep" @@ -3144,15 +4600,15 @@ msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen." msgid "%s: %s cannot be used with %s" msgstr "%s: %s kann nicht mit %s benutzt werden" -#: builtin/revert.c:127 +#: builtin/revert.c:131 msgid "program error" msgstr "Programmfehler" -#: builtin/revert.c:213 +#: builtin/revert.c:221 msgid "revert failed" msgstr "\"revert\" fehlgeschlagen" -#: builtin/revert.c:228 +#: builtin/revert.c:236 msgid "cherry-pick failed" msgstr "\"cherry-pick\" fehlgeschlagen" @@ -3200,32 +4656,32 @@ msgstr "git rm: konnte %s nicht entfernen" msgid "Missing author: %s" msgstr "fehlender Autor: %s" -#: builtin/tag.c:58 +#: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" msgstr "fehlerhaftes Objekt bei '%s'" -#: builtin/tag.c:205 +#: builtin/tag.c:207 #, c-format msgid "tag name too long: %.*s..." msgstr "Markierungsname zu lang: %.*s..." -#: builtin/tag.c:210 +#: builtin/tag.c:212 #, c-format msgid "tag '%s' not found." msgstr "Markierung '%s' nicht gefunden." -#: builtin/tag.c:225 +#: builtin/tag.c:227 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "Gelöschte Markierung '%s' (war %s)\n" -#: builtin/tag.c:237 +#: builtin/tag.c:239 #, c-format msgid "could not verify the tag '%s'" msgstr "Konnte Markierung '%s' nicht verifizieren" -#: builtin/tag.c:247 +#: builtin/tag.c:249 msgid "" "\n" "#\n" @@ -3239,7 +4695,7 @@ msgstr "" "# Zeilen, die mit '#' beginnen, werden ignoriert.\n" "#\n" -#: builtin/tag.c:254 +#: builtin/tag.c:256 msgid "" "\n" "#\n" @@ -3255,89 +4711,250 @@ msgstr "" "# selbst entfernen wenn du möchtest.\n" "#\n" -#: builtin/tag.c:294 +#: builtin/tag.c:298 msgid "unable to sign the tag" msgstr "konnte Markierung nicht signieren" -#: builtin/tag.c:296 +#: builtin/tag.c:300 msgid "unable to write tag file" msgstr "konnte Markierungsdatei nicht schreiben" -#: builtin/tag.c:321 +#: builtin/tag.c:325 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:334 +#: builtin/tag.c:338 msgid "tag header too big." msgstr "Markierungskopf zu groß." -#: builtin/tag.c:366 +#: builtin/tag.c:370 msgid "no tag message?" msgstr "keine Markierungsbeschreibung?" -#: builtin/tag.c:372 +#: builtin/tag.c:376 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Markierungsbeschreibung wurde gelassen in %s\n" -#: builtin/tag.c:421 +#: builtin/tag.c:425 msgid "switch 'points-at' requires an object" msgstr "Option 'points-at' erfordert ein Objekt" -#: builtin/tag.c:423 +#: builtin/tag.c:427 #, c-format msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: builtin/tag.c:502 +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column und -n sind inkompatibel" + +#: builtin/tag.c:523 msgid "-n option is only allowed with -l." msgstr "-n Option ist nur erlaubt mit -l." -#: builtin/tag.c:504 +#: builtin/tag.c:525 msgid "--contains option is only allowed with -l." msgstr "--contains Option ist nur erlaubt mit -l." -#: builtin/tag.c:506 +#: builtin/tag.c:527 msgid "--points-at option is only allowed with -l." msgstr "--points-at Option ist nur erlaubt mit -l." -#: builtin/tag.c:514 +#: builtin/tag.c:535 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:534 +#: builtin/tag.c:555 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:540 +#: builtin/tag.c:561 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Markierungsname." -#: builtin/tag.c:545 +#: builtin/tag.c:566 #, c-format msgid "tag '%s' already exists" msgstr "Markierung '%s' existiert bereits" -#: builtin/tag.c:563 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kann Referenz nicht sperren" -#: builtin/tag.c:565 +#: builtin/tag.c:586 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kann Referenz nicht aktualisieren" -#: builtin/tag.c:567 +#: builtin/tag.c:588 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Aktualisierte Markierung '%s' (war %s)\n" +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Siehe 'git help <Kommando>' für weitere Informationen zu einem spezifischen " +"Kommando" + +#: parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "Anzahl" + +#: parse-options.h:141 +msgid "time" +msgstr "Zeit" + +#: parse-options.h:149 +msgid "file" +msgstr "Datei" + +#: parse-options.h:151 +msgid "when" +msgstr "wann" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "Kein Effekt (Rückwärtskompatibilität)" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "erweiterte Ausgaben" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "weniger Ausgaben" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "stellt Dateiinhalte zur Eintragung bereit" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "" +"Findet über eine Binärsuche die Änderungen, die einen Fehler verursacht haben" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Zeigt an, erstellt oder entfernt Zweige" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "Checkt Zweige oder Pfade im Arbeitszweig aus" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Klont ein Projektarchiv in einem neuen Verzeichnis" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Trägt Änderungen in das Projektarchiv ein" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Zeigt Änderungen zwischen Versionen, Version und Arbeitszweig, etc. an" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Lädt Objekte und Referenzen von einem anderen Projektarchiv herunter" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "Stellt Zeilen dar, die einem Muster entsprechen" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "" +"Erstellt ein leeres Git-Projektarchiv oder initialisiert ein bestehendes neu" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "Zeigt Versionshistorie an" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Führt zwei oder mehr Entwicklungszweige zusammen" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "" +"Verschiebt oder benennt eine Datei, ein Verzeichnis, oder eine symbolische " +"Verknüpfung um" + +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "" +"Fordert Objekte von einem externen Projektarchiv an und führt sie mit einem " +"anderen Projektarchiv oder einem lokalen Zweig zusammen" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Aktualisiert externe Referenzen mitsamt den verbundenen Objekten" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "Baut lokale Versionen auf einem aktuellerem externen Zweig neu auf" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "" +"Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand zurück" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "Löscht Dateien im Arbeitszweig und von der Bereitstellung" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Zeigt verschiedene Arten von Objekten an" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "Zeigt den Zustand des Arbeitszweiges an" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "" +"Erzeugt, listet auf, löscht oder verifiziert ein mit GPG signiertes " +"Markierungsobjekt" + #: git-am.sh:50 msgid "You need to set your committer info first" msgstr "Du musst zuerst die Informationen des Eintragenden setzen." +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Du scheinst seit dem letzten gescheiterten 'am' die Zweigspitze (HEAD)\n" +"geändert zu haben.\n" +"Keine Zurücksetzung zu ORIG_HEAD." + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"Wenn du das Problem aufgelöst hast, führe \"$cmdline --resolved\" aus.\n" +"Falls du diesen Patch auslassen möchtest, führe stattdessen " +"\"$cmdline --skip\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der Patches\n" +"abzubrechen, führe \"$cmdline --abort\" aus." + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "Kann nicht zu 3-Wege-Zusammenführung zurückfallen." + #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" @@ -3394,12 +5011,33 @@ msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" "Unsaubere Bereitstellung: kann Patches nicht anwenden (unsauber: $files)" +#: git-am.sh:671 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"Patch ist leer. Wurde er falsch aufgeteilt?\n" +"Wenn du diesen Patch auslassen möchtest, führe stattdessen " +"\"$cmdline --skip\" aus.\n" +"Um den ursprünglichen Zweig wiederherzustellen und die Anwendung der Patches\n" +"abzubrechen, führe \"$cmdline --abort\" aus." + +#: git-am.sh:708 +msgid "Patch does not have a valid e-mail address." +msgstr "Patch enthält keine gültige eMail-Adresse." + #: git-am.sh:755 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." +#: git-am.sh:759 +msgid "Commit Body is:" +msgstr "Beschreibung der Eintragung ist:" + #. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] #. in your translation. The program will only accept English #. input at this point. @@ -3412,14 +5050,42 @@ msgstr "Anwenden? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgid "Applying: $FIRSTLINE" msgstr "Wende an: $FIRSTLINE" +#: git-am.sh:823 +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 "" +"Keine Änderungen - hast du vergessen 'git add' zu benutzen?\n" +"Wenn keine Änderungen mehr zum Bereitstellen vorhanden sind, könnten\n" +"diese bereits anderweitig eingefügt worden sein; du könntest diesen Patch\n" +"auslassen." + +#: git-am.sh:831 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"Du hast immer noch nicht zusammengeführte Pfade in der Bereitstellung.\n" +"Hast du vergessen 'git add' zu benutzen?" + #: git-am.sh:847 msgid "No changes -- Patch already applied." msgstr "Keine Änderungen -- Patches bereits angewendet." +#: git-am.sh:857 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Anwendung des Patches fehlgeschlagen bei $msgnum $FIRSTLINE" + #: git-am.sh:873 msgid "applying to an empty history" msgstr "wende zu leerer Historie an" +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Du musst mit \"git bisect start\" beginnen." + #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. @@ -3480,6 +5146,12 @@ msgstr "Ungültige Referenz-Eingabe: $rev" msgid "'git bisect bad' can take only one argument." msgstr "'git bisect bad' kann nur ein Argument entgegennehmen." +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:273 +msgid "Warning: bisecting only with a bad commit." +msgstr "Warnung: halbiere nur mit einer fehlerhaften Version" + #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. @@ -3487,6 +5159,29 @@ msgstr "'git bisect bad' kann nur ein Argument entgegennehmen." msgid "Are you sure [Y/n]? " msgstr "Bist du sicher [Y/n]? " +#: git-bisect.sh:289 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Du musst mindestens eine korrekte und eine fehlerhafte Version angeben.\n" +"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" + +#: git-bisect.sh:292 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Du musst mit \"git bisect start\" beginnen.\n" +"Danach musst du mindestens eine korrekte und eine fehlerhafte Version " +"angeben.\n" +"(Du kannst dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" + +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Wir sind nicht beim Halbieren." + #: git-bisect.sh:354 #, sh-format msgid "'$invalid' is not a valid commit" @@ -3514,9 +5209,36 @@ msgstr "kann $file nicht für das Abspielen lesen" msgid "?? what are you talking about?" msgstr "?? Was redest du da?" -#: git-bisect.sh:474 -msgid "We are not bisecting." -msgstr "Wir sind nicht beim Halbieren." +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "führe $command aus" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"Ausführung der Halbierung fehlgeschlagen:\n" +"Rückkehrwert $res von '$command' ist < 0 oder >= 128" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "Ausführung der Halbierung kann nicht mehr fortgesetzt werden" + +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"Ausführung der Halbierung fehlgeschlagen:\n" +"'bisect_state $state' wurde mit Fehlerwert $res beendet" + +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "Halbierung erfolgreich ausgeführt" #: git-pull.sh:21 msgid "" @@ -3539,6 +5261,20 @@ msgstr "" "Aktualisiere eine ungeborenen Zweig mit Änderungen, die zur Bereitstellung " "hinzugefügt wurden" +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"Warnung: Die Anforderung aktualisierte die Spitze des aktuellen Zweiges.\n" +"Warnung: Spule deinen Arbeitszweig von Version $orig_head vor." + #: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" msgstr "Kann nicht mehrere Zweige in einen ungeborenen Zweig zusammenführen" @@ -3575,6 +5311,26 @@ msgstr "Kann temporäre Bereitstellung nicht entfernen (kann nicht passieren)" msgid "Cannot record working tree state" msgstr "Kann Zustand des Arbeitsbaumes nicht aufzeichnen" +#. 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:202 +#, 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, benutze \"git stash save -- " +"'$option'\"" + #: git-stash.sh:223 msgid "No local changes to save" msgstr "Keine lokalen Änderungen zum Speichern" @@ -3636,6 +5392,10 @@ msgstr "Konnte Bereitstellungsbaum nicht speichern" msgid "Cannot unstage modified files" msgstr "Kann geänderte Dateien nicht aus der Bereitstellung herausnehmen" +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "Bereitstellung wurde nicht ausgelagert." + #: git-stash.sh:491 #, sh-format msgid "Dropped ${REV} ($s)" @@ -3662,7 +5422,8 @@ msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" #: git-submodule.sh:109 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" -msgstr "Keine Unterprojekt-Zuordnung in .gitmodules für Pfad '$sm_path' gefunden" +msgstr "" +"Keine Unterprojekt-Zuordnung in .gitmodules für Pfad '$sm_path' gefunden" #: git-submodule.sh:150 #, sh-format @@ -3675,68 +5436,87 @@ msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" "Git-Verzeichnis '$a' ist Teil des Unterprojekt-Pfades '$b', oder umgekehrt" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "repo URL: '$repo' muss absolut sein oder mit ./|../ beginnen" -#: git-submodule.sh:265 +#: git-submodule.sh:266 #, sh-format -msgid "'$path' already exists in the index" -msgstr "'$path' existiert bereits in der Bereitstellung" +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' existiert bereits in der Bereitstellung" -#: git-submodule.sh:282 +#: git-submodule.sh:270 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Der folgende Pfad wird durch eine deiner \".gitignore\" Dateien " +"ignoriert:\n" +"$sm_path\n" +"Benutze -f wenn du diesen wirklich hinzufügen möchtest." + +#: git-submodule.sh:281 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "Füge existierendes Projektarchiv in '$sm_path' der Bereitstellung " +"hinzu." + +#: git-submodule.sh:283 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' existiert bereits und ist kein gültiges Git-Projektarchiv" -#: git-submodule.sh:296 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken" -#: git-submodule.sh:301 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:306 +#: git-submodule.sh:307 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:348 +#: git-submodule.sh:349 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Betrete '$prefix$sm_path'" -#: git-submodule.sh:360 +#: git-submodule.sh:363 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "Stoppe bei '$sm_path'; Skript gab nicht-Null Status zurück." -#: git-submodule.sh:402 +#: git-submodule.sh:406 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "Keine URL für Unterprojekt-Pfad '$sm_path' in .gitmodules gefunden" -#: git-submodule.sh:411 +#: git-submodule.sh:415 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "Registrierung der URL für Unterprojekt-Pfad '$sm_path' fehlgeschlagen" -#: git-submodule.sh:419 -#, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" -msgstr "Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad " -"'$sm_path' fehlgeschlagen" - -#: git-submodule.sh:421 +#: git-submodule.sh:417 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "Unterprojekt '$name' ($url) ist für Pfad '$sm_path' registriert" -#: git-submodule.sh:520 +#: git-submodule.sh:425 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" +"Registrierung des Aktualisierungsmodus für Unterprojekt-Pfad '$sm_path' " +"fehlgeschlagen" + +#: git-submodule.sh:524 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -3745,84 +5525,123 @@ msgstr "" "Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" "Vielleicht möchtest du 'update --init' benutzen?" -#: git-submodule.sh:533 +#: git-submodule.sh:537 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden" -#: git-submodule.sh:552 +#: git-submodule.sh:556 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern" -#: git-submodule.sh:566 +#: git-submodule.sh:570 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "Neuaufbau von '$sha1' in Unterprojekt-Pfad '$sm_path' nicht möglich" -#: git-submodule.sh:567 +#: git-submodule.sh:571 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'" -#: git-submodule.sh:572 +#: git-submodule.sh:576 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" "Zusammenführung von '$sha1' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen" -#: git-submodule.sh:573 +#: git-submodule.sh:577 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'" -#: git-submodule.sh:578 +#: git-submodule.sh:582 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "Konnte '$sha1' in Unterprojekt-Pfad '$sm_path' nicht auschecken." -#: git-submodule.sh:579 +#: git-submodule.sh:583 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt" -#: git-submodule.sh:601 git-submodule.sh:924 +#: git-submodule.sh:605 git-submodule.sh:928 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'" -#: git-submodule.sh:709 -msgid "--" -msgstr "--" +#: git-submodule.sh:713 +msgid "--cached cannot be used with --files" +msgstr "--cached kann nicht mit --files benutzt werden" + +#. unexpected type +#: git-submodule.sh:753 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:767 +#: git-submodule.sh:771 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Warnung: $name beinhaltet nicht Version $sha1_src" -#: git-submodule.sh:770 +#: git-submodule.sh:774 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst" -#: git-submodule.sh:773 +#: git-submodule.sh:777 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" " Warnung: $name beinhaltet nicht die Versionen $sha1_src und $sha1_dst" -#: git-submodule.sh:798 +#: git-submodule.sh:802 msgid "blob" msgstr "Blob" -#: git-submodule.sh:799 +#: git-submodule.sh:803 msgid "submodule" msgstr "Unterprojekt" -#: git-submodule.sh:970 +#: git-submodule.sh:840 +msgid "# Submodules changed but not updated:" +msgstr "# Unterprojekte geändert, aber nicht aktualisiert:" + +#: git-submodule.sh:842 +msgid "# Submodule changes to be committed:" +msgstr "# Änderungen in Unterprojekt zum Eintragen:" + +#: git-submodule.sh:974 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synchronisiere Unterprojekt-URL für '$name'" +#~ msgid "--" +#~ msgstr "--" + +#~ msgid "Could not extract email from committer identity." +#~ msgstr "Konnte E-Mail-Adresse des Einreichers nicht extrahieren." + +#~ msgid "cherry-pick" +#~ msgstr "cherry-pick" + +#~ msgid "Please enter the commit message for your changes." +#~ msgstr "Bitte gebe die Versionsbeschreibung für deine Änderungen ein." + #~ msgid "Too many options specified" #~ msgstr "Zu viele Optionen angegeben" + +#~ msgid "" +#~ "To prevent you from losing history, non-fast-forward updates were " +#~ "rejected\n" +#~ "Merge the remote changes (e.g. 'git pull') before pushing again. See " +#~ "the\n" +#~ "'Note about fast-forwards' section of 'git push --help' for details.\n" +#~ msgstr "" +#~ "Um dich vor Verlust von Historie zu bewahren, wurden nicht vorzuspulende " +#~ "Aktualisierungen zurückgewiesen.\n" +#~ "Führe die externen Änderungen zusammen (z.B. 'git pull') bevor du erneut " +#~ "versendest. Siehe auch die 'Note about fast-forwards' Sektion von \n" +#~ "'git push --help' für weitere Details.\n" diff --git a/po/git.pot b/po/git.pot index decd3d59e5..b6665060de 100644 --- a/po/git.pot +++ b/po/git.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-05-15 06:42+0800\n" +"POT-Creation-Date: 2012-06-08 10:20+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" @@ -45,7 +45,7 @@ msgstr "" msgid "unrecognized header: %s%s (%d)" msgstr "" -#: bundle.c:89 builtin/commit.c:697 +#: bundle.c:89 builtin/commit.c:696 #, c-format msgid "could not open '%s'" msgstr "" @@ -54,8 +54,8 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:533 sequencer.c:965 builtin/log.c:289 -#: builtin/log.c:719 builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347 +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289 +#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "" @@ -78,7 +78,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:296 builtin/log.c:1231 builtin/shortlog.c:284 +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -265,17 +265,17 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" -#: grep.c:1280 +#: grep.c:1320 #, c-format msgid "'%s': unable to read %s" msgstr "" -#: grep.c:1297 +#: grep.c:1337 #, c-format msgid "'%s': %s" msgstr "" -#: grep.c:1308 +#: grep.c:1348 #, c-format msgid "'%s': short read %s" msgstr "" @@ -327,14 +327,35 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1607 +#: parse-options.c:493 +msgid "..." +msgstr "" + +#: parse-options.c:511 +#, c-format +msgid "usage: %s" +msgstr "" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:515 +#, c-format +msgid " or: %s" +msgstr "" + +#: parse-options.c:518 +#, c-format +msgid " %s" +msgstr "" + +#: remote.c:1629 #, 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:1613 +#: remote.c:1635 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -342,7 +363,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1621 +#: remote.c:1643 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -378,7 +399,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:160 sequencer.c:741 sequencer.c:824 +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 #, c-format msgid "Could not write to %s" msgstr "" @@ -414,178 +435,178 @@ msgstr "" msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:323 +#: sequencer.c:324 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:328 +#: sequencer.c:329 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:358 +#: sequencer.c:395 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:361 +#: sequencer.c:398 msgid "You do not have a valid HEAD" msgstr "" -#: sequencer.c:376 +#: sequencer.c:413 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:384 +#: sequencer.c:421 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:388 +#: sequencer.c:425 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:399 +#: sequencer.c:436 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:403 +#: sequencer.c:440 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:491 +#: sequencer.c:524 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:492 +#: sequencer.c:525 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:536 +#: sequencer.c:553 msgid "empty commit set passed" msgstr "" -#: sequencer.c:544 +#: sequencer.c:561 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:549 +#: sequencer.c:566 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:607 +#: sequencer.c:624 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:629 +#: sequencer.c:646 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:634 +#: sequencer.c:651 msgid "No commits parsed." msgstr "" -#: sequencer.c:647 +#: sequencer.c:664 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:651 +#: sequencer.c:668 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:658 +#: sequencer.c:675 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:686 +#: sequencer.c:703 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:689 +#: sequencer.c:706 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:701 +#: sequencer.c:718 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:722 +#: sequencer.c:739 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:723 +#: sequencer.c:740 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:727 +#: sequencer.c:744 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:743 sequencer.c:828 +#: sequencer.c:760 sequencer.c:845 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:762 sequencer.c:896 +#: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:764 +#: sequencer.c:781 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:766 +#: sequencer.c:783 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:788 builtin/apply.c:3689 +#: sequencer.c:805 builtin/apply.c:3697 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:791 +#: sequencer.c:808 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:792 +#: sequencer.c:809 msgid "unexpected end of file" msgstr "" -#: sequencer.c:798 +#: sequencer.c:815 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:821 +#: sequencer.c:838 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:983 +#: sequencer.c:1000 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:984 +#: sequencer.c:1001 msgid "Can't cherry-pick into empty head" msgstr "" @@ -608,6 +629,15 @@ msgstr "" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "" +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "" + +#: wrapper.c:414 +msgid "no such user" +msgstr "" + #: wt-status.c:135 msgid "Unmerged paths:" msgstr "" @@ -937,10 +967,14 @@ msgstr "" msgid "index file corrupt" msgstr "" -#: builtin/add.c:476 builtin/apply.c:4100 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "" +#: builtin/apply.c:53 +msgid "git apply [options] [<patch>...]" +msgstr "" + #: builtin/apply.c:106 #, c-format msgid "unrecognized whitespace option '%s'" @@ -1163,122 +1197,239 @@ msgstr "" msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3266 +#: builtin/apply.c:3267 #, c-format -msgid "new mode (%o) of %s does not match old mode (%o)%s%s" +msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" #: builtin/apply.c:3272 #, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" + +#: builtin/apply.c:3280 +#, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3285 +#: builtin/apply.c:3293 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3340 builtin/checkout.c:212 builtin/reset.c:158 +#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3483 +#: builtin/apply.c:3491 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3510 +#: builtin/apply.c:3518 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3514 +#: builtin/apply.c:3522 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3519 +#: builtin/apply.c:3527 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3522 +#: builtin/apply.c:3530 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3555 +#: builtin/apply.c:3563 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3604 +#: builtin/apply.c:3612 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3660 +#: builtin/apply.c:3668 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3668 +#: builtin/apply.c:3676 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3671 +#: builtin/apply.c:3679 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3681 +#: builtin/apply.c:3689 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:3702 +#: builtin/apply.c:3710 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:3705 +#: builtin/apply.c:3713 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:3836 +#: builtin/apply.c:3844 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:3847 +#: builtin/apply.c:3855 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4042 +#: builtin/apply.c:3970 builtin/apply.c:3973 +msgid "path" +msgstr "" + +#: builtin/apply.c:3971 +msgid "don't apply changes matching the given path" +msgstr "" + +#: builtin/apply.c:3974 +msgid "apply changes matching the given path" +msgstr "" + +#: builtin/apply.c:3976 +msgid "num" +msgstr "" + +#: builtin/apply.c:3977 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" + +#: builtin/apply.c:3980 +msgid "ignore additions made by the patch" +msgstr "" + +#: builtin/apply.c:3982 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "" + +#: builtin/apply.c:3986 +msgid "shows number of added and deleted lines in decimal notation" +msgstr "" + +#: builtin/apply.c:3988 +msgid "instead of applying the patch, output a summary for the input" +msgstr "" + +#: builtin/apply.c:3990 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "" + +#: builtin/apply.c:3992 +msgid "make sure the patch is applicable to the current index" +msgstr "" + +#: builtin/apply.c:3994 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: builtin/apply.c:3996 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "" + +#: builtin/apply.c:3998 +msgid "build a temporary index based on embedded index information" +msgstr "" + +#: builtin/apply.c:4000 +msgid "paths are separated with NUL character" +msgstr "" + +#: builtin/apply.c:4003 +msgid "ensure at least <n> lines of context match" +msgstr "" + +#: builtin/apply.c:4004 +msgid "action" +msgstr "" + +#: builtin/apply.c:4005 +msgid "detect new or modified lines that have whitespace errors" +msgstr "" + +#: builtin/apply.c:4008 builtin/apply.c:4011 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: builtin/apply.c:4014 +msgid "apply the patch in reverse" +msgstr "" + +#: builtin/apply.c:4016 +msgid "don't expect at least one line of context" +msgstr "" + +#: builtin/apply.c:4018 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "" + +#: builtin/apply.c:4020 +msgid "allow overlapping hunks" +msgstr "" + +#: builtin/apply.c:4021 +msgid "be verbose" +msgstr "" + +#: builtin/apply.c:4023 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: builtin/apply.c:4026 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: builtin/apply.c:4028 +msgid "root" +msgstr "" + +#: builtin/apply.c:4029 +msgid "prepend <root> to all filenames" +msgstr "" + +#: builtin/apply.c:4050 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4045 +#: builtin/apply.c:4053 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4061 +#: builtin/apply.c:4069 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4075 +#: builtin/apply.c:4083 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4081 builtin/apply.c:4091 +#: builtin/apply.c:4089 builtin/apply.c:4099 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -1953,52 +2104,52 @@ msgstr "" msgid "malformed --author parameter" msgstr "" -#: builtin/commit.c:583 +#: builtin/commit.c:582 #, c-format msgid "Malformed ident string: '%s'" msgstr "" -#: builtin/commit.c:621 builtin/commit.c:654 builtin/commit.c:968 +#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 #, c-format msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:633 builtin/shortlog.c:296 +#: builtin/commit.c:632 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "" -#: builtin/commit.c:635 +#: builtin/commit.c:634 msgid "could not read log from standard input" msgstr "" -#: builtin/commit.c:639 +#: builtin/commit.c:638 #, c-format msgid "could not read log file '%s'" msgstr "" -#: builtin/commit.c:645 +#: builtin/commit.c:644 msgid "commit has empty message" msgstr "" -#: builtin/commit.c:661 +#: builtin/commit.c:660 msgid "could not read MERGE_MSG" msgstr "" -#: builtin/commit.c:665 +#: builtin/commit.c:664 msgid "could not read SQUASH_MSG" msgstr "" -#: builtin/commit.c:669 +#: builtin/commit.c:668 #, c-format msgid "could not read '%s'" msgstr "" -#: builtin/commit.c:721 +#: builtin/commit.c:720 msgid "could not write commit template" msgstr "" -#: builtin/commit.c:732 +#: builtin/commit.c:731 #, c-format msgid "" "\n" @@ -2008,7 +2159,7 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:737 +#: builtin/commit.c:736 #, c-format msgid "" "\n" @@ -2018,171 +2169,171 @@ msgid "" "and try again.\n" msgstr "" -#: builtin/commit.c:749 +#: builtin/commit.c:748 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:754 +#: builtin/commit.c:753 msgid "" "Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -#: builtin/commit.c:767 +#: builtin/commit.c:766 #, c-format msgid "%sAuthor: %s" msgstr "" -#: builtin/commit.c:774 +#: builtin/commit.c:773 #, c-format msgid "%sCommitter: %s" msgstr "" -#: builtin/commit.c:794 +#: builtin/commit.c:793 msgid "Cannot read index" msgstr "" -#: builtin/commit.c:831 +#: builtin/commit.c:830 msgid "Error building trees" msgstr "" -#: builtin/commit.c:846 builtin/tag.c:361 +#: builtin/commit.c:845 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" -#: builtin/commit.c:943 +#: builtin/commit.c:942 #, c-format msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:958 builtin/commit.c:1158 +#: builtin/commit.c:957 builtin/commit.c:1157 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:998 +#: builtin/commit.c:997 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:1009 +#: builtin/commit.c:1008 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:1012 +#: builtin/commit.c:1011 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1014 +#: builtin/commit.c:1013 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1017 +#: builtin/commit.c:1016 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1027 +#: builtin/commit.c:1026 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1029 +#: builtin/commit.c:1028 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1037 +#: builtin/commit.c:1036 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1054 +#: builtin/commit.c:1053 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1056 +#: builtin/commit.c:1055 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1058 +#: builtin/commit.c:1057 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1060 +#: builtin/commit.c:1059 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1070 builtin/tag.c:577 +#: builtin/commit.c:1069 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1075 +#: builtin/commit.c:1074 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1258 +#: builtin/commit.c:1257 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1260 +#: builtin/commit.c:1259 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1301 +#: builtin/commit.c:1300 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1303 +#: builtin/commit.c:1302 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1447 +#: builtin/commit.c:1446 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1485 builtin/merge.c:509 +#: builtin/commit.c:1484 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1492 +#: builtin/commit.c:1491 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1499 +#: builtin/commit.c:1498 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1518 +#: builtin/commit.c:1517 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1532 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1537 +#: builtin/commit.c:1536 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1552 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1573 +#: builtin/commit.c:1572 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1577 +#: builtin/commit.c:1576 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1588 +#: builtin/commit.c:1587 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -2509,32 +2660,32 @@ msgstr "" msgid "cannot open '%s'" msgstr "" -#: builtin/grep.c:888 +#: builtin/grep.c:885 msgid "no pattern given." msgstr "" -#: builtin/grep.c:902 +#: builtin/grep.c:899 #, c-format msgid "bad object %s" msgstr "" -#: builtin/grep.c:943 +#: builtin/grep.c:940 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:966 +#: builtin/grep.c:963 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:971 +#: builtin/grep.c:968 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:974 +#: builtin/grep.c:971 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:982 +#: builtin/grep.c:979 msgid "both --cached and trees are given." msgstr "" @@ -2999,85 +3150,81 @@ msgstr "" msgid "format.headers without value" msgstr "" -#: builtin/log.c:675 +#: builtin/log.c:676 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:686 +#: builtin/log.c:687 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:700 +#: builtin/log.c:701 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:708 +#: builtin/log.c:709 msgid "Not a range." msgstr "" -#: builtin/log.c:745 -msgid "Could not extract email from committer identity." -msgstr "" - -#: builtin/log.c:791 +#: builtin/log.c:786 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:885 +#: builtin/log.c:859 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:958 +#: builtin/log.c:932 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1179 +#: builtin/log.c:1153 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1224 +#: builtin/log.c:1198 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1226 +#: builtin/log.c:1200 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1234 +#: builtin/log.c:1208 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1236 +#: builtin/log.c:1210 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1238 +#: builtin/log.c:1212 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1261 +#: builtin/log.c:1235 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1263 +#: builtin/log.c:1237 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1416 +#: builtin/log.c:1390 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1520 +#: builtin/log.c:1494 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524 #, c-format msgid "Unknown commit %s" msgstr "" @@ -3547,22 +3694,22 @@ msgstr "" msgid "Unknown subcommand: %s" msgstr "" -#: builtin/pack-objects.c:2315 +#: builtin/pack-objects.c:2337 #, c-format msgid "unsupported index version %s" msgstr "" -#: builtin/pack-objects.c:2319 +#: builtin/pack-objects.c:2341 #, c-format msgid "bad index version '%s'" msgstr "" -#: builtin/pack-objects.c:2342 +#: builtin/pack-objects.c:2364 #, c-format msgid "option %s does not accept negative form" msgstr "" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2368 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "" @@ -3793,7 +3940,7 @@ msgstr "" #: builtin/remote.c:677 #, c-format msgid "" -"Not updating non-default fetch respec\n" +"Not updating non-default fetch refspec\n" "\t%s\n" "\tPlease update the configuration manually if necessary." msgstr "" @@ -4323,6 +4470,38 @@ msgstr "" msgid "See 'git help <command>' for more information on a specific command." msgstr "" +#: parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "" + +#: parse-options.h:141 +msgid "time" +msgstr "" + +#: parse-options.h:149 +msgid "file" +msgstr "" + +#: parse-options.h:151 +msgid "when" +msgstr "" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "" + #: common-cmds.h:8 msgid "Add file contents to the index" msgstr "" @@ -4411,6 +4590,24 @@ msgstr "" msgid "You need to set your committer info first" msgstr "" +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "" + #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "" @@ -4460,10 +4657,26 @@ msgstr "" msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "" +#: git-am.sh:671 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:708 +msgid "Patch does not have a valid e-mail address." +msgstr "" + #: git-am.sh:755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "" +#: git-am.sh:759 +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. @@ -4476,14 +4689,36 @@ msgstr "" msgid "Applying: $FIRSTLINE" msgstr "" +#: git-am.sh:823 +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-am.sh:831 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + #: git-am.sh:847 msgid "No changes -- Patch already applied." msgstr "" +#: git-am.sh:857 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "" + #: git-am.sh:873 msgid "applying to an empty history" msgstr "" +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "" + #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. @@ -4542,6 +4777,12 @@ msgstr "" msgid "'git bisect bad' can take only one argument." msgstr "" +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:273 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input #. at this point. @@ -4549,6 +4790,23 @@ msgstr "" msgid "Are you sure [Y/n]? " msgstr "" +#: git-bisect.sh:289 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:292 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "" + #: git-bisect.sh:354 #, sh-format msgid "'$invalid' is not a valid commit" @@ -4574,8 +4832,31 @@ msgstr "" msgid "?? what are you talking about?" msgstr "" -#: git-bisect.sh:474 -msgid "We are not bisecting." +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "" + +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" + +#: git-bisect.sh:466 +msgid "bisect run success" msgstr "" #: git-pull.sh:21 @@ -4593,6 +4874,18 @@ msgstr "" msgid "updating an unborn branch with changes added to the index" msgstr "" +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + #: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" msgstr "" @@ -4629,6 +4922,23 @@ msgstr "" msgid "Cannot record working tree state" 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:202 +#, sh-format +msgid "" +"error: unknown option for 'stash save': $option\n" +" To provide a message, use git stash save -- '$option'" +msgstr "" + #: git-stash.sh:223 msgid "No local changes to save" msgstr "" @@ -4689,6 +4999,10 @@ msgstr "" msgid "Cannot unstage modified files" msgstr "" +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "" + #: git-stash.sh:491 #, sh-format msgid "Dropped ${REV} ($s)" @@ -4737,6 +5051,19 @@ msgstr "" msgid "'$sm_path' already exists in the index" msgstr "" +#: git-submodule.sh:270 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" + +#: git-submodule.sh:281 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "" + #: git-submodule.sh:283 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" @@ -4767,106 +5094,120 @@ msgstr "" msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:405 +#: git-submodule.sh:406 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:414 +#: git-submodule.sh:415 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:422 +#: git-submodule.sh:417 #, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" +msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:424 +#: git-submodule.sh:425 #, sh-format -msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:523 +#: git-submodule.sh:524 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:536 +#: git-submodule.sh:537 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:555 +#: git-submodule.sh:556 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:569 +#: git-submodule.sh:570 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:570 +#: git-submodule.sh:571 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:575 +#: git-submodule.sh:576 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:576 +#: git-submodule.sh:577 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:581 +#: git-submodule.sh:582 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:582 +#: git-submodule.sh:583 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:604 git-submodule.sh:927 +#: git-submodule.sh:605 git-submodule.sh:928 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:712 -msgid "--" +#: git-submodule.sh:713 +msgid "--cached cannot be used with --files" +msgstr "" + +#. unexpected type +#: git-submodule.sh:753 +#, sh-format +msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:770 +#: git-submodule.sh:771 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:773 +#: git-submodule.sh:774 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:776 +#: git-submodule.sh:777 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:801 +#: git-submodule.sh:802 msgid "blob" msgstr "" -#: git-submodule.sh:802 +#: git-submodule.sh:803 msgid "submodule" msgstr "" -#: git-submodule.sh:973 +#: git-submodule.sh:840 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:842 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:974 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "" diff --git a/po/it.po b/po/it.po new file mode 100644 index 0000000000..fe61f1a3f3 --- /dev/null +++ b/po/it.po @@ -0,0 +1,5367 @@ +# Italian translations for Git. +# Copyright (C) 2012 Marco Paolone <marcopaolone@gmail.com> +# This file is distributed under the same license as the Git package. +msgid "" +msgstr "" +"Project-Id-Version: Git\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-06-08 10:20+0800\n" +"PO-Revision-Date: 2012-06-14 14:13+0200\n" +"Last-Translator: Marco Paolone <marcopaolone@gmail.com>\n" +"Language-Team: Italian\n" +"Language: it\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" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "suggerimento: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +msgid "" +"Fix them up in the work tree,\n" +"and then use 'git add/rm <file>' as\n" +"appropriate to mark resolution and make a commit,\n" +"or use 'git commit -a'." +msgstr "" + +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "header non riconosciuto: %s%s (%d)" + +#: bundle.c:89 builtin/commit.c:696 +#, c-format +msgid "could not open '%s'" +msgstr "non è stato possibile aprire '%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "" + +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289 +#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:192 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "" +msgstr[1] "" + +#: bundle.c:290 +msgid "rev-list died" +msgstr "" + +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "argomento non riconosciuto: %s" + +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "il ref '%s' è escluso dalle opzioni di rev-list" + +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "" + +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "" + +#: bundle.c:412 +msgid "pack-objects died" +msgstr "" + +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "impossibile creare '%s'" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "" + +#: commit.c:48 +#, c-format +msgid "could not parse %s" +msgstr "non è stato possibile analizzare %s" + +#: commit.c:50 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s non è un commit!" + +#: compat/obstack.c:406 compat/obstack.c:408 +msgid "memory exhausted" +msgstr "memoria esaurita" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Non è stato possibile eseguire 'git-rev-list'" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "scrittura nella rev-list non riuscita: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "" + +#: date.c:95 +msgid "in the future" +msgstr "in futuro" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu secondo fa" +msgstr[1] "%lu secondi fa" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu un minuto fa" +msgstr[1] "%lu minuti fa" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu ora fa" +msgstr[1] "%lu ore fa" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu giorno fa" +msgstr[1] "%lu giorni fa" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu settimana fa" +msgstr[1] "%lu settimane fa" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu mese fa" +msgstr[1] "%lu mesi fa" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu anno" +msgstr[1] "%lu anni" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, %lu mese fa" +msgstr[1] "%s, %lu mesi fa" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu anno fa" +msgstr[1] "%lu anni fa" + +#: diff.c:105 +#, c-format +msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" +msgstr "" + +#: diff.c:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Parametro dirstat '%.*s' sconosciuto\n" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Trovati errori nella variabile di configurazione 'diff.dirstat':\n" +"%s" + +#: diff.c:1400 +msgid " 0 files changed\n" +msgstr " 0 file modificati\n" + +#: diff.c:1404 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d file modificato" +msgstr[1] " %d file modificati" + +#: diff.c:1421 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d inserzione(+)" +msgstr[1] ", %d inserzioni(+)" + +#: diff.c:1432 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ". %d rimozione(-)" +msgstr[1] ", %d rimozioni(-)" + +#: diff.c:3478 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Analisi del parametro dell'opzione --dirstat/-X non riuscita:\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "non è stato possibile eseguire gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg non ha accettato i dati" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg non è riuscito a firmare i dati" + +#: grep.c:1320 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s': impossibile leggere %s" + +#: grep.c:1337 +#, c-format +msgid "'%s': %s" +msgstr "'%s': %s" + +#: grep.c:1348 +#, c-format +msgid "'%s': short read %s" +msgstr "" + +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "comandi git disponibili in '%s'" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "comandi git disponibili altrove nel tuo $PATH" + +#: help.c:270 +#, 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' sembra essere un comando git, ma non è stato\n" +"possibile eseguirlo. Forse git-%s è corrotto?" + +#: help.c:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Oh oh. Il tuo sistema non riporta alcun comando Git." + +#: help.c:349 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "" + +#: help.c:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "automaticamente tra %0.1f secondi..." + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' non è un comando git. Vedi 'git --help'." + +#: help.c:365 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Intendevi questo?" +msgstr[1] "" +"\n" +"Intendevi uno di questi?" + +#: parse-options.c:493 +msgid "..." +msgstr "..." + +#: parse-options.c:511 +#, c-format +msgid "usage: %s" +msgstr " uso: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:515 +#, c-format +msgid " or: %s" +msgstr "oppure: %s" + +#: parse-options.c:518 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1629 +#, c-format +msgid "Your branch is ahead of '%s' by %d commit.\n" +msgid_plural "Your branch is ahead of '%s' by %d commits.\n" +msgstr[0] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" +msgstr[1] "Il tuo branch è avanti rispetto a '%s' di %d commit.\n" + +#: remote.c:1635 +#, c-format +msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" +msgid_plural "" +"Your branch is behind '%s' by %d commits, and can be fast-forwarded.\n" +msgstr[0] "" +msgstr[1] "" + +#: remote.c:1643 +#, c-format +msgid "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" +msgid_plural "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commits each, respectively.\n" +msgstr[0] "" +msgstr[1] "" + +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 +#: builtin/merge.c:1088 builtin/merge.c:1098 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Non è stato possibile aprire '%s' per la scrittura" + +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 +#: builtin/merge.c:1090 builtin/merge.c:1103 +#, c-format +msgid "Could not write to '%s'" +msgstr "Non è stato possibile scrivere su '%s'" + +#: sequencer.c:144 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"dopo aver risolto i conflitti, segna i path corretti\n" +"con 'git add <path>' o 'git rm <path>'" + +#: sequencer.c:147 +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 "" +"dopo aver risolto i conflitti, segna i path corretti\n" +"con 'git add <path>' o 'git rm <path>' ed eseguire\n" +"il commit del risultato con 'git commit'" + +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 +#, c-format +msgid "Could not write to %s" +msgstr "Non è stato possibile scrivere su %s" + +#: sequencer.c:163 +#, c-format +msgid "Error wrapping up %s" +msgstr "" + +#: sequencer.c:178 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Le tue modifiche locali verranno sovrascritte da cherry-pick" + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by revert." +msgstr "Le tue modifiche locali verranno sovrascritte da revert." + +#: sequencer.c:183 +msgid "Commit your changes or stash them to proceed." +msgstr "" + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:233 +#, c-format +msgid "%s: Unable to write new index file" +msgstr "%s: impossibile scrivere il nuovo index file" + +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "Non è stato possibile risolvere il commit HEAD\n" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "" + +#: sequencer.c:324 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Non è stato possibile analizzare il commit %s\n" + +#: sequencer.c:329 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "" + +#: sequencer.c:395 +msgid "Your index file is unmerged." +msgstr "" + +#: sequencer.c:398 +msgid "You do not have a valid HEAD" +msgstr "Non hai un HEAD valido" + +#: sequencer.c:413 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Il commit %s è un merge ma non è stata specificata l'opzione -m." + +#: sequencer.c:421 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "" + +#: sequencer.c:425 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "" + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:436 +#, c-format +msgid "%s: cannot parse parent commit %s" +msgstr "" + +#: sequencer.c:440 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Impossibile ottenere il messaggio di commit per %s" + +#: sequencer.c:524 +#, c-format +msgid "could not revert %s... %s" +msgstr "non è stato possibile eseguire il revert di %s... %s" + +#: sequencer.c:525 +#, c-format +msgid "could not apply %s... %s" +msgstr "non è stato possibile applicare %s... %s" + +#: sequencer.c:553 +msgid "empty commit set passed" +msgstr "è stato passato un set di commit vuoto" + +#: sequencer.c:561 +#, c-format +msgid "git %s: failed to read the index" +msgstr "git %s: lettura di index non riuscita" + +#: sequencer.c:566 +#, c-format +msgid "git %s: failed to refresh the index" +msgstr "git %s: aggiornamento di index non riuscito" + +#: sequencer.c:624 +#, c-format +msgid "Cannot %s during a %s" +msgstr "" + +#: sequencer.c:646 +#, c-format +msgid "Could not parse line %d." +msgstr "Non è stato possibile analizzare la riga %d." + +#: sequencer.c:651 +msgid "No commits parsed." +msgstr "Nessun commit analizzato." + +#: sequencer.c:664 +#, c-format +msgid "Could not open %s" +msgstr "Non è stato possibile aprire %s" + +#: sequencer.c:668 +#, c-format +msgid "Could not read %s." +msgstr "Non è stato possibile leggere %s." + +#: sequencer.c:675 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "" + +#: sequencer.c:703 +#, c-format +msgid "Invalid key: %s" +msgstr "Chiave non valida: %s" + +#: sequencer.c:706 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Valore non valido per %s: %s" + +#: sequencer.c:718 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "" + +#: sequencer.c:739 +msgid "a cherry-pick or revert is already in progress" +msgstr "è già in corso un'operazione di cherry-pick o di revert" + +#: sequencer.c:740 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "prova \"git cherry-pick (--continue | --quit | -- abort)\"" + +#: sequencer.c:744 +#, c-format +msgid "Could not create sequencer directory %s" +msgstr "" + +#: sequencer.c:760 sequencer.c:845 +#, c-format +msgid "Error wrapping up %s." +msgstr "" + +#: sequencer.c:779 sequencer.c:913 +msgid "no cherry-pick or revert in progress" +msgstr "nessuna operazione di cherry-pick o revert in corso" + +#: sequencer.c:781 +msgid "cannot resolve HEAD" +msgstr "impossibile risolvere HEAD" + +#: sequencer.c:783 +msgid "cannot abort from a branch yet to be born" +msgstr "" + +#: sequencer.c:805 builtin/apply.c:3697 +#, c-format +msgid "cannot open %s: %s" +msgstr "impossibile aprire %s: %s" + +#: sequencer.c:808 +#, c-format +msgid "cannot read %s: %s" +msgstr "impossibile leggere %s: %s" + +#: sequencer.c:809 +msgid "unexpected end of file" +msgstr "fine del file inattesa" + +#: sequencer.c:815 +#, c-format +msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" +msgstr "" + +#: sequencer.c:838 +#, c-format +msgid "Could not format %s." +msgstr "" + +#: sequencer.c:1000 +msgid "Can't revert as initial commit" +msgstr "Impossibile eseguire il revert come commit iniziale" + +#: sequencer.c:1001 +msgid "Can't cherry-pick into empty head" +msgstr "" + +#: sha1_name.c:864 +msgid "HEAD does not point to a branch" +msgstr "HEAD non punta ad un branch" + +#: sha1_name.c:867 +#, c-format +msgid "No such branch: '%s'" +msgstr "Nessun branch esistente: '%s'" + +#: sha1_name.c:869 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Nessun upstream configurato per il branch '%s'" + +#: sha1_name.c:872 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "" + +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "impossibile trovare l'utente corrente nel file passwd: %s" + +#: wrapper.c:414 +msgid "no such user" +msgstr "utente non esistente" + +#: wt-status.c:135 +msgid "Unmerged paths:" +msgstr "" + +#: wt-status.c:141 wt-status.c:158 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:143 wt-status.c:160 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr "" + +#: wt-status.c:144 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (usa \"git add/rm <file>...\" come appropriato per la risoluzione)" + +#: wt-status.c:152 +msgid "Changes to be committed:" +msgstr "" + +#: wt-status.c:170 +msgid "Changes not staged for commit:" +msgstr "" + +#: wt-status.c:174 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:176 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr "" + +#: wt-status.c:177 +msgid "" +" (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr "" + +#: wt-status.c:179 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr "" + +#: wt-status.c:188 +#, c-format +msgid "%s files:" +msgstr "%s file:" + +#: wt-status.c:191 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr "" + +#: wt-status.c:208 +msgid "bug" +msgstr "bug" + +#: wt-status.c:213 +msgid "both deleted:" +msgstr "entrambi eliminati:" + +#: wt-status.c:214 +msgid "added by us:" +msgstr "aggiunto da noi:" + +#: wt-status.c:215 +msgid "deleted by them:" +msgstr "eliminato da loro:" + +#: wt-status.c:216 +msgid "added by them:" +msgstr "aggiunto da loro:" + +#: wt-status.c:217 +msgid "deleted by us:" +msgstr "eliminato da noi:" + +#: wt-status.c:218 +msgid "both added:" +msgstr "entrambi aggiunti:" + +#: wt-status.c:219 +msgid "both modified:" +msgstr "entrambi modificati:" + +#: wt-status.c:249 +msgid "new commits, " +msgstr "nuovi commit, " + +#: wt-status.c:251 +msgid "modified content, " +msgstr "contenuto modificato, " + +#: wt-status.c:253 +msgid "untracked content, " +msgstr "" + +#: wt-status.c:267 +#, c-format +msgid "new file: %s" +msgstr "nuovo file: %s" + +#: wt-status.c:270 +#, c-format +msgid "copied: %s -> %s" +msgstr "copiato: %s -> %s" + +#: wt-status.c:273 +#, c-format +msgid "deleted: %s" +msgstr "eliminato: %s" + +#: wt-status.c:276 +#, c-format +msgid "modified: %s" +msgstr "modificato: %s" + +#: wt-status.c:279 +#, c-format +msgid "renamed: %s -> %s" +msgstr "rinominato: %s -> %s" + +#: wt-status.c:282 +#, c-format +msgid "typechange: %s" +msgstr "" + +#: wt-status.c:285 +#, c-format +msgid "unknown: %s" +msgstr "sconosciuto: %s" + +#: wt-status.c:288 +#, c-format +msgid "unmerged: %s" +msgstr "" + +#: wt-status.c:291 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "" + +#: wt-status.c:737 +msgid "On branch " +msgstr "Sul branch " + +#: wt-status.c:744 +msgid "Not currently on any branch." +msgstr "" + +#: wt-status.c:755 +msgid "Initial commit" +msgstr "Commit iniziale" + +#: wt-status.c:769 +msgid "Untracked" +msgstr "" + +#: wt-status.c:771 +msgid "Ignored" +msgstr "Ignorato" + +#: wt-status.c:773 +#, c-format +msgid "Untracked files not listed%s" +msgstr "" + +#: wt-status.c:775 +msgid " (use -u option to show untracked files)" +msgstr "" + +#: wt-status.c:781 +msgid "No changes" +msgstr "Nessuna modifica" + +#: wt-status.c:785 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "nessuna modifica aggiunta al commit%s\n" + +#: wt-status.c:787 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (usa \"git add\" e/o \"git commit -a\")" + +#: wt-status.c:789 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "" + +#: wt-status.c:791 +msgid " (use \"git add\" to track)" +msgstr "" + +#: wt-status.c:793 wt-status.c:796 wt-status.c:799 +#, c-format +msgid "nothing to commit%s\n" +msgstr "" + +#: wt-status.c:794 +msgid " (create/copy files and use \"git add\" to track)" +msgstr "" + +#: wt-status.c:797 +msgid " (use -u to show untracked files)" +msgstr "" + +#: wt-status.c:800 +msgid " (working directory clean)" +msgstr "" + +#: wt-status.c:908 +msgid "HEAD (no branch)" +msgstr "HEAD (nessun branch)" + +#: wt-status.c:914 +msgid "Initial commit on " +msgstr "Commit iniziale su " + +#: wt-status.c:929 +msgid "behind " +msgstr "indietro " + +#: wt-status.c:932 wt-status.c:935 +msgid "ahead " +msgstr "avanti " + +#: wt-status.c:937 +msgid ", behind " +msgstr ", indietro " + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "status diff %c inatteso" + +#: builtin/add.c:67 builtin/commit.c:226 +msgid "updating files failed" +msgstr "aggiornamento dei file non riuscito" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "elimina '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Il path '%s' è nel sottomodulo '%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "" + +#: builtin/add.c:195 builtin/add.c:456 builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' si trova oltre un link simbolico" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Non è stato possibile leggere index" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Non è stato possibile aprire '%s' per la scrittura." + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Non è stato possibile scrivere la patch" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "Non è stato possibile eseguire lo stat di '%s'" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Patch vuota. Operazione interrotta." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Non è stato possibile applicare '%s'" + +#: builtin/add.c:312 +msgid "The following paths are ignored by one of your .gitignore files:\n" +msgstr "I seguenti path sono stati ignorati da uno o più dei tuoi file .gitignore:\n" + +#: builtin/add.c:352 +#, c-format +msgid "Use -f if you really want to add them.\n" +msgstr "Usa -f se vuoi davvero aggiungerli.\n" + +#: builtin/add.c:353 +msgid "no files added" +msgstr "nessun file aggiunto" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "aggiunta dei file non riuscita" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "-A e -u sono reciprocamente incompatibili" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "L'opzione --ignore-missing può essere usata solo con --dry-run" + +#: builtin/add.c:413 +#, c-format +msgid "Nothing specified, nothing added.\n" +msgstr "" + +#: builtin/add.c:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Forse intendevi dire 'git add .'?\n" + +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "index file corrotto" + +#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 +msgid "Unable to write new index file" +msgstr "Impossibile scrivere il nuovo index file" + +#: builtin/apply.c:53 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [opzioni] [<patch>...]" + +#: builtin/apply.c:106 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "" + +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "" + +#: builtin/apply.c:815 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "" + +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec ha restituito %d per l'input: %s" + +#: builtin/apply.c:905 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "impossibile trovare il nome del file nella patch alla riga %d" + +#: builtin/apply.c:937 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: git-diff errato - atteso /dev/null, ricevuto %s alla riga %d" + +#: builtin/apply.c:941 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply: git-diff errato - nuovo nome del file inconsistente alla riga %d" + +#: builtin/apply.c:942 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply: git-diff errato - vecchio nome del file inconsistente alla riga %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff errato - atteso /dev/nulla alla riga %d" + +#: builtin/apply.c:1394 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount: riga inattesa: %.*s" + +#: builtin/apply.c:1451 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "frammento di patch senza intestazione alla riga %d: %.*s" + +#: builtin/apply.c:1468 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:1628 +msgid "new file depends on old contents" +msgstr "il nuovo file dipende da contenuti precedenti" + +#: builtin/apply.c:1630 +msgid "deleted file still has contents" +msgstr "il file eliminato ha ancora dei contenuti" + +#: builtin/apply.c:1656 +#, c-format +msgid "corrupt patch at line %d" +msgstr "" + +#: builtin/apply.c:1692 +#, c-format +msgid "new file %s depends on old contents" +msgstr "il nuovo file %s dipende da contenuti precedenti" + +#: builtin/apply.c:1694 +#, c-format +msgid "deleted file %s still has contents" +msgstr "il file eliminato %s ha ancora dei contenuti" + +#: builtin/apply.c:1697 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** attenzione: il file %s diventa vuoto ma non è eliminato" + +#: builtin/apply.c:1843 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "patch binaria corrotta alla riga %d: %.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1872 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "patch binaria non riconosciuta alla riga %d" + +#: builtin/apply.c:1958 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "" + +#: builtin/apply.c:2048 +#, c-format +msgid "unable to read symlink %s" +msgstr "impossibile leggere il link simbolico %s" + +#: builtin/apply.c:2052 +#, c-format +msgid "unable to open or read %s" +msgstr "impossibile aprire o leggere %s" + +#: builtin/apply.c:2123 +msgid "oops" +msgstr "oops" + +#: builtin/apply.c:2645 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "inizio della riga non valido: '%c'" + +#: builtin/apply.c:2763 +#, 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] "" + +#: builtin/apply.c:2775 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "" + +#: builtin/apply.c:2781 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"durante la ricerca per:\n" +"%.*s" + +#: builtin/apply.c:2800 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "dati della patch binaria mancanti per '%s'" + +#: builtin/apply.c:2903 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "la patch binaria non può essere applicata a '%s'" + +#: builtin/apply.c:2909 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "la patch binaria su '%s' crea risultati non corretti (atteso %s, ricevuto %s)" + +#: builtin/apply.c:2930 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "patch non riuscita: %s:%ld" + +#: builtin/apply.c:3045 +#, c-format +msgid "patch %s has been renamed/deleted" +msgstr "la patch %s è stata rinominata/eliminata" + +#: builtin/apply.c:3052 builtin/apply.c:3069 +#, c-format +msgid "read of %s failed" +msgstr "lettura di %s non riuscita" + +#: builtin/apply.c:3084 +msgid "removal patch leaves file contents" +msgstr "la rimozione della patch lascia contenuti del file" + +#: builtin/apply.c:3105 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: esiste già nella directory di lavoro" + +#: builtin/apply.c:3143 +#, c-format +msgid "%s: has been deleted/renamed" +msgstr "%s: è stata eliminata/rinominata" + +#: builtin/apply.c:3148 builtin/apply.c:3179 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3159 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: non esiste in index" + +#: builtin/apply.c:3173 +#, c-format +msgid "%s: does not match index" +msgstr "%s: non corrisponde a index" + +#: builtin/apply.c:3190 +#, c-format +msgid "%s: wrong type" +msgstr "%s: tipo errato" + +#: builtin/apply.c:3192 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s ha il tipo %o, atteso %o" + +#: builtin/apply.c:3247 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: esiste già in index" + +#: builtin/apply.c:3267 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "" + +#: builtin/apply.c:3272 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o) of %s" +msgstr "" + +#: builtin/apply.c:3280 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: la patch non può essere applicata" + +#: builtin/apply.c:3293 +#, c-format +msgid "Checking patch %s..." +msgstr "Controllo della patch %s..." + +#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "make_cache_entry non riuscito per il path '%s'" + +#: builtin/apply.c:3491 +#, c-format +msgid "unable to remove %s from index" +msgstr "impossibile rimuovere %s da index" + +#: builtin/apply.c:3518 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "patch corrotta per il sottoprogetto %s" + +#: builtin/apply.c:3522 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "impossibile eseguire lo stat del file appena creato '%s'" + +#: builtin/apply.c:3527 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "" + +#: builtin/apply.c:3530 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "impossibile aggiungere la voce della cache per %s" + +#: builtin/apply.c:3563 +#, c-format +msgid "closing file '%s'" +msgstr "chiusura del file '%s'" + +#: builtin/apply.c:3612 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "impossibile scrivere il file '%s' in modalità %o" + +#: builtin/apply.c:3668 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Patch %s applicata correttamente." + +#: builtin/apply.c:3676 +msgid "internal error" +msgstr "errore interno" + +#. Say this even without --verbose +#: builtin/apply.c:3679 +#, c-format +msgid "Applying patch %%s with %d reject..." +msgid_plural "Applying patch %%s with %d rejects..." +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:3689 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "" + +#: builtin/apply.c:3710 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Frammento #%d applicato correttamente." + +#: builtin/apply.c:3713 +#, c-format +msgid "Rejected hunk #%d." +msgstr "Frammento #%d respinto." + +#: builtin/apply.c:3844 +msgid "unrecognized input" +msgstr "input non riconosciuto" + +#: builtin/apply.c:3855 +msgid "unable to read index file" +msgstr "impossibile leggere index file" + +#: builtin/apply.c:3970 builtin/apply.c:3973 +msgid "path" +msgstr "path" + +#: builtin/apply.c:3971 +msgid "don't apply changes matching the given path" +msgstr "non applica le modifiche corrispondenti al path specificato" + +#: builtin/apply.c:3974 +msgid "apply changes matching the given path" +msgstr "applica le modifiche corrispondenti al path specificato" + +#: builtin/apply.c:3976 +msgid "num" +msgstr "num" + +#: builtin/apply.c:3977 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "" + +#: builtin/apply.c:3980 +msgid "ignore additions made by the patch" +msgstr "ignora le aggiunte create dalla patch" + +#: builtin/apply.c:3982 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "invece di applicare la patch, mostra l'output di diffstat per l'input" + +#: builtin/apply.c:3986 +msgid "shows number of added and deleted lines in decimal notation" +msgstr "mostra il numero di righe aggiunte e eliminate in notazione decimale" + +#: builtin/apply.c:3988 +msgid "instead of applying the patch, output a summary for the input" +msgstr "invece di applicare la patch, mostra un riassunto per l'input" + +#: builtin/apply.c:3990 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "invece di applicare la patch, verifica se può essere applicata" + +#: builtin/apply.c:3992 +msgid "make sure the patch is applicable to the current index" +msgstr "assicura che la patch sia applicabile all'attuale index" + +#: builtin/apply.c:3994 +msgid "apply a patch without touching the working tree" +msgstr "" + +#: builtin/apply.c:3996 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "applica anche la patch (da usare con --stat/--summary/--check)" + +#: builtin/apply.c:3998 +msgid "build a temporary index based on embedded index information" +msgstr "" + +#: builtin/apply.c:4000 +msgid "paths are separated with NUL character" +msgstr "i path sono separati con un carattere NUL" + +#: builtin/apply.c:4003 +msgid "ensure at least <n> lines of context match" +msgstr "assicura almeno <n> righe di contesto corrispondente" + +#: builtin/apply.c:4004 +msgid "action" +msgstr "azione" + +#: builtin/apply.c:4005 +msgid "detect new or modified lines that have whitespace errors" +msgstr "rileva righe nuove o modificate che hanno errori di spazi bianchi" + +#: builtin/apply.c:4008 builtin/apply.c:4011 +msgid "ignore changes in whitespace when finding context" +msgstr "" + +#: builtin/apply.c:4014 +msgid "apply the patch in reverse" +msgstr "applica la patch in maniera inversa" + +#: builtin/apply.c:4016 +msgid "don't expect at least one line of context" +msgstr "" + +#: builtin/apply.c:4018 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "lascia i frammenti respinti nei file .rej corrispondenti" + +#: builtin/apply.c:4020 +msgid "allow overlapping hunks" +msgstr "consente la sovrapposizione dei frammenti" + +#: builtin/apply.c:4021 +msgid "be verbose" +msgstr "dettagliato" + +#: builtin/apply.c:4023 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "" + +#: builtin/apply.c:4026 +msgid "do not trust the line counts in the hunk headers" +msgstr "" + +#: builtin/apply.c:4028 +msgid "root" +msgstr "radice" + +#: builtin/apply.c:4029 +msgid "prepend <root> to all filenames" +msgstr "antepone <root> a tutti i nomi file" + +#: builtin/apply.c:4050 +msgid "--index outside a repository" +msgstr "--index al di fuori di un repository" + +#: builtin/apply.c:4053 +msgid "--cached outside a repository" +msgstr "--cached al di fuori di un repository" + +#: builtin/apply.c:4069 +#, c-format +msgid "can't open patch '%s'" +msgstr "impossibile aprire la patch '%s'" + +#: builtin/apply.c:4083 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "" +msgstr[1] "" + +#: builtin/apply.c:4089 builtin/apply.c:4099 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d riga aggiunge errori di spazi bianchi." +msgstr[1] "%d righe aggiungono errori di spazi bianchi." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "non è stato possibile creare il file del repository '%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "non è stato possibile redirigere l'output" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: Remote non ha un URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: atteso ACK/NAK, ricevuto EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "errore remoto: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: errore del protocollo" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: atteso un flush" + +#: builtin/branch.c:144 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" + +#: builtin/branch.c:148 +#, 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:180 +msgid "cannot use -a with -d" +msgstr "impossibile usare -a con -d" + +#: builtin/branch.c:186 +msgid "Couldn't look up commit object for HEAD" +msgstr "" + +#: builtin/branch.c:191 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "" + +#: builtin/branch.c:202 +#, c-format +msgid "remote branch '%s' not found." +msgstr "il branch remoto '%s' non è stato trovato." + +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "branch '%s' non trovato." + +#: builtin/branch.c:210 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "" + +#: builtin/branch.c:216 +#, 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:225 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Errore nella rimozione del branch remoto '%s'" + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Errore nella rimozione del branch '%s'" + +#: builtin/branch.c:233 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Ramo remoto %s eliminato (era %s).\n" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Ramo %s eliminato (era %s).\n" + +#: builtin/branch.c:239 +msgid "Update of config-file failed" +msgstr "Aggiornamento del file di configurazione fallito" + +#: builtin/branch.c:337 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "il branch '%s' non punta ad un commit" + +#: builtin/branch.c:409 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: dietro %d]" + +#: builtin/branch.c:411 +#, c-format +msgid "[behind %d]" +msgstr "[dietro %d]" + +#: builtin/branch.c:415 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: avanti %d]" + +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" +msgstr "" + +#: builtin/branch.c:420 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "" + +#: builtin/branch.c:535 +msgid "(no branch)" +msgstr "(nessun branch)" + +#: builtin/branch.c:600 +msgid "some refs could not be read" +msgstr "" + +#: builtin/branch.c:613 +msgid "cannot rename the current branch while not on any." +msgstr "" + +#: builtin/branch.c:623 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "Nome del branch non valido: '%s'" + +#: builtin/branch.c:638 +msgid "Branch rename failed" +msgstr "" + +#: builtin/branch.c:642 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "" + +#: builtin/branch.c:646 +#, c-format +msgid "Branch renamed to %s, but HEAD is not updated!" +msgstr "Ramo rinominato in %s, ma HEAD non è aggiornato!" + +#: builtin/branch.c:653 +msgid "Branch is renamed, but update of config-file failed" +msgstr "" +"Il branch è stato rinominato, ma l'aggiornamento del file di configurazione " +"è fallito" + +#: builtin/branch.c:668 +#, c-format +msgid "malformed object name %s" +msgstr "nome dell'oggetto %s errato" + +#: builtin/branch.c:692 +#, c-format +msgid "could not write branch description template: %s" +msgstr "" + +#: builtin/branch.c:783 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "" + +#: builtin/branch.c:788 builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "" + +#: builtin/branch.c:808 +msgid "--column and --verbose are incompatible" +msgstr "--column e --verbose non sono compatibili" + +#: builtin/branch.c:857 +msgid "-a and -r options to 'git branch' do not make sense with a branch name" +msgstr "" +"le opzioni -a e -r per 'git branch' non hanno senso con il nome di un branch" + +#: builtin/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "%s è corretto\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "" + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "" + +#: builtin/checkout.c:113 builtin/checkout.c:146 +#, c-format +msgid "path '%s' does not have our version" +msgstr "il path '%s' non ha la nostra versione" + +#: builtin/checkout.c:115 builtin/checkout.c:148 +#, c-format +msgid "path '%s' does not have their version" +msgstr "il path '%s' non ha la loro versione" + +#: builtin/checkout.c:131 +#, c-format +msgid "path '%s' does not have all necessary versions" +msgstr "" + +#: builtin/checkout.c:175 +#, c-format +msgid "path '%s' does not have necessary versions" +msgstr "il path '%s' non ha le versioni necessarie" + +#: builtin/checkout.c:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "" + +#: builtin/checkout.c:209 +#, c-format +msgid "Unable to add merge result for '%s'" +msgstr "" + +#: builtin/checkout.c:234 builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "file index corrotto" + +#: builtin/checkout.c:264 builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "" + +#: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 +#: builtin/merge.c:812 +msgid "unable to write new index file" +msgstr "impossibile scrivere il nuovo file index" + +#: builtin/checkout.c:319 builtin/diff.c:302 builtin/merge.c:408 +msgid "diff_setup_done failed" +msgstr "diff_setup_done non riuscito" + +#: builtin/checkout.c:414 +msgid "you need to resolve your current index first" +msgstr "è necessario risolvere prima l'attuale index" + +#: builtin/checkout.c:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "" + +#: builtin/checkout.c:566 +msgid "HEAD is now at" +msgstr "HEAD si trova ora a" + +#: builtin/checkout.c:573 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Ripristina il branch '%s'\n" + +#: builtin/checkout.c:576 +#, c-format +msgid "Already on '%s'\n" +msgstr "Si è già su '%s'\n" + +#: builtin/checkout.c:580 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:582 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "" + +#: builtin/checkout.c:584 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Si è passati al branch '%s'\n" + +#: builtin/checkout.c:640 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... e %d altri.\n" + +#. The singular version +#: builtin/checkout.c:646 +#, c-format +msgid "" +"Warning: you are leaving %d commit behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgid_plural "" +"Warning: you are leaving %d commits behind, not connected to\n" +"any of your branches:\n" +"\n" +"%s\n" +msgstr[0] "" +msgstr[1] "" + +#: builtin/checkout.c:664 +#, c-format +msgid "" +"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 "" +"Se si vuole mantenerle creando un nuovo branch, questo potrebbe essere\n" +"un buon momento per farlo con:\n" +"\n" +" git branch nuovo_nome_branch %s\n" +"\n" + +#: builtin/checkout.c:694 +msgid "internal error in revision walk" +msgstr "" + +#: builtin/checkout.c:698 +msgid "Previous HEAD position was" +msgstr "La precedente posizione di HEAD era" + +#: builtin/checkout.c:724 +msgid "You are on a branch yet to be born" +msgstr "" + +#. case (1) +#: builtin/checkout.c:855 +#, c-format +msgid "invalid reference: %s" +msgstr "riferimento non valido: %s" + +#. case (1): want a tree +#: builtin/checkout.c:894 +#, c-format +msgid "reference is not a tree: %s" +msgstr "" + +#: builtin/checkout.c:974 +msgid "-B cannot be used with -b" +msgstr "-B non può essere usata con -b" + +#: builtin/checkout.c:983 +msgid "--patch is incompatible with all other options" +msgstr "--patch non è compatibile con tutte le altre opzioni" + +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detach non può essere usata con -b/-B/--orphan" + +#: builtin/checkout.c:988 +msgid "--detach cannot be used with -t" +msgstr "--detach non può essere usata con -t" + +#: builtin/checkout.c:994 +msgid "--track needs a branch name" +msgstr "--track necessita del nome di un branch" + +#: builtin/checkout.c:1001 +msgid "Missing branch name; try -b" +msgstr "Nome del branch mancante; prova con -b" + +#: builtin/checkout.c:1007 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "" + +#: builtin/checkout.c:1009 +msgid "--orphan cannot be used with -t" +msgstr "--orphan non può essere usata con -t" + +#: builtin/checkout.c:1019 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f e -m non sono compatibili" + +#: builtin/checkout.c:1053 +msgid "invalid path specification" +msgstr "" + +#: builtin/checkout.c:1061 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" + +#: builtin/checkout.c:1063 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "" + +#: builtin/checkout.c:1068 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach non prende un path come argomento" + +#: builtin/checkout.c:1071 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" + +#: builtin/checkout.c:1090 +msgid "Cannot switch branch to a non-commit." +msgstr "" + +#: builtin/checkout.c:1093 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs non sono compatibili con il passaggio ai branch." + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x e -X non possono essere usati insieme" + +#: builtin/clean.c:82 +msgid "" +"clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "" +"clean.requireForce è impostato a vero, ma né -n né -f sono state specificate; " +"clean interrotto" + +#: builtin/clean.c:85 +msgid "" +"clean.requireForce defaults to true and neither -n nor -f given; refusing to " +"clean" +msgstr "" +"clean.requireForce è vero per default, ma né -n né -f sono state specificate; " +"clean interrotto" + +#: builtin/clean.c:155 builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:159 builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Rimozione di %s\n" + +#: builtin/clean.c:162 builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "rimozione di %s non riuscita" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "il repository di riferimento '%s' non è una directory locale." + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "apertura di '%s' non riuscita" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "creazione della directory '%s' non riuscita" + +#: builtin/clone.c:308 builtin/diff.c:75 +#, c-format +msgid "failed to stat '%s'" +msgstr "stat di '%s' non riuscito" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s esiste e non è una directory" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "stat di %s non riuscito\n" + +#: builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "rimozione del link '%s' non riuscita" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "creazione del link '%s' non riuscita" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "copia del file in '%s' non riuscita" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "fatto.\n" + +#: builtin/clone.c:440 +#, c-format +msgid "Could not find remote branch %s to clone." +msgstr "Non è stato possibile trovare il branch remoto %s da clonare." + +#: builtin/clone.c:549 +msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" +msgstr "" +"l'HEAD remoto si riferisce ad un ref inesistente, impossibile eseguire il " +"checkout.\n" + +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "Troppi argomenti." + +#: builtin/clone.c:643 +msgid "You must specify a repository to clone." +msgstr "Devi specificare un repository da clonare." + +#: builtin/clone.c:654 +#, c-format +msgid "--bare and --origin %s options are incompatible." +msgstr "le opzioni --bare e --origin %s non sono compatibili." + +#: builtin/clone.c:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "il repository '%s' non esiste" + +#: builtin/clone.c:673 +msgid "--depth is ignored in local clones; use file:// instead." +msgstr "" + +#: builtin/clone.c:683 +#, c-format +msgid "destination path '%s' already exists and is not an empty directory." +msgstr "" +"il path di destinazione '%s' esiste già e non è una directory vuota." + +#: builtin/clone.c:693 +#, c-format +msgid "working tree '%s' already exists." +msgstr "" + +#: builtin/clone.c:706 builtin/clone.c:720 +#, c-format +msgid "could not create leading directories of '%s'" +msgstr "" + +#: builtin/clone.c:709 +#, c-format +msgid "could not create work tree dir '%s'." +msgstr "" + +#: builtin/clone.c:728 +#, c-format +msgid "Cloning into bare repository '%s'...\n" +msgstr "Clone nel repository spoglio '%s'...\n" + +#: builtin/clone.c:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "" + +#: builtin/clone.c:786 +#, c-format +msgid "Don't know how to clone %s" +msgstr "Non so come clonare %s" + +#: builtin/clone.c:835 +#, c-format +msgid "Remote branch %s not found in upstream %s" +msgstr "Il branch remoto %s non è stato trovato in upstream %s" + +#: builtin/clone.c:842 +msgid "You appear to have cloned an empty repository." +msgstr "Sembra che tu abbia clonato un repository vuoto." + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "--command deve essere il primo argomento" + +#: builtin/commit.c:43 +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 "" +"Il tuo nome e l'indirizzo email sono stati configurati automaticamente usando\n" +"il tuo nome utente ed il nome host. Per favore, verifica che siano esatti.\n" +"È possibile eliminare questo messaggio impostandoli esplicitamente:\n" +"\n" +" git config --global user.name \"Tuo Nome\"\n" +" git config --global user.email tu@esempio.com\n" +"\n" +"Dopo questa operazione, puoi ripristinare l'identità usata in questo commit con:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:55 +msgid "" +"You asked to amend the most recent commit, but doing so would make\n" +"it empty. You can repeat your command with --allow-empty, or you can\n" +"remove the commit entirely with \"git reset HEAD^\".\n" +msgstr "" + +#: builtin/commit.c:60 +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" +"Otherwise, please use 'git reset'\n" +msgstr "" + +#: builtin/commit.c:253 +msgid "failed to unpack HEAD tree object" +msgstr "" + +#: builtin/commit.c:295 +msgid "unable to create temporary index" +msgstr "" + +#: builtin/commit.c:301 +msgid "interactive add failed" +msgstr "add interattivo non riuscito" + +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 +msgid "unable to write new_index file" +msgstr "impossibile scrivere il file new_index" + +#: builtin/commit.c:386 +msgid "cannot do a partial commit during a merge." +msgstr "impossibile eseguire un commit parziale durante un merge." + +#: builtin/commit.c:388 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "impossibile eseguire un commit parziale durante un cherry-pick." + +#: builtin/commit.c:398 +msgid "cannot read the index" +msgstr "impossibile leggere index" + +#: builtin/commit.c:418 +msgid "unable to write temporary index file" +msgstr "" + +#: builtin/commit.c:493 builtin/commit.c:499 +#, c-format +msgid "invalid commit: %s" +msgstr "commit non valido: %s" + +#: builtin/commit.c:522 +msgid "malformed --author parameter" +msgstr "parametro --author malformato" + +#: builtin/commit.c:582 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "" + +#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 +#, c-format +msgid "could not lookup commit %s" +msgstr "non è stato possibile trovare il commit %s" + +#: builtin/commit.c:632 builtin/shortlog.c:296 +#, c-format +msgid "(reading log message from standard input)\n" +msgstr "(lettura del messaggio di log dallo standard input)\n" + +#: builtin/commit.c:634 +msgid "could not read log from standard input" +msgstr "non è stato possibile leggere il log dallo standard input" + +#: builtin/commit.c:638 +#, c-format +msgid "could not read log file '%s'" +msgstr "non è stato possibile leggere il file di log '%s'" + +#: builtin/commit.c:644 +msgid "commit has empty message" +msgstr "il commit ha un messaggio vuoto" + +#: builtin/commit.c:660 +msgid "could not read MERGE_MSG" +msgstr "non è stato possibile leggere MERGE_MSG" + +#: builtin/commit.c:664 +msgid "could not read SQUASH_MSG" +msgstr "non è stato possibile leggere SQUASH_MSG" + +#: builtin/commit.c:668 +#, c-format +msgid "could not read '%s'" +msgstr "non è stato possibile leggere '%s'" + +#: builtin/commit.c:720 +msgid "could not write commit template" +msgstr "non è stato possibile scrivere il modello di commit" + +#: builtin/commit.c:731 +#, 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" +"Sembra che si stia eseguendo il commit di un merge.\n" +"Se l'operazione non è corretta, per favore elimina il file\n" +"\t%s\n" +"e riprova.\n" + +#: builtin/commit.c:736 +#, 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" +"Sembra che si stia eseguendo il commit di un cherry-pick.\n" +"Se l'operazione non è corretta, per favore rimuovi il file\n" +"\t%s\n" +"e riprova.\n" + +#: builtin/commit.c:748 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Per favore inserisci il messaggio di commit per le modifiche. Le righe\n" +"che iniziano con '#' verranno ignorate, e un messaggio vuoto annulla il commit.\n" + +#: builtin/commit.c:753 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Per favore inserisci il messaggio di commit per le modifiche. Le\n" +"righe che iniziano con '#' verranno mantenute; possono comunque essere\n" +"rimosse manualmente. Un messaggio vuoto annulla il commit.\n" + +#: builtin/commit.c:766 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sAutore: %s" + +#: builtin/commit.c:773 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sCommitter: %s" + +#: builtin/commit.c:793 +msgid "Cannot read index" +msgstr "Impossibile leggere index" + +#: builtin/commit.c:830 +msgid "Error building trees" +msgstr "" + +#: builtin/commit.c:845 builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Per favore, specifica il messaggio usando l'opzione -m o -F.\n" + +#: builtin/commit.c:942 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Nessun autore esistente trovato con '%s'" + +#: builtin/commit.c:957 builtin/commit.c:1157 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "" + +#: builtin/commit.c:997 +msgid "Using both --reset-author and --author does not make sense" +msgstr "L'uso di entrambe le opzioni --reset-author e --author non ha senso" + +#: builtin/commit.c:1008 +msgid "You have nothing to amend." +msgstr "" + +#: builtin/commit.c:1011 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "" + +#: builtin/commit.c:1013 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "" + +#: builtin/commit.c:1016 +msgid "Options --squash and --fixup cannot be used together" +msgstr "Le opzioni --squash e --fixup non possono essere usate insieme" + +#: builtin/commit.c:1026 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Solo una delle opzioni -c/-C/-F/--fixup può essere usata." + +#: builtin/commit.c:1028 +msgid "Option -m cannot be combined with -c/-C/-F/--fixup." +msgstr "L'opzione -m non può essere combinata con -c/-C/-F/--fixup." + +#: builtin/commit.c:1036 +msgid "--reset-author can be used only with -C, -c or --amend." +msgstr "L'opzione --reset-author può essere usata solo con -C, -c o --amend." + +#: builtin/commit.c:1053 +msgid "Only one of --include/--only/--all/--interactive/--patch can be used." +msgstr "" +"Può essere usata solo una delle opzioni --include/--only/--all/--" +"interactive/--patch ." + +#: builtin/commit.c:1055 +msgid "No paths with --include/--only does not make sense." +msgstr "Devi specificare un path se usi --include/--only." + +#: builtin/commit.c:1057 +msgid "Clever... amending the last one with dirty index." +msgstr "" + +#: builtin/commit.c:1059 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "" + +#: builtin/commit.c:1069 builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "" + +#: builtin/commit.c:1074 +msgid "Paths with -a does not make sense." +msgstr "I path con -a non hanno senso." + +#: builtin/commit.c:1257 +msgid "couldn't look up newly created commit" +msgstr "non è stato possibile trovare il commit appena creato" + +#: builtin/commit.c:1259 +msgid "could not parse newly created commit" +msgstr "non è stato possibile analizzare il commit appena creato" + +#: builtin/commit.c:1300 +msgid "detached HEAD" +msgstr "" + +#: builtin/commit.c:1302 +msgid " (root-commit)" +msgstr " (root-commit)" + +#: builtin/commit.c:1446 +msgid "could not parse HEAD commit" +msgstr "non è stato possibile analizzare il commit HEAD" + +#: builtin/commit.c:1484 builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "non è stato possibile aprire '%s' per la lettura" + +#: builtin/commit.c:1491 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "File MERGE_HEAD corrotto (%s)" + +#: builtin/commit.c:1498 +msgid "could not read MERGE_MODE" +msgstr "non è stato possibile leggere MERGE_MODE" + +#: builtin/commit.c:1517 +#, c-format +msgid "could not read commit message: %s" +msgstr "non è stato possibile leggere il messaggio di commit: %s" + +#: builtin/commit.c:1531 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Commit interrotto; il messaggio non è stato modificato.\n" + +#: builtin/commit.c:1536 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Interruzione del commit a causa di un messaggio di commit vuoto.\n" + +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 +msgid "failed to write commit object" +msgstr "scrittura dell'oggetto di commit non riuscita" + +#: builtin/commit.c:1572 +msgid "cannot lock HEAD ref" +msgstr "" + +#: builtin/commit.c:1576 +msgid "cannot update HEAD ref" +msgstr "" + +#: builtin/commit.c:1587 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full or quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "" +"Il repository è stato aggiornato, ma non è stato possibile scrivere il file\n" +"new_index. Verifica che l'unità disco non sia piena o che la quota non sia\n" +"stata superata, ed esegui \"git reset HEAD\" per il ripristino." + +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "" + +#: builtin/describe.c:238 +#, c-format +msgid "annotated tag %s has no embedded name" +msgstr "" + +#: builtin/describe.c:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "il tag '%s' è davvero '%s' qui" + +#: builtin/describe.c:267 +#, c-format +msgid "Not a valid object name %s" +msgstr "Non è il nome di un oggetto valido %s" + +#: builtin/describe.c:270 +#, c-format +msgid "%s is not a valid '%s' object" +msgstr "%s non è un oggetto '%s' valido" + +#: builtin/describe.c:287 +#, c-format +msgid "no tag exactly matches '%s'" +msgstr "nessun tag corrisponde esattamente a '%s'" + +#: builtin/describe.c:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "" + +#: builtin/describe.c:329 +#, c-format +msgid "finished search at %s\n" +msgstr "" + +#: builtin/describe.c:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" + +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Nessun tag può descrivere '%s'.\n" +"Prova con --always, o crea dei tag." + +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "" + +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long non è compatibile con --abbrev=0" + +#: builtin/describe.c:462 +msgid "No names found, cannot describe anything." +msgstr "" + +#: builtin/describe.c:482 +msgid "--dirty is incompatible with committishes" +msgstr "" + +#: builtin/diff.c:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': non è un file regolare o un link simbolico" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "opzione non valida: %s" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "Non è un repository git" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "oggetto non valido '%s' specificato." + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "" + +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "più di due blob specificati: '%s'" + +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "oggetto non gestito '%s' specificato." + +#: builtin/fetch.c:200 +msgid "Couldn't find remote ref HEAD" +msgstr "" + +#: builtin/fetch.c:253 +#, c-format +msgid "object %s not found" +msgstr "oggetto %s non trovato" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[aggiornato]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "" + +#: builtin/fetch.c:274 builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[respinto]" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[tag aggiornata]" + +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr " (impossibile aggiornare il ref locale)" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[nuova tag]" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[nuovo branch]" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[nuovo ref]" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "impossibile aggiornare il ref locale" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "aggiornamento forzato" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "" + +#: builtin/fetch.c:393 builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "impossibile aprire %s: %s\n" + +#: builtin/fetch.c:402 +#, c-format +msgid "%s did not send all necessary objects\n" +msgstr "%s non ha inviato tutti gli oggetti necessari\n" + +#: builtin/fetch.c:488 +#, c-format +msgid "From %.*s\n" +msgstr "Da %.*s\n" + +#: builtin/fetch.c:499 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"non è stato possibile aggiornare alcuni ref locali; prova con\n" +" 'git remote prune %s' per rimuovere ogni branch che vada in conflitto" + +#: builtin/fetch.c:549 +#, c-format +msgid " (%s will become dangling)" +msgstr "" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr "" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[eliminato]" + +#: builtin/fetch.c:558 builtin/remote.c:1055 +msgid "(none)" +msgstr "(nessuno)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "" + +#: builtin/fetch.c:709 +#, c-format +msgid "Don't know how to fetch from %s" +msgstr "" + +#: builtin/fetch.c:786 +#, c-format +msgid "Option \"%s\" value \"%s\" is not valid for %s" +msgstr "" + +#: builtin/fetch.c:789 +#, c-format +msgid "Option \"%s\" is ignored for %s\n" +msgstr "L'opzione \"%s\" è ignorata per %s\n" + +#: builtin/fetch.c:888 +#, c-format +msgid "Fetching %s\n" +msgstr "" + +#: builtin/fetch.c:890 builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "" + +#: builtin/fetch.c:907 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Nessun repository remoto specificato. Per favore, specifica un URL o\n" +"il nome di un remote da cui prelevare nuove revisioni." + +#: builtin/fetch.c:927 +msgid "You need to specify a tag name." +msgstr "Devi specificare il nome di un tag." + +#: builtin/fetch.c:979 +msgid "fetch --all does not take a repository argument" +msgstr "fetch --all non richiede il repository come argomento" + +#: builtin/fetch.c:981 +msgid "fetch --all does not make sense with refspecs" +msgstr "" + +#: builtin/fetch.c:992 +#, c-format +msgid "No such remote or remote group: %s" +msgstr "" + +#: builtin/fetch.c:1000 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "%s non valido: '%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "" + +#: builtin/gc.c:221 +#, c-format +msgid "Auto packing the repository for optimum performance.\n" +msgstr "" + +#: builtin/gc.c:224 +#, c-format +msgid "" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" +msgstr "" + +#: builtin/gc.c:251 +msgid "" +"There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "" + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: creazione del thread non riuscita: %s" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "" + +#: builtin/grep.c:478 builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "impossibile leggere il tree (%s)" + +#: builtin/grep.c:526 +#, c-format +msgid "unable to grep from object of type %s" +msgstr "" + +#: builtin/grep.c:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "switch '%c' richiede un valore numerico" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "impossibile aprire '%s'" + +#: builtin/grep.c:885 +msgid "no pattern given." +msgstr "nessun modello specificato." + +#: builtin/grep.c:899 +#, c-format +msgid "bad object %s" +msgstr "oggetto %s errato" + +#: builtin/grep.c:940 +msgid "--open-files-in-pager only works on the worktree" +msgstr "" + +#: builtin/grep.c:963 +msgid "--cached or --untracked cannot be used with --no-index." +msgstr "--cached o --untracked non può essere usato con --no-index." + +#: builtin/grep.c:968 +msgid "--no-index or --untracked cannot be used with revs." +msgstr "--no-index o --untracked non possono essere usate con le revisioni." + +#: builtin/grep.c:971 +msgid "--[no-]exclude-standard cannot be used for tracked contents." +msgstr "" + +#: builtin/grep.c:979 +msgid "both --cached and trees are given." +msgstr "" + +#: builtin/help.c:59 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "formato di aiuto '%s' non riconosciuto" + +#: builtin/help.c:87 +msgid "Failed to start emacsclient." +msgstr "Esecuzione di emacsclient non riuscita." + +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." +msgstr "Verifica della versione di emacsclient non riuscita." + +#: builtin/help.c:108 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "la versione '%d' di emacsclient è troppo vecchia (<22)." + +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "esecuzione di '%s' non riuscita: %s" + +#: builtin/help.c:211 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"'%s': path ad un visualizzatore man pages non supportato.\n" +"Usa invece 'man.<tool>.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 per visualizzatore man pages supportato.\n" +"Per favore usa 'man.<tool>.path' invece." + +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" +msgstr "I comandi git usati più di frequente sono:" + +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': visualizzatore man sconosciuto." + +#: builtin/help.c:372 +msgid "no man viewer handled the request" +msgstr "nessun visualizzatore man ha gestito la richiesta" + +#: builtin/help.c:380 +msgid "no info viewer handled the request" +msgstr "nessun visualizzatore info ha gestito la richiesta" + +#: builtin/help.c:391 +#, c-format +msgid "'%s': not a documentation directory." +msgstr "'%s': non è una directory della documentazione." + +#: builtin/help.c:432 builtin/help.c:439 +#, c-format +msgid "usage: %s%s" +msgstr "uso: %s%s" + +#: builtin/help.c:453 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "'git %s è un alias di '%s'" + +#: builtin/index-pack.c:169 +#, c-format +msgid "object type mismatch at %s" +msgstr "" + +#: builtin/index-pack.c:189 +msgid "object of unexpected type" +msgstr "" + +#: builtin/index-pack.c:226 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:236 +msgid "early EOF" +msgstr "EOF prematuro" + +#: builtin/index-pack.c:237 +msgid "read error on input" +msgstr "errore di lettura in input" + +#: builtin/index-pack.c:249 +msgid "used more bytes than were available" +msgstr "usati più byte di quelli disponibili" + +#: builtin/index-pack.c:256 +msgid "pack too large for current definition of off_t" +msgstr "pack troppo largo per la definizione corrente di off_t" + +#: builtin/index-pack.c:272 +#, c-format +msgid "unable to create '%s'" +msgstr "impossibile creare '%s'" + +#: builtin/index-pack.c:277 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "impossibile aprire il file pack '%s'" + +#: builtin/index-pack.c:291 +msgid "pack signature mismatch" +msgstr "la firma del pack non coincide" + +#: builtin/index-pack.c:311 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "" + +#: builtin/index-pack.c:405 +#, c-format +msgid "inflate returned %d" +msgstr "" + +#: builtin/index-pack.c:450 +msgid "offset value overflow for delta base object" +msgstr "" + +#: builtin/index-pack.c:458 +msgid "delta base offset is out of bound" +msgstr "" + +#: builtin/index-pack.c:466 +#, c-format +msgid "unknown object type %d" +msgstr "tipo di oggetto %d sconosciuto" + +#: builtin/index-pack.c:495 +msgid "cannot pread pack file" +msgstr "" + +#: builtin/index-pack.c:497 +#, c-format +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "" +msgstr[1] "" + +#: builtin/index-pack.c:510 +msgid "serious inflate inconsistency" +msgstr "" + +#: builtin/index-pack.c:583 +#, c-format +msgid "cannot read existing object %s" +msgstr "non è possibile leggere l'oggetto %s esistente" + +#: builtin/index-pack.c:586 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "TROVATA COLLISIONE SHA1 CON %s !" + +#: builtin/index-pack.c:598 +#, c-format +msgid "invalid blob object %s" +msgstr "oggetto blob %s non valido" + +#: builtin/index-pack.c:610 +#, c-format +msgid "invalid %s" +msgstr "%s non valido" + +#: builtin/index-pack.c:612 +msgid "Error in object" +msgstr "Errore nell'oggetto" + +#: builtin/index-pack.c:614 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "Non tutti gli oggetti figlio di %s sono raggiungibili" + +#: builtin/index-pack.c:687 builtin/index-pack.c:713 +msgid "failed to apply delta" +msgstr "applicazione del delta non riuscita" + +#: builtin/index-pack.c:850 +msgid "Receiving objects" +msgstr "Ricezione degli oggetti" + +#: builtin/index-pack.c:850 +msgid "Indexing objects" +msgstr "Indicizzazione degli oggetti" + +#: builtin/index-pack.c:872 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "il pack è corrotto (SHA1 non corrisponde)" + +#: builtin/index-pack.c:877 +msgid "cannot fstat packfile" +msgstr "" + +#: builtin/index-pack.c:880 +msgid "pack has junk at the end" +msgstr "" + +#: builtin/index-pack.c:903 +msgid "Resolving deltas" +msgstr "Risoluzione dei delta" + +#: builtin/index-pack.c:954 +msgid "confusion beyond insanity" +msgstr "confusione al di là della follia" + +#: builtin/index-pack.c:973 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "pack ha %d delta irrisolto" +msgstr[1] "pack ha %d delta irrisolti" + +#: builtin/index-pack.c:998 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "" + +#: builtin/index-pack.c:1077 +#, c-format +msgid "local object %s is corrupt" +msgstr "l'oggetto locale %s è corrotto" + +#: builtin/index-pack.c:1101 +msgid "error while closing pack file" +msgstr "errore nella chiusura del file pack" + +#: builtin/index-pack.c:1114 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "impossibile scrivere il file keep '%s'" + +#: builtin/index-pack.c:1122 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "" + +#: builtin/index-pack.c:1135 +msgid "cannot store pack file" +msgstr "impossibile archiviare il file pack" + +#: builtin/index-pack.c:1146 +msgid "cannot store index file" +msgstr "impossibile archiviare index file" + +#: builtin/index-pack.c:1247 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Impossibile aprire il file pack '%s' esistente" + +#: builtin/index-pack.c:1249 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "" + +#: builtin/index-pack.c:1296 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "non delta: %d oggetto" +msgstr[1] "non delta: %d oggetti" + +#: builtin/index-pack.c:1303 +#, c-format +msgid "chain length = %d: %lu object" +msgid_plural "chain length = %d: %lu objects" +msgstr[0] "lunghezza della catena = %d: %lu oggetto" +msgstr[1] "lunghezza della catena = %d: %lu oggetti" + +#: builtin/index-pack.c:1330 +msgid "Cannot come back to cwd" +msgstr "" + +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393 +#, c-format +msgid "bad %s" +msgstr "%s errato" + +#: builtin/index-pack.c:1407 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin non può essere usato senza --stdin" + +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "il nome del file pack '%s' non termina con '.pack'" + +#: builtin/index-pack.c:1430 +msgid "--verify with no packfile name given" +msgstr "--verify senza un nome del file pack specificato" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Non è stato possible rendere %s scrivibile dal gruppo" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "impossibile eseguire lo stat di '%s'" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "" + +#: builtin/init-db.c:322 builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s esiste già" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "impossibile gestire il tipo di file %d" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "impossibile spostare %s in %s" + +#: builtin/init-db.c:362 +#, c-format +msgid "Could not create git link %s" +msgstr "Non è stato possibile creare il link git %s" + +#. +#. * TRANSLATORS: The first '%s' is either "Reinitialized +#. * existing" or "Initialized empty", the second " shared" or +#. * "", and the last '%s%s' is the verbatim directory name. +#. +#: builtin/init-db.c:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s repository Git in %s%s\n" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "Reinizializzato un esistente" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "Inizializzato un" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr " condiviso" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "" + +#: builtin/init-db.c:521 builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "" + +#: builtin/init-db.c:554 +#, c-format +msgid "" +"%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-" +"dir=<directory>)" +msgstr "" +"%s (o --work-tree=<directory>) non consentito senza specificare %s (o --git-" +"dir=<directory>)" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "Impossibile accedere alla directory di lavoro corrente" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "" + +#: builtin/log.c:188 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Output finale: %d %s\n" + +#: builtin/log.c:401 builtin/log.c:489 +#, c-format +msgid "Could not read object %s" +msgstr "Non è stato possibile leggere l'oggetto %s" + +#: builtin/log.c:513 +#, c-format +msgid "Unknown type: %d" +msgstr "Tipo sconosciuto: %d" + +#: builtin/log.c:602 +msgid "format.headers without value" +msgstr "format.headers non ha alcun valore" + +#: builtin/log.c:676 +msgid "name of output directory is too long" +msgstr "il nome della directory di output è troppo lungo" + +#: builtin/log.c:687 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Impossibile aprire il file patch %s" + +#: builtin/log.c:701 +msgid "Need exactly one range." +msgstr "" + +#: builtin/log.c:709 +msgid "Not a range." +msgstr "" + +#: builtin/log.c:786 +msgid "Cover letter needs email format" +msgstr "" + +#: builtin/log.c:859 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "" + +#: builtin/log.c:932 +msgid "Two output directories?" +msgstr "Due directory di output?" + +#: builtin/log.c:1153 +#, c-format +msgid "bogus committer info %s" +msgstr "" + +#: builtin/log.c:1198 +msgid "-n and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1200 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "" + +#: builtin/log.c:1208 +msgid "--name-only does not make sense" +msgstr "--name-only non ha senso" + +#: builtin/log.c:1210 +msgid "--name-status does not make sense" +msgstr "--name-status non ha senso" + +#: builtin/log.c:1212 +msgid "--check does not make sense" +msgstr "--check non ha senso" + +#: builtin/log.c:1235 +msgid "standard output, or directory, which one?" +msgstr "standard output, o directory, quale dei due?" + +#: builtin/log.c:1237 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Non è stato possibile creare la directory '%s'" + +#: builtin/log.c:1390 +msgid "Failed to create output files" +msgstr "Creazione dei file di output non riuscita" + +#: builtin/log.c:1494 +#, c-format +msgid "" +"Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "" + +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524 +#, c-format +msgid "Unknown commit %s" +msgstr "Commit %s sconosciuto" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "lo switch 'm' richiede un valore" + +#: builtin/merge.c:127 +#, c-format +msgid "Could not find merge strategy '%s'.\n" +msgstr "Non è stato possibile trovare la strategia di merge '%s'.\n" + +#: builtin/merge.c:128 +#, c-format +msgid "Available strategies are:" +msgstr "Le strategie disponibili sono:" + +#: builtin/merge.c:133 +#, c-format +msgid "Available custom strategies are:" +msgstr "Le strategie personalizzate disponibili sono:" + +#: builtin/merge.c:240 +msgid "could not run stash." +msgstr "non è stato possibile eseguire stash." + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "esecuzione di stash non riuscita" + +#: builtin/merge.c:250 +#, c-format +msgid "not a valid object: %s" +msgstr "non è un oggetto valido: %s" + +#: builtin/merge.c:269 builtin/merge.c:286 +msgid "read-tree failed" +msgstr "read-tree non riuscito" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr "" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "Scrittura di SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Completamento di SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Nessun messaggio di merge -- HEAD non viene aggiornato\n" + +#: builtin/merge.c:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' non punta ad un commit" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Stringa branch.%s.mergeoptions errata: %s" + +#: builtin/merge.c:629 +msgid "git write-tree failed to write a tree" +msgstr "" + +#: builtin/merge.c:679 +msgid "failed to read the cache" +msgstr "lettura della cache non riuscita" + +#: builtin/merge.c:697 +msgid "Unable to write index." +msgstr "Impossibile scrivere index." + +#: builtin/merge.c:710 +msgid "Not handling anything other than two heads merge." +msgstr "" + +#: builtin/merge.c:724 +#, c-format +msgid "Unknown option for merge-recursive: -X%s" +msgstr "Opzione per merge-recursive sconosciuta: -X%s" + +#: builtin/merge.c:738 +#, c-format +msgid "unable to write %s" +msgstr "non è possibile scrivere %s" + +#: builtin/merge.c:877 +#, c-format +msgid "Could not read from '%s'" +msgstr "Non è stato possibile leggere da '%s'" + +#: builtin/merge.c:886 +#, c-format +msgid "Not committing merge; use 'git commit' to complete the merge.\n" +msgstr "" + +#: builtin/merge.c:892 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" + +#: builtin/merge.c:916 +msgid "Empty commit message." +msgstr "Messaggio di commit vuoto." + +#: builtin/merge.c:928 +#, c-format +msgid "Wonderful.\n" +msgstr "Splendido.\n" + +#: builtin/merge.c:993 +#, c-format +msgid "Automatic merge failed; fix conflicts and then commit the result.\n" +msgstr "" +"Merge automatico fallito; risolvi i conflitti ed eseguire il commit\n" +"del risultato.\n" + +#: builtin/merge.c:1009 +#, c-format +msgid "'%s' is not a commit" +msgstr "'%s' non è un commit" + +#: builtin/merge.c:1050 +msgid "No current branch." +msgstr "Nessun branch corrente." + +#: builtin/merge.c:1052 +msgid "No remote for the current branch." +msgstr "Nessun remote per il branch corrente." + +#: builtin/merge.c:1054 +msgid "No default upstream defined for the current branch." +msgstr "Nessun upstream di default definito per il branch corrente." + +#: builtin/merge.c:1059 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "" + +#: builtin/merge.c:1146 builtin/merge.c:1303 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - non è qualcosa per cui possiamo eseguire il merge" + +#: builtin/merge.c:1214 +msgid "There is no merge to abort (MERGE_HEAD missing)." +msgstr "Non c'è nessun merge da interrompere (manca MERGE_HEAD)" + +#: builtin/merge.c:1230 git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Il merge non è stato concluso (esiste MERGE_HEAD).\n" +"Per favore, esegui il commit delle modifiche prima del merge." + +#: builtin/merge.c:1233 git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Il merge non è stato concluso (esiste MERGE_HEAD)." + +#: builtin/merge.c:1237 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Il cherry-pick non è stato concluso (esiste CHERRY_PICK_HEAD).\n" +"Per favore, esegui il commit delle modifiche prima del merge." + +#: builtin/merge.c:1240 +msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." +msgstr "Il tuo cherry-pick non è stato concluso (CHERRY_PICK_HEAD esiste)." + +#: builtin/merge.c:1249 +msgid "You cannot combine --squash with --no-ff." +msgstr "Impossibile combinare --squash con --no-off." + +#: builtin/merge.c:1254 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Impossibile combinare --no-ff con --ff-only." + +#: builtin/merge.c:1261 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Nessun commit specificato e merge.defaultToUpstream non definito." + +#: builtin/merge.c:1293 +msgid "Can merge only exactly one commit into empty head" +msgstr "" + +#: builtin/merge.c:1296 +msgid "Squash commit into empty head not supported yet" +msgstr "" + +#: builtin/merge.c:1298 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "" + +#: builtin/merge.c:1413 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Aggiornamento di %s..%s\n" + +#: builtin/merge.c:1451 +#, c-format +msgid "Trying really trivial in-index merge...\n" +msgstr "" + +#: builtin/merge.c:1458 +#, c-format +msgid "Nope.\n" +msgstr "No.\n" + +#: builtin/merge.c:1490 +msgid "Not possible to fast-forward, aborting." +msgstr "Fast-forward non possibile, stop." + +#: builtin/merge.c:1513 builtin/merge.c:1592 +#, c-format +msgid "Rewinding the tree to pristine...\n" +msgstr "" + +#: builtin/merge.c:1517 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Tentativo con la strategia di merge %s...\n" + +#: builtin/merge.c:1583 +#, c-format +msgid "No merge strategy handled the merge.\n" +msgstr "Nessuna strategia di merge ha gestito il merge.\n" + +#: builtin/merge.c:1585 +#, c-format +msgid "Merge with strategy %s failed.\n" +msgstr "Merge con la strategia %s fallito.\n" + +#: builtin/merge.c:1594 +#, c-format +msgid "Using the %s to prepare resolving by hand.\n" +msgstr "" + +#: builtin/merge.c:1606 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "" +"Il merge automatico è andato a buon fine; fermato prima del commit come " +"richiesto\n" + +#: builtin/mv.c:108 +#, c-format +msgid "Checking rename of '%s' to '%s'\n" +msgstr "" + +#: builtin/mv.c:112 +msgid "bad source" +msgstr "" + +#: builtin/mv.c:115 +msgid "can not move directory into itself" +msgstr "non è possibile spostare la directory in sé stessa" + +#: builtin/mv.c:118 +msgid "cannot move directory over file" +msgstr "non è possibile spostare la directory su un file" + +#: builtin/mv.c:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Eh? %.*s si trova in index?" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "la directory sorgente è vuota" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "non è sotto controllo di versione" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "la destinazione esiste" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "sovrascrittura di %s in corso" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Impossibile sovrascrivere" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "fonti multiple per la stessa destinazione" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, sorgente=%s, destinazione=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Rinominazione di %s in %s in corso\n" + +#: builtin/mv.c:215 builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "rinomina di '%s' non riuscita" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "impossibile avviare 'show' per l'oggetto '%s'" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "" + +#: builtin/notes.c:175 builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "non è stato possibile creare il file '%s'" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Per favore specifica il contenuto delle note usando le opzioni -m o -F" + +#: builtin/notes.c:210 builtin/notes.c:973 +#, c-format +msgid "Removing note for object %s\n" +msgstr "Rimozione della nota per l'oggetto %s\n" + +#: builtin/notes.c:215 +msgid "unable to write note object" +msgstr "impossibile scrivere l'oggetto nota" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Il contenuto della nota è stato lasciato in %s" + +#: builtin/notes.c:251 builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "impossibile leggere '%s'" + +#: builtin/notes.c:253 builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "non è stato possibile aprire o leggere '%s'" + +#: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 +#: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 +#: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "" + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Lettura dell'oggetto '%s' non riuscita." + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Valore di notes.rewriteMode errato: '%s'" + +#: builtin/notes.c:350 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Impossibile riscrivere le note in %s (al di fuori di refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Valore di %s errato: '%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Riga di input malformata: '%s'." + +#: builtin/notes.c:456 +#, c-format +msgid "Failed to copy notes from '%s' to '%s'" +msgstr "Copia delle note da '%s' a '%s' non riuscita" + +#: builtin/notes.c:500 builtin/notes.c:554 builtin/notes.c:627 +#: builtin/notes.c:639 builtin/notes.c:712 builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "troppi parametri" + +#: builtin/notes.c:513 builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "Nessuna nota trovata per l'oggetto %s." + +#: builtin/notes.c:580 +#, c-format +msgid "" +"Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" + +#: builtin/notes.c:585 builtin/notes.c:662 +#, c-format +msgid "Overwriting existing notes for object %s\n" +msgstr "Sovrascrittura delle note esistenti per l'oggetto %s\n" + +#: builtin/notes.c:635 +msgid "too few parameters" +msgstr "troppi pochi parametri" + +#: builtin/notes.c:656 +#, c-format +msgid "" +"Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " +"existing notes" +msgstr "" +"Impossibile copiare le note. Trovate note esistenti per l'oggetto %s. Usa " +"'-f' per sovrascrivere le note esistenti" + +#: builtin/notes.c:668 +#, c-format +msgid "Missing notes on source object %s. Cannot copy." +msgstr "Note mancanti per l'oggetto sorgente %s. Impossibile copiare." + +#: builtin/notes.c:717 +#, 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 "" +"Le opzioni -m/-F/-c/-C per il sottocomando 'edit' sono deprecate.\n" +"Per favore usa 'git notes add -f -m/-F/-c/-C' invece.\n" + +#: builtin/notes.c:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "L'oggetto %s non ha note.\n" + +#: builtin/notes.c:1103 builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Sottocomando sconosciuto: %s" + +#: builtin/pack-objects.c:2337 +#, c-format +msgid "unsupported index version %s" +msgstr "versione %s di index non supportata" + +#: builtin/pack-objects.c:2341 +#, c-format +msgid "bad index version '%s'" +msgstr "versione '%s' di index errata" + +#: builtin/pack-objects.c:2364 +#, c-format +msgid "option %s does not accept negative form" +msgstr "l'opzione %s non accetta forme negative" + +#: builtin/pack-objects.c:2368 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "impossibile analizzare il valore '%s' per l'opzione %s" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete accetta solo nomi dei ref di destinazione in chiaro" + +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" + +#: builtin/push.c:102 +#, 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 "" + +#: builtin/push.c:121 +#, c-format +msgid "" +"You are not currently on a branch.\n" +"To push the history leading to the current (detached HEAD)\n" +"state now, use\n" +"\n" +" git push %s HEAD:<name-of-remote-branch>\n" +msgstr "" + +#: builtin/push.c:128 +#, 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 "" +"Il branch corrente %s non ha alcun branch upstream.\n" +"Per eseguire il push del branch corrente ed impostare remote come upstream, usa\n" +"\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Il branch corrente %s ha branch multipli in upstream; push non eseguito." + +#: builtin/push.c:139 +#, c-format +msgid "" +"You are pushing to remote '%s', which is not the upstream of\n" +"your current branch '%s', without telling me what to push\n" +"to update which remote branch." +msgstr "" + +#: builtin/push.c:174 +msgid "" +"You didn't specify any refspecs to push, and push.default is \"nothing\"." +msgstr "" +"Non è stato specificato alcun refspec per il push, e push.default è \"nothing\"." + +#: builtin/push.c:181 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" +"before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:187 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. If you did not intend to push that branch, you may want to\n" +"specify branches to push or set the 'push.default' configuration\n" +"variable to 'current' or 'upstream' to push only the current branch." +msgstr "" + +#: builtin/push.c:193 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and merge the remote changes\n" +"(e.g. 'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:233 +#, c-format +msgid "Pushing to %s\n" +msgstr "" + +#: builtin/push.c:237 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "" + +#: builtin/push.c:269 +#, c-format +msgid "bad repository '%s'" +msgstr "repository '%s' errato" + +#: builtin/push.c:270 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote " +"repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Nessuna destinazione per il push configurata.\n" +"Specifica un URL dalla riga di comando oppure configurare un repository " +"remoto usando\n" +"\n" +" git remote add <nome> <url>\n" +"\n" +"e poi eseguire il push usando il nome del remote\n" +"\n" +" git push <nome>\n" + +#: builtin/push.c:285 +msgid "--all and --tags are incompatible" +msgstr "--all e --tags non sono compatibili" + +#: builtin/push.c:286 +msgid "--all can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:291 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror e --tags non sono compatibili" + +#: builtin/push.c:292 +msgid "--mirror can't be combined with refspecs" +msgstr "" + +#: builtin/push.c:297 +msgid "--all and --mirror are incompatible" +msgstr "--all e --mirror non sono compatibili" + +#: builtin/push.c:385 +msgid "--delete is incompatible with --all, --mirror and --tags" +msgstr "--delete non è compatibile con --all, --mirror e --tags" + +#: builtin/push.c:387 +msgid "--delete doesn't make sense without any refs" +msgstr "--delete non ha senso senza alcun ref" + +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Aggiornamento di %s" + +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"--mirror è pericoloso e deprecato; per favore\n" +"\t usa invece --mirror-fetch o --mirror-push" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "argomento di mirror sconosciuto: %s" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "specificare un branch master con --mirror non ha senso" + +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "" + +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "il remoto %s esiste già." + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' non è un nome di remoto valido" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Non è stato possibile configurare il master '%s'" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "più di un %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "" + +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" +msgstr "(corrispondente)" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(elimina)" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Non è stato possibile aggiungere '%s' a '%s'" + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Remote non esistente: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Non è stato possibile rinominare la sezione di configurazione da '%s' in '%s'" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Non è stato possibile rimuovere la sezione di configurazione '%s'" + +#: builtin/remote.c:677 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Non è stato possibile impostare '%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "eliminazione di '%s' non riuscita" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "creazione di '%s' non riuscita" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Non è stato possibile rimuovere il branch %s" + +#: builtin/remote.c:834 +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: un branch al di fuori della gerarchia refs/remotes/ non è stato " +"eliminato;\n" +"per eliminarlo, usare:" +msgstr[1] "" +"Nota: alcuni branch al di fuori della gerarchia refs/remotes/ non sono stati " +"eliminati;\n" +"per eliminarli, usare:" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr "" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr "" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " vecchio (usare 'git remote prune' per rimuoverlo)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr "???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "" +"branch.%s.merge non valido; impossibile eseguire il rebase su > 1 branch" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " merge con il remote %s" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " e con il remote" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "merge con il remote %s" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr "" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "crea" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "elimina" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "aggiornato" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "locale non aggiornato" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr "" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr "" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr "" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s esegue il push su %s" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* remote %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr "" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(nessun URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr "" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " branch HEAD: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr "" +" branch HEAD (l'HEAD remoto è ambiguo, potrebbe essere uno dei seguenti):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Branch remoto:%s" +msgstr[1] " Branch remoti:%s" + +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" +msgstr "" + +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Branch locale configurato per 'git pull':" +msgstr[1] " Branch locali configurati per 'git pull':" + +#: builtin/remote.c:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr "" + +#: builtin/remote.c:1178 +#, c-format +msgid " Local ref configured for 'git push'%s:" +msgid_plural " Local refs configured for 'git push'%s:" +msgstr[0] " Ref locale configurato per 'git push'%s:" +msgstr[1] " Ref locali configurati per 'git push'%s:" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" +msgstr "Impossibile determinare l'HEAD remoto" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "Non è stato possibile eliminare %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Non è un ref valido: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Non è stato possibile configurare %s" + +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr "" + +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr "" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr "" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr "" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Remote '%s' non esistente" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "nessun remote specificato" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete non ha senso" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "Nessuna URL trovata: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "" + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "" + +#: builtin/reset.c:85 +#, c-format +msgid "Failed to find tree of %s." +msgstr "" + +#: builtin/reset.c:96 +msgid "Could not write new index file." +msgstr "Non è stato possibile scrivere il nuovo index file." + +#: builtin/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD ora si trova a %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "Non è stato possibile leggere index" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:223 +#, c-format +msgid "Cannot do a %s reset in the middle of a merge." +msgstr "Impossibile eseguire un %s reset nel corso di un merge." + +#: builtin/reset.c:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "Non è stato possibile analizzare l'oggetto '%s'." + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch non è compatibile con --{hard,mixed,soft}" + +#: builtin/reset.c:311 +msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." +msgstr "--mixed con i path è deprecata; usa invece 'git reset -- <path>'." + +#: builtin/reset.c:313 +#, c-format +msgid "Cannot do %s reset with paths." +msgstr "" + +#: builtin/reset.c:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s reset non è consentito in un repository spoglio" + +#: builtin/reset.c:341 +#, c-format +msgid "Could not reset index file to revision '%s'." +msgstr "" +"Non è stato possibile ripristinare index file " +"alla revisione '%s'." + +#: builtin/revert.c:70 builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s non può essere usata con %s" + +#: builtin/revert.c:131 +msgid "program error" +msgstr "errore del programma" + +#: builtin/revert.c:221 +msgid "revert failed" +msgstr "revert non riuscito" + +#: builtin/revert.c:236 +msgid "cherry-pick failed" +msgstr "cherry-pick non riuscito" + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" + +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" + +#: builtin/rm.c:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' contiene delle modifiche locali\n" +"(usa --cached per mantenere il file, o -f per forzare la rimozione)" + +#: builtin/rm.c:194 +#, c-format +msgid "not removing '%s' recursively without -r" +msgstr "" + +#: builtin/rm.c:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: non è possibile eliminare %s" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "Autore mancante: %s" + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" +msgstr "" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "nome tag troppo lungo: %.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "tag '%s' non trovato." + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Tag '%s' eliminato (era %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "non è stato possibile verificare il tag '%s'" + +#: builtin/tag.c:249 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Scrivere un messaggio associato al tag\n" +"# Le righe che iniziano con '#' verranno ignorate.\n" +"#\n" + +#: builtin/tag.c:256 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you " +"want to.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Scrivere un messaggio associato al tag\n" +"# Le righe che iniziano con '#' verranno mantenute; possono essere comunque " +"rimosse manualmente.\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "impossibile firmare il tag" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "impossibile scrivere il file di tag" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "tipo di oggetto errato." + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "intestazione del tag troppo grande." + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "nessun messaggio per il tag?" + +#: builtin/tag.c:376 +#, c-format +msgid "The tag message has been left in %s\n" +msgstr "Il messaggio del tag è stato lasciato in %s\n" + +#: builtin/tag.c:425 +msgid "switch 'points-at' requires an object" +msgstr "lo switch 'points-at' richiede un oggetto" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "nome oggetto '%s' malformato" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column e -n non sono compatibili" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "l'opzione -n è consentita solo con -l." + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "l'opzione --contains è consentita solo con -l." + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "l'opzione --points-at è consentita solo con -l." + +#: builtin/tag.c:535 +msgid "only one -F or -m option is allowed." +msgstr "è consentita una sola opzione tra -F e -m." + +#: builtin/tag.c:555 +msgid "too many params" +msgstr "troppi parametri" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' non è un nome tag valido." + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "il tag '%s' esiste già" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: impossibile riservare il ref" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: impossibile aggiornare il ref" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Tag '%s' aggiornato (era %s)\n" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "" +"Vedi 'git help <comando> per maggiori informazioni su un comando " +"specifico." + +#: parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "n" + +#: parse-options.h:141 +msgid "time" +msgstr "tempo" + +#: parse-options.h:149 +msgid "file" +msgstr "file" + +#: parse-options.h:151 +msgid "when" +msgstr "quando" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "più dettagliato" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "meno dettagliato" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "usare <n> cifre per mostrare gli hash SHA-1" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "Aggiunge il contenuto del file a index" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "Cerca mediante ricerca binaria la modifica che ha introdotto un bug" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Elenca, crea o elimina branch" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Clona un repository in una nuova directory" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Registra modifiche nel repository" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Scarica oggetti e ref da un altro repository" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "Stampa le righe corrispondenti ad un modello" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "Crea un repository git vuoto o reinizializza uno esistente" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "Mostra log del commit" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Unisce due o più cronologie di sviluppo" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Sposta o rinomina un file, una directory o un link simbolico" + +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "Combina fetche + merge da un altro repository o un branch locale" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Aggiorna i ref remoti insieme agli oggetti associati" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "Ripristina l'HEAD corrente allo stato specificato" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Mostra vari tipi di oggetti" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "Crea, elenca, elimina o verifica un oggetto tag firmato con GPG" + +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "È necessario impostare le informazioni sul committer" + +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"Quando hai risolto il problema esegui \"$cmdline --resolved\".\n" +"Se vuoi saltare questa patch, esegui invece \"$cmdline --skip\".\n" +"Per ripristinare il branch originale e interrompere l'applicazione delle " +"patch esegui \"$cmdline --abort\"." + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "" + +#: git-am.sh:137 +msgid "Repository lacks necessary blobs to fall back on 3-way merge." +msgstr "" + +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"La tua patch è stata modificata manualmente?\n" +"Non può essere applicata ai blob registrati nel proprio index." + +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "" + +#: git-am.sh:275 +msgid "Only one StGIT patch series can be applied at once" +msgstr "Può essere applicata solo una serie di patch StGIT per volta" + +#: git-am.sh:362 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Il formato patch $patch_format non è supportato." + +#: git-am.sh:364 +msgid "Patch format detection failed." +msgstr "Rilevamento del formato della patch non riuscito." + +#: git-am.sh:418 +msgid "-d option is no longer supported. Do not use." +msgstr "l'opzione -d non è più supportata. Non utilizzarla." + +#: git-am.sh:481 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "" + +#: git-am.sh:486 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Per favore, deciditi. --skip o --abort?" + +#: git-am.sh:513 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "" + +#: git-am.sh:579 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "" + +#: git-am.sh:671 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" + +#: git-am.sh:708 +msgid "Patch does not have a valid e-mail address." +msgstr "La patch non contiene un indirizzo email valido." + +#: git-am.sh:755 +msgid "cannot be interactive without stdin connected to a terminal." +msgstr "" + +#: git-am.sh:759 +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. +#: git-am.sh:766 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Applicare? sì[y]/no[n]/modifica[e]/visualizza patch[v]/accetta tutto[a] " + +#: git-am.sh:802 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "" + +#: git-am.sh:823 +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-am.sh:831 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" + +#: git-am.sh:847 +msgid "No changes -- Patch already applied." +msgstr "Nessuna modifica -- patch già applicata." + +#: git-am.sh:857 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Patch non riuscita a $msgnum $FIRSTLINE" + +#: git-am.sh:873 +msgid "applying to an empty history" +msgstr "" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Devi iniziare con \"git bisect start\"" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:54 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Vuoi che me ne occupi io [Y/n]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "opzione non riconosciuta: '$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' non sembra essere una revisione valida" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "" + +#: git-bisect.sh:130 +#, sh-format +msgid "" +"Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "" +"Checkout di '$start_head' non riuscito. Prova 'git bisect reset " +"<branch-valido>'." + +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "HEAD errato - strano ref simbolico" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Argomento bisect_write errato: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Per favore, chiama 'bisect_state' con almeno un argomento." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "'git bisect bad' può prendere un solo argomento." + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:273 +msgid "Warning: bisecting only with a bad commit." +msgstr "" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:279 +msgid "Are you sure [Y/n]? " +msgstr "Sei sicuro? [Y/n] " + +#: git-bisect.sh:289 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Devi specificare almeno una revisione corretta ed una errata.\n" +"(Puoi usare \"git bisect bad\" e \"git bisect good\" per questo scopo.)" + +#: git-bisect.sh:292 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" + +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Non stiamo eseguendo un bisect." + +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' non è un commit valido" + +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Nessun file di log specificato" + +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "" + +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? di cosa si sta parlando?" + +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "sto eseguendo $command" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"bisect run non riuscito:\n" +"il codice di uscita $res da '$command' è < 0 oppure >= 128" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "bisect run non può più proseguire" + +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"bisect run non riuscito:\n" +"bisect_state $state è uscito con il codice di errore $res" + +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "bisect run eseguito con successo" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution, or use 'git commit -a'." +msgstr "" + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "" +"Il pull non è possibile perché ci sono file di cui non è stato eseguito il " +"merge." + +#: git-pull.sh:197 +msgid "updating an unborn branch with changes added to the index" +msgstr "" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Impossibile eseguire il merge di branch multipli in un head vuoto" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Impossibile eseguire il rebase su branch multipli" + +#: git-stash.sh:51 +msgid "git stash clear with parameters is unimplemented" +msgstr "git stash clear con parametri non è implementato" + +#: git-stash.sh:74 +msgid "You do not have the initial commit yet" +msgstr "Non hai ancora un commit iniziale" + +#: git-stash.sh:89 +msgid "Cannot save the current index state" +msgstr "Impossibile salvare lo stato corrente di index" + +#: git-stash.sh:123 git-stash.sh:136 +msgid "Cannot save the current worktree state" +msgstr "" + +#: git-stash.sh:140 +msgid "No changes selected" +msgstr "Nessuna modifica selezionata" + +#: git-stash.sh:143 +msgid "Cannot remove temporary index (can't happen)" +msgstr "" + +#: git-stash.sh:156 +msgid "Cannot record working tree state" +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:202 +#, sh-format +msgid "" +"error: unknown option for 'stash save': $option\n" +" To provide a message, use git stash save -- '$option'" +msgstr "" +"errore: opzione sconosciuta per 'stash save': $option\n" +" Per aggiungere un messaggio, usare git stash save -- '$option'" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Nessuna modifica locale da salvare" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Impossibile inizializzare stash" + +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "Impossibile salvare lo stato attuale" + +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "" + +#: git-stash.sh:352 +msgid "No stash found." +msgstr "Nessuno stash trovato." + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Troppe revisioni specificate: $REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference non è un riferimento valido" + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' non è un commit di tipo stash" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' non è un referimento a uno stash" + +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "impossibile aggiornare index" + +#: git-stash.sh:416 +msgid "Cannot apply a stash in the middle of a merge" +msgstr "Impossibile applicare uno stash nel mezzo di un merge" + +#: git-stash.sh:424 +msgid "Conflicts in index. Try without --index." +msgstr "Ci sono conflitti in index. Prova senza --index." + +#: git-stash.sh:426 +msgid "Could not save index tree" +msgstr "" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "" + +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "" + +#: git-stash.sh:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "${REV} eliminata ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: non è stato possibile rimuovere la voce di stash" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "Nome del branch non specificato" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Per ripristinarli digita \"git stash apply\")" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "" + +#: git-submodule.sh:109 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:150 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "" + +#: git-submodule.sh:160 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "" + +#: git-submodule.sh:249 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "repo URL: '$repo' deve essere assoluto o iniziare con ./|../" + +#: git-submodule.sh:266 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' esiste già in index" + +#: git-submodule.sh:270 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Il seguente path è ignorato da uno dei tuoi file .gitignore:\n" +"$sm_path\n" +"Usa -f se vuoi davvero aggiungerlo." + +#: git-submodule.sh:281 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "" + +#: git-submodule.sh:283 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' esiste già e non è un repository git valido" + +#: git-submodule.sh:297 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:302 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:307 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "" + +#: git-submodule.sh:349 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "" + +#: git-submodule.sh:363 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "" +"Interruzione a '$sm_path'; lo script ha restituito uno stato diverso da zero." + +#: git-submodule.sh:406 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "" + +#: git-submodule.sh:415 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:417 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "" + +#: git-submodule.sh:425 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:524 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" + +#: git-submodule.sh:537 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:556 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:570 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:571 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "" + +#: git-submodule.sh:576 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:577 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "" + +#: git-submodule.sh:582 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:583 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "" + +#: git-submodule.sh:605 git-submodule.sh:928 +#, sh-format +msgid "Failed to recurse into submodule path '$sm_path'" +msgstr "" + +#: git-submodule.sh:713 +msgid "--cached cannot be used with --files" +msgstr "--cached non può essere usata con --files" + +#. unexpected type +#: git-submodule.sh:753 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "modalità $mod_dst inattesa" + +#: git-submodule.sh:771 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Attenzione: $name non contiene commit $sha1_src" + +#: git-submodule.sh:774 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Attenzione: $name non contiene commit $sha1_dst" + +#: git-submodule.sh:777 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " Attenzione: $name non contiene commit $sha1_src e $sha1_dst" + +#: git-submodule.sh:802 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:803 +msgid "submodule" +msgstr "sottomodulo" + +#: git-submodule.sh:840 +msgid "# Submodules changed but not updated:" +msgstr "" + +#: git-submodule.sh:842 +msgid "# Submodule changes to be committed:" +msgstr "" + +#: git-submodule.sh:974 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "" + +#~ msgid "--" +#~ msgstr "--" + +#~ msgid "Could not extract email from committer identity." +#~ msgstr "" +#~ "Non è stato possibile estrarre l'indirizzo email dall'identità del " +#~ "committer." @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: git 1.7.10\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-03-16 20:18+0800\n" -"PO-Revision-Date: 2012-03-26 07:00+0100\n" +"POT-Creation-Date: 2012-05-15 06:31+0800\n" +"PO-Revision-Date: 2012-05-28 22:35+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" "Language: sv\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:34 +#: advice.c:40 #, c-format msgid "hint: %.*s\n" msgstr "tips: %.*s\n" @@ -26,7 +26,7 @@ msgstr "tips: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:64 +#: advice.c:70 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -85,32 +85,32 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:1336 +#: diff.c:1400 msgid " 0 files changed\n" msgstr " 0 filer ändrade\n" -#: diff.c:1340 +#: diff.c:1404 #, c-format msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d fil ändrad" msgstr[1] " %d filer ändrade" -#: diff.c:1357 +#: diff.c:1421 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] ", %d tillägg(+)" msgstr[1] ", %d tillägg(+)" -#: diff.c:1368 +#: diff.c:1432 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] ", %d borttagning(-)" msgstr[1] ", %d borttagningar(-)" -#: diff.c:3424 +#: diff.c:3439 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -187,14 +187,14 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: sequencer.c:120 builtin/merge.c:864 builtin/merge.c:985 -#: builtin/merge.c:1095 builtin/merge.c:1105 +#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978 +#: builtin/merge.c:1088 builtin/merge.c:1098 #, c-format msgid "Could not open '%s' for writing" msgstr "Kunde inte öppna \"%s\" för skrivning" -#: sequencer.c:122 builtin/merge.c:334 builtin/merge.c:867 -#: builtin/merge.c:1097 builtin/merge.c:1110 +#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868 +#: builtin/merge.c:1090 builtin/merge.c:1103 #, c-format msgid "Could not write to '%s'" msgstr "Kunde inte skriva till \"%s\"" @@ -291,7 +291,7 @@ msgid "could not apply %s... %s" msgstr "kunde inte applicera %s... %s" #: sequencer.c:450 sequencer.c:909 builtin/log.c:288 builtin/log.c:713 -#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:348 +#: builtin/log.c:1329 builtin/log.c:1548 builtin/merge.c:347 #: builtin/shortlog.c:181 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -999,7 +999,7 @@ msgid "path '%s' is unmerged" msgstr "sökvägen \"%s\" har inte slagits ihop" #: builtin/checkout.c:302 builtin/checkout.c:498 builtin/clone.c:583 -#: builtin/merge.c:811 +#: builtin/merge.c:812 msgid "unable to write new index file" msgstr "kunde inte skriva ny indexfil" @@ -1089,71 +1089,71 @@ msgstr "" " git branch nytt_grennamn %s\n" "\n" -#: builtin/checkout.c:692 +#: builtin/checkout.c:693 msgid "internal error in revision walk" msgstr "internt fel vid genomgång av revisioner (revision walk)" -#: builtin/checkout.c:696 +#: builtin/checkout.c:697 msgid "Previous HEAD position was" msgstr "Tidigare position för HEAD var" -#: builtin/checkout.c:722 +#: builtin/checkout.c:723 msgid "You are on a branch yet to be born" msgstr "Du är på en gren som ännu inte är född" #. case (1) -#: builtin/checkout.c:853 +#: builtin/checkout.c:854 #, c-format msgid "invalid reference: %s" msgstr "felaktig referens: %s" #. case (1): want a tree -#: builtin/checkout.c:892 +#: builtin/checkout.c:893 #, c-format msgid "reference is not a tree: %s" msgstr "referensen är inte ett träd: %s" -#: builtin/checkout.c:972 +#: builtin/checkout.c:973 msgid "-B cannot be used with -b" msgstr "-B kan inte användas med -b" -#: builtin/checkout.c:981 +#: builtin/checkout.c:982 msgid "--patch is incompatible with all other options" msgstr "--patch är inkompatibel med alla andra flaggor" -#: builtin/checkout.c:984 +#: builtin/checkout.c:985 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detcah kan inte användas med -b/-B/--orphan" -#: builtin/checkout.c:986 +#: builtin/checkout.c:987 msgid "--detach cannot be used with -t" msgstr "--detach kan inte användas med -t" -#: builtin/checkout.c:992 +#: builtin/checkout.c:993 msgid "--track needs a branch name" msgstr "--track behöver ett namn på en gren" -#: builtin/checkout.c:999 +#: builtin/checkout.c:1000 msgid "Missing branch name; try -b" msgstr "Grennamn saknas; försök med -b" -#: builtin/checkout.c:1005 +#: builtin/checkout.c:1006 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan och -b|-B kan inte användas samtidigt" -#: builtin/checkout.c:1007 +#: builtin/checkout.c:1008 msgid "--orphan cannot be used with -t" msgstr "--orphan kan inte användas med -t" -#: builtin/checkout.c:1017 +#: builtin/checkout.c:1018 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout: -f och -m är inkompatibla" -#: builtin/checkout.c:1051 +#: builtin/checkout.c:1052 msgid "invalid path specification" msgstr "felaktig sökvägsangivelse" -#: builtin/checkout.c:1059 +#: builtin/checkout.c:1060 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1162,15 +1162,15 @@ msgstr "" "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren.\n" "Ville du checka ut \"%s\" som inte kan lösas som en sammanslaning?" -#: builtin/checkout.c:1061 +#: builtin/checkout.c:1062 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout: uppdatera sökvägar är inkompatibelt med att växla gren." -#: builtin/checkout.c:1066 +#: builtin/checkout.c:1067 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout: --detach tar inte en sökväg som argument" -#: builtin/checkout.c:1069 +#: builtin/checkout.c:1070 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." @@ -1178,11 +1178,11 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/checkout.c:1088 +#: builtin/checkout.c:1089 msgid "Cannot switch branch to a non-commit." msgstr "Kan inte växla gren på en icke-incheckning." -#: builtin/checkout.c:1091 +#: builtin/checkout.c:1092 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs är inkompatibla med att byta gren." @@ -1445,67 +1445,67 @@ msgstr "kan inte läsa indexet" msgid "unable to write temporary index file" msgstr "kunde inte skriva temporär indexfil" -#: builtin/commit.c:550 builtin/commit.c:556 +#: builtin/commit.c:561 builtin/commit.c:567 #, c-format msgid "invalid commit: %s" msgstr "felaktig incheckning: %s" -#: builtin/commit.c:579 +#: builtin/commit.c:590 msgid "malformed --author parameter" msgstr "felformad \"--author\"-flagga" -#: builtin/commit.c:635 +#: builtin/commit.c:651 #, c-format msgid "Malformed ident string: '%s'" msgstr "Felaktig indragningssträng: \"%s\"" -#: builtin/commit.c:670 builtin/commit.c:703 builtin/commit.c:1000 +#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033 #, c-format msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:682 builtin/shortlog.c:296 +#: builtin/commit.c:701 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" -#: builtin/commit.c:684 +#: builtin/commit.c:703 msgid "could not read log from standard input" msgstr "kunde inte läsa logg från standard in" -#: builtin/commit.c:688 +#: builtin/commit.c:707 #, c-format msgid "could not read log file '%s'" msgstr "kunde inte läsa loggfilen \"%s\"" -#: builtin/commit.c:694 +#: builtin/commit.c:713 msgid "commit has empty message" msgstr "incheckningen har ett tomt meddelande" -#: builtin/commit.c:710 +#: builtin/commit.c:729 msgid "could not read MERGE_MSG" msgstr "kunde inte läsa MERGE_MSG" -#: builtin/commit.c:714 +#: builtin/commit.c:733 msgid "could not read SQUASH_MSG" msgstr "kunde inte läsa SQUASH_MSG" -#: builtin/commit.c:718 +#: builtin/commit.c:737 #, c-format msgid "could not read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/commit.c:746 +#: builtin/commit.c:765 #, c-format msgid "could not open '%s'" msgstr "kunde inte öppna \"%s\"" -#: builtin/commit.c:770 +#: builtin/commit.c:789 msgid "could not write commit template" msgstr "kunde inte skriva incheckningsmall" # %s är "merge" eller "cherry-pick" -#: builtin/commit.c:783 +#: builtin/commit.c:799 #, c-format msgid "" "\n" @@ -1520,11 +1520,11 @@ msgstr "" "\t%s\n" "och försöker igen.\n" -#: builtin/commit.c:796 +#: builtin/commit.c:812 msgid "Please enter the commit message for your changes." msgstr "Ange ett incheckningsmeddelande för dina ändringar." -#: builtin/commit.c:799 +#: builtin/commit.c:815 msgid "" " Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" @@ -1532,7 +1532,7 @@ msgstr "" " Rader som inleds\n" "med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:804 +#: builtin/commit.c:820 msgid "" " Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" @@ -1542,151 +1542,156 @@ msgstr "" "med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" -#: builtin/commit.c:816 +#: builtin/commit.c:832 #, c-format msgid "%sAuthor: %s" msgstr "%sFörfattare: %s" -#: builtin/commit.c:823 +#: builtin/commit.c:839 #, c-format msgid "%sCommitter: %s" msgstr "%sIncheckare: %s" -#: builtin/commit.c:843 +#: builtin/commit.c:859 msgid "Cannot read index" msgstr "Kan inte läsa indexet" -#: builtin/commit.c:880 +#: builtin/commit.c:896 msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:895 builtin/tag.c:357 +#: builtin/commit.c:911 builtin/tag.c:357 #, 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:975 +#: builtin/commit.c:1008 #, c-format msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:990 builtin/commit.c:1182 +#: builtin/commit.c:1023 builtin/commit.c:1217 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:1030 +#: builtin/commit.c:1063 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:1041 +#: builtin/commit.c:1074 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:1043 +#: builtin/commit.c:1076 #, c-format msgid "You are in the middle of a %s -- cannot amend." msgstr "Du är i mitten av en %s -- kan inte utöka." -#: builtin/commit.c:1045 +#: builtin/commit.c:1078 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1055 +#: builtin/commit.c:1088 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:1057 +#: builtin/commit.c:1090 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:1063 +#: builtin/commit.c:1098 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:1080 +#: builtin/commit.c:1115 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:1082 +#: builtin/commit.c:1117 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:1084 +#: builtin/commit.c:1119 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1086 +#: builtin/commit.c:1121 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "Explicita sökvägar angavs utan -i eller -o; antar --only sökvägar..." -#: builtin/commit.c:1096 builtin/tag.c:556 +#: builtin/commit.c:1131 builtin/tag.c:556 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1101 +#: builtin/commit.c:1136 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1280 +#: builtin/commit.c:1315 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1282 +#: builtin/commit.c:1317 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1323 +#: builtin/commit.c:1358 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1325 +#: builtin/commit.c:1360 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1415 +#: builtin/commit.c:1450 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1452 builtin/merge.c:509 +#: builtin/commit.c:1487 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1459 +#: builtin/commit.c:1494 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1466 +#: builtin/commit.c:1501 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1485 +#: builtin/commit.c:1520 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1499 +#: builtin/commit.c:1534 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" + +#: builtin/commit.c:1539 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1514 builtin/merge.c:935 builtin/merge.c:968 +#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1535 +#: builtin/commit.c:1575 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1539 +#: builtin/commit.c:1579 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1550 +#: builtin/commit.c:1590 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -1819,68 +1824,72 @@ msgstr "ej hanterat objekt \"%s\" angavs." msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:252 +#: builtin/fetch.c:253 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:258 +#: builtin/fetch.c:259 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:272 +#: builtin/fetch.c:273 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kan inte hämta i aktuell gren)" -#: builtin/fetch.c:273 builtin/fetch.c:351 +#: builtin/fetch.c:274 builtin/fetch.c:360 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:284 +#: builtin/fetch.c:285 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:286 builtin/fetch.c:313 builtin/fetch.c:331 +#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:298 +#: builtin/fetch.c:305 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:302 +#: builtin/fetch.c:308 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:347 +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[ny ref]" + +#: builtin/fetch.c:356 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:347 +#: builtin/fetch.c:356 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:353 +#: builtin/fetch.c:362 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:384 builtin/fetch.c:676 +#: builtin/fetch.c:393 builtin/fetch.c:685 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:393 +#: builtin/fetch.c:402 #, 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:479 +#: builtin/fetch.c:488 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:490 +#: builtin/fetch.c:499 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -1889,55 +1898,55 @@ msgstr "" "vissa lokala referenser kunde inte uppdateras; testa att köra\n" " \"git remote prune %s\" för att ta bort gamla grenar som står i konflikt" -#: builtin/fetch.c:540 +#: builtin/fetch.c:549 #, c-format msgid " (%s will become dangling)\n" msgstr " (%s kommer bli dinglande)\n" -#: builtin/fetch.c:541 +#: builtin/fetch.c:550 #, c-format msgid " (%s has become dangling)\n" msgstr " (%s har blivit dinglande)\n" -#: builtin/fetch.c:548 +#: builtin/fetch.c:557 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:549 +#: builtin/fetch.c:558 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:666 +#: builtin/fetch.c:675 #, 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:700 +#: builtin/fetch.c:709 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:777 +#: builtin/fetch.c:786 #, 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:780 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:879 +#: builtin/fetch.c:888 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:881 +#: builtin/fetch.c:890 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:898 +#: builtin/fetch.c:907 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -1945,24 +1954,24 @@ msgstr "" "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:918 +#: builtin/fetch.c:927 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:970 +#: builtin/fetch.c:979 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:972 +#: builtin/fetch.c:981 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:983 +#: builtin/fetch.c:992 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:991 +#: builtin/fetch.c:1000 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -1971,21 +1980,17 @@ msgstr "Kan inte hämta från grupp och ange referensspecifikationer" msgid "Invalid %s: '%s'" msgstr "Felaktigt %s: \"%s\"" -#: builtin/gc.c:78 -msgid "Too many options specified" -msgstr "För många flaggor angavs" - -#: builtin/gc.c:103 +#: builtin/gc.c:90 #, c-format msgid "insanely long object directory %.*s" msgstr "tokigt lång objektkatalog %.*s" -#: builtin/gc.c:223 +#: builtin/gc.c:221 #, c-format msgid "Auto packing the repository for optimum performance.\n" msgstr "Packar arkivet automatiskt för optimal prestanda.\n" -#: builtin/gc.c:226 +#: builtin/gc.c:224 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -1994,7 +1999,7 @@ msgstr "" "Packar arkivet automatiskt för optimal prestanda. Du kan även\n" "köra \"git gc\" manuellt. Se \"git help gc\" för mer information.\n" -#: builtin/gc.c:256 +#: builtin/gc.c:251 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "" @@ -2311,56 +2316,56 @@ msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/merge.c:91 +#: builtin/merge.c:90 msgid "switch `m' requires a value" msgstr "flaggan \"m\" behöver ett värde" -#: builtin/merge.c:128 +#: builtin/merge.c:127 #, c-format msgid "Could not find merge strategy '%s'.\n" msgstr "Kunde inte hitta sammanslagningsstrategin \"%s\".\n" -#: builtin/merge.c:129 +#: builtin/merge.c:128 #, c-format msgid "Available strategies are:" msgstr "Tillgängliga strategier är:" -#: builtin/merge.c:134 +#: builtin/merge.c:133 #, c-format msgid "Available custom strategies are:" msgstr "Tillgängliga skräddarsydda strategier är:" -#: builtin/merge.c:241 +#: builtin/merge.c:240 msgid "could not run stash." msgstr "kunde köra stash." -#: builtin/merge.c:246 +#: builtin/merge.c:245 msgid "stash failed" msgstr "stash misslyckades" -#: builtin/merge.c:251 +#: builtin/merge.c:250 #, c-format msgid "not a valid object: %s" msgstr "inte ett giltigt objekt: %s" -#: builtin/merge.c:270 builtin/merge.c:287 +#: builtin/merge.c:269 builtin/merge.c:286 msgid "read-tree failed" msgstr "read-tree misslyckades" -#: builtin/merge.c:317 +#: builtin/merge.c:316 msgid " (nothing to squash)" msgstr " (inget att platta till)" -#: builtin/merge.c:330 +#: builtin/merge.c:329 #, c-format msgid "Squash commit -- not updating HEAD\n" msgstr "Tillplattningsincheckning -- uppdaterar inte HEAD\n" -#: builtin/merge.c:362 +#: builtin/merge.c:361 msgid "Writing SQUASH_MSG" msgstr "Skriver SQUASH_MSG" -#: builtin/merge.c:364 +#: builtin/merge.c:363 msgid "Finishing SQUASH_MSG" msgstr "Avslutar SQUASH_MSG" @@ -2387,37 +2392,37 @@ msgstr "git write-tree misslyckades skriva ett träd" msgid "failed to read the cache" msgstr "misslyckads läsa cachen" -#: builtin/merge.c:696 +#: builtin/merge.c:697 msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: builtin/merge.c:709 +#: builtin/merge.c:710 msgid "Not handling anything other than two heads merge." msgstr "Hanterar inte något annat än en sammanslagning av två huvuden." -#: builtin/merge.c:723 +#: builtin/merge.c:724 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "Felaktig flagga för merge-recursive: -X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:738 #, c-format msgid "unable to write %s" msgstr "kunde inte skriva %s" -#: builtin/merge.c:876 +#: builtin/merge.c:877 #, c-format msgid "Could not read from '%s'" msgstr "Kunde inte läsa från \"%s\"" -#: builtin/merge.c:885 +#: builtin/merge.c:886 #, 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:891 +#: builtin/merge.c:892 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" @@ -2432,48 +2437,53 @@ msgstr "" "Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" -#: builtin/merge.c:915 +#: builtin/merge.c:916 msgid "Empty commit message." msgstr "Tomt incheckningsmeddelande." -#: builtin/merge.c:927 +#: builtin/merge.c:928 #, c-format msgid "Wonderful.\n" msgstr "Underbart.\n" -#: builtin/merge.c:1000 +#: builtin/merge.c:993 #, 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:1016 +#: builtin/merge.c:1009 #, c-format msgid "'%s' is not a commit" msgstr "\"%s\" är inte en incheckning" -#: builtin/merge.c:1057 +#: builtin/merge.c:1050 msgid "No current branch." msgstr "Inte på någon gren." -#: builtin/merge.c:1059 +#: builtin/merge.c:1052 msgid "No remote for the current branch." msgstr "Ingen fjärr för aktuell gren." -#: builtin/merge.c:1061 +#: builtin/merge.c:1054 msgid "No default upstream defined for the current branch." msgstr "Ingen standarduppström angiven för aktuell gren." -#: builtin/merge.c:1066 +#: builtin/merge.c:1059 #, 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:1188 +#: builtin/merge.c:1146 builtin/merge.c:1303 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - inte något vi kan slå ihop" + +#: builtin/merge.c:1214 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "Det finns ingen sammanslagning att avbryta (MERGE_HEAD saknas)." -#: builtin/merge.c:1204 git-pull.sh:31 +#: builtin/merge.c:1230 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -2481,11 +2491,11 @@ msgstr "" "Du har inte avslutat sammanslagningen (MERGE_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1207 git-pull.sh:34 +#: builtin/merge.c:1233 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "Du har inte avslutat sammanslagningen (MERGE_HEAD finns)." -#: builtin/merge.c:1211 +#: builtin/merge.c:1237 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -2493,84 +2503,79 @@ msgstr "" "Du har inte avslutat din \"cherry-pick\" (CHERRY_PICK_HEAD finns).\n" "Checka in dina ändringar innan du kan slå ihop." -#: builtin/merge.c:1214 +#: builtin/merge.c:1240 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:1223 +#: builtin/merge.c:1249 msgid "You cannot combine --squash with --no-ff." msgstr "Du kan inte kombinera --squash med --no-ff." -#: builtin/merge.c:1228 +#: builtin/merge.c:1254 msgid "You cannot combine --no-ff with --ff-only." msgstr "Du kan inte kombinera --no-ff med --ff-only." -#: builtin/merge.c:1235 +#: builtin/merge.c:1261 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "Ingen incheckning angiven och merge.defaultToUpstream är ej satt." -#: builtin/merge.c:1266 +#: builtin/merge.c:1293 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:1269 +#: builtin/merge.c:1296 msgid "Squash commit into empty head not supported yet" msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" -#: builtin/merge.c:1271 +#: builtin/merge.c:1298 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:1275 builtin/merge.c:1319 -#, c-format -msgid "%s - not something we can merge" -msgstr "%s - inte något vi kan slå ihop" - -#: builtin/merge.c:1385 +#: builtin/merge.c:1413 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1423 +#: builtin/merge.c:1451 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1430 +#: builtin/merge.c:1458 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1462 +#: builtin/merge.c:1490 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1485 builtin/merge.c:1562 +#: builtin/merge.c:1513 builtin/merge.c:1592 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1517 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1553 +#: builtin/merge.c:1583 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1555 +#: builtin/merge.c:1585 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslaning med strategin %s misslyckades.\n" -#: builtin/merge.c:1564 +#: builtin/merge.c:1594 #, 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:1575 +#: builtin/merge.c:1606 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -2796,35 +2801,35 @@ msgstr "Objektet %s har ingen anteckning\n" msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" -#: builtin/pack-objects.c:2310 +#: builtin/pack-objects.c:2315 #, c-format msgid "unsupported index version %s" msgstr "indexversionen %s stöds ej" -#: builtin/pack-objects.c:2314 +#: builtin/pack-objects.c:2319 #, c-format msgid "bad index version '%s'" msgstr "felaktig indexversion \"%s\"" -#: builtin/pack-objects.c:2322 +#: builtin/pack-objects.c:2342 #, c-format msgid "option %s does not accept negative form" msgstr "flaggan %s godtar inte negativ form" -#: builtin/pack-objects.c:2326 +#: builtin/pack-objects.c:2346 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "kunde inte tolka värdet \"%s\" för flaggan %s" -#: builtin/push.c:44 +#: builtin/push.c:45 msgid "tag shorthand without <tag>" msgstr "taggförkortning utan <tagg>" -#: builtin/push.c:63 +#: builtin/push.c:64 msgid "--delete only accepts plain target ref names" msgstr "--delete godtar endast enkla målreferensnamn" -#: builtin/push.c:73 +#: builtin/push.c:84 #, c-format msgid "" "You are not currently on a branch.\n" @@ -2839,7 +2844,7 @@ msgstr "" "\n" " git push %s HEAD:<namn-på-fjärrgren>\n" -#: builtin/push.c:80 +#: builtin/push.c:91 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -2852,48 +2857,82 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:88 +#: builtin/push.c:99 #, 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:111 +#: builtin/push.c:102 +#, 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 "" +"Du sänder till fjärren \"%s\", som inte är uppströms för den\n" +"aktuella grenen \"%s\", utan att tala om för mig vad som\n" +"skall sändas för att uppdatera fjärrgrenen." + +#: builtin/push.c:131 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:131 +#: builtin/push.c:138 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" +"before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Uppdateringar avvisades då änden på din befintliga gren är bakom\n" +"dess fjärrmotsvarighet. Slå ihop fjärrändringarna (t.ex. \"git pull\")\n" +"innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." + +#: builtin/push.c:144 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. If you did not intend to push that branch, you may want to\n" +"specify branches to push or set the 'push.default' configuration\n" +"variable to 'current' or 'upstream' to push only the current branch." +msgstr "" +"Uppdateringar avvisades då änden på en insänd gren är bakom dess\n" +"fjärrmotsvarighet. Om det inte var meningen att sända in grenen, bör\n" +"du specificera grenar att sända, eller ändra inställningsvariabeln\n" +"\"push-default\" till \"current\" eller \"upstream\" för att endast sända\n" +"aktuell gren." + +#: builtin/push.c:150 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and merge 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 "" +"Uppdateringar avvisades då änden på en gren som sänds in är bakom dess\n" +"fjärrmotsvarighet. Checka ut grenen och slå ihop fjärrändringarna (t.ex.\n" +"\"git pull\") innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." + +#: builtin/push.c:190 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:135 +#: builtin/push.c:194 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:143 -#, c-format -msgid "" -"To prevent you from losing history, non-fast-forward updates were rejected\n" -"Merge the remote changes (e.g. 'git pull') before pushing again. See the\n" -"'Note about fast-forwards' section of 'git push --help' for details.\n" -msgstr "" -"För att förhindra att du tappar historik har icke snabbspolande " -"uppdateringar\n" -"avvisats. Slå ihop fjärrändringarna (t.ex \"git pull\") innan du sänder " -"igen.\n" -"Se avsnittet \"Note about fast-forward\" i \"git push --help\" för " -"detaljer.\n" - -#: builtin/push.c:160 +#: builtin/push.c:226 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:161 +#: builtin/push.c:227 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -2914,31 +2953,31 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:176 +#: builtin/push.c:242 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:177 +#: builtin/push.c:243 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:182 +#: builtin/push.c:248 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:183 +#: builtin/push.c:249 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:188 +#: builtin/push.c:254 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:274 +#: builtin/push.c:334 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:276 +#: builtin/push.c:336 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -3022,20 +3061,20 @@ msgstr "%s återställning tillåts inte i ett naket arkiv" msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." -#: builtin/revert.c:70 builtin/revert.c:91 +#: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" msgstr "%s: %s kan inte användas med %s" -#: builtin/revert.c:126 +#: builtin/revert.c:127 msgid "program error" msgstr "programfel" -#: builtin/revert.c:209 +#: builtin/revert.c:213 msgid "revert failed" msgstr "\"revert\" misslyckades" -#: builtin/revert.c:224 +#: builtin/revert.c:228 msgid "cherry-pick failed" msgstr "\"cherry-pick\" misslyckades" @@ -3549,68 +3588,68 @@ msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$path\"" msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitkatalog \"$a\" ingår i underkatalogsökvägen \"$b\" eller omvänt" -#: git-submodule.sh:247 +#: git-submodule.sh:248 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "arkiv-URL: \"$repo\" måste vara absolut eller börja med ./|../" -#: git-submodule.sh:264 +#: git-submodule.sh:265 #, sh-format msgid "'$path' already exists in the index" msgstr "\"$path\" finns redan i indexet" -#: git-submodule.sh:281 +#: git-submodule.sh:282 #, sh-format msgid "'$path' already exists and is not a valid git repo" msgstr "\"$path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:295 +#: git-submodule.sh:296 #, sh-format msgid "Unable to checkout submodule '$path'" msgstr "Kan inte checka ut undermodul \"$path\"" -#: git-submodule.sh:300 +#: git-submodule.sh:301 #, sh-format msgid "Failed to add submodule '$path'" msgstr "Misslyckades lägga till underkatalog \"$path\"" -#: git-submodule.sh:305 +#: git-submodule.sh:306 #, sh-format msgid "Failed to register submodule '$path'" msgstr "Misslyckades registrera undermodul \"$path\"" -#: git-submodule.sh:347 +#: git-submodule.sh:348 #, sh-format msgid "Entering '$prefix$path'" msgstr "Går in i \"$prefix$path\"" -#: git-submodule.sh:359 +#: git-submodule.sh:360 #, sh-format msgid "Stopping at '$path'; script returned non-zero status." msgstr "Stoppar på \"$path\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:401 +#: git-submodule.sh:402 #, sh-format msgid "No url found for submodule path '$path' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"$path\" i .gitmodules" -#: git-submodule.sh:410 +#: git-submodule.sh:411 #, sh-format msgid "Failed to register url for submodule path '$path'" msgstr "Misslyckades registrera url för underkatalogsökväg \"$path\"" -#: git-submodule.sh:418 +#: git-submodule.sh:419 #, sh-format msgid "Failed to register update mode for submodule path '$path'" msgstr "" "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$path\"" -#: git-submodule.sh:420 +#: git-submodule.sh:421 #, sh-format msgid "Submodule '$name' ($url) registered for path '$path'" msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$path\"" -#: git-submodule.sh:519 +#: git-submodule.sh:520 #, sh-format msgid "" "Submodule path '$path' not initialized\n" @@ -3619,83 +3658,86 @@ msgstr "" "Undermodulen \"$path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:532 +#: git-submodule.sh:533 #, sh-format msgid "Unable to find current revision in submodule path '$path'" msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$path\"" -#: git-submodule.sh:551 +#: git-submodule.sh:552 #, sh-format msgid "Unable to fetch in submodule path '$path'" msgstr "Kan inte hämta i undermodulsökväg \"$path\"" -#: git-submodule.sh:565 +#: git-submodule.sh:566 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$path'" msgstr "Kan inte göra \"rebase\" av \"$sha1\" i undermodulsökväg \"$path\"" -#: git-submodule.sh:566 +#: git-submodule.sh:567 #, sh-format msgid "Submodule path '$path': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$path\": \"rebase\":ad in i \"$sha1\"" -#: git-submodule.sh:571 +#: git-submodule.sh:572 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$path'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$path\"" -#: git-submodule.sh:572 +#: git-submodule.sh:573 #, sh-format msgid "Submodule path '$path': merged in '$sha1'" msgstr "Undermodulsökvägen \"$path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:577 +#: git-submodule.sh:578 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$path'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$path\"" -#: git-submodule.sh:578 +#: git-submodule.sh:579 #, sh-format msgid "Submodule path '$path': checked out '$sha1'" msgstr "Undermodulsökvägen \"$path\": checkade ut \"$sha1\"" -#: git-submodule.sh:600 git-submodule.sh:923 +#: git-submodule.sh:601 git-submodule.sh:924 #, sh-format msgid "Failed to recurse into submodule path '$path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$path\"" -#: git-submodule.sh:708 +#: git-submodule.sh:709 msgid "--" msgstr "--" -#: git-submodule.sh:766 +#: git-submodule.sh:767 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: git-submodule.sh:769 +#: git-submodule.sh:770 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: git-submodule.sh:772 +#: git-submodule.sh:773 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " Varning: $name innehåller inte incheckningar $sha1_src och $sha1_dst" -#: git-submodule.sh:797 +#: git-submodule.sh:798 msgid "blob" msgstr "blob" -#: git-submodule.sh:798 +#: git-submodule.sh:799 msgid "submodule" msgstr "undermodul" -#: git-submodule.sh:969 +#: git-submodule.sh:970 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "Synkroniserar undermodul-url för \"$name\"" +#~ msgid "Too many options specified" +#~ msgstr "För många flaggor angavs" + #~ msgid "# Changed but not updated:" #~ msgstr "# Ändrade men inte uppdaterade:" diff --git a/po/vi.po b/po/vi.po new file mode 100644 index 0000000000..f0529f407a --- /dev/null +++ b/po/vi.po @@ -0,0 +1,5570 @@ +# Vietnamese translation for GIT-CORE. +# Copyright (C) 2012, Trần Ngọc Quân. +# This file is distributed under the same license as the git-core package. +# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: git-1.7.11.rc2.2.gb694fbb\n" +"Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" +"POT-Creation-Date: 2012-06-08 10:20+0800\n" +"PO-Revision-Date: 2012-06-09 14:08+0700\n" +"Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" +"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: \n" +"Plural-Forms: nplurals=2; plural=1;\n" +"X-Poedit-Language: Vietnamese\n" +"X-Poedit-Country: VIET NAM\n" +"X-Poedit-SourceCharset: utf-8\n" +"X-Poedit-Basepath: ../\n" + +#: advice.c:40 +#, c-format +msgid "hint: %.*s\n" +msgstr "gợi ý: %.*s\n" + +#. +#. * Message used both when 'git commit' fails and when +#. * other commands doing a merge do. +#. +#: advice.c:70 +msgid "" +"Fix them up in the work tree,\n" +"and then use 'git add/rm <file>' as\n" +"appropriate to mark resolution and make a commit,\n" +"or use 'git commit -a'." +msgstr "" +"Sửa chúng trong cây làm việc,\n" +"và sau đó sử 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,\n" +"hoặc là sử dụng lệnh 'git commit -a'." + +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' không giống như tập tin v2 bundle (cụm)" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "phần đầu (header) không được thừa nhận: %s%s (%d)" + +#: bundle.c:89 +#: builtin/commit.c:696 +#, c-format +msgid "could not open '%s'" +msgstr "không thể mở '%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "Khó chứa thiếu những lần chuyển giao (commit) cần trước hết này:" + +#: bundle.c:164 +#: sequencer.c:550 +#: sequencer.c:982 +#: builtin/log.c:289 +#: builtin/log.c:720 +#: builtin/log.c:1309 +#: builtin/log.c:1528 +#: builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "Cài đặt việc di chuyển qua các điểm xét lại gặp lỗi" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "Bundle chứa %d tham chiếu (refs)" +msgstr[1] "Bundle chứa %d tham chiếu (refs)" + +#: bundle.c:192 +#, 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 tham chiếu (refs) này" +msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này" + +#: bundle.c:290 +msgid "rev-list died" +msgstr "rev-list bị chết" + +#: bundle.c:296 +#: builtin/log.c:1205 +#: builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "đối số không được thừa nhận: %s" + +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "tham chiếu '%s' bị loại trừ bởi các tùy chọn rev-list" + +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "Từ chối tạo một bundle trống rỗng." + +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "Không thể sản sinh pack-objects" + +#: bundle.c:412 +msgid "pack-objects died" +msgstr "pack-objects đã chết" + +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "không thể tạo '%s'" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "index-pack đã chết" + +#: commit.c:48 +#, c-format +msgid "could not parse %s" +msgstr "không thể phân tích %s" + +#: commit.c:50 +#, c-format +msgid "%s %s is not a commit!" +msgstr "%s %s không phải là một lần commit!" + +#: compat/obstack.c:406 +#: compat/obstack.c:408 +msgid "memory exhausted" +msgstr "cạn bộ nhớ" + +#: connected.c:39 +msgid "Could not run 'git rev-list'" +msgstr "Không thể chạy 'git rev-list'" + +#: connected.c:48 +#, c-format +msgid "failed write to rev-list: %s" +msgstr "gặp lỗi khi ghi vào rev-list: %s" + +#: connected.c:56 +#, c-format +msgid "failed to close rev-list's stdin: %s" +msgstr "gặp lỗi khi đóng đầu vào chuẩn stdin của rev-list: %s" + +#: date.c:95 +msgid "in the future" +msgstr "trong tương lai" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu giây trước" +msgstr[1] "%lu giây trước" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu phút trước" +msgstr[1] "%lu phút trước" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu giờ trước" +msgstr[1] "%lu giờ trước" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu ngày trước" +msgstr[1] "%lu ngày trước" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu tuần trước" +msgstr[1] "%lu tuần trước" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu tháng trước" +msgstr[1] "%lu tháng trước" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu năm" +msgstr[1] "%lu năm" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s, %lu tháng trước" +msgstr[1] "%s, %lu tháng trước" + +#: date.c:154 +#: date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu năm trước" +msgstr[1] "%lu năm trước" + +#: diff.c:105 +#, 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:110 +#, c-format +msgid " Unknown dirstat parameter '%.*s'\n" +msgstr " Không hiểu đối số dirstat '%.*s'\n" + +#: diff.c:210 +#, c-format +msgid "" +"Found errors in 'diff.dirstat' config variable:\n" +"%s" +msgstr "" +"Tìm thấy các lỗi trong biến cấu hình 'diff.dirstat':\n" +"%s" + +#: diff.c:1400 +msgid " 0 files changed\n" +msgstr " 0 tập tin nào bị thay đổi\n" + +#: diff.c:1404 +#, c-format +msgid " %d file changed" +msgid_plural " %d files changed" +msgstr[0] " %d tập tin đã bị thay đổi" +msgstr[1] " %d tập tin đã bị thay đổi" + +#: diff.c:1421 +#, c-format +msgid ", %d insertion(+)" +msgid_plural ", %d insertions(+)" +msgstr[0] ", %d được thêm vào(+)" +msgstr[1] ", %d được thêm vào(+)" + +#: diff.c:1432 +#, c-format +msgid ", %d deletion(-)" +msgid_plural ", %d deletions(-)" +msgstr[0] ", %d bị xóa(-)" +msgstr[1] ", %d bị xóa(-)" + +#: diff.c:3478 +#, c-format +msgid "" +"Failed to parse --dirstat/-X option parameter:\n" +"%s" +msgstr "" +"Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" +"%s" + +#: gpg-interface.c:59 +msgid "could not run gpg." +msgstr "không thể chạy gpg." + +#: gpg-interface.c:71 +msgid "gpg did not accept the data" +msgstr "gpg đã không đồng ý dữ liệu" + +#: gpg-interface.c:82 +msgid "gpg failed to sign the data" +msgstr "gpg gặp lỗi khi ký dữ liệu" + +#: grep.c:1320 +#, c-format +msgid "'%s': unable to read %s" +msgstr "'%s': không thể đọc %s" + +#: grep.c:1337 +#, c-format +msgid "'%s': %s" +msgstr "'%s': %s" + +#: grep.c:1348 +#, c-format +msgid "'%s': short read %s" +msgstr "'%s': đọc ngắn %s" + +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "các lệnh git sẵn sàng để dùng trong '%s'" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "các lệnh git sẵn sàng để dùng từ một nơi khác trong $PATH của bạn" + +#: help.c:270 +#, 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' trông như là một lệnh git, nhưng chúng tôi không\n" +"thể thực thi nó. Có lẽ là lệnh git-%s đã bị hỏng?" + +#: help.c:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "Ối chà. Hệ thống của bạn báo rằng chẳng có lệnh Git nào cả." + +#: help.c:349 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "" +"CẢNH BÁO: Bạn đã gọi lệnh Git có tên '%s', mà nó lại không sẵn có.\n" +"Giả định rằng ý bạn là '%s'" + +#: help.c:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "trong %0.1f giây một cách tự động..." + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git: '%s' không phải là một lệnh của git. Xem thêm 'git --help'." + +#: help.c:365 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"Có phải ý bạn là cái này không?" +msgstr[1] "" +"\n" +"Có phải ý bạn là một trong số những cái này không?" + +#: parse-options.c:493 +msgid "..." +msgstr "..." + +#: parse-options.c:511 +#, c-format +msgid "usage: %s" +msgstr "cách sử dụng: %s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:515 +#, c-format +msgid " or: %s" +msgstr " hoặc: %s" + +#: parse-options.c:518 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1629 +#, 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 là đầu của '%s' bởi %d lần chuyển giao (commit).\n" +msgstr[1] "Nhánh của bạn là đầu của '%s' bởi %d lần chuyển giao (commit).\n" + +#: remote.c:1635 +#, 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] "Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể được fast-forward.\n" +msgstr[1] "Nhánh của bạn thì ở đằng sau '%s' bởi %d lần chuyển giao (commit), và có thể được fast-forward.\n" + +#: remote.c:1643 +#, 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] "" +"Nhánh của bạn và '%s' bị phân kỳ,\n" +"và có %d và %d lần chuyển giao (commit) khác nhau cho từng cái,\n" +"tương ứng với mỗi lần.\n" +msgstr[1] "" +"Your branch and '%s' have diverged,\n" +"and have %d and %d different commit each, respectively.\n" + +#: sequencer.c:121 +#: builtin/merge.c:865 +#: builtin/merge.c:978 +#: builtin/merge.c:1088 +#: builtin/merge.c:1098 +#, c-format +msgid "Could not open '%s' for writing" +msgstr "Không thể mở %s' để ghi" + +#: sequencer.c:123 +#: builtin/merge.c:333 +#: builtin/merge.c:868 +#: builtin/merge.c:1090 +#: builtin/merge.c:1103 +#, c-format +msgid "Could not write to '%s'" +msgstr "Không thể ghi vào '%s'" + +#: sequencer.c:144 +msgid "" +"after resolving the conflicts, mark the corrected paths\n" +"with 'git add <paths>' or 'git rm <paths>'" +msgstr "" +"sau khi giải quyết các xung đột, đánh dấu đường dẫn đã sửa\n" +"với lệnh 'git add <đường_dẫn>' hoặc 'git rm <đường_dẫn>'" + +#: sequencer.c:147 +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 "" +"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>'\n" +"và chuyển giao (commit) kết quả bằng lệnh 'git commit'" + +#: sequencer.c:160 +#: sequencer.c:758 +#: sequencer.c:841 +#, c-format +msgid "Could not write to %s" +msgstr "Không thể ghi vào %s" + +#: sequencer.c:163 +#, c-format +msgid "Error wrapping up %s" +msgstr "Lỗi bao bọc %s" + +#: sequencer.c:178 +msgid "Your local changes would be overwritten by cherry-pick." +msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh cherry-pick." + +#: sequencer.c:180 +msgid "Your local changes would be overwritten by revert." +msgstr "Các thay đổi nội bộ của bạn có thể bị ghi đè bởi lệnh revert." + +#: sequencer.c:183 +msgid "Commit your changes or stash them to proceed." +msgstr "Chuyển giao (commit) các thay đổi hay stash chúng để tiến hành." + +#. TRANSLATORS: %s will be "revert" or "cherry-pick" +#: sequencer.c:233 +#, 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:261 +msgid "Could not resolve HEAD commit\n" +msgstr "Không thể phân giải commit (lần chuyển giao) HEAD\n" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "Không thể cập nhật cây bộ nhớ đệm\n" + +#: sequencer.c:324 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" + +#: sequencer.c:329 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "Không thể phân tích commit (lần chuyển giao) cha mẹ %s\n" + +#: sequencer.c:395 +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:398 +msgid "You do not have a valid HEAD" +msgstr "Bạn không có HEAD nào hợp lệ" + +#: sequencer.c:413 +#, c-format +msgid "Commit %s is a merge but no -m option was given." +msgstr "Lần chuyển giao (commit) %s là một lần hòa trộn nhưng không đưa ra tùy chọn -m." + +#: sequencer.c:421 +#, c-format +msgid "Commit %s does not have parent %d" +msgstr "Lần chuyển giao (commit) %s không có cha mẹ %d" + +#: sequencer.c:425 +#, c-format +msgid "Mainline was specified but commit %s is not a merge." +msgstr "Luồng chính được chỉ định nhưng lần chuyển giao (commit) %s không phải là một lần hòa trộn." + +#. TRANSLATORS: The first %s will be "revert" or +#. "cherry-pick", the second %s a SHA1 +#: sequencer.c:436 +#, 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:440 +#, c-format +msgid "Cannot get commit message for %s" +msgstr "Không thể lấy thông điệp lần chuyển giao (commit) cho %s" + +#: sequencer.c:524 +#, c-format +msgid "could not revert %s... %s" +msgstr "không thể revert %s... %s" + +#: sequencer.c:525 +#, c-format +msgid "could not apply %s... %s" +msgstr "không thể apply (áp dụng miếng vá) %s... %s" + +#: sequencer.c:553 +msgid "empty commit set passed" +msgstr "lần chuyển giao (commit) trống rỗng đặt là hợp quy cách" + +#: sequencer.c:561 +#, 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:566 +#, 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:624 +#, c-format +msgid "Cannot %s during a %s" +msgstr "Không thể %s trong khi %s" + +#: sequencer.c:646 +#, c-format +msgid "Could not parse line %d." +msgstr "Không phân tích được dòng %d." + +#: sequencer.c:651 +msgid "No commits parsed." +msgstr "Không có lần chuyển giao (commit) nào được phân tích." + +#: sequencer.c:664 +#, c-format +msgid "Could not open %s" +msgstr "Không thể mở %s" + +#: sequencer.c:668 +#, c-format +msgid "Could not read %s." +msgstr "Không thể đọc %s." + +#: sequencer.c:675 +#, c-format +msgid "Unusable instruction sheet: %s" +msgstr "Bảng chỉ thị không thể dùng được: %s" + +#: sequencer.c:703 +#, c-format +msgid "Invalid key: %s" +msgstr "Khóa không đúng: %s" + +#: sequencer.c:706 +#, c-format +msgid "Invalid value for %s: %s" +msgstr "Giá trị không hợp lệ %s: %s" + +#: sequencer.c:718 +#, c-format +msgid "Malformed options sheet: %s" +msgstr "Bảng tùy chọn dị hình: %s" + +#: sequencer.c:739 +msgid "a cherry-pick or revert is already in progress" +msgstr "một thao tác cherry-pick hoặc revert đang được thực hiện" + +#: sequencer.c:740 +msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" +msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" + +#: sequencer.c:744 +#, 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:760 +#: sequencer.c:845 +#, c-format +msgid "Error wrapping up %s." +msgstr "Lỗi bao bọc %s." + +#: sequencer.c:779 +#: sequencer.c:913 +msgid "no cherry-pick or revert in progress" +msgstr "không cherry-pick hay revert trong tiến trình" + +#: sequencer.c:781 +msgid "cannot resolve HEAD" +msgstr "không thể phân giải HEAD" + +#: sequencer.c:783 +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:805 +#: builtin/apply.c:3697 +#, c-format +msgid "cannot open %s: %s" +msgstr "không thể mở %s: %s" + +#: sequencer.c:808 +#, c-format +msgid "cannot read %s: %s" +msgstr "không thể đọc %s: %s" + +#: sequencer.c:809 +msgid "unexpected end of file" +msgstr "kết thúc tập tin đột xuất" + +#: sequencer.c:815 +#, 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:838 +#, c-format +msgid "Could not format %s." +msgstr "Không thể định dạng %s." + +#: sequencer.c:1000 +msgid "Can't revert as initial commit" +msgstr "Không thể revert một lần chuyển giao (commit) khởi tạo" + +#: sequencer.c:1001 +msgid "Can't cherry-pick into empty head" +msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" + +#: sha1_name.c:864 +msgid "HEAD does not point to a branch" +msgstr "HEAD không chỉ đến một nhánh nào cả" + +#: sha1_name.c:867 +#, c-format +msgid "No such branch: '%s'" +msgstr "Không có nhánh nào như thế: '%s'" + +#: sha1_name.c:869 +#, c-format +msgid "No upstream configured for branch '%s'" +msgstr "Không có dòng ngược (upstream) được cấu hình cho nhánh '%s'" + +#: sha1_name.c:872 +#, c-format +msgid "Upstream branch '%s' not stored as a remote-tracking branch" +msgstr "Nhánh dòng ngược (upstream) '%s' không được lưu lại như là một nhánh 'remote-tracking'" + +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "không tìm thấy người dùng hiện tại trong tập tin passwd: %s" + +#: wrapper.c:414 +msgid "no such user" +msgstr "không có người dùng như vậy" + +#: wt-status.c:135 +msgid "Unmerged paths:" +msgstr "Những đường dẫn chưa được hòa trộn:" + +#: wt-status.c:141 +#: wt-status.c:158 +#, c-format +msgid " (use \"git reset %s <file>...\" to unstage)" +msgstr " (sử dụng \"git reset %s <tập-tin>...\" để bỏ một stage (trạng thái))" + +#: wt-status.c:143 +#: wt-status.c:160 +msgid " (use \"git rm --cached <file>...\" to unstage)" +msgstr " (sử dụng \"git rm --cached <tập-tin>...\" để bỏ trạng thái (stage))" + +#: wt-status.c:144 +msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" +msgstr " (sử 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:152 +msgid "Changes to be committed:" +msgstr "Những thay đổi sẽ được chuyển giao:" + +#: wt-status.c:170 +msgid "Changes not staged for commit:" +msgstr "Các thay đổi không được đặt trạng thái (stage) cho lần chuyển giao (commit):" + +#: wt-status.c:174 +msgid " (use \"git add <file>...\" to update what will be committed)" +msgstr " (sử dụng \"git add <tập-tin>...\" để cập nhật những gì cần chuyển giao (commit))" + +#: wt-status.c:176 +msgid " (use \"git add/rm <file>...\" to update what will be committed)" +msgstr " (sử dụng \"git add/rm <tập_tin>...\" để cập nhật những gì sẽ được chuyển giao)" + +#: wt-status.c:177 +msgid " (use \"git checkout -- <file>...\" to discard changes in working directory)" +msgstr " (sử dụng \"git checkout -- <tập_tin>...\" để loại bỏ những thay đổi trong thư mục làm việc)" + +#: wt-status.c:179 +msgid " (commit or discard the untracked or modified content in submodules)" +msgstr " (chuyển giao (commit) hoặc là loại bỏ các nội dung không-bị-theo-vết hay đã bị chỉnh sửa trong mô-đun-con)" + +#: wt-status.c:188 +#, c-format +msgid "%s files:" +msgstr "%s tệp tin:" + +#: wt-status.c:191 +#, c-format +msgid " (use \"git %s <file>...\" to include in what will be committed)" +msgstr " (sử dụng \"git %s <tập-tin>...\" để bao gồm thêm vào những gì cần chuyển giao (commit))" + +#: wt-status.c:208 +msgid "bug" +msgstr "lỗi" + +#: wt-status.c:213 +msgid "both deleted:" +msgstr "bị xóa bởi cả hai:" + +#: wt-status.c:214 +msgid "added by us:" +msgstr "được thêm vào bởi chúng tôi:" + +#: wt-status.c:215 +msgid "deleted by them:" +msgstr "bị xóa đi bởi họ:" + +#: wt-status.c:216 +msgid "added by them:" +msgstr "được thêm vào bởi họ:" + +#: wt-status.c:217 +msgid "deleted by us:" +msgstr "bị xóa bởi chúng tôi:" + +#: wt-status.c:218 +msgid "both added:" +msgstr "được thêm vào bởi cả hai:" + +#: wt-status.c:219 +msgid "both modified:" +msgstr "bị sửa bởi cả hai:" + +#: wt-status.c:249 +msgid "new commits, " +msgstr " lần chuyển giao (commit) mới, " + +#: wt-status.c:251 +msgid "modified content, " +msgstr "nội dung được sửa đổi," + +#: wt-status.c:253 +msgid "untracked content, " +msgstr "nội dung chưa được theo dõi" + +#: wt-status.c:267 +#, c-format +msgid "new file: %s" +msgstr "tập tin mới: %s" + +#: wt-status.c:270 +#, c-format +msgid "copied: %s -> %s" +msgstr "đã sao chép: %s -> %s" + +#: wt-status.c:273 +#, c-format +msgid "deleted: %s" +msgstr "bị xóa: %s" + +#: wt-status.c:276 +#, c-format +msgid "modified: %s" +msgstr "bị sửa đổi: %s" + +#: wt-status.c:279 +#, c-format +msgid "renamed: %s -> %s" +msgstr "đã đổi tên: %s -> %s" + +#: wt-status.c:282 +#, c-format +msgid "typechange: %s" +msgstr "đổi-kiểu: %s" + +#: wt-status.c:285 +#, c-format +msgid "unknown: %s" +msgstr "không rõ: %s" + +#: wt-status.c:288 +#, c-format +msgid "unmerged: %s" +msgstr "chưa hòa trộn: %s" + +#: wt-status.c:291 +#, c-format +msgid "bug: unhandled diff status %c" +msgstr "lỗi: không lấy được trạng thái lệnh diff %c" + +#: wt-status.c:737 +msgid "On branch " +msgstr "Trên nhánh" + +#: wt-status.c:744 +msgid "Not currently on any branch." +msgstr "Hiện tại chẳng ở nhánh nào cả." + +#: wt-status.c:755 +msgid "Initial commit" +msgstr "Lần chuyển giao (commit) khởi đầu" + +#: wt-status.c:769 +msgid "Untracked" +msgstr "Không được theo vết" + +#: wt-status.c:771 +msgid "Ignored" +msgstr "Bị bỏ qua" + +#: wt-status.c:773 +#, c-format +msgid "Untracked files not listed%s" +msgstr "Những tập tin không bị theo vết không được liệt kê ra %s" + +#: wt-status.c:775 +msgid " (use -u option to show untracked files)" +msgstr " (sử dụng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" + +#: wt-status.c:781 +msgid "No changes" +msgstr "Không có thay đổi nào" + +#: wt-status.c:785 +#, c-format +msgid "no changes added to commit%s\n" +msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)%s\n" + +#: wt-status.c:787 +msgid " (use \"git add\" and/or \"git commit -a\")" +msgstr " (sử dụng \"git add\" và/hoặc \"git commit -a\")" + +#: wt-status.c:789 +#, c-format +msgid "nothing added to commit but untracked files present%s\n" +msgstr "không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin không được theo dấu vết hiện diện%s\n" + +#: wt-status.c:791 +msgid " (use \"git add\" to track)" +msgstr " (sử dụng \"git add\" để theo dõi dấu vết)" + +#: wt-status.c:793 +#: wt-status.c:796 +#: wt-status.c:799 +#, c-format +msgid "nothing to commit%s\n" +msgstr "không có gì để chuyển giao (commit) %s\n" + +#: wt-status.c:794 +msgid " (create/copy files and use \"git add\" to track)" +msgstr " (tạo/sao-chép các tập tin và sử dụng \"git add\" để theo dõi dấu vết)" + +#: wt-status.c:797 +msgid " (use -u to show untracked files)" +msgstr " (sử dụng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" + +#: wt-status.c:800 +msgid " (working directory clean)" +msgstr " (thư mục làm việc sạch sẽ)" + +#: wt-status.c:908 +msgid "HEAD (no branch)" +msgstr "HEAD (chưa có nhánh nào)" + +#: wt-status.c:914 +msgid "Initial commit on " +msgstr "Lần chuyển giao (commit) khởi tạo trên" + +#: wt-status.c:929 +msgid "behind " +msgstr "đằng sau" + +#: wt-status.c:932 +#: wt-status.c:935 +msgid "ahead " +msgstr "phía trước" + +#: wt-status.c:937 +msgid ", behind " +msgstr ", đằng sau" + +#: builtin/add.c:62 +#, c-format +msgid "unexpected diff status %c" +msgstr "trạng thái lệnh diff không như mong đợi %c" + +#: builtin/add.c:67 +#: builtin/commit.c:226 +msgid "updating files failed" +msgstr "Cập nhật tập tin gặp lỗi" + +#: builtin/add.c:77 +#, c-format +msgid "remove '%s'\n" +msgstr "gỡ bỏ '%s'\n" + +#: builtin/add.c:176 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Đường dẫn '%s' thì ở trong mô-đun-con '%.*s'" + +#: builtin/add.c:192 +msgid "Unstaged changes after refreshing the index:" +msgstr "Các thay đổi không được lưu trạng thái sau khi làm tươi mới lại bảng mục lục:" + +#: builtin/add.c:195 +#: builtin/add.c:456 +#: builtin/rm.c:186 +#, c-format +msgid "pathspec '%s' did not match any files" +msgstr "pathspec '%s' không khớp với bất kỳ tập tin nào" + +#: builtin/add.c:209 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' nằm ngoài một liên kết tượng trưng" + +#: builtin/add.c:276 +msgid "Could not read the index" +msgstr "Không thể đọc bảng mục lục" + +#: builtin/add.c:286 +#, c-format +msgid "Could not open '%s' for writing." +msgstr "Không thể mở '%s' để ghi" + +#: builtin/add.c:290 +msgid "Could not write patch" +msgstr "Không thể ghi ra miếng vá" + +#: builtin/add.c:295 +#, c-format +msgid "Could not stat '%s'" +msgstr "không thể lấy trạng thái về '%s'" + +#: builtin/add.c:297 +msgid "Empty patch. Aborted." +msgstr "Miếng vá trống rỗng. Đã bỏ qua." + +#: builtin/add.c:303 +#, c-format +msgid "Could not apply '%s'" +msgstr "Không thể apply (áp dụng miếng vá) '%s'" + +#: builtin/add.c:312 +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:352 +#, 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:353 +msgid "no files added" +msgstr "chưa có tập tin nào được thêm vào" + +#: builtin/add.c:359 +msgid "adding files failed" +msgstr "thêm tập tin gặp lỗi" + +#: builtin/add.c:391 +msgid "-A and -u are mutually incompatible" +msgstr "-A và -u xung khắc nhau" + +#: builtin/add.c:393 +msgid "Option --ignore-missing can only be used together with --dry-run" +msgstr "Tùy chọn --ignore-missing chỉ có thể được sử dụng cùng với --dry-run" + +#: builtin/add.c:413 +#, 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:414 +#, c-format +msgid "Maybe you wanted to say 'git add .'?\n" +msgstr "Có lẽ bạn muốn nói là 'git add .' phải không?\n" + +#: builtin/add.c:420 +#: builtin/clean.c:95 +#: builtin/commit.c:286 +#: builtin/mv.c:82 +#: builtin/rm.c:162 +msgid "index file corrupt" +msgstr "tập tin ghi bảng mục lục bị hỏng" + +#: builtin/add.c:476 +#: builtin/apply.c:4108 +#: builtin/mv.c:229 +#: builtin/rm.c:260 +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" + +#: builtin/apply.c:53 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [các-tùy-chọn] [<miếng-vá>...]" + +#: builtin/apply.c:106 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "không nhận ra tùy chọn về khoảng trắng '%s'" + +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "không nhận ra tùy chọn bỏ qua khoảng trắng '%s'" + +#: builtin/apply.c:815 +#, 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" + +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "thi hành biểu thức chính quy trả về %d cho kết xuất: %s" + +#: builtin/apply.c:905 +#, 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" + +#: builtin/apply.c:937 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null, got %s on line %d" +msgstr "git apply: git-diff sai - mong đợi /dev/null, đã nhận %s trên dòng %d" + +#: builtin/apply.c:941 +#, 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 mâu thuấn trên dòng %d" + +#: builtin/apply.c:942 +#, 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ũ mâu thuấn trên dòng %d" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply: git-diff sai - mong đợi /dev/null trên dòng %d" + +#: builtin/apply.c:1394 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "chi tiết: dòng không được mong đợi: %.*s" + +#: builtin/apply.c:1451 +#, 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" + +#: builtin/apply.c:1468 +#, 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] "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)" +msgstr[1] "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)" + +#: builtin/apply.c:1628 +msgid "new file depends on old contents" +msgstr "tập tin mới phụ thuộc vào nội dung cũ" + +#: builtin/apply.c:1630 +msgid "deleted file still has contents" +msgstr "tập tin đã xóa vẫn còn nội dung" + +#: builtin/apply.c:1656 +#, c-format +msgid "corrupt patch at line %d" +msgstr "miếng vá hỏng tại dòng %d" + +#: builtin/apply.c:1692 +#, 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ũ" + +#: builtin/apply.c:1694 +#, c-format +msgid "deleted file %s still has contents" +msgstr "tập tin đã xóa %s vẫn còn nội dung" + +#: builtin/apply.c:1697 +#, 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" + +#: builtin/apply.c:1843 +#, 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" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1872 +#, 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" + +#: builtin/apply.c:1958 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "vá chỉ với 'garbage' tại dòng %d" + +#: builtin/apply.c:2048 +#, c-format +msgid "unable to read symlink %s" +msgstr "không thể đọc liên kết tượng trưng %s" + +#: builtin/apply.c:2052 +#, c-format +msgid "unable to open or read %s" +msgstr "không thể mở để đọc hay ghi %s" + +#: builtin/apply.c:2123 +msgid "oops" +msgstr "ôi?" + +#: builtin/apply.c:2645 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "sai khởi đầu dòng: '%c'" + +#: builtin/apply.c:2763 +#, 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)." +msgstr[1] "Khối dữ liệu #%d thành công tại %d (offset %d dòng)." + +#: builtin/apply.c:2775 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "Nội dung được giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" + +#: builtin/apply.c:2781 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"Trong khi đang tìm kiếm cho:\n" +"%.*s" + +#: builtin/apply.c:2800 +#, 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'" + +#: builtin/apply.c:2903 +#, 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'" + +#: builtin/apply.c:2909 +#, 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 (đang chờ %s, đã nhận %s)" + +#: builtin/apply.c:2930 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "vá gặp lỗi: %s:%ld" + +#: builtin/apply.c:3045 +#, c-format +msgid "patch %s has been renamed/deleted" +msgstr "miếng vá %s đã bị xóa/đổi tên" + +#: builtin/apply.c:3052 +#: builtin/apply.c:3069 +#, c-format +msgid "read of %s failed" +msgstr "đọc %s gặp lỗi" + +#: builtin/apply.c:3084 +msgid "removal patch leaves file contents" +msgstr "loại bỏ miếng vá để lại nội dung tập tin" + +#: builtin/apply.c:3105 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s: đã sẵn có trong thư mục đang làm việc" + +#: builtin/apply.c:3143 +#, c-format +msgid "%s: has been deleted/renamed" +msgstr "%s: đã được xóa/thay-tên" + +#: builtin/apply.c:3148 +#: builtin/apply.c:3179 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: builtin/apply.c:3159 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s: không tồn tại trong bảng mục lục" + +#: builtin/apply.c:3173 +#, c-format +msgid "%s: does not match index" +msgstr "%s: không khớp trong mục lục" + +#: builtin/apply.c:3190 +#, c-format +msgid "%s: wrong type" +msgstr "%s: sai kiểu" + +#: builtin/apply.c:3192 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s có kiểu %o, mong chờ %o" + +#: builtin/apply.c:3247 +#, c-format +msgid "%s: already exists in index" +msgstr "%s: đã có từ trước trong bảng mục lục" + +#: builtin/apply.c:3267 +#, 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)" + +#: builtin/apply.c:3272 +#, 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" + +#: builtin/apply.c:3280 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s: miếng vá không được áp dụng" + +#: builtin/apply.c:3293 +#, c-format +msgid "Checking patch %s..." +msgstr "Đang kiểm tra miếng vá %s..." + +#: builtin/apply.c:3348 +#: builtin/checkout.c:212 +#: builtin/reset.c:158 +#, 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'" + +#: builtin/apply.c:3491 +#, c-format +msgid "unable to remove %s from index" +msgstr "không thể gỡ bỏ %s từ mục lục" + +#: builtin/apply.c:3518 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "miếng vá sai hỏng cho dự án con (subproject) %s" + +#: builtin/apply.c:3522 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "không thể lấy trạng thái về tập tin %s mới hơn đã được tạo" + +#: builtin/apply.c:3527 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "không thể tạo 'backing store' cho tập tin được tạo mới hơn %s" + +#: builtin/apply.c:3530 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "không thể thêm mục nhớ tạm cho %s" + +#: builtin/apply.c:3563 +#, c-format +msgid "closing file '%s'" +msgstr "đang đóng tập tin '%s'" + +#: builtin/apply.c:3612 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "không thể ghi vào tập tin '%s' chế độ (mode) %o" + +#: builtin/apply.c:3668 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "Đã áp dụng miếng và %s một cách sạch sẽ." + +#: builtin/apply.c:3676 +msgid "internal error" +msgstr "lỗi nội bộ" + +#. Say this even without --verbose +#: builtin/apply.c:3679 +#, 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..." +msgstr[1] "Đang áp dụng miếng vá %%s với %d lần từ chối..." + +#: builtin/apply.c:3689 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "đang cắt cụt tên tập tin .rej thành %.*s.rej" + +#: builtin/apply.c:3710 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "Khối nhớ #%d được áp dụng gọn gàng." + +#: builtin/apply.c:3713 +#, c-format +msgid "Rejected hunk #%d." +msgstr "hunk #%d bị từ chối." + +#: builtin/apply.c:3844 +msgid "unrecognized input" +msgstr "không thừa nhận đầu vào" + +#: builtin/apply.c:3855 +msgid "unable to read index file" +msgstr "không thể đọc tập tin lưu bảng mục lục" + +#: builtin/apply.c:3970 +#: builtin/apply.c:3973 +msgid "path" +msgstr "đường-dẫn" + +#: builtin/apply.c:3971 +msgid "don't apply changes matching the given path" +msgstr "không áp dụng các thay đổi khớp với đường dẫn đã cho" + +#: builtin/apply.c:3974 +msgid "apply changes matching the given path" +msgstr "áp dụng các thay đổi khớp với đường dẫn đã cho" + +#: builtin/apply.c:3976 +msgid "num" +msgstr "số" + +#: builtin/apply.c:3977 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "gỡ bỏ <số> phần dẫn đầu (slashe) từ đường dẫn diff cổ điển" + +#: builtin/apply.c:3980 +msgid "ignore additions made by the patch" +msgstr "lờ đi phần phụ thêm tạo ra bởi miếng vá" + +#: builtin/apply.c:3982 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả từ lệnh diffstat cho đầu ra" + +#: builtin/apply.c:3986 +msgid "shows number of added and deleted lines in decimal notation" +msgstr "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" + +#: builtin/apply.c:3988 +msgid "instead of applying the patch, output a summary for the input" +msgstr "thay vì áp dụng một miếng vá, kết xuất kết quả cho đầu vào" + +#: builtin/apply.c:3990 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "thay vì áp dụng miếng vá, hãy xem xem miếng vá có thích hợp không" + +#: builtin/apply.c:3992 +msgid "make sure the patch is applicable to the current index" +msgstr "hãy chắc chắn là miếng vá thích hợp với bảng mục lục hiện hành" + +#: builtin/apply.c:3994 +msgid "apply a patch without touching the working tree" +msgstr "áp dụng một miếng vá mà không động chạm đến cây làm việc" + +#: builtin/apply.c:3996 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "đồng thời áp dụng miếng vá (sử dụng với tùy chọn --stat/--summary/--check)" + +#: builtin/apply.c:3998 +msgid "build a temporary index based on embedded index information" +msgstr "xây dựng bảng mục lục tạm thời trên cơ sở thông tin bảng mục lục được nhúng" + +#: builtin/apply.c:4000 +msgid "paths are separated with NUL character" +msgstr "các đường dẫn bị ngăn cách bởi ký tự NULL" + +#: builtin/apply.c:4003 +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" + +#: builtin/apply.c:4004 +msgid "action" +msgstr "hành động" + +#: builtin/apply.c:4005 +msgid "detect new or modified lines that have whitespace errors" +msgstr "tìm thấy một dòng mới hoặc bị sửa đổi mà nó có lỗi do khoảng trắng" + +#: builtin/apply.c:4008 +#: builtin/apply.c:4011 +msgid "ignore changes in whitespace when finding context" +msgstr "lờ đi sự thay đổi do khoảng trắng khi quét nội dung" + +#: builtin/apply.c:4014 +msgid "apply the patch in reverse" +msgstr "áp dụng miếng vá theo chiều ngược" + +#: builtin/apply.c:4016 +msgid "don't expect at least one line of context" +msgstr "đừng hy vọng có ít nhất một dòng nội dung" + +#: builtin/apply.c:4018 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "để lại khối dữ liệu bị từ chối trong các tập tin *.rej tương ứng" + +#: builtin/apply.c:4020 +msgid "allow overlapping hunks" +msgstr "cho phép chồng khối nhớ" + +#: builtin/apply.c:4021 +msgid "be verbose" +msgstr "chi tiết" + +#: builtin/apply.c:4023 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "dung sai không chính xác đã tìm thấy thiếu dòng mới tại cuối tập tin" + +#: builtin/apply.c:4026 +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" + +#: builtin/apply.c:4028 +msgid "root" +msgstr "root" + +#: builtin/apply.c:4029 +msgid "prepend <root> to all filenames" +msgstr "treo thêm <root> vào tất cả các tên tập tin" + +#: builtin/apply.c:4050 +msgid "--index outside a repository" +msgstr "--index ở ngoài một kho chứa" + +#: builtin/apply.c:4053 +msgid "--cached outside a repository" +msgstr "--cached ở ngoài một kho chứa" + +#: builtin/apply.c:4069 +#, c-format +msgid "can't open patch '%s'" +msgstr "không thể mở miếng vá '%s'" + +#: builtin/apply.c:4083 +#, 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" +msgstr[1] "đã chấm dứt %d lỗi khoảng trắng" + +#: builtin/apply.c:4089 +#: builtin/apply.c:4099 +#, 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." +msgstr[1] "%d dòng thêm khoảng trắng lỗi." + +#: builtin/archive.c:17 +#, c-format +msgid "could not create archive file '%s'" +msgstr "không thể tạo tập tin kho (lưu trữ, nén) '%s'" + +#: builtin/archive.c:20 +msgid "could not redirect output" +msgstr "không thể chuyển hướng kết xuất" + +#: builtin/archive.c:37 +msgid "git archive: Remote with no URL" +msgstr "git archive: Máy chủ không có địa chỉ URL" + +#: builtin/archive.c:58 +msgid "git archive: expected ACK/NAK, got EOF" +msgstr "git archive: mong đợi ACK/NAK, nhận EOF" + +#: builtin/archive.c:63 +#, c-format +msgid "git archive: NACK %s" +msgstr "git archive: NACK %s" + +#: builtin/archive.c:65 +#, c-format +msgid "remote error: %s" +msgstr "lỗi máy chủ: %s" + +#: builtin/archive.c:66 +msgid "git archive: protocol error" +msgstr "git archive: lỗi giao thức" + +#: builtin/archive.c:71 +msgid "git archive: expected a flush" +msgstr "git archive: đã mong chờ một flush" + +#: builtin/branch.c:144 +#, c-format +msgid "" +"deleting branch '%s' that has been merged to\n" +" '%s', but not yet merged to HEAD." +msgstr "" +"đ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:148 +#, c-format +msgid "" +"not deleting branch '%s' that is not yet merged to\n" +" '%s', even though it is merged to HEAD." +msgstr "" +"không xóa nhánh '%s' cái mà chưa được hòa trộng vào\n" +" '%s', cho dù là nó đã được hòa trộn vào HEAD." + +#: builtin/branch.c:180 +msgid "cannot use -a with -d" +msgstr "không thể sử dụng -a với -d" + +#: builtin/branch.c:186 +msgid "Couldn't look up commit object for HEAD" +msgstr "Không thể tìm kiếm đối tượng chuyển giao (commit) cho HEAD" + +#: builtin/branch.c:191 +#, c-format +msgid "Cannot delete the branch '%s' which you are currently on." +msgstr "Không thể xóa nhánh '%s' cái mà bạn hiện nay đang ở." + +#: builtin/branch.c:202 +#, c-format +msgid "remote branch '%s' not found." +msgstr "nhánh máy chủ '%s' không tìm thấy." + +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "không tìm thấy nhánh '%s'." + +#: builtin/branch.c:210 +#, 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 (commit) cho '%s'" + +#: builtin/branch.c:216 +#, 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 "" +"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:225 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "Gặp lỗi khi đang xóa nhánh máy chủ '%s'" + +#: builtin/branch.c:226 +#, c-format +msgid "Error deleting branch '%s'" +msgstr "Lỗi khi xoá bỏ nhánh '%s'" + +#: builtin/branch.c:233 +#, c-format +msgid "Deleted remote branch %s (was %s).\n" +msgstr "Nhánh máy chủ đã xóa %s (trước là %s).\n" + +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "Nhánh đã bị xóa '%s' (trước là %s)\n" + +#: builtin/branch.c:239 +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:337 +#, c-format +msgid "branch '%s' does not point at a commit" +msgstr "nhánh '%s' không chỉ đến một lần chuyển giao (commit) nào cả" + +#: builtin/branch.c:409 +#, c-format +msgid "[%s: behind %d]" +msgstr "[%s: đằng sau %d]" + +#: builtin/branch.c:411 +#, c-format +msgid "[behind %d]" +msgstr "[đằng sau %d]" + +#: builtin/branch.c:415 +#, c-format +msgid "[%s: ahead %d]" +msgstr "[%s: phía trước %d]" + +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" +msgstr "[phía trước %d]" + +#: builtin/branch.c:420 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s: phía trước %d, phía sau %d]" + +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[phía trước %d, phía sau %d]" + +#: builtin/branch.c:535 +msgid "(no branch)" +msgstr "(không có nhánh nào)" + +#: builtin/branch.c:600 +msgid "some refs could not be read" +msgstr "một số tham chiếu đã không thể đọc được" + +#: builtin/branch.c:613 +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:623 +#, c-format +msgid "Invalid branch name: '%s'" +msgstr "tên nhánh sai: '%s'" + +#: builtin/branch.c:638 +msgid "Branch rename failed" +msgstr "Đổi tên nhánh gặp lỗi" + +#: builtin/branch.c:642 +#, c-format +msgid "Renamed a misnamed branch '%s' away" +msgstr "Đã đổi tên nhánh khuyết danh '%s' đi" + +#: builtin/branch.c:646 +#, 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:653 +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:668 +#, c-format +msgid "malformed object name %s" +msgstr "tên đối tượng dị hình %s" + +#: builtin/branch.c:692 +#, c-format +msgid "could not write branch description template: %s" +msgstr "không thể ghi vào mẫu mô tả nhánh: %s" + +#: builtin/branch.c:783 +msgid "Failed to resolve HEAD as a valid ref." +msgstr "Gặp lỗi khi giải quyết HEAD như là một tham chiếu (ref) hợp lệ." + +#: builtin/branch.c:788 +#: builtin/clone.c:558 +msgid "HEAD not found below refs/heads!" +msgstr "HEAD không tìm thấy ở dưới refs/heads!" + +#: builtin/branch.c:808 +msgid "--column and --verbose are incompatible" +msgstr "--column và --verbose xung khắc nhau" + +#: builtin/branch.c:857 +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/bundle.c:47 +#, c-format +msgid "%s is okay\n" +msgstr "'%s' tốt\n" + +#: builtin/bundle.c:56 +msgid "Need a repository to create a bundle." +msgstr "Cần một kho chứa để mà tạo một bundle." + +#: builtin/bundle.c:60 +msgid "Need a repository to unbundle." +msgstr "Cần một kho chứa để mà bung một bundle." + +#: builtin/checkout.c:113 +#: builtin/checkout.c:146 +#, 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:115 +#: builtin/checkout.c:148 +#, 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:131 +#, 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:175 +#, 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:192 +#, c-format +msgid "path '%s': cannot merge" +msgstr "đường dẫn '%s': không thể hòa trộn" + +#: builtin/checkout.c:209 +#, 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:234 +#: builtin/checkout.c:392 +msgid "corrupt index file" +msgstr "tập tin ghi bảng mục lục bị hỏng" + +#: builtin/checkout.c:264 +#: builtin/checkout.c:271 +#, c-format +msgid "path '%s' is unmerged" +msgstr "đường dẫn '%s' không được hòa trộn" + +#: builtin/checkout.c:302 +#: builtin/checkout.c:498 +#: builtin/clone.c:583 +#: builtin/merge.c:812 +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" + +#: builtin/checkout.c:319 +#: builtin/diff.c:302 +#: builtin/merge.c:408 +msgid "diff_setup_done failed" +msgstr "diff_setup_done gặp lỗi" + +#: builtin/checkout.c:414 +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:533 +#, c-format +msgid "Can not do reflog for '%s'\n" +msgstr "Không thể thực hiện reflog cho '%s'\n" + +#: builtin/checkout.c:566 +msgid "HEAD is now at" +msgstr "HEAD hiện giờ tại" + +#: builtin/checkout.c:573 +#, c-format +msgid "Reset branch '%s'\n" +msgstr "Đặt lại nhánh '%s'\n" + +#: builtin/checkout.c:576 +#, c-format +msgid "Already on '%s'\n" +msgstr "Đã sẵn sàng trên '%s'\n" + +#: builtin/checkout.c:580 +#, c-format +msgid "Switched to and reset branch '%s'\n" +msgstr "Đã chuyển tới và reset nhánh '%s'\n" + +#: builtin/checkout.c:582 +#, c-format +msgid "Switched to a new branch '%s'\n" +msgstr "Đã chuyển đến nhánh mới '%s'\n" + +#: builtin/checkout.c:584 +#, c-format +msgid "Switched to branch '%s'\n" +msgstr "Đã chuyển đến nhánh '%s'\n" + +#: builtin/checkout.c:640 +#, c-format +msgid " ... and %d more.\n" +msgstr " ... và nhiều hơn %d.\n" + +#. The singular version +#: builtin/checkout.c:646 +#, 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] "" +"Cảnh báo: bạn đã rời bở %d lần chuyển giao (commit) lại đằng sau, không được kết nối đến\n" +"bất kỳ nhánh nào của bạn:\n" +"\n" +"%s\n" +msgstr[1] "" +"Cảnh báo: bạn đã rời bở %d lần chuyển giao (commit) lại đằng sau, không được kết nối đến\n" +"bất kỳ nhánh nào của bạn:\n" +"\n" +"%s\n" + +#: builtin/checkout.c:664 +#, c-format +msgid "" +"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 "" +"Nếu bạn muốn giữ chúng bằng cách tạo ra một nhánh mới, đây có lẽ là một thời điểm thích hợp\n" +"để làm thế bằng lệnh:\n" +"\n" +" git branch tên_nhánh_mới %s\n" +"\n" + +#: builtin/checkout.c:694 +msgid "internal error in revision walk" +msgstr "lỗi nội bộ trong khi di chuyển qua các điểm xét lại" + +#: builtin/checkout.c:698 +msgid "Previous HEAD position was" +msgstr "Vị trí kế trước của HEAD là" + +#: builtin/checkout.c:724 +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" + +#. case (1) +#: builtin/checkout.c:855 +#, c-format +msgid "invalid reference: %s" +msgstr "tham chiếu sai: %s" + +#. case (1): want a tree +#: builtin/checkout.c:894 +#, c-format +msgid "reference is not a tree: %s" +msgstr "tham chiếu không phải là cây:%s" + +#: builtin/checkout.c:974 +msgid "-B cannot be used with -b" +msgstr "-B không thể được sử dụng với -b" + +#: builtin/checkout.c:983 +msgid "--patch is incompatible with all other options" +msgstr "--patch xung khắc với tất cả các tùy chọn khác" + +#: builtin/checkout.c:986 +msgid "--detach cannot be used with -b/-B/--orphan" +msgstr "--detach không thể được sử dụng với -b/-B/--orphan" + +#: builtin/checkout.c:988 +msgid "--detach cannot be used with -t" +msgstr "--detach không thể được sử dụng với tùy chọn -t" + +#: builtin/checkout.c:994 +msgid "--track needs a branch name" +msgstr "--track cần tên một nhánh" + +#: builtin/checkout.c:1001 +msgid "Missing branch name; try -b" +msgstr "Thiếu tên nhánh; hãy thử -b" + +#: builtin/checkout.c:1007 +msgid "--orphan and -b|-B are mutually exclusive" +msgstr "Tùy chọn --orphan và -b|-B loại từ lẫn nhau" + +#: builtin/checkout.c:1009 +msgid "--orphan cannot be used with -t" +msgstr "--orphan không thể được sử dụng với tùy chọn -t" + +#: builtin/checkout.c:1019 +msgid "git checkout: -f and -m are incompatible" +msgstr "git checkout: -f và -m xung khắc nhau" + +#: builtin/checkout.c:1053 +msgid "invalid path specification" +msgstr "đường dẫn đã cho không hợp lệ" + +#: builtin/checkout.c:1061 +#, c-format +msgid "" +"git checkout: updating paths is incompatible with switching branches.\n" +"Did you intend to checkout '%s' which can not be resolved as commit?" +msgstr "" +"git checkout: việc cập nhật các đường dẫn là xung khắc với việc chuyển đổi các nhánh..\n" +"Bạn đã có ý định checkout '%s' cái mà không thể được phân giải như là lần chuyển giao (commit)?" + +#: builtin/checkout.c:1063 +msgid "git checkout: updating paths is incompatible with switching branches." +msgstr "git checkout: việc cập nhật các đường dẫn là xung khắc với việc chuyển đổi các nhánh." + +#: builtin/checkout.c:1068 +msgid "git checkout: --detach does not take a path argument" +msgstr "git checkout: --detach không nhận một đối số đường dẫn" + +#: builtin/checkout.c:1071 +msgid "" +"git checkout: --ours/--theirs, --force and --merge are incompatible when\n" +"checking out of the index." +msgstr "" +"git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" +"checkout." + +#: builtin/checkout.c:1090 +msgid "Cannot switch branch to a non-commit." +msgstr "Không thể chuyển đến một non-commit." + +#: builtin/checkout.c:1093 +msgid "--ours/--theirs is incompatible with switching branches." +msgstr "--ours/--theirs là xung khắc nhau khi chuyển đổi các nhánh." + +#: builtin/clean.c:78 +msgid "-x and -X cannot be used together" +msgstr "-x và -X không thể dùng cùng một lúc với nhau" + +#: builtin/clean.c:82 +msgid "clean.requireForce set to true and neither -n nor -f given; refusing to clean" +msgstr "clean.requireForce được đặt thành true và không đưa ra tùy chọn -n mà cũng không -f; từ chối lệnh dọn dẹp (clean)" + +#: builtin/clean.c:85 +msgid "clean.requireForce defaults to true and neither -n nor -f given; refusing to clean" +msgstr "clean.requireForce mặc định được đặt thành true và không đưa ra tùy chọn -n mà cũng không -f; từ chối lệnh dọn dẹp (clean)" + +#: builtin/clean.c:155 +#: builtin/clean.c:176 +#, c-format +msgid "Would remove %s\n" +msgstr "Có thể gỡ bỏ %s\n" + +#: builtin/clean.c:159 +#: builtin/clean.c:179 +#, c-format +msgid "Removing %s\n" +msgstr "Đang gỡ bỏ %s\n" + +#: builtin/clean.c:162 +#: builtin/clean.c:182 +#, c-format +msgid "failed to remove %s" +msgstr "gặp lỗi khi gỡ bỏ %s" + +#: builtin/clean.c:166 +#, c-format +msgid "Would not remove %s\n" +msgstr "Không thể gỡ bỏ %s\n" + +#: builtin/clean.c:168 +#, c-format +msgid "Not removing %s\n" +msgstr "Không xóa %s\n" + +#: builtin/clone.c:243 +#, c-format +msgid "reference repository '%s' is not a local directory." +msgstr "kho tham chiếu '%s' không phải là một thư mục nội bộ." + +#: builtin/clone.c:302 +#, c-format +msgid "failed to open '%s'" +msgstr "gặp lỗi khi mở '%s'" + +#: builtin/clone.c:306 +#, c-format +msgid "failed to create directory '%s'" +msgstr "tạo thư mục \"%s\" gặp lỗi" + +#: builtin/clone.c:308 +#: builtin/diff.c:75 +#, c-format +msgid "failed to stat '%s'" +msgstr "gặp lỗi stat (lấy trạng thái về) '%s'" + +#: builtin/clone.c:310 +#, c-format +msgid "%s exists and is not a directory" +msgstr "%s tồn tại nhưng không phải là một thư mục" + +#: builtin/clone.c:324 +#, c-format +msgid "failed to stat %s\n" +msgstr "lỗi stat (lấy trạng thái về) %s\n" + +#: builtin/clone.c:341 +#, c-format +msgid "failed to unlink '%s'" +msgstr "bỏ liên kết (unlink) %s không thành công" + +#: builtin/clone.c:346 +#, c-format +msgid "failed to create link '%s'" +msgstr "tạo được liên kết mềm tới %s gặp lỗi" + +#: builtin/clone.c:350 +#, c-format +msgid "failed to copy file to '%s'" +msgstr "sao chép tệp tin tới '%s' gặp lỗi" + +#: builtin/clone.c:373 +#, c-format +msgid "done.\n" +msgstr "hoàn tất.\n" + +#: builtin/clone.c:440 +#, 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:549 +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ể checkout.\n" + +#: builtin/clone.c:639 +msgid "Too many arguments." +msgstr "Có quá nhiều đối số." + +#: builtin/clone.c:643 +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:654 +#, 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:668 +#, c-format +msgid "repository '%s' does not exist" +msgstr "kho chứa '%s' chưa tồn tại" + +#: builtin/clone.c:673 +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:683 +#, 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:693 +#, 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:706 +#: builtin/clone.c:720 +#, 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:709 +#, 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:728 +#, 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:730 +#, c-format +msgid "Cloning into '%s'...\n" +msgstr "Đang nhân bản thành '%s'...\n" + +#: builtin/clone.c:786 +#, 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:835 +#, 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 dòng ngược (upstream) %s" + +#: builtin/clone.c:842 +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." + +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "--command phải là đối số đầu tiên" + +#: builtin/commit.c:43 +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 "" +"Tên và địa chỉ thư điện tử của bạn được cấu hình một cách tự động trên cơ sở\n" +"tài khoản và địa chỉ máy chủ của bạn. Xin hãy kiểm tra xem chúng có chính xác không.\n" +"Bạn có thể chặn những thông báo kiểu này bằng cách cài đặt các thông tin trên một cách rõ ràng:\n" +"\n" +" git config --global user.name \"Tên của bạn\"\n" +" git config --global user.email you@example.com\n" +"\n" +"Sau khi thực hiện xong, bạn có thể sửa chữa định danh được sử dụng cho lần chuyển giao (commit) này với lệnh:\n" +"\n" +" git commit --amend --reset-author\n" + +#: builtin/commit.c:55 +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 "" +"Bạn đã yêu cầu amend (tu bổ) phần lớn các lần chuyển giao (commit) gần đây, nhưng làm như thế\n" +"có thể làm cho nó trở nên trống rỗng. Bạn có thể lặp lại lệnh của mình bằng --allow-empty,\n" +"hoặc là bạn gỡ bỏ các lần chuyển giao một cách hoàn toàn bằng lệnh:\n" +"\"git reset HEAD^\".\n" + +#: builtin/commit.c:60 +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" +"Otherwise, please use 'git reset'\n" +msgstr "" +"Lần cherry-pick trước hiện nay trống rỗng, có lẽ là bởi vì sự phân giải xung đột.\n" +"Nếu bạn muốn chuyển giao nó cho dù thế nào đi nữa, sử dụng:\n" +"\n" +" git commit --allow-empty\n" +"\n" +"Nếu không, hãy thử sử dụng 'git reset'\n" + +#: builtin/commit.c:253 +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:295 +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:301 +msgid "interactive add failed" +msgstr "việc thêm tương tác gặp lỗi" + +#: builtin/commit.c:334 +#: builtin/commit.c:355 +#: builtin/commit.c:405 +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:386 +msgid "cannot do a partial commit during a merge." +msgstr "không thể thực hiện việc chuyển giao (commit) cục bộ trong khi đang được hòa trộn." + +#: builtin/commit.c:388 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "không thể thực hiện việc chuyển giao (commit) bộ phận trong khi đang cherry-pick." + +#: builtin/commit.c:398 +msgid "cannot read the index" +msgstr "không đọc được bảng mục lục" + +#: builtin/commit.c:418 +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:493 +#: builtin/commit.c:499 +#, c-format +msgid "invalid commit: %s" +msgstr "lần chuyển giao (commit) không hợp lệ: %s" + +#: builtin/commit.c:522 +msgid "malformed --author parameter" +msgstr "đối số --author bị dị hình" + +#: builtin/commit.c:582 +#, c-format +msgid "Malformed ident string: '%s'" +msgstr "Chuỗi thụt lề đầu dòng dị hình: '%s'" + +#: builtin/commit.c:620 +#: builtin/commit.c:653 +#: builtin/commit.c:967 +#, 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:632 +#: builtin/shortlog.c:296 +#, 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:634 +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:638 +#, c-format +msgid "could not read log file '%s'" +msgstr "không đọc được tệp nhật ký '%s'" + +#: builtin/commit.c:644 +msgid "commit has empty message" +msgstr "lần chuyển giao (commit) có ghi chú trống rỗng" + +#: builtin/commit.c:660 +msgid "could not read MERGE_MSG" +msgstr "không thể đọc MERGE_MSG" + +#: builtin/commit.c:664 +msgid "could not read SQUASH_MSG" +msgstr "không thể đọc SQUASH_MSG" + +#: builtin/commit.c:668 +#, c-format +msgid "could not read '%s'" +msgstr "Không thể đọc '%s'." + +#: builtin/commit.c:720 +msgid "could not write commit template" +msgstr "không thể ghi mẫu commit" + +#: builtin/commit.c:731 +#, 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" +"Nó trông giống với việc bạn đang chuyển giao một lần hòa trộn.\n" +"Nếu không phải vậy, xin hãy gỡ bỏ tập tin\n" +"\t%s\n" +"và thử lại.\n" + +#: builtin/commit.c:736 +#, 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" +"Nó trông giống với việc bạn đang chuyển giao một lần cherry-pick.\n" +"Nếu không phải vậy, xin hãy gỡ bỏ tập tin\n" +"\t%s\n" +"và thử lại.\n" + +#: builtin/commit.c:748 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be ignored, and an empty message aborts the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn. Những dòng được\n" +"bắt đầu bằng '#' sẽ được bỏ qua, phần chú thích này nếu rỗng sẽ làm hủy bỏ lần chuyển giao (commit).\n" + +#: builtin/commit.c:753 +msgid "" +"Please enter the commit message for your changes. Lines starting\n" +"with '#' will be kept; you may remove them yourself if you want to.\n" +"An empty message aborts the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích các thay đổi của bạn.Những dòng được\n" +"bắt đầu bằng '#' sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn.\n" +"Phần chú thích này nếu rỗng sẽ làm hủy bỏ lần chuyển giao (commit).\n" + +#: builtin/commit.c:766 +#, c-format +msgid "%sAuthor: %s" +msgstr "%sTác giả: %s" + +#: builtin/commit.c:773 +#, c-format +msgid "%sCommitter: %s" +msgstr "%sNgười chuyển giao (commit): %s" + +#: builtin/commit.c:793 +msgid "Cannot read index" +msgstr "không đọc được bảng mục lục" + +#: builtin/commit.c:830 +msgid "Error building trees" +msgstr "Gặp lỗi khi xây dựng cây" + +#: builtin/commit.c:845 +#: builtin/tag.c:361 +#, c-format +msgid "Please supply the message using either -m or -F option.\n" +msgstr "Xin hãy áp dụng thông điệp sử dụng hoặc là tùy chọn -m hoặc là -F.\n" + +#: builtin/commit.c:942 +#, c-format +msgid "No existing author found with '%s'" +msgstr "Không tìm thấy tác giả đã sẵn có với '%s'" + +#: builtin/commit.c:957 +#: builtin/commit.c:1157 +#, c-format +msgid "Invalid untracked files mode '%s'" +msgstr "Chế độ cho các tập tin không bị theo vết không hợp lệ '%s'" + +#: builtin/commit.c:997 +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:1008 +msgid "You have nothing to amend." +msgstr "Không có gì để amend (tu bổ) cả." + +#: builtin/commit.c:1011 +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 amend (tu bổ)." + +#: builtin/commit.c:1013 +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 amend (tu bổ)." + +#: builtin/commit.c:1016 +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:1026 +msgid "Only one of -c/-C/-F/--fixup can be used." +msgstr "Chỉ một tùy chọn trong số -c/-C/-F/--fixup được sử dụng" + +#: builtin/commit.c:1028 +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:1036 +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:1053 +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:1055 +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:1057 +msgid "Clever... amending the last one with dirty index." +msgstr "Giỏi... đang tu bổ cái cuối với bảng mục lục phi nghĩa." + +#: builtin/commit.c:1059 +msgid "Explicit paths specified without -i nor -o; assuming --only paths..." +msgstr "Những đường dẫn rõ ràng được chỉ ra không có tùy chọn -i cũng không -o; đang giả định --only những-đường-dẫn..." + +#: builtin/commit.c:1069 +#: builtin/tag.c:577 +#, c-format +msgid "Invalid cleanup mode %s" +msgstr "Chế độ dọn dẹp không hợp lệ %s" + +#: builtin/commit.c:1074 +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:1257 +msgid "couldn't look up newly created commit" +msgstr "không thể tìm thấy lần chuyển giao (commit) mới hơn đã được tạo" + +#: builtin/commit.c:1259 +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:1300 +msgid "detached HEAD" +msgstr "đã rời khỏi HEAD" + +#: builtin/commit.c:1302 +msgid " (root-commit)" +msgstr " (root-commit)" + +#: builtin/commit.c:1446 +msgid "could not parse HEAD commit" +msgstr "không thể phân tích commit (lần chuyển giao) HEAD" + +#: builtin/commit.c:1484 +#: builtin/merge.c:509 +#, c-format +msgid "could not open '%s' for reading" +msgstr "không thể mở %s' để đọc" + +#: builtin/commit.c:1491 +#, c-format +msgid "Corrupt MERGE_HEAD file (%s)" +msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" + +#: builtin/commit.c:1498 +msgid "could not read MERGE_MODE" +msgstr "không thể đọc MERGE_MODE" + +#: builtin/commit.c:1517 +#, c-format +msgid "could not read commit message: %s" +msgstr "không thể đọc thông điệp (message) commit (lần chuyển giao): %s" + +#: builtin/commit.c:1531 +#, c-format +msgid "Aborting commit; you did not edit the message.\n" +msgstr "Đang bỏ qua việc chuyển giao (commit); bạn đã không biên soạn thông điệp (message).\n" + +#: builtin/commit.c:1536 +#, c-format +msgid "Aborting commit due to empty commit message.\n" +msgstr "Đang bỏ qua lần chuyển giao (commit) bởi vì thông điệp của nó trống rỗng.\n" + +#: builtin/commit.c:1551 +#: builtin/merge.c:936 +#: builtin/merge.c:961 +msgid "failed to write commit object" +msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" + +#: builtin/commit.c:1572 +msgid "cannot lock HEAD ref" +msgstr "không thể khóa HEAD ref (tham chiếu)" + +#: builtin/commit.c:1576 +msgid "cannot update HEAD ref" +msgstr "không thể cập nhật HEAD ref (tham chiếu)" + +#: builtin/commit.c:1587 +msgid "" +"Repository has been updated, but unable to write\n" +"new_index file. Check that disk is not full or quota is\n" +"not exceeded, and then \"git reset HEAD\" to recover." +msgstr "" +"Kho chứa đã hoàn tất việc cập nhật, nhưng không thể ghi vào\n" +"tập tin new_index (bảng mục lục mới). Hãy kiểm tra xem đĩa có bị đầy quá\n" +"hay quota (hạn nghạch đĩa cứng) bị vượt quá, và sau đó \"git reset HEAD\" để khắc phục." + +#: builtin/describe.c:234 +#, c-format +msgid "annotated tag %s not available" +msgstr "thẻ đã được ghi chú %s không sẵn để dùng" + +#: builtin/describe.c:238 +#, 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:240 +#, c-format +msgid "tag '%s' is really '%s' here" +msgstr "thẻ '%s' đã thực sự ở đây '%s' rồi" + +#: builtin/describe.c:267 +#, 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:270 +#, 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:287 +#, 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:289 +#, c-format +msgid "searching to describe %s\n" +msgstr "Đang tìm kiếm để mô tả %s\n" + +#: builtin/describe.c:329 +#, 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:353 +#, c-format +msgid "" +"No annotated tags can describe '%s'.\n" +"However, there were unannotated tags: try --tags." +msgstr "" +"Không có thẻ được chú giải nào được mô tả là '%s'.\n" +"Tuy nhiên, ở đây có những thẻ không được chú giải: hãy thử --tags." + +#: builtin/describe.c:357 +#, c-format +msgid "" +"No tags can describe '%s'.\n" +"Try --always, or create some tags." +msgstr "" +"Không có thẻ (tag) có thể mô tả '%s'.\n" +"Hãy thử --always, hoặt tạo một số thẻ." + +#: builtin/describe.c:378 +#, c-format +msgid "traversed %lu commits\n" +msgstr "đã xuyên %lu qua lần chuyển giao (commit)\n" + +#: builtin/describe.c:381 +#, c-format +msgid "" +"more than %i tags found; listed %i most recent\n" +"gave up search at %s\n" +msgstr "" +"tìm thấy nhiều hơn %i thẻ (tag); đã liệt kê %i gần đây nhất\n" +"bỏ đi tìm kiếm tại %s\n" + +#: builtin/describe.c:436 +msgid "--long is incompatible with --abbrev=0" +msgstr "--long là xung khắc với tùy chọn --abbrev=0" + +#: builtin/describe.c:462 +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:482 +msgid "--dirty is incompatible with committishes" +msgstr "--dirty là xung khắc với các tùy chọn dành cho chuyển giao (commit)" + +#: builtin/diff.c:77 +#, c-format +msgid "'%s': not a regular file or symlink" +msgstr "'%s': không phải tập tin bình thường hay liên kết tượng trưng" + +#: builtin/diff.c:220 +#, c-format +msgid "invalid option: %s" +msgstr "tùy chọn sai: %s" + +#: builtin/diff.c:297 +msgid "Not a git repository" +msgstr "Không phải là kho git" + +#: builtin/diff.c:347 +#, c-format +msgid "invalid object '%s' given." +msgstr "đối tượng đã cho '%s' không hợp lệ." + +#: builtin/diff.c:352 +#, c-format +msgid "more than %d trees given: '%s'" +msgstr "đã chỉ ra nhiều hơn %d cây (tree): '%s'" + +#: builtin/diff.c:362 +#, c-format +msgid "more than two blobs given: '%s'" +msgstr "đã cho nhiều hơn hai đối tượng blob: '%s'" + +#: builtin/diff.c:370 +#, c-format +msgid "unhandled object '%s' given." +msgstr "đã cho đối tượng không thể nắm giữ '%s'." + +#: builtin/fetch.c:200 +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:253 +#, c-format +msgid "object %s not found" +msgstr "Không tìm thấy đối tượng %s" + +#: builtin/fetch.c:259 +msgid "[up to date]" +msgstr "[đã cập nhật]" + +#: builtin/fetch.c:273 +#, c-format +msgid "! %-*s %-*s -> %s (can't fetch in current branch)" +msgstr "! %-*s %-*s -> %s (không thể fetch (lấy về) trong nhánh hiện hành)" + +#: builtin/fetch.c:274 +#: builtin/fetch.c:360 +msgid "[rejected]" +msgstr "[Bị từ chối]" + +#: builtin/fetch.c:285 +msgid "[tag update]" +msgstr "[cập nhật thẻ]" + +#: builtin/fetch.c:287 +#: builtin/fetch.c:322 +#: builtin/fetch.c:340 +msgid " (unable to update local ref)" +msgstr " (không thể cập nhật tham chiếu (ref) nội bộ)" + +#: builtin/fetch.c:305 +msgid "[new tag]" +msgstr "[thẻ mới]" + +#: builtin/fetch.c:308 +msgid "[new branch]" +msgstr "[nhánh mới]" + +#: builtin/fetch.c:311 +msgid "[new ref]" +msgstr "[ref (tham chiếu) mới]" + +#: builtin/fetch.c:356 +msgid "unable to update local ref" +msgstr "không thể cập nhật tham chiếu (ref) nội bộ" + +#: builtin/fetch.c:356 +msgid "forced update" +msgstr "cưỡng bức cập nhật" + +#: builtin/fetch.c:362 +msgid "(non-fast-forward)" +msgstr "(non-fast-forward)" + +#: builtin/fetch.c:393 +#: builtin/fetch.c:685 +#, c-format +msgid "cannot open %s: %s\n" +msgstr "không thể mở %s: %s\n" + +#: builtin/fetch.c:402 +#, 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:488 +#, c-format +msgid "From %.*s\n" +msgstr "Từ %.*s\n" + +#: builtin/fetch.c:499 +#, c-format +msgid "" +"some local refs could not be updated; try running\n" +" 'git remote prune %s' to remove any old, conflicting branches" +msgstr "" +"một số tham chiếu (refs) 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:549 +#, c-format +msgid " (%s will become dangling)" +msgstr " (%s sẽ trở thành lủng lẳng (không được quản lý))" + +#: builtin/fetch.c:550 +#, c-format +msgid " (%s has become dangling)" +msgstr " (%s phải trở thành lủng lẳng (không được quản lý))" + +#: builtin/fetch.c:557 +msgid "[deleted]" +msgstr "[đã xóa]" + +#: builtin/fetch.c:558 +#: builtin/remote.c:1055 +msgid "(none)" +msgstr "(không)" + +#: builtin/fetch.c:675 +#, c-format +msgid "Refusing to fetch into current branch %s of non-bare repository" +msgstr "Từ chối việc lấy (fetch) 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:709 +#, 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ề (fetch) từ %s" + +#: builtin/fetch.c:786 +#, 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:789 +#, 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:888 +#, c-format +msgid "Fetching %s\n" +msgstr "Đang lấy (fetch) %s\n" + +#: builtin/fetch.c:890 +#: builtin/remote.c:100 +#, c-format +msgid "Could not fetch %s" +msgstr "không thể fetch (lấy) %s" + +#: builtin/fetch.c:907 +msgid "" +"No remote repository specified. Please, specify either a URL or a\n" +"remote name from which new revisions should be fetched." +msgstr "" +"Chưa chỉ ra kho chứa máy chủ. Xin hãy chỉ định hoặc là URL hoặc\n" +"tên máy chủ từ cái mà những điểm xét duyệt mới có thể được fetch (lấy về)." + +#: builtin/fetch.c:927 +msgid "You need to specify a tag name." +msgstr "Bạn phải định rõ tên thẻ." + +#: builtin/fetch.c:979 +msgid "fetch --all does not take a repository argument" +msgstr "lệnh lấy về sử dụng tùy chọn --all sẽ không lấy đối số kho chứa" + +#: builtin/fetch.c:981 +msgid "fetch --all does not make sense with refspecs" +msgstr "lệnh lấy về fetch sử dụng tùy chọn --all không hợp lý với refspecs" + +#: builtin/fetch.c:992 +#, 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:1000 +msgid "Fetching a group and specifying refspecs does not make sense" +msgstr "Việc lấy về cả một nhóm và chỉ định refspecs không hợp lý" + +#: builtin/gc.c:63 +#, c-format +msgid "Invalid %s: '%s'" +msgstr "%s không hợp lệ: '%s'" + +#: builtin/gc.c:90 +#, c-format +msgid "insanely long object directory %.*s" +msgstr "thư mục đối tượng dài một cách điên rồ %.*s" + +#: builtin/gc.c:221 +#, 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:224 +#, c-format +msgid "" +"Auto packing the repository for optimum performance. You may also\n" +"run \"git gc\" manually. See \"git help gc\" for more information.\n" +msgstr "" +"Tự động đóng gói kho chứa để tối ưu hóa hiệu suất làm việc.\n" +"chạy lệnh \"git gc\" một cách thủ công. Hãy xem \"git help gc\" để biết thêm chi tiết.\n" + +#: builtin/gc.c:251 +msgid "There are too many unreachable loose objects; run 'git prune' to remove them." +msgstr "Có quá nhiều đối tượng tự do không được dùng đến; hãy chạy lệnh 'git prune' để xóa bỏ chúng đi." + +#: builtin/grep.c:216 +#, c-format +msgid "grep: failed to create thread: %s" +msgstr "grep: gặp lỗi tạo tuyến (thread): %s" + +#: builtin/grep.c:402 +#, c-format +msgid "Failed to chdir: %s" +msgstr "Gặp lỗi với lệnh chdir: %s" + +#: builtin/grep.c:478 +#: builtin/grep.c:512 +#, c-format +msgid "unable to read tree (%s)" +msgstr "không thể đọc cây (%s)" + +#: builtin/grep.c:526 +#, 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:584 +#, c-format +msgid "switch `%c' expects a numerical value" +msgstr "chuyển đến `%c' mong chờ một giá trị bằng số" + +#: builtin/grep.c:601 +#, c-format +msgid "cannot open '%s'" +msgstr "không mở được '%s'" + +#: builtin/grep.c:885 +msgid "no pattern given." +msgstr "chưa chỉ ra mẫu." + +#: builtin/grep.c:899 +#, c-format +msgid "bad object %s" +msgstr "đối tượng sai %s" + +#: builtin/grep.c:940 +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:963 +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:968 +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 các tùy chọn liên quan đến revs." + +#: builtin/grep.c:971 +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:979 +msgid "both --cached and trees are given." +msgstr "cả hai --cached và các cây phải được chỉ ra." + +#: builtin/help.c:59 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "không nhận ra định dạng trợ giúp '%s'" + +#: builtin/help.c:87 +msgid "Failed to start emacsclient." +msgstr "Lỗi khởi chạy emacsclient." + +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." +msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." + +#: builtin/help.c:108 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "phiên bản của emacsclient '%d' quá cũ (< 22)." + +#: builtin/help.c:126 +#: builtin/help.c:154 +#: builtin/help.c:163 +#: builtin/help.c:171 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "gặp lỗi khi thực thi '%s': %s" + +#: builtin/help.c:211 +#, c-format +msgid "" +"'%s': path for unsupported man viewer.\n" +"Please consider using 'man.<tool>.cmd' instead." +msgstr "" +"'%s': đường dẫn không hỗ trợ bộ trình chiếu man.\n" +"Hãy cân nhắc đến việc sử dụng 'man.<tool>.cmd' để thay thế." + +#: builtin/help.c:223 +#, c-format +msgid "" +"'%s': cmd for supported man viewer.\n" +"Please consider using 'man.<tool>.path' instead." +msgstr "" +"'%s': cmd (lệnh) hỗ trợ bộ trình chiếu man.\n" +"Hãy cân nhắc đến việc sử dụng 'man.<tool>.path' để thay thế." + +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" +msgstr "Những lệnh git hay được sử dụng nhất là:" + +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s': không rõ chương trình xem man." + +#: builtin/help.c:372 +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:380 +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:391 +#, c-format +msgid "'%s': not a documentation directory." +msgstr "'%s': không phải là một thư mục tài liệu." + +#: builtin/help.c:432 +#: builtin/help.c:439 +#, c-format +msgid "usage: %s%s" +msgstr "cách sử dụng: %s%s" + +#: builtin/help.c:453 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "`git %s' được đặt bí danh thành `%s'" + +#: builtin/index-pack.c:169 +#, 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:189 +msgid "object of unexpected type" +msgstr "đối tượng của kiểu không mong đợi" + +#: builtin/index-pack.c:226 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "không thể điền vào %d byte" +msgstr[1] "không thể điền vào %d byte" + +#: builtin/index-pack.c:236 +msgid "early EOF" +msgstr "vừa đúng lúc EOF" + +#: builtin/index-pack.c:237 +msgid "read error on input" +msgstr "lỗi đọc ở đầu vào" + +#: builtin/index-pack.c:249 +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:256 +msgid "pack too large for current definition of off_t" +msgstr "pack quá lớn so với định nghĩa hiện tại của kiểu off_t" + +#: builtin/index-pack.c:272 +#, c-format +msgid "unable to create '%s'" +msgstr "không thể tạo '%s'" + +#: builtin/index-pack.c:277 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "không thể mở packfile '%s'" + +#: builtin/index-pack.c:291 +msgid "pack signature mismatch" +msgstr "chữ ký cho pack không khớp" + +#: builtin/index-pack.c:311 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "pack có đối tượng sai khoảng bù (offset) %lu: %s" + +#: builtin/index-pack.c:405 +#, c-format +msgid "inflate returned %d" +msgstr "xả nén trả về %d" + +#: builtin/index-pack.c:450 +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:458 +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:466 +#, c-format +msgid "unknown object type %d" +msgstr "không hiểu kiểu đối tượng %d" + +#: builtin/index-pack.c:495 +msgid "cannot pread pack file" +msgstr "không thể chạy hàm pread cho tập tin pack" + +#: builtin/index-pack.c:497 +#, c-format +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" +msgstr[1] "tập tin pack bị kết thúc sớm, %lu byte bị thiếu" + +#: builtin/index-pack.c:510 +msgid "serious inflate inconsistency" +msgstr "sự mâu thuẫn xả nén nghiêm trọng" + +#: builtin/index-pack.c:583 +#, 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:586 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "SỰ VA CHẠM SHA1 ĐÃ XẢY RA VỚI %s!" + +#: builtin/index-pack.c:598 +#, c-format +msgid "invalid blob object %s" +msgstr "đối tượng blob không hợp lệ %s" + +#: builtin/index-pack.c:610 +#, c-format +msgid "invalid %s" +msgstr "%s không hợp lệ" + +#: builtin/index-pack.c:612 +msgid "Error in object" +msgstr "Lỗi trong đối tượng" + +#: builtin/index-pack.c:614 +#, 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:687 +#: builtin/index-pack.c:713 +msgid "failed to apply delta" +msgstr "gặp lỗi khi áp dụng delta" + +#: builtin/index-pack.c:850 +msgid "Receiving objects" +msgstr "Đang nhận về các đối tượng" + +#: builtin/index-pack.c:850 +msgid "Indexing objects" +msgstr "Các đối tượng bảng mục lục" + +#: builtin/index-pack.c:872 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "pack bị sai hỏng (SHA1 không khớp)" + +#: builtin/index-pack.c:877 +msgid "cannot fstat packfile" +msgstr "không thể fstat packfile" + +#: builtin/index-pack.c:880 +msgid "pack has junk at the end" +msgstr "pack có phần thừa ở cuối" + +#: builtin/index-pack.c:903 +msgid "Resolving deltas" +msgstr "Đang phân giải các delta" + +#: builtin/index-pack.c:954 +msgid "confusion beyond insanity" +msgstr "lộn xộn hơn cả điên rồ" + +#: builtin/index-pack.c:973 +#, c-format +msgid "pack has %d unresolved delta" +msgid_plural "pack has %d unresolved deltas" +msgstr[0] "pack có %d delta chưa được giải quyết" +msgstr[1] "pack có %d delta chưa được giải quyết" + +#: builtin/index-pack.c:998 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "không thể xả đối tượng nối thêm (%d)" + +#: builtin/index-pack.c:1077 +#, c-format +msgid "local object %s is corrupt" +msgstr "đối tượng nội bộ %s bị hỏng" + +#: builtin/index-pack.c:1101 +msgid "error while closing pack file" +msgstr "gặp lỗi trong khi đóng tập tin pack" + +#: builtin/index-pack.c:1114 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "không thể ghi tập tin giữ lại '%s'" + +#: builtin/index-pack.c:1122 +#, 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:1135 +msgid "cannot store pack file" +msgstr "không thể lưu tập tin pack" + +#: builtin/index-pack.c:1146 +msgid "cannot store index file" +msgstr "không thể lưu trữ tập tin ghi mục lục" + +#: builtin/index-pack.c:1247 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "Không thể mở tập tin pack đã sẵn có '%s' " + +#: builtin/index-pack.c:1249 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "Không thể mở tập tin 'pack idx' cho '%s'" + +#: builtin/index-pack.c:1296 +#, c-format +msgid "non delta: %d object" +msgid_plural "non delta: %d objects" +msgstr[0] "không delta: %d đối tượng" +msgstr[1] "không delta: %d đối tượng" + +#: builtin/index-pack.c:1303 +#, 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" +msgstr[1] "chiều dài xích = %d: %lu đối tượng" + +#: builtin/index-pack.c:1330 +msgid "Cannot come back to cwd" +msgstr "Không thể quay lại cwd" + +#: builtin/index-pack.c:1374 +#: builtin/index-pack.c:1377 +#: builtin/index-pack.c:1389 +#: builtin/index-pack.c:1393 +#, c-format +msgid "bad %s" +msgstr "%s sai" + +#: builtin/index-pack.c:1407 +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:1411 +#: builtin/index-pack.c:1421 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "tên tập tin packfile '%s' không được kết thúc bằng đuôi '.pack'" + +#: builtin/index-pack.c:1430 +msgid "--verify with no packfile name given" +msgstr "dùng tùy chọn --verify mà không đưa ra tên packfile" + +#: builtin/init-db.c:35 +#, c-format +msgid "Could not make %s writable by group" +msgstr "Không thể làm %s được ghi bởi nhóm" + +#: builtin/init-db.c:62 +#, c-format +msgid "insanely long template name %s" +msgstr "tên mẫu dài một cách điên rồ %s" + +#: builtin/init-db.c:67 +#, c-format +msgid "cannot stat '%s'" +msgstr "không thể lấy trạng thái (stat) về '%s'" + +#: builtin/init-db.c:73 +#, c-format +msgid "cannot stat template '%s'" +msgstr "không thể stat (lấy trạng thái về) mẫu '%s'" + +#: builtin/init-db.c:80 +#, c-format +msgid "cannot opendir '%s'" +msgstr "không thể opendir '%s'" + +#: builtin/init-db.c:97 +#, c-format +msgid "cannot readlink '%s'" +msgstr "không thể readlink '%s'" + +#: builtin/init-db.c:99 +#, c-format +msgid "insanely long symlink %s" +msgstr "liên kết tượng trưng dài một cách điên rồ %s" + +#: builtin/init-db.c:102 +#, c-format +msgid "cannot symlink '%s' '%s'" +msgstr "không thể tạo liên kết tượng trưng (symlink) '%s' '%s'" + +#: builtin/init-db.c:106 +#, c-format +msgid "cannot copy '%s' to '%s'" +msgstr "không thể sao chép %s sang %s" + +#: builtin/init-db.c:110 +#, c-format +msgid "ignoring template %s" +msgstr "đang lờ đi mẫu %s" + +#: builtin/init-db.c:133 +#, c-format +msgid "insanely long template path %s" +msgstr "đường dẫn mẫu dài một cách điên rồ %s" + +#: builtin/init-db.c:141 +#, c-format +msgid "templates not found %s" +msgstr "các mẫu không được tìm thấy %s" + +#: builtin/init-db.c:154 +#, c-format +msgid "not copying templates of a wrong format version %d from '%s'" +msgstr "không sao chép các mẫu của phiên bản sai định dạng %d từ '%s'" + +#: builtin/init-db.c:192 +#, c-format +msgid "insane git directory %s" +msgstr "thư mục git điên rồ %s" + +#: builtin/init-db.c:322 +#: builtin/init-db.c:325 +#, c-format +msgid "%s already exists" +msgstr "%s đã tồn tại rồi" + +#: builtin/init-db.c:354 +#, c-format +msgid "unable to handle file type %d" +msgstr "không thể handle tệp tin kiểu %d" + +#: builtin/init-db.c:357 +#, c-format +msgid "unable to move %s to %s" +msgstr "không di chuyển được %s vào %s" + +#: builtin/init-db.c:362 +#, c-format +msgid "Could not create git link %s" +msgstr "Không thể tạo liên kết git '%s'" + +#. +#. * TRANSLATORS: The first '%s' is either "Reinitialized +#. * existing" or "Initialized empty", the second " shared" or +#. * "", and the last '%s%s' is the verbatim directory name. +#. +#: builtin/init-db.c:419 +#, c-format +msgid "%s%s Git repository in %s%s\n" +msgstr "%s%s kho Git trong %s%s\n" + +#: builtin/init-db.c:420 +msgid "Reinitialized existing" +msgstr "Khởi tạo lại đã sẵn có rồi" + +#: builtin/init-db.c:420 +msgid "Initialized empty" +msgstr "Khởi tạo trống rỗng" + +#: builtin/init-db.c:421 +msgid " shared" +msgstr " đã chia sẻ" + +#: builtin/init-db.c:440 +msgid "cannot tell cwd" +msgstr "không nói chuyện được với lệnh cwd" + +#: builtin/init-db.c:521 +#: builtin/init-db.c:528 +#, c-format +msgid "cannot mkdir %s" +msgstr "không thể mkdir (tạo thư mục): %s" + +#: builtin/init-db.c:532 +#, c-format +msgid "cannot chdir to %s" +msgstr "không thể chdir (chuyển đổi thư mục) sang %s" + +#: builtin/init-db.c:554 +#, c-format +msgid "%s (or --work-tree=<directory>) not allowed without specifying %s (or --git-dir=<directory>)" +msgstr "%s (hoặc --work-tree=<thư-mục>) không cho phép không chỉ định %s (hoặc --git-dir=<thư-mục>)" + +#: builtin/init-db.c:578 +msgid "Cannot access current working directory" +msgstr "Không thể truy cập thư mục làm việc hiện hành" + +#: builtin/init-db.c:585 +#, c-format +msgid "Cannot access work tree '%s'" +msgstr "không thể truy cập cây (tree) làm việc '%s'" + +#: builtin/log.c:188 +#, c-format +msgid "Final output: %d %s\n" +msgstr "Kết xuất cuối cùng: %d %s\n" + +#: builtin/log.c:401 +#: builtin/log.c:489 +#, c-format +msgid "Could not read object %s" +msgstr "Không thể đọc đối tượng %s" + +#: builtin/log.c:513 +#, c-format +msgid "Unknown type: %d" +msgstr "Không nhận ra kiểu: %d" + +#: builtin/log.c:602 +msgid "format.headers without value" +msgstr "format.headers không có giá trị cụ thể" + +#: builtin/log.c:676 +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:687 +#, c-format +msgid "Cannot open patch file %s" +msgstr "Không thể mở tập tin miếng vá: %s" + +#: builtin/log.c:701 +msgid "Need exactly one range." +msgstr "Cần chính xác một vùng." + +#: builtin/log.c:709 +msgid "Not a range." +msgstr "Không phải là một vùng." + +#: builtin/log.c:786 +msgid "Cover letter needs email format" +msgstr "'Cover letter' cần cho định dạng thư" + +#: builtin/log.c:859 +#, c-format +msgid "insane in-reply-to: %s" +msgstr "in-reply-to điên rồ: %s" + +#: builtin/log.c:932 +msgid "Two output directories?" +msgstr "Hai thư mục kết xuất?" + +#: builtin/log.c:1153 +#, c-format +msgid "bogus committer info %s" +msgstr "thông tin người chuyển giao không có thực %s" + +#: builtin/log.c:1198 +msgid "-n and -k are mutually exclusive." +msgstr "-n và -k loại từ lẫn nhau." + +#: builtin/log.c:1200 +msgid "--subject-prefix and -k are mutually exclusive." +msgstr "--subject-prefix và -k xung khắc nhau." + +#: builtin/log.c:1208 +msgid "--name-only does not make sense" +msgstr "--name-only không hợp lý" + +#: builtin/log.c:1210 +msgid "--name-status does not make sense" +msgstr "--name-status không hợp lý" + +#: builtin/log.c:1212 +msgid "--check does not make sense" +msgstr "--check không hợp lý" + +#: builtin/log.c:1235 +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:1237 +#, c-format +msgid "Could not create directory '%s'" +msgstr "Không thể tạo thư mục '%s'" + +#: builtin/log.c:1390 +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:1494 +#, c-format +msgid "Could not find a tracked remote branch, please specify <upstream> manually.\n" +msgstr "Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <dòng-ngược> một cách thủ công.\n" + +#: builtin/log.c:1510 +#: builtin/log.c:1512 +#: builtin/log.c:1524 +#, c-format +msgid "Unknown commit %s" +msgstr "Không hiểu lần chuyển giao (commit) %s" + +#: builtin/merge.c:90 +msgid "switch `m' requires a value" +msgstr "switch `m' yêu cầu một giá trị" + +#: builtin/merge.c:127 +#, 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:128 +#, c-format +msgid "Available strategies are:" +msgstr "Các chiến lược sẵn sàng là:" + +#: builtin/merge.c:133 +#, 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:240 +msgid "could not run stash." +msgstr "không thể chạy stash." + +#: builtin/merge.c:245 +msgid "stash failed" +msgstr "stash gặp lỗi" + +#: builtin/merge.c:250 +#, 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:269 +#: builtin/merge.c:286 +msgid "read-tree failed" +msgstr "read-tree gặp lỗi" + +#: builtin/merge.c:316 +msgid " (nothing to squash)" +msgstr " (không có ghì để squash)" + +#: builtin/merge.c:329 +#, c-format +msgid "Squash commit -- not updating HEAD\n" +msgstr "Squash commit -- không cập nhật HEAD\n" + +#: builtin/merge.c:361 +msgid "Writing SQUASH_MSG" +msgstr "Đang ghi SQUASH_MSG" + +#: builtin/merge.c:363 +msgid "Finishing SQUASH_MSG" +msgstr "Hoàn thành SQUASH_MSG" + +#: builtin/merge.c:386 +#, c-format +msgid "No merge message -- not updating HEAD\n" +msgstr "Không thông điệp hòa trộn -- không cập nhật HEAD\n" + +#: builtin/merge.c:437 +#, c-format +msgid "'%s' does not point to a commit" +msgstr "'%s' không chỉ đến một lần chuyển giao (commit) nào cả" + +#: builtin/merge.c:536 +#, c-format +msgid "Bad branch.%s.mergeoptions string: %s" +msgstr "Chuỗi branch.%s.mergeoptions sai: %s" + +#: builtin/merge.c:629 +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/merge.c:679 +msgid "failed to read the cache" +msgstr "gặp lỗi khi đọc bộ nhớ tạm" + +#: builtin/merge.c:697 +msgid "Unable to write index." +msgstr "Không thể ghi bảng mục lục" + +#: builtin/merge.c:710 +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:724 +#, 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:738 +#, c-format +msgid "unable to write %s" +msgstr "không ghi được %s" + +#: builtin/merge.c:877 +#, c-format +msgid "Could not read from '%s'" +msgstr "Không thể đọc từ '%s'" + +#: builtin/merge.c:886 +#, 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 (commit); sử dụng lệnh 'git commit' để hoàn tất việc hòa trộn.\n" + +#: builtin/merge.c:892 +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 '#' will be ignored, and an empty message aborts\n" +"the commit.\n" +msgstr "" +"Hãy nhập vào các thông tin để giải thích tại sao sự hòa trộn này là cần thiết,\n" +"đặc biệt là khi nó hòa trộn dòng ngược đã cập nhật vào trong một nhánh topic.\n" +"\n" +"Những dòng được bắt đầu bằng '#' sẽ được bỏ qua, và phần chú thích này nếu rỗng\n" +"sẽ làm hủy bỏ lần chuyển giao (commit).\n" + +#: builtin/merge.c:916 +msgid "Empty commit message." +msgstr "Chú thích của lần commit (chuyển giao) bị trống rỗng." + +#: builtin/merge.c:928 +#, c-format +msgid "Wonderful.\n" +msgstr "Thần kỳ.\n" + +#: builtin/merge.c:993 +#, 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 (commit) kết quả.\n" + +#: builtin/merge.c:1009 +#, c-format +msgid "'%s' is not a commit" +msgstr "%s không phải là một lần commit (chuyển giao)" + +#: builtin/merge.c:1050 +msgid "No current branch." +msgstr "không phải nhánh hiện hành" + +#: builtin/merge.c:1052 +msgid "No remote for the current branch." +msgstr "Không có máy chủ cho nhánh hiện hành." + +#: builtin/merge.c:1054 +msgid "No default upstream defined for the current branch." +msgstr "Không có dòng ngược mặc định được định nghĩa cho nhánh hiện hành." + +#: builtin/merge.c:1059 +#, c-format +msgid "No remote tracking branch for %s from %s" +msgstr "Không nhánh mạng theo vết cho %s từ %s" + +#: builtin/merge.c:1146 +#: builtin/merge.c:1303 +#, c-format +msgid "%s - not something we can merge" +msgstr "%s - không phải là một số thứ chúng tôi có thể hòa trộn" + +#: builtin/merge.c:1214 +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ả (không thấy MERGE_HEAD)." + +#: builtin/merge.c:1230 +#: git-pull.sh:31 +msgid "" +"You have not concluded your merge (MERGE_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại).\n" +"Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." + +#: builtin/merge.c:1233 +#: git-pull.sh:34 +msgid "You have not concluded your merge (MERGE_HEAD exists)." +msgstr "Bạn chưa kết thúc việc hòa trộng (MERGE_HEAD vẫn tồn tại)." + +#: builtin/merge.c:1237 +msgid "" +"You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" +"Please, commit your changes before you can merge." +msgstr "" +"Bạn chưa kết thúc việc cherry-pick (CHERRY_PICK_HEAD vẫn tồn tại).\n" +"Hãy chuyển giao (commit) các thay đổi trước khi bạn có thể hòa trộn." + +#: builtin/merge.c:1240 +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:1249 +msgid "You cannot combine --squash with --no-ff." +msgstr "Bạn không thể tổ hợp --squash với --no-ff." + +#: builtin/merge.c:1254 +msgid "You cannot combine --no-ff with --ff-only." +msgstr "Bạn không thể tổ hợp --no-ff với --ff-only." + +#: builtin/merge.c:1261 +msgid "No commit specified and merge.defaultToUpstream not set." +msgstr "Không chỉ ra lần chuyển giao (commit) và merge.defaultToUpstream chưa được đặt." + +#: builtin/merge.c:1293 +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 (commit) vào một head rỗng" + +#: builtin/merge.c:1296 +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:1298 +msgid "Non-fast-forward commit does not make sense into an empty head" +msgstr "Chuyển giao (commit) không-fast-forward không hợp lý ở trong một head trống rỗng" + +#: builtin/merge.c:1413 +#, c-format +msgid "Updating %s..%s\n" +msgstr "Đang cập nhật %s..%s\n" + +#: builtin/merge.c:1451 +#, 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:1458 +#, c-format +msgid "Nope.\n" +msgstr "Không.\n" + +#: builtin/merge.c:1490 +msgid "Not possible to fast-forward, aborting." +msgstr "Thực hiện lệnh fast-forward là không thể được, đang bỏ qua." + +#: builtin/merge.c:1513 +#: builtin/merge.c:1592 +#, 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:1517 +#, c-format +msgid "Trying merge strategy %s...\n" +msgstr "Đang thử chiến lược hòa trộn %s...\n" + +#: builtin/merge.c:1583 +#, 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:1585 +#, 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:1594 +#, 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:1606 +#, c-format +msgid "Automatic merge went well; stopped before committing as requested\n" +msgstr "Hòa trộn tự động đã trở nên tốt; bị dừng trước khi việc chuyển giao được yêu cầu\n" + +#: builtin/mv.c:108 +#, 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:112 +msgid "bad source" +msgstr "nguồn sai" + +#: builtin/mv.c:115 +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:118 +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:128 +#, c-format +msgid "Huh? %.*s is in index?" +msgstr "Hả? %.*s trong bảng mục lục à?" + +#: builtin/mv.c:140 +msgid "source directory is empty" +msgstr "thư mục nguồn là trống rỗng" + +#: builtin/mv.c:171 +msgid "not under version control" +msgstr "không nằm dưới sự quản lý mã nguồn" + +#: builtin/mv.c:173 +msgid "destination exists" +msgstr "đích đã tồn tại sẵn rồi" + +#: builtin/mv.c:181 +#, c-format +msgid "overwriting '%s'" +msgstr "đang ghi đè lên '%s'" + +#: builtin/mv.c:184 +msgid "Cannot overwrite" +msgstr "Không thể ghi chèn" + +#: builtin/mv.c:187 +msgid "multiple sources for the same target" +msgstr "Nhiều nguồn cho cùng một đích" + +#: builtin/mv.c:202 +#, c-format +msgid "%s, source=%s, destination=%s" +msgstr "%s, nguồn=%s, đích=%s" + +#: builtin/mv.c:212 +#, c-format +msgid "Renaming %s to %s\n" +msgstr "Đang thay đổi tên %s thành %s\n" + +#: builtin/mv.c:215 +#: builtin/remote.c:731 +#, c-format +msgid "renaming '%s' failed" +msgstr "đổi tên %s gặp lỗi" + +#: builtin/notes.c:139 +#, c-format +msgid "unable to start 'show' for object '%s'" +msgstr "không thể khởi chạy 'show' cho đối tượng '%s'" + +#: builtin/notes.c:145 +msgid "can't fdopen 'show' output fd" +msgstr "không thể fdopen 'show' (lệnh hiển thị) mô tả tập tin (fd) kết xuất" + +#: builtin/notes.c:155 +#, c-format +msgid "failed to close pipe to 'show' for object '%s'" +msgstr "gặp lỗi khi đóng đường ống cho lệnh 'show' cho đối tượng '%s'" + +#: builtin/notes.c:158 +#, c-format +msgid "failed to finish 'show' for object '%s'" +msgstr "gặp lỗi khi hoàn thành 'show' cho đối tượng '%s'" + +#: builtin/notes.c:175 +#: builtin/tag.c:347 +#, c-format +msgid "could not create file '%s'" +msgstr "không thể tạo tập tin '%s'" + +#: builtin/notes.c:189 +msgid "Please supply the note contents using either -m or -F option" +msgstr "Xin hãy áp dụng nội dung của ghi chú sử dụng hoặc là tùy chọn -m hoặc là -F" + +#: builtin/notes.c:210 +#: builtin/notes.c:973 +#, 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:215 +msgid "unable to write note object" +msgstr "không thể ghi đối tượng ghi chú (note)" + +#: builtin/notes.c:217 +#, c-format +msgid "The note contents has been left in %s" +msgstr "Nội dung ghi chú còn lại %s" + +#: builtin/notes.c:251 +#: builtin/tag.c:542 +#, c-format +msgid "cannot read '%s'" +msgstr "không thể đọc '%s'" + +#: builtin/notes.c:253 +#: builtin/tag.c:545 +#, c-format +msgid "could not open or read '%s'" +msgstr "không thể mở để đọc hay ghi '%s'" + +#: builtin/notes.c:272 +#: builtin/notes.c:445 +#: builtin/notes.c:447 +#: builtin/notes.c:507 +#: builtin/notes.c:561 +#: builtin/notes.c:644 +#: builtin/notes.c:649 +#: builtin/notes.c:724 +#: builtin/notes.c:766 +#: builtin/notes.c:968 +#: builtin/reset.c:293 +#: builtin/tag.c:558 +#, c-format +msgid "Failed to resolve '%s' as a valid ref." +msgstr "Gặp lỗi khi giải quyết '%s' như là một tham chiếu (ref) hợp lệ." + +#: builtin/notes.c:275 +#, c-format +msgid "Failed to read object '%s'." +msgstr "Gặp lỗi khi đọc đối tượng '%s'." + +#: builtin/notes.c:299 +msgid "Cannot commit uninitialized/unreferenced notes tree" +msgstr "Không thể chuyển giao (commit) chưa được khởi tạo hoặc không được tham chiếu cây ghi chú" + +#: builtin/notes.c:340 +#, c-format +msgid "Bad notes.rewriteMode value: '%s'" +msgstr "Giá trị notes.rewriteMode sai: '%s'" + +#: builtin/notes.c:350 +#, c-format +msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" +msgstr "Từ chối ghi đè ghi chú trong %s (nằm ngoài của refs/notes/)" + +#. TRANSLATORS: The first %s is the name of the +#. environment variable, the second %s is its value +#: builtin/notes.c:377 +#, c-format +msgid "Bad %s value: '%s'" +msgstr "Giá trị %s sai: '%s'" + +#: builtin/notes.c:441 +#, c-format +msgid "Malformed input line: '%s'." +msgstr "Dòng nhập vào dị hình: '%s'." + +#: builtin/notes.c:456 +#, 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/notes.c:500 +#: builtin/notes.c:554 +#: builtin/notes.c:627 +#: builtin/notes.c:639 +#: builtin/notes.c:712 +#: builtin/notes.c:759 +#: builtin/notes.c:1033 +msgid "too many parameters" +msgstr "quá nhiều đối số" + +#: builtin/notes.c:513 +#: builtin/notes.c:772 +#, c-format +msgid "No note found for object %s." +msgstr "không ghi chú được tìm thấy cho đối tượng %s." + +#: builtin/notes.c:580 +#, c-format +msgid "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" +msgstr "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã sẵn có cho đối tượng %s. Sử dụng tùy chọn '-f' để ghi đè lên các ghi chú cũ" + +#: builtin/notes.c:585 +#: builtin/notes.c:662 +#, 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:635 +msgid "too few parameters" +msgstr "quá ít đối số" + +#: builtin/notes.c:656 +#, c-format +msgid "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite existing notes" +msgstr "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã sẵn có cho đối tượng %s. Sử dụng tùy chọn '-f' để ghi đè lên các ghi chú cũ" + +#: builtin/notes.c:668 +#, 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:717 +#, 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 "" +"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:971 +#, c-format +msgid "Object %s has no note\n" +msgstr "Đối tượng %s không có ghi chú (note)\n" + +#: builtin/notes.c:1103 +#: builtin/remote.c:1598 +#, c-format +msgid "Unknown subcommand: %s" +msgstr "Không hiểu câu lệnh con: %s" + +#: builtin/pack-objects.c:2337 +#, 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:2341 +#, c-format +msgid "bad index version '%s'" +msgstr "phiên bản mục lục sai '%s'" + +#: builtin/pack-objects.c:2364 +#, c-format +msgid "option %s does not accept negative form" +msgstr "tùy chọn %s không chấp nhận dạng thức âm" + +#: builtin/pack-objects.c:2368 +#, c-format +msgid "unable to parse value '%s' for option %s" +msgstr "không thể phân tích giá trị '%s' cho tùy chọn %s" + +#: builtin/push.c:45 +msgid "tag shorthand without <tag>" +msgstr "dùng tốc ký tag không có <thẻ>" + +#: builtin/push.c:64 +msgid "--delete only accepts plain target ref names" +msgstr "--delete chỉ chấp nhận các tên tham chiếu (ref) dạng thường" + +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"Để chọn mỗi tùy chọn một cách cố định, xem push.default trong 'git help config'." + +#: builtin/push.c:102 +#, 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 "" +"Nhánh dòng ngược (upstream) của nhánh hiện tại của bạn không khớp\n" +"với tên của nhánh hiện tại của bạn. Để push đến nhánh dòng ngược\n" +"trên máy chủ, sử dụng\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"Để push tới nhánh cùng tên trên máy chủ, sử dụng\n" +"\n" +" git push %s %s\n" +"%s" + +#: builtin/push.c:121 +#, 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 "" +"Bạn hiện nay không ở một nhánh.\n" +"Để push lịch sử hướng tới trạng thái hiện hành (HEAD đã bị tách rời)\n" +"ngay bây giờ, sử dụng\n" +"\n" +" git push %s HEAD:<tên-của-nhánh-máy-chủ>\n" + +#: builtin/push.c:128 +#, 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 "" +"Nhánh hiện tại %s không có nhánh dòng ngược (upstream) nào.\n" +"Để push (đẩy lên) nhánh hiện tại và đặt máy chủ như là dòng ngược (upstream), sử dụng\n" +"\n" +" git push --set-upstream %s %s\n" + +#: builtin/push.c:136 +#, c-format +msgid "The current branch %s has multiple upstream branches, refusing to push." +msgstr "Nhánh hiện tại %s có đa nhánh dòng ngược (upstream), từ chối push." + +#: builtin/push.c:139 +#, 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 "" +"Bạn đang push (đẩy lên) máy chủ '%s', mà nó không phải là dòng ngược (upstream) của\n" +"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:174 +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 để push, và push.default là \"không là gì cả\"." + +#: builtin/push.c:181 +msgid "" +"Updates were rejected because the tip of your current branch is behind\n" +"its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" +"before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" +"phận tương ứng của máy chủ. Hòa trộn với các thay đổi từ máy chủ (v.d. 'git pull')\n" +"trước khi lại push lần nữa.\n" +"Xem trong phần 'Note about fast-forwards' trong nội dung từ lệnh 'git push --help'." + +#: builtin/push.c:187 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. If you did not intend to push that branch, you may want to\n" +"specify branches to push or set the 'push.default' configuration\n" +"variable to 'current' or 'upstream' to push only the current branch." +msgstr "" +"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" +"phận tương ứng của máy chủ. Nếu bạn không có ý định push nhánh đó, bạn có lẽ muốn\n" +"chỉ định các nhánh để push hoặt là đặt nội dung cho biến cấu hình 'push.default'\n" +"thành 'current' hoặc 'upstream' để push chỉ nhánh hiện hành mà thôi." + +#: builtin/push.c:193 +msgid "" +"Updates were rejected because a pushed branch tip is behind its remote\n" +"counterpart. Check out this branch and merge 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 "" +"Việc cập nhật bị từ chối bởi vì đầu mút của nhánh được push nằm đằng sau bộ\n" +"phận tương ứng của máy chủ. Checkou nhánh này và hòa trộn với các thay đổi từ máy chủ\n" +"(v.d. 'git pull') trước khi lại push lần nữa.\n" +"Xem trong phần 'Note about fast-forwards' trong nội dung từ lệnh 'git push --help'." + +#: builtin/push.c:233 +#, c-format +msgid "Pushing to %s\n" +msgstr "Đang push (đẩy) lên %s\n" + +#: builtin/push.c:237 +#, c-format +msgid "failed to push some refs to '%s'" +msgstr "gặp lỗi khi push (đẩy lên) một số tham chiếu (ref) đến '%s'" + +#: builtin/push.c:269 +#, c-format +msgid "bad repository '%s'" +msgstr "repository (kho) sai '%s'" + +#: builtin/push.c:270 +msgid "" +"No configured push destination.\n" +"Either specify the URL from the command-line or configure a remote repository using\n" +"\n" +" git remote add <name> <url>\n" +"\n" +"and then push using the remote name\n" +"\n" +" git push <name>\n" +msgstr "" +"Chưa cấu hình đích để push (đẩy lên).\n" +"Hoặc là chỉ ra URL từ dòng lệnh hoặc là cấu hình một kho máy chủ sử dụng\n" +"\n" +" git remote add <tên> <url>\n" +"\n" +"và sau đó push sử dụng tên máy chủ\n" +"\n" +" git push <tên>\n" + +#: builtin/push.c:285 +msgid "--all and --tags are incompatible" +msgstr "--all và --tags xung khắc nhau" + +#: builtin/push.c:286 +msgid "--all can't be combined with refspecs" +msgstr "--all không thể được tổ hợp cùng với refspecs" + +#: builtin/push.c:291 +msgid "--mirror and --tags are incompatible" +msgstr "--mirror và --tags xung khắc nhau" + +#: builtin/push.c:292 +msgid "--mirror can't be combined with refspecs" +msgstr "--mirror không thể được tổ hợp cùng với refspecs" + +#: builtin/push.c:297 +msgid "--all and --mirror are incompatible" +msgstr "--all và --mirror xung khắc nhau" + +#: builtin/push.c:385 +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:387 +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 (refs) nào" + +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "Đang cập nhật %s" + +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"--mirror nguy hiểm và không dùng nữa; xin hãy\n" +"\t sử dụng tùy chọn --mirror=fetch hoặc --mirror=push để thay thế" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "không hiểu tham số máy bản sao (mirror): %s" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "đang chỉ định một nhánh master không phân biệt HOA/thường với tùy chọn --mirror" + +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "chỉ định những nhánh để theo vết chỉ hợp lý với các 'fetch mirror'" + +#: builtin/remote.c:195 +#: builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "máy chủ %s đã tồn tại rồi." + +#: builtin/remote.c:199 +#: builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' không phải tên máy chủ hợp lệ" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "Không thể cài đặt nhánh master '%s'" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "nhiều hơn một %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "Không thể lấy ánh xạ (map) fetch cho refspec %s" + +#: builtin/remote.c:440 +#: builtin/remote.c:448 +msgid "(matching)" +msgstr "(mẫu)" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "(xoá)" + +#: builtin/remote.c:595 +#: builtin/remote.c:601 +#: builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "Không thể nối thêm '%s' vào '%s'" + +#: builtin/remote.c:639 +#: builtin/remote.c:792 +#: builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "Không có máy chủ nào như thế: %s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "Không thể đổi tên chương (section) cấu hình từ '%s' thành '%s'" + +#: builtin/remote.c:662 +#: builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "Không thể gỡ bỏ chương (section) cấu hình '%s'" + +#: builtin/remote.c:677 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" +"Không cập nhật 'non-default fetch respec'\n" +"\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:683 +#, c-format +msgid "Could not append '%s'" +msgstr "Không thể nối thêm '%s'" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "Không thể đặt '%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "việc xoá %s gặp lỗi" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "tạo %s gặp lỗi" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "Không thể gỡ nhánh %s" + +#: builtin/remote.c:834 +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] "" +"Chú ý: Một nhánh nằm ngoài hệ thống refs/remotes/ đã không được gỡ bỏ đi;\n" +"để xóa đi, sử dụng:" +msgstr[1] "" +"Chú ý: Một số nhánh nằm ngoài hệ thống refs/remotes/ đã không được gỡ bỏ đi;\n" +"để xóa đi, sử dụng:" + +#: builtin/remote.c:943 +#, 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:946 +msgid " tracked" +msgstr " bị theo vết" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " cũ (sử dụng 'git remote prune' để gỡ bỏ)" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "branch.%s.merge không hợp lệ; không thể rebase về phía > 1 nhánh" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "thực hiện rebase trên máy chủ %s" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " hòa trộn với máy chủ %s" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " và với máy chủ" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "hòa trộn với máy chủ %s" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " và với máy chủ" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "tạo" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "xoá" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "đã cập nhật" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "có-thể-fast-forward" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "dữ liệu nội bộ đã cũ" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s ép buộc thành %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s push tới %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s ép buộc thành %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s push tới %s" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* máy chủ %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " URL để lấy về (fetch): %s" + +#: builtin/remote.c:1120 +#: builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(không có URL nào)" + +#: builtin/remote.c:1129 +#: builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " URL để đẩy lên (push) : %s" + +#: builtin/remote.c:1133 +#: builtin/remote.c:1135 +#: builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " Nhánh HEAD: %s" + +#: builtin/remote.c:1139 +#, c-format +msgid " HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " nhánh HEAD (HEAD máy chủ là không rõ ràng, có lẽ là một trong số sau):\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " Nhánh trên máy chủ:%s" +msgstr[1] " Những nhánh trên máy chủ:%s" + +#: builtin/remote.c:1154 +#: builtin/remote.c:1181 +msgid " (status not queried)" +msgstr " (trạng thái không được yêu cầu)" + +#: builtin/remote.c:1163 +msgid " Local branch configured for 'git pull':" +msgid_plural " Local branches configured for 'git pull':" +msgstr[0] " Nhánh nội bộ đã được cấu hình cho lệnh 'git pull':" +msgstr[1] " Những nhánh nội bộ đã được cấu hình cho lệnh 'git pull':" + +#: builtin/remote.c:1171 +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:1178 +#, c-format +msgid " Local ref configured for 'git push'%s:" +msgid_plural " Local refs configured for 'git push'%s:" +msgstr[0] " Tham chiếu nội bộ được cấu hình cho lệnh 'git push'%s:" +msgstr[1] " Những tham chiếu nội bộ được cấu hình cho lệnh 'git push'%s:" + +#: builtin/remote.c:1216 +msgid "Cannot determine remote HEAD" +msgstr "Không thể xác định được HEAD máy chủ" + +#: builtin/remote.c:1218 +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:1228 +#, c-format +msgid "Could not delete %s" +msgstr "Không thể xóa bỏ %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "Không phải là tham chiếu (ref) hợp lệ: %s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "Không thể cài đặt %s" + +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s sẽ trở thành lủng lẳng (không được quản lý)!" + +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s phải trở thành lủng lẳng (không được quản lý)!" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "Đang xén bớt %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL: %s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [nên xén bớt] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr " *[đã xén bớ] %s" + +#: builtin/remote.c:1387 +#: builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "Không có máy chủ nào có tên '%s'" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "chưa chỉ ra máy chủ nào" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete không hợp lý" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "Kiểu mẫu URL cũ không hợp lệ: %s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "Không tìm thấy URL như vậy: %s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "Sẽ không xóa những địa chỉ URL không-push" + +#: builtin/reset.c:33 +msgid "mixed" +msgstr "pha trộn" + +#: builtin/reset.c:33 +msgid "soft" +msgstr "mềm" + +#: builtin/reset.c:33 +msgid "hard" +msgstr "cứng" + +#: builtin/reset.c:33 +msgid "merge" +msgstr "hòa trộn" + +#: builtin/reset.c:33 +msgid "keep" +msgstr "giữ lại" + +#: builtin/reset.c:77 +msgid "You do not have a valid HEAD." +msgstr "Bạn không có HEAD nào hợp lệ." + +#: builtin/reset.c:79 +msgid "Failed to find tree of HEAD." +msgstr "Gặp lỗi khi tìm cây của HEAD." + +#: builtin/reset.c:85 +#, 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:96 +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/reset.c:106 +#, c-format +msgid "HEAD is now at %s" +msgstr "HEAD hiện giờ tại %s" + +#: builtin/reset.c:130 +msgid "Could not read index" +msgstr "Không thể đọc bảng mục lục" + +#: builtin/reset.c:133 +msgid "Unstaged changes after reset:" +msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" + +#: builtin/reset.c:223 +#, 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:297 +#, c-format +msgid "Could not parse object '%s'." +msgstr "không thể phân tích đối tượng '%s'." + +#: builtin/reset.c:302 +msgid "--patch is incompatible with --{hard,mixed,soft}" +msgstr "--patch xung khắc với --{hard,mixed,soft}" + +#: builtin/reset.c:311 +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:313 +#, 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:325 +#, c-format +msgid "%s reset is not allowed in a bare repository" +msgstr "%s reset không được phép trên kho bare (trên máy chủ)" + +#: builtin/reset.c:341 +#, 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 lại '%s'." + +#: builtin/revert.c:70 +#: builtin/revert.c:92 +#, c-format +msgid "%s: %s cannot be used with %s" +msgstr "%s: %s không thể được sử dụng với %s" + +#: builtin/revert.c:131 +msgid "program error" +msgstr "lỗi chương trình" + +#: builtin/revert.c:221 +msgid "revert failed" +msgstr "revert gặp lỗi" + +#: builtin/revert.c:236 +msgid "cherry-pick failed" +msgstr "cherry-pick gặp lỗi" + +#: builtin/rm.c:109 +#, c-format +msgid "" +"'%s' has staged content different from both the file and the HEAD\n" +"(use -f to force removal)" +msgstr "" +"'%s' có nội dung được lưu trạng thái khác biệt từ cả tập tin và cả HEAD\n" +"(sử dụng -f để ép buộc gỡ bỏ)" + +#: builtin/rm.c:115 +#, c-format +msgid "" +"'%s' has changes staged in the index\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' có các thay đổi được lưu trạng thái trong bảng mục lục\n" +"(sử dụng --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" + +#: builtin/rm.c:119 +#, c-format +msgid "" +"'%s' has local modifications\n" +"(use --cached to keep the file, or -f to force removal)" +msgstr "" +"'%s' có các thay đổi nội bộ\n" +"(sử dụng --cached để giữ tập tin, hoặc -f để ép buộc gỡ bỏ)" + +#: builtin/rm.c:194 +#, 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:230 +#, c-format +msgid "git rm: unable to remove %s" +msgstr "git rm: không thể gỡ bỏ %s" + +#: builtin/shortlog.c:157 +#, c-format +msgid "Missing author: %s" +msgstr "Thiếu tên tác giả: %s" + +#: builtin/tag.c:60 +#, c-format +msgid "malformed object at '%s'" +msgstr "đối tượng dị hình tại '%s'" + +#: builtin/tag.c:207 +#, c-format +msgid "tag name too long: %.*s..." +msgstr "tên thẻ quá dài: %.*s..." + +#: builtin/tag.c:212 +#, c-format +msgid "tag '%s' not found." +msgstr "không tìm thấy tìm thấy thẻ '%s'." + +#: builtin/tag.c:227 +#, c-format +msgid "Deleted tag '%s' (was %s)\n" +msgstr "Thẻ đã bị xóa '%s' (trước là %s)\n" + +#: builtin/tag.c:239 +#, c-format +msgid "could not verify the tag '%s'" +msgstr "không thể thẩm tra thẻ '%s'" + +#: builtin/tag.c:249 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be ignored.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Viết các ghi chú cho (thẻ) tag\n" +"# Những dòng được bắt đầu bằng '#' sẽ được bỏ qua.\n" +"#\n" + +#: builtin/tag.c:256 +msgid "" +"\n" +"#\n" +"# Write a tag message\n" +"# Lines starting with '#' will be kept; you may remove them yourself if you want to.\n" +"#\n" +msgstr "" +"\n" +"#\n" +"# Viết các ghi chú cho (thẻ) tag\n" +"# Những dòng được bắt đầu bằng '#' sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn.\n" +"#\n" + +#: builtin/tag.c:298 +msgid "unable to sign the tag" +msgstr "không thể ký thẻ" + +#: builtin/tag.c:300 +msgid "unable to write tag file" +msgstr "không thể ghi vào tập tin lưu thẻ" + +#: builtin/tag.c:325 +msgid "bad object type." +msgstr "kiểu đối tượng sai." + +#: builtin/tag.c:338 +msgid "tag header too big." +msgstr "đầu thẻ (tag) quá lớn." + +#: builtin/tag.c:370 +msgid "no tag message?" +msgstr "không có thông điệp (message) cho thẻ (tag)?" + +#: builtin/tag.c:376 +#, 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:425 +msgid "switch 'points-at' requires an object" +msgstr "chuyển đến 'points-at' yêu cần một đối tượng" + +#: builtin/tag.c:427 +#, c-format +msgid "malformed object name '%s'" +msgstr "tên đối tượng dị hình '%s'" + +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column và -n xung khắc nhau" + +#: builtin/tag.c:523 +msgid "-n option is only allowed with -l." +msgstr "tùy chọn -n chỉ cho phép dùng với -l." + +#: builtin/tag.c:525 +msgid "--contains option is only allowed with -l." +msgstr "tùy chọn --contains chỉ cho phép dùng với -l." + +#: builtin/tag.c:527 +msgid "--points-at option is only allowed with -l." +msgstr "tùy chọn --points-at chỉ cho phép dùng với -l." + +#: builtin/tag.c:535 +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:555 +msgid "too many params" +msgstr "quá nhiều đối số" + +#: builtin/tag.c:561 +#, c-format +msgid "'%s' is not a valid tag name." +msgstr "'%s' không phải thẻ hợp lệ." + +#: builtin/tag.c:566 +#, c-format +msgid "tag '%s' already exists" +msgstr "Thẻ '%s' đã tồn tại rồi" + +#: builtin/tag.c:584 +#, c-format +msgid "%s: cannot lock the ref" +msgstr "%s: không thể khóa ref (tham chiếu)" + +#: builtin/tag.c:586 +#, c-format +msgid "%s: cannot update the ref" +msgstr "%s: không thể cập nhật ref (tham chiếu)" + +#: builtin/tag.c:588 +#, c-format +msgid "Updated tag '%s' (was %s)\n" +msgstr "Thẻ đã cập nhật '%s' (cũ là %s)\n" + +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "Chạy lệnh 'git help <tên-lệnh>' để có thêm thông tin về lệnh được chỉ ra." + +#: parse-options.h:133 +#: parse-options.h:235 +msgid "n" +msgstr "n" + +#: parse-options.h:141 +msgid "time" +msgstr "thời-gian" + +#: parse-options.h:149 +msgid "file" +msgstr "tập-tin" + +#: parse-options.h:151 +msgid "when" +msgstr "khi" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "no-op (tương thích ngược)" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "chi tiết hơn nữa" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "im lặng hơn nữa" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "Thêm nội dung tập tin vào bảng mục lục" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "Tìm kiếm bằng điều tra nhị phân các thay đổi mà nó bắt đầu lỗi" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "Liệt kê, tạo hay là xóa các nhánh" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "Checkout một nhánh hay các đường dẫn tời cây làm việc" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "Nhân bản một kho chứa đến một thư mục mới" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "Ghi các thay đổi vào kho chứa" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "Hiển thị các thay đổi giữa những lần chuyển giao (commit), commit và cây làm việc, v.v.." + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "Các đối tượng và tham chiếu được tải về từ kho chứa khác" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "In ra những dòng khớp với một mẫu" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "Tạo một kho git trống rỗng hay khởi tạo lại một kho đã tồn tại từ trước" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "hiển thị nhật ký các lần commit (chuyển giao)" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "Hợp nhất hai hay nhiều hơn lịch sử của các nhà phát triển phần mềm lại với nhau" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "Di chuyển, đổi tên một tập tin, thư mục hay liên kết tượng trưng" + +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "Fetch (lấy về) và hòa trộng với kho khác hay nhánh nội bộ" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "Cập nhật tham chiếu (refs) máy chủ cùng với các đối tượng liên quan đến nó" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "Forward-port những lần chuyển giao nội bộ tới head dòng ngược đã cập nhật" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "Đặt lại HEAD hiện hành thành một trạng thái được chỉ ra" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "Gỡ bỏ các tập tin từ cây làm việc và từ bảng mục lục" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "Hiển thị các kiểu khác nhau của các đối tượng" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "Hiển thị trạng thái cây làm việc" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "Tạo, liệt kê, xóa hay xác thực một đối tượng thẻ (tag) mà nó được ký sử dụng GPG" + +#: git-am.sh:50 +msgid "You need to set your committer info first" +msgstr "Bạn cần đặt thông tin về người chuyển giao mã nguồn trước đã" + +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"Bạn có lẽ đã có HEAD đã bị di chuyển đi kể từ lần 'am' thất bại cuối cùng.\n" +"Không thể chuyển tới ORIG_HEAD" + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"Khi bạn cần giải quyết vấn đề này hãy chạy lệnh \"$cmdline --resolved\".\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 bản và dừng việc vá lại thì chạy \"$cmdline --abort\"." + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "Đang trở lại để hòa trộn kiểu 'three-way'." + +#: git-am.sh:137 +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'." + +#: git-am.sh:154 +msgid "" +"Did you hand edit your patch?\n" +"It does not apply to blobs recorded in its index." +msgstr "" +"Bạn đã sửa miếng vá của mình bằng cách thủ công à?\n" +"Nó không thể áp dụng các blob đã được ghi lại trong bảng mục lục của nó." + +#: git-am.sh:163 +msgid "Falling back to patching base and 3-way merge..." +msgstr "Đang trở lại để vá cơ sở và '3-way merge'..." + +#: git-am.sh:275 +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" + +#: git-am.sh:362 +#, sh-format +msgid "Patch format $patch_format is not supported." +msgstr "Định dạng miếng vá $patch_format không được hỗ trợ." + +#: git-am.sh:364 +msgid "Patch format detection failed." +msgstr "Dò tìm định dạng miếng vá gặp lỗi." + +#: git-am.sh:418 +msgid "-d option is no longer supported. Do not use." +msgstr "Tùy chọn -d không còn được hỗ trợ nữa. Xin đừng sử dụng." + +#: git-am.sh:481 +#, sh-format +msgid "previous rebase directory $dotest still exists but mbox given." +msgstr "thư mục rebase trước $dotest vẫn chưa sẵn sàng nhưng mbox được đưa ra." + +#: git-am.sh:486 +msgid "Please make up your mind. --skip or --abort?" +msgstr "Xin hãy rõ ràng. --skip hay --abort?" + +#: git-am.sh:513 +msgid "Resolve operation not in progress, we are not resuming." +msgstr "Thao tác phân giải không đang được tiến hành, chúng ta không phục hồi lại." + +#: git-am.sh:579 +#, sh-format +msgid "Dirty index: cannot apply patches (dirty: $files)" +msgstr "Bảng mục lục sai: không thể áp dụng các miếng vá (sai: $files)" + +#: git-am.sh:671 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"Miếng vá trống rỗng. Nó đã bị chia cắt sai phải không?\n" +"Nếu bạn thích bỏ qua miếng vá này, hãy chạy lệnh sau để thay thế \"$cmdline --skip\".\n" +"Để phục hồi lại nhánh nguyên bản và dừng vá lại hãy chạy lệnh \"$cmdline --abort\"." + +#: git-am.sh:708 +msgid "Patch does not have a valid e-mail address." +msgstr "Miếng vá không có địa chỉ e-mail hợp lệ." + +#: git-am.sh:755 +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" + +#: git-am.sh:759 +msgid "Commit Body is:" +msgstr "Thân của lần chuyển giao (commit) là:" + +#. TRANSLATORS: Make sure to include [y], [n], [e], [v] and [a] +#. in your translation. The program will only accept English +#. input at this point. +#: git-am.sh:766 +msgid "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " +msgstr "Áp dụng? đồng ý [y]/không [n]/chỉnh sửa [e]/hiển thị miếng [v]á/đồng ý tất cả [a]" + +#: git-am.sh:802 +#, sh-format +msgid "Applying: $FIRSTLINE" +msgstr "Đang áp dụng (miếng vá): $FIRSTLINE" + +#: git-am.sh:823 +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 "" +"Không có thay đổi nào - bạn đã quên sử dụng lệnh 'git add' à?\n" +"Nếu ở đây không có gì còn lại stage, tình cờ là có một số thứ khác\n" +"đã 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." + +#: git-am.sh:831 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"Bạn vẫn có những đường dẫn chưa được hòa trộn trong bảng mục lục của mình\n" +"bạn đã quên sử dụng lệnh 'git add' à?" + +#: git-am.sh:847 +msgid "No changes -- Patch already applied." +msgstr "Không thay đổi gì cả -- Miếng vá đã được áp dụng rồi." + +#: git-am.sh:857 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "Vá gặp lỗi tại $msgnum $FIRSTLINE" + +#: git-am.sh:873 +msgid "applying to an empty history" +msgstr "áp dụng vào một lịch sử trống rỗng" + +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "Bạn cần khởi đầu bằng \"git bisect start\"" + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:54 +msgid "Do you want me to do it for you [Y/n]? " +msgstr "Bạn có muốn tôi thực hiện điều này cho bạn không [Y/n]? " + +#: git-bisect.sh:95 +#, sh-format +msgid "unrecognised option: '$arg'" +msgstr "không công nhận tùy chọn: '$arg'" + +#: git-bisect.sh:99 +#, sh-format +msgid "'$arg' does not appear to be a valid revision" +msgstr "'$arg' không có vẻ như là một sự xét lại hợp lệ" + +#: git-bisect.sh:117 +msgid "Bad HEAD - I need a HEAD" +msgstr "HEAD sai - Tôi cần một HEAD" + +#: git-bisect.sh:130 +#, sh-format +msgid "Checking out '$start_head' failed. Try 'git bisect reset <validbranch>'." +msgstr "Việc checkout '$start_head' gặp lỗi. Hãy thử 'git bisect reset <nhánh_hợp_lệ>'." + +#: git-bisect.sh:140 +msgid "won't bisect on seeked tree" +msgstr "sẽ không bisect trêm cây được seek" + +#: git-bisect.sh:144 +msgid "Bad HEAD - strange symbolic ref" +msgstr "HEAD sai - tham chiếu (ref) tượng trưng kỳ lạ" + +#: git-bisect.sh:189 +#, sh-format +msgid "Bad bisect_write argument: $state" +msgstr "Đối số bisect_write sai: $state" + +#: git-bisect.sh:218 +#, sh-format +msgid "Bad rev input: $arg" +msgstr "Đầu vào rev sai: $arg" + +#: git-bisect.sh:232 +msgid "Please call 'bisect_state' with at least one argument." +msgstr "Hãy gọi lệnhl 'bisect_state' với ít nhất một đối số." + +#: git-bisect.sh:244 +#, sh-format +msgid "Bad rev input: $rev" +msgstr "Đầu vào rev sai: $rev" + +#: git-bisect.sh:250 +msgid "'git bisect bad' can take only one argument." +msgstr "'git bisect bad' có thể lấy chỉ một đối số." + +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:273 +msgid "Warning: bisecting only with a bad commit." +msgstr "Cảnh báo: chỉ thực hiện việc bisect với một lần chuyển giao (commit) sai." + +#. TRANSLATORS: Make sure to include [Y] and [n] in your +#. translation. The program will only accept English input +#. at this point. +#: git-bisect.sh:279 +msgid "Are you sure [Y/n]? " +msgstr "Bạn có chắc chắn chưa [Y/n]?" + +#: git-bisect.sh:289 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Bạn phải chỉ cho tôi ít nhất một điểm xét duyệt tốt và một điểm sai.\n" +"(Bạn có thể sử dụng \"git bisect bad\" và \"git bisect good\" cho cái đó.)" + +#: git-bisect.sh:292 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"Bạn cần bắt đầu bằng lệnh \"git bisect start\".\n" +"Bạn sau đó cần phải chỉ cho tôi ít nhất một điểm xét duyệt đúng và một điểm sai.\n" +"(Bạn có thể sử dụng \"git bisect bad\" và \"git bisect good\" cho chúng.)" + +#: git-bisect.sh:347 +#: git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "Chúng tôi không bisect." + +#: git-bisect.sh:354 +#, sh-format +msgid "'$invalid' is not a valid commit" +msgstr "'$invalid' không phải là lần chuyển giao (commit) hợp lệ" + +#: git-bisect.sh:363 +#, sh-format +msgid "" +"Could not check out original HEAD '$branch'.\n" +"Try 'git bisect reset <commit>'." +msgstr "" +"Không thể check out original HEAD '$branch'.\n" +"Hãy thử 'git bisect reset <commit>'." + +#: git-bisect.sh:390 +msgid "No logfile given" +msgstr "Chưa chỉ ra tập tin ghi nhật ký" + +#: git-bisect.sh:391 +#, sh-format +msgid "cannot read $file for replaying" +msgstr "không thể đọc $file để thao diễn lại" + +#: git-bisect.sh:408 +msgid "?? what are you talking about?" +msgstr "?? bạn đang nói gì thế?" + +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "đang chạy lệnh $command" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"chạy bisect gặp lỗi:\n" +"mã trả về $res từ lệnh '$command' là < 0 hoặc >= 128" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "bisect không thể tiếp tục thêm được nữa" + +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"chạy bisect gặp lỗi:\n" +"'bisect_state $state' đã thoát ra với mã lỗi $res" + +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "bisect chạy thành công" + +#: git-pull.sh:21 +msgid "" +"Pull is not possible because you have unmerged files.\n" +"Please, fix them up in the work tree, and then use 'git add/rm <file>'\n" +"as appropriate to mark resolution, or use 'git commit -a'." +msgstr "" +"Pull là không thể được bởi vì bạn có những tập tin chưa được hòa trộn.\n" +"Xin hãy sửa chữa chúng trước, và sau đó sử dụng lệnh 'git add/rm <tập-tin>'\n" +"để phê chuẩn việc đánh dấu đây cần được giải quyết, hoặc là sử dụng 'git commit -a'." + +#: git-pull.sh:25 +msgid "Pull is not possible because you have unmerged files." +msgstr "Full 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." + +#: git-pull.sh:197 +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" + +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"Cảnh báo: fetch đã cập nhật head nhánh hiện tại.\n" +"Cảnh báo: đang fast-forward cây làm việc của bạn từ\n" +"Cảnh báo: commit $orig_head." + +#: git-pull.sh:253 +msgid "Cannot merge multiple branches into empty head" +msgstr "Không thể hòa trộn nhiều nhánh và trong một head trống rỗng" + +#: git-pull.sh:257 +msgid "Cannot rebase onto multiple branches" +msgstr "Không thể thực hiện lệnh rebase (cơ cấu lại) trên nhiều nhánh" + +#: git-stash.sh:51 +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:74 +msgid "You do not have the initial commit yet" +msgstr "Bạn chưa còn có lần chuyển giao (commit) khởi tạo" + +#: git-stash.sh:89 +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:123 +#: git-stash.sh:136 +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:140 +msgid "No changes selected" +msgstr "Chưa có thay đổi nào được chọn" + +#: git-stash.sh:143 +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:156 +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" + +#. 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:202 +#, 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" +" Để cung cấp một thông điệp, sử dụng git stash save -- '$option'" + +#: git-stash.sh:223 +msgid "No local changes to save" +msgstr "Không có thay đổi nội bộ nào được ghi lại" + +#: git-stash.sh:227 +msgid "Cannot initialize stash" +msgstr "Không thể khởi tạo stash" + +#: git-stash.sh:235 +msgid "Cannot save the current status" +msgstr "Không thể ghi lại trạng thái hiện hành" + +#: git-stash.sh:253 +msgid "Cannot remove worktree changes" +msgstr "Không thể gỡ bỏ các thay đổi cây-làm-việc" + +#: git-stash.sh:352 +msgid "No stash found." +msgstr "Không tìm thấy stast nào." + +#: git-stash.sh:359 +#, sh-format +msgid "Too many revisions specified: $REV" +msgstr "Chỉ ra quá nhiều điểm xét lại: $REV" + +#: git-stash.sh:365 +#, sh-format +msgid "$reference is not valid reference" +msgstr "$reference không phải là tham chiếu hợp lệ" + +#: git-stash.sh:393 +#, sh-format +msgid "'$args' is not a stash-like commit" +msgstr "'$args' không phải là lần chuyển giao (commit) giống-stash" + +#: git-stash.sh:404 +#, sh-format +msgid "'$args' is not a stash reference" +msgstr "'$args' không phải tham chiếu đến stash" + +#: git-stash.sh:412 +msgid "unable to refresh index" +msgstr "không thể làm tươi mới bảng mục lục" + +#: git-stash.sh:416 +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:424 +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:426 +msgid "Could not save index tree" +msgstr "Không thể ghi lại cây chỉ mục" + +#: git-stash.sh:460 +msgid "Cannot unstage modified files" +msgstr "Không thể bỏ trạng thía của các tập tin đã được sửa chữa" + +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "Bảng mục lục đã không được bỏ stash." + +#: git-stash.sh:491 +#, sh-format +msgid "Dropped ${REV} ($s)" +msgstr "Đã hạ xuống ${REV} ($s)" + +#: git-stash.sh:492 +#, sh-format +msgid "${REV}: Could not drop stash entry" +msgstr "${REV}: Không thể xóa bỏ mục stash" + +#: git-stash.sh:499 +msgid "No branch name specified" +msgstr "Chưa chỉ ra tên của nhánh" + +#: git-stash.sh:570 +msgid "(To restore them type \"git stash apply\")" +msgstr "(Để phục hồi lại chúng hãy gõ \"git stash apply\")" + +#: git-submodule.sh:56 +#, sh-format +msgid "cannot strip one component off url '$remoteurl'" +msgstr "không thể tháo bỏ một thành phần ra khỏi url '$remoteurl'" + +#: git-submodule.sh:109 +#, sh-format +msgid "No submodule mapping found in .gitmodules for path '$sm_path'" +msgstr "Không tìm thấy ánh xạ (mapping) mô-đun-con trong .gitmodules cho đường dẫn '$sm_path'" + +#: git-submodule.sh:150 +#, sh-format +msgid "Clone of '$url' into submodule path '$sm_path' failed" +msgstr "Nhân bản '$url' vào đường dẫn mô-đun-con '$sm_path' gặp lỗi" + +#: git-submodule.sh:160 +#, sh-format +msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" +msgstr "Gitdir '$a' là bộ phận của đường dẫn mô-đun-con '$b' hoặc \"vice versa\"" + +#: git-submodule.sh:249 +#, sh-format +msgid "repo URL: '$repo' must be absolute or begin with ./|../" +msgstr "repo URL: '$repo' phải là đường dẫn tuyệt đối hoặc là bắt đầu bằng ./|../" + +#: git-submodule.sh:266 +#, sh-format +msgid "'$sm_path' already exists in the index" +msgstr "'$sm_path' thực sự đã tồn tại ở bảng mục lục rồi" + +#: git-submodule.sh:270 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore của bạn:\n" +"$sm_path\n" +"Sử dụng -f nếu bạn thực sự muốn thêm nó vào." + +#: git-submodule.sh:281 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "Đang thêm repo có sẵn tại '$sm_path' vào bảng mục lục" + +#: git-submodule.sh:283 +#, sh-format +msgid "'$sm_path' already exists and is not a valid git repo" +msgstr "'$sm_path' đã tồn tại từ trước và không phải là một kho git hợp lệ" + +#: git-submodule.sh:297 +#, sh-format +msgid "Unable to checkout submodule '$sm_path'" +msgstr "Không thể checkout mô-đun con '$sm_path'" + +#: git-submodule.sh:302 +#, sh-format +msgid "Failed to add submodule '$sm_path'" +msgstr "Gặp lỗi khi thêm mô-đun con '$sm_path'" + +#: git-submodule.sh:307 +#, sh-format +msgid "Failed to register submodule '$sm_path'" +msgstr "Gặp lỗi khi đăng ký với hệ thống mô-đun con '$sm_path'" + +#: git-submodule.sh:349 +#, sh-format +msgid "Entering '$prefix$sm_path'" +msgstr "Đang nhập '$prefix$sm_path'" + +#: git-submodule.sh:363 +#, sh-format +msgid "Stopping at '$sm_path'; script returned non-zero status." +msgstr "Dừng lại tại '$sm_path'; script trả về trạng thái khác không." + +#: git-submodule.sh:406 +#, sh-format +msgid "No url found for submodule path '$sm_path' in .gitmodules" +msgstr "Không tìm thấy url cho đường dẫn mô-đun-con '$sm_path' trong .gitmodules" + +#: git-submodule.sh:415 +#, sh-format +msgid "Failed to register url for submodule path '$sm_path'" +msgstr "Gặp lỗi khi đăng ký url cho đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:417 +#, sh-format +msgid "Submodule '$name' ($url) registered for path '$sm_path'" +msgstr "Mô-đun-con '$name' ($url) được đăng ký cho đường dẫn '$sm_path'" + +#: git-submodule.sh:425 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "Gặp lỗi khi đăng ký chế độ cập nhật cho đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:524 +#, sh-format +msgid "" +"Submodule path '$sm_path' not initialized\n" +"Maybe you want to use 'update --init'?" +msgstr "" +"Đường dẫn mô-đun-con '$sm_path' chưa được khởi tạo\n" +"Có lẽ bạn muốn sử dụng lệnh 'update --init'?" + +#: git-submodule.sh:537 +#, sh-format +msgid "Unable to find current revision in submodule path '$sm_path'" +msgstr "Không tìm thấy điểm xét lại hiện hành trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:556 +#, sh-format +msgid "Unable to fetch in submodule path '$sm_path'" +msgstr "Không thể lấy về (fetch) trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:570 +#, sh-format +msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" +msgstr "Không thể rebase '$sha1' trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:571 +#, sh-format +msgid "Submodule path '$sm_path': rebased into '$sha1'" +msgstr "Đường dẫn mô-đun-con '$sm_path': được rebase vào trong '$sha1'" + +#: git-submodule.sh:576 +#, sh-format +msgid "Unable to merge '$sha1' in submodule path '$sm_path'" +msgstr "Không thể hòa trộn (merge) '$sha1' trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:577 +#, sh-format +msgid "Submodule path '$sm_path': merged in '$sha1'" +msgstr "Đường dẫn mô-đun-con '$sm_path': được hòa trộn vào '$sha1'" + +#: git-submodule.sh:582 +#, sh-format +msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" +msgstr "Không thể checkout '$sha1' trong đường dẫn mô-đun-con '$sm_path'" + +#: git-submodule.sh:583 +#, sh-format +msgid "Submodule path '$sm_path': checked out '$sha1'" +msgstr "Đường dẫn mô-đun-con '$sm_path': được checkout '$sha1'" + +#: git-submodule.sh:605 +#: git-submodule.sh:928 +#, 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:713 +msgid "--cached cannot be used with --files" +msgstr "--cached không thể được sử dụng cùng với --files" + +#. unexpected type +#: git-submodule.sh:753 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "chế độ không như mong chờ $mod_dst" + +#: git-submodule.sh:771 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_src" +msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_src" + +#: git-submodule.sh:774 +#, sh-format +msgid " Warn: $name doesn't contain commit $sha1_dst" +msgstr " Cảnh báo: $name không chứa lần chuyển giao (commit) $sha1_dst" + +#: git-submodule.sh:777 +#, sh-format +msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" +msgstr " Cảnh báo: $name không chứa những lần chuyển giao (commit) $sha1_src và $sha1_dst" + +#: git-submodule.sh:802 +msgid "blob" +msgstr "blob" + +#: git-submodule.sh:803 +msgid "submodule" +msgstr "mô-đun con" + +#: git-submodule.sh:840 +msgid "# Submodules changed but not updated:" +msgstr "# Những mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" + +#: git-submodule.sh:842 +msgid "# Submodule changes to be committed:" +msgstr "# Những thay đổi mô-đun-con được chuyển giao (commit):" + +#: git-submodule.sh:974 +#, sh-format +msgid "Synchronizing submodule url for '$name'" +msgstr "Đang đồng bộ hóa url mô-đun-con cho '$name'" + +#~ msgid "--" +#~ msgstr "--" + +#~ msgid "Could not extract email from committer identity." +#~ msgstr "" +#~ "Không thể rút trích địa chỉ thư điện tử từ định danh người chuyển giao" + +#, fuzzy +#~ msgid "could not parse commit %s\n" +#~ msgstr "Không thể phân tích commit (lần chuyển giao) %s\n" + +#, fuzzy +#~ msgid "cherry-pick" +#~ msgstr "< Chọn D-Mod" + +#, fuzzy +#~ msgid "Too many options specified" +#~ msgstr "đã ghi rõ quá nhiều kích cỡ" diff --git a/po/zh_CN.po b/po/zh_CN.po index 155c75e57e..b46b53e6d6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -12,15 +12,15 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-05-15 06:31+0800\n" -"PO-Revision-Date: 2012-01-30 00:00+0800\n" +"POT-Creation-Date: 2012-06-08 10:20+0800\n" +"PO-Revision-Date: 2012-06-08 12:24+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=1; plural=0;\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" #: advice.c:40 #, c-format @@ -42,6 +42,80 @@ msgstr "" "'git add/rm <file>' 标记解决方案，\n" "或使用 'git commit -a'。" +#: bundle.c:36 +#, c-format +msgid "'%s' does not look like a v2 bundle file" +msgstr "'%s' 不像是一个 v2 版本的包文件" + +#: bundle.c:63 +#, c-format +msgid "unrecognized header: %s%s (%d)" +msgstr "未能识别的包头：%s%s (%d)" + +#: bundle.c:89 builtin/commit.c:696 +#, c-format +msgid "could not open '%s'" +msgstr "不能打开 '%s'" + +#: bundle.c:140 +msgid "Repository lacks these prerequisite commits:" +msgstr "版本库缺少这些必备的提交：" + +#: bundle.c:164 sequencer.c:550 sequencer.c:982 builtin/log.c:289 +#: builtin/log.c:720 builtin/log.c:1309 builtin/log.c:1528 builtin/merge.c:347 +#: builtin/shortlog.c:181 +msgid "revision walk setup failed" +msgstr "版本遍历设置失败" + +#: bundle.c:186 +#, c-format +msgid "The bundle contains %d ref" +msgid_plural "The bundle contains %d refs" +msgstr[0] "这个包中含有 %d 个引用" +msgstr[1] "这个包中含有 %d 个引用" + +#: bundle.c:192 +#, c-format +msgid "The bundle requires this ref" +msgid_plural "The bundle requires these %d refs" +msgstr[0] "这个包需要这个引用" +msgstr[1] "这个包需要 %d 个这些引用" + +#: bundle.c:290 +msgid "rev-list died" +msgstr "rev-list 终止" + +#: bundle.c:296 builtin/log.c:1205 builtin/shortlog.c:284 +#, c-format +msgid "unrecognized argument: %s" +msgstr "未能识别的参数：%s" + +#: bundle.c:331 +#, c-format +msgid "ref '%s' is excluded by the rev-list options" +msgstr "引用 '%s' 被 rev-list 选项排除" + +#: bundle.c:376 +msgid "Refusing to create empty bundle." +msgstr "不能创建空包。" + +#: bundle.c:394 +msgid "Could not spawn pack-objects" +msgstr "不能生成 pack-objects 进程" + +#: bundle.c:412 +msgid "pack-objects died" +msgstr "pack-objects 终止" + +#: bundle.c:415 +#, c-format +msgid "cannot create '%s'" +msgstr "不能创建 '%s'" + +#: bundle.c:437 +msgid "index-pack died" +msgstr "index-pack 终止" + #: commit.c:48 #, c-format msgid "could not parse %s" @@ -70,6 +144,73 @@ msgstr "无法写入 rev-list：%s" msgid "failed to close rev-list's stdin: %s" msgstr "无法关闭 rev-list 的标准输入：%s" +#: date.c:95 +msgid "in the future" +msgstr "在将来" + +#: date.c:101 +#, c-format +msgid "%lu second ago" +msgid_plural "%lu seconds ago" +msgstr[0] "%lu 秒钟之前" +msgstr[1] "%lu 秒钟之前" + +#: date.c:108 +#, c-format +msgid "%lu minute ago" +msgid_plural "%lu minutes ago" +msgstr[0] "%lu 分钟之前" +msgstr[1] "%lu 分钟之前" + +#: date.c:115 +#, c-format +msgid "%lu hour ago" +msgid_plural "%lu hours ago" +msgstr[0] "%lu 小时之前" +msgstr[1] "%lu 小时之前" + +#: date.c:122 +#, c-format +msgid "%lu day ago" +msgid_plural "%lu days ago" +msgstr[0] "%lu 天之前" +msgstr[1] "%lu 天之前" + +#: date.c:128 +#, c-format +msgid "%lu week ago" +msgid_plural "%lu weeks ago" +msgstr[0] "%lu 周之前" +msgstr[1] "%lu 周之前" + +#: date.c:135 +#, c-format +msgid "%lu month ago" +msgid_plural "%lu months ago" +msgstr[0] "%lu 个月之前" +msgstr[1] "%lu 个月之前" + +#: date.c:146 +#, c-format +msgid "%lu year" +msgid_plural "%lu years" +msgstr[0] "%lu 年" +msgstr[1] "%lu 年" + +#: date.c:149 +#, c-format +msgid "%s, %lu month ago" +msgid_plural "%s, %lu months ago" +msgstr[0] "%s，%lu 个月之前" +msgstr[1] "%s，%lu 个月之前" + +#: date.c:154 date.c:159 +#, c-format +msgid "%lu year ago" +msgid_plural "%lu years ago" +msgstr[0] "%lu 年前" +msgstr[1] "%lu 年前" + # 译者：注意保持前导空格 #: diff.c:105 #, c-format @@ -100,20 +241,23 @@ msgstr " 0 个文件被修改\n" msgid " %d file changed" msgid_plural " %d files changed" msgstr[0] " %d 个文件被修改" +msgstr[1] " %d 个文件被修改" #: diff.c:1421 #, c-format msgid ", %d insertion(+)" msgid_plural ", %d insertions(+)" msgstr[0] "，插入 %d 行(+)" +msgstr[1] "，插入 %d 行(+)" #: diff.c:1432 #, c-format msgid ", %d deletion(-)" msgid_plural ", %d deletions(-)" msgstr[0] "，删除 %d 行(-)" +msgstr[1] "，删除 %d 行(-)" -#: diff.c:3439 +#: diff.c:3478 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -134,22 +278,31 @@ msgstr "gpg 没有接受数据" msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: grep.c:1280 +#: grep.c:1320 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1297 +#: grep.c:1337 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1308 +#: grep.c:1348 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" -#: help.c:287 +#: help.c:207 +#, c-format +msgid "available git commands in '%s'" +msgstr "在 '%s' 下可用的 git 命令" + +#: help.c:214 +msgid "git commands available from elsewhere on your $PATH" +msgstr "在 $PATH 路径中的其他地方可用的 git 命令" + +#: help.c:270 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -158,20 +311,81 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: remote.c:1607 +#: help.c:327 +msgid "Uh oh. Your system reports no Git commands at all." +msgstr "唉呀，您的系统中未发现 Git 命令。" + +#: help.c:349 +#, c-format +msgid "" +"WARNING: You called a Git command named '%s', which does not exist.\n" +"Continuing under the assumption that you meant '%s'" +msgstr "" +"警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" +"是 '%s'" + +#: help.c:354 +#, c-format +msgid "in %0.1f seconds automatically..." +msgstr "在 %0.1f 秒钟后自动运行..." + +#: help.c:361 +#, c-format +msgid "git: '%s' is not a git command. See 'git --help'." +msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" + +#: help.c:365 +msgid "" +"\n" +"Did you mean this?" +msgid_plural "" +"\n" +"Did you mean one of these?" +msgstr[0] "" +"\n" +"您指的是这个么？" +msgstr[1] "" +"\n" +"您指的是这些其中一个么？" + +#: parse-options.c:493 +msgid "..." +msgstr "..." + +#: parse-options.c:511 +#, c-format +msgid "usage: %s" +msgstr "用法：%s" + +#. TRANSLATORS: the colon here should align with the +#. one in "usage: %s" translation +#: parse-options.c:515 +#, c-format +msgid " or: %s" +msgstr " 或：%s" + +# 译者：为保证在输出中对齐，注意调整句中空格！ +#: parse-options.c:518 +#, c-format +msgid " %s" +msgstr " %s" + +#: remote.c:1629 #, 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:1613 +#: remote.c:1635 #, 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" +msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" -#: remote.c:1621 +#: remote.c:1643 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -182,20 +396,23 @@ msgid_plural "" msgstr[0] "" "您的分支和 '%s' 出现了偏离，\n" "并且各自分别有 %d 和 %d 处不同的提交。\n" +msgstr[1] "" +"您的分支和 '%s' 出现了偏离，\n" +"并且各自分别有 %d 和 %d 处不同的提交。\n" -#: sequencer.c:120 builtin/merge.c:865 builtin/merge.c:978 +#: sequencer.c:121 builtin/merge.c:865 builtin/merge.c:978 #: builtin/merge.c:1088 builtin/merge.c:1098 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:122 builtin/merge.c:333 builtin/merge.c:868 +#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:868 #: builtin/merge.c:1090 builtin/merge.c:1103 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" -#: sequencer.c:143 +#: sequencer.c:144 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -203,7 +420,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "命令标记修正后的文件" -#: sequencer.c:146 +#: sequencer.c:147 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -212,202 +429,214 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:159 sequencer.c:685 sequencer.c:768 +#: sequencer.c:160 sequencer.c:758 sequencer.c:841 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:162 +#: sequencer.c:163 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" -#: sequencer.c:177 +#: sequencer.c:178 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:179 +#: sequencer.c:180 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:182 +#: sequencer.c:183 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:232 +#: sequencer.c:233 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:298 +#: sequencer.c:261 +msgid "Could not resolve HEAD commit\n" +msgstr "不能解析 HEAD 提交\n" + +#: sequencer.c:282 +msgid "Unable to update cache tree\n" +msgstr "不能更新缓存\n" + +#: sequencer.c:324 +#, c-format +msgid "Could not parse commit %s\n" +msgstr "不能解析提交 %s\n" + +#: sequencer.c:329 +#, c-format +msgid "Could not parse parent commit %s\n" +msgstr "不能解析父提交 %s\n" + +#: sequencer.c:395 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:301 +#: sequencer.c:398 msgid "You do not have a valid HEAD" msgstr "您没有一个有效的 HEAD" -#: sequencer.c:316 +#: sequencer.c:413 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:324 +#: sequencer.c:421 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:328 +#: sequencer.c:425 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "指定了主线但提交 %s 不是一个合并。" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:339 +#: sequencer.c:436 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:343 +#: sequencer.c:440 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:427 +#: sequencer.c:524 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:428 +#: sequencer.c:525 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:450 sequencer.c:909 builtin/log.c:289 builtin/log.c:719 -#: builtin/log.c:1335 builtin/log.c:1554 builtin/merge.c:347 -#: builtin/shortlog.c:181 -msgid "revision walk setup failed" -msgstr "版本遍历设置失败" - -#: sequencer.c:453 +#: sequencer.c:553 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:461 +#: sequencer.c:561 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:466 +#: sequencer.c:566 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:551 +#: sequencer.c:624 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:573 +#: sequencer.c:646 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:578 +#: sequencer.c:651 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:591 +#: sequencer.c:664 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:595 +#: sequencer.c:668 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:602 +#: sequencer.c:675 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:630 +#: sequencer.c:703 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:633 +#: sequencer.c:706 #, c-format msgid "Invalid value for %s: %s" -msgstr "无效的 %s 值：%s" +msgstr "%s 的值无效：%s" -#: sequencer.c:645 +#: sequencer.c:718 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:666 +#: sequencer.c:739 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:667 +#: sequencer.c:740 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:671 +#: sequencer.c:744 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:687 sequencer.c:772 +#: sequencer.c:760 sequencer.c:845 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:706 sequencer.c:840 +#: sequencer.c:779 sequencer.c:913 msgid "no cherry-pick or revert in progress" msgstr "没有拣选或还原操作在进行" -#: sequencer.c:708 +#: sequencer.c:781 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:710 +#: sequencer.c:783 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:732 +#: sequencer.c:805 builtin/apply.c:3697 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:735 +#: sequencer.c:808 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:736 +#: sequencer.c:809 msgid "unexpected end of file" msgstr "未预期的文件结束" -#: sequencer.c:742 +#: sequencer.c:815 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:765 +#: sequencer.c:838 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:927 +#: sequencer.c:1000 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:928 +#: sequencer.c:1001 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" @@ -430,261 +659,270 @@ msgstr "尚未给分支 '%s' 设置上游" msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" -#: wt-status.c:134 +#: wrapper.c:413 +#, c-format +msgid "unable to look up current user in the passwd file: %s" +msgstr "无法在 passwd 文件中查询到当前用户：%s" + +#: wrapper.c:414 +msgid "no such user" +msgstr "无此用户" + +#: wt-status.c:135 msgid "Unmerged paths:" msgstr "未合并的路径：" # 译者：注意保持前导空格 -#: wt-status.c:140 wt-status.c:157 +#: wt-status.c:141 wt-status.c:158 #, c-format msgid " (use \"git reset %s <file>...\" to unstage)" msgstr " （使用 \"git reset %s <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:142 wt-status.c:159 +#: wt-status.c:143 wt-status.c:160 msgid " (use \"git rm --cached <file>...\" to unstage)" msgstr " （使用 \"git rm --cached <file>...\" 撤出暂存区）" # 译者：注意保持前导空格 -#: wt-status.c:143 +#: wt-status.c:144 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" msgstr " （酌情使用 \"git add/rm <file>...\" 标记解决方案）" -#: wt-status.c:151 +#: wt-status.c:152 msgid "Changes to be committed:" msgstr "要提交的变更：" -#: wt-status.c:169 +#: wt-status.c:170 msgid "Changes not staged for commit:" msgstr "尚未暂存以备提交的变更：" # 译者：注意保持前导空格 -#: wt-status.c:173 +#: wt-status.c:174 msgid " (use \"git add <file>...\" to update what will be committed)" msgstr " （使用 \"git add <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:175 +#: wt-status.c:176 msgid " (use \"git add/rm <file>...\" to update what will be committed)" msgstr " （使用 \"git add/rm <file>...\" 更新要提交的内容）" # 译者：注意保持前导空格 -#: wt-status.c:176 +#: wt-status.c:177 msgid "" " (use \"git checkout -- <file>...\" to discard changes in working directory)" msgstr " （使用 \"git checkout -- <file>...\" 丢弃工作区的改动）" # 译者：注意保持前导空格 -#: wt-status.c:178 +#: wt-status.c:179 msgid " (commit or discard the untracked or modified content in submodules)" msgstr " （提交或丢弃子模组中未跟踪或修改的内容）" -#: wt-status.c:187 +#: wt-status.c:188 #, c-format msgid "%s files:" msgstr "%s文件：" # 译者：注意保持前导空格 -#: wt-status.c:190 +#: wt-status.c:191 #, c-format msgid " (use \"git %s <file>...\" to include in what will be committed)" msgstr " （使用 \"git %s <file>...\" 以包含要提交的内容）" -#: wt-status.c:207 +#: wt-status.c:208 msgid "bug" msgstr "bug" -#: wt-status.c:212 +#: wt-status.c:213 msgid "both deleted:" msgstr "双方删除：" -#: wt-status.c:213 +#: wt-status.c:214 msgid "added by us:" msgstr "由我们添加：" -#: wt-status.c:214 +#: wt-status.c:215 msgid "deleted by them:" msgstr "由他们删除：" -#: wt-status.c:215 +#: wt-status.c:216 msgid "added by them:" msgstr "由他们添加：" -#: wt-status.c:216 +#: wt-status.c:217 msgid "deleted by us:" msgstr "由我们删除：" -#: wt-status.c:217 +#: wt-status.c:218 msgid "both added:" msgstr "双方添加：" -#: wt-status.c:218 +#: wt-status.c:219 msgid "both modified:" msgstr "双方修改：" # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:248 +#: wt-status.c:249 msgid "new commits, " msgstr "新提交, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:250 +#: wt-status.c:251 msgid "modified content, " msgstr "修改的内容, " # 译者：末尾两个字节可能被删减，如果翻译为中文标点会出现半个汉字 -#: wt-status.c:252 +#: wt-status.c:253 msgid "untracked content, " msgstr "未跟踪的内容, " # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:266 +#: wt-status.c:267 #, c-format msgid "new file: %s" msgstr "新文件： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:269 +#: wt-status.c:270 #, c-format msgid "copied: %s -> %s" msgstr "拷贝： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:272 +#: wt-status.c:273 #, c-format msgid "deleted: %s" msgstr "删除： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:275 +#: wt-status.c:276 #, c-format msgid "modified: %s" msgstr "修改： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:278 +#: wt-status.c:279 #, c-format msgid "renamed: %s -> %s" msgstr "重命名： %s -> %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:281 +#: wt-status.c:282 #, c-format msgid "typechange: %s" msgstr "类型变更： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:284 +#: wt-status.c:285 #, c-format msgid "unknown: %s" msgstr "未知： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: wt-status.c:287 +#: wt-status.c:288 #, c-format msgid "unmerged: %s" msgstr "未合并： %s" -#: wt-status.c:290 +#: wt-status.c:291 #, c-format msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:713 +#: wt-status.c:737 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:720 +#: wt-status.c:744 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:731 +#: wt-status.c:755 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:745 +#: wt-status.c:769 msgid "Untracked" msgstr "未跟踪的" -#: wt-status.c:747 +#: wt-status.c:771 msgid "Ignored" msgstr "忽略的" -#: wt-status.c:749 +#: wt-status.c:773 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:751 +#: wt-status.c:775 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:757 +#: wt-status.c:781 msgid "No changes" msgstr "没有修改" -#: wt-status.c:761 +#: wt-status.c:785 #, c-format msgid "no changes added to commit%s\n" msgstr "修改尚未加入提交%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:763 +#: wt-status.c:787 msgid " (use \"git add\" and/or \"git commit -a\")" msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" -#: wt-status.c:765 +#: wt-status.c:789 #, c-format msgid "nothing added to commit but untracked files present%s\n" msgstr "空提交但存在未跟踪文件%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:767 +#: wt-status.c:791 msgid " (use \"git add\" to track)" msgstr "（使用 \"git add\" 建立跟踪）" -#: wt-status.c:769 wt-status.c:772 wt-status.c:775 +#: wt-status.c:793 wt-status.c:796 wt-status.c:799 #, c-format msgid "nothing to commit%s\n" msgstr "无须提交%s\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:770 +#: wt-status.c:794 msgid " (create/copy files and use \"git add\" to track)" msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:773 +#: wt-status.c:797 msgid " (use -u to show untracked files)" msgstr "（使用 -u 显示未跟踪文件）" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:776 +#: wt-status.c:800 msgid " (working directory clean)" msgstr "（干净的工作区）" -#: wt-status.c:884 +#: wt-status.c:908 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:890 +#: wt-status.c:914 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:905 +#: wt-status.c:929 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:908 wt-status.c:911 +#: wt-status.c:932 wt-status.c:935 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:913 +#: wt-status.c:937 msgid ", behind " msgstr "，落后 " @@ -693,7 +931,7 @@ msgstr "，落后 " msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:67 builtin/commit.c:298 +#: builtin/add.c:67 builtin/commit.c:226 msgid "updating files failed" msgstr "更新文件失败" @@ -783,15 +1021,482 @@ msgstr "没有指定文件，也没有文件被添加。\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:358 builtin/mv.c:82 +#: builtin/add.c:420 builtin/clean.c:95 builtin/commit.c:286 builtin/mv.c:82 #: builtin/rm.c:162 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:476 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:476 builtin/apply.c:4108 builtin/mv.c:229 builtin/rm.c:260 msgid "Unable to write new index file" msgstr "无法写入新索引文件" +#: builtin/apply.c:53 +msgid "git apply [options] [<patch>...]" +msgstr "git apply [选项] [<补丁>...]" + +#: builtin/apply.c:106 +#, c-format +msgid "unrecognized whitespace option '%s'" +msgstr "未能识别的空白字符选项 '%s'" + +#: builtin/apply.c:121 +#, c-format +msgid "unrecognized whitespace ignore option '%s'" +msgstr "未能识别的空白字符忽略选项 '%s'" + +#: builtin/apply.c:815 +#, c-format +msgid "Cannot prepare timestamp regexp %s" +msgstr "无法准备时间戳正则表达式 %s" + +#: builtin/apply.c:824 +#, c-format +msgid "regexec returned %d for input: %s" +msgstr "regexec 返回 %d，输入为：%s" + +#: builtin/apply.c:905 +#, c-format +msgid "unable to find filename in patch at line %d" +msgstr "不能在补丁的第 %d 行找到文件名" + +#: builtin/apply.c:937 +#, 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" + +#: builtin/apply.c:941 +#, c-format +msgid "git apply: bad git-diff - inconsistent new filename on line %d" +msgstr "git apply：错误的 git-diff - 第 %d 行上新文件名不一致" + +#: builtin/apply.c:942 +#, c-format +msgid "git apply: bad git-diff - inconsistent old filename on line %d" +msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" + +#: builtin/apply.c:949 +#, c-format +msgid "git apply: bad git-diff - expected /dev/null on line %d" +msgstr "git apply：错误的 git-diff - 期望 /dev/null 于第 %d 行" + +#: builtin/apply.c:1394 +#, c-format +msgid "recount: unexpected line: %.*s" +msgstr "recount：意外的行：%.*s" + +#: builtin/apply.c:1451 +#, c-format +msgid "patch fragment without header at line %d: %.*s" +msgstr "第 %d 行的补丁片段没有头信息：%.*s" + +#: builtin/apply.c:1468 +#, c-format +msgid "" +"git diff header lacks filename information when removing %d leading pathname " +"component (line %d)" +msgid_plural "" +"git diff header lacks filename information when removing %d leading pathname " +"components (line %d)" +msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" +msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" + +#: builtin/apply.c:1628 +msgid "new file depends on old contents" +msgstr "新文件依赖旧内容" + +#: builtin/apply.c:1630 +msgid "deleted file still has contents" +msgstr "删除的文件仍有内容" + +#: builtin/apply.c:1656 +#, c-format +msgid "corrupt patch at line %d" +msgstr "补丁损坏位于第 %d 行" + +#: builtin/apply.c:1692 +#, c-format +msgid "new file %s depends on old contents" +msgstr "新文件 %s 依赖旧内容" + +#: builtin/apply.c:1694 +#, c-format +msgid "deleted file %s still has contents" +msgstr "删除的文件 %s 仍有内容" + +#: builtin/apply.c:1697 +#, c-format +msgid "** warning: file %s becomes empty but is not deleted" +msgstr "** 警告：文件 %s 成为空文件但并未删除" + +#: builtin/apply.c:1843 +#, c-format +msgid "corrupt binary patch at line %d: %.*s" +msgstr "二进制补丁在第 %d 行损坏：%.*s" + +#. there has to be one hunk (forward hunk) +#: builtin/apply.c:1872 +#, c-format +msgid "unrecognized binary patch at line %d" +msgstr "未能识别的二进制补丁位于第 %d 行" + +#: builtin/apply.c:1958 +#, c-format +msgid "patch with only garbage at line %d" +msgstr "补丁文件的第 %d 行只有垃圾数据" + +#: builtin/apply.c:2048 +#, c-format +msgid "unable to read symlink %s" +msgstr "无法读取符号链接 %s" + +#: builtin/apply.c:2052 +#, c-format +msgid "unable to open or read %s" +msgstr "不能打开或读取 %s" + +#: builtin/apply.c:2123 +msgid "oops" +msgstr "哎哟" + +#: builtin/apply.c:2645 +#, c-format +msgid "invalid start of line: '%c'" +msgstr "无效的行首字符：'%c'" + +#: builtin/apply.c:2763 +#, 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 行）" + +#: builtin/apply.c:2775 +#, c-format +msgid "Context reduced to (%ld/%ld) to apply fragment at %d" +msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" + +#: builtin/apply.c:2781 +#, c-format +msgid "" +"while searching for:\n" +"%.*s" +msgstr "" +"当查询：\n" +"%.*s" + +#: builtin/apply.c:2800 +#, c-format +msgid "missing binary patch data for '%s'" +msgstr "缺失 '%s' 的二进制补丁数据" + +#: builtin/apply.c:2903 +#, c-format +msgid "binary patch does not apply to '%s'" +msgstr "二进制补丁未应用到 '%s'" + +#: builtin/apply.c:2909 +#, c-format +msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" +msgstr "到 '%s' 的二进制补丁产生了不正确的结果（预期 %s，得到 %s）" + +#: builtin/apply.c:2930 +#, c-format +msgid "patch failed: %s:%ld" +msgstr "打补丁失败：%s:%ld" + +#: builtin/apply.c:3045 +#, c-format +msgid "patch %s has been renamed/deleted" +msgstr "补丁 %s 已经被重命名/删除" + +#: builtin/apply.c:3052 builtin/apply.c:3069 +#, c-format +msgid "read of %s failed" +msgstr "读取 %s 失败" + +#: builtin/apply.c:3084 +msgid "removal patch leaves file contents" +msgstr "移除补丁仍留下了文件内容" + +#: builtin/apply.c:3105 +#, c-format +msgid "%s: already exists in working directory" +msgstr "%s：已经存在于工作区中" + +#: builtin/apply.c:3143 +#, c-format +msgid "%s: has been deleted/renamed" +msgstr "%s：已经被删除/重命名" + +#: builtin/apply.c:3148 builtin/apply.c:3179 +#, c-format +msgid "%s: %s" +msgstr "%s：%s" + +#: builtin/apply.c:3159 +#, c-format +msgid "%s: does not exist in index" +msgstr "%s：不存在于索引中" + +#: builtin/apply.c:3173 +#, c-format +msgid "%s: does not match index" +msgstr "%s：和索引不匹配" + +#: builtin/apply.c:3190 +#, c-format +msgid "%s: wrong type" +msgstr "%s：错误类型" + +#: builtin/apply.c:3192 +#, c-format +msgid "%s has type %o, expected %o" +msgstr "%s 的类型是 %o，预期是 %o" + +#: builtin/apply.c:3247 +#, c-format +msgid "%s: already exists in index" +msgstr "%s：已经存在于索引中" + +#: builtin/apply.c:3267 +#, c-format +msgid "new mode (%o) of %s does not match old mode (%o)" +msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" + +#: builtin/apply.c:3272 +#, 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）不匹配" + +#: builtin/apply.c:3280 +#, c-format +msgid "%s: patch does not apply" +msgstr "%s：补丁未应用" + +#: builtin/apply.c:3293 +#, c-format +msgid "Checking patch %s..." +msgstr "检查补丁 %s..." + +#: builtin/apply.c:3348 builtin/checkout.c:212 builtin/reset.c:158 +#, c-format +msgid "make_cache_entry failed for path '%s'" +msgstr "对路径 '%s' 的 make_cache_entry 操作失败" + +#: builtin/apply.c:3491 +#, c-format +msgid "unable to remove %s from index" +msgstr "不能从索引中移除 %s" + +#: builtin/apply.c:3518 +#, c-format +msgid "corrupt patch for subproject %s" +msgstr "子项目 %s 损坏的补丁" + +#: builtin/apply.c:3522 +#, c-format +msgid "unable to stat newly created file '%s'" +msgstr "不能枚举新建文件 '%s' 的状态" + +#: builtin/apply.c:3527 +#, c-format +msgid "unable to create backing store for newly created file %s" +msgstr "不能为新建文件 %s 创建后端存储" + +#: builtin/apply.c:3530 +#, c-format +msgid "unable to add cache entry for %s" +msgstr "无法为 %s 添加缓存条目" + +#: builtin/apply.c:3563 +#, c-format +msgid "closing file '%s'" +msgstr "关闭文件 '%s'" + +#: builtin/apply.c:3612 +#, c-format +msgid "unable to write file '%s' mode %o" +msgstr "不能写文件 '%s' 权限 %o" + +#: builtin/apply.c:3668 +#, c-format +msgid "Applied patch %s cleanly." +msgstr "成功应用补丁 %s。" + +#: builtin/apply.c:3676 +msgid "internal error" +msgstr "内部错误" + +#. Say this even without --verbose +#: builtin/apply.c:3679 +#, 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 个被拒绝..." + +#: builtin/apply.c:3689 +#, c-format +msgid "truncating .rej filename to %.*s.rej" +msgstr "截短 .rej 文件名为 %.*s.rej" + +#: builtin/apply.c:3710 +#, c-format +msgid "Hunk #%d applied cleanly." +msgstr "第 #%d 个片段成功应用。" + +#: builtin/apply.c:3713 +#, c-format +msgid "Rejected hunk #%d." +msgstr "拒绝第 #%d 个片段。" + +#: builtin/apply.c:3844 +msgid "unrecognized input" +msgstr "未能识别的输入" + +#: builtin/apply.c:3855 +msgid "unable to read index file" +msgstr "无法读取索引文件" + +#: builtin/apply.c:3970 builtin/apply.c:3973 +msgid "path" +msgstr "路径" + +#: builtin/apply.c:3971 +msgid "don't apply changes matching the given path" +msgstr "不要应用与给出路径向匹配的变更" + +#: builtin/apply.c:3974 +msgid "apply changes matching the given path" +msgstr "应用与给出路径向匹配的变更" + +#: builtin/apply.c:3976 +msgid "num" +msgstr "数字" + +#: builtin/apply.c:3977 +msgid "remove <num> leading slashes from traditional diff paths" +msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" + +#: builtin/apply.c:3980 +msgid "ignore additions made by the patch" +msgstr "忽略补丁中的添加的文件" + +#: builtin/apply.c:3982 +msgid "instead of applying the patch, output diffstat for the input" +msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" + +#: builtin/apply.c:3986 +msgid "shows number of added and deleted lines in decimal notation" +msgstr "以数字方式显示添加或删除行的数量" + +#: builtin/apply.c:3988 +msgid "instead of applying the patch, output a summary for the input" +msgstr "不应用补丁，而是显示输入的概要" + +#: builtin/apply.c:3990 +msgid "instead of applying the patch, see if the patch is applicable" +msgstr "不应用补丁，而是查看补丁是否可应用" + +#: builtin/apply.c:3992 +msgid "make sure the patch is applicable to the current index" +msgstr "确认补丁可以应用到当前索引" + +#: builtin/apply.c:3994 +msgid "apply a patch without touching the working tree" +msgstr "应用补丁而不修改工作区" + +#: builtin/apply.c:3996 +msgid "also apply the patch (use with --stat/--summary/--check)" +msgstr "同时应用此补丁（和 --stat/--summary/--check 共用）" + +#: builtin/apply.c:3998 +msgid "build a temporary index based on embedded index information" +msgstr "创建一个临时索引基于嵌入的索引信息" + +#: builtin/apply.c:4000 +msgid "paths are separated with NUL character" +msgstr "路径以 NUL 字符分隔" + +#: builtin/apply.c:4003 +msgid "ensure at least <n> lines of context match" +msgstr "确保至少匹配 <n> 行上下文" + +#: builtin/apply.c:4004 +msgid "action" +msgstr "动作" + +#: builtin/apply.c:4005 +msgid "detect new or modified lines that have whitespace errors" +msgstr "检查新增和修改的行中间的空白字符滥用" + +#: builtin/apply.c:4008 builtin/apply.c:4011 +msgid "ignore changes in whitespace when finding context" +msgstr "查找上下文时忽略空白字符的变更" + +#: builtin/apply.c:4014 +msgid "apply the patch in reverse" +msgstr "反向应用补丁" + +#: builtin/apply.c:4016 +msgid "don't expect at least one line of context" +msgstr "无需至少一行上下文" + +#: builtin/apply.c:4018 +msgid "leave the rejected hunks in corresponding *.rej files" +msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" + +#: builtin/apply.c:4020 +msgid "allow overlapping hunks" +msgstr "允许重叠的补丁片段" + +#: builtin/apply.c:4021 +msgid "be verbose" +msgstr "冗长输出" + +#: builtin/apply.c:4023 +msgid "tolerate incorrectly detected missing new-line at the end of file" +msgstr "宽容不正确的文件末尾换行符" + +#: builtin/apply.c:4026 +msgid "do not trust the line counts in the hunk headers" +msgstr "不信任补丁片段的头信息中的行号" + +#: builtin/apply.c:4028 +msgid "root" +msgstr "根目录" + +#: builtin/apply.c:4029 +msgid "prepend <root> to all filenames" +msgstr "为所有文件名前添加 <根目录>" + +#: builtin/apply.c:4050 +msgid "--index outside a repository" +msgstr "--index 在一个版本库之外" + +#: builtin/apply.c:4053 +msgid "--cached outside a repository" +msgstr "--cached 在一个版本库之外" + +#: builtin/apply.c:4069 +#, c-format +msgid "can't open patch '%s'" +msgstr "不能打开补丁 '%s'" + +#: builtin/apply.c:4083 +#, c-format +msgid "squelched %d whitespace error" +msgid_plural "squelched %d whitespace errors" +msgstr[0] "抑制下仍有 %d 个空白字符误用" +msgstr[1] "抑制下仍有 %d 个空白字符误用" + +#: builtin/apply.c:4089 builtin/apply.c:4099 +#, c-format +msgid "%d line adds whitespace errors." +msgid_plural "%d lines add whitespace errors." +msgstr[0] "%d 行有空白字符误用。" +msgstr[1] "%d 行有空白字符误用。" + #: builtin/archive.c:17 #, c-format msgid "could not create archive file '%s'" @@ -828,7 +1533,7 @@ msgid "git archive: expected a flush" msgstr "git archive：预期一个刷新" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:137 +#: builtin/branch.c:144 #, c-format msgid "" "deleting branch '%s' that has been merged to\n" @@ -838,7 +1543,7 @@ msgstr "" " '%s'，但未合并到 HEAD。" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 -#: builtin/branch.c:141 +#: builtin/branch.c:148 #, c-format msgid "" "not deleting branch '%s' that is not yet merged to\n" @@ -847,36 +1552,35 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -# 译者：汉字之间无空格，故删除尾部空格 -#. TRANSLATORS: This is "remote " in "remote branch '%s' not found" -#: builtin/branch.c:164 -msgid "remote " -msgstr "远程" - -#: builtin/branch.c:172 +#: builtin/branch.c:180 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 共用" -#: builtin/branch.c:178 +#: builtin/branch.c:186 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:183 +#: builtin/branch.c:191 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" -#: builtin/branch.c:193 +#: builtin/branch.c:202 #, c-format -msgid "%sbranch '%s' not found." -msgstr "%s分支 '%s' 未发现。" +msgid "remote branch '%s' not found." +msgstr "远程分支 '%s' 未发现。" -#: builtin/branch.c:201 +#: builtin/branch.c:203 +#, c-format +msgid "branch '%s' not found." +msgstr "分支 '%s' 未发现。" + +#: builtin/branch.c:210 #, c-format msgid "Couldn't look up commit object for '%s'" msgstr "无法查询 '%s' 指向的提交对象" -#: builtin/branch.c:207 +#: builtin/branch.c:216 #, c-format msgid "" "The branch '%s' is not fully merged.\n" @@ -885,97 +1589,123 @@ msgstr "" "分支 '%s' 没有完全合并。\n" "如果您确认要删除它，执行 'git branch -D %s'。" -#: builtin/branch.c:215 +#: builtin/branch.c:225 +#, c-format +msgid "Error deleting remote branch '%s'" +msgstr "删除远程分支 '%s' 时出错" + +#: builtin/branch.c:226 #, c-format -msgid "Error deleting %sbranch '%s'" -msgstr "删除 %s分支 '%s' 时出错" +msgid "Error deleting branch '%s'" +msgstr "删除分支 '%s' 时出错" -#: builtin/branch.c:221 +#: builtin/branch.c:233 #, c-format -msgid "Deleted %sbranch %s (was %s).\n" -msgstr "已删除 %s分支 %s（曾为 %s）。\n" +msgid "Deleted remote branch %s (was %s).\n" +msgstr "已删除远程分支 %s（曾为 %s）。\n" -#: builtin/branch.c:226 +#: builtin/branch.c:234 +#, c-format +msgid "Deleted branch %s (was %s).\n" +msgstr "已删除分支 %s（曾为 %s）。\n" + +#: builtin/branch.c:239 msgid "Update of config-file failed" msgstr "无法更新 config 文件" -#: builtin/branch.c:324 +#: builtin/branch.c:337 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -# 译者：注意保持句尾空格 -#: builtin/branch.c:396 +#: builtin/branch.c:409 #, c-format -msgid "behind %d] " -msgstr "落后 %d] " +msgid "[%s: behind %d]" +msgstr "[%s：落后 %d]" -# 译者：注意保持句尾空格 -#: builtin/branch.c:398 +#: builtin/branch.c:411 #, c-format -msgid "ahead %d] " -msgstr "领先 %d] " +msgid "[behind %d]" +msgstr "[落后 %d]" -# 译者：注意保持句尾空格 -#: builtin/branch.c:400 +#: builtin/branch.c:415 #, c-format -msgid "ahead %d, behind %d] " -msgstr "领先 %d，落后 %d] " +msgid "[%s: ahead %d]" +msgstr "[%s：领先 %d]" -#: builtin/branch.c:503 +#: builtin/branch.c:417 +#, c-format +msgid "[ahead %d]" +msgstr "[领先 %d]" + +#: builtin/branch.c:420 +#, c-format +msgid "[%s: ahead %d, behind %d]" +msgstr "[%s：领先 %d，落后 %d]" + +#: builtin/branch.c:423 +#, c-format +msgid "[ahead %d, behind %d]" +msgstr "[领先 %d，落后 %d]" + +#: builtin/branch.c:535 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:568 +#: builtin/branch.c:600 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:581 +#: builtin/branch.c:613 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:591 +#: builtin/branch.c:623 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:606 +#: builtin/branch.c:638 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:610 +#: builtin/branch.c:642 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:614 +#: builtin/branch.c:646 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:621 +#: builtin/branch.c:653 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:636 +#: builtin/branch.c:668 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:660 +#: builtin/branch.c:692 #, c-format -msgid "could not write branch description template: %s\n" -msgstr "不能写分支描述模版：%s\n" +msgid "could not write branch description template: %s" +msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:750 +#: builtin/branch.c:783 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:755 builtin/clone.c:558 +#: builtin/branch.c:788 builtin/clone.c:558 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:813 +#: builtin/branch.c:808 +msgid "--column and --verbose are incompatible" +msgstr "--column 和 --verbose 不兼容" + +#: builtin/branch.c:857 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" @@ -1022,11 +1752,6 @@ msgstr "path '%s'：无法合并" msgid "Unable to add merge result for '%s'" msgstr "无法为 '%s' 添加合并结果" -#: builtin/checkout.c:212 builtin/reset.c:158 -#, c-format -msgid "make_cache_entry failed for path '%s'" -msgstr "对路径 '%s' 的 make_cache_entry 操作失败" - #: builtin/checkout.c:234 builtin/checkout.c:392 msgid "corrupt index file" msgstr "损坏的索引文件" @@ -1106,6 +1831,10 @@ msgstr[0] "" "警告：您正丢下 %d 个提交，未和任何分支关联：\n" "\n" "%s\n" +msgstr[1] "" +"警告：您正丢下 %d 个提交，未和任何分支关联：\n" +"\n" +"%s\n" #: builtin/checkout.c:664 #, c-format @@ -1122,71 +1851,71 @@ msgstr "" " git branch new_branch_name %s\n" "\n" -#: builtin/checkout.c:693 +#: builtin/checkout.c:694 msgid "internal error in revision walk" msgstr "在版本遍历时遇到内部错误" -#: builtin/checkout.c:697 +#: builtin/checkout.c:698 msgid "Previous HEAD position was" msgstr "之前的 HEAD 位置是" -#: builtin/checkout.c:723 +#: builtin/checkout.c:724 msgid "You are on a branch yet to be born" msgstr "您位于一个尚未初始化的分支" #. case (1) -#: builtin/checkout.c:854 +#: builtin/checkout.c:855 #, c-format msgid "invalid reference: %s" msgstr "无效引用：%s" #. case (1): want a tree -#: builtin/checkout.c:893 +#: builtin/checkout.c:894 #, c-format msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:973 +#: builtin/checkout.c:974 msgid "-B cannot be used with -b" msgstr "-B 不能和 -b 共用" -#: builtin/checkout.c:982 +#: builtin/checkout.c:983 msgid "--patch is incompatible with all other options" msgstr "--patch 选项和其他选项不兼容" -#: builtin/checkout.c:985 +#: builtin/checkout.c:986 msgid "--detach cannot be used with -b/-B/--orphan" msgstr "--detach 不能和 -b/-B/--orphan 共用" -#: builtin/checkout.c:987 +#: builtin/checkout.c:988 msgid "--detach cannot be used with -t" msgstr "--detach 不能和 -t 共用" -#: builtin/checkout.c:993 +#: builtin/checkout.c:994 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1000 +#: builtin/checkout.c:1001 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1006 +#: builtin/checkout.c:1007 msgid "--orphan and -b|-B are mutually exclusive" msgstr "--orphan 和 -b|-B 互斥" -#: builtin/checkout.c:1008 +#: builtin/checkout.c:1009 msgid "--orphan cannot be used with -t" msgstr "--orphan 不能和 -t 共用" -#: builtin/checkout.c:1018 +#: builtin/checkout.c:1019 msgid "git checkout: -f and -m are incompatible" msgstr "git checkout：-f 和 -m 不兼容" -#: builtin/checkout.c:1052 +#: builtin/checkout.c:1053 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1060 +#: builtin/checkout.c:1061 #, c-format msgid "" "git checkout: updating paths is incompatible with switching branches.\n" @@ -1195,26 +1924,26 @@ msgstr "" "git checkout：更新路径和切换分支不兼容。\n" "您是想要检出 '%s' 但未能将其解析为提交么？" -#: builtin/checkout.c:1062 +#: builtin/checkout.c:1063 msgid "git checkout: updating paths is incompatible with switching branches." msgstr "git checkout：更新路径和切换分支不兼容。" -#: builtin/checkout.c:1067 +#: builtin/checkout.c:1068 msgid "git checkout: --detach does not take a path argument" msgstr "git checkout：--detach 不跟路径参数" -#: builtin/checkout.c:1070 +#: builtin/checkout.c:1071 msgid "" "git checkout: --ours/--theirs, --force and --merge are incompatible when\n" "checking out of the index." msgstr "" "git checkout：在从索引检出时，--ours/--theirs、--force 和 --merge 不兼容。" -#: builtin/checkout.c:1089 +#: builtin/checkout.c:1090 msgid "Cannot switch branch to a non-commit." msgstr "无法切换分支到一个非提交。" -#: builtin/checkout.c:1092 +#: builtin/checkout.c:1093 msgid "--ours/--theirs is incompatible with switching branches." msgstr "--ours/--theirs 和切换分支不兼容。" @@ -1385,7 +2114,11 @@ msgstr "远程分支 %s 在上游 %s 未发现" msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" -#: builtin/commit.c:42 +#: builtin/column.c:51 +msgid "--command must be the first argument" +msgstr "--command 必须是第一个参数" + +#: builtin/commit.c:43 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -1408,7 +2141,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:54 +#: builtin/commit.c:55 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" @@ -1417,7 +2150,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:59 +#: builtin/commit.c:60 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -1433,296 +2166,292 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:205 builtin/reset.c:33 -msgid "merge" -msgstr "合并" - -#: builtin/commit.c:208 -msgid "cherry-pick" -msgstr "拣选" - -#: builtin/commit.c:325 +#: builtin/commit.c:253 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:367 +#: builtin/commit.c:295 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:373 +#: builtin/commit.c:301 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:406 builtin/commit.c:427 builtin/commit.c:473 +#: builtin/commit.c:334 builtin/commit.c:355 builtin/commit.c:405 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -# 译者：%s若翻为中文，前后不需要空格 -#: builtin/commit.c:457 -#, c-format -msgid "cannot do a partial commit during a %s." -msgstr "在%s过程中不能做部分提交。" +#: builtin/commit.c:386 +msgid "cannot do a partial commit during a merge." +msgstr "在合并过程中不能做部分提交。" + +#: builtin/commit.c:388 +msgid "cannot do a partial commit during a cherry-pick." +msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:466 +#: builtin/commit.c:398 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:486 +#: builtin/commit.c:418 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:561 builtin/commit.c:567 +#: builtin/commit.c:493 builtin/commit.c:499 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:590 +#: builtin/commit.c:522 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:651 +#: builtin/commit.c:582 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:689 builtin/commit.c:722 builtin/commit.c:1033 +#: builtin/commit.c:620 builtin/commit.c:653 builtin/commit.c:967 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:701 builtin/shortlog.c:296 +#: builtin/commit.c:632 builtin/shortlog.c:296 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:703 +#: builtin/commit.c:634 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:707 +#: builtin/commit.c:638 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:713 +#: builtin/commit.c:644 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:729 +#: builtin/commit.c:660 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:733 +#: builtin/commit.c:664 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:737 +#: builtin/commit.c:668 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:765 -#, c-format -msgid "could not open '%s'" -msgstr "不能打开 '%s'" - -#: builtin/commit.c:789 +#: builtin/commit.c:720 msgid "could not write commit template" msgstr "不能写提交模版" -# 译者：%s若翻为中文，前后不需要空格 -#: builtin/commit.c:799 +#: builtin/commit.c:731 #, c-format msgid "" "\n" -"It looks like you may be committing a %s.\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" -"看起来您正在提交一个%s。\n" -"如果不是这样，请删除文件\n" +"看起来您正在做一个合并提交。如果不对，请删除文件\n" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:812 -msgid "Please enter the commit message for your changes." -msgstr "请为您的修改输入提交说明。" +#: builtin/commit.c:736 +#, 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" +"看起来您正在做一个拣选提交。如果不对，请删除文件\n" +"\t%s\n" +"然后重试。\n" -# 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:815 +#: builtin/commit.c:748 msgid "" -" Lines starting\n" +"Please enter the commit message for your changes. Lines starting\n" "with '#' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"以 '#' 开头\n" -"的行将被忽略，并且空的提交说明将会中止提交。\n" +"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n" +"说明将会终止提交。\n" -# 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:820 +#: builtin/commit.c:753 msgid "" -" Lines starting\n" +"Please enter the commit message for your changes. Lines starting\n" "with '#' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"以 '#' 开头\n" -"的行将被保留，您可以删除它们如果您想这样做的话。空的提交说明将会\n" -"中止提交。\n" +"请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n" +"如果您想这样做的话。而一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:832 +#: builtin/commit.c:766 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:839 +#: builtin/commit.c:773 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:859 +#: builtin/commit.c:793 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:896 +#: builtin/commit.c:830 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:911 builtin/tag.c:357 +#: builtin/commit.c:845 builtin/tag.c:361 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" -#: builtin/commit.c:1008 +#: builtin/commit.c:942 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:1023 builtin/commit.c:1217 +#: builtin/commit.c:957 builtin/commit.c:1157 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1063 +#: builtin/commit.c:997 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1074 +#: builtin/commit.c:1008 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -# 译者：%s若翻为中文，前后不需要空格 -#: builtin/commit.c:1076 -#, c-format -msgid "You are in the middle of a %s -- cannot amend." -msgstr "您正处于一个%s的过程中 -- 无法修补提交。" +#: builtin/commit.c:1011 +msgid "You are in the middle of a merge -- cannot amend." +msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1078 +#: builtin/commit.c:1013 +msgid "You are in the middle of a cherry-pick -- cannot amend." +msgstr "您正处于一个拣选过程中 -- 无法修补提交。" + +#: builtin/commit.c:1016 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能共用" -#: builtin/commit.c:1088 +#: builtin/commit.c:1026 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1090 +#: builtin/commit.c:1028 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 共用。" -#: builtin/commit.c:1098 +#: builtin/commit.c:1036 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 共用。" -#: builtin/commit.c:1115 +#: builtin/commit.c:1053 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1117 +#: builtin/commit.c:1055 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1119 +#: builtin/commit.c:1057 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1121 +#: builtin/commit.c:1059 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1131 builtin/tag.c:556 +#: builtin/commit.c:1069 builtin/tag.c:577 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1136 +#: builtin/commit.c:1074 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项共用没有意义。" -#: builtin/commit.c:1315 +#: builtin/commit.c:1257 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1317 +#: builtin/commit.c:1259 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1358 +#: builtin/commit.c:1300 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1360 +#: builtin/commit.c:1302 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1450 +#: builtin/commit.c:1446 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1487 builtin/merge.c:509 +#: builtin/commit.c:1484 builtin/merge.c:509 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1494 +#: builtin/commit.c:1491 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1501 +#: builtin/commit.c:1498 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1517 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1531 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1536 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1554 builtin/merge.c:936 builtin/merge.c:961 +#: builtin/commit.c:1551 builtin/merge.c:936 builtin/merge.c:961 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1575 +#: builtin/commit.c:1572 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1579 +#: builtin/commit.c:1576 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1590 +#: builtin/commit.c:1587 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -1931,20 +2660,20 @@ msgstr "" # 译者：注意保持前导空格 #: builtin/fetch.c:549 #, c-format -msgid " (%s will become dangling)\n" -msgstr " （%s 将成为悬空状态）\n" +msgid " (%s will become dangling)" +msgstr " （%s 将成为悬空状态）" # 译者：注意保持前导空格 #: builtin/fetch.c:550 #, c-format -msgid " (%s has become dangling)\n" -msgstr " （%s 已成为悬空状态）\n" +msgid " (%s has become dangling)" +msgstr " （%s 已成为悬空状态）" #: builtin/fetch.c:557 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:558 +#: builtin/fetch.c:558 builtin/remote.c:1055 msgid "(none)" msgstr "（无）" @@ -1966,14 +2695,14 @@ msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" #: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" is ignored for %s\n" -msgstr "选项 \"%s\" 对于 %s 被忽略\n" +msgstr "选项 \"%s\" 为 %s 所忽略\n" #: builtin/fetch.c:888 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:890 +#: builtin/fetch.c:890 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" @@ -2064,35 +2793,339 @@ msgstr "开关 `%c' 期望一个数字值" msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:888 +#: builtin/grep.c:885 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:902 +#: builtin/grep.c:899 #, c-format msgid "bad object %s" msgstr "坏对象 %s" -#: builtin/grep.c:943 +#: builtin/grep.c:940 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:966 +#: builtin/grep.c:963 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 共用。" -#: builtin/grep.c:971 +#: builtin/grep.c:968 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本共用。" -#: builtin/grep.c:974 +#: builtin/grep.c:971 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:982 +#: builtin/grep.c:979 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" +#: builtin/help.c:59 +#, c-format +msgid "unrecognized help format '%s'" +msgstr "未能识别的帮助格式 '%s'" + +#: builtin/help.c:87 +msgid "Failed to start emacsclient." +msgstr "无法启动 emacsclient。" + +#: builtin/help.c:100 +msgid "Failed to parse emacsclient version." +msgstr "无法解析 emacsclient 版本。" + +#: builtin/help.c:108 +#, c-format +msgid "emacsclient version '%d' too old (< 22)." +msgstr "emacsclient 版本 '%d' 太老 (< 22)。" + +#: builtin/help.c:126 builtin/help.c:154 builtin/help.c:163 builtin/help.c:171 +#, c-format +msgid "failed to exec '%s': %s" +msgstr "无法执行 '%s'：%s" + +#: 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.<tool>.cmd'。" + +#: 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.<tool>.path'。" + +#: builtin/help.c:287 +msgid "The most commonly used git commands are:" +msgstr "最常用的 git 命令有：" + +#: builtin/help.c:355 +#, c-format +msgid "'%s': unknown man viewer." +msgstr "'%s'：未知的 man 查看器。" + +#: builtin/help.c:372 +msgid "no man viewer handled the request" +msgstr "没有 man 查看器处理此请求" + +#: builtin/help.c:380 +msgid "no info viewer handled the request" +msgstr "没有 info 查看器处理此请求" + +#: builtin/help.c:391 +#, c-format +msgid "'%s': not a documentation directory." +msgstr "'%s'：不是一个文档目录。" + +#: builtin/help.c:432 builtin/help.c:439 +#, c-format +msgid "usage: %s%s" +msgstr "用法：%s%s" + +#: builtin/help.c:453 +#, c-format +msgid "`git %s' is aliased to `%s'" +msgstr "`git %s' 是 `%s' 的别名" + +#: builtin/index-pack.c:169 +#, c-format +msgid "object type mismatch at %s" +msgstr "%s 的对象类型不匹配" + +#: builtin/index-pack.c:189 +msgid "object of unexpected type" +msgstr "意外的类型的对象" + +#: builtin/index-pack.c:226 +#, c-format +msgid "cannot fill %d byte" +msgid_plural "cannot fill %d bytes" +msgstr[0] "无法填充 %d 字节" +msgstr[1] "无法填充 %d 字节" + +#: builtin/index-pack.c:236 +msgid "early EOF" +msgstr "过早的文件结束符（EOF）" + +#: builtin/index-pack.c:237 +msgid "read error on input" +msgstr "输入上的读错误" + +#: builtin/index-pack.c:249 +msgid "used more bytes than were available" +msgstr "用掉了超过可用的字节" + +#: builtin/index-pack.c:256 +msgid "pack too large for current definition of off_t" +msgstr "包太大超过了当前 off_t 的定义" + +#: builtin/index-pack.c:272 +#, c-format +msgid "unable to create '%s'" +msgstr "不能创建 '%s'" + +#: builtin/index-pack.c:277 +#, c-format +msgid "cannot open packfile '%s'" +msgstr "无法打开包文件 '%s'" + +#: builtin/index-pack.c:291 +msgid "pack signature mismatch" +msgstr "包签名不匹配" + +#: builtin/index-pack.c:311 +#, c-format +msgid "pack has bad object at offset %lu: %s" +msgstr "包中有错误的对象位于 %lu：%s" + +#: builtin/index-pack.c:405 +#, c-format +msgid "inflate returned %d" +msgstr "解压缩返回 %d" + +#: builtin/index-pack.c:450 +msgid "offset value overflow for delta base object" +msgstr "偏移值覆盖了 delta 基准对象" + +#: builtin/index-pack.c:458 +msgid "delta base offset is out of bound" +msgstr "delta 基准偏移越界" + +#: builtin/index-pack.c:466 +#, c-format +msgid "unknown object type %d" +msgstr "未知对象类型 %d" + +#: builtin/index-pack.c:495 +msgid "cannot pread pack file" +msgstr "无法读取包文件" + +#: builtin/index-pack.c:497 +#, c-format +msgid "premature end of pack file, %lu byte missing" +msgid_plural "premature end of pack file, %lu bytes missing" +msgstr[0] "包文件过早结束，缺少 %lu 字节" +msgstr[1] "包文件过早结束，缺少 %lu 字节" + +#: builtin/index-pack.c:510 +msgid "serious inflate inconsistency" +msgstr "解压缩严重的不一致" + +#: builtin/index-pack.c:583 +#, c-format +msgid "cannot read existing object %s" +msgstr "不能读取现存对象 %s" + +#: builtin/index-pack.c:586 +#, c-format +msgid "SHA1 COLLISION FOUND WITH %s !" +msgstr "发现 %s 出现 SHA1 冲突！" + +#: builtin/index-pack.c:598 +#, c-format +msgid "invalid blob object %s" +msgstr "无效的 blob 对象 %s" + +#: builtin/index-pack.c:610 +#, c-format +msgid "invalid %s" +msgstr "无效的 %s" + +#: builtin/index-pack.c:612 +msgid "Error in object" +msgstr "对象中出错" + +#: builtin/index-pack.c:614 +#, c-format +msgid "Not all child objects of %s are reachable" +msgstr "%s 的所有子对象并非都可达" + +#: builtin/index-pack.c:687 builtin/index-pack.c:713 +msgid "failed to apply delta" +msgstr "无法应用 delta" + +#: builtin/index-pack.c:850 +msgid "Receiving objects" +msgstr "接收对象中" + +#: builtin/index-pack.c:850 +msgid "Indexing objects" +msgstr "索引对象中" + +#: builtin/index-pack.c:872 +msgid "pack is corrupted (SHA1 mismatch)" +msgstr "包冲突（SHA1 不匹配）" + +#: builtin/index-pack.c:877 +msgid "cannot fstat packfile" +msgstr "不能枚举包文件状态" + +#: builtin/index-pack.c:880 +msgid "pack has junk at the end" +msgstr "包的结尾有垃圾数据" + +#: builtin/index-pack.c:903 +msgid "Resolving deltas" +msgstr "处理 delta 中" + +#: builtin/index-pack.c:954 +msgid "confusion beyond insanity" +msgstr "不可理喻" + +#: builtin/index-pack.c:973 +#, 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:998 +#, c-format +msgid "unable to deflate appended object (%d)" +msgstr "不能缩小附加对象（%d）" + +#: builtin/index-pack.c:1077 +#, c-format +msgid "local object %s is corrupt" +msgstr "本地对象 %s 已损坏" + +#: builtin/index-pack.c:1101 +msgid "error while closing pack file" +msgstr "关闭包文件时出错" + +#: builtin/index-pack.c:1114 +#, c-format +msgid "cannot write keep file '%s'" +msgstr "无法写保留文件 '%s'" + +#: builtin/index-pack.c:1122 +#, c-format +msgid "cannot close written keep file '%s'" +msgstr "无法关闭保留文件 '%s'" + +#: builtin/index-pack.c:1135 +msgid "cannot store pack file" +msgstr "无法存储包文件" + +#: builtin/index-pack.c:1146 +msgid "cannot store index file" +msgstr "无法存储索引文件" + +#: builtin/index-pack.c:1247 +#, c-format +msgid "Cannot open existing pack file '%s'" +msgstr "无法打开现存包文件 '%s'" + +#: builtin/index-pack.c:1249 +#, c-format +msgid "Cannot open existing pack idx file for '%s'" +msgstr "无法为 %s 打开包索引文件" + +#: builtin/index-pack.c:1296 +#, 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:1303 +#, 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:1330 +msgid "Cannot come back to cwd" +msgstr "无法返回当前工作目录" + +#: builtin/index-pack.c:1374 builtin/index-pack.c:1377 +#: builtin/index-pack.c:1389 builtin/index-pack.c:1393 +#, c-format +msgid "bad %s" +msgstr "错误选项 %s" + +#: builtin/index-pack.c:1407 +msgid "--fix-thin cannot be used without --stdin" +msgstr "--fix-thin 不能和 --stdin 共用" + +#: builtin/index-pack.c:1411 builtin/index-pack.c:1421 +#, c-format +msgid "packfile name '%s' does not end with '.pack'" +msgstr "包名 '%s' 没有以 '.pack' 结尾" + +#: builtin/index-pack.c:1430 +msgid "--verify with no packfile name given" +msgstr "--verify 没有提供包名参数" + #: builtin/init-db.c:35 #, c-format msgid "Could not make %s writable by group" @@ -2156,7 +3189,7 @@ msgstr "模版未找到 %s" #: builtin/init-db.c:154 #, c-format msgid "not copying templates of a wrong format version %d from '%s'" -msgstr "未复制错误版本 %d 的模版自 '%s'" +msgstr "没有从 '%2$s' 复制带有错误版本 %1$d 的模版" #: builtin/init-db.c:192 #, c-format @@ -2257,90 +3290,81 @@ msgstr "未知类型：%d" msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:675 +#: builtin/log.c:676 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:686 +#: builtin/log.c:687 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:700 +#: builtin/log.c:701 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:708 +#: builtin/log.c:709 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:745 -msgid "Could not extract email from committer identity." -msgstr "不能从提交者身份中提取邮件地址。" - -#: builtin/log.c:791 +#: builtin/log.c:786 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:885 +#: builtin/log.c:859 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:958 +#: builtin/log.c:932 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1179 +#: builtin/log.c:1153 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" -#: builtin/log.c:1224 +#: builtin/log.c:1198 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1226 +#: builtin/log.c:1200 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1231 builtin/shortlog.c:284 -#, c-format -msgid "unrecognized argument: %s" -msgstr "未识别的参数：%s" - -#: builtin/log.c:1234 +#: builtin/log.c:1208 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1236 +#: builtin/log.c:1210 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1238 +#: builtin/log.c:1212 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1261 +#: builtin/log.c:1235 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1263 +#: builtin/log.c:1237 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1416 +#: builtin/log.c:1390 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1520 +#: builtin/log.c:1494 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1536 builtin/log.c:1538 builtin/log.c:1550 +#: builtin/log.c:1510 builtin/log.c:1512 builtin/log.c:1524 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" @@ -2662,7 +3686,7 @@ msgstr "%s，源=%s，目标=%s" msgid "Renaming %s to %s\n" msgstr "重命名 %s 至 %s\n" -#: builtin/mv.c:215 +#: builtin/mv.c:215 builtin/remote.c:731 #, c-format msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" @@ -2686,7 +3710,7 @@ msgstr "无法为对象 '%s' 的 'show' 关闭管道" msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:175 builtin/tag.c:343 +#: builtin/notes.c:175 builtin/tag.c:347 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" @@ -2709,12 +3733,12 @@ msgstr "不能写注解对象" msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" -#: builtin/notes.c:251 builtin/tag.c:521 +#: builtin/notes.c:251 builtin/tag.c:542 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:253 builtin/tag.c:524 +#: builtin/notes.c:253 builtin/tag.c:545 #, c-format msgid "could not open or read '%s'" msgstr "不能打开或读取 '%s'" @@ -2722,7 +3746,7 @@ msgstr "不能打开或读取 '%s'" #: builtin/notes.c:272 builtin/notes.c:445 builtin/notes.c:447 #: builtin/notes.c:507 builtin/notes.c:561 builtin/notes.c:644 #: builtin/notes.c:649 builtin/notes.c:724 builtin/notes.c:766 -#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:537 +#: builtin/notes.c:968 builtin/reset.c:293 builtin/tag.c:558 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" @@ -2816,30 +3840,30 @@ msgstr "" msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:1103 +#: builtin/notes.c:1103 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" -#: builtin/pack-objects.c:2315 +#: builtin/pack-objects.c:2337 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2319 +#: builtin/pack-objects.c:2341 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2342 +#: builtin/pack-objects.c:2364 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2346 +#: builtin/pack-objects.c:2368 #, c-format msgid "unable to parse value '%s' for option %s" -msgstr "不能解析值 '%s' 针对于选项 %s" +msgstr "不能解析选项 %1$s 的值 '%2$s'" #: builtin/push.c:45 msgid "tag shorthand without <tag>" @@ -2849,7 +3873,39 @@ msgstr "tag 简写没有跟 <tag> 参数" msgid "--delete only accepts plain target ref names" msgstr "--delete 只接受简单的目标引用名" -#: builtin/push.c:84 +#: builtin/push.c:99 +msgid "" +"\n" +"To choose either option permanently, see push.default in 'git help config'." +msgstr "" +"\n" +"为了永久地选择任一选项，参见 'git help config' 中的 push.default。" + +#: builtin/push.c:102 +#, 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 "" +"如果您当前分支的上游分支和您当前分支名不匹配，为推送到远程的\n" +"上游分支，使用\n" +"\n" +" git push %s HEAD:%s\n" +"\n" +"为推送至远程同名分支，使用\n" +"\n" +" git push %s %s\n" +"%s" + +#: builtin/push.c:121 #, c-format msgid "" "You are not currently on a branch.\n" @@ -2863,7 +3919,7 @@ msgstr "" "\n" " git push %s HEAD:<name-of-remote-branch>\n" -#: builtin/push.c:91 +#: builtin/push.c:128 #, c-format msgid "" "The current branch %s has no upstream branch.\n" @@ -2876,12 +3932,12 @@ msgstr "" "\n" " git push --set-upstream %s %s\n" -#: builtin/push.c:99 +#: builtin/push.c:136 #, c-format msgid "The current branch %s has multiple upstream branches, refusing to push." msgstr "当前分支 %s 有多个上游分支，拒绝推送。" -#: builtin/push.c:102 +#: builtin/push.c:139 #, c-format msgid "" "You are pushing to remote '%s', which is not the upstream of\n" @@ -2891,12 +3947,12 @@ msgstr "" "您正推送至远程 '%s'（其并非当前分支 '%s' 的上游），\n" "而没有告诉我要推送什么、更新哪个远程分支。" -#: builtin/push.c:131 +#: builtin/push.c:174 msgid "" "You didn't specify any refspecs to push, and push.default is \"nothing\"." msgstr "您没有为推送指定任何引用表达式，并且 push.default 为 \"nothing\"。" -#: builtin/push.c:138 +#: builtin/push.c:181 msgid "" "Updates were rejected because the tip of your current branch is behind\n" "its remote counterpart. Merge the remote changes (e.g. 'git pull')\n" @@ -2907,7 +3963,7 @@ msgstr "" "再次推送前，先与远程变更合并（如 'git pull'）。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:144 +#: builtin/push.c:187 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. If you did not intend to push that branch, you may want to\n" @@ -2916,10 +3972,9 @@ msgid "" msgstr "" "更新被拒绝，因为推送的一个分支的最新提交落后于其对应的远程分支。\n" "如果您并非有意推送该分支，您可以在推送时指定要推送的分支，或者将\n" -"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送" -"当前分支。" +"配置变量 'push.default' 设置为 'current' 或 'upstream' 以便只推送当前分支。" -#: builtin/push.c:150 +#: builtin/push.c:193 msgid "" "Updates were rejected because a pushed branch tip is behind its remote\n" "counterpart. Check out this branch and merge the remote changes\n" @@ -2930,22 +3985,22 @@ msgstr "" "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:190 +#: builtin/push.c:233 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:194 +#: builtin/push.c:237 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:226 +#: builtin/push.c:269 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:227 +#: builtin/push.c:270 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -2966,34 +4021,385 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:242 +#: builtin/push.c:285 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:243 +#: builtin/push.c:286 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用表达式共用" -#: builtin/push.c:248 +#: builtin/push.c:291 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:249 +#: builtin/push.c:292 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用表达式共用" -#: builtin/push.c:254 +#: builtin/push.c:297 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:334 +#: builtin/push.c:385 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:336 +#: builtin/push.c:387 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" +#: builtin/remote.c:98 +#, c-format +msgid "Updating %s" +msgstr "更新 %s 中" + +#: builtin/remote.c:130 +msgid "" +"--mirror is dangerous and deprecated; please\n" +"\t use --mirror=fetch or --mirror=push instead" +msgstr "" +"--mirror 选项危险且过时，请使用 --mirror=fetch\n" +"\t 或 --mirror=push" + +#: builtin/remote.c:147 +#, c-format +msgid "unknown mirror argument: %s" +msgstr "未知的镜像参数：%s" + +#: builtin/remote.c:185 +msgid "specifying a master branch makes no sense with --mirror" +msgstr "指定一个 master 分支并使用 --mirror 选项没有意义" + +#: builtin/remote.c:187 +msgid "specifying branches to track makes sense only with fetch mirrors" +msgstr "指定要跟踪的分支只在与获取镜像共用才有意义" + +#: builtin/remote.c:195 builtin/remote.c:646 +#, c-format +msgid "remote %s already exists." +msgstr "远程 %s 已经存在。" + +#: builtin/remote.c:199 builtin/remote.c:650 +#, c-format +msgid "'%s' is not a valid remote name" +msgstr "'%s' 不是一个有效的远程名称" + +#: builtin/remote.c:243 +#, c-format +msgid "Could not setup master '%s'" +msgstr "无法设置 master '%s'" + +#: builtin/remote.c:299 +#, c-format +msgid "more than one %s" +msgstr "多于一个 %s" + +#: builtin/remote.c:339 +#, c-format +msgid "Could not get fetch map for refspec %s" +msgstr "无法得到引用表达式 %s 的获取列表" + +#: builtin/remote.c:440 builtin/remote.c:448 +msgid "(matching)" +msgstr "（匹配）" + +#: builtin/remote.c:452 +msgid "(delete)" +msgstr "（删除）" + +#: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 +#, c-format +msgid "Could not append '%s' to '%s'" +msgstr "不能添加 '%s' 至 '%s'" + +#: builtin/remote.c:639 builtin/remote.c:792 builtin/remote.c:890 +#, c-format +msgid "No such remote: %s" +msgstr "没有这样的远程：%s" + +#: builtin/remote.c:656 +#, c-format +msgid "Could not rename config section '%s' to '%s'" +msgstr "不能重命名配置小节 '%s' 到 '%s'" + +#: builtin/remote.c:662 builtin/remote.c:799 +#, c-format +msgid "Could not remove config section '%s'" +msgstr "不能移除配置小节 '%s'" + +#: builtin/remote.c:677 +#, c-format +msgid "" +"Not updating non-default fetch refspec\n" +"\t%s\n" +"\tPlease update the configuration manually if necessary." +msgstr "" +"没有更新非默认的获取引用表达式\n" +"\t%s\n" +"\t如果必要请手动更新配置。" + +#: builtin/remote.c:683 +#, c-format +msgid "Could not append '%s'" +msgstr "不能追加 '%s'" + +#: builtin/remote.c:694 +#, c-format +msgid "Could not set '%s'" +msgstr "不能设置 '%s'" + +#: builtin/remote.c:716 +#, c-format +msgid "deleting '%s' failed" +msgstr "删除 '%s' 失败" + +#: builtin/remote.c:750 +#, c-format +msgid "creating '%s' failed" +msgstr "创建 '%s' 失败" + +#: builtin/remote.c:764 +#, c-format +msgid "Could not remove branch %s" +msgstr "无法移除分支 %s" + +#: builtin/remote.c:834 +msgid "" +"Note: A branch outside the refs/remotes/ hierarchy was not removed;\n" +"to delete it, use:" +msgid_plural "" +"Note: Some branches outside the refs/remotes/ hierarchy were not removed;\n" +"to delete them, use:" +msgstr[0] "注意：ref/remotes 层级之外的一个分支未被移除。要删除它，使用：" +msgstr[1] "注意：ref/remotes 层级之外的一些分支未被移除。要删除它们，使用：" + +#: builtin/remote.c:943 +#, c-format +msgid " new (next fetch will store in remotes/%s)" +msgstr " 新的（下一次获取将存储于 remotes/%s）" + +#: builtin/remote.c:946 +msgid " tracked" +msgstr " 已跟踪" + +#: builtin/remote.c:948 +msgid " stale (use 'git remote prune' to remove)" +msgstr " 过时（使用 'git remote prune' 来移除）" + +#: builtin/remote.c:950 +msgid " ???" +msgstr " ???" + +#: builtin/remote.c:991 +#, c-format +msgid "invalid branch.%s.merge; cannot rebase onto > 1 branch" +msgstr "无效的 branch.%s.merge，不能变基到一个以上的分支" + +#: builtin/remote.c:998 +#, c-format +msgid "rebases onto remote %s" +msgstr "变基到远程 %s" + +#: builtin/remote.c:1001 +#, c-format +msgid " merges with remote %s" +msgstr " 与远程 %s 合并" + +#: builtin/remote.c:1002 +msgid " and with remote" +msgstr " 且有远程" + +#: builtin/remote.c:1004 +#, c-format +msgid "merges with remote %s" +msgstr "与远程 %s 合并" + +#: builtin/remote.c:1005 +msgid " and with remote" +msgstr " 且有远程" + +#: builtin/remote.c:1051 +msgid "create" +msgstr "创建" + +#: builtin/remote.c:1054 +msgid "delete" +msgstr "删除" + +#: builtin/remote.c:1058 +msgid "up to date" +msgstr "最新" + +#: builtin/remote.c:1061 +msgid "fast-forwardable" +msgstr "可快进" + +#: builtin/remote.c:1064 +msgid "local out of date" +msgstr "本地已过时" + +#: builtin/remote.c:1071 +#, c-format +msgid " %-*s forces to %-*s (%s)" +msgstr " %-*s 强制推送至 %-*s (%s)" + +#: builtin/remote.c:1074 +#, c-format +msgid " %-*s pushes to %-*s (%s)" +msgstr " %-*s 推送至 %-*s (%s)" + +#: builtin/remote.c:1078 +#, c-format +msgid " %-*s forces to %s" +msgstr " %-*s 强制推送至 %s" + +#: builtin/remote.c:1081 +#, c-format +msgid " %-*s pushes to %s" +msgstr " %-*s 推送至 %s" + +#: builtin/remote.c:1118 +#, c-format +msgid "* remote %s" +msgstr "* 远程 %s" + +#: builtin/remote.c:1119 +#, c-format +msgid " Fetch URL: %s" +msgstr " 获取地址：%s" + +#: builtin/remote.c:1120 builtin/remote.c:1285 +msgid "(no URL)" +msgstr "(无 URL)" + +#: builtin/remote.c:1129 builtin/remote.c:1131 +#, c-format +msgid " Push URL: %s" +msgstr " 推送地址：%s" + +#: builtin/remote.c:1133 builtin/remote.c:1135 builtin/remote.c:1137 +#, c-format +msgid " HEAD branch: %s" +msgstr " HEAD分支：%s" + +#: builtin/remote.c:1139 +#, c-format +msgid "" +" HEAD branch (remote HEAD is ambiguous, may be one of the following):\n" +msgstr " HEAD 分支（远程 HEAD 模糊，可能是下列中的一个）：\n" + +#: builtin/remote.c:1151 +#, c-format +msgid " Remote branch:%s" +msgid_plural " Remote branches:%s" +msgstr[0] " 远程分支：%s" +msgstr[1] " 远程分支：%s" + +# 译者：中文字符串拼接，可删除前导空格 +#: builtin/remote.c:1154 builtin/remote.c:1181 +msgid " (status not queried)" +msgstr "（状态未查询）" + +#: builtin/remote.c:1163 +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:1171 +msgid " Local refs will be mirrored by 'git push'" +msgstr " 本地引用将在 'git push' 时被镜像" + +#: builtin/remote.c:1178 +#, 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:1216 +msgid "Cannot determine remote HEAD" +msgstr "无法确定远程 HEAD" + +#: builtin/remote.c:1218 +msgid "Multiple remote HEAD branches. Please choose one explicitly with:" +msgstr "多个远程 HEAD 分支。请明确地选择一个用命令：" + +#: builtin/remote.c:1228 +#, c-format +msgid "Could not delete %s" +msgstr "无法删除 %s" + +#: builtin/remote.c:1236 +#, c-format +msgid "Not a valid ref: %s" +msgstr "不是一个有效引用：%s" + +#: builtin/remote.c:1238 +#, c-format +msgid "Could not setup %s" +msgstr "不能设置 %s" + +# 译者：注意保持前导空格 +#: builtin/remote.c:1274 +#, c-format +msgid " %s will become dangling!" +msgstr " %s 将成为悬空状态！" + +# 译者：注意保持前导空格 +#: builtin/remote.c:1275 +#, c-format +msgid " %s has become dangling!" +msgstr " %s 已成为悬空状态！" + +#: builtin/remote.c:1281 +#, c-format +msgid "Pruning %s" +msgstr "修剪 %s" + +#: builtin/remote.c:1282 +#, c-format +msgid "URL: %s" +msgstr "URL：%s" + +#: builtin/remote.c:1295 +#, c-format +msgid " * [would prune] %s" +msgstr " * [将删除] %s" + +#: builtin/remote.c:1298 +#, c-format +msgid " * [pruned] %s" +msgstr " * [已删除] %s" + +#: builtin/remote.c:1387 builtin/remote.c:1461 +#, c-format +msgid "No such remote '%s'" +msgstr "没有此远程 '%s'" + +#: builtin/remote.c:1414 +msgid "no remote specified" +msgstr "未指定远程" + +#: builtin/remote.c:1447 +msgid "--add --delete doesn't make sense" +msgstr "--add --delete 无意义" + +#: builtin/remote.c:1487 +#, c-format +msgid "Invalid old URL pattern: %s" +msgstr "无效的旧URL匹配模版：%s" + +#: builtin/remote.c:1495 +#, c-format +msgid "No such URL found: %s" +msgstr "未找到此URL：%s" + +#: builtin/remote.c:1497 +msgid "Will not delete all non-push URLs" +msgstr "将不会删除所有非推送URL地址" + #: builtin/reset.c:33 msgid "mixed" msgstr "混杂" @@ -3007,6 +4413,10 @@ msgid "hard" msgstr "硬性" #: builtin/reset.c:33 +msgid "merge" +msgstr "合并" + +#: builtin/reset.c:33 msgid "keep" msgstr "保持" @@ -3081,15 +4491,15 @@ msgstr "不能重置索引文件至版本 '%s'。" msgid "%s: %s cannot be used with %s" msgstr "%s：%s 不能和 %s 共用" -#: builtin/revert.c:127 +#: builtin/revert.c:131 msgid "program error" msgstr "程序错误" -#: builtin/revert.c:213 +#: builtin/revert.c:221 msgid "revert failed" msgstr "还原失败" -#: builtin/revert.c:228 +#: builtin/revert.c:236 msgid "cherry-pick failed" msgstr "拣选失败" @@ -3135,32 +4545,32 @@ msgstr "git rm：不能删除 %s" msgid "Missing author: %s" msgstr "缺少作者：%s" -#: builtin/tag.c:58 +#: builtin/tag.c:60 #, c-format msgid "malformed object at '%s'" msgstr "非法的对象于 '%s'" -#: builtin/tag.c:205 +#: builtin/tag.c:207 #, c-format msgid "tag name too long: %.*s..." msgstr "tag 名字太长：%.*s..." -#: builtin/tag.c:210 +#: builtin/tag.c:212 #, c-format msgid "tag '%s' not found." msgstr "tag '%s' 未发现。" -#: builtin/tag.c:225 +#: builtin/tag.c:227 #, c-format msgid "Deleted tag '%s' (was %s)\n" msgstr "已删除 tag '%s'（曾为 %s）\n" -#: builtin/tag.c:237 +#: builtin/tag.c:239 #, c-format msgid "could not verify the tag '%s'" msgstr "不能校验 tag '%s'" -#: builtin/tag.c:247 +#: builtin/tag.c:249 msgid "" "\n" "#\n" @@ -3174,7 +4584,7 @@ msgstr "" "# 以 '#' 开头的行将被忽略。\n" "#\n" -#: builtin/tag.c:254 +#: builtin/tag.c:256 msgid "" "\n" "#\n" @@ -3189,89 +4599,235 @@ msgstr "" "# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n" "#\n" -#: builtin/tag.c:294 +#: builtin/tag.c:298 msgid "unable to sign the tag" msgstr "无法签署 tag" -#: builtin/tag.c:296 +#: builtin/tag.c:300 msgid "unable to write tag file" msgstr "无法写 tag 文件" -#: builtin/tag.c:321 +#: builtin/tag.c:325 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:334 +#: builtin/tag.c:338 msgid "tag header too big." msgstr "tag 头信息太大。" -#: builtin/tag.c:366 +#: builtin/tag.c:370 msgid "no tag message?" msgstr "无 tag 说明？" -#: builtin/tag.c:372 +#: builtin/tag.c:376 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被保留在 %s\n" -#: builtin/tag.c:421 +#: builtin/tag.c:425 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需要一个对象" -#: builtin/tag.c:423 +#: builtin/tag.c:427 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: builtin/tag.c:502 +#: builtin/tag.c:506 +msgid "--column and -n are incompatible" +msgstr "--column 和 -n 不兼容" + +#: builtin/tag.c:523 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 共用。" -#: builtin/tag.c:504 +#: builtin/tag.c:525 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 共用。" -#: builtin/tag.c:506 +#: builtin/tag.c:527 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 共用。" -#: builtin/tag.c:514 +#: builtin/tag.c:535 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:534 +#: builtin/tag.c:555 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:540 +#: builtin/tag.c:561 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" -#: builtin/tag.c:545 +#: builtin/tag.c:566 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" -#: builtin/tag.c:563 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot lock the ref" msgstr "%s：不能锁定引用" -#: builtin/tag.c:565 +#: builtin/tag.c:586 #, c-format msgid "%s: cannot update the ref" msgstr "%s：不能更新引用" -#: builtin/tag.c:567 +#: builtin/tag.c:588 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'（曾为 %s）\n" +#: git.c:16 +msgid "See 'git help <command>' for more information on a specific command." +msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" + +#: parse-options.h:133 parse-options.h:235 +msgid "n" +msgstr "数字" + +#: parse-options.h:141 +msgid "time" +msgstr "时间" + +#: parse-options.h:149 +msgid "file" +msgstr "文件" + +#: parse-options.h:151 +msgid "when" +msgstr "何时" + +#: parse-options.h:156 +msgid "no-op (backward compatibility)" +msgstr "空操作（向后兼容）" + +#: parse-options.h:228 +msgid "be more verbose" +msgstr "更加详细" + +#: parse-options.h:230 +msgid "be more quiet" +msgstr "更加安静" + +#: parse-options.h:236 +msgid "use <n> digits to display SHA-1s" +msgstr "用 <n> 位数字显示 SHA-1 哈希值" + +#: common-cmds.h:8 +msgid "Add file contents to the index" +msgstr "添加文件内容至索引" + +#: common-cmds.h:9 +msgid "Find by binary search the change that introduced a bug" +msgstr "通过二分查找定位引入 bug 的变更" + +#: common-cmds.h:10 +msgid "List, create, or delete branches" +msgstr "列出、创建或删除分支" + +#: common-cmds.h:11 +msgid "Checkout a branch or paths to the working tree" +msgstr "检出一个分支或路径到工作区" + +#: common-cmds.h:12 +msgid "Clone a repository into a new directory" +msgstr "克隆一个版本库到一个新目录" + +#: common-cmds.h:13 +msgid "Record changes to the repository" +msgstr "记录变更到版本库" + +#: common-cmds.h:14 +msgid "Show changes between commits, commit and working tree, etc" +msgstr "显示提交之间、提交和工作区之间等的差异" + +#: common-cmds.h:15 +msgid "Download objects and refs from another repository" +msgstr "从另外一个版本库下载对象和引用" + +#: common-cmds.h:16 +msgid "Print lines matching a pattern" +msgstr "输出和模式匹配的行" + +#: common-cmds.h:17 +msgid "Create an empty git repository or reinitialize an existing one" +msgstr "创建一个空的 git 版本库或者重新初始化一个" + +#: common-cmds.h:18 +msgid "Show commit logs" +msgstr "显示提交日志" + +#: common-cmds.h:19 +msgid "Join two or more development histories together" +msgstr "合并两个或更多开发历史" + +#: common-cmds.h:20 +msgid "Move or rename a file, a directory, or a symlink" +msgstr "移动或重命名一个文件、目录或符号链接" + +#: common-cmds.h:21 +msgid "Fetch from and merge with another repository or a local branch" +msgstr "获取并合并另外的版本库或一个本地分支" + +#: common-cmds.h:22 +msgid "Update remote refs along with associated objects" +msgstr "更新远程引用和相关的对象" + +#: common-cmds.h:23 +msgid "Forward-port local commits to the updated upstream head" +msgstr "本地提交转移至更新后的上游分支中" + +#: common-cmds.h:24 +msgid "Reset current HEAD to the specified state" +msgstr "重置当前HEAD到指定状态" + +#: common-cmds.h:25 +msgid "Remove files from the working tree and from the index" +msgstr "从工作区和索引中删除文件" + +#: common-cmds.h:26 +msgid "Show various types of objects" +msgstr "显示各种类型的对象" + +#: common-cmds.h:27 +msgid "Show the working tree status" +msgstr "显示工作区状态" + +#: common-cmds.h:28 +msgid "Create, list, delete or verify a tag object signed with GPG" +msgstr "创建、列出、删除或校验一个GPG签名的 tag 对象" + #: git-am.sh:50 msgid "You need to set your committer info first" msgstr "您需要先设置你的提交者信息" +#: git-am.sh:95 +msgid "" +"You seem to have moved HEAD since the last 'am' failure.\n" +"Not rewinding to ORIG_HEAD" +msgstr "" +"您好像在上一次 'am' 失败后移动了 HEAD。未回退至 ORIG_HEAD" + +#: git-am.sh:105 +#, sh-format +msgid "" +"When you have resolved this problem run \"$cmdline --resolved\".\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"当您解决了此问题后，执行 \"$cmdline --resolved\"。\n" +"如果您想跳过此补丁，则执行 \"$cmdline --skip\"。\n" +"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" + +#: git-am.sh:121 +msgid "Cannot fall back to three-way merge." +msgstr "无法求助于三路合并。" + #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." msgstr "版本库缺乏必要的 blob 数据以进行三路合并。" @@ -3286,7 +4842,7 @@ msgstr "" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." -msgstr "回退到补丁基础版本并使用三路合并..." +msgstr "转而在基础版本上打补丁及进行三路合并..." #: git-am.sh:275 msgid "Only one StGIT patch series can be applied at once" @@ -3323,10 +4879,29 @@ msgstr "解决操作未进行，我们不会继续。" msgid "Dirty index: cannot apply patches (dirty: $files)" msgstr "脏的索引：不能应用补丁（脏文件：$files）" +#: git-am.sh:671 +#, sh-format +msgid "" +"Patch is empty. Was it split wrong?\n" +"If you would prefer to skip this patch, instead run \"$cmdline --skip\".\n" +"To restore the original branch and stop patching run \"$cmdline --abort\"." +msgstr "" +"补丁为空。是不是切分错误？\n" +"如果您想要跳过这个补丁，执行 \"$cmdline --skip\"。\n" +"要恢复原分支并停止打补丁，执行 \"$cmdline --abort\"。" + +#: git-am.sh:708 +msgid "Patch does not have a valid e-mail address." +msgstr "补丁中没有一个有效的邮件地址。" + #: git-am.sh:755 msgid "cannot be interactive without stdin connected to a terminal." msgstr "标准输入没有和终端关联，不能进行交互式操作。" +#: git-am.sh:759 +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 @@ -3340,14 +4915,40 @@ msgstr "应用？[y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " msgid "Applying: $FIRSTLINE" msgstr "正应用：$FIRSTLINE" +#: git-am.sh:823 +msgid "" +"No changes - did you forget to use 'git add'?\n" +"If there is nothing left to stage, chances are that something else\n" +"already introduced the same changes; you might want to skip this patch." +msgstr "" +"没有变更 —— 您是不是忘了执行 'git add'？\n" +"如果没有什么要添加到暂存区的，则很可能是其它提交已经引入了相同的变更。\n" +"您也许想要跳过这个补丁。" + +#: git-am.sh:831 +msgid "" +"You still have unmerged paths in your index\n" +"did you forget to use 'git add'?" +msgstr "" +"您的索引中仍有未合并的路径。您是否忘了执行 'git add'？" + #: git-am.sh:847 msgid "No changes -- Patch already applied." msgstr "没有变更 -- 补丁已经应用过。" +#: git-am.sh:857 +#, sh-format +msgid "Patch failed at $msgnum $FIRSTLINE" +msgstr "补丁失败于 $msgnum $FIRSTLINE" + #: git-am.sh:873 msgid "applying to an empty history" msgstr "正应用到一个空历史上" +#: git-bisect.sh:48 +msgid "You need to start by \"git bisect start\"" +msgstr "您需要执行 \"git bisect start\" 来开始" + # 译者：注意保持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -3359,7 +4960,7 @@ msgstr "您想让我为您这样做么[Y/n]？ " #: git-bisect.sh:95 #, sh-format msgid "unrecognised option: '$arg'" -msgstr "未识别的选项：'$arg'" +msgstr "未能识别的选项：'$arg'" #: git-bisect.sh:99 #, sh-format @@ -3407,6 +5008,12 @@ msgstr "输入坏的版本：$rev" msgid "'git bisect bad' can take only one argument." msgstr "'git bisect bad' 只能带一个参数。" +#. have bad but not good. we could bisect although +#. this is less optimum. +#: git-bisect.sh:273 +msgid "Warning: bisecting only with a bad commit." +msgstr "警告：在仅有一个坏提交下进行二分查找。" + # 译者：注意保持句尾空格 #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -3415,6 +5022,28 @@ msgstr "'git bisect bad' 只能带一个参数。" msgid "Are you sure [Y/n]? " msgstr "您确认么[Y/n]？ " +#: git-bisect.sh:289 +msgid "" +"You need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"您需要给我至少一个好版本和一个坏版本。\n" +"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" + +#: git-bisect.sh:292 +msgid "" +"You need to start by \"git bisect start\".\n" +"You then need to give me at least one good and one bad revisions.\n" +"(You can use \"git bisect bad\" and \"git bisect good\" for that.)" +msgstr "" +"您需要执行 \"git bisect start\" 来开始。\n" +"然后需要提供我至少一个好版本和一个坏版本。\n" +"（您可以用 \"git bisect bad\" 和 \"git bisect good\" 命令来标识。）" + +#: git-bisect.sh:347 git-bisect.sh:474 +msgid "We are not bisecting." +msgstr "我们没有在二分查找。" + #: git-bisect.sh:354 #, sh-format msgid "'$invalid' is not a valid commit" @@ -3442,9 +5071,36 @@ msgstr "不能读取 $file 来重放" msgid "?? what are you talking about?" msgstr "?? 您在说什么?" -#: git-bisect.sh:474 -msgid "We are not bisecting." -msgstr "我们没有在二分查找。" +#: git-bisect.sh:420 +#, sh-format +msgid "running $command" +msgstr "运行 $command" + +#: git-bisect.sh:427 +#, sh-format +msgid "" +"bisect run failed:\n" +"exit code $res from '$command' is < 0 or >= 128" +msgstr "" +"二分查找运行失败：\n" +"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128" + +#: git-bisect.sh:453 +msgid "bisect run cannot continue any more" +msgstr "二分查找不能继续运行" + +#: git-bisect.sh:459 +#, sh-format +msgid "" +"bisect run failed:\n" +"'bisect_state $state' exited with error code $res" +msgstr "" +"二分查找运行失败：\n" +"'bisect_state $state' 退出码为 $res" + +#: git-bisect.sh:466 +msgid "bisect run success" +msgstr "二分查找运行成功" #: git-pull.sh:21 msgid "" @@ -3464,6 +5120,20 @@ msgstr "Pull 不可用，因为您尚有未合并的文件。" msgid "updating an unborn branch with changes added to the index" msgstr "更新尚未诞生的分支，变更添加至索引" +#. The fetch involved updating the current branch. +#. The working tree and the index file is still based on the +#. $orig_head commit, but we are merging into $curr_head. +#. First update the working tree to match $curr_head. +#: git-pull.sh:228 +#, sh-format +msgid "" +"Warning: fetch updated the current branch head.\n" +"Warning: fast-forwarding your working tree from\n" +"Warning: commit $orig_head." +msgstr "" +"警告：fetch 更新了当前的分支。您的工作区\n" +"警告：从原提交 $orig_head 快进。" + #: git-pull.sh:253 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" @@ -3500,6 +5170,25 @@ msgstr "无法删除临时索引（不应发生）" msgid "Cannot record working tree state" 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:202 +#, 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:223 msgid "No local changes to save" msgstr "没有要保存的本地修改" @@ -3560,6 +5249,10 @@ msgstr "不能保存索引树" msgid "Cannot unstage modified files" msgstr "无法还原修改的文件" +#: git-stash.sh:474 +msgid "Index was not unstashed." +msgstr "索引的进度没有被恢复。" + #: git-stash.sh:491 #, sh-format msgid "Dropped ${REV} ($s)" @@ -3598,67 +5291,83 @@ msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" -#: git-submodule.sh:248 +#: git-submodule.sh:249 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:265 +#: git-submodule.sh:266 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:282 +#: git-submodule.sh:270 +#, sh-format +msgid "" +"The following path is ignored by one of your .gitignore files:\n" +"$sm_path\n" +"Use -f if you really want to add it." +msgstr "" +"以下路径被您的一个 .gitignore 文件所忽略：\n" +"$sm_path\n" +"如果您确实想添加它，使用 -f 参数。" + +#: git-submodule.sh:281 +#, sh-format +msgid "Adding existing repo at '$sm_path' to the index" +msgstr "添加位于 '$sm_path' 的现存版本库到索引" + +#: git-submodule.sh:283 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:296 +#: git-submodule.sh:297 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:301 +#: git-submodule.sh:302 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:306 +#: git-submodule.sh:307 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:348 +#: git-submodule.sh:349 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" -#: git-submodule.sh:360 +#: git-submodule.sh:363 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path'，脚本返回非零值。" -#: git-submodule.sh:402 +#: git-submodule.sh:406 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" -#: git-submodule.sh:411 +#: git-submodule.sh:415 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:419 -#, sh-format -msgid "Failed to register update mode for submodule path '$sm_path'" -msgstr "无法为子模组路径 '$sm_path' 注册更新模式" - -#: git-submodule.sh:421 +#: git-submodule.sh:417 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:520 +#: git-submodule.sh:425 +#, sh-format +msgid "Failed to register update mode for submodule path '$sm_path'" +msgstr "无法为子模组路径 '$sm_path' 注册更新模式" + +#: git-submodule.sh:524 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -3667,85 +5376,96 @@ msgstr "" "子模组路径 '$sm_path' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:533 +#: git-submodule.sh:537 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" -#: git-submodule.sh:552 +#: git-submodule.sh:556 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:566 +#: git-submodule.sh:570 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" -#: git-submodule.sh:567 +#: git-submodule.sh:571 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "子模组路径 '$sm_path'：变基至 '$sha1'" -#: git-submodule.sh:572 +#: git-submodule.sh:576 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" -#: git-submodule.sh:573 +#: git-submodule.sh:577 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'" -#: git-submodule.sh:578 +#: git-submodule.sh:582 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" -#: git-submodule.sh:579 +#: git-submodule.sh:583 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "子模组路径 '$sm_path'：检出 '$sha1'" -#: git-submodule.sh:601 git-submodule.sh:924 +#: git-submodule.sh:605 git-submodule.sh:928 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:709 -msgid "--" -msgstr "--" +#: git-submodule.sh:713 +msgid "--cached cannot be used with --files" +msgstr "--cached 不能和 --files 共用" + +#. unexpected type +#: git-submodule.sh:753 +#, sh-format +msgid "unexpected mode $mod_dst" +msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:767 +#: git-submodule.sh:771 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告：$name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:770 +#: git-submodule.sh:774 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:773 +#: git-submodule.sh:777 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:798 +#: git-submodule.sh:802 msgid "blob" msgstr "blob" -#: git-submodule.sh:799 +#: git-submodule.sh:803 msgid "submodule" msgstr "子模组" -#: git-submodule.sh:970 +#: git-submodule.sh:840 +msgid "# Submodules changed but not updated:" +msgstr "# 子模组已修改但尚未更新：" + +#: git-submodule.sh:842 +msgid "# Submodule changes to be committed:" +msgstr "要提交的子模组变更：" + +#: git-submodule.sh:974 #, sh-format msgid "Synchronizing submodule url for '$name'" msgstr "为 '$name' 同步子模组 url" - -#~ msgid "Too many options specified" -#~ msgstr "指定了太多的选项" @@ -259,8 +259,13 @@ static void clear_ref_dir(struct ref_dir *dir); static void free_ref_entry(struct ref_entry *entry) { - if (entry->flag & REF_DIR) - clear_ref_dir(get_ref_dir(entry)); + if (entry->flag & REF_DIR) { + /* + * Do not use get_ref_dir() here, as that might + * trigger the reading of loose refs. + */ + clear_ref_dir(&entry->u.subdir); + } free(entry); } @@ -300,12 +305,13 @@ static void clear_ref_dir(struct ref_dir *dir) * "refs/heads/") or "" for the top-level directory. */ static struct ref_entry *create_dir_entry(struct ref_cache *ref_cache, - const char *dirname, int incomplete) + const char *dirname, size_t len, + int incomplete) { struct ref_entry *direntry; - int len = strlen(dirname); direntry = xcalloc(1, sizeof(struct ref_entry) + len + 1); - memcpy(direntry->name, dirname, len + 1); + memcpy(direntry->name, dirname, len); + direntry->name[len] = '\0'; direntry->u.subdir.ref_cache = ref_cache; direntry->flag = REF_DIR | (incomplete ? REF_INCOMPLETE : 0); return direntry; @@ -320,28 +326,42 @@ static int ref_entry_cmp(const void *a, const void *b) static void sort_ref_dir(struct ref_dir *dir); +struct string_slice { + size_t len; + const char *str; +}; + +static int ref_entry_cmp_sslice(const void *key_, const void *ent_) +{ + struct string_slice *key = (struct string_slice *)key_; + struct ref_entry *ent = *(struct ref_entry **)ent_; + int entlen = strlen(ent->name); + int cmplen = key->len < entlen ? key->len : entlen; + int cmp = memcmp(key->str, ent->name, cmplen); + if (cmp) + return cmp; + return key->len - entlen; +} + /* * Return the entry with the given refname from the ref_dir * (non-recursively), sorting dir if necessary. Return NULL if no * such entry is found. dir must already be complete. */ -static struct ref_entry *search_ref_dir(struct ref_dir *dir, const char *refname) +static struct ref_entry *search_ref_dir(struct ref_dir *dir, + const char *refname, size_t len) { - struct ref_entry *e, **r; - int len; + struct ref_entry **r; + struct string_slice key; if (refname == NULL || !dir->nr) return NULL; sort_ref_dir(dir); - - len = strlen(refname) + 1; - e = xmalloc(sizeof(struct ref_entry) + len); - memcpy(e->name, refname, len); - - r = bsearch(&e, dir->entries, dir->nr, sizeof(*dir->entries), ref_entry_cmp); - - free(e); + key.len = len; + key.str = refname; + r = bsearch(&key, dir->entries, dir->nr, sizeof(*dir->entries), + ref_entry_cmp_sslice); if (r == NULL) return NULL; @@ -357,9 +377,10 @@ static struct ref_entry *search_ref_dir(struct ref_dir *dir, const char *refname * directory cannot be found. dir must already be complete. */ static struct ref_dir *search_for_subdir(struct ref_dir *dir, - const char *subdirname, int mkdir) + const char *subdirname, size_t len, + int mkdir) { - struct ref_entry *entry = search_ref_dir(dir, subdirname); + struct ref_entry *entry = search_ref_dir(dir, subdirname, len); if (!entry) { if (!mkdir) return NULL; @@ -369,7 +390,7 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir, * therefore, create an empty record for it but mark * the record complete. */ - entry = create_dir_entry(dir->ref_cache, subdirname, 0); + entry = create_dir_entry(dir->ref_cache, subdirname, len, 0); add_entry_to_dir(dir, entry); } return get_ref_dir(entry); @@ -387,15 +408,11 @@ static struct ref_dir *search_for_subdir(struct ref_dir *dir, static struct ref_dir *find_containing_dir(struct ref_dir *dir, const char *refname, int mkdir) { - struct strbuf dirname; const char *slash; - strbuf_init(&dirname, PATH_MAX); for (slash = strchr(refname, '/'); slash; slash = strchr(slash + 1, '/')) { + size_t dirnamelen = slash - refname + 1; struct ref_dir *subdir; - strbuf_add(&dirname, - refname + dirname.len, - (slash + 1) - (refname + dirname.len)); - subdir = search_for_subdir(dir, dirname.buf, mkdir); + subdir = search_for_subdir(dir, refname, dirnamelen, mkdir); if (!subdir) { dir = NULL; break; @@ -403,7 +420,6 @@ static struct ref_dir *find_containing_dir(struct ref_dir *dir, dir = subdir; } - strbuf_release(&dirname); return dir; } @@ -418,7 +434,7 @@ static struct ref_entry *find_ref(struct ref_dir *dir, const char *refname) dir = find_containing_dir(dir, refname, 0); if (!dir) return NULL; - entry = search_ref_dir(dir, refname); + entry = search_ref_dir(dir, refname, strlen(refname)); return (entry && !(entry->flag & REF_DIR)) ? entry : NULL; } @@ -828,7 +844,7 @@ static struct ref_dir *get_packed_refs(struct ref_cache *refs) const char *packed_refs_file; FILE *f; - refs->packed = create_dir_entry(refs, "", 0); + refs->packed = create_dir_entry(refs, "", 0, 0); if (*refs->name) packed_refs_file = git_path_submodule(refs->name, "packed-refs"); else @@ -893,7 +909,8 @@ static void read_loose_refs(const char *dirname, struct ref_dir *dir) } else if (S_ISDIR(st.st_mode)) { strbuf_addch(&refname, '/'); add_entry_to_dir(dir, - create_dir_entry(refs, refname.buf, 1)); + create_dir_entry(refs, refname.buf, + refname.len, 1)); } else { if (*refs->name) { hashclr(sha1); @@ -923,12 +940,12 @@ static struct ref_dir *get_loose_refs(struct ref_cache *refs) * are about to read the only subdirectory that can * hold references: */ - refs->loose = create_dir_entry(refs, "", 0); + refs->loose = create_dir_entry(refs, "", 0, 0); /* * Create an incomplete entry for "refs/": */ add_entry_to_dir(get_ref_dir(refs->loose), - create_dir_entry(refs, "refs/", 1)); + create_dir_entry(refs, "refs/", 5, 1)); } return get_ref_dir(refs->loose); } @@ -7,6 +7,7 @@ #include "dir.h" #include "tag.h" #include "string-list.h" +#include "mergesort.h" enum map_direction { FROM_SRC, FROM_DST }; @@ -918,6 +919,27 @@ void free_refs(struct ref *ref) } } +int ref_compare_name(const void *va, const void *vb) +{ + const struct ref *a = va, *b = vb; + return strcmp(a->name, b->name); +} + +static void *ref_list_get_next(const void *a) +{ + return ((const struct ref *)a)->next; +} + +static void ref_list_set_next(void *a, void *next) +{ + ((struct ref *)a)->next = next; +} + +void sort_ref_list(struct ref **l, int (*cmp)(const void *, const void *)) +{ + *l = llist_mergesort(*l, ref_list_get_next, ref_list_set_next, cmp); +} + static int count_refspec_match(const char *pattern, struct ref *refs, struct ref **matched_ref) @@ -72,6 +72,8 @@ extern const struct refspec *tag_refspec; struct ref *alloc_ref(const char *name); struct ref *copy_ref(const struct ref *ref); struct ref *copy_ref_list(const struct ref *ref); +void sort_ref_list(struct ref **, int (*cmp)(const void *, const void *)); +int ref_compare_name(const void *, const void *); int check_ref_type(const struct ref *ref, int flags); diff --git a/sequencer.c b/sequencer.c index 3c384b94d2..bf078f274b 100644 --- a/sequencer.c +++ b/sequencer.c @@ -291,7 +291,8 @@ static int is_index_unchanged(void) * If we are revert, or if our cherry-pick results in a hand merge, * we had better say that the current user is responsible for that. */ -static int run_git_commit(const char *defmsg, struct replay_opts *opts) +static int run_git_commit(const char *defmsg, struct replay_opts *opts, + int allow_empty) { struct argv_array array; int rc; @@ -307,7 +308,7 @@ static int run_git_commit(const char *defmsg, struct replay_opts *opts) argv_array_push(&array, defmsg); } - if (opts->allow_empty) + if (allow_empty) argv_array_push(&array, "--allow-empty"); rc = run_command_v_opt(array.argv, RUN_GIT_CMD); @@ -335,6 +336,44 @@ static int is_original_commit_empty(struct commit *commit) return !hashcmp(ptree_sha1, commit->tree->object.sha1); } +/* + * Do we run "git commit" with "--allow-empty"? + */ +static int allow_empty(struct replay_opts *opts, struct commit *commit) +{ + int index_unchanged, empty_commit; + + /* + * Three cases: + * + * (1) we do not allow empty at all and error out. + * + * (2) we allow ones that were initially empty, but + * forbid the ones that become empty; + * + * (3) we allow both. + */ + if (!opts->allow_empty) + return 0; /* let "git commit" barf as necessary */ + + index_unchanged = is_index_unchanged(); + if (index_unchanged < 0) + return index_unchanged; + if (!index_unchanged) + return 0; /* we do not have to say --allow-empty */ + + if (opts->keep_redundant_commits) + return 1; + + empty_commit = is_original_commit_empty(commit); + if (empty_commit < 0) + return empty_commit; + if (!empty_commit) + return 0; + else + return 1; +} + static int do_pick_commit(struct commit *commit, struct replay_opts *opts) { unsigned char head[20]; @@ -344,8 +383,6 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) char *defmsg = NULL; struct strbuf msgbuf = STRBUF_INIT; int res; - int empty_commit; - int index_unchanged; if (opts->no_commit) { /* @@ -471,10 +508,6 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) free_commit_list(remotes); } - empty_commit = is_original_commit_empty(commit); - if (empty_commit < 0) - return empty_commit; - /* * If the merge was clean or if it failed due to conflict, we write * CHERRY_PICK_HEAD for the subsequent invocation of commit to use. @@ -495,27 +528,11 @@ static int do_pick_commit(struct commit *commit, struct replay_opts *opts) print_advice(res == 1, opts); rerere(opts->allow_rerere_auto); } else { - index_unchanged = is_index_unchanged(); - /* - * If index_unchanged is less than 0, that indicates we either - * couldn't parse HEAD or the index, so error out here. - */ - if (index_unchanged < 0) - return index_unchanged; - - if (!empty_commit && !opts->keep_redundant_commits && index_unchanged) - /* - * The head tree and the index match - * meaning the commit is empty. Since it wasn't created - * empty (based on the previous test), we can conclude - * the commit has been made redundant. Since we don't - * want to keep redundant commits, we can just return - * here, skipping this commit - */ - return 0; - + int allow = allow_empty(opts, commit); + if (allow < 0) + return allow; if (!opts->no_commit) - res = run_git_commit(defmsg, opts); + res = run_git_commit(defmsg, opts, allow); } free_message(&msg); diff --git a/streaming.c b/streaming.c index 3a3cd1206a..4d978e54e4 100644 --- a/streaming.c +++ b/streaming.c @@ -121,7 +121,7 @@ static enum input_source istream_source(const unsigned char *sha1, case OI_LOOSE: return loose; case OI_PACKED: - if (!oi->u.packed.is_delta && big_file_threshold <= size) + if (!oi->u.packed.is_delta && big_file_threshold < size) return pack_non_delta; /* fallthru */ default: diff --git a/t/t3406-rebase-message.sh b/t/t3406-rebase-message.sh index fe5f936988..6898377910 100755 --- a/t/t3406-rebase-message.sh +++ b/t/t3406-rebase-message.sh @@ -62,4 +62,9 @@ test_expect_success 'rebase -n overrides config rebase.stat config' ' ! grep "^ fileX | *1 +$" diffstat.txt ' +test_expect_success 'rebase --onto outputs the invalid ref' ' + test_must_fail git rebase --onto invalid-ref HEAD HEAD 2>err && + grep "invalid-ref" err +' + test_done diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index 92f00cdf84..5a1340cee6 100755 --- a/t/t3505-cherry-pick-empty.sh +++ b/t/t3505-cherry-pick-empty.sh @@ -71,4 +71,34 @@ test_expect_success 'cherry pick with --keep-redundant-commits' ' git cherry-pick --keep-redundant-commits HEAD^ ' +test_expect_success 'cherry-pick a commit that becomes no-op (prep)' ' + git checkout master && + git branch fork && + echo foo >file2 && + git add file2 && + test_tick && + git commit -m "add file2 on master" && + + git checkout fork && + echo foo >file2 && + git add file2 && + test_tick && + git commit -m "add file2 on the side" +' + +test_expect_success 'cherry-pick a no-op without --keep-redundant' ' + git reset --hard && + git checkout fork^0 && + test_must_fail git cherry-pick master +' + +test_expect_success 'cherry-pick a no-op with --keep-redundant' ' + git reset --hard && + git checkout fork^0 && + git cherry-pick --keep-redundant-commits master && + git show -s --format='%s' >actual && + echo "add file2 on master" >expect && + test_cmp expect actual +' + test_done diff --git a/t/t3510-cherry-pick-sequence.sh b/t/t3510-cherry-pick-sequence.sh index 97f3710700..f4e6450d6a 100755 --- a/t/t3510-cherry-pick-sequence.sh +++ b/t/t3510-cherry-pick-sequence.sh @@ -31,7 +31,7 @@ test_cmp_rev () { } test_expect_success setup ' - git config advice.detachedhead false + git config advice.detachedhead false && echo unrelated >unrelated && git add unrelated && test_commit initial foo a && diff --git a/t/t4012-diff-binary.sh b/t/t4012-diff-binary.sh index 8b4e80de96..6cebb3951b 100755 --- a/t/t4012-diff-binary.sh +++ b/t/t4012-diff-binary.sh @@ -36,6 +36,18 @@ test_expect_success '"apply --stat" output for binary file change' ' test_i18ncmp expected current ' +test_expect_success 'diff --shortstat output for binary file change' ' + echo " 4 files changed, 2 insertions(+), 2 deletions(-)" >expected && + git diff --shortstat >current && + test_i18ncmp expected current +' + +test_expect_success 'diff --shortstat output for binary file change only' ' + echo " 1 file changed, 0 insertions(+), 0 deletions(-)" >expected && + git diff --shortstat -- b >current && + test_i18ncmp expected current +' + test_expect_success 'apply --numstat notices binary file change' ' git diff >diff && git apply --numstat <diff >current && diff --git a/t/t5701-clone-local.sh b/t/t5701-clone-local.sh index 6972258b27..7ff6e0e16c 100755 --- a/t/t5701-clone-local.sh +++ b/t/t5701-clone-local.sh @@ -3,7 +3,10 @@ test_description='test local clone' . ./test-lib.sh -D=`pwd` +repo_is_hardlinked() { + find "$1/objects" -type f -links 1 >output && + test_line_count = 0 output +} test_expect_success 'preparing origin repository' ' : >file && git add . && git commit -m1 && @@ -19,105 +22,72 @@ test_expect_success 'preparing origin repository' ' ' test_expect_success 'local clone without .git suffix' ' - cd "$D" && git clone -l -s a b && - cd b && + (cd b && test "$(GIT_CONFIG=.git/config git config --bool core.bare)" = false && - git fetch + git fetch) ' test_expect_success 'local clone with .git suffix' ' - cd "$D" && git clone -l -s a.git c && - cd c && - git fetch + (cd c && git fetch) ' test_expect_success 'local clone from x' ' - cd "$D" && git clone -l -s x y && - cd y && - git fetch + (cd y && git fetch) ' test_expect_success 'local clone from x.git that does not exist' ' - cd "$D" && - if git clone -l -s x.git z - then - echo "Oops, should have failed" - false - else - echo happy - fi + test_must_fail git clone -l -s x.git z ' test_expect_success 'With -no-hardlinks, local will make a copy' ' - cd "$D" && git clone --bare --no-hardlinks x w && - cd w && - linked=$(find objects -type f ! -links 1 | wc -l) && - test 0 = $linked + ! repo_is_hardlinked w ' test_expect_success 'Even without -l, local will make a hardlink' ' - cd "$D" && rm -fr w && git clone -l --bare x w && - cd w && - copied=$(find objects -type f -links 1 | wc -l) && - test 0 = $copied + repo_is_hardlinked w ' test_expect_success 'local clone of repo with nonexistent ref in HEAD' ' - cd "$D" && echo "ref: refs/heads/nonexistent" > a.git/HEAD && git clone a d && - cd d && + (cd d && git fetch && - test ! -e .git/refs/remotes/origin/HEAD' + test ! -e .git/refs/remotes/origin/HEAD) +' test_expect_success 'bundle clone without .bundle suffix' ' - cd "$D" && git clone dir/b3 && - cd b3 && - git fetch + (cd b3 && git fetch) ' test_expect_success 'bundle clone with .bundle suffix' ' - cd "$D" && git clone b1.bundle && - cd b1 && - git fetch + (cd b1 && git fetch) ' test_expect_success 'bundle clone from b4' ' - cd "$D" && git clone b4 bdl && - cd bdl && - git fetch + (cd bdl && git fetch) ' test_expect_success 'bundle clone from b4.bundle that does not exist' ' - cd "$D" && - if git clone b4.bundle bb - then - echo "Oops, should have failed" - false - else - echo happy - fi + test_must_fail git clone b4.bundle bb ' test_expect_success 'bundle clone with nonexistent HEAD' ' - cd "$D" && git clone b2.bundle b2 && - cd b2 && + (cd b2 && git fetch && - test ! -e .git/refs/heads/master + test_must_fail git rev-parse --verify refs/heads/master) ' test_expect_success 'clone empty repository' ' - cd "$D" && mkdir empty && (cd empty && git init && @@ -135,7 +105,6 @@ test_expect_success 'clone empty repository' ' ' test_expect_success 'clone empty repository, and then push should not segfault.' ' - cd "$D" && rm -fr empty/ empty-clone/ && mkdir empty && (cd empty && git init) && @@ -145,16 +114,24 @@ test_expect_success 'clone empty repository, and then push should not segfault.' ' test_expect_success 'cloning non-existent directory fails' ' - cd "$D" && rm -rf does-not-exist && test_must_fail git clone does-not-exist ' test_expect_success 'cloning non-git directory fails' ' - cd "$D" && rm -rf not-a-git-repo not-a-git-repo-clone && mkdir not-a-git-repo && test_must_fail git clone not-a-git-repo not-a-git-repo-clone ' +test_expect_success 'cloning file:// does not hardlink' ' + git clone --bare file://"$(pwd)"/a non-local && + ! repo_is_hardlinked non-local +' + +test_expect_success 'cloning a local path with --no-local does not hardlink' ' + git clone --bare --no-local a force-nonlocal && + ! repo_is_hardlinked force-nonlocal +' + test_done diff --git a/t/t6200-fmt-merge-msg.sh b/t/t6200-fmt-merge-msg.sh index 9b50f54cc2..992c2a0467 100755 --- a/t/t6200-fmt-merge-msg.sh +++ b/t/t6200-fmt-merge-msg.sh @@ -102,8 +102,8 @@ test_expect_success '[merge] summary/log configuration' ' cat >expected <<-EOF && Merge branch ${apos}left${apos} - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: Left #5 Left #4 @@ -149,8 +149,8 @@ test_expect_success 'merge.log=3 limits shortlog length' ' cat >expected <<-EOF && Merge branch ${apos}left${apos} - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: (5 commits) Left #5 Left #4 @@ -166,8 +166,8 @@ test_expect_success 'merge.log=5 shows all 5 commits' ' cat >expected <<-EOF && Merge branch ${apos}left${apos} - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: Left #5 Left #4 @@ -190,8 +190,8 @@ test_expect_success '--log=3 limits shortlog length' ' cat >expected <<-EOF && Merge branch ${apos}left${apos} - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: (5 commits) Left #5 Left #4 @@ -207,8 +207,8 @@ test_expect_success '--log=5 shows all 5 commits' ' cat >expected <<-EOF && Merge branch ${apos}left${apos} - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: Left #5 Left #4 @@ -238,8 +238,8 @@ test_expect_success 'fmt-merge-msg -m' ' cat >expected.log <<-EOF && Sync with left - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * ${apos}left${apos} of $(pwd): Left #5 Left #4 @@ -271,8 +271,8 @@ test_expect_success 'setup: expected shortlog for two branches' ' cat >expected <<-EOF Merge branches ${apos}left${apos} and ${apos}right${apos} - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: Left #5 Left #4 @@ -396,8 +396,8 @@ test_expect_success 'merge-msg two tags' ' Common #2 Common #1 - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * tag ${apos}tag-l5${apos}: Left #5 Left #4 @@ -426,8 +426,8 @@ test_expect_success 'merge-msg tag and branch' ' Common #2 Common #1 - By Another Author (3) and A U Thor (2) - via Another Committer + # By Another Author (3) and A U Thor (2) + # Via Another Committer * left: Left #5 Left #4 diff --git a/t/t9501-gitweb-standalone-http-status.sh b/t/t9501-gitweb-standalone-http-status.sh index fa2f65f6be..ef86948d21 100755 --- a/t/t9501-gitweb-standalone-http-status.sh +++ b/t/t9501-gitweb-standalone-http-status.sh @@ -12,6 +12,13 @@ code and message.' . ./gitweb-lib.sh +# +# Gitweb only provides the functionality tested by the 'modification times' +# tests if it can access a date parser from one of these modules: +# +perl -MHTTP::Date -e 0 >/dev/null 2>&1 && test_set_prereq DATE_PARSER +perl -MTime::ParseDate -e 0 >/dev/null 2>&1 && test_set_prereq DATE_PARSER + # ---------------------------------------------------------------------- # snapshot settings @@ -115,14 +122,14 @@ test_debug 'cat gitweb.output' # ---------------------------------------------------------------------- # modification times (Last-Modified and If-Modified-Since) -test_expect_success 'modification: feed last-modified' ' +test_expect_success DATE_PARSER 'modification: feed last-modified' ' gitweb_run "p=.git;a=atom;h=master" && grep "Status: 200 OK" gitweb.headers && grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers ' test_debug 'cat gitweb.headers' -test_expect_success 'modification: feed if-modified-since (modified)' ' +test_expect_success DATE_PARSER 'modification: feed if-modified-since (modified)' ' export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && gitweb_run "p=.git;a=atom;h=master" && @@ -130,7 +137,7 @@ test_expect_success 'modification: feed if-modified-since (modified)' ' ' test_debug 'cat gitweb.headers' -test_expect_success 'modification: feed if-modified-since (unmodified)' ' +test_expect_success DATE_PARSER 'modification: feed if-modified-since (unmodified)' ' export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && gitweb_run "p=.git;a=atom;h=master" && @@ -138,14 +145,14 @@ test_expect_success 'modification: feed if-modified-since (unmodified)' ' ' test_debug 'cat gitweb.headers' -test_expect_success 'modification: snapshot last-modified' ' +test_expect_success DATE_PARSER 'modification: snapshot last-modified' ' gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && grep "Status: 200 OK" gitweb.headers && grep "Last-modified: Thu, 7 Apr 2005 22:14:13 +0000" gitweb.headers ' test_debug 'cat gitweb.headers' -test_expect_success 'modification: snapshot if-modified-since (modified)' ' +test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (modified)' ' export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && @@ -153,7 +160,7 @@ test_expect_success 'modification: snapshot if-modified-since (modified)' ' ' test_debug 'cat gitweb.headers' -test_expect_success 'modification: snapshot if-modified-since (unmodified)' ' +test_expect_success DATE_PARSER 'modification: snapshot if-modified-since (unmodified)' ' export HTTP_IF_MODIFIED_SINCE="Thu, 7 Apr 2005 22:14:13 +0000" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && gitweb_run "p=.git;a=snapshot;h=master;sf=tgz" && @@ -161,7 +168,7 @@ test_expect_success 'modification: snapshot if-modified-since (unmodified)' ' ' test_debug 'cat gitweb.headers' -test_expect_success 'modification: tree snapshot' ' +test_expect_success DATE_PARSER 'modification: tree snapshot' ' ID=`git rev-parse --verify HEAD^{tree}` && export HTTP_IF_MODIFIED_SINCE="Wed, 6 Apr 2005 22:14:13 +0000" && test_when_finished "unset HTTP_IF_MODIFIED_SINCE" && diff --git a/t/t9801-git-p4-branch.sh b/t/t9801-git-p4-branch.sh index 2859256de3..99fe16b72d 100755 --- a/t/t9801-git-p4-branch.sh +++ b/t/t9801-git-p4-branch.sh @@ -218,7 +218,7 @@ test_expect_success 'git p4 clone simple branches' ' cd branch1 && p4 edit file2 && echo file2_ >>file2 && - p4 submit -d "update file2 in branch3" && + p4 submit -d "update file2 in branch1" && cd "$git" && git reset --hard p4/depot/branch1 && git p4 rebase && @@ -249,8 +249,6 @@ test_expect_success 'git p4 clone simple branches' ' # `- file2 # `- file3 test_expect_success 'git p4 add complex branches' ' - test_when_finished cleanup_git && - test_create_repo "$git" && ( cd "$cli" && changelist=$(p4 changes -m1 //depot/... | cut -d" " -f2) && @@ -306,6 +304,112 @@ test_expect_success 'git p4 clone complex branches' ' ) ' +# Move branch3/file3 to branch4/file3 in a single changelist +test_expect_success 'git p4 submit to two branches in a single changelist' ' + ( + cd "$cli" && + p4 integrate //depot/branch3/file3 //depot/branch4/file3 && + p4 delete //depot/branch3/file3 && + p4 submit -d "Move branch3/file3 to branch4/file3" + ) +' + +# Confirm that changes to two branches done in a single changelist +# are correctly imported by git p4 +test_expect_success 'git p4 sync changes to two branches in the same changelist' ' + test_when_finished cleanup_git && + test_create_repo "$git" && + ( + cd "$git" && + git config git-p4.branchList branch1:branch2 && + git config --add git-p4.branchList branch1:branch3 && + git config --add git-p4.branchList branch1:branch4 && + git config --add git-p4.branchList branch1:branch5 && + git p4 clone --dest=. --detect-branches //depot@all && + git log --all --graph --decorate --stat && + git reset --hard p4/depot/branch1 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_file file3 && + grep update file2 && + git reset --hard p4/depot/branch2 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_missing file3 && + ! grep update file2 && + git reset --hard p4/depot/branch3 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_missing file3 && + grep update file2 && + git reset --hard p4/depot/branch4 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_file file3 && + ! grep update file2 && + git reset --hard p4/depot/branch5 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_file file3 && + ! grep update file2 && + test_path_is_missing .git/git-p4-tmp + ) +' + +# Create a branch by integrating a single file +test_expect_success 'git p4 file subset branch' ' + ( + cd "$cli" && + p4 integrate //depot/branch1/file1 //depot/branch6/file1 && + p4 submit -d "Integrate file1 alone from branch1 to branch6" + ) +' + +# Check if git p4 creates a new branch containing a single file, +# instead of keeping the old files from the original branch +test_expect_failure 'git p4 clone file subset branch' ' + test_when_finished cleanup_git && + test_create_repo "$git" && + ( + cd "$git" && + git config git-p4.branchList branch1:branch2 && + git config --add git-p4.branchList branch1:branch3 && + git config --add git-p4.branchList branch1:branch4 && + git config --add git-p4.branchList branch1:branch5 && + git config --add git-p4.branchList branch1:branch6 && + git p4 clone --dest=. --detect-branches //depot@all && + git log --all --graph --decorate --stat && + git reset --hard p4/depot/branch1 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_file file3 && + grep update file2 && + git reset --hard p4/depot/branch2 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_missing file3 && + ! grep update file2 && + git reset --hard p4/depot/branch3 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_missing file3 && + grep update file2 && + git reset --hard p4/depot/branch4 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_file file3 && + ! grep update file2 && + git reset --hard p4/depot/branch5 && + test_path_is_file file1 && + test_path_is_file file2 && + test_path_is_file file3 && + ! grep update file2 && + git reset --hard p4/depot/branch6 && + test_path_is_file file1 && + test_path_is_missing file2 && + test_path_is_missing file3 + ) +' test_expect_success 'kill p4d' ' kill_p4d ' diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 9a80c60945..256e6a0b3f 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -63,7 +63,7 @@ run_completion () local _cword _words=( $1 ) (( _cword = ${#_words[@]} - 1 )) - __git_wrap_main_git && print_comp + __git_wrap__git_main && print_comp } test_completion () diff --git a/unpack-trees.c b/unpack-trees.c index ad40109432..33a581924e 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1023,6 +1023,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options o->el = ⪙ } + if (o->dir) { + o->path_exclude_check = xmalloc(sizeof(struct path_exclude_check)); + path_exclude_check_init(o->path_exclude_check, o->dir); + } memset(&o->result, 0, sizeof(o->result)); o->result.initialized = 1; o->result.timestamp.sec = o->src_index->timestamp.sec; @@ -1148,6 +1152,10 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options done: free_excludes(&el); + if (o->path_exclude_check) { + path_exclude_check_clear(o->path_exclude_check); + free(o->path_exclude_check); + } return ret; return_failed: @@ -1363,7 +1371,8 @@ static int check_ok_to_remove(const char *name, int len, int dtype, if (ignore_case && icase_exists(o, name, len, st)) return 0; - if (o->dir && excluded(o->dir, name, &dtype)) + if (o->dir && + path_excluded(o->path_exclude_check, name, -1, &dtype)) /* * ce->name is explicitly excluded, so it is Ok to * overwrite it. diff --git a/unpack-trees.h b/unpack-trees.h index 5e432f576e..ec74a9f19a 100644 --- a/unpack-trees.h +++ b/unpack-trees.h @@ -52,6 +52,7 @@ struct unpack_trees_options { const char *prefix; int cache_bottom; struct dir_struct *dir; + struct path_exclude_check *path_exclude_check; struct pathspec *pathspec; merge_fn_t fn; const char *msgs[NB_UNPACK_TREES_ERROR_TYPES]; diff --git a/version.c b/version.c new file mode 100644 index 0000000000..f98d5a654d --- /dev/null +++ b/version.c @@ -0,0 +1,17 @@ +#include "git-compat-util.h" +#include "version.h" + +const char git_version_string[] = GIT_VERSION; + +const char *git_user_agent(void) +{ + static const char *agent = NULL; + + if (!agent) { + agent = getenv("GIT_USER_AGENT"); + if (!agent) + agent = GIT_USER_AGENT; + } + + return agent; +} diff --git a/version.h b/version.h new file mode 100644 index 0000000000..fd9cdd6316 --- /dev/null +++ b/version.h @@ -0,0 +1,8 @@ +#ifndef VERSION_H +#define VERSION_H + +extern const char git_version_string[]; + +const char *git_user_agent(void); + +#endif /* VERSION_H */ @@ -402,3 +402,15 @@ int remove_or_warn(unsigned int mode, const char *file) { return S_ISGITLINK(mode) ? rmdir_or_warn(file) : unlink_or_warn(file); } + +struct passwd *xgetpwuid_self(void) +{ + struct passwd *pw; + + errno = 0; + pw = getpwuid(getuid()); + if (!pw) + die(_("unable to look up current user in the passwd file: %s"), + errno ? strerror(errno) : _("no such user")); + return pw; +} |