diff options
446 files changed, 22150 insertions, 11536 deletions
diff --git a/.gitignore b/.gitignore index aa258a6bcf..6669bf0c6c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,7 @@ /git-bundle /git-cat-file /git-check-attr +/git-check-ignore /git-check-ref-format /git-checkout /git-checkout-index diff --git a/Documentation/.gitignore b/Documentation/.gitignore index d62aebd848..2c8b2d612e 100644 --- a/Documentation/.gitignore +++ b/Documentation/.gitignore @@ -9,4 +9,5 @@ gitman.info howto-index.txt doc.dep cmds-*.txt +mergetools-*.txt manpage-base-url.xsl diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines index 69f7e9b76c..b1bfff630f 100644 --- a/Documentation/CodingGuidelines +++ b/Documentation/CodingGuidelines @@ -1,5 +1,5 @@ Like other projects, we also have some guidelines to keep to the -code. For git in general, three rough rules are: +code. For Git in general, three rough rules are: - Most importantly, we never say "It's in POSIX; we'll happily ignore your needs should your system not conform to it." @@ -18,11 +18,12 @@ code. For git in general, three rough rules are: judgement call, the decision based more on real world constraints people face than what the paper standard says. +Make your code readable and sensible, and don't try to be clever. As for more concrete guidelines, just imitate the existing code (this is a good guideline, no matter which project you are contributing to). It is always preferable to match the _local_ -convention. New code added to git suite is expected to match +convention. New code added to Git suite is expected to match the overall style of existing code. Modifications to existing code is expected to match the style the surrounding code already uses (even if it doesn't match the overall style of existing code). @@ -112,7 +113,7 @@ For C programs: - We try to keep to at most 80 characters per line. - - We try to support a wide range of C compilers to compile git with, + - We try to support a wide range of C compilers to compile Git with, including old ones. That means that you should not use C99 initializers, even if a lot of compilers grok it. @@ -164,14 +165,14 @@ For C programs: - If you are planning a new command, consider writing it in shell or perl first, so that changes in semantics can be easily - changed and discussed. Many git commands started out like + changed and discussed. Many Git commands started out like that, and a few are still scripts. - - Avoid introducing a new dependency into git. This means you + - Avoid introducing a new dependency into Git. This means you usually should stay away from scripting languages not already - used in the git core command set (unless your command is clearly + used in the Git core command set (unless your command is clearly separate from it, such as an importer to convert random-scm-X - repositories to git). + repositories to Git). - When we pass <string, length> pair to functions, we should try to pass them in that order. @@ -179,6 +180,61 @@ For C programs: - Use Git's gettext wrappers to make the user interface translatable. See "Marking strings for translation" in po/README. +For Perl programs: + + - Most of the C guidelines above apply. + + - We try to support Perl 5.8 and later ("use Perl 5.008"). + + - use strict and use warnings are strongly preferred. + + - Don't overuse statement modifiers unless using them makes the + result easier to follow. + + ... do something ... + do_this() unless (condition); + ... do something else ... + + is more readable than: + + ... do something ... + unless (condition) { + do_this(); + } + ... do something else ... + + *only* when the condition is so rare that do_this() will be almost + always called. + + - We try to avoid assignments inside "if ()" conditions. + + - Learn and use Git.pm if you need that functionality. + + - For Emacs, it's useful to put the following in + GIT_CHECKOUT/.dir-locals.el, assuming you use cperl-mode: + + ;; note the first part is useful for C editing, too + ((nil . ((indent-tabs-mode . t) + (tab-width . 8) + (fill-column . 80))) + (cperl-mode . ((cperl-indent-level . 8) + (cperl-extra-newline-before-brace . nil) + (cperl-merge-trailing-else . t)))) + +For Python scripts: + + - We follow PEP-8 (http://www.python.org/dev/peps/pep-0008/). + + - As a minimum, we aim to be compatible with Python 2.6 and 2.7. + + - Where required libraries do not restrict us to Python 2, we try to + also be compatible with Python 3.1 and later. + + - When you must differentiate between Unicode literals and byte string + literals, it is OK to use the 'b' prefix. Even though the Python + documentation for version 2.6 does not mention this prefix, it has + been supported since version 2.6.0. + Writing Documentation: Every user-visible change should be reflected in the documentation. @@ -230,3 +286,8 @@ Writing Documentation: valid usage. "*" has its own pair of brackets, because it can (optionally) be specified only when one or more of the letters is also provided. + + A note on notation: + Use 'git' (all lowercase) when talking about commands i.e. something + the user would type into a shell and use 'Git' (uppercase first letter) + when talking about the version control system and its properties. diff --git a/Documentation/Makefile b/Documentation/Makefile index 971977b8aa..62dbd9ac7c 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,19 +1,41 @@ -MAN1_TXT= \ - $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ - $(wildcard git-*.txt)) \ - gitk.txt gitweb.txt git.txt -MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \ - gitrepository-layout.txt gitweb.conf.txt -MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \ - gitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \ - gitdiffcore.txt gitnamespaces.txt gitrevisions.txt gitworkflows.txt +# Guard against environment variables +MAN1_TXT = +MAN5_TXT = +MAN7_TXT = + +MAN1_TXT += $(filter-out \ + $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \ + $(wildcard git-*.txt)) +MAN1_TXT += git.txt +MAN1_TXT += gitk.txt +MAN1_TXT += gitremote-helpers.txt +MAN1_TXT += gitweb.txt + +MAN5_TXT += gitattributes.txt +MAN5_TXT += githooks.txt +MAN5_TXT += gitignore.txt +MAN5_TXT += gitmodules.txt +MAN5_TXT += gitrepository-layout.txt +MAN5_TXT += gitweb.conf.txt + +MAN7_TXT += gitcli.txt +MAN7_TXT += gitcore-tutorial.txt MAN7_TXT += gitcredentials.txt +MAN7_TXT += gitcvs-migration.txt +MAN7_TXT += gitdiffcore.txt +MAN7_TXT += gitglossary.txt +MAN7_TXT += gitnamespaces.txt +MAN7_TXT += gitrevisions.txt +MAN7_TXT += gittutorial-2.txt +MAN7_TXT += gittutorial.txt +MAN7_TXT += gitworkflows.txt MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT) MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT)) MAN_HTML=$(patsubst %.txt,%.html,$(MAN_TXT)) -DOC_HTML=$(MAN_HTML) +OBSOLETE_HTML = git-remote-helpers.html +DOC_HTML=$(MAN_HTML) $(OBSOLETE_HTML) ARTICLES = howto-index ARTICLES += everyday @@ -222,7 +244,11 @@ install-html: html # # Determine "include::" file references in asciidoc files. # -doc.dep : $(wildcard *.txt) build-docdep.perl +docdep_prereqs = \ + mergetools-list.made $(mergetools_txt) \ + cmd-list.made $(cmds_txt) + +doc.dep : $(docdep_prereqs) $(wildcard *.txt) build-docdep.perl $(QUIET_GEN)$(RM) $@+ $@ && \ $(PERL_PATH) ./build-docdep.perl >$@+ $(QUIET_STDERR) && \ mv $@+ $@ @@ -246,13 +272,27 @@ cmd-list.made: cmd-list.perl ../command-list.txt $(MAN1_TXT) $(PERL_PATH) ./cmd-list.perl ../command-list.txt $(QUIET_STDERR) && \ date >$@ +mergetools_txt = mergetools-diff.txt mergetools-merge.txt + +$(mergetools_txt): mergetools-list.made + +mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*) + $(QUIET_GEN)$(RM) $@ && \ + $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ + . ../git-mergetool--lib.sh && \ + show_tool_names can_diff "* " || :' >mergetools-diff.txt && \ + $(SHELL_PATH) -c 'MERGE_TOOLS_DIR=../mergetools && \ + . ../git-mergetool--lib.sh && \ + show_tool_names can_merge "* " || :' >mergetools-merge.txt && \ + date >$@ + clean: $(RM) *.xml *.xml+ *.html *.html+ *.1 *.5 *.7 $(RM) *.texi *.texi+ *.texi++ git.info gitman.info $(RM) *.pdf $(RM) howto-index.txt howto/*.html doc.dep $(RM) technical/*.html technical/api-index.txt - $(RM) $(cmds_txt) *.made + $(RM) $(cmds_txt) $(mergetools_txt) *.made $(RM) manpage-base-url.xsl $(MAN_HTML): %.html : %.txt asciidoc.conf @@ -261,6 +301,12 @@ $(MAN_HTML): %.html : %.txt asciidoc.conf $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \ mv $@+ $@ +$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf + $(QUIET_ASCIIDOC)$(RM) $@+ $@ && \ + $(ASCIIDOC) -b xhtml11 -f asciidoc.conf \ + $(ASCIIDOC_EXTRA) -agit_version=$(GIT_VERSION) -o $@+ $< && \ + mv $@+ $@ + manpage-base-url.xsl: manpage-base-url.xsl.in sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@ @@ -346,8 +392,8 @@ $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt install-webdoc : html '$(SHELL_PATH_SQ)' ./install-webdoc.sh $(WEBDOC_DEST) -# You must have a clone of git-htmldocs and git-manpages repositories -# next to the git repository itself for the following to work. +# You must have a clone of 'git-htmldocs' and 'git-manpages' repositories +# next to the 'git' repository itself for the following to work. quick-install: quick-install-man diff --git a/Documentation/RelNotes/1.8.1.1.txt b/Documentation/RelNotes/1.8.1.1.txt index 0dc37dcdd4..6cde07ba29 100644 --- a/Documentation/RelNotes/1.8.1.1.txt +++ b/Documentation/RelNotes/1.8.1.1.txt @@ -4,15 +4,56 @@ Git 1.8.1.1 Release Notes Fixes since v1.8.1 ------------------ + * The attribute mechanism didn't allow limiting attributes to be + applied to only a single directory itself with "path/" like the + exclude mechanism does. + + * When attempting to read the XDG-style $HOME/.config/git/config and + finding that $HOME/.config/git is a file, we gave a wrong error + message, instead of treating the case as "a custom config file does + not exist there" and moving on. + * After failing to create a temporary file using mkstemp(), failing pathname was not reported correctly on some platforms. * http transport was wrong to ask for the username when the authentication is done by certificate identity. + * The behaviour visible to the end users was confusing, when they + attempt to kill a process spawned in the editor that was in turn + launched by Git with SIGINT (or SIGQUIT), as Git would catch that + signal and die. We ignore these signals now. + + * A child process that was killed by a signal (e.g. SIGINT) was + reported in an inconsistent way depending on how the process was + spawned by us, with or without a shell in between. + * After "git add -N" and then writing a tree object out of the index, the cache-tree data structure got corrupted. + * "git apply" misbehaved when fixing whitespace breakages by removing + excess trailing blank lines in some corner cases. + + * A tar archive created by "git archive" recorded a directory in a + way that made NetBSD's implementation of "tar" sometimes unhappy. + + * When "git clone --separate-git-dir=$over_there" is interrupted, it + failed to remove the real location of the $GIT_DIR it created. + This was most visible when interrupting a submodule update. + + * "git fetch --mirror" and fetch that uses other forms of refspec + with wildcard used to attempt to update a symbolic ref that match + the wildcard on the receiving end, which made little sense (the + real ref that is pointed at by the symbolic ref would be updated + anyway). Symbolic refs no longer are affected by such a fetch. + + * The "log --graph" codepath fell into infinite loop in some + corner cases. + + * "git merge" started calling prepare-commit-msg hook like "git + commit" does some time ago, but forgot to pay attention to the exit + status of the hook. + * "git pack-refs" that ran in parallel to another process that created new refs had a race that can lose new ones. @@ -20,10 +61,20 @@ Fixes since v1.8.1 whose length exactly is the wrap width, "git shortlog -w" failed to add a newline after such a line. + * The way "git svn" asked for password using SSH_ASKPASS and + GIT_ASKPASS was not in line with the rest of the system. + + * "gitweb", when sorting by age to show repositories with new + activities first, used to sort repositories with absolutely + nothing in it early, which was not very useful. + * "gitweb", when sorting by age to show repositories with new activities first, used to sort repositories with absolutely nothing in it early, which was not very useful. + * When autoconf is used, any build on a different commit always ran + "config.status --recheck" even when unnecessary. + * Some scripted programs written in Python did not get updated when PYTHON_PATH changed. diff --git a/Documentation/RelNotes/1.8.1.2.txt b/Documentation/RelNotes/1.8.1.2.txt new file mode 100644 index 0000000000..5ab7b18906 --- /dev/null +++ b/Documentation/RelNotes/1.8.1.2.txt @@ -0,0 +1,25 @@ +Git 1.8.1.2 Release Notes +========================= + +Fixes since v1.8.1.1 +-------------------- + + * An element on GIT_CEILING_DIRECTORIES list that does not name the + real path to a directory (i.e. a symbolic link) could have caused + the GIT_DIR discovery logic to escape the ceiling. + + * Command line completion for "tcsh" emitted an unwanted space + after completing a single directory name. + + * Command line completion leaked an unnecessary error message while + looking for possible matches with paths in <tree-ish>. + + * "git archive" did not record uncompressed size in the header when + streaming a zip archive, which confused some implementations of unzip. + + * When users spelled "cc:" in lowercase in the fake "header" in the + trailer part, "git send-email" failed to pick up the addresses from + there. As e-mail headers field names are case insensitive, this + script should follow suit and treat "cc:" and "Cc:" the same way. + +Also contains various documentation fixes. diff --git a/Documentation/RelNotes/1.8.1.3.txt b/Documentation/RelNotes/1.8.1.3.txt new file mode 100644 index 0000000000..681cb35c0a --- /dev/null +++ b/Documentation/RelNotes/1.8.1.3.txt @@ -0,0 +1,47 @@ +Git 1.8.1.3 Release Notes +========================= + +Fixes since v1.8.1.2 +-------------------- + + * The attribute mechanism didn't allow limiting attributes to be + applied to only a single directory itself with "path/" like the + exclude mechanism does. The fix for this in 1.8.1.2 had + performance degradations. + + * Command line completion code was inadvertently made incompatible with + older versions of bash by using a newer array notation. + + * Scripts to test bash completion was inherently flaky as it was + affected by whatever random things the user may have on $PATH. + + * A fix was added to the build procedure to work around buggy + versions of ccache broke the auto-generation of dependencies, which + unfortunately is still relevant because some people use ancient + distros. + + * We used to stuff "user@" and then append what we read from + /etc/mailname to come up with a default e-mail ident, but a bug + lost the "user@" part. + + * "git am" did not parse datestamp correctly from Hg generated patch, + when it is run in a locale outside C (or en). + + * Attempt to "branch --edit-description" an existing branch, while + being on a detached HEAD, errored out. + + * "git cherry-pick" did not replay a root commit to an unborn branch. + + * We forgot to close the file descriptor reading from "gpg" output, + killing "git log --show-signature" on a long history. + + * "git rebase --preserve-merges" lost empty merges in recent versions + of Git. + + * Rebasing the history of superproject with change in the submodule + has been broken since v1.7.12. + + * A failure to push due to non-ff while on an unborn branch + dereferenced a NULL pointer when showing an error message. + +Also contains various documentation fixes. diff --git a/Documentation/RelNotes/1.8.1.4.txt b/Documentation/RelNotes/1.8.1.4.txt new file mode 100644 index 0000000000..22af1d1643 --- /dev/null +++ b/Documentation/RelNotes/1.8.1.4.txt @@ -0,0 +1,11 @@ +Git 1.8.1.4 Release Notes +========================= + +Fixes since v1.8.1.3 +-------------------- + + * "git imap-send" talking over imaps:// did make sure it received a + valid certificate from the other end, but did not check if the + certificate matched the host it thought it was talking to. + +Also contains various documentation fixes. diff --git a/Documentation/RelNotes/1.8.1.5.txt b/Documentation/RelNotes/1.8.1.5.txt new file mode 100644 index 0000000000..efa68aef22 --- /dev/null +++ b/Documentation/RelNotes/1.8.1.5.txt @@ -0,0 +1,47 @@ +Git 1.8.1.5 Release Notes +========================= + +Fixes since v1.8.1.4 +-------------------- + + * Given a string with a multi-byte character that begins with '-' on + the command line where an option is expected, the option parser + used just one byte of the unknown letter when reporting an error. + + * In v1.8.1, the attribute parser was tightened too restrictive to + error out upon seeing an entry that begins with an ! (exclamation), + which may confuse users to expect a "negative match", which does + not exist. This has been demoted to a warning; such an entry is + still ignored. + + * "git apply --summary" has been taught to make sure the similarity + value shown in its output is sensible, even when the input had a + bogus value. + + * "git clean" showed what it was going to do, but sometimes ended + up finding that it was not allowed to do so, which resulted in a + confusing output (e.g. after saying that it will remove an + untracked directory, it found an embedded git repository there + which it is not allowed to remove). It now performs the actions + and then reports the outcome more faithfully. + + * "git clone" used to allow --bare and --separate-git-dir=$there + options at the same time, which was nonsensical. + + * "git cvsimport" mishandled timestamps at DST boundary. + + * We used to have an arbitrary 32 limit for combined diff input, + resulting in incorrect number of leading colons shown when showing + the "--raw --cc" output. + + * The smart HTTP clients forgot to verify the content-type that comes + back from the server side to make sure that the request is being + handled properly. + + * "git help remote-helpers" failed to find the documentation. + + * "gitweb" pages served over HTTPS, when configured to show picon or + gravatar, referred to these external resources to be fetched via + HTTP, resulting in mixed contents warning in browsers. + +Also contains various documentation fixes. diff --git a/Documentation/RelNotes/1.8.2.1.txt b/Documentation/RelNotes/1.8.2.1.txt new file mode 100644 index 0000000000..23977562a9 --- /dev/null +++ b/Documentation/RelNotes/1.8.2.1.txt @@ -0,0 +1,68 @@ +Git v1.8.2.1 Release Notes +========================== + +Fixes since v1.8.2 +------------------ + + * "git submodule update", when recursed into sub-submodules, did not + acccumulate the prefix paths. + + * "git am $maildir/" applied messages in an unexpected order; sort + filenames read from the maildir/ in a way that is more likely to + sort messages in the order the writing MUA meant to, by sorting + numeric segment in numeric order and non-numeric segment in + alphabetical order. + + * When export-subst is used, "zip" output recorded incorrect + size of the file. + + * Some platforms and users spell UTF-8 differently; retry with the + most official "UTF-8" when the system does not understand the + user-supplied encoding name that are the common alternative + spellings of UTF-8. + + * "git branch" did not bother to check nonsense command line + parameters and issue errors in many cases. + + * "git update-index -h" did not do the usual "-h(elp)" thing. + + * perl/Git.pm::cat_blob slurped everything in core only to write it + out to a file descriptor, which was not a very smart thing to do. + + * The SSL peer verification done by "git imap-send" did not ask for + Server Name Indication (RFC 4366), failing to connect SSL/TLS + sites that serve multiple hostnames on a single IP. + + * "git index-pack" had a buffer-overflow while preparing an + informational message when the translated version of it was too + long. + + * Clarify in the documentation "what" gets pushed to "where" when the + command line to "git push" does not say these explicitly. + + * In "git reflog expire", REACHABLE bit was not cleared from the + correct objects. + + * The "--color=<when>" argument to the commands in the diff family + was described poorly. + + * The arguments given to pre-rebase hook were not documented. + + * The v4 index format was not documented. + + * The "--match=<pattern>" argument "git describe" takes uses glob + pattern but it wasn't obvious from the documentation. + + * Some sources failed to compile on systems that lack NI_MAXHOST in + their system header (e.g. z/OS). + + * Add an example use of "--env-filter" in "filter-branch" + documentation. + + * "git bundle verify" did not say "records a complete history" for a + bundle that does not have any prerequisites. + + * In the v1.8.0 era, we changed symbols that do not have to be global + to file scope static, but a few functions in graph.c were used by + CGit from sideways bypassing the entry points of the API the + in-tree users use. diff --git a/Documentation/RelNotes/1.8.2.txt b/Documentation/RelNotes/1.8.2.txt index a6eb139150..fc606ae116 100644 --- a/Documentation/RelNotes/1.8.2.txt +++ b/Documentation/RelNotes/1.8.2.txt @@ -1,19 +1,51 @@ Git v1.8.2 Release Notes ======================== -Backward compatibility notes ----------------------------- - -In the upcoming major release (tentatively called 1.8.2), we will -change the behavior of the "git push" command. +Backward compatibility notes (this release) +------------------------------------------- + +"git push $there tag v1.2.3" used to allow replacing a tag v1.2.3 +that already exists in the repository $there, if the rewritten tag +you are pushing points at a commit that is a descendant of a commit +that the old tag v1.2.3 points at. This was found to be error prone +and starting with this release, any attempt to update an existing +ref under refs/tags/ hierarchy will fail, without "--force". + +When "git add -u" and "git add -A" that does not specify what paths +to add on the command line is run from inside a subdirectory, the +scope of the operation has always been limited to the subdirectory. +Many users found this counter-intuitive, given that "git commit -a" +and other commands operate on the entire tree regardless of where you +are. In this release, these commands give a warning message that +suggests the users to use "git add -u/-A ." when they want to limit +the scope to the current directory; doing so will squelch the message, +while training their fingers. + + +Backward compatibility notes (for Git 2.0) +------------------------------------------ When "git push [$there]" does not say what to push, we have used the traditional "matching" semantics so far (all your branches were sent to the remote as long as there already are branches of the same name -over there). We will use the "simple" semantics that pushes the -current branch to the branch with the same name, only when the current -branch is set to integrate with that remote branch. There is a user -preference configuration variable "push.default" to change this. +over there). In Git 2.0, the default will change to the "simple" +semantics that pushes the current branch to the branch with the same +name, only when the current branch is set to integrate with that +remote branch. There is a user preference configuration variable +"push.default" to change this. If you are an old-timer who is used +to the "matching" semantics, you can set it to "matching" to keep the +traditional behaviour. If you want to live in the future early, +you can set it to "simple" today without waiting for Git 2.0. + +When "git add -u" and "git add -A", that does not specify what paths +to add on the command line is run from inside a subdirectory, these +commands will operate on the entire tree in Git 2.0 for consistency +with "git commit -a" and other commands. Because there will be no +mechanism to make "git add -u" behave as if "git add -u .", it is +important for those who are used to "git add -u" (without pathspec) +updating the index only for paths in the current subdirectory to start +training their fingers to explicitly say "git add -u ." when they mean +it before Git 2.0 comes. Updates since v1.8.1 @@ -26,6 +58,18 @@ UI, Workflows & Features * Output from the tests is coloured using "green is okay, yellow is questionable, red is bad and blue is informative" scheme. + * Mention of "GIT/Git/git" in the documentation have been updated to + be more uniform and consistent. The name of the system and the + concept it embodies is "Git"; the command the users type is "git". + All-caps "GIT" was merely a way to imitate "Git" typeset in small + caps in our ASCII text only documentation and to be avoided. + + * The completion script (in contrib/completion) used to let the + default completer to suggest pathnames, which gave too many + irrelevant choices (e.g. "git add" would not want to add an + unmodified path). It learnt to use a more git-aware logic to + enumerate only relevant ones. + * In bare repositories, "git shortlog" and other commands now read mailmap files from the tip of the history, to help running these tools in server settings. @@ -38,12 +82,48 @@ UI, Workflows & Features * Scripts can ask Git that wildcard patterns in pathspecs they give do not have any significance, i.e. take them as literal strings. - * The pathspec code learned to grok "foo/**/bar" as a pattern that - matches "bar" in 0-or-more levels of subdirectory in "foo". + * The patterns in .gitignore and .gitattributes files can have **/, + as a pattern that matches 0 or more levels of subdirectory. + E.g. "foo/**/bar" matches "bar" in "foo" itself or in a + subdirectory of "foo". + + * When giving arguments without "--" disambiguation, object names + that come earlier on the command line must not be interpretable as + pathspecs and pathspecs that come later on the command line must + not be interpretable as object names. This disambiguation rule has + been tweaked so that ":/" (no other string before or after) is + always interpreted as a pathspec; "git cmd -- :/" is no longer + needed, you can just say "git cmd :/". + + * Various "hint" lines Git gives when it asks the user to edit + messages in the editor are commented out with '#' by default. The + core.commentchar configuration variable can be used to customize + this '#' to a different character. + + * "git add -u" and "git add -A" without pathspec issues warning to + make users aware that they are only operating on paths inside the + subdirectory they are in. Use ":/" (everything from the top) or + "." (everything from the $cwd) to disambiguate. + + * "git blame" (and "git diff") learned the "--no-follow" option. + + * "git branch" now rejects some nonsense combinations of command line + arguments (e.g. giving more than one branch name to rename) with + more case-specific error messages. + + * "git check-ignore" command to help debugging .gitignore files has + been added. * "git cherry-pick" can be used to replay a root commit to an unborn branch. + * "git commit" can be told to use --cleanup=whitespace by setting the + configuration variable commit.cleanup to 'whitespace'. + + * "git diff" and other Porcelain commands can be told to use a + non-standard algorithm by setting diff.algorithm configuration + variable. + * "git fetch --mirror" and fetch that uses other forms of refspec with wildcard used to attempt to update a symbolic ref that match the wildcard on the receiving end, which made little sense (the @@ -54,19 +134,64 @@ UI, Workflows & Features is being exported, and uses the description for the branch, when asked to write a cover letter for the series. + * "git format-patch" learned "-v $count" option, and prepends a + string "v$count-" to the names of its output files, and also + automatically sets the subject prefix to "PATCH v$count". This + allows patches from rerolled series to be stored under different + names and makes it easier to reuse cover letter messages. + + * "git log" and friends can be told with --use-mailmap option to + rewrite the names and email addresses of people using the mailmap + mechanism. + + * "git log --cc --graph" now shows the combined diff output with the + ancestry graph. + + * "git log --grep=<pattern>" honors i18n.logoutputencoding to look + for the pattern after fixing the log message to the specified + encoding. + + * "git mergetool" and "git difftool" learned to list the available + tool backends in a more consistent manner. + + * "git mergetool" is aware of TortoiseGitMerge now and uses it over + TortoiseMerge when available. + * "git push" now requires "-f" to update a tag, even if it is a fast-forward, as tags are meant to be fixed points. + * Error messages from "git push" when it stops to prevent remote refs + from getting overwritten by mistake have been improved to explain + various situations separately. + + * "git push" will stop without doing anything if the new "pre-push" + hook exists and exits with a failure. + * When "git rebase" fails to generate patches to be applied (e.g. due to oom), it failed to detect the failure and instead behaved as if there were nothing to do. A workaround to use a temporary file has been applied, but we probably would want to revisit this later, as it hurts the common case of not failing at all. + * Input and preconditions to "git reset" has been loosened where + appropriate. "git reset $fromtree Makefile" requires $fromtree to + be any tree (it used to require it to be a commit), for example. + "git reset" (without options or parameters) used to error out when + you do not have any commits in your history, but it now gives you + an empty index (to match non-existent commit you are not even on). + + * "git status" says what branch is being bisected or rebased when + able, not just "bisecting" or "rebasing". + * "git submodule" started learning a new mode to integrate with the tip of the remote branch (as opposed to integrating with the commit recorded in the superproject's gitlink). + * "git upload-pack" which implements the service "ls-remote" and + "fetch" talk to can be told to hide ref hierarchies the server + side internally uses (and that clients have no business learning + about) with transfer.hiderefs configuration. + Foreign Interface @@ -75,6 +200,13 @@ Foreign Interface * A new remote helper to interact with bzr has been added to contrib/. + * "git p4" got various bugfixes around its branch handling. It is + also made usable with Python 2.4/2.5. In addition, its various + portability issues for Cygwin have been addressed. + + * The remote helper to interact with Hg in contrib/ has seen a few + fixes. + Performance, Internal Implementation, etc. @@ -84,13 +216,52 @@ Performance, Internal Implementation, etc. * Matching paths with common forms of pathspecs that contain wildcard characters has been optimized further. + * We stopped paying attention to $GIT_CONFIG environment that points + at a single configuration file from any command other than "git config" + quite a while ago, but "git clone" internally set, exported, and + then unexported the variable during its operation unnecessarily. + + * "git reset" internals has been reworked and should be faster in + general. We tried to be careful not to break any behaviour but + there could be corner cases, especially when running the command + from a conflicted state, that we may have missed. + * The implementation of "imap-send" has been updated to reuse xml - quoting code from http-push codepath. + quoting code from http-push codepath, and lost a lot of unused + code. * There is a simple-minded checker for the test scripts in t/ directory to catch most common mistakes (it is not enabled by default). + * You can build with USE_WILDMATCH=YesPlease to use a replacement + implementation of pattern matching logic used for pathname-like + things, e.g. refnames and paths in the repository. This new + implementation is not expected change the existing behaviour of Git + in this release, except for "git for-each-ref" where you can now + say "refs/**/master" and match with both refs/heads/master and + refs/remotes/origin/master. We plan to use this new implementation + in wider places (e.g. "git ls-files '**/Makefile' may find Makefile + at the top-level, and "git log '**/t*.sh'" may find commits that + touch a shell script whose name begins with "t" at any level) in + future versions of Git, but we are not there yet. By building with + USE_WILDMATCH, using the resulting Git daily and reporting when you + find breakages, you can help us get closer to that goal. + + * Some reimplementations of Git do not write all the stat info back + to the index due to their implementation limitations (e.g. jgit). + A configuration option can tell Git to ignore changes to most of + the stat fields and only pay attention to mtime and size, which + these implementations can reliably update. This can be used to + avoid excessive revalidation of contents. + + * Some platforms ship with old version of expat where xmlparse.h + needs to be included instead of expat.h; the build procedure has + been taught about this. + + * "make clean" on platforms that cannot compute header dependencies + on the fly did not work with implementations of "rm" that do not + like an empty argument list. Also contains minor documentation updates and code clean-ups. @@ -105,90 +276,166 @@ details). * An element on GIT_CEILING_DIRECTORIES list that does not name the real path to a directory (i.e. a symbolic link) could have caused the GIT_DIR discovery logic to escape the ceiling. - (merge 059b379 mh/ceiling later to maint). * When attempting to read the XDG-style $HOME/.config/git/config and finding that $HOME/.config/git is a file, we gave a wrong error message, instead of treating the case as "a custom config file does not exist there" and moving on. - (merge 8f2bbe4 jn/warn-on-inaccessible-loosen later to maint). * The behaviour visible to the end users was confusing, when they attempt to kill a process spawned in the editor that was in turn launched by Git with SIGINT (or SIGQUIT), as Git would catch that signal and die. We ignore these signals now. - (merge 1250857 pf/editor-ignore-sigint later to maint). + (merge 0398fc34 pf/editor-ignore-sigint later to maint). + + * A child process that was killed by a signal (e.g. SIGINT) was + reported in an inconsistent way depending on how the process was + spawned by us, with or without a shell in between. * After failing to create a temporary file using mkstemp(), failing pathname was not reported correctly on some platforms. - (merge f7be59b jc/mkstemp-more-careful-error-reporting later to maint). + + * We used to stuff "user@" and then append what we read from + /etc/mailname to come up with a default e-mail ident, but a bug + lost the "user@" part. * The attribute mechanism didn't allow limiting attributes to be applied to only a single directory itself with "path/" like the - exclude mechanism does. - (merge 94bc671 ja/directory-attrs later to maint). + exclude mechanism does. The initial implementation of this that + was merged to 'maint' and 1.8.1.2 was with a severe performance + degradations and needs to merge a fix-up topic. + + * The smart HTTP clients forgot to verify the content-type that comes + back from the server side to make sure that the request is being + handled properly. + + * "git am" did not parse datestamp correctly from Hg generated patch, + when it is run in a locale outside C (or en). * "git apply" misbehaved when fixing whitespace breakages by removing excess trailing blank lines. - (merge 5de7166 jc/apply-trailing-blank-removal later to maint). + + * "git apply --summary" has been taught to make sure the similarity + value shown in its output is sensible, even when the input had a + bogus value. * A tar archive created by "git archive" recorded a directory in a way that made NetBSD's implementation of "tar" sometimes unhappy. - (merge 22f0dcd rs/leave-base-name-in-name-field-of-tar later to maint). + + * "git archive" did not record uncompressed size in the header when + streaming a zip archive, which confused some implementations of unzip. + + * "git archive" did not parse configuration values in tar.* namespace + correctly. + (merge b3873c3 jk/config-parsing-cleanup later to maint). + + * Attempt to "branch --edit-description" an existing branch, while + being on a detached HEAD, errored out. + + * "git clean" showed what it was going to do, but sometimes end up + finding that it was not allowed to do so, which resulted in a + confusing output (e.g. after saying that it will remove an + untracked directory, it found an embedded git repository there + which it is not allowed to remove). It now performs the actions + and then reports the outcome more faithfully. * When "git clone --separate-git-dir=$over_there" is interrupted, it failed to remove the real location of the $GIT_DIR it created. This was most visible when interrupting a submodule update. - (merge 9be1980 jl/interrupt-clone-remove-separate-git-dir later to maint). + + * "git cvsimport" mishandled timestamps at DST boundary. + + * We used to have an arbitrary 32 limit for combined diff input, + resulting in incorrect number of leading colons shown when showing + the "--raw --cc" output. + + * "git fetch --depth" was broken in at least three ways. The + resulting history was deeper than specified by one commit, it was + unclear how to wipe the shallowness of the repository with the + command, and documentation was misleading. + (merge cfb70e1 nd/fetch-depth-is-broken later to maint). + + * "git log --all -p" that walked refs/notes/textconv/ ref can later + try to use the textconv data incorrectly after it gets freed. + + * We forgot to close the file descriptor reading from "gpg" output, + killing "git log --show-signature" on a long history. * The way "git svn" asked for password using SSH_ASKPASS and GIT_ASKPASS was not in line with the rest of the system. - (merge e9263e4 ss/svn-prompt later to maint). * The --graph code fell into infinite loop when asked to do what the code did not expect. - (merge 656197a mk/maint-graph-infinity-loop later to maint). * http transport was wrong to ask for the username when the authentication is done by certificate identity. - (merge 75e9a40 rb/http-cert-cred-no-username-prompt later to maint). * "git pack-refs" that ran in parallel to another process that created new refs had a nasty race. - (merge b3f1280 jk/repack-ref-racefix later to maint). + + * Rebasing the history of superproject with change in the submodule + has been broken since v1.7.12. * After "git add -N" and then writing a tree object out of the index, the cache-tree data structure got corrupted. - (merge eec3e7e nd/invalidate-i-t-a-cache-tree later to maint). + + * "git clone" used to allow --bare and --separate-git-dir=$there + options at the same time, which was nonsensical. + + * "git rebase --preserve-merges" lost empty merges in recent versions + of Git. * "git merge --no-edit" computed who were involved in the work done on the side branch, even though that information is to be discarded without getting seen in the editor. - (merge 9bcbb1c jc/maint-fmt-merge-msg-no-edit-lose-credit later to maint). * "git merge" started calling prepare-commit-msg hook like "git commit" does some time ago, but forgot to pay attention to the exit status of the hook. - (merge 3e4141d ap/merge-stop-at-prepare-commit-msg-failure later to maint). + + * A failure to push due to non-ff while on an unborn branch + dereferenced a NULL pointer when showing an error message. + + * When users spell "cc:" in lowercase in the fake "header" in the + trailer part, "git send-email" failed to pick up the addresses from + there. As e-mail headers field names are case insensitive, this + script should follow suit and treat "cc:" and "Cc:" the same way. + + * Output from "git status --ignored" showed an unexpected interaction + with "--untracked". * "gitweb", when sorting by age to show repositories with new activities first, used to sort repositories with absolutely nothing in it early, which was not very useful. - (merge 28dae18 md/gitweb-sort-by-age later to maint). * "gitweb"'s code to sanitize control characters before passing it to "highlight" filter lost known-to-be-safe control characters by mistake. - (merge 0e901d2 os/gitweb-highlight-uncaptured later to maint). + + * "gitweb" pages served over HTTPS, when configured to show picon or + gravatar, referred to these external resources to be fetched via + HTTP, resulting in mixed contents warning in browsers. * When a line to be wrapped has a solid run of non space characters whose length exactly is the wrap width, "git shortlog -w" failed to add a newline after such a line. - (merge e0db176 sp/shortlog-missing-lf later to maint). + + * Command line completion leaked an unnecessary error message while + looking for possible matches with paths in <tree-ish>. + + * Command line completion for "tcsh" emitted an unwanted space + after completing a single directory name. + + * Command line completion code was inadvertently made incompatible with + older versions of bash by using a newer array notation. + + * "git push" was taught to refuse updating the branch that is + currently checked out long time ago, but the user manual was left + stale. + (merge 50995ed wk/man-deny-current-branch-is-default-these-days later to maint). * Some shells do not behave correctly when IFS is unset; work it around by explicitly setting it to the default value. - (merge 393050c jc/maint-fbsd-sh-ifs-workaround later to maint). * Some scripted programs written in Python did not get updated when PYTHON_PATH changed. @@ -196,24 +443,53 @@ details). * When autoconf is used, any build on a different commit always ran "config.status --recheck" even when unnecessary. - (merge 1226504 jn/less-reconfigure later to maint). + + * A fix was added to the build procedure to work around buggy + versions of ccache broke the auto-generation of dependencies, which + unfortunately is still relevant because some people use ancient + distros. + + * The autoconf subsystem passed --mandir down to generated + config.mak.autogen but forgot to do the same for --htmldir. + (merge 55d9bf0 ct/autoconf-htmldir later to maint). + + * A change made on v1.8.1.x maintenance track had a nasty regression + to break the build when autoconf is used. + (merge 7f1b697 jn/less-reconfigure later to maint). * We have been carrying a translated and long-unmaintained copy of an old version of the tutorial; removed. - (merge 0a85441 ta/remove-stale-translated-tut later to maint). + + * t0050 had tests expecting failures from a bug that was fixed some + time ago. * t4014, t9502 and t0200 tests had various portability issues that broke on OpenBSD. - (merge 27f6342 jc/maint-test-portability later to maint). * t9020 and t3600 tests had various portability issues. - (merge 5a02966 jc/test-portability later to maint). * t9200 runs "cvs init" on a directory that already exists, but a platform can configure this fail for the current user (e.g. you need to be in the cvsadmin group on NetBSD 6.0). - (merge 8666df0 jc/test-cvs-no-init-in-existing-dir later to maint). * t9020 and t9810 had a few non-portable shell script construct. - (merge 2797914 tb/test-t9020-no-which later to maint). - (merge 6f4e505 tb/test-t9810-no-sed-i later to maint). + + * Scripts to test bash completion was inherently flaky as it was + affected by whatever random things the user may have on $PATH. + + * An element on GIT_CEILING_DIRECTORIES could be a "logical" pathname + that uses a symbolic link to point at somewhere else (e.g. /home/me + that points at /net/host/export/home/me, and the latter directory + is automounted). Earlier when Git saw such a pathname e.g. /home/me + on this environment variable, the "ceiling" mechanism did not take + effect. With this release (the fix has also been merged to the + v1.8.1.x maintenance series), elements on GIT_CEILING_DIRECTORIES + are by default checked for such aliasing coming from symbolic + links. As this needs to actually resolve symbolic links for each + element on the GIT_CEILING_DIRECTORIES, you can disable this + mechanism for some elements by listing them after an empty element + on the GIT_CEILING_DIRECTORIES. e.g. Setting /home/me::/home/him to + GIT_CEILING_DIRECTORIES makes Git resolve symbolic links in + /home/me when checking if the current directory is under /home/me, + but does not do so for /home/him. + (merge 7ec30aa mh/maint-ceil-absolute later to maint). diff --git a/Documentation/RelNotes/1.8.3.txt b/Documentation/RelNotes/1.8.3.txt new file mode 100644 index 0000000000..b027992d82 --- /dev/null +++ b/Documentation/RelNotes/1.8.3.txt @@ -0,0 +1,207 @@ +Git v1.8.3 Release Notes +======================== + +Backward compatibility notes (for Git 2.0) +------------------------------------------ + +When "git push [$there]" does not say what to push, we have used the +traditional "matching" semantics so far (all your branches were sent +to the remote as long as there already are branches of the same name +over there). In Git 2.0, the default will change to the "simple" +semantics that pushes the current branch to the branch with the same +name, only when the current branch is set to integrate with that +remote branch. There is a user preference configuration variable +"push.default" to change this. If you are an old-timer who is used +to the "matching" semantics, you can set it to "matching" to keep the +traditional behaviour. If you want to live in the future early, +you can set it to "simple" today without waiting for Git 2.0. + +When "git add -u" and "git add -A", that does not specify what paths +to add on the command line is run from inside a subdirectory, these +commands will operate on the entire tree in Git 2.0 for consistency +with "git commit -a" and other commands. Because there will be no +mechanism to make "git add -u" behave as if "git add -u .", it is +important for those who are used to "git add -u" (without pathspec) +updating the index only for paths in the current subdirectory to start +training their fingers to explicitly say "git add -u ." when they mean +it before Git 2.0 comes. + + +Updates since v1.8.2 +-------------------- + +UI, Workflows & Features + + * When the interactive access to git-shell is not enabled, it issues + a message meant to help the system admininstrator to enable it. + An explicit way to help the end users who connect to the service by + issuing custom messages to refuse such an access has been added. + + * "git status" suggests users to look into using--untracked=no option + when it takes too long. + + * "git fetch" learned to fetch a commit at the tip of an unadvertised + ref by specifying a raw object name from the command line when the + server side supports this feature. + + * "git count-objects -v" learned to report leftover temporary + packfiles and other garbage in the object store. + + * A new read-only credential helper (in contrib/) to interact with + the .netrc/.authinfo files has been added. + + * "git send-email" can be used with the credential helper system. + + * There was no Porcelain way to say "I no longer am interested in + this submodule", once you express your interest in a submodule with + "submodule init". "submodule deinit" is the way to do so. + + * "git pull --rebase" learned to pass "-v/-q" options to underlying + "git rebase". + + * The new "--follow-tags" option tells "git push" to push relevant + annotated tags when pushing branches out. + + * "git mergetool" now feeds files to the "p4merge" backend in the + order that matches the p4 convention, where "theirs" is usually + shown on the left side, which is the opposite from other backend + expects. + + +Performance, Internal Implementation, etc. + + * Updates for building under msvc. + + * A few codepaths knew how much data they need to put in the + hashtables they use upfront, but still started from a small table + repeatedly growing and rehashing. + + * The API to walk reflog entries from the latest to older, which was + necessary for operations such as "git checkout -", was cumbersome + to use correctly and also inefficient. + + +Also contains minor documentation updates and code clean-ups. + + +Fixes since v1.8.2 +------------------ + +Unless otherwise noted, all the fixes since v1.8.2 in the maintenance +track are contained in this release (see release notes to them for +details). + + * Annotated tags outside refs/tags/ hierarchy were not advertised + correctly to the ls-remote and fetch with recent version of Git. + (merge c29c46f jk/fully-peeled-packed-ref later to maint). + + * Recent optimization broke shallow clones. + (merge f59de5d jk/peel-ref later to maint). + + * "git cmd -- ':(top'" was not diagnosed as an invalid syntax, and + instead the parser kept reading beyond the end of the string. + (merge f612a67 lf/setup-prefix-pathspec later to maint). + + * "git tag -f <tag>" always said "Updated tag '<tag>'" even when + creating a new tag (i.e. not overwriting nor updating). + (merge 3ae851e ph/tag-force-no-warn-on-creation later to maint). + + * "git p4" did not behave well when the path to the root of the P4 + client was not its real path. + (merge bbd8486 pw/p4-symlinked-root later to maint). + + * "git archive" reports a failure when asked to create an archive out + of an empty tree. It would be more intuitive to give an empty + archive back in such a case. + (merge bd54cf1 jk/empty-archive later to maint). + + * When "format-patch" quoted a non-ascii strings on the header files, + it incorrectly applied rfc2047 and chopped a single character in + the middle of it. + (merge 6cd3c05 ks/rfc2047-one-char-at-a-time later to maint). + + * An aliased command spawned from a bare repository that does not say + it is bare with "core.bare = yes" is treated as non-bare by mistake. + (merge 2cd83d1 jk/alias-in-bare later to maint). + + * In "git reflog expire", REACHABLE bit was not cleared from the + correct objects. + + * The logic used by "git diff -M --stat" to shorten the names of + files before and after a rename did not work correctly when the + common prefix and suffix between the two filenames overlapped. + (merge b174eb4 ap/maint-diff-rename-avoid-overlap later to maint). + + * The "--match=<pattern>" option of "git describe", when used with + "--all" to allow refs that are not annotated tags to be used as a + base of description, did not restrict the output from the command + to those that match the given pattern. + (merge 46e1d6e jc/describe later to maint). + + * Clarify in the documentation "what" gets pushed to "where" when the + command line to "git push" does not say these explicitly. + + * The "--color=<when>" argument to the commands in the diff family + was described poorly. + + * The arguments given to pre-rebase hook were not documented. + + * The v4 index format was not documented. + + * The "--match=<pattern>" argument "git describe" takes uses glob + pattern but it wasn't obvious from the documentation. + + * Some sources failed to compile on systems that lack NI_MAXHOST in + their system header (e.g. z/OS). + + * Add an example use of "--env-filter" in "filter-branch" + documentation. + + * "git bundle verify" did not say "records a complete history" for a + bundle that does not have any prerequisites. + + * In the v1.8.0 era, we changed symbols that do not have to be global + to file scope static, but a few functions in graph.c were used by + CGit from sideways bypassing the entry points of the API the + in-tree users use. + + * "git update-index -h" did not do the usual "-h(elp)" thing. + + * "git index-pack" had a buffer-overflow while preparing an + informational message when the translated version of it was too + long. + + * 'git commit -m "$msg"' used to add an extra newline even when + $msg already ended with one. + (merge 46fbf75 bc/commit-complete-lines-given-via-m-option later to maint). + + * The SSL peer verification done by "git imap-send" did not ask for + Server Name Indication (RFC 4366), failing to connect SSL/TLS + sites that serve multiple hostnames on a single IP. + + * perl/Git.pm::cat_blob slurped everything in core only to write it + out to a file descriptor, which was not a very smart thing to do. + + * "git branch" did not bother to check nonsense command line + parameters and issue errors in many cases. + + * Verification of signed tags were not done correctly when not in C + or en/US locale. + (merge 0174eea mg/gpg-interface-using-status later to maint). + + * Some platforms and users spell UTF-8 differently; retry with the + most official "UTF-8" when the system does not understand the + user-supplied encoding name that are the common alternative + spellings of UTF-8. + + * When export-subst is used, "zip" output recorded incorrect + size of the file. + + * "git am $maildir/" applied messages in an unexpected order; sort + filenames read from the maildir/ in a way that is more likely to + sort messages in the order the writing MUA meant to, by sorting + numeric segment in numeric order and non-numeric segment in + alphabetical order. + + * "git submodule update", when recursed into sub-submodules, did not + acccumulate the prefix paths. diff --git a/Documentation/SubmittingPatches b/Documentation/SubmittingPatches index 90133d8c3b..d0a4733e45 100644 --- a/Documentation/SubmittingPatches +++ b/Documentation/SubmittingPatches @@ -103,9 +103,9 @@ without external resources. Instead of giving a URL to a mailing list archive, summarize the relevant points of the discussion. -(3) Generate your patch using git tools out of your commits. +(3) Generate your patch using Git tools out of your commits. -git based diff tools generate unidiff which is the preferred format. +Git based diff tools generate unidiff which is the preferred format. You do not have to be afraid to use -M option to "git diff" or "git format-patch", if your patch involves file renames. The @@ -122,7 +122,7 @@ that is fine, but please mark it as such. (4) Sending your patches. -People on the git mailing list need to be able to read and +People on the Git mailing list need to be able to read and comment on the changes you are submitting. It is important for a developer to be able to "quote" your changes, using standard e-mail tools, so that they may comment on specific portions of @@ -206,7 +206,7 @@ patch. To improve tracking of who did what, we've borrowed the "sign-off" procedure from the Linux kernel project on patches -that are being emailed around. Although core GIT is a lot +that are being emailed around. Although core Git is a lot smaller project it is a good discipline to follow it. The sign-off is a simple line at the end of the explanation for @@ -244,7 +244,7 @@ then you just add a line saying Signed-off-by: Random J Developer <random@developer.example.org> -This line can be automatically added by git if you run the git-commit +This line can be automatically added by Git if you run the git-commit command with the -s option. Notice that you can place your own Signed-off-by: line when @@ -337,7 +337,7 @@ Know the status of your patch after submission tell you if your patch is merged in pu if you rebase on top of master). -* Read the git mailing list, the maintainer regularly posts messages +* Read the Git mailing list, the maintainer regularly posts messages entitled "What's cooking in git.git" and "What's in git.git" giving the status of various proposed changes. diff --git a/Documentation/asciidoc.conf b/Documentation/asciidoc.conf index 1273a85c8a..2c16c536ba 100644 --- a/Documentation/asciidoc.conf +++ b/Documentation/asciidoc.conf @@ -4,7 +4,7 @@ # # Note, {0} is the manpage section, while {target} is the command. # -# Show GIT link as: <command>(<section>); if section is defined, else just show +# Show Git link as: <command>(<section>); if section is defined, else just show # the command. [macros] diff --git a/Documentation/blame-options.txt b/Documentation/blame-options.txt index d4a51da464..b0d31df0e7 100644 --- a/Documentation/blame-options.txt +++ b/Documentation/blame-options.txt @@ -95,7 +95,7 @@ of lines before or after the line given by <start>. running extra passes of inspection. + <num> is optional but it is the lower bound on the number of -alphanumeric characters that git must detect as moving/copying +alphanumeric characters that Git must detect as moving/copying within a file for it to associate those lines with the parent commit. The default value is 20. @@ -110,7 +110,7 @@ commit. The default value is 20. looks for copies from other files in any commit. + <num> is optional but it is the lower bound on the number of -alphanumeric characters that git must detect as moving/copying +alphanumeric characters that Git must detect as moving/copying between files for it to associate those lines with the parent commit. And the default value is 40. If there are more than one `-C` options given, the <num> argument of the last `-C` will diff --git a/Documentation/config.txt b/Documentation/config.txt index d5809e0e8c..c1f435f6df 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -1,14 +1,14 @@ CONFIGURATION FILE ------------------ -The git configuration file contains a number of variables that affect -the git command's behavior. The `.git/config` file in each repository +The Git configuration file contains a number of variables that affect +the Git commands' behavior. The `.git/config` file in each repository is used to store the configuration for that repository, and `$HOME/.gitconfig` is used to store a per-user configuration as fallback values for the `.git/config` file. The file `/etc/gitconfig` can be used to store a system-wide default configuration. -The configuration variables are used by both the git plumbing +The configuration variables are used by both the Git plumbing and the porcelains. The variables are divided into sections, wherein the fully qualified variable name of the variable itself is the last dot-separated segment and the section name is everything before the last @@ -143,7 +143,8 @@ advice.*:: pushUpdateRejected:: Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFDefault', - 'pushNonFFMatching', and 'pushAlreadyExists' + 'pushNonFFMatching', 'pushAlreadyExists', + 'pushFetchFirst', and 'pushNeedsForce' simultaneously. pushNonFFCurrent:: Advice shown when linkgit:git-push[1] fails due to a @@ -162,17 +163,30 @@ advice.*:: pushAlreadyExists:: Shown when linkgit:git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.) + pushFetchFirst:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object we do not have. + pushNeedsForce:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object that is not a committish, or make the remote + ref point at an object that is not a committish. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in the template shown when writing commit messages in linkgit:git-commit[1], and in the help message shown by linkgit:git-checkout[1] when switching branch. + statusUoption:: + Advise to consider using the `-u` option to linkgit:git-status[1] + when the command takes more than 2 seconds to enumerate untracked + files. commitBeforeMerge:: Advice shown when linkgit:git-merge[1] refuses to merge to avoid overwriting local changes. resolveConflict:: - Advices shown by various commands when conflicts + Advice shown by various commands when conflicts prevent the operation from being performed. implicitIdentity:: Advice on how to set your identity configuration when @@ -209,9 +223,9 @@ core.ignoreCygwinFSTricks:: core.ignorecase:: If true, this option enables various workarounds to enable - git to work better on filesystems that are not case sensitive, + Git to work better on filesystems that are not case sensitive, like FAT. For example, if a directory listing finds - "makefile" when git expects "Makefile", git will assume + "makefile" when Git expects "Makefile", Git will assume it is really the same file, and continue to remember it as "Makefile". + @@ -220,13 +234,13 @@ will probe and set core.ignorecase true if appropriate when the repository is created. core.precomposeunicode:: - This option is only used by Mac OS implementation of git. - When core.precomposeunicode=true, git reverts the unicode decomposition + This option is only used by Mac OS implementation of Git. + When core.precomposeunicode=true, Git reverts the unicode decomposition of filenames done by Mac OS. This is useful when sharing a repository between Mac OS and Linux or Windows. - (Git for Windows 1.7.10 or higher is needed, or git under cygwin 1.7). - When false, file names are handled fully transparent by git, - which is backward compatible with older versions of git. + (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). + When false, file names are handled fully transparent by Git, + which is backward compatible with older versions of Git. core.trustctime:: If false, the ctime differences between the index and the @@ -235,6 +249,12 @@ core.trustctime:: crawlers and some backup systems). See linkgit:git-update-index[1]. True by default. +core.checkstat:: + Determines which stat fields to match between the index + and work tree. The user can set this to 'default' or + 'minimal'. Default (or explicitly 'default'), is to check + all fields, including the sub-second part of mtime and ctime. + core.quotepath:: The commands that output paths (e.g. 'ls-files', 'diff'), when not given the `-z` option, will quote @@ -256,20 +276,20 @@ core.eol:: conversion. core.safecrlf:: - If true, makes git check if converting `CRLF` is reversible when + If true, makes Git check if converting `CRLF` is reversible when end-of-line conversion is active. Git will verify if a command modifies a file in the work tree either directly or indirectly. For example, committing a file followed by checking out the same file should yield the original file in the work tree. If this is not the case for the current setting of - `core.autocrlf`, git will reject the file. The variable can - be set to "warn", in which case git will only warn about an + `core.autocrlf`, Git will reject the file. The variable can + be set to "warn", in which case Git will only warn about an irreversible conversion but continue the operation. + CRLF conversion bears a slight chance of corrupting data. -When it is enabled, git will convert CRLF to LF during commit and LF to +When it is enabled, Git will convert CRLF to LF during commit and LF to CRLF during checkout. A file that contains a mixture of LF and -CRLF before the commit cannot be recreated by git. For text +CRLF before the commit cannot be recreated by Git. For text files this is the right thing to do: it corrects line endings such that we have only LF line endings in the repository. But for binary files that are accidentally classified as text the @@ -279,7 +299,7 @@ If you recognize such corruption early you can easily fix it by setting the conversion type explicitly in .gitattributes. Right after committing you still have the original file in your work tree and this file is not yet corrupted. You can explicitly tell -git that this file is binary and git will handle the file +Git that this file is binary and Git will handle the file appropriately. + Unfortunately, the desired effect of cleaning up text files with @@ -324,7 +344,7 @@ is created. core.gitProxy:: A "proxy command" to execute (as 'command host port') instead of establishing direct connection to the remote server when - using the git protocol for fetching. If the variable value is + using the Git protocol for fetching. If the variable value is in the "COMMAND for DOMAIN" format, the command is applied only on hostnames ending with the specified domain string. This variable may be set multiple times and is matched in the given order; @@ -383,7 +403,7 @@ Note that this variable is honored even when set in a configuration file in a ".git" subdirectory of a directory and its value differs from the latter directory (e.g. "/path/to/.git/config" has core.worktree set to "/different/path"), which is most likely a -misconfiguration. Running git commands in the "/path/to" directory will +misconfiguration. Running Git commands in the "/path/to" directory will still use "/different/path" as the root of the work tree and can cause confusion unless you know what you are doing (e.g. you are creating a read-only snapshot of the same index to a location different from the @@ -415,7 +435,7 @@ core.sharedRepository:: several users in a group (making sure all the files and objects are group-writable). When 'all' (or 'world' or 'everybody'), the repository will be readable by all users, additionally to being - group-shareable. When 'umask' (or 'false'), git will use permissions + group-shareable. When 'umask' (or 'false'), Git will use permissions reported by umask(2). When '0xxx', where '0xxx' is an octal number, files in the repository will have this mode value. '0xxx' will override user's umask value (whereas the other options will only override @@ -426,8 +446,8 @@ core.sharedRepository:: See linkgit:git-init[1]. False by default. core.warnAmbiguousRefs:: - If true, git will warn you if the ref name you passed it is ambiguous - and might match multiple refs in the .git/refs/ tree. True by default. + If true, Git will warn you if the ref name you passed it is ambiguous + and might match multiple refs in the repository. True by default. core.compression:: An integer -1..9, indicating a default compression level. @@ -498,7 +518,7 @@ Common unit suffixes of 'k', 'm', or 'g' are supported. core.excludesfile:: In addition to '.gitignore' (per-directory) and - '.git/info/exclude', git looks into this file for patterns + '.git/info/exclude', Git looks into this file for patterns of files which are not meant to be tracked. "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the specified user's home directory. Its default value is $XDG_CONFIG_HOME/git/ignore. @@ -516,7 +536,7 @@ core.askpass:: core.attributesfile:: In addition to '.gitattributes' (per-directory) and - '.git/info/attributes', git looks into this file for attributes + '.git/info/attributes', Git looks into this file for attributes (see linkgit:gitattributes[5]). Path expansions are made the same way as for `core.excludesfile`. Its default value is $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not @@ -528,6 +548,12 @@ core.editor:: variable when it is set, and the environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]. +core.commentchar:: + Commands such as `commit` and `tag` that lets you edit + messages consider a line that begins with this character + commented, and removes them after the editor returns + (default '#'). + sequence.editor:: Text editor used by `git rebase -i` for editing the rebase insn file. The value is meant to be interpreted by the shell when it is used. @@ -535,9 +561,9 @@ sequence.editor:: When not configured the default commit message editor is used instead. core.pager:: - The command that git will use to paginate output. Can + The command that Git will use to paginate output. Can be overridden with the `GIT_PAGER` environment - variable. Note that git sets the `LESS` environment + variable. Note that Git sets the `LESS` environment variable to `FRSX` if it is unset when it runs the pager. One can change these settings by setting the `LESS` variable to some other value. Alternately, @@ -545,11 +571,11 @@ core.pager:: global basis by setting the `core.pager` option. Setting `core.pager` has no effect on the `LESS` environment variable behaviour above, so if you want - to override git's default settings this way, you need + to override Git's default settings this way, you need to be explicit. For example, to disable the S option in a backward compatible manner, set `core.pager` to `less -+S`. This will be passed to the shell by - git, which will translate the final command to + Git, which will translate the final command to `LESS=FRSX less -+S`. core.whitespace:: @@ -578,7 +604,7 @@ core.whitespace:: does not trigger if the character before such a carriage-return is not a whitespace (not enabled by default). * `tabwidth=<n>` tells how many character positions a tab occupies; this - is relevant for `indent-with-non-tab` and when git fixes `tab-in-indent` + is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` errors. The default tab width is 8. Allowed values are 1 to 63. core.fsyncobjectfiles:: @@ -594,7 +620,7 @@ core.preloadindex:: + This can speed up operations like 'git diff' and 'git status' especially on filesystems like NFS that have weak caching semantics and thus -relatively high IO latencies. With this set to 'true', git will do the +relatively high IO latencies. With this set to 'true', Git will do the index comparison to the filesystem data in parallel, allowing overlapping IO's. @@ -630,9 +656,9 @@ add.ignore-errors:: add.ignoreErrors:: Tells 'git add' to continue adding files when some files cannot be added due to indexing errors. Equivalent to the '--ignore-errors' - option of linkgit:git-add[1]. Older versions of git accept only + option of linkgit:git-add[1]. Older versions of Git accept only `add.ignore-errors`, which does not follow the usual naming - convention for configuration variables. Newer versions of git + convention for configuration variables. Newer versions of Git honor `add.ignoreErrors` as well. alias.*:: @@ -640,7 +666,7 @@ alias.*:: after defining "alias.last = cat-file commit HEAD", the invocation "git last" is equivalent to "git cat-file commit HEAD". To avoid confusion and troubles with script usage, aliases that - hide existing git commands are ignored. Arguments are split by + hide existing Git commands are ignored. Arguments are split by spaces, the usual shell quoting and escaping is supported. quote pair and a backslash can be used to quote them. + @@ -687,7 +713,7 @@ branch.autosetupmerge:: branch.autosetuprebase:: When a new branch is created with 'git branch' or 'git checkout' - that tracks another branch, this variable tells git to set + that tracks another branch, this variable tells Git to set up pull to rebase instead of merge (see "branch.<name>.rebase"). When `never`, rebase is never automatically set to true. When `local`, rebase is set to true for tracked branches of @@ -868,7 +894,7 @@ color.status.<slot>:: one of `header` (the header text of the status message), `added` or `updated` (files which are added but not committed), `changed` (files which are changed but not added in the index), - `untracked` (files which are not tracked by git), + `untracked` (files which are not tracked by Git), `branch` (the current branch), or `nobranch` (the color the 'no branch' warning is shown in, defaulting to red). The values of these variables may be specified as in @@ -882,7 +908,7 @@ color.ui:: to `always` if you want all output not intended for machine consumption to use color, to `true` or `auto` if you want such output to use color when written to the terminal, or to `false` or - `never` if you prefer git commands not to use color unless enabled + `never` if you prefer Git commands not to use color unless enabled explicitly with some other configuration or the `--color` option. column.ui:: @@ -923,6 +949,15 @@ column.tag:: Specify whether to output tag listing in `git tag` in columns. See `column.ui` for details. +commit.cleanup:: + This setting overrides the default of the `--cleanup` option in + `git commit`. See linkgit:git-commit[1] for details. Changing the + default can be useful when you always want to keep lines that begin + with comment character `#` in your log message, in which case you + would do `git config commit.cleanup whitespace` (note that you will + have to remove the help lines that begin with `#` in the commit log + template yourself, if you do this). + commit.status:: A boolean to enable/disable inclusion of status information in the commit message template when using an editor to prepare the commit @@ -990,7 +1025,7 @@ fetch.fsckObjects:: is used instead. fetch.unpackLimit:: - If the number of objects fetched over the git native + If the number of objects fetched over the Git native transfer is below this limit, then the objects will be unpacked into loose object files. However if the number of received objects equals or @@ -1030,7 +1065,7 @@ format.subjectprefix:: format.signature:: The default for format-patch is to output a signature containing - the git version number. Use this variable to change that default. + the Git version number. Use this variable to change that default. Set this variable to the empty string ("") to suppress signature generation. @@ -1143,7 +1178,7 @@ gitcvs.logfile:: gitcvs.usecrlfattr:: If true, the server will look up the end-of-line conversion attributes for files to determine the '-k' modes to use. If - the attributes force git to treat a file as text, + the attributes force Git to treat a file as text, the '-k' mode will be left blank so CVS clients will treat it as text. If they suppress text conversion, the file will be set with '-kb' mode, which suppresses any newline munging @@ -1163,7 +1198,7 @@ gitcvs.allbinary:: gitcvs.dbname:: Database used by git-cvsserver to cache revision information - derived from the git repository. The exact meaning depends on the + derived from the Git repository. The exact meaning depends on the used database driver, for SQLite (which is the default driver) this is a filename. Supports variable substitution (see linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`). @@ -1361,6 +1396,12 @@ help.autocorrect:: value is 0 - the command will be just shown but not executed. This is the default. +help.htmlpath:: + Specify the path where the HTML documentation resides. File system paths + and URLs are supported. HTML pages will be prefixed with this path when + help is displayed in the 'web' format. This defaults to the documentation + path of your Git installation. + http.proxy:: Override the HTTP proxy, normally configured using the 'http_proxy', 'https_proxy', and 'all_proxy' environment variables (see @@ -1369,7 +1410,7 @@ http.proxy:: http.cookiefile:: File containing previously stored cookie lines which should be used - in the git http session, if they match the server. The file format + in the Git http session, if they match the server. The file format of the file to read cookies from should be plain HTTP headers or the Netscape/Mozilla cookie file format (see linkgit:curl[1]). NOTE that the file specified with http.cookiefile is only used as @@ -1391,7 +1432,7 @@ http.sslKey:: variable. http.sslCertPasswordProtected:: - Enable git's password prompt for the SSL certificate. Otherwise + Enable Git's password prompt for the SSL certificate. Otherwise OpenSSL will prompt the user, possibly many times, if the certificate or private key is encrypted. Can be overridden by the 'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable. @@ -1438,7 +1479,7 @@ http.noEPSV:: http.useragent:: The HTTP USER_AGENT string presented to an HTTP server. The default - value represents the version of the client git such as git/1.7.1. + value represents the version of the client Git such as git/1.7.1. This option allows you to override this value to a more common value such as Mozilla/4.0. This may be necessary, for instance, if connecting through a firewall that restricts HTTP connections to a set @@ -1446,7 +1487,7 @@ http.useragent:: Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable. i18n.commitEncoding:: - Character encoding the commit messages are stored in; git itself + Character encoding the commit messages are stored in; Git itself does not care per se, but this information is necessary e.g. when importing commits from emails or in the gitk graphical history browser (and possibly at other places in the future or in other @@ -1519,6 +1560,10 @@ log.showroot:: Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which normally hide the root commit will now show it. True by default. +log.mailmap:: + If true, makes linkgit:git-log[1], linkgit:git-show[1], and + linkgit:git-whatchanged[1] assume `--use-mailmap`. + mailmap.file:: The location of an augmenting mailmap file. The default mailmap, located in the root of the repository, is loaded @@ -1580,7 +1625,7 @@ mergetool.keepBackup:: `true` (i.e. keep the backup files). mergetool.keepTemporaries:: - When invoking a custom merge tool, git uses a set of temporary + When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool. If the tool returns an error and this variable is set to `true`, then these temporary files will be preserved, otherwise they will be removed after the tool has @@ -1608,7 +1653,7 @@ displayed. notes.rewrite.<command>:: When rewriting commits with <command> (currently `amend` or - `rebase`) and this variable is set to `true`, git + `rebase`) and this variable is set to `true`, Git automatically copies your notes from the original to the rewritten commit. Defaults to `true`, but see "notes.rewriteRef" below. @@ -1688,7 +1733,7 @@ pack.threads:: warning. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. - Specifying 0 will cause git to auto-detect the number of CPU's + Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly. pack.indexVersion:: @@ -1700,11 +1745,11 @@ pack.indexVersion:: and this config option ignored whenever the corresponding pack is larger than 2 GB. + -If you have an old git that does not understand the version 2 `*.idx` file, +If you have an old Git that does not understand the version 2 `*.idx` file, cloning or fetching over a non native protocol (e.g. "http" and "rsync") that will copy both `*.pack` file and corresponding `*.idx` file from the other side may give you a repository that cannot be accessed with your -older version of git. If the `*.pack` file is smaller than 2 GB, however, +older version of Git. If the `*.pack` file is smaller than 2 GB, however, you can use linkgit:git-index-pack[1] on the *.pack file to regenerate the `*.idx` file. @@ -1719,7 +1764,7 @@ pack.packSizeLimit:: pager.<cmd>:: If the value is boolean, turns on or off pagination of the - output of a particular git subcommand when writing to a tty. + output of a particular Git subcommand when writing to a tty. Otherwise, turns on pagination for the subcommand using the pager specified by the value of `pager.<cmd>`. If `--paginate` or `--no-pager` is specified on the command line, it takes @@ -1754,7 +1799,7 @@ pull.twohead:: The default merge strategy to use when pulling a single branch. push.default:: - Defines the action git push should take if no refspec is given + Defines the action `git push` should take if no refspec is given on the command line, no refspec is configured in the remote, and no refspec is implied by any of the options given on the command line. Possible values are: @@ -1770,7 +1815,8 @@ push.default:: + This is currently the default, but Git 2.0 will change the default to `simple`. -* `upstream` - push the current branch to its upstream branch. +* `upstream` - push the current branch to its upstream branch + (`tracking` is a deprecated synonym for this). With this, `git push` will update the same remote ref as the one which is merged by `git pull`, making `push` and `pull` symmetrical. See "branch.<name>.merge" for how to configure the upstream branch. @@ -1839,6 +1885,15 @@ receive.denyNonFastForwards:: even if that push is forced. This configuration variable is set when initializing a shared repository. +receive.hiderefs:: + String(s) `receive-pack` uses to decide which refs to omit + from its initial advertisement. Use more than one + definitions to specify multiple prefix strings. A ref that + are under the hierarchies listed on the value of this + variable is excluded, and is hidden when responding to `git + push`, and an attempt to update or delete a hidden ref by + `git push` is rejected. + receive.updateserverinfo:: If set to true, git-receive-pack will run git-update-server-info after receiving data from git-push and updating refs. @@ -1894,7 +1949,7 @@ remote.<name>.tagopt:: linkgit:git-fetch[1]. remote.<name>.vcs:: - Setting this to a value <vcs> will cause git to interact with + Setting this to a value <vcs> will cause Git to interact with the remote with the git-remote-<vcs> helper. remotes.<group>:: @@ -1904,9 +1959,9 @@ remotes.<group>:: repack.usedeltabaseoffset:: By default, linkgit:git-repack[1] creates packs that use delta-base offset. If you need to share your repository with - git older than version 1.4.4, either directly or via a dumb + Git older than version 1.4.4, either directly or via a dumb protocol such as http, then you need to set this option to - "false" and repack. Access from old git versions over the + "false" and repack. Access from old Git versions over the native protocol are unaffected by this option. rerere.autoupdate:: @@ -1975,7 +2030,7 @@ showbranch.default:: status.relativePaths:: By default, linkgit:git-status[1] shows paths relative to the current directory. Setting this variable to `false` shows paths - relative to the repository root (this was the default for git + relative to the repository root (this was the default for Git prior to v1.5.4). status.showUntrackedFiles:: @@ -2051,18 +2106,38 @@ transfer.fsckObjects:: not set, the value of this variable is used instead. Defaults to false. +transfer.hiderefs:: + This variable can be used to set both `receive.hiderefs` + and `uploadpack.hiderefs` at the same time to the same + values. See entries for these other variables. + transfer.unpackLimit:: When `fetch.unpackLimit` or `receive.unpackLimit` are not set, the value of this variable is used instead. The default value is 100. +uploadpack.hiderefs:: + String(s) `upload-pack` uses to decide which refs to omit + from its initial advertisement. Use more than one + definitions to specify multiple prefix strings. A ref that + are under the hierarchies listed on the value of this + variable is excluded, and is hidden from `git ls-remote`, + `git fetch`, etc. An attempt to fetch a hidden ref by `git + fetch` will fail. See also `uploadpack.allowtipsha1inwant`. + +uploadpack.allowtipsha1inwant:: + When `uploadpack.hiderefs` is in effect, allow `upload-pack` + to accept a fetch request that asks for an object at the tip + of a hidden ref (by default, such a request is rejected). + see also `uploadpack.hiderefs`. + url.<base>.insteadOf:: Any URL that starts with this value will be rewritten to start, instead, with <base>. In cases where some site serves a large number of repositories, and serves them with multiple access methods, and some users need to use different access methods, this feature allows people to specify any of the - equivalent URLs and have git automatically rewrite the URL to + equivalent URLs and have Git automatically rewrite the URL to the best alternative for the particular user, even for a never-before-seen repository on the site. When more than one insteadOf strings match a given URL, the longest match is used. @@ -2073,11 +2148,11 @@ url.<base>.pushInsteadOf:: resulting URL will be pushed to. In cases where some site serves a large number of repositories, and serves them with multiple access methods, some of which do not allow push, this feature - allows people to specify a pull-only URL and have git + allows people to specify a pull-only URL and have Git automatically use an appropriate URL to push, even for a never-before-seen repository on the site. When more than one pushInsteadOf strings match a given URL, the longest match is - used. If a remote has an explicit pushurl, git will ignore this + used. If a remote has an explicit pushurl, Git will ignore this setting for that remote. user.email:: diff --git a/Documentation/diff-config.txt b/Documentation/diff-config.txt index 4314ad0fbb..ac77050255 100644 --- a/Documentation/diff-config.txt +++ b/Documentation/diff-config.txt @@ -99,7 +99,7 @@ diff.renameLimit:: detection; equivalent to the 'git diff' option '-l'. diff.renames:: - Tells git to detect renames. If set to any boolean value, it + Tells Git to detect renames. If set to any boolean value, it will enable basic rename detection. If set to "copies" or "copy", it will detect copies, as well. @@ -149,9 +149,27 @@ diff.<driver>.cachetextconv:: conversion outputs. See linkgit:gitattributes[5] for details. diff.tool:: - The diff tool to be used by linkgit:git-difftool[1]. This - option overrides `merge.tool`, and has the same valid built-in - values as `merge.tool` minus "tortoisemerge" and plus - "kompare". Any other value is treated as a custom diff tool, - and there must be a corresponding `difftool.<tool>.cmd` - option. + Controls which diff tool is used by linkgit:git-difftool[1]. + This variable overrides the value configured in `merge.tool`. + The list below shows the valid built-in values. + Any other value is treated as a custom diff tool and requires + that a corresponding difftool.<tool>.cmd variable is defined. + +include::mergetools-diff.txt[] + +diff.algorithm:: + Choose a diff algorithm. The variants are as follows: ++ +-- +`default`, `myers`;; + The basic greedy diff algorithm. Currently, this is the default. +`minimal`;; + Spend extra time to make sure the smallest possible diff is + produced. +`patience`;; + Use "patience diff" algorithm when generating patches. +`histogram`;; + This algorithm extends the patience algorithm to "support + low-occurrence common elements". +-- ++ diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 39f2c5074c..104579dc75 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -55,6 +55,26 @@ endif::git-format-patch[] --histogram:: Generate a diff using the "histogram diff" algorithm. +--diff-algorithm={patience|minimal|histogram|myers}:: + Choose a diff algorithm. The variants are as follows: ++ +-- +`default`, `myers`;; + The basic greedy diff algorithm. Currently, this is the default. +`minimal`;; + Spend extra time to make sure the smallest possible diff is + produced. +`patience`;; + Use "patience diff" algorithm when generating patches. +`histogram`;; + This algorithm extends the patience algorithm to "support + low-occurrence common elements". +-- ++ +For instance, if you configured diff.algorithm variable to a +non-default value and want to use the default one, then you +have to use `--diff-algorithm=default` option. + --stat[=<width>[,<name-width>[,<count>]]]:: Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -175,8 +195,8 @@ any of those replacements occurred. --color[=<when>]:: Show colored diff. - The value must be `always` (the default for `<when>`), `never`, or `auto`. - The default value is `never`. + `--color` (i.e. without '=<when>') is the same as `--color=always`. + '<when>' can be one of `always`, `never`, or `auto`. ifdef::git-diff[] It can be changed by the `color.ui` and `color.diff` configuration settings. @@ -283,7 +303,7 @@ few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the -original should remain in the result for git to consider it a total +original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines). + @@ -307,7 +327,7 @@ ifdef::git-log[] endif::git-log[] If `n` is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the - file's size). For example, `-M90%` means git should consider a + file's size). For example, `-M90%` means Git should consider a delete/add pair to be a rename if more than 90% of the file hasn't changed. Without a `%` sign, the number is to be read as a fraction, with a decimal point before it. I.e., `-M5` becomes diff --git a/Documentation/everyday.txt b/Documentation/everyday.txt index 048337b40f..e1fba85660 100644 --- a/Documentation/everyday.txt +++ b/Documentation/everyday.txt @@ -1,4 +1,4 @@ -Everyday GIT With 20 Commands Or So +Everyday Git With 20 Commands Or So =================================== <<Individual Developer (Standalone)>> commands are essential for @@ -12,7 +12,7 @@ commands in addition to the above. <<Repository Administration>> commands are for system administrators who are responsible for the care and feeding -of git repositories. +of Git repositories. Individual Developer (Standalone)[[Individual Developer (Standalone)]] @@ -87,7 +87,7 @@ $ git log v2.43.. curses/ <12> + <1> create a new topic branch. <2> revert your botched changes in `curses/ux_audio_oss.c`. -<3> you need to tell git if you added a new file; removal and +<3> you need to tell Git if you added a new file; removal and modification will be caught if you do `git commit -a` later. <4> to see what changes you are committing. <5> commit everything as you have tested, with your sign-off. @@ -229,7 +229,7 @@ commands in addition to the ones needed by participants. Examples ~~~~~~~~ -My typical GIT day.:: +My typical Git day.:: + ------------ $ git status <1> @@ -332,7 +332,7 @@ Run git-daemon to serve /pub/scm from xinetd.:: ------------ $ cat /etc/xinetd.d/git-daemon # default: off -# description: The git server offers access to git repositories +# description: The Git server offers access to Git repositories service git { disable = no diff --git a/Documentation/fetch-options.txt b/Documentation/fetch-options.txt index 6e98bdf149..9cb649673d 100644 --- a/Documentation/fetch-options.txt +++ b/Documentation/fetch-options.txt @@ -8,11 +8,15 @@ option old data in `.git/FETCH_HEAD` will be overwritten. --depth=<depth>:: - Deepen the history of a 'shallow' repository created by + Deepen or shorten the history of a 'shallow' repository created by `git clone` with `--depth=<depth>` option (see linkgit:git-clone[1]) to the specified number of commits from the tip of each remote branch history. Tags for the deepened commits are not fetched. +--unshallow:: + Convert a shallow repository to a complete one, removing all + the limitations imposed by shallow repositories. + ifndef::git-pull[] --dry-run:: Show what would be done, without making any changes. diff --git a/Documentation/git-add.txt b/Documentation/git-add.txt index fd9e36b99f..b0944e57d5 100644 --- a/Documentation/git-add.txt +++ b/Documentation/git-add.txt @@ -11,7 +11,7 @@ SYNOPSIS 'git add' [-n] [-v] [--force | -f] [--interactive | -i] [--patch | -p] [--edit | -e] [--all | [--update | -u]] [--intent-to-add | -N] [--refresh] [--ignore-errors] [--ignore-missing] [--] - [<filepattern>...] + [<pathspec>...] DESCRIPTION ----------- @@ -49,7 +49,7 @@ commit. OPTIONS ------- -<filepattern>...:: +<pathspec>...:: Files to add content from. Fileglobs (e.g. `*.c`) can be given to add all matching files. Also a leading directory name (e.g. `dir` to add `dir/file1` @@ -100,23 +100,26 @@ apply to the index. See EDITING PATCHES below. -u:: --update:: - Only match <filepattern> against already tracked files in - the index rather than the working tree. That means that it - will never stage new files, but that it will stage modified - new contents of tracked files and that it will remove files - from the index if the corresponding files in the working tree - have been removed. + Update the index just where it already has an entry matching + <pathspec>. This removes as well as modifies index entries to + match the working tree, but adds no new files. + -If no <filepattern> is given, default to "."; in other words, -update all tracked files in the current directory and its -subdirectories. +If no <pathspec> is given, the current version of Git defaults to +"."; in other words, update all tracked files in the current directory +and its subdirectories. This default will change in a future version +of Git, hence the form without <pathspec> should not be used. -A:: --all:: - Like `-u`, but match <filepattern> against files in the - working tree in addition to the index. That means that it - will find new files as well as staging modified content and - removing files that are no longer in the working tree. + Update the index not only where the working tree has a file + matching <pathspec> but also where the index already has an + entry. This adds, modifies, and removes index entries to + match the working tree. ++ +If no <pathspec> is given, the current version of Git defaults to +"."; in other words, update all files in the current directory +and its subdirectories. This default will change in a future version +of Git, hence the form without <pathspec> should not be used. -N:: --intent-to-add:: diff --git a/Documentation/git-apply.txt b/Documentation/git-apply.txt index 634b84e4b9..f605327946 100644 --- a/Documentation/git-apply.txt +++ b/Documentation/git-apply.txt @@ -24,7 +24,7 @@ Reads the supplied diff output (i.e. "a patch") and applies it to files. With the `--index` option the patch is also applied to the index, and with the `--cached` option the patch is only applied to the index. Without these options, the command applies the patch only to files, -and does not require them to be in a git repository. +and does not require them to be in a Git repository. This command applies the patch but does not create a commit. Use linkgit:git-am[1] to create commits from patches generated by @@ -198,7 +198,7 @@ behavior: * `fix` outputs warnings for a few such errors, and applies the patch after fixing them (`strip` is a synonym --- the tool used to consider only trailing whitespace characters as errors, and the - fix involved 'stripping' them, but modern gits do more). + fix involved 'stripping' them, but modern Gits do more). * `error` outputs warnings for a few such errors, and refuses to apply the patch. * `error-all` is similar to `error` but shows all errors. diff --git a/Documentation/git-archimport.txt b/Documentation/git-archimport.txt index f4504ba9bf..163b9f6f41 100644 --- a/Documentation/git-archimport.txt +++ b/Documentation/git-archimport.txt @@ -3,7 +3,7 @@ git-archimport(1) NAME ---- -git-archimport - Import an Arch repository into git +git-archimport - Import an Arch repository into Git SYNOPSIS @@ -40,13 +40,13 @@ directory. To follow the development of a project that uses Arch, rerun incremental imports. While 'git archimport' will try to create sensible branch names for the -archives that it imports, it is also possible to specify git branch names -manually. To do so, write a git branch name after each <archive/branch> +archives that it imports, it is also possible to specify Git branch names +manually. To do so, write a Git branch name after each <archive/branch> parameter, separated by a colon. This way, you can shorten the Arch -branch names and convert Arch jargon to git jargon, for example mapping a +branch names and convert Arch jargon to Git jargon, for example mapping a "PROJECT{litdd}devo{litdd}VERSION" branch to "master". -Associating multiple Arch branches to one git branch is possible; the +Associating multiple Arch branches to one Git branch is possible; the result will make the most sense only if no commits are made to the first branch, after the second branch is created. Still, this is useful to convert Arch repositories that had been rotated periodically. @@ -54,14 +54,14 @@ convert Arch repositories that had been rotated periodically. MERGES ------ -Patch merge data from Arch is used to mark merges in git as well. git +Patch merge data from Arch is used to mark merges in Git as well. Git does not care much about tracking patches, and only considers a merge when a branch incorporates all the commits since the point they forked. The end result -is that git will have a good idea of how far branches have diverged. So the +is that Git will have a good idea of how far branches have diverged. So the import process does lose some patch-trading metadata. Fortunately, when you try and merge branches imported from Arch, -git will find a good merge base, and it has a good chance of identifying +Git will find a good merge base, and it has a good chance of identifying patches that have been traded out-of-sequence between the branches. OPTIONS diff --git a/Documentation/git-archive.txt b/Documentation/git-archive.txt index 59d73e532f..b4c2e24849 100644 --- a/Documentation/git-archive.txt +++ b/Documentation/git-archive.txt @@ -128,7 +128,7 @@ export-ignore:: added to archive files. See linkgit:gitattributes[5] for details. export-subst:: - If the attribute export-subst is set for a file then git will + If the attribute export-subst is set for a file then Git will expand several placeholders when adding this file to an archive. See linkgit:gitattributes[5] for details. diff --git a/Documentation/git-bisect-lk2009.txt b/Documentation/git-bisect-lk2009.txt index ec4497e098..0eed3e3f29 100644 --- a/Documentation/git-bisect-lk2009.txt +++ b/Documentation/git-bisect-lk2009.txt @@ -224,7 +224,7 @@ Note that the example that we will use is really a toy example, we will be looking for the first commit that has a version like "2.6.26-something", that is the commit that has a "SUBLEVEL = 26" line in the top level Makefile. This is a toy example because there are -better ways to find this commit with git than using "git bisect" (for +better ways to find this commit with Git than using "git bisect" (for example "git blame" or "git log -S<string>"). Driving a bisection manually @@ -455,7 +455,7 @@ So only the W and B commits will be kept. Because commits X and Y will have been removed by rules a) and b) respectively, and because commits G are removed by rule b) too. -Note for git users, that it is equivalent as keeping only the commit +Note for Git users, that it is equivalent as keeping only the commit given by: ------------- @@ -710,8 +710,8 @@ Skip algorithm discussed After step 7) (in the skip algorithm), we could check if the second commit has been skipped and return it if it is not the case. And in fact that was the algorithm we used from when "git bisect skip" was -developed in git version 1.5.4 (released on February 1st 2008) until -git version 1.6.4 (released July 29th 2009). +developed in Git version 1.5.4 (released on February 1st 2008) until +Git version 1.6.4 (released July 29th 2009). But Ingo Molnar and H. Peter Anvin (another well known linux kernel developer) both complained that sometimes the best bisection points @@ -1025,10 +1025,10 @@ And here is what Andreas said about this work-flow <<5>>: _____________ To give some hard figures, we used to have an average report-to-fix cycle of 142.6 hours (according to our somewhat weird bug-tracker -which just measures wall-clock time). Since we moved to git, we've +which just measures wall-clock time). Since we moved to Git, we've lowered that to 16.2 hours. Primarily because we can stay on top of the bug fixing now, and because everyone's jockeying to get to fix -bugs (we're quite proud of how lazy we are to let git find the bugs +bugs (we're quite proud of how lazy we are to let Git find the bugs for us). Each new release results in ~40% fewer bugs (almost certainly due to how we now feel about writing tests). _____________ @@ -1228,9 +1228,9 @@ commits in already released history, for example to change the commit message or the author. And it can also be used instead of git "grafts" to link a repository with another old repository. -In fact it's this last feature that "sold" it to the git community, so -it is now in the "master" branch of git's git repository and it should -be released in git 1.6.5 in October or November 2009. +In fact it's this last feature that "sold" it to the Git community, so +it is now in the "master" branch of Git's Git repository and it should +be released in Git 1.6.5 in October or November 2009. One problem with "git replace" is that currently it stores all the replacements refs in "refs/replace/", but it would be perhaps better @@ -1324,7 +1324,7 @@ Acknowledgements ---------------- Many thanks to Junio Hamano for his help in reviewing this paper, for -reviewing the patches I sent to the git mailing list, for discussing +reviewing the patches I sent to the Git mailing list, for discussing some ideas and helping me improve them, for improving "git bisect" a lot and for his awesome work in maintaining and developing Git. @@ -1337,7 +1337,7 @@ Many thanks to Linus Torvalds for inventing, developing and evangelizing "git bisect", Git and Linux. Many thanks to the many other great people who helped one way or -another when I worked on git, especially to Andreas Ericsson, Johannes +another when I worked on Git, especially to Andreas Ericsson, Johannes Schindelin, H. Peter Anvin, Daniel Barkalow, Bill Lear, John Hawley, Shawn O. Pierce, Jeff King, Sam Vilain, Jon Seymour. diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index e4f46bc18d..f986c5cb3a 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -83,7 +83,7 @@ Bisect reset ~~~~~~~~~~~~ After a bisect session, to clean up the bisection state and return to -the original HEAD, issue the following command: +the original HEAD (i.e., to quit bisecting), issue the following command: ------------------------------------------------ $ git bisect reset @@ -169,14 +169,14 @@ the revision as good or bad in the usual manner. Bisect skip ~~~~~~~~~~~~ -Instead of choosing by yourself a nearby commit, you can ask git +Instead of choosing by yourself a nearby commit, you can ask Git to do it for you by issuing the command: ------------ $ git bisect skip # Current version cannot be tested ------------ -But git may eventually be unable to tell the first bad commit among +But Git may eventually be unable to tell the first bad commit among a bad commit and one or more skipped commits. You can even skip a range of commits, instead of just one commit, @@ -284,6 +284,7 @@ EXAMPLES ------------ $ git bisect start HEAD v1.2 -- # HEAD is bad, v1.2 is good $ git bisect run make # "make" builds the app +$ git bisect reset # quit the bisect session ------------ * Automatically bisect a test failure between origin and HEAD: @@ -291,6 +292,7 @@ $ git bisect run make # "make" builds the app ------------ $ git bisect start HEAD origin -- # HEAD is bad, origin is good $ git bisect run make test # "make test" builds and tests +$ git bisect reset # quit the bisect session ------------ * Automatically bisect a broken test case: @@ -302,6 +304,7 @@ make || exit 125 # this skips broken builds ~/check_test_case.sh # does the test case pass? $ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run ~/test.sh +$ git bisect reset # quit the bisect session ------------ + Here we use a "test.sh" custom script. In this script, if "make" @@ -351,6 +354,7 @@ use `git cherry-pick` instead of `git merge`.) ------------ $ git bisect start HEAD HEAD~10 -- # culprit is among the last 10 $ git bisect run sh -c "make || exit 125; ~/check_test_case.sh" +$ git bisect reset # quit the bisect session ------------ + This shows that you can do without a run script if you write the test @@ -368,6 +372,7 @@ $ git bisect run sh -c ' rm -f tmp.$$ test $rc = 0' +$ git bisect reset # quit the bisect session ------------ + In this case, when 'git bisect run' finishes, bisect/bad will refer to a commit that diff --git a/Documentation/git-blame.txt b/Documentation/git-blame.txt index e44173f66a..9a05c2b3d2 100644 --- a/Documentation/git-blame.txt +++ b/Documentation/git-blame.txt @@ -30,7 +30,7 @@ The report does not tell you anything about lines which have been deleted or replaced; you need to use a tool such as 'git diff' or the "pickaxe" interface briefly mentioned in the following paragraph. -Apart from supporting file annotation, git also supports searching the +Apart from supporting file annotation, Git also supports searching the development history for when a code snippet occurred in a change. This makes it possible to track when a code snippet was added to a file, moved or copied between files, and eventually deleted or replaced. It works by searching for diff --git a/Documentation/git-branch.txt b/Documentation/git-branch.txt index 45a225e0aa..b7cb625b89 100644 --- a/Documentation/git-branch.txt +++ b/Documentation/git-branch.txt @@ -22,13 +22,15 @@ SYNOPSIS DESCRIPTION ----------- -With no arguments, existing branches are listed and the current branch will -be highlighted with an asterisk. Option `-r` causes the remote-tracking -branches to be listed, and option `-a` shows both. This list mode is also -activated by the `--list` option (see below). -<pattern> restricts the output to matching branches, the pattern is a shell -wildcard (i.e., matched using fnmatch(3)). -Multiple patterns may be given; if any of them matches, the branch is shown. +If `--list` is given, or if there are no non-option arguments, existing +branches are listed; the current branch will be highlighted with an +asterisk. Option `-r` causes the remote-tracking branches to be listed, +and option `-a` shows both local and remote branches. If a `<pattern>` +is given, it is used as a shell wildcard to restrict the output to +matching branches. If multiple patterns are given, a branch is shown if +it matches any of the patterns. Note that when providing a +`<pattern>`, you must use `--list`; otherwise the command is interpreted +as branch creation. With `--contains`, shows only the branches that contain the named commit (in other words, the branches whose tip commits are descendants of the @@ -45,7 +47,7 @@ Note that this will create the new branch, but it will not switch the working tree to it; use "git checkout <newbranch>" to switch to the new branch. -When a local branch is started off a remote-tracking branch, git sets up the +When a local branch is started off a remote-tracking branch, Git sets up the branch so that 'git pull' will appropriately merge from the remote-tracking branch. This behavior may be changed via the global `branch.autosetupmerge` configuration flag. That setting can be @@ -193,15 +195,15 @@ start-point is either a local or remote-tracking branch. --contains [<commit>]:: Only list branches which contain the specified commit (HEAD - if not specified). + if not specified). Implies `--list`. --merged [<commit>]:: Only list branches whose tips are reachable from the - specified commit (HEAD if not specified). + specified commit (HEAD if not specified). Implies `--list`. --no-merged [<commit>]:: Only list branches whose tips are not reachable from the - specified commit (HEAD if not specified). + specified commit (HEAD if not specified). Implies `--list`. <branchname>:: The name of the branch to create or delete. diff --git a/Documentation/git-bundle.txt b/Documentation/git-bundle.txt index bc023cc5f3..0417562eb7 100644 --- a/Documentation/git-bundle.txt +++ b/Documentation/git-bundle.txt @@ -19,7 +19,7 @@ DESCRIPTION Some workflows require that one or more branches of development on one machine be replicated on another machine, but the two machines cannot -be directly connected, and therefore the interactive git protocols (git, +be directly connected, and therefore the interactive Git protocols (git, ssh, rsync, http) cannot be used. This command provides support for 'git fetch' and 'git pull' to operate by packaging objects and references in an archive at the originating machine, then importing those into diff --git a/Documentation/git-check-ignore.txt b/Documentation/git-check-ignore.txt new file mode 100644 index 0000000000..854e4d0c42 --- /dev/null +++ b/Documentation/git-check-ignore.txt @@ -0,0 +1,89 @@ +git-check-ignore(1) +=================== + +NAME +---- +git-check-ignore - Debug gitignore / exclude files + + +SYNOPSIS +-------- +[verse] +'git check-ignore' [options] pathname... +'git check-ignore' [options] --stdin < <list-of-paths> + +DESCRIPTION +----------- + +For each pathname given via the command-line or from a file via +`--stdin`, show the pattern from .gitignore (or other input files to +the exclude mechanism) that decides if the pathname is excluded or +included. Later patterns within a file take precedence over earlier +ones. + +OPTIONS +------- +-q, --quiet:: + Don't output anything, just set exit status. This is only + valid with a single pathname. + +-v, --verbose:: + Also output details about the matching pattern (if any) + for each given pathname. + +--stdin:: + Read file names from stdin instead of from the command-line. + +-z:: + The output format is modified to be machine-parseable (see + below). If `--stdin` is also given, input paths are separated + with a NUL character instead of a linefeed character. + +OUTPUT +------ + +By default, any of the given pathnames which match an ignore pattern +will be output, one per line. If no pattern matches a given path, +nothing will be output for that path; this means that path will not be +ignored. + +If `--verbose` is specified, the output is a series of lines of the form: + +<source> <COLON> <linenum> <COLON> <pattern> <HT> <pathname> + +<pathname> is the path of a file being queried, <pattern> is the +matching pattern, <source> is the pattern's source file, and <linenum> +is the line number of the pattern within that source. If the pattern +contained a `!` prefix or `/` suffix, it will be preserved in the +output. <source> will be an absolute path when referring to the file +configured by `core.excludesfile`, or relative to the repository root +when referring to `.git/info/exclude` or a per-directory exclude file. + +If `-z` is specified, the pathnames in the output are delimited by the +null character; if `--verbose` is also specified then null characters +are also used instead of colons and hard tabs: + +<source> <NULL> <linenum> <NULL> <pattern> <NULL> <pathname> <NULL> + + +EXIT STATUS +----------- + +0:: + One or more of the provided paths is ignored. + +1:: + None of the provided paths are ignored. + +128:: + A fatal error was encountered. + +SEE ALSO +-------- +linkgit:gitignore[5] +linkgit:gitconfig[5] +linkgit:git-ls-files[5] + +GIT +--- +Part of the linkgit:git[1] suite diff --git a/Documentation/git-check-ref-format.txt b/Documentation/git-check-ref-format.txt index 98009d1bd5..ec1739a896 100644 --- a/Documentation/git-check-ref-format.txt +++ b/Documentation/git-check-ref-format.txt @@ -18,14 +18,14 @@ DESCRIPTION Checks if a given 'refname' is acceptable, and exits with a non-zero status if it is not. -A reference is used in git to specify branches and tags. A +A reference is used in Git to specify branches and tags. A branch head is stored in the `refs/heads` hierarchy, while a tag is stored in the `refs/tags` hierarchy of the ref namespace (typically in `$GIT_DIR/refs/heads` and `$GIT_DIR/refs/tags` directories or, as entries in file `$GIT_DIR/packed-refs` if refs are packed by `git gc`). -git imposes the following rules on how references are named: +Git imposes the following rules on how references are named: . They can include slash `/` for hierarchical (directory) grouping, but no slash-separated component can begin with a diff --git a/Documentation/git-checkout.txt b/Documentation/git-checkout.txt index 6f04d22f5e..8edcdcae9d 100644 --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -333,7 +333,7 @@ a---b---c---d branch 'master' (refers to commit 'd') tag 'v2.0' (refers to commit 'b') ------------ -In fact, we can perform all the normal git operations. But, let's look +In fact, we can perform all the normal Git operations. But, let's look at what happens when we then checkout master: ------------ @@ -350,7 +350,7 @@ a---b---c---d branch 'master' (refers to commit 'd') It is important to realize that at this point nothing refers to commit 'f'. Eventually commit 'f' (and by extension commit 'e') will be deleted -by the routine git garbage collection process, unless we create a reference +by the routine Git garbage collection process, unless we create a reference before that happens. If we have not yet moved away from commit 'f', any of these will create a reference to it: diff --git a/Documentation/git-clean.txt b/Documentation/git-clean.txt index 9f42c0d0e6..bdc3ab80c7 100644 --- a/Documentation/git-clean.txt +++ b/Documentation/git-clean.txt @@ -16,7 +16,7 @@ DESCRIPTION Cleans the working tree by recursively removing files that are not under version control, starting from the current directory. -Normally, only files unknown to git are removed, but if the '-x' +Normally, only files unknown to Git are removed, but if the '-x' option is specified, ignored files are also removed. This can, for example, be useful to remove all build products. @@ -27,13 +27,13 @@ OPTIONS ------- -d:: Remove untracked directories in addition to untracked files. - If an untracked directory is managed by a different git + If an untracked directory is managed by a different Git repository, it is not removed by default. Use -f option twice if you really want to remove such a directory. -f:: --force:: - If the git configuration variable clean.requireForce is not set + If the Git configuration variable clean.requireForce is not set to false, 'git clean' will refuse to run unless given -f or -n. -n:: @@ -60,7 +60,7 @@ OPTIONS working directory to test a clean build. -X:: - Remove only files ignored by git. This may be useful to rebuild + Remove only files ignored by Git. This may be useful to rebuild everything from scratch, but keep manually created files. SEE ALSO diff --git a/Documentation/git-clone.txt b/Documentation/git-clone.txt index 7fefdb0384..5c16e317f6 100644 --- a/Documentation/git-clone.txt +++ b/Documentation/git-clone.txt @@ -43,7 +43,7 @@ OPTIONS --local:: -l:: When the repository to clone from is on a local machine, - this flag bypasses the normal "git aware" transport + this flag bypasses the normal "Git aware" transport 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 @@ -54,11 +54,11 @@ 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. +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. +usual "Git aware" transport mechanism, `--no-hardlinks` can be used. --no-hardlinks:: Optimize the cloning process from a repository on a @@ -76,9 +76,9 @@ usual "git aware" transport mechanism, `--no-hardlinks` can be used. *NOTE*: this is a possibly dangerous operation; do *not* use it unless you understand what it does. If you clone your repository using this option and then delete branches (or use any -other git command that makes any existing commit unreferenced) in the +other Git command that makes any existing commit unreferenced) in the source repository, some objects may become unreferenced (or dangling). -These objects may be removed by normal git operations (such as `git commit`) +These objects may be removed by normal Git operations (such as `git commit`) which automatically call `git gc --auto`. (See linkgit:git-gc[1].) If these objects are removed and were referenced by the cloned repository, then the cloned repository will become corrupt. @@ -125,7 +125,7 @@ objects from the source repository into a pack in the cloned repository. No checkout of HEAD is performed after the clone is complete. --bare:: - Make a 'bare' GIT repository. That is, instead of + Make a 'bare' Git repository. That is, instead of creating `<directory>` and placing the administrative files in `<directory>/.git`, make the `<directory>` itself the `$GIT_DIR`. This obviously implies the `-n` @@ -213,8 +213,8 @@ objects from the source repository into a pack in the cloned repository. --separate-git-dir=<git dir>:: Instead of placing the cloned repository where it is supposed to be, place the cloned repository at the specified directory, - then make a filesytem-agnostic git symbolic link to there. - The result is git repository can be separated from working + then make a filesytem-agnostic Git symbolic link to there. + The result is Git repository can be separated from working tree. diff --git a/Documentation/git-commit-tree.txt b/Documentation/git-commit-tree.txt index 6d5a04c83b..86ef56e7c8 100644 --- a/Documentation/git-commit-tree.txt +++ b/Documentation/git-commit-tree.txt @@ -30,7 +30,7 @@ While a tree represents a particular directory state of a working directory, a commit represents that state in "time", and explains how to get there. -Normally a commit would identify a new "HEAD" state, and while git +Normally a commit would identify a new "HEAD" state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file that is pointed at by `.git/HEAD`, so that we can always see what the last committed @@ -72,13 +72,13 @@ if set: GIT_COMMITTER_NAME GIT_COMMITTER_EMAIL GIT_COMMITTER_DATE - EMAIL (nb "<", ">" and "\n"s are stripped) In case (some of) these environment variables are not set, the information is taken from the configuration items user.name and user.email, or, if not -present, system user name and the hostname used for outgoing mail (taken +present, the environment variable EMAIL, or, if that is not set, +system user name and the hostname used for outgoing mail (taken from `/etc/mailname` and falling back to the fully qualified hostname when that file does not exist). diff --git a/Documentation/git-commit.txt b/Documentation/git-commit.txt index 7bdb039d5e..24a99ccc99 100644 --- a/Documentation/git-commit.txt +++ b/Documentation/git-commit.txt @@ -32,7 +32,7 @@ The content to be added can be specified in several ways: 3. by listing files as arguments to the 'commit' command, in which case the commit will ignore changes staged in the index, and instead record the current content of the listed files (which must already - be known to git); + be known to Git); 4. by using the -a switch with the 'commit' command to automatically "add" changes from all known files (i.e. all files that are already @@ -59,7 +59,7 @@ OPTIONS --all:: Tell the command to automatically stage files that have been modified and deleted, but new files you have not - told git about are not affected. + told Git about are not affected. -p:: --patch:: @@ -172,14 +172,25 @@ OPTIONS linkgit:git-commit-tree[1]. --cleanup=<mode>:: - This option sets how the commit message is cleaned up. - The '<mode>' can be one of 'verbatim', 'whitespace', 'strip', - and 'default'. The 'default' mode will strip leading and - trailing empty lines and #commentary from the commit message - only if the message is to be edited. Otherwise only whitespace - removed. The 'verbatim' mode does not change message at all, - 'whitespace' removes just leading/trailing whitespace lines - and 'strip' removes both whitespace and commentary. + This option determines how the supplied commit message should be + cleaned up before committing. The '<mode>' can be `strip`, + `whitespace`, `verbatim`, or `default`. ++ +-- +strip:: + Strip leading and trailing empty lines, trailing whitespace, and + #commentary and collapse consecutive empty lines. +whitespace:: + Same as `strip` except #commentary is not removed. +verbatim:: + Do not change the message at all. +default:: + Same as `strip` if the message is to be edited. + Otherwise `whitespace`. +-- ++ +The default can be changed by the 'commit.cleanup' configuration +variable (see linkgit:git-config[1]). -e:: --edit:: @@ -402,7 +413,7 @@ Though not required, it's a good idea to begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated -as the commit title, and that title is used throughout git. +as the commit title, and that title is used throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body. diff --git a/Documentation/git-count-objects.txt b/Documentation/git-count-objects.txt index 23c80cea64..da6e72e696 100644 --- a/Documentation/git-count-objects.txt +++ b/Documentation/git-count-objects.txt @@ -20,11 +20,23 @@ OPTIONS ------- -v:: --verbose:: - In addition to the number of loose objects and disk - space consumed, it reports the number of in-pack - objects, number of packs, disk space consumed by those packs, - and number of objects that can be removed by running - `git prune-packed`. + Report in more detail: ++ +count: the number of loose objects ++ +size: disk space consumed by loose objects, in KiB ++ +in-pack: the number of in-pack objects ++ +size-pack: disk space consumed by the packs, in KiB ++ +prune-packable: the number of loose objects that are also present in +the packs. These objects could be pruned using `git prune-packed`. ++ +garbage: the number of files in object database that are not valid +loose objects nor valid packs ++ +size-garbage: disk space consumed by garbage files, in KiB GIT --- diff --git a/Documentation/git-credential-cache.txt b/Documentation/git-credential-cache.txt index eeff5fa989..89b730632d 100644 --- a/Documentation/git-credential-cache.txt +++ b/Documentation/git-credential-cache.txt @@ -14,13 +14,13 @@ git config credential.helper 'cache [options]' DESCRIPTION ----------- -This command caches credentials in memory for use by future git +This command caches credentials in memory for use by future Git programs. The stored credentials never touch the disk, and are forgotten after a configurable timeout. The cache is accessible over a Unix domain socket, restricted to the current user by filesystem permissions. You probably don't want to invoke this command directly; it is meant to -be used as a credential helper by other parts of git. See +be used as a credential helper by other parts of Git. See linkgit:gitcredentials[7] or `EXAMPLES` below. OPTIONS diff --git a/Documentation/git-credential-store.txt b/Documentation/git-credential-store.txt index b27c03c361..8481cae70e 100644 --- a/Documentation/git-credential-store.txt +++ b/Documentation/git-credential-store.txt @@ -20,7 +20,7 @@ security tradeoff, try linkgit:git-credential-cache[1], or find a helper that integrates with secure storage provided by your operating system. This command stores credentials indefinitely on disk for use by future -git programs. +Git programs. You probably don't want to invoke this command directly; it is meant to be used as a credential helper by other parts of git. See @@ -63,11 +63,11 @@ stored on its own line as a URL like: https://user:pass@example.com ------------------------------ -When git needs authentication for a particular URL context, +When Git needs authentication for a particular URL context, credential-store will consider that context a pattern to match against each entry in the credentials file. If the protocol, hostname, and username (if we already have one) match, then the password is returned -to git. See the discussion of configuration in linkgit:gitcredentials[7] +to Git. See the discussion of configuration in linkgit:gitcredentials[7] for more information. GIT diff --git a/Documentation/git-credential.txt b/Documentation/git-credential.txt index 810e957124..472f00f607 100644 --- a/Documentation/git-credential.txt +++ b/Documentation/git-credential.txt @@ -18,9 +18,9 @@ Git has an internal interface for storing and retrieving credentials from system-specific helpers, as well as prompting the user for usernames and passwords. The git-credential command exposes this interface to scripts which may want to retrieve, store, or prompt for -credentials in the same manner as git. The design of this scriptable +credentials in the same manner as Git. The design of this scriptable interface models the internal C API; see -link:technical/api-credentials.txt[the git credential API] for more +link:technical/api-credentials.txt[the Git credential API] for more background on the concepts. git-credential takes an "action" option on the command-line (one of @@ -74,7 +74,7 @@ infomation it has): password=secr3t + In most cases, this means the attributes given in the input will be -repeated in the output, but git may also modify the credential +repeated in the output, but Git may also modify the credential description, for example by removing the `path` attribute when the protocol is HTTP(s) and `credential.useHttpPath` is false. + diff --git a/Documentation/git-cvsexportcommit.txt b/Documentation/git-cvsexportcommit.txt index 7f79cec3f8..00154b6c85 100644 --- a/Documentation/git-cvsexportcommit.txt +++ b/Documentation/git-cvsexportcommit.txt @@ -15,8 +15,8 @@ SYNOPSIS DESCRIPTION ----------- -Exports a commit from GIT to a CVS checkout, making it easier -to merge patches from a git repository into a CVS repository. +Exports a commit from Git to a CVS checkout, making it easier +to merge patches from a Git repository into a CVS repository. Specify the name of a CVS checkout using the -w switch or execute it from the root of the CVS working copy. In the latter case GIT_DIR must @@ -71,7 +71,7 @@ OPTIONS -w:: Specify the location of the CVS checkout to use for the export. This option does not require GIT_DIR to be set before execution if the - current directory is within a git repository. The default is the + current directory is within a Git repository. The default is the value of 'cvsexportcommit.cvsdir'. -W:: diff --git a/Documentation/git-cvsimport.txt b/Documentation/git-cvsimport.txt index 9d5353e8be..d1bcda28f4 100644 --- a/Documentation/git-cvsimport.txt +++ b/Documentation/git-cvsimport.txt @@ -18,7 +18,13 @@ SYNOPSIS DESCRIPTION ----------- -Imports a CVS repository into git. It will either create a new +*WARNING:* `git cvsimport` uses cvsps version 2, which is considered +deprecated; it does not work with cvsps version 3 and later. If you are +performing a one-shot import of a CVS repository consider using +link:http://cvs2svn.tigris.org/cvs2git.html[cvs2git] or +link:https://github.com/BartMassey/parsecvs[parsecvs]. + +Imports a CVS repository into Git. It will either create a new repository, or incrementally import into an existing one. Splitting the CVS log into patch sets is done by 'cvsps'. @@ -59,18 +65,18 @@ OPTIONS `CVS/Repository`. -C <target-dir>:: - The git repository to import to. If the directory doesn't + The Git repository to import to. If the directory doesn't exist, it will be created. Default is the current directory. -r <remote>:: - The git remote to import this CVS repository into. + The Git remote to import this CVS repository into. Moves all CVS branches into remotes/<remote>/<branch> akin to the way 'git clone' uses 'origin' by default. -o <branch-for-HEAD>:: When no remote is specified (via -r) the 'HEAD' branch - from CVS is imported to the 'origin' branch within the git - repository, as 'HEAD' already has a special meaning for git. + from CVS is imported to the 'origin' branch within the Git + repository, as 'HEAD' already has a special meaning for Git. When a remote is specified the 'HEAD' branch is named remotes/<remote>/master mirroring 'git clone' behaviour. Use this option if you want to import into a different diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt index 88d814af0e..472f5cbd07 100644 --- a/Documentation/git-cvsserver.txt +++ b/Documentation/git-cvsserver.txt @@ -3,7 +3,7 @@ git-cvsserver(1) NAME ---- -git-cvsserver - A CVS server emulator for git +git-cvsserver - A CVS server emulator for Git SYNOPSIS -------- @@ -60,7 +60,7 @@ unless '--export-all' was given, too. DESCRIPTION ----------- -This application is a CVS emulation layer for git. +This application is a CVS emulation layer for Git. It is highly functional. However, not all methods are implemented, and for those methods that are implemented, @@ -72,9 +72,9 @@ plugin. Most functionality works fine with both of these clients. LIMITATIONS ----------- -CVS clients cannot tag, branch or perform GIT merges. +CVS clients cannot tag, branch or perform Git merges. -'git-cvsserver' maps GIT branches to CVS modules. This is very different +'git-cvsserver' maps Git branches to CVS modules. This is very different from what most CVS users would expect since in CVS modules usually represent one or more directories. @@ -130,7 +130,7 @@ Then provide your password via the pserver method, for example: ------ cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name> ------ -No special setup is needed for SSH access, other than having GIT tools +No special setup is needed for SSH access, other than having Git tools in the PATH. If you have clients that do not accept the CVS_SERVER environment variable, you can rename 'git-cvsserver' to `cvs`. @@ -160,9 +160,9 @@ with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean Note: you need to ensure each user that is going to invoke 'git-cvsserver' has write access to the log file and to the database (see <<dbbackend,Database Backend>>. If you want to offer write access over -SSH, the users of course also need write access to the git repository itself. +SSH, the users of course also need write access to the Git repository itself. -You also need to ensure that each repository is "bare" (without a git index +You also need to ensure that each repository is "bare" (without a Git index file) for `cvs commit` to work. See linkgit:gitcvs-migration[7]. [[configaccessmethod]] @@ -181,7 +181,7 @@ allowing access over SSH. 3. If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command, automatically saving it in your 'CVS/Root' files, then you need to set them explicitly in your environment. CVSROOT should be set as per normal, but the - directory should point at the appropriate git repo. As above, for SSH clients + directory should point at the appropriate Git repo. As above, for SSH clients _not_ restricted to 'git-shell', CVS_SERVER should be set to 'git-cvsserver'. + -- @@ -197,7 +197,7 @@ allowing access over SSH. shell is bash, .bashrc may be a reasonable alternative. 5. Clients should now be able to check out the project. Use the CVS 'module' - name to indicate what GIT 'head' you want to check out. This also sets the + name to indicate what Git 'head' you want to check out. This also sets the name of your newly checked-out directory, unless you tell it otherwise with `-d <dir_name>`. For example, this checks out 'master' branch to the `project-master` directory: @@ -210,7 +210,7 @@ allowing access over SSH. Database Backend ---------------- -'git-cvsserver' uses one database per git head (i.e. CVS module) to +'git-cvsserver' uses one database per Git head (i.e. CVS module) to store information about the repository to maintain consistent CVS revision numbers. The database needs to be updated (i.e. written to) after every commit. @@ -225,7 +225,7 @@ the pserver method), 'git-cvsserver' should have write access to the database to work reliably (otherwise you need to make sure that the database is up-to-date any time 'git-cvsserver' is executed). -By default it uses SQLite databases in the git directory, named +By default it uses SQLite databases in the Git directory, named `gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates temporary files in the same directory as the database file on write so it might not be enough to grant the users using @@ -291,14 +291,14 @@ Variable substitution In `dbdriver` and `dbuser` you can use the following variables: %G:: - git directory name + Git directory name %g:: - git directory name, where all characters except for + Git directory name, where all characters except for alpha-numeric ones, `.`, and `-` are replaced with `_` (this should make it easier to use the directory name in a filename if wanted) %m:: - CVS module/git head name + CVS module/Git head name %a:: access method (one of "ext" or "pserver") %u:: @@ -359,6 +359,43 @@ Operations supported All the operations required for normal use are supported, including checkout, diff, status, update, log, add, remove, commit. + +Most CVS command arguments that read CVS tags or revision numbers +(typically -r) work, and also support any git refspec +(tag, branch, commit ID, etc). +However, CVS revision numbers for non-default branches are not well +emulated, and cvs log does not show tags or branches at +all. (Non-main-branch CVS revision numbers superficially resemble CVS +revision numbers, but they actually encode a git commit ID directly, +rather than represent the number of revisions since the branch point.) + +Note that there are two ways to checkout a particular branch. +As described elsewhere on this page, the "module" parameter +of cvs checkout is interpreted as a branch name, and it becomes +the main branch. It remains the main branch for a given sandbox +even if you temporarily make another branch sticky with +cvs update -r. Alternatively, the -r argument can indicate +some other branch to actually checkout, even though the module +is still the "main" branch. Tradeoffs (as currently +implemented): Each new "module" creates a new database on disk with +a history for the given module, and after the database is created, +operations against that main branch are fast. Or alternatively, +-r doesn't take any extra disk space, but may be significantly slower for +many operations, like cvs update. + +If you want to refer to a git refspec that has characters that are +not allowed by CVS, you have two options. First, it may just work +to supply the git refspec directly to the appropriate CVS -r argument; +some CVS clients don't seem to do much sanity checking of the argument. +Second, if that fails, you can use a special character escape mechanism +that only uses characters that are valid in CVS tags. A sequence +of 4 or 5 characters of the form (underscore (`"_"`), dash (`"-"`), +one or two characters, and dash (`"-"`)) can encode various characters based +on the one or two letters: `"s"` for slash (`"/"`), `"p"` for +period (`"."`), `"u"` for underscore (`"_"`), or two hexadecimal digits +for any byte value at all (typically an ASCII number, or perhaps a part +of a UTF-8 encoded character). + Legacy monitoring operations are not supported (edit, watch and related). Exports and tagging (tags and branches) are not supported at this stage. diff --git a/Documentation/git-daemon.txt b/Documentation/git-daemon.txt index 7e5098a95e..77da564134 100644 --- a/Documentation/git-daemon.txt +++ b/Documentation/git-daemon.txt @@ -3,7 +3,7 @@ git-daemon(1) NAME ---- -git-daemon - A really simple server for git repositories +git-daemon - A really simple server for Git repositories SYNOPSIS -------- @@ -22,12 +22,12 @@ SYNOPSIS DESCRIPTION ----------- -A really simple TCP git daemon that normally listens on port "DEFAULT_GIT_PORT" +A really simple TCP Git daemon that normally listens on port "DEFAULT_GIT_PORT" aka 9418. It waits for a connection asking for a service, and will serve that service if it is enabled. It verifies that the directory has the magic file "git-daemon-export-ok", and -it will refuse to export any git directory that hasn't explicitly been marked +it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the '--export-all' parameter is specified). If you pass some directory paths as 'git daemon' arguments, you can further restrict the offers to a whitelist comprising of those. @@ -37,7 +37,7 @@ By default, only `upload-pack` service is enabled, which serves from 'git fetch', 'git pull', and 'git clone'. This is ideally suited for read-only updates, i.e., pulling from -git repositories. +Git repositories. An `upload-archive` also exists to serve 'git archive'. @@ -51,7 +51,7 @@ OPTIONS --base-path=<path>:: Remap all the path requests as relative to the given path. - This is sort of "GIT root" - if you run 'git daemon' with + This is sort of "Git root" - if you run 'git daemon' with '--base-path=/srv/git' on example.com, then if you later try to pull 'git://example.com/hello.git', 'git daemon' will interpret the path as '/srv/git/hello.git'. @@ -73,7 +73,7 @@ OPTIONS whitelist. --export-all:: - Allow pulling from all directories that look like GIT repositories + Allow pulling from all directories that look like Git repositories (have the 'objects' and 'refs' subdirectories), even if they do not have the 'git-daemon-export-ok' file. diff --git a/Documentation/git-describe.txt b/Documentation/git-describe.txt index 72d6bb612b..3c81e85ec5 100644 --- a/Documentation/git-describe.txt +++ b/Documentation/git-describe.txt @@ -81,8 +81,9 @@ OPTIONS that points at object deadbee....). --match <pattern>:: - Only consider tags matching the given pattern (can be used to avoid - leaking private tags made from the repository). + Only consider tags matching the given `glob(7)` pattern, + excluding the "refs/tags/" prefix. This can be used to avoid + leaking private tags from the repository. --always:: Show uniquely abbreviated commit object as fallback. @@ -131,7 +132,7 @@ closest tagname without any suffix: Note that the suffix you get if you type these commands today may be longer than what Linus saw above when he ran these commands, as your -git repository may have new commits whose object names begin with +Git repository may have new commits whose object names begin with 975b that did not exist back then, and "-g975b" suffix alone may not be sufficient to disambiguate these commits. diff --git a/Documentation/git-diff.txt b/Documentation/git-diff.txt index f8c06013f3..a7b46208f6 100644 --- a/Documentation/git-diff.txt +++ b/Documentation/git-diff.txt @@ -25,7 +25,7 @@ between two files on disk. This form is to view the changes you made relative to the index (staging area for the next commit). In other - words, the differences are what you _could_ tell git to + words, the differences are what you _could_ tell Git to further add to the index but you still haven't. You can stage these changes by using linkgit:git-add[1]. + diff --git a/Documentation/git-difftool.txt b/Documentation/git-difftool.txt index 73ca7025a3..e0e12e9470 100644 --- a/Documentation/git-difftool.txt +++ b/Documentation/git-difftool.txt @@ -12,7 +12,7 @@ SYNOPSIS DESCRIPTION ----------- -'git difftool' is a git command that allows you to compare and edit files +'git difftool' is a Git command that allows you to compare and edit files between revisions using common diff tools. 'git difftool' is a frontend to 'git diff' and accepts the same options and arguments. See linkgit:git-diff[1]. diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 3da5cc272a..bf1a02a80d 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -33,34 +33,46 @@ the frontend program in use. OPTIONS ------- ---date-format=<fmt>:: - Specify the type of dates the frontend will supply to - fast-import within `author`, `committer` and `tagger` commands. - See ``Date Formats'' below for details about which formats - are supported, and their syntax. --force:: Force updating modified existing branches, even if doing so would cause commits to be lost (as the new commit does not contain the old commit). ---max-pack-size=<n>:: - Maximum size of each output packfile. - The default is unlimited. +--quiet:: + Disable all non-fatal output, making fast-import silent when it + is successful. This option disables the output shown by + \--stats. ---big-file-threshold=<n>:: - Maximum size of a blob that fast-import will attempt to - create a delta for, expressed in bytes. The default is 512m - (512 MiB). Some importers may wish to lower this on systems - with constrained memory. +--stats:: + Display some basic statistics about the objects fast-import has + created, the packfiles they were stored into, and the + memory used by fast-import during this run. Showing this output + is currently the default, but can be disabled with \--quiet. ---depth=<n>:: - Maximum delta depth, for blob and tree deltification. - Default is 10. +Options for Frontends +~~~~~~~~~~~~~~~~~~~~~ ---active-branches=<n>:: - Maximum number of branches to maintain active at once. - See ``Memory Utilization'' below for details. Default is 5. +--cat-blob-fd=<fd>:: + Write responses to `cat-blob` and `ls` queries to the + file descriptor <fd> instead of `stdout`. Allows `progress` + output intended for the end-user to be separated from other + output. + +--date-format=<fmt>:: + Specify the type of dates the frontend will supply to + fast-import within `author`, `committer` and `tagger` commands. + See ``Date Formats'' below for details about which formats + are supported, and their syntax. + +--done:: + Terminate with error if there is no `done` command at the end of + the stream. This option might be useful for detecting errors + that cause the frontend to terminate before it has started to + write a stream. + +Locations of Marks Files +~~~~~~~~~~~~~~~~~~~~~~~~ --export-marks=<file>:: Dumps the internal marks table to <file> when complete. @@ -83,32 +95,33 @@ OPTIONS Like --import-marks but instead of erroring out, silently skips the file if it does not exist. ---relative-marks:: +--[no-]relative-marks:: After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative to the .git/info/fast-import directory. However, other importers may use a different location. ++ +Relative and non-relative marks may be combined by interweaving +--(no-)-relative-marks with the --(import|export)-marks= options. ---no-relative-marks:: - Negates a previous --relative-marks. Allows for combining - relative and non-relative marks by interweaving - --(no-)-relative-marks with the --(import|export)-marks= - options. +Performance and Compression Tuning +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ---cat-blob-fd=<fd>:: - Write responses to `cat-blob` and `ls` queries to the - file descriptor <fd> instead of `stdout`. Allows `progress` - output intended for the end-user to be separated from other - output. +--active-branches=<n>:: + Maximum number of branches to maintain active at once. + See ``Memory Utilization'' below for details. Default is 5. ---done:: - Terminate with error if there is no `done` command at the - end of the stream. - This option might be useful for detecting errors that - cause the frontend to terminate before it has started to - write a stream. +--big-file-threshold=<n>:: + Maximum size of a blob that fast-import will attempt to + create a delta for, expressed in bytes. The default is 512m + (512 MiB). Some importers may wish to lower this on systems + with constrained memory. + +--depth=<n>:: + Maximum delta depth, for blob and tree deltification. + Default is 10. --export-pack-edges=<file>:: After creating a packfile, print a line of data to @@ -119,16 +132,9 @@ OPTIONS as these commits can be used as edge points during calls to 'git pack-objects'. ---quiet:: - Disable all non-fatal output, making fast-import silent when it - is successful. This option disables the output shown by - \--stats. - ---stats:: - Display some basic statistics about the objects fast-import has - created, the packfiles they were stored into, and the - memory used by fast-import during this run. Showing this output - is currently the default, but can be disabled with \--quiet. +--max-pack-size=<n>:: + Maximum size of each output packfile. + The default is unlimited. Performance diff --git a/Documentation/git-fetch-pack.txt b/Documentation/git-fetch-pack.txt index 8c751202d7..b81e90d8e7 100644 --- a/Documentation/git-fetch-pack.txt +++ b/Documentation/git-fetch-pack.txt @@ -84,6 +84,8 @@ be in a separate packet, and the list must end with a flush packet. --depth=<n>:: Limit fetching to ancestor-chains not longer than n. + 'git-upload-pack' treats the special depth 2147483647 as + infinite even if there is an ancestor-chain that long. --no-progress:: Do not show the progress. diff --git a/Documentation/git-fetch.txt b/Documentation/git-fetch.txt index b41d7c1de1..e08a028946 100644 --- a/Documentation/git-fetch.txt +++ b/Documentation/git-fetch.txt @@ -80,7 +80,7 @@ Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself can not be fetched, making it impossible to check out that submodule later without -having to do a fetch again. This is expected to be fixed in a future git +having to do a fetch again. This is expected to be fixed in a future Git version. SEE ALSO diff --git a/Documentation/git-filter-branch.txt b/Documentation/git-filter-branch.txt index e2301f5c01..e4c8e82660 100644 --- a/Documentation/git-filter-branch.txt +++ b/Documentation/git-filter-branch.txt @@ -18,7 +18,7 @@ SYNOPSIS DESCRIPTION ----------- -Lets you rewrite git revision history by rewriting the branches mentioned +Lets you rewrite Git revision history by rewriting the branches mentioned in the <rev-list options>, applying custom filters on each revision. Those filters can modify each tree (e.g. removing a file or running a perl rewrite on all files) or information about each commit. @@ -29,7 +29,7 @@ The command will only rewrite the _positive_ refs mentioned in the command line (e.g. if you pass 'a..b', only 'b' will be rewritten). If you specify no filters, the commits will be recommitted without any changes, which would normally have no effect. Nevertheless, this may be -useful in the future for compensating for some git bugs or such, +useful in the future for compensating for some Git bugs or such, therefore such a usage is permitted. *NOTE*: This command honors `.git/info/grafts` file and refs in @@ -64,8 +64,11 @@ argument is always evaluated in the shell context using the 'eval' command Prior to that, the $GIT_COMMIT environment variable will be set to contain the id of the commit being rewritten. Also, GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, GIT_AUTHOR_DATE, GIT_COMMITTER_NAME, GIT_COMMITTER_EMAIL, -and GIT_COMMITTER_DATE are set according to the current commit. The values -of these variables after the filters have run, are used for the new commit. +and GIT_COMMITTER_DATE are taken from the current commit and exported to +the environment, in order to affect the author and committer identities of +the replacement commit created by linkgit:git-commit-tree[1] after the +filters have run. + If any evaluation of <command> returns a non-zero exit status, the whole operation will be aborted. @@ -329,6 +332,26 @@ git filter-branch --msg-filter ' ' HEAD~10..HEAD -------------------------------------------------------- +The `--env-filter` option can be used to modify committer and/or author +identity. For example, if you found out that your commits have the wrong +identity due to a misconfigured user.email, you can make a correction, +before publishing the project, like this: + +-------------------------------------------------------- +git filter-branch --env-filter ' + if test "$GIT_AUTHOR_EMAIL" = "root@localhost" + then + GIT_AUTHOR_EMAIL=john@example.com + export GIT_AUTHOR_EMAIL + fi + if test "$GIT_COMMITTER_EMAIL" = "root@localhost" + then + GIT_COMMITTER_EMAIL=john@example.com + export GIT_COMMITTER_EMAIL + fi +' -- --all +-------------------------------------------------------- + To restrict rewriting to only part of the history, specify a revision range in addition to the new branch name. The new branch name will point to the top-most revision that a 'git rev-list' of this range @@ -374,7 +397,7 @@ git-filter-branch is often used to get rid of a subset of files, usually with some combination of `--index-filter` and `--subdirectory-filter`. People expect the resulting repository to be smaller than the original, but you need a few more steps to -actually make it smaller, because git tries hard not to lose your +actually make it smaller, because Git tries hard not to lose your objects until you tell it to. First make sure that: * You really removed all variants of a filename, if a blob was moved diff --git a/Documentation/git-for-each-ref.txt b/Documentation/git-for-each-ref.txt index db55a4e0bb..f2e08d11c1 100644 --- a/Documentation/git-for-each-ref.txt +++ b/Documentation/git-for-each-ref.txt @@ -117,7 +117,7 @@ returns an empty string instead. As a special case for the date-type fields, you may specify a format for the date by adding one of `:default`, `:relative`, `:short`, `:local`, -`:iso8601` or `:rfc2822` to the end of the fieldname; e.g. +`:iso8601`, `:rfc2822` or `:raw` to the end of the fieldname; e.g. `%(taggerdate:relative)`. diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 9a914d0159..3a62f50eda 100644 --- a/Documentation/git-format-patch.txt +++ b/Documentation/git-format-patch.txt @@ -208,14 +208,14 @@ The expected use case of this is to write supporting explanation for the commit that does not belong to the commit log message proper, and include it with the patch submission. While one can simply write these explanations after `format-patch` has run but before sending, -keeping them as git notes allows them to be maintained between versions +keeping them as Git notes allows them to be maintained between versions of the patch series (but see the discussion of the `notes.rewrite` configuration options in linkgit:git-notes[1] to use this workflow). --[no]-signature=<signature>:: Add a signature to each message produced. Per RFC 3676 the signature is separated from the body by a line with '-- ' on it. If the - signature option is omitted the signature defaults to the git version + signature option is omitted the signature defaults to the Git version number. --suffix=.<sfx>:: @@ -389,7 +389,7 @@ Thunderbird ~~~~~~~~~~~ By default, Thunderbird will both wrap emails as well as flag them as being 'format=flowed', both of which will make the -resulting email unusable by git. +resulting email unusable by Git. There are three different approaches: use an add-on to turn off line wraps, configure Thunderbird to not mangle patches, or use @@ -525,8 +525,8 @@ $ git format-patch -M -B origin Additionally, it detects and handles renames and complete rewrites intelligently to produce a renaming patch. A renaming patch reduces the amount of text output, and generally makes it easier to review. -Note that non-git "patch" programs won't understand renaming patches, so -use it only when you know the recipient uses git to apply your patch. +Note that non-Git "patch" programs won't understand renaming patches, so +use it only when you know the recipient uses Git to apply your patch. * Extract three topmost commits from the current branch and format them as e-mailable patches: diff --git a/Documentation/git-fsck.txt b/Documentation/git-fsck.txt index da348fc942..eff91889d7 100644 --- a/Documentation/git-fsck.txt +++ b/Documentation/git-fsck.txt @@ -56,7 +56,7 @@ index file, all SHA1 references in `refs` namespace, and all reflogs ($GIT_DIR/objects), but also the ones found in alternate object pools listed in GIT_ALTERNATE_OBJECT_DIRECTORIES or $GIT_DIR/objects/info/alternates, - and in packed git archives found in $GIT_DIR/objects/pack + and in packed Git archives found in $GIT_DIR/objects/pack and corresponding pack subdirectories in alternate object pools. This is now default; you can turn it off with --no-full. @@ -64,8 +64,8 @@ index file, all SHA1 references in `refs` namespace, and all reflogs --strict:: Enable more strict checking, namely to catch a file mode recorded with g+w bit set, which was created by older - versions of git. Existing repositories, including the - Linux kernel, git itself, and sparse repository have old + versions of Git. Existing repositories, including the + Linux kernel, Git itself, and sparse repository have old objects that triggers this check, but it is recommended to check new projects with this flag. diff --git a/Documentation/git-grep.txt b/Documentation/git-grep.txt index cfecf848fb..50d46e1a7b 100644 --- a/Documentation/git-grep.txt +++ b/Documentation/git-grep.txt @@ -61,7 +61,7 @@ OPTIONS blobs registered in the index file. --no-index:: - Search files in the current directory that is not managed by git. + Search files in the current directory that is not managed by Git. --untracked:: In addition to searching in the tracked files in the working diff --git a/Documentation/git-gui.txt b/Documentation/git-gui.txt index 0041994443..8144527ae0 100644 --- a/Documentation/git-gui.txt +++ b/Documentation/git-gui.txt @@ -102,7 +102,7 @@ Examples SEE ALSO -------- linkgit:gitk[1]:: - The git repository browser. Shows branches, commit history + The Git repository browser. Shows branches, commit history and file differences. gitk is the utility started by 'git gui''s Repository Visualize actions. diff --git a/Documentation/git-hash-object.txt b/Documentation/git-hash-object.txt index 4b0a502e8e..02c1f12685 100644 --- a/Documentation/git-hash-object.txt +++ b/Documentation/git-hash-object.txt @@ -40,7 +40,7 @@ OPTIONS --path:: Hash object as it were located at the given path. The location of file does not directly influence on the hash value, but path is - used to determine what git filters should be applied to the object + used to determine what Git filters should be applied to the object before it can be placed to the object database, and, as result of applying filters, the actual blob put into the object database may differ from the given file. This option is mainly useful for hashing diff --git a/Documentation/git-help.txt b/Documentation/git-help.txt index 9e0b3f6811..e07b6dc19a 100644 --- a/Documentation/git-help.txt +++ b/Documentation/git-help.txt @@ -3,7 +3,7 @@ git-help(1) NAME ---- -git-help - display help information about git +git-help - Display help information about Git SYNOPSIS -------- @@ -14,13 +14,13 @@ DESCRIPTION ----------- With no options and no COMMAND given, the synopsis of the 'git' -command and a list of the most commonly used git commands are printed +command and a list of the most commonly used Git commands are printed on the standard output. If the option '--all' or '-a' is given, then all available commands are printed on the standard output. -If a git command is named, a manual page for that command is brought +If a Git subcommand is named, a manual page for that subcommand is brought up. The 'man' program is used by default for this purpose, but this can be overridden by other options or configuration variables. diff --git a/Documentation/git-http-backend.txt b/Documentation/git-http-backend.txt index f4e0741c11..7b1e85cd15 100644 --- a/Documentation/git-http-backend.txt +++ b/Documentation/git-http-backend.txt @@ -19,7 +19,7 @@ and the backwards-compatible dumb HTTP protocol, as well as clients pushing using the smart HTTP protocol. It verifies that the directory has the magic file -"git-daemon-export-ok", and it will refuse to export any git directory +"git-daemon-export-ok", and it will refuse to export any Git directory that hasn't explicitly been marked for export this way (unless the GIT_HTTP_EXPORT_ALL environmental variable is set). diff --git a/Documentation/git-http-fetch.txt b/Documentation/git-http-fetch.txt index 070cd1e6ed..21a33d2c41 100644 --- a/Documentation/git-http-fetch.txt +++ b/Documentation/git-http-fetch.txt @@ -3,7 +3,7 @@ git-http-fetch(1) NAME ---- -git-http-fetch - Download from a remote git repository via HTTP +git-http-fetch - Download from a remote Git repository via HTTP SYNOPSIS @@ -13,7 +13,7 @@ SYNOPSIS DESCRIPTION ----------- -Downloads a remote git repository via HTTP. +Downloads a remote Git repository via HTTP. *NOTE*: use of this command without -a is deprecated. The -a behaviour will become the default in a future release. diff --git a/Documentation/git-index-pack.txt b/Documentation/git-index-pack.txt index 39e6d0ddd8..36adc5fc14 100644 --- a/Documentation/git-index-pack.txt +++ b/Documentation/git-index-pack.txt @@ -19,7 +19,7 @@ DESCRIPTION Reads a packed archive (.pack) from the specified file, and builds a pack index file (.idx) for it. The packed archive together with the pack index can then be placed in the -objects/pack/ directory of a git repository. +objects/pack/ directory of a Git repository. OPTIONS @@ -39,7 +39,7 @@ OPTIONS When this flag is provided, the pack is read from stdin instead and a copy is then written to <pack-file>. If <pack-file> is not specified, the pack is written to - objects/pack/ directory of the current git repository with + objects/pack/ directory of the current Git repository with a default name determined from the pack content. If <pack-file> is not specified consider using --keep to prevent a race condition between this process and @@ -81,7 +81,7 @@ OPTIONS This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. - Specifying 0 will cause git to auto-detect the number of CPU's + Specifying 0 will cause Git to auto-detect the number of CPU's and use maximum 3 threads. diff --git a/Documentation/git-init-db.txt b/Documentation/git-init-db.txt index a21e346789..648a6cd78a 100644 --- a/Documentation/git-init-db.txt +++ b/Documentation/git-init-db.txt @@ -3,7 +3,7 @@ git-init-db(1) NAME ---- -git-init-db - Creates an empty git repository +git-init-db - Creates an empty Git repository SYNOPSIS diff --git a/Documentation/git-init.txt b/Documentation/git-init.txt index 9ac2bbaa56..afd721e3a9 100644 --- a/Documentation/git-init.txt +++ b/Documentation/git-init.txt @@ -3,7 +3,7 @@ git-init(1) NAME ---- -git-init - Create an empty git repository or reinitialize an existing one +git-init - Create an empty Git repository or reinitialize an existing one SYNOPSIS @@ -17,7 +17,7 @@ SYNOPSIS DESCRIPTION ----------- -This command creates an empty git repository - basically a `.git` +This command creates an empty Git repository - basically a `.git` directory with subdirectories for `objects`, `refs/heads`, `refs/tags`, and template files. An initial `HEAD` file that references the HEAD of the master branch is also created. @@ -58,19 +58,19 @@ DIRECTORY" section below.) --separate-git-dir=<git dir>:: Instead of initializing the repository where it is supposed to be, -place a filesytem-agnostic git symbolic link there, pointing to the -specified git path, and initialize a git repository at the path. The -result is git repository can be separated from working tree. If this +place a filesytem-agnostic Git symbolic link there, pointing to the +specified path, and initialize a Git repository at the path. The +result is Git repository can be separated from working tree. If this is reinitialization, the repository will be moved to the specified path. --shared[=(false|true|umask|group|all|world|everybody|0xxx)]:: -Specify that the git repository is to be shared amongst several users. This +Specify that the Git repository is to be shared amongst several users. This allows users belonging to the same group to push into that repository. When specified, the config variable "core.sharedRepository" is set so that files and directories under `$GIT_DIR` are created with the -requested permissions. When not specified, git will use permissions reported +requested permissions. When not specified, Git will use permissions reported by umask(2). The option can have the following values, defaulting to 'group' if no value @@ -130,7 +130,7 @@ The suggested patterns and hook files are all modifiable and extensible. EXAMPLES -------- -Start a new git repository for an existing code base:: +Start a new Git repository for an existing code base:: + ---------------- $ cd /path/to/my/codebase diff --git a/Documentation/git-log.txt b/Documentation/git-log.txt index 08a185db7f..69db5783ce 100644 --- a/Documentation/git-log.txt +++ b/Documentation/git-log.txt @@ -47,6 +47,11 @@ OPTIONS Print out the ref name given on the command line by which each commit was reached. +--use-mailmap:: + Use mailmap file to map author and committer names and email + to canonical real names and email addresses. See + linkgit:git-shortlog[1]. + --full-diff:: Without this flag, "git log -p <path>..." shows commits that touch the specified paths, and diffs about the same specified @@ -59,7 +64,7 @@ produced by --stat etc. --log-size:: Before the log message print out its size in bytes. Intended - mainly for porcelain tools consumption. If git is unable to + mainly for porcelain tools consumption. If Git is unable to produce a valid value size is set to zero. Note that only message is considered, if also a diff is shown its size is not included. diff --git a/Documentation/git-ls-files.txt b/Documentation/git-ls-files.txt index 4b28292811..0bdebff6f7 100644 --- a/Documentation/git-ls-files.txt +++ b/Documentation/git-ls-files.txt @@ -92,7 +92,7 @@ OPTIONS directory and its subdirectories in <file>. --exclude-standard:: - Add the standard git exclusions: .git/info/exclude, .gitignore + Add the standard Git exclusions: .git/info/exclude, .gitignore in each directory, and the user's global exclusion file. --error-unmatch:: diff --git a/Documentation/git-merge-index.txt b/Documentation/git-merge-index.txt index e0df1b3340..0c80cec0e8 100644 --- a/Documentation/git-merge-index.txt +++ b/Documentation/git-merge-index.txt @@ -41,13 +41,13 @@ If 'git merge-index' is called with multiple <file>s (or -a) then it processes them in turn only stopping if merge returns a non-zero exit code. -Typically this is run with a script calling git's imitation of +Typically this is run with a script calling Git's imitation of the 'merge' command from the RCS package. A sample script called 'git merge-one-file' is included in the distribution. -ALERT ALERT ALERT! The git "merge object order" is different from the +ALERT ALERT ALERT! The Git "merge object order" is different from the RCS 'merge' program merge object order. In the above ordering, the original is first. But the argument order to the 3-way merge program 'merge' is to have the original in the middle. Don't ask me why. diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index d34ea3c50b..c852a2677a 100644 --- a/Documentation/git-merge.txt +++ b/Documentation/git-merge.txt @@ -178,10 +178,10 @@ of the merge. Among the changes made to the common ancestor's version, non-overlapping ones (that is, you changed an area of the file while the other side left that area intact, or vice versa) are incorporated in the final result verbatim. When both sides made changes to the same area, -however, git cannot randomly pick one side over the other, and asks you to +however, Git cannot randomly pick one side over the other, and asks you to resolve it by leaving what both sides did to that area. -By default, git uses the same style as the one used by the "merge" program +By default, Git uses the same style as the one used by the "merge" program from the RCS suite to present such a conflicted hunk, like this: ------------ diff --git a/Documentation/git-mergetool--lib.txt b/Documentation/git-mergetool--lib.txt index f98a41b87c..055550b2bc 100644 --- a/Documentation/git-mergetool--lib.txt +++ b/Documentation/git-mergetool--lib.txt @@ -3,7 +3,7 @@ git-mergetool{litdd}lib(1) NAME ---- -git-mergetool--lib - Common git merge tool shell scriptlets +git-mergetool--lib - Common Git merge tool shell scriptlets SYNOPSIS -------- @@ -19,7 +19,7 @@ Porcelain-ish scripts and/or are writing new ones. The 'git-mergetool{litdd}lib' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up functions for working -with git merge tools. +with Git merge tools. Before sourcing 'git-mergetool{litdd}lib', your script must set `TOOL_MODE` to define the operation mode for the functions listed below. diff --git a/Documentation/git-mktag.txt b/Documentation/git-mktag.txt index 65e167a5c5..3ca158b05e 100644 --- a/Documentation/git-mktag.txt +++ b/Documentation/git-mktag.txt @@ -28,9 +28,9 @@ A tag signature file has a very simple fixed format: four lines of tagger <tagger> followed by some 'optional' free-form message (some tags created -by older git may not have `tagger` line). The message, when +by older Git may not have `tagger` line). The message, when exists, is separated by a blank line from the header. The -message part may contain a signature that git itself doesn't +message part may contain a signature that Git itself doesn't care about, but that can be verified with gpg. GIT diff --git a/Documentation/git-mv.txt b/Documentation/git-mv.txt index e3c8448614..e93fcb49fd 100644 --- a/Documentation/git-mv.txt +++ b/Documentation/git-mv.txt @@ -34,7 +34,7 @@ OPTIONS -k:: Skip move or rename actions which would lead to an error condition. An error happens when a source is neither existing nor - controlled by GIT, or when it would overwrite an existing + controlled by Git, or when it would overwrite an existing file unless '-f' is given. -n:: --dry-run:: diff --git a/Documentation/git-p4.txt b/Documentation/git-p4.txt index beff6229c8..c579fbc2b8 100644 --- a/Documentation/git-p4.txt +++ b/Documentation/git-p4.txt @@ -18,13 +18,13 @@ SYNOPSIS DESCRIPTION ----------- This command provides a way to interact with p4 repositories -using git. +using Git. -Create a new git repository from an existing p4 repository using +Create a new Git repository from an existing p4 repository using 'git p4 clone', giving it one or more p4 depot paths. Incorporate new commits from p4 changes with 'git p4 sync'. The 'sync' command is also used to include new branches from other p4 depot paths. -Submit git changes back to p4 using 'git p4 submit'. The command +Submit Git changes back to p4 using 'git p4 submit'. The command 'git p4 rebase' does a sync plus rebases the current branch onto the updated p4 remote branch. @@ -37,7 +37,7 @@ EXAMPLE $ git p4 clone //depot/path/project ------------ -* Do some work in the newly created git repository: +* Do some work in the newly created Git repository: + ------------ $ cd project @@ -45,7 +45,7 @@ $ vi foo.h $ git commit -a -m "edited foo.h" ------------ -* Update the git repository with recent changes from p4, rebasing your +* Update the Git repository with recent changes from p4, rebasing your work on top: + ------------ @@ -64,21 +64,21 @@ COMMANDS Clone ~~~~~ -Generally, 'git p4 clone' is used to create a new git directory +Generally, 'git p4 clone' is used to create a new Git directory from an existing p4 repository: ------------ $ git p4 clone //depot/path/project ------------ This: -1. Creates an empty git repository in a subdirectory called 'project'. +1. Creates an empty Git repository in a subdirectory called 'project'. + 2. Imports the full contents of the head revision from the given p4 -depot path into a single commit in the git branch 'refs/remotes/p4/master'. +depot path into a single commit in the Git branch 'refs/remotes/p4/master'. + 3. Creates a local branch, 'master' from this remote and checks it out. -To reproduce the entire p4 history in git, use the '@all' modifier on +To reproduce the entire p4 history in Git, use the '@all' modifier on the depot path: ------------ $ git p4 clone //depot/path/project@all @@ -88,13 +88,13 @@ $ git p4 clone //depot/path/project@all Sync ~~~~ As development continues in the p4 repository, those changes can -be included in the git repository using: +be included in the Git repository using: ------------ $ git p4 sync ------------ -This command finds new changes in p4 and imports them as git commits. +This command finds new changes in p4 and imports them as Git commits. -P4 repositories can be added to an existing git repository using +P4 repositories can be added to an existing Git repository using 'git p4 sync' too: ------------ $ mkdir repo-git @@ -103,14 +103,19 @@ $ git init $ git p4 sync //path/in/your/perforce/depot ------------ This imports the specified depot into -'refs/remotes/p4/master' in an existing git repository. The +'refs/remotes/p4/master' in an existing Git repository. The '--branch' option can be used to specify a different branch to be used for the p4 content. -If a git repository includes branches 'refs/remotes/origin/p4', these +If a Git repository includes branches 'refs/remotes/origin/p4', these will be fetched and consulted first during a 'git p4 sync'. Since importing directly from p4 is considerably slower than pulling changes -from a git remote, this can be useful in a multi-developer environment. +from a Git remote, this can be useful in a multi-developer environment. + +If there are multiple branches, doing 'git p4 sync' will automatically +use the "BRANCH DETECTION" algorithm to try to partition new changes +into the right branch. This can be overridden with the '--branch' +option to specify just a single branch to update. Rebase @@ -127,13 +132,13 @@ $ git p4 rebase Submit ~~~~~~ -Submitting changes from a git repository back to the p4 repository +Submitting changes from a Git repository back to the p4 repository requires a separate p4 client workspace. This should be specified -using the 'P4CLIENT' environment variable or the git configuration +using the 'P4CLIENT' environment variable or the Git configuration variable 'git-p4.client'. The p4 client must exist, but the client root will be created and populated if it does not already exist. -To submit all changes that are in the current git branch but not in +To submit all changes that are in the current Git branch but not in the 'p4/master' branch, use: ------------ $ git p4 submit @@ -149,7 +154,7 @@ be overridden using the '--origin=' command-line option. The p4 changes will be created as the user invoking 'git p4 submit'. The '--preserve-user' option will cause ownership to be modified -according to the author of the git commit. This option requires admin +according to the author of the Git commit. This option requires admin privileges in p4, which can be granted using 'p4 protect'. @@ -173,12 +178,14 @@ subsequent 'sync' operations. --branch <branch>:: Import changes into given branch. If the branch starts with - 'refs/', it will be used as is, otherwise the path 'refs/heads/' - will be prepended. The default branch is 'master'. If used - with an initial clone, no HEAD will be checked out. + 'refs/', it will be used as is. Otherwise if it does not start + with 'p4/', that prefix is added. The branch is assumed to + name a remote tracking, but this can be modified using + '--import-local', or by giving a full ref name. The default + branch is 'master'. + This example imports a new remote "p4/proj2" into an existing -git repository: +Git repository: + ---- $ git init @@ -199,11 +206,11 @@ git repository: --detect-labels:: Query p4 for labels associated with the depot paths, and add - them as tags in git. Limited usefulness as only imports labels + them as tags in Git. Limited usefulness as only imports labels associated with new changelists. Deprecated. --import-labels:: - Import labels from p4 into git. + Import labels from p4 into Git. --import-local:: By default, p4 branches are stored in 'refs/remotes/p4/', @@ -219,12 +226,12 @@ git repository: specifier. --keep-path:: - The mapping of file names from the p4 depot path to git, by + The mapping of file names from the p4 depot path to Git, by default, involves removing the entire depot path. With this - option, the full p4 depot path is retained in git. For example, + option, the full p4 depot path is retained in Git. For example, path '//depot/main/foo/bar.c', when imported from '//depot/main/', becomes 'foo/bar.c'. With '--keep-path', the - git path is instead 'depot/main/foo/bar.c'. + Git path is instead 'depot/main/foo/bar.c'. --use-client-spec:: Use a client spec to find the list of interesting files in p4. @@ -236,7 +243,7 @@ These options can be used in an initial 'clone', along with the 'sync' options described above. --destination <directory>:: - Where to create the git repository. If not provided, the last + Where to create the Git repository. If not provided, the last component in the p4 depot path is used to create a new directory. @@ -266,12 +273,12 @@ These options can be used to modify 'git p4 submit' behavior. requires p4 admin privileges. --export-labels:: - Export tags from git as p4 labels. Tags found in git are applied + Export tags from Git as p4 labels. Tags found in Git are applied to the perforce working directory. --dry-run, -n:: Show just what commits would be submitted to p4; do not change - state in git or p4. + state in Git or p4. --prepare-p4-only:: Apply a commit to the p4 workspace, opening, adding and deleting @@ -287,6 +294,11 @@ These options can be used to modify 'git p4 submit' behavior. to bypass the prompt, causing conflicting commits to be automatically skipped, or to quit trying to apply commits, without prompting. +--branch <branch>:: + After submitting, sync this named branch instead of the default + p4/master. See the "Sync options" section above for more + information. + Rebase options ~~~~~~~~~~~~~~ These options can be used to modify 'git p4 rebase' behavior. @@ -312,12 +324,12 @@ p4 revision specifier on the end: "//depot/proj1@all //depot/proj2@all":: Import all changes from both named depot paths into a single repository. Only files below these directories are included. - There is not a subdirectory in git for each "proj1" and "proj2". + There is not a subdirectory in Git for each "proj1" and "proj2". You must use the '--destination' option when specifying more than one depot path. The revision specifier must be specified identically on each depot path. If there are files in the depot paths with the same name, the path with the most recently - updated version of the file is the one that appears in git. + updated version of the file is the one that appears in Git. See 'p4 help revisions' for the full syntax of p4 revision specifiers. @@ -334,11 +346,11 @@ configuration file. This allows future 'git p4 submit' commands to work properly; the submit command looks only at the variable and does not have a command-line option. -The full syntax for a p4 view is documented in 'p4 help views'. 'Git p4' +The full syntax for a p4 view is documented in 'p4 help views'. 'git p4' knows only a subset of the view syntax. It understands multi-line mappings, overlays with '+', exclusions with '-' and double-quotes around whitespace. Of the possible wildcards, 'git p4' only handles -'...', and only when it is at the end of the path. 'Git p4' will complain +'...', and only when it is at the end of the path. 'git p4' will complain if it encounters an unhandled wildcard. Bugs in the implementation of overlap mappings exist. If multiple depot @@ -354,7 +366,7 @@ variable P4CLIENT, a file referenced by P4CONFIG, or the local host name. BRANCH DETECTION ---------------- -P4 does not have the same concept of a branch as git. Instead, +P4 does not have the same concept of a branch as Git. Instead, p4 organizes its content as a directory tree, where by convention different logical branches are in different locations in the tree. The 'p4 branch' command is used to maintain mappings between @@ -364,7 +376,7 @@ can use these mappings to determine branch relationships. If you have a repository where all the branches of interest exist as subdirectories of a single depot path, you can use '--detect-branches' when cloning or syncing to have 'git p4' automatically find -subdirectories in p4, and to generate these as branches in git. +subdirectories in p4, and to generate these as branches in Git. For example, if the P4 repository structure is: ---- @@ -386,7 +398,7 @@ called 'master', and one for //depot/branch1 called 'depot/branch1'. However, it is not necessary to create branches in p4 to be able to use them like branches. Because it is difficult to infer branch -relationships automatically, a git configuration setting +relationships automatically, a Git configuration setting 'git-p4.branchList' can be used to explicitly identify branch relationships. It is a list of "source:destination" pairs, like a simple p4 branch specification, where the "source" and "destination" are @@ -394,15 +406,17 @@ the path elements in the p4 repository. The example above relied on the presence of the p4 branch. Without p4 branches, the same result will occur with: ---- +git init depot +cd depot git config git-p4.branchList main:branch1 -git p4 clone --detect-branches //depot@all +git p4 clone --detect-branches //depot@all . ---- PERFORMANCE ----------- The fast-import mechanism used by 'git p4' creates one pack file for -each invocation of 'git p4 sync'. Normally, git garbage compression +each invocation of 'git p4 sync'. Normally, Git garbage compression (linkgit:git-gc[1]) automatically compresses these to fewer pack files, but explicit invocation of 'git repack -adf' may improve performance. @@ -440,9 +454,9 @@ git-p4.client:: Clone and sync variables ~~~~~~~~~~~~~~~~~~~~~~~~ git-p4.syncFromOrigin:: - Because importing commits from other git repositories is much faster + Because importing commits from other Git repositories is much faster than importing them from p4, a mechanism exists to find p4 changes - first in git remotes. If branches exist under 'refs/remote/origin/p4', + first in Git remotes. If branches exist under 'refs/remote/origin/p4', those will be fetched and used when syncing from p4. This variable can be set to 'false' to disable this behavior. @@ -494,7 +508,7 @@ git-p4.detectCopiesHarder:: Detect copies harder. See linkgit:git-diff[1]. A boolean. git-p4.preserveUser:: - On submit, re-author changes to reflect the git author, + On submit, re-author changes to reflect the Git author, regardless of who invokes 'git p4 submit'. git-p4.allowMissingP4Users:: @@ -531,7 +545,7 @@ git-p4.attemptRCSCleanup:: present. git-p4.exportLabels:: - Export git tags to p4 labels, as per --export-labels. + Export Git tags to p4 labels, as per --export-labels. git-p4.labelExportRegexp:: Only p4 labels matching this regular expression will be exported. The @@ -543,11 +557,11 @@ git-p4.conflict:: IMPLEMENTATION DETAILS ---------------------- -* Changesets from p4 are imported using git fast-import. +* Changesets from p4 are imported using Git fast-import. * Cloning or syncing does not require a p4 client; file contents are collected using 'p4 print'. * Submitting requires a p4 client, which is not in the same location - as the git repository. Patches are applied, one at a time, to + as the Git repository. Patches are applied, one at a time, to this p4 client and submitted from there. * Each commit imported by 'git p4' has a line at the end of the log message indicating the p4 depot location and change number. This diff --git a/Documentation/git-pack-objects.txt b/Documentation/git-pack-objects.txt index 20c8551d6a..69c9313cf5 100644 --- a/Documentation/git-pack-objects.txt +++ b/Documentation/git-pack-objects.txt @@ -35,7 +35,7 @@ A pack index file (.idx) is generated for fast, random access to the objects in the pack. Placing both the index file (.idx) and the packed archive (.pack) in the pack/ subdirectory of $GIT_OBJECT_DIRECTORY (or any of the directories on $GIT_ALTERNATE_OBJECT_DIRECTORIES) -enables git to read from the pack archive. +enables Git to read from the pack archive. The 'git unpack-objects' command can read the packed archive and expand the objects contained in the pack into "one-file @@ -80,7 +80,7 @@ base-name:: --include-tag:: Include unasked-for annotated tags if the object they reference was included in the resulting packfile. This - can be useful to send new tags to native git clients. + can be useful to send new tags to native Git clients. --window=<n>:: --depth=<n>:: @@ -185,14 +185,14 @@ base-name:: option only makes sense in conjunction with --stdout. + Note: A thin pack violates the packed archive format by omitting -required objects and is thus unusable by git without making it +required objects and is thus unusable by Git without making it self-contained. Use `git index-pack --fix-thin` (see linkgit:git-index-pack[1]) to restore the self-contained property. --delta-base-offset:: A packed archive can express the base object of a delta as either a 20-byte object name or as an offset in the - stream, but ancient versions of git don't understand the + stream, but ancient versions of Git don't understand the latter. By default, 'git pack-objects' only uses the former format for better compatibility. This option allows the command to use the latter format for @@ -202,7 +202,7 @@ self-contained. Use `git index-pack --fix-thin` + Note: Porcelain commands such as `git gc` (see linkgit:git-gc[1]), `git repack` (see linkgit:git-repack[1]) pass this option by default -in modern git when they put objects in your repository into pack files. +in modern Git when they put objects in your repository into pack files. So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle. --threads=<n>:: @@ -212,7 +212,7 @@ So does `git bundle` (see linkgit:git-bundle[1]) when it creates a bundle. This is meant to reduce packing time on multiprocessor machines. The required amount of memory for the delta search window is however multiplied by the number of threads. - Specifying 0 will cause git to auto-detect the number of CPU's + Specifying 0 will cause Git to auto-detect the number of CPU's and set the number of threads accordingly. --index-version=<version>[,<offset>]:: diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt index 67fa5ee195..c975743230 100644 --- a/Documentation/git-pull.txt +++ b/Documentation/git-pull.txt @@ -59,8 +59,8 @@ and a log message from the user describing the changes. See linkgit:git-merge[1] for details, including how conflicts are presented and handled. -In git 1.7.0 or later, to cancel a conflicting merge, use -`git reset --merge`. *Warning*: In older versions of git, running 'git pull' +In Git 1.7.0 or later, to cancel a conflicting merge, use +`git reset --merge`. *Warning*: In older versions of Git, running 'git pull' with uncommitted changes is discouraged: while possible, it leaves you in a state that may be hard to back out of in the case of a conflict. @@ -89,7 +89,7 @@ must be given before the options meant for 'git fetch'. This option controls if new commits of all populated submodules should be fetched too (see linkgit:git-config[1] and linkgit:gitmodules[5]). That might be necessary to get the data needed for merging submodule - commits, a feature git learned in 1.7.3. Notice that the result of a + commits, a feature Git learned in 1.7.3. Notice that the result of a merge will not be checked out in the submodule, "git submodule update" has to be called afterwards to bring the work tree up to date with the merge result. @@ -228,7 +228,7 @@ Using --recurse-submodules can only fetch new commits in already checked out submodules right now. When e.g. upstream added a new submodule in the just fetched commits of the superproject the submodule itself can not be fetched, making it impossible to check out that submodule later without -having to do a fetch again. This is expected to be fixed in a future git +having to do a fetch again. This is expected to be fixed in a future Git version. SEE ALSO diff --git a/Documentation/git-push.txt b/Documentation/git-push.txt index c964b796be..eb2883c94c 100644 --- a/Documentation/git-push.txt +++ b/Documentation/git-push.txt @@ -9,7 +9,7 @@ git-push - Update remote refs along with associated objects SYNOPSIS -------- [verse] -'git push' [--all | --mirror | --tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>] +'git push' [--all | --mirror | --tags] [--follow-tags] [-n | --dry-run] [--receive-pack=<git-receive-pack>] [--repo=<repository>] [-f | --force] [--prune] [-v | --verbose] [-u | --set-upstream] [<repository> [<refspec>...]] @@ -23,6 +23,17 @@ You can make interesting things happen to a repository every time you push into it, by setting up 'hooks' there. See documentation for linkgit:git-receive-pack[1]. +When the command line does not specify where to push with the +`<repository>` argument, `branch.*.remote` configuration for the +current branch is consulted to determine where to push. If the +configuration is missing, it defaults to 'origin'. + +When the command line does not specify what to push with `<refspec>...` +arguments or `--all`, `--mirror`, `--tags` options, the command finds +the default `<refspec>` by consulting `remote.*.push` configuration, +and if it is not found, honors `push.default` configuration to decide +what to push (See gitlink:git-config[1] for the meaning of `push.default`). + OPTIONS[[OPTIONS]] ------------------ @@ -33,13 +44,10 @@ OPTIONS[[OPTIONS]] of a remote (see the section <<REMOTES,REMOTES>> below). <refspec>...:: + Specify what destination ref to update with what source object. The format of a <refspec> parameter is an optional plus - `+`, followed by the source ref <src>, followed + `+`, followed by the source object <src>, followed by a colon `:`, followed by the destination ref <dst>. - It is used to specify with what <src> object the <dst> ref - in the remote repository is to be updated. If not specified, - the behavior of the command is controlled by the `push.default` - configuration variable. + The <src> is often the name of the branch you would want to push, but it can be any arbitrary "SHA-1 expression", such as `master~4` or @@ -53,7 +61,7 @@ updated. The object referenced by <src> is used to update the <dst> reference on the remote side. By default this is only allowed if <dst> is not a tag (annotated or lightweight), and then only if it can fast-forward -<dst>. By having the optional leading `+`, you can tell git to update +<dst>. By having the optional leading `+`, you can tell Git to update the <dst> ref even if it is not allowed by default (e.g., it is not a fast-forward.) This does *not* attempt to merge <src> into <dst>. See EXAMPLES below for details. @@ -64,12 +72,9 @@ Pushing an empty <src> allows you to delete the <dst> ref from the remote repository. + The special refspec `:` (or `+:` to allow non-fast-forward updates) -directs git to push "matching" branches: for every branch that exists on +directs Git to push "matching" branches: for every branch that exists on the local side, the remote side is updated if a branch of the same name -already exists on the remote side. This is the default operation mode -if no explicit refspec is found (that is neither on the command line -nor in any Push line of the corresponding remotes file---see below) and -no `push.default` configuration variable is set. +already exists on the remote side. --all:: Instead of naming each ref to push, specifies that all @@ -112,6 +117,12 @@ no `push.default` configuration variable is set. addition to refspecs explicitly listed on the command line. +--follow-tags:: + Push all the refs that would be pushed without this option, + and also push annotated tags in `refs/tags` that are missing + from the remote but are pointing at committish that are + reachable from the refs being pushed. + --receive-pack=<git-receive-pack>:: --exec=<git-receive-pack>:: Path to the 'git-receive-pack' program on the remote @@ -177,7 +188,7 @@ useful if you write an alias or script around 'git push'. --recurse-submodules=check|on-demand:: Make sure all submodule commits used by the revisions to be pushed are available on a remote-tracking branch. If 'check' is - used git will verify that all submodule commits that changed in + used Git will verify that all submodule commits that changed in the revisions to be pushed are available on at least one remote of the submodule. If any commits are missing the push will be aborted and exit with non-zero status. If 'on-demand' is used @@ -192,7 +203,7 @@ OUTPUT ------ The output of "git push" depends on the transport method used; this -section describes the output when pushing over the git protocol (either +section describes the output when pushing over the Git protocol (either locally or via ssh). The status of the push is output in tabular form, with each line diff --git a/Documentation/git-quiltimport.txt b/Documentation/git-quiltimport.txt index 7f112f3dcd..a356196586 100644 --- a/Documentation/git-quiltimport.txt +++ b/Documentation/git-quiltimport.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Applies a quilt patchset onto the current git branch, preserving +Applies a quilt patchset onto the current Git branch, preserving the patch boundaries, patch order, and patch descriptions present in the quilt patchset. @@ -25,7 +25,7 @@ the patch description is displayed and the user is asked to interactively enter the author of the patch. If a subject is not found in the patch description the patch name is -preserved as the 1 line subject in the git description. +preserved as the 1 line subject in the Git description. OPTIONS ------- diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index da067ecafa..aca840525e 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -179,7 +179,7 @@ parameter can be any valid commit-ish. In case of conflict, 'git rebase' will stop at the first problematic commit and leave conflict markers in the tree. You can use 'git diff' to locate the markers (<<<<<<) and make edits to resolve the conflict. For each -file you edit, you need to tell git that the conflict has been resolved, +file you edit, you need to tell Git that the conflict has been resolved, typically this would be done with diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt index 7fe2d2247b..fb8697ea4c 100644 --- a/Documentation/git-reflog.txt +++ b/Documentation/git-reflog.txt @@ -38,7 +38,7 @@ The reflog will cover all recent actions (HEAD reflog records branch switching as well). It is an alias for `git log -g --abbrev-commit --pretty=oneline`; see linkgit:git-log[1]. -The reflog is useful in various git commands, to specify the old value +The reflog is useful in various Git commands, to specify the old value of a reference. For example, `HEAD@{2}` means "where HEAD used to be two moves ago", `master@{one.week.ago}` means "where master used to point to one week ago", and so on. See linkgit:gitrevisions[7] for diff --git a/Documentation/git-remote-ext.txt b/Documentation/git-remote-ext.txt index 8a8e1d775d..58b7facb09 100644 --- a/Documentation/git-remote-ext.txt +++ b/Documentation/git-remote-ext.txt @@ -13,7 +13,7 @@ git remote add <nick> "ext::<command>[ <arguments>...]" DESCRIPTION ----------- This remote helper uses the specified '<command>' to connect -to a remote git server. +to a remote Git server. Data written to stdin of the specified '<command>' is assumed to be sent to a git:// server, git-upload-pack, git-receive-pack @@ -33,12 +33,12 @@ The following sequences have a special meaning: '%s':: Replaced with name (receive-pack, upload-pack, or - upload-archive) of the service git wants to invoke. + upload-archive) of the service Git wants to invoke. '%S':: Replaced with long name (git-receive-pack, git-upload-pack, or git-upload-archive) of the service - git wants to invoke. + Git wants to invoke. '%G' (must be the first characters in an argument):: This argument will not be passed to '<command>'. Instead, it @@ -75,7 +75,7 @@ GIT_EXT_SERVICE_NOPREFIX:: EXAMPLES: --------- -This remote helper is transparently used by git when +This remote helper is transparently used by Git when you use commands such as "git fetch <URL>", "git clone <URL>", , "git push <URL>" or "git remote add <nick> <URL>", where <URL> begins with `ext::`. Examples: @@ -100,14 +100,14 @@ begins with `ext::`. Examples: Represents a repository with path /repo accessed using the helper program "git-server-alias foo". The hostname for the remote server passed in the protocol stream will be "foo" - (this allows multiple virtual git servers to share a + (this allows multiple virtual Git servers to share a link-level address). "ext::git-server-alias foo %G/repo% with% spaces %Vfoo":: Represents a repository with path '/repo with spaces' accessed using the helper program "git-server-alias foo". The hostname for the remote server passed in the protocol stream will be "foo" - (this allows multiple virtual git servers to share a + (this allows multiple virtual Git servers to share a link-level address). "ext::git-ssl foo.example /bar":: @@ -118,7 +118,7 @@ begins with `ext::`. Examples: Documentation -------------- -Documentation by Ilari Liusvaara, Jonathan Nieder and the git list +Documentation by Ilari Liusvaara, Jonathan Nieder and the Git list <git@vger.kernel.org> GIT diff --git a/Documentation/git-remote-fd.txt b/Documentation/git-remote-fd.txt index f095d57d09..933c2adaf6 100644 --- a/Documentation/git-remote-fd.txt +++ b/Documentation/git-remote-fd.txt @@ -11,14 +11,14 @@ SYNOPSIS DESCRIPTION ----------- -This helper uses specified file descriptors to connect to a remote git server. +This helper uses specified file descriptors to connect to a remote Git server. This is not meant for end users but for programs and scripts calling git fetch, push or archive. If only <infd> is given, it is assumed to be a bidirectional socket connected -to remote git server (git-upload-pack, git-receive-pack or +to remote Git server (git-upload-pack, git-receive-pack or git-upload-achive). If both <infd> and <outfd> are given, they are assumed -to be pipes connected to a remote git server (<infd> being the inbound pipe +to be pipes connected to a remote Git server (<infd> being the inbound pipe and <outfd> being the outbound pipe. It is assumed that any handshaking procedures have already been completed @@ -52,7 +52,7 @@ EXAMPLES Documentation -------------- -Documentation by Ilari Liusvaara and the git list <git@vger.kernel.org> +Documentation by Ilari Liusvaara and the Git list <git@vger.kernel.org> GIT --- diff --git a/Documentation/git-remote-helpers.txto b/Documentation/git-remote-helpers.txto new file mode 100644 index 0000000000..49233f5d26 --- /dev/null +++ b/Documentation/git-remote-helpers.txto @@ -0,0 +1,9 @@ +git-remote-helpers +================== + +This document has been moved to linkgit:gitremote-helpers[1]. + +Please let the owners of the referring site know so that they can update the +link you clicked to get here. + +Thanks. diff --git a/Documentation/git-remote-testgit.txt b/Documentation/git-remote-testgit.txt index 612a625ced..f791d73c05 100644 --- a/Documentation/git-remote-testgit.txt +++ b/Documentation/git-remote-testgit.txt @@ -23,7 +23,7 @@ The best way to learn more is to read the comments and source code in SEE ALSO -------- -linkgit:git-remote-helpers[1] +linkgit:gitremote-helpers[1] GIT --- diff --git a/Documentation/git-replace.txt b/Documentation/git-replace.txt index 51131d0858..0142cd18ae 100644 --- a/Documentation/git-replace.txt +++ b/Documentation/git-replace.txt @@ -22,7 +22,7 @@ replacement object. Unless `-f` is given, the 'replace' reference must not yet exist. -Replacement references will be used by default by all git commands +Replacement references will be used by default by all Git commands except those doing reachability traversal (prune, pack transfer and fsck). diff --git a/Documentation/git-reset.txt b/Documentation/git-reset.txt index 978d8da50c..a404b47b7b 100644 --- a/Documentation/git-reset.txt +++ b/Documentation/git-reset.txt @@ -8,20 +8,20 @@ git-reset - Reset current HEAD to the specified state SYNOPSIS -------- [verse] -'git reset' [-q] [<commit>] [--] <paths>... -'git reset' (--patch | -p) [<commit>] [--] [<paths>...] +'git reset' [-q] [<tree-ish>] [--] <paths>... +'git reset' (--patch | -p) [<tree-sh>] [--] [<paths>...] 'git reset' [--soft | --mixed | --hard | --merge | --keep] [-q] [<commit>] DESCRIPTION ----------- -In the first and second form, copy entries from <commit> to the index. +In the first and second form, copy entries from <tree-ish> to the index. In the third form, set the current branch head (HEAD) to <commit>, optionally -modifying index and working tree to match. The <commit> defaults to HEAD -in all forms. +modifying index and working tree to match. The <tree-ish>/<commit> defaults +to HEAD in all forms. -'git reset' [-q] [<commit>] [--] <paths>...:: +'git reset' [-q] [<tree-ish>] [--] <paths>...:: This form resets the index entries for all <paths> to their - state at <commit>. (It does not affect the working tree, nor + state at <tree-ish>. (It does not affect the working tree, nor the current branch.) + This means that `git reset <paths>` is the opposite of `git add @@ -34,9 +34,9 @@ Alternatively, using linkgit:git-checkout[1] and specifying a commit, you can copy the contents of a path out of a commit to the index and to the working tree in one go. -'git reset' (--patch | -p) [<commit>] [--] [<paths>...]:: +'git reset' (--patch | -p) [<tree-ish>] [--] [<paths>...]:: Interactively select hunks in the difference between the index - and <commit> (defaults to HEAD). The chosen hunks are applied + and <tree-ish> (defaults to HEAD). The chosen hunks are applied in reverse to the index. + This means that `git reset -p` is the opposite of `git add -p`, i.e. diff --git a/Documentation/git-rev-list.txt b/Documentation/git-rev-list.txt index 38fafcaa6b..65ac27e0c9 100644 --- a/Documentation/git-rev-list.txt +++ b/Documentation/git-rev-list.txt @@ -99,7 +99,7 @@ between the two operands. The following two commands are equivalent: $ git rev-list A...B ----------------------------------------------------------------------- -'rev-list' is a very essential git command, since it +'rev-list' is a very essential Git command, since it provides the ability to build and traverse commit ancestry graphs. For this reason, it has a lot of different options that enables it to be used by commands as different as 'git bisect' and diff --git a/Documentation/git-rev-parse.txt b/Documentation/git-rev-parse.txt index 3c63561f02..10a116faf8 100644 --- a/Documentation/git-rev-parse.txt +++ b/Documentation/git-rev-parse.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Many git porcelainish commands take mixture of flags +Many Git porcelainish commands take mixture of flags (i.e. parameters that begin with a dash '-') and parameters meant for the underlying 'git rev-list' command they use internally and flags and parameters for the other commands they use @@ -147,7 +147,7 @@ shown. If the pattern does not contain a globbing character (`?`, relative to the current working directory. + If `$GIT_DIR` is not defined and the current directory -is not detected to lie in a git repository or work tree +is not detected to lie in a Git repository or work tree print a message to stderr and exit with nonzero status. --is-inside-git-dir:: @@ -187,9 +187,11 @@ print a message to stderr and exit with nonzero status. Flags and parameters to be parsed. --resolve-git-dir <path>:: - Check if <path> is a valid git-dir or a git-file pointing to a valid - git-dir. If <path> is a valid git-dir the resolved path to git-dir will - be printed. + Check if <path> is a valid repository or a gitfile that + points at a valid repository, and print the location of the + repository. If <path> is a gitfile then the resolved path + to the real repository is printed. + include::revisions.txt[] diff --git a/Documentation/git-rm.txt b/Documentation/git-rm.txt index 262436b7b1..1d876c2619 100644 --- a/Documentation/git-rm.txt +++ b/Documentation/git-rm.txt @@ -28,7 +28,7 @@ OPTIONS ------- <file>...:: Files to remove. Fileglobs (e.g. `*.c`) can be given to - remove all matching files. If you want git to expand + remove all matching files. If you want Git to expand file glob characters, you may need to shell-escape them. A leading directory name (e.g. `dir` to remove `dir/file1` and `dir/file2`) can be @@ -74,8 +74,8 @@ DISCUSSION The <file> list given to the command can be exact pathnames, file glob patterns, or leading directory names. The command -removes only the paths that are known to git. Giving the name of -a file that you have not told git about does not remove that file. +removes only the paths that are known to Git. Giving the name of +a file that you have not told Git about does not remove that file. File globbing matches across directory boundaries. Thus, given two directories `d` and `d2`, there is a difference between @@ -137,7 +137,7 @@ git diff --name-only --diff-filter=D -z | xargs -0 git rm --cached Submodules ~~~~~~~~~~ Only submodules using a gitfile (which means they were cloned -with a git version 1.7.8 or newer) will be removed from the work +with a Git version 1.7.8 or newer) will be removed from the work tree, as their repository lives inside the .git directory of the superproject. If a submodule (or one of those nested inside it) still uses a .git directory, `git rm` will fail - no matter if forced @@ -149,6 +149,10 @@ files that aren't ignored are present in the submodules work tree. Ignored files are deemed expendable and won't stop a submodule's work tree from being removed. +If you only want to remove the local checkout of a submodule from your +work tree without committing the removal, +use linkgit:git-submodule[1] `deinit` instead. + EXAMPLES -------- `git rm Documentation/\*.txt`:: @@ -156,7 +160,7 @@ EXAMPLES `Documentation` directory and any of its subdirectories. + Note that the asterisk `*` is quoted from the shell in this -example; this lets git, and not the shell, expand the pathnames +example; this lets Git, and not the shell, expand the pathnames of files and subdirectories under the `Documentation/` directory. `git rm -f git-*.sh`:: diff --git a/Documentation/git-send-email.txt b/Documentation/git-send-email.txt index eeb561cf14..0cffef8aa5 100644 --- a/Documentation/git-send-email.txt +++ b/Documentation/git-send-email.txt @@ -67,7 +67,7 @@ The --cc option must be repeated for each user you want on the cc list. When '--compose' is used, git send-email will use the From, Subject, and In-Reply-To headers specified in the message. If the body of the message (what you type after the headers and a blank line) only contains blank -(or GIT: prefixed) lines the summary won't be sent, but From, Subject, +(or Git: prefixed) lines the summary won't be sent, but From, Subject, and In-Reply-To headers will be used unless they are removed. + Missing From or In-Reply-To headers will be prompted for. @@ -164,8 +164,8 @@ Sending Furthermore, passwords need not be specified in configuration files or on the command line. If a username has been specified (with '--smtp-user' or a 'sendemail.smtpuser'), but no password has been -specified (with '--smtp-pass' or 'sendemail.smtppass'), then the -user is prompted for a password while the input is masked for privacy. +specified (with '--smtp-pass' or 'sendemail.smtppass'), then +a password is obtained using 'git-credential'. --smtp-server=<host>:: If set, specifies the outgoing SMTP server to use (e.g. diff --git a/Documentation/git-send-pack.txt b/Documentation/git-send-pack.txt index bd3eaa69bf..dc3a568baa 100644 --- a/Documentation/git-send-pack.txt +++ b/Documentation/git-send-pack.txt @@ -3,7 +3,7 @@ git-send-pack(1) NAME ---- -git-send-pack - Push objects over git protocol to another repository +git-send-pack - Push objects over Git protocol to another repository SYNOPSIS diff --git a/Documentation/git-sh-setup.txt b/Documentation/git-sh-setup.txt index 5e5f1c8964..5d709d02c3 100644 --- a/Documentation/git-sh-setup.txt +++ b/Documentation/git-sh-setup.txt @@ -3,7 +3,7 @@ git-sh-setup(1) NAME ---- -git-sh-setup - Common git shell script setup code +git-sh-setup - Common Git shell script setup code SYNOPSIS -------- @@ -19,7 +19,7 @@ Porcelain-ish scripts and/or are writing new ones. The 'git sh-setup' scriptlet is designed to be sourced (using `.`) by other shell scripts to set up some variables pointing at -the normal git directories and a few helper shell functions. +the normal Git directories and a few helper shell functions. Before sourcing it, your script should set up a few variables; `USAGE` (and `LONG_USAGE`, if any) is used to define message @@ -82,6 +82,12 @@ get_author_ident_from_commit:: outputs code for use with eval to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL and GIT_AUTHOR_DATE variables for a given commit. +create_virtual_base:: + modifies the first file so only lines in common with the + second file remain. If there is insufficient common material, + then the first file is left empty. The result is suitable + as a virtual base input for a 3-way merge. + GIT --- Part of the linkgit:git[1] suite diff --git a/Documentation/git-shell.txt b/Documentation/git-shell.txt index 9b9250600f..c35051ba58 100644 --- a/Documentation/git-shell.txt +++ b/Documentation/git-shell.txt @@ -9,25 +9,81 @@ git-shell - Restricted login shell for Git-only SSH access SYNOPSIS -------- [verse] -'git shell' [-c <command> <argument>] +'chsh' -s $(command -v git-shell) <user> +'git clone' <user>`@localhost:/path/to/repo.git` +'ssh' <user>`@localhost` DESCRIPTION ----------- -A login shell for SSH accounts to provide restricted Git access. When -'-c' is given, the program executes <command> non-interactively; -<command> can be one of 'git receive-pack', 'git upload-pack', 'git -upload-archive', 'cvs server', or a command in COMMAND_DIR. The shell -is started in interactive mode when no arguments are given; in this -case, COMMAND_DIR must exist, and any of the executables in it can be -invoked. +This is a login shell for SSH accounts to provide restricted Git access. +It permits execution only of server-side Git commands implementing the +pull/push functionality, plus custom commands present in a subdirectory +named `git-shell-commands` in the user's home directory. -'cvs server' is a special command which executes git-cvsserver. +COMMANDS +-------- + +'git shell' accepts the following commands after the '-c' option: + +'git receive-pack <argument>':: +'git upload-pack <argument>':: +'git upload-archive <argument>':: + Call the corresponding server-side command to support + the client's 'git push', 'git fetch', or 'git archive --remote' + request. +'cvs server':: + Imitate a CVS server. See linkgit:git-cvsserver[1]. + +If a `~/git-shell-commands` directory is present, 'git shell' will +also handle other, custom commands by running +"`git-shell-commands/<command> <arguments>`" from the user's home +directory. + +INTERACTIVE USE +--------------- + +By default, the commands above can be executed only with the '-c' +option; the shell is not interactive. -COMMAND_DIR is the path "$HOME/git-shell-commands". The user must have -read and execute permissions to the directory in order to execute the -programs in it. The programs are executed with a cwd of $HOME, and -<argument> is parsed as a command-line string. +If a `~/git-shell-commands` directory is present, 'git shell' +can also be run interactively (with no arguments). If a `help` +command is present in the `git-shell-commands` directory, it is +run to provide the user with an overview of allowed actions. Then a +"git> " prompt is presented at which one can enter any of the +commands from the `git-shell-commands` directory, or `exit` to close +the connection. + +Generally this mode is used as an administrative interface to allow +users to list repositories they have access to, create, delete, or +rename repositories, or change repository descriptions and +permissions. + +If a `no-interactive-login` command exists, then it is run and the +interactive shell is aborted. + +EXAMPLE +------- + +To disable interactive logins, displaying a greeting instead: ++ +---------------- +$ chsh -s /usr/bin/git-shell +$ mkdir $HOME/git-shell-commands +$ cat >$HOME/git-shell-commands/no-interactive-login <<\EOF +#!/bin/sh +printf '%s\n' "Hi $USER! You've successfully authenticated, but I do not" +printf '%s\n' "provide interactive shell access." +exit 128 +EOF +$ chmod +x $HOME/git-shell-commands/no-interactive-login +---------------- + +SEE ALSO +-------- +ssh(1), +linkgit:git-daemon[1], +contrib/git-shell-commands/README GIT --- diff --git a/Documentation/git-shortlog.txt b/Documentation/git-shortlog.txt index afeb4cdf16..c308e91537 100644 --- a/Documentation/git-shortlog.txt +++ b/Documentation/git-shortlog.txt @@ -56,6 +56,9 @@ OPTIONS line of each entry is indented by `indent1` spaces, and the second and subsequent lines are indented by `indent2` spaces. `width`, `indent1`, and `indent2` default to 76, 6 and 9 respectively. ++ +If width is `0` (zero) then indent the lines of the output without wrapping +them. MAPPING AUTHORS diff --git a/Documentation/git-show-index.txt b/Documentation/git-show-index.txt index 2dcbbb2454..9cbbed944c 100644 --- a/Documentation/git-show-index.txt +++ b/Documentation/git-show-index.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads given idx file for packed git archive created with +Reads given idx file for packed Git archive created with 'git pack-objects' command, and dumps its contents. The information it outputs is subset of what you can get from diff --git a/Documentation/git-status.txt b/Documentation/git-status.txt index 9f1ef9a463..9046df98a0 100644 --- a/Documentation/git-status.txt +++ b/Documentation/git-status.txt @@ -16,7 +16,7 @@ DESCRIPTION Displays paths that have differences between the index file and the current HEAD commit, paths that have differences between the working tree and the index file, and paths in the working tree that are not -tracked by git (and are not ignored by linkgit:gitignore[5]). The first +tracked by Git (and are not ignored by linkgit:gitignore[5]). The first are what you _would_ commit by running `git commit`; the second and third are what you _could_ commit by running 'git add' before running `git commit`. @@ -35,7 +35,7 @@ OPTIONS --porcelain:: Give the output in an easy-to-parse format for scripts. This is similar to the short output, but will remain stable - across git versions and regardless of user configuration. See + across Git versions and regardless of user configuration. See below for details. --long:: @@ -46,15 +46,21 @@ OPTIONS Show untracked files. + The mode parameter is optional (defaults to 'all'), and is used to -specify the handling of untracked files; when -u is not used, the -default is 'normal', i.e. show untracked files and directories. +specify the handling of untracked files. + The possible options are: + - - 'no' - Show no untracked files - - 'normal' - Shows untracked files and directories + - 'no' - Show no untracked files. + - 'normal' - Shows untracked files and directories. - 'all' - Also shows individual files in untracked directories. + +When `-u` option is not used, untracked files and directories are +shown (i.e. the same as specifying `normal`), to help you avoid +forgetting to add newly created files. Because it takes extra work +to find untracked files in the filesystem, this mode may take some +time in a large working tree. You can use `no` to have `git status` +return more quickly without showing untracked files. ++ The default can be changed using the status.showUntrackedFiles configuration variable documented in linkgit:git-config[1]. @@ -96,7 +102,7 @@ The default, long format, is designed to be human readable, verbose and descriptive. Its contents and format are subject to change at any time. -The paths mentioned in the output, unlike many other git commands, are +The paths mentioned in the output, unlike many other Git commands, are made relative to the current directory if you are working in a subdirectory (this is on purpose, to help cutting and pasting). See the status.relativePaths config option below. @@ -168,7 +174,7 @@ Porcelain Format ~~~~~~~~~~~~~~~~ The porcelain format is similar to the short format, but is guaranteed -not to change in a backwards-incompatible way between git versions or +not to change in a backwards-incompatible way between Git versions or based on user configuration. This makes it ideal for parsing by scripts. The description of the short format above also describes the porcelain format, with a few exceptions: diff --git a/Documentation/git-stripspace.txt b/Documentation/git-stripspace.txt index a80d94650d..c87bfcb674 100644 --- a/Documentation/git-stripspace.txt +++ b/Documentation/git-stripspace.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Clean the input in the manner used by 'git' for text such as commit +Clean the input in the manner used by Git for text such as commit messages, notes, tags and branch descriptions. With no arguments, this will: @@ -35,7 +35,13 @@ OPTIONS ------- -s:: --strip-comments:: - Skip and remove all lines starting with '#'. + Skip and remove all lines starting with comment character (default '#'). + +-c:: +--comment-lines:: + Prepend comment character and blank to each line. Lines will automatically + be terminated with a newline. On empty lines, only the comment character + will be prepended. EXAMPLES -------- diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index b1996f1a63..74d5bdc59d 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -13,8 +13,10 @@ SYNOPSIS [--reference <repository>] [--] <repository> [<path>] 'git submodule' [--quiet] status [--cached] [--recursive] [--] [<path>...] 'git submodule' [--quiet] init [--] [<path>...] -'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] [--rebase] - [--reference <repository>] [--merge] [--recursive] [--] [<path>...] +'git submodule' [--quiet] deinit [-f|--force] [--] <path>... +'git submodule' [--quiet] update [--init] [--remote] [-N|--no-fetch] + [-f|--force] [--rebase] [--reference <repository>] + [--merge] [--recursive] [--] [<path>...] 'git submodule' [--quiet] summary [--cached|--files] [(-n|--summary-limit) <n>] [commit] [--] [<path>...] 'git submodule' [--quiet] foreach [--recursive] <command> @@ -91,7 +93,7 @@ working directory is used instead. <path> is the relative location for the cloned submodule to exist in the superproject. If <path> does not exist, then the submodule is created by cloning from the named URL. If <path> does -exist and is already a valid git repository, then this is added +exist and is already a valid Git repository, then this is added to the changeset without cloning. This second form is provided to ease creating a new submodule from scratch, and presumes the user will later push the submodule to the given URL. @@ -134,6 +136,19 @@ init:: the explicit 'init' step if you do not intend to customize any submodule locations. +deinit:: + Unregister the given submodules, i.e. remove the whole + `submodule.$name` section from .git/config together with their work + tree. Further calls to `git submodule update`, `git submodule foreach` + and `git submodule sync` will skip any unregistered submodules until + they are initialized again, so use this command if you don't want to + have a local checkout of the submodule in your work tree anymore. If + you really want to remove a submodule from the repository and commit + that use linkgit:git-rm[1] instead. ++ +If `--force` is specified, the submodule's work tree will be removed even if +it contains local modifications. + update:: Update the registered submodules, i.e. clone missing submodules and checkout the commit specified in the index of the containing repository. @@ -213,8 +228,10 @@ OPTIONS -f:: --force:: - This option is only valid for add and update commands. + This option is only valid for add, deinit and update commands. When running add, allow adding an otherwise ignored submodule path. + When running deinit the submodule work trees will be removed even if + they contain local changes. When running update, throw away local changes in submodules when switching to a different commit; and always run a checkout operation in the submodule, even if the commit listed in the index of the diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt index 69decb13b0..1b8b6498cd 100644 --- a/Documentation/git-svn.txt +++ b/Documentation/git-svn.txt @@ -3,7 +3,7 @@ git-svn(1) NAME ---- -git-svn - Bidirectional operation between a Subversion repository and git +git-svn - Bidirectional operation between a Subversion repository and Git SYNOPSIS -------- @@ -12,8 +12,8 @@ SYNOPSIS DESCRIPTION ----------- -'git svn' is a simple conduit for changesets between Subversion and git. -It provides a bidirectional flow of changes between a Subversion and a git +'git svn' is a simple conduit for changesets between Subversion and Git. +It provides a bidirectional flow of changes between a Subversion and a Git repository. 'git svn' can track a standard Subversion repository, @@ -21,15 +21,15 @@ following the common "trunk/branches/tags" layout, with the --stdlayout option. It can also follow branches and tags in any layout with the -T/-t/-b options (see options to 'init' below, and also the 'clone' command). -Once tracking a Subversion repository (with any of the above methods), the git +Once tracking a Subversion repository (with any of the above methods), the Git repository can be updated from Subversion by the 'fetch' command and -Subversion updated from git by the 'dcommit' command. +Subversion updated from Git by the 'dcommit' command. COMMANDS -------- 'init':: - Initializes an empty git repository with additional + Initializes an empty Git repository with additional metadata directories for 'git svn'. The Subversion URL may be specified as a command-line argument, or as full URL arguments to -T/-t/-b. Optionally, the target @@ -199,9 +199,9 @@ and have no uncommitted changes. Commit each diff from the current branch directly to the SVN repository, and then rebase or reset (depending on whether or not there is a diff between SVN and head). This will create - a revision in SVN for each commit in git. + a revision in SVN for each commit in Git. + -When an optional git branch name (or a git commit object name) +When an optional Git branch name (or a Git commit object name) is specified as an argument, the subcommand works on the specified branch, not on the current branch. + @@ -316,7 +316,7 @@ New features: + -- --show-commit;; - shows the git commit sha1, as well + shows the Git commit sha1, as well --oneline;; our version of --pretty=oneline -- @@ -337,15 +337,25 @@ Any other arguments are passed directly to 'git log' + --git-format;; Produce output in the same format as 'git blame', but with - SVN revision numbers instead of git commit hashes. In this mode, + SVN revision numbers instead of Git commit hashes. In this mode, changes that haven't been committed to SVN (including local working-copy edits) are shown as revision 0. 'find-rev':: When given an SVN revision number of the form 'rN', returns the - corresponding git commit hash (this can optionally be followed by a + corresponding Git commit hash (this can optionally be followed by a tree-ish to specify which branch should be searched). When given a tree-ish, returns the corresponding SVN revision number. ++ +--before;; + Don't require an exact match if given an SVN revision, instead find + the commit corresponding to the state of the SVN repository (on the + current branch) at the specified revision. ++ +--after;; + Don't require an exact match if given an SVN revision; if there is + not an exact match return the closest match searching forward in the + history. 'set-tree':: You should consider using 'dcommit' instead of this command. @@ -368,7 +378,7 @@ Any other arguments are passed directly to 'git log' the $GIT_DIR/info/exclude file. 'mkdirs':: - Attempts to recreate empty directories that core git cannot track + Attempts to recreate empty directories that core Git cannot track based on information in $GIT_DIR/svn/<refname>/unhandled.log files. Empty directories are automatically recreated when using "git svn clone" and "git svn rebase", so "mkdirs" is intended @@ -500,9 +510,9 @@ order. Only the leading sha1 is read from each line, so + Remove directories from the SVN tree if there are no files left behind. SVN can version empty directories, and they are not -removed by default if there are no files left in them. git +removed by default if there are no files left in them. Git cannot version empty directories. Enabling this flag will make -the commit to SVN act like git. +the commit to SVN act like Git. + [verse] config key: svn.rmdir @@ -589,7 +599,7 @@ Passed directly to 'git rebase' when using 'dcommit' if a This can be used with the 'dcommit', 'rebase', 'branch' and 'tag' commands. + -For 'dcommit', print out the series of git arguments that would show +For 'dcommit', print out the series of Git arguments that would show which diffs would be committed to SVN. + For 'rebase', display the local branch associated with the upstream svn @@ -600,14 +610,14 @@ For 'branch' and 'tag', display the urls that will be used for copying when creating the branch or tag. --use-log-author:: - When retrieving svn commits into git (as part of 'fetch', 'rebase', or + When retrieving svn commits into Git (as part of 'fetch', 'rebase', or 'dcommit' operations), look for the first `From:` or `Signed-off-by:` line in the log message and use that as the author string. --add-author-from:: - When committing to svn from git (as part of 'commit-diff', 'set-tree' or 'dcommit' + When committing to svn from Git (as part of 'commit-diff', 'set-tree' or 'dcommit' operations), if the existing log message doesn't already have a `From:` or `Signed-off-by:` line, append a `From:` line based on the - git commit's author string. If you use this, then `--use-log-author` + Git commit's author string. If you use this, then `--use-log-author` will retrieve a valid author string for all commits. @@ -632,7 +642,7 @@ ADVANCED OPTIONS one of the repository layout options --trunk, --tags, --branches, --stdlayout). For each tracked branch, try to find out where its revision was copied from, and set - a suitable parent in the first git commit for the branch. + a suitable parent in the first Git commit for the branch. This is especially helpful when we're tracking a directory that has been moved around within the repository. If this feature is disabled, the branches created by 'git svn' will all @@ -664,7 +674,7 @@ option for (hopefully) obvious reasons. + This option is NOT recommended as it makes it difficult to track down old references to SVN revision numbers in existing documentation, bug -reports and archives. If you plan to eventually migrate from SVN to git +reports and archives. If you plan to eventually migrate from SVN to Git and are certain about dropping SVN history, consider linkgit:git-filter-branch[1] instead. filter-branch also allows reformatting of metadata for ease-of-reading and rewriting authorship @@ -704,7 +714,7 @@ svn-remote.<name>.rewriteUUID:: svn-remote.<name>.pushurl:: - Similar to git's 'remote.<name>.pushurl', this key is designed + Similar to Git's 'remote.<name>.pushurl', this key is designed to be used in cases where 'url' points to an SVN repository via a read-only transport, to provide an alternate read/write transport. It is assumed that both keys point to the same @@ -758,15 +768,15 @@ Tracking and contributing to the trunk of a Subversion-managed project cd trunk # You should be on master branch, double-check with 'git branch' git branch -# Do some work and commit locally to git: +# Do some work and commit locally to Git: git commit ... # Something is committed to SVN, rebase your local changes against the # latest changes in SVN: git svn rebase -# Now commit your changes (that were committed previously using git) to SVN, +# Now commit your changes (that were committed previously using Git) to SVN, # as well as automatically updating your working HEAD: git svn dcommit -# Append svn:ignore settings to the default git exclude file: +# Append svn:ignore settings to the default Git exclude file: git svn show-ignore >> .git/info/exclude ------------------------------------------------------------------------ @@ -806,7 +816,7 @@ have each person clone that repository with 'git clone': git remote add origin server:/pub/project git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git fetch -# Prevent fetch/pull from remote git server in the future, +# Prevent fetch/pull from remote Git server in the future, # we only want to use git svn for future updates git config --remove-section remote.origin # Create a local branch from one of the branches just fetched @@ -839,13 +849,13 @@ While 'git svn' can track copy history (including branches and tags) for repositories adopting a standard layout, it cannot yet represent merge history that happened inside git back upstream to SVN users. Therefore it is advised that -users keep history as linear as possible inside git to ease +users keep history as linear as possible inside Git to ease compatibility with SVN (see the CAVEATS section below). HANDLING OF SVN BRANCHES ------------------------ If 'git svn' is configured to fetch branches (and --follow-branches -is in effect), it sometimes creates multiple git branches for one +is in effect), it sometimes creates multiple Git branches for one SVN branch, where the addtional branches have names of the form 'branchname@nnn' (with nnn an SVN revision number). These additional branches are created if 'git svn' cannot find a parent commit for the @@ -855,17 +865,17 @@ the other branches. Normally, the first commit in an SVN branch consists of a copy operation. 'git svn' will read this commit to get the SVN revision the branch was created from. It will then try to find the -git commit that corresponds to this SVN revision, and use that as the +Git commit that corresponds to this SVN revision, and use that as the parent of the branch. However, it is possible that there is no suitable -git commit to serve as parent. This will happen, among other reasons, +Git commit to serve as parent. This will happen, among other reasons, if the SVN branch is a copy of a revision that was not fetched by 'git svn' (e.g. because it is an old revision that was skipped with '--revision'), or if in SVN a directory was copied that is not tracked by 'git svn' (such as a branch that is not tracked at all, or a subdirectory of a tracked branch). In these cases, 'git svn' will still -create a git branch, but instead of using an existing git commit as the +create a Git branch, but instead of using an existing Git commit as the parent of the branch, it will read the SVN history of the directory the -branch was copied from and create appropriate git commits. This is +branch was copied from and create appropriate Git commits. This is indicated by the message "Initializing parent: <branchname>". Additionally, it will create a special branch named @@ -875,15 +885,15 @@ created parent commit of the branch. If in SVN the branch was deleted and later recreated from a different version, there will be multiple such branches with an '@'. -Note that this may mean that multiple git commits are created for a +Note that this may mean that multiple Git commits are created for a single SVN revision. An example: in an SVN repository with a standard trunk/tags/branches layout, a directory trunk/sub is created in r.100. In r.200, trunk/sub is branched by copying it to branches/. 'git svn -clone -s' will then create a branch 'sub'. It will also create new git +clone -s' will then create a branch 'sub'. It will also create new Git commits for r.100 through r.199 and use these as the history of branch -'sub'. Thus there will be two git commits for each revision from r.100 +'sub'. Thus there will be two Git commits for each revision from r.100 to r.199 (one containing trunk/, one containing trunk/sub/). Finally, it will create a branch 'sub@200' pointing to the new parent commit of branch 'sub' (i.e. the commit for r.200 and trunk/sub/). @@ -894,13 +904,13 @@ CAVEATS For the sake of simplicity and interoperating with Subversion, it is recommended that all 'git svn' users clone, fetch and dcommit directly from the SVN server, and avoid all 'git clone'/'pull'/'merge'/'push' -operations between git repositories and branches. The recommended -method of exchanging code between git branches and users is +operations between Git repositories and branches. The recommended +method of exchanging code between Git branches and users is 'git format-patch' and 'git am', or just 'dcommit'ing to the SVN repository. Running 'git merge' or 'git pull' is NOT recommended on a branch you plan to 'dcommit' from because Subversion users cannot see any -merges you've made. Furthermore, if you merge or pull from a git branch +merges you've made. Furthermore, if you merge or pull from a Git branch that is a mirror of an SVN branch, 'dcommit' may commit to the wrong branch. @@ -919,7 +929,7 @@ any 'git svn' metadata, or config. So repositories created and managed with using 'git svn' should use 'rsync' for cloning, if cloning is to be done at all. -Since 'dcommit' uses rebase internally, any git branches you 'git push' to +Since 'dcommit' uses rebase internally, any Git branches you 'git push' to before 'dcommit' on will require forcing an overwrite of the existing ref on the remote repository. This is generally considered bad practice, see the linkgit:git-push[1] documentation for details. @@ -931,7 +941,7 @@ dcommit with SVN is analogous to that. When cloning an SVN repository, if none of the options for describing the repository layout is used (--trunk, --tags, --branches, ---stdlayout), 'git svn clone' will create a git repository with +--stdlayout), 'git svn clone' will create a Git repository with completely linear history, where branches and tags appear as separate directories in the working copy. While this is the easiest way to get a copy of a complete repository, for projects with many branches it will @@ -947,7 +957,7 @@ branches and tags is required, the options '--trunk' / '--branches' / When using multiple --branches or --tags, 'git svn' does not automatically handle name collisions (for example, if two branches from different paths have the same name, or if a branch and a tag have the same name). In these cases, -use 'init' to set up your git repository then, before your first 'fetch', edit +use 'init' to set up your Git repository then, before your first 'fetch', edit the .git/config file so that the branches and tags are associated with different name spaces. For example: @@ -960,12 +970,12 @@ BUGS We ignore all SVN properties except svn:executable. Any unhandled properties are logged to $GIT_DIR/svn/<refname>/unhandled.log -Renamed and copied directories are not detected by git and hence not +Renamed and copied directories are not detected by Git and hence not tracked when committing to SVN. I do not plan on adding support for this as it's quite difficult and time-consuming to get working for all -the possible corner cases (git doesn't do it, either). Committing +the possible corner cases (Git doesn't do it, either). Committing renamed and copied files is fully supported if they're similar enough -for git to detect them. +for Git to detect them. In SVN, it is possible (though discouraged) to commit changes to a tag (because a tag is just a directory copy, thus technically the same as a @@ -977,7 +987,7 @@ CONFIGURATION ------------- 'git svn' stores [svn-remote] configuration information in the -repository .git/config file. It is similar the core git +repository .git/config file. It is similar the core Git [remote] sections except 'fetch' keys do not accept glob arguments; but they are instead handled by the 'branches' and 'tags' keys. Since some SVN repositories are oddly diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt index 6470cffd32..e3032c46c6 100644 --- a/Documentation/git-tag.txt +++ b/Documentation/git-tag.txt @@ -242,7 +242,7 @@ $ git pull git://git..../proj.git master In such a case, you do not want to automatically follow the other person's tags. -One important aspect of git is its distributed nature, which +One important aspect of Git is its distributed nature, which largely means there is no inherent "upstream" or "downstream" in the system. On the face of it, the above example might seem to indicate that the tag namespace is owned diff --git a/Documentation/git-tools.txt b/Documentation/git-tools.txt index a96403cb8c..ad8b823f77 100644 --- a/Documentation/git-tools.txt +++ b/Documentation/git-tools.txt @@ -1,11 +1,11 @@ -A short git tools survey +A short Git tools survey ======================== Introduction ------------ -Apart from git contrib/ area there are some others third-party tools +Apart from Git contrib/ area there are some others third-party tools you may want to look. This document presents a brief summary of each tool and the corresponding @@ -17,26 +17,26 @@ Alternative/Augmentative Porcelains - *Cogito* (http://www.kernel.org/pub/software/scm/cogito/) - Cogito is a version control system layered on top of the git tree history + Cogito is a version control system layered on top of the Git tree history storage system. It aims at seamless user interface and ease of use, - providing generally smoother user experience than the "raw" Core GIT + providing generally smoother user experience than the "raw" Core Git itself and indeed many other version control systems. Cogito is no longer maintained as most of its functionality - is now in core GIT. + is now in core Git. - *pg* (http://www.spearce.org/category/projects/scm/pg/) - pg is a shell script wrapper around GIT to help the user manage a set of - patches to files. pg is somewhat like quilt or StGIT, but it does have a + pg is a shell script wrapper around Git to help the user manage a set of + patches to files. pg is somewhat like quilt or StGit, but it does have a slightly different feature set. - *StGit* (http://www.procode.org/stgit/) - Stacked GIT provides a quilt-like patch management functionality in the - GIT environment. You can easily manage your patches in the scope of GIT + Stacked Git provides a quilt-like patch management functionality in the + Git environment. You can easily manage your patches in the scope of Git until they get merged upstream. @@ -45,33 +45,33 @@ History Viewers - *gitk* (shipped with git-core) - gitk is a simple Tk GUI for browsing history of GIT repositories easily. + gitk is a simple Tk GUI for browsing history of Git repositories easily. - *gitview* (contrib/) - gitview is a GTK based repository browser for git + gitview is a GTK based repository browser for Git - *gitweb* (shipped with git-core) - GITweb provides full-fledged web interface for GIT repositories. + Gitweb provides full-fledged web interface for Git repositories. - *qgit* (http://digilander.libero.it/mcostalba/) - QGit is a git/StGIT GUI viewer built on Qt/C++. QGit could be used + QGit is a git/StGit GUI viewer built on Qt/C++. QGit could be used to browse history and directory tree, view annotated files, commit changes cherry picking single files or applying patches. - Currently it is the fastest and most feature rich among the git + Currently it is the fastest and most feature rich among the Git viewers and commit tools. - *tig* (http://jonas.nitro.dk/tig/) - tig by Jonas Fonseca is a simple git repository browser + tig by Jonas Fonseca is a simple Git repository browser written using ncurses. Basically, it just acts as a front-end for git-log and git-show/git-diff. Additionally, you can also - use it as a pager for git commands. + use it as a pager for Git commands. Foreign SCM interface @@ -80,20 +80,20 @@ Foreign SCM interface - *git-svn* (shipped with git-core) git-svn is a simple conduit for changesets between a single Subversion - branch and git. + branch and Git. - *quilt2git / git2quilt* (http://home-tj.org/wiki/index.php/Misc) These utilities convert patch series in a quilt repository and commit - series in git back and forth. + series in Git back and forth. - *hg-to-git* (contrib/) - hg-to-git converts a Mercurial repository into a git one, and + hg-to-git converts a Mercurial repository into a Git one, and preserves the full branch history in the process. hg-to-git can - also be used in an incremental way to keep the git repository + also be used in an incremental way to keep the Git repository in sync with the master Mercurial repository. @@ -102,14 +102,14 @@ Others - *(h)gct* (http://www.cyd.liu.se/users/~freku045/gct/) - Commit Tool or (h)gct is a GUI enabled commit tool for git and + Commit Tool or (h)gct is a GUI enabled commit tool for Git and Mercurial (hg). It allows the user to view diffs, select which files to committed (or ignored / reverted) write commit messages and perform the commit itself. - *git.el* (contrib/) - This is an Emacs interface for git. The user interface is modeled on + This is an Emacs interface for Git. The user interface is modeled on pcl-cvs. It has been developed on Emacs 21 and will probably need some tweaking to work on XEmacs. diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 9d0b1515c5..c92775829b 100644 --- a/Documentation/git-update-index.txt +++ b/Documentation/git-update-index.txt @@ -82,10 +82,10 @@ OPTIONS When these flags are specified, the object names recorded for the paths are not updated. Instead, these options set and unset the "assume unchanged" bit for the - paths. When the "assume unchanged" bit is on, git stops + paths. When the "assume unchanged" bit is on, Git stops checking the working tree files for possible modifications, so you need to manually unset the bit to - tell git when you change the working tree file. This is + tell Git when you change the working tree file. This is sometimes helpful when working with a big project on a filesystem that has very slow lstat(2) system call (e.g. cifs). @@ -145,7 +145,15 @@ you will need to handle the situation manually. --index-version <n>:: Write the resulting index out in the named on-disk format version. - The current default version is 2. + Supported versions are 2, 3 and 4. The current default version is 2 + or 3, depending on whether extra features are used, such as + `git add -N`. ++ +Version 4 performs a simple pathname compression that reduces index +size by 30%-50% on large repositories, which results in faster load +time. Version 4 is relatively young (first released in in 1.8.0 in +October 2012). Other Git implementations such as JGit and libgit2 +may not support it yet. -z:: Only meaningful with `--stdin` or `--index-info`; paths are @@ -253,18 +261,18 @@ $ git ls-files -s Using ``assume unchanged'' bit ------------------------------ -Many operations in git depend on your filesystem to have an +Many operations in Git depend on your filesystem to have an efficient `lstat(2)` implementation, so that `st_mtime` information for working tree files can be cheaply checked to see if the file contents have changed from the version recorded in the index file. Unfortunately, some filesystems have inefficient `lstat(2)`. If your filesystem is one of them, you can set "assume unchanged" bit to paths you have not changed to -cause git not to do this check. Note that setting this bit on a -path does not mean git will check the contents of the file to -see if it has changed -- it makes git to omit any checking and +cause Git not to do this check. Note that setting this bit on a +path does not mean Git will check the contents of the file to +see if it has changed -- it makes Git to omit any checking and assume it has *not* changed. When you make changes to working -tree files, you have to explicitly tell git about it by dropping +tree files, you have to explicitly tell Git about it by dropping "assume unchanged" bit, either before or after you modify them. In order to set "assume unchanged" bit, use `--assume-unchanged` @@ -274,7 +282,7 @@ have the "assume unchanged" bit set, use `git ls-files -v` The command looks at `core.ignorestat` configuration variable. When this is true, paths updated with `git update-index paths...` and -paths updated with other git commands that update both index and +paths updated with other Git commands that update both index and working tree (e.g. 'git apply --index', 'git checkout-index -u', and 'git read-tree -u') are automatically marked as "assume unchanged". Note that "assume unchanged" bit is *not* set if diff --git a/Documentation/git-update-ref.txt b/Documentation/git-update-ref.txt index d377a35243..0df13ff6f4 100644 --- a/Documentation/git-update-ref.txt +++ b/Documentation/git-update-ref.txt @@ -73,7 +73,7 @@ in ref value. Log lines are formatted as: Where "oldsha1" is the 40 character hexadecimal value previously stored in <ref>, "newsha1" is the 40 character hexadecimal value of <newvalue> and "committer" is the committer's name, email address -and date in the standard GIT committer ident format. +and date in the standard Git committer ident format. Optionally with -m: diff --git a/Documentation/git-upload-archive.txt b/Documentation/git-upload-archive.txt index 4d52d3833a..d09bbb52b1 100644 --- a/Documentation/git-upload-archive.txt +++ b/Documentation/git-upload-archive.txt @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- Invoked by 'git archive --remote' and sends a generated archive to the -other end over the git protocol. +other end over the Git protocol. This command is usually not invoked directly by the end user. The UI for the protocol is on the 'git archive' side, and the program pair diff --git a/Documentation/git-upload-pack.txt b/Documentation/git-upload-pack.txt index 71f16083d6..0abc806ea9 100644 --- a/Documentation/git-upload-pack.txt +++ b/Documentation/git-upload-pack.txt @@ -26,7 +26,7 @@ OPTIONS ------- --strict:: - Do not try <directory>/.git/ if <directory> is no git directory. + Do not try <directory>/.git/ if <directory> is no Git directory. --timeout=<n>:: Interrupt transfer after <n> seconds of inactivity. diff --git a/Documentation/git-var.txt b/Documentation/git-var.txt index 67edf58689..44ff9541df 100644 --- a/Documentation/git-var.txt +++ b/Documentation/git-var.txt @@ -3,7 +3,7 @@ git-var(1) NAME ---- -git-var - Show a git logical variable +git-var - Show a Git logical variable SYNOPSIS @@ -13,13 +13,13 @@ SYNOPSIS DESCRIPTION ----------- -Prints a git logical variable. +Prints a Git logical variable. OPTIONS ------- -l:: Cause the logical variables to be listed. In addition, all the - variables of the git configuration file .git/config are listed + variables of the Git configuration file .git/config are listed as well. (However, the configuration variables listing functionality is deprecated in favor of `git config -l`.) @@ -35,10 +35,10 @@ GIT_AUTHOR_IDENT:: The author of a piece of code. GIT_COMMITTER_IDENT:: - The person who put a piece of code into git. + The person who put a piece of code into Git. GIT_EDITOR:: - Text editor for use by git commands. The value is meant to be + Text editor for use by Git commands. The value is meant to be interpreted by the shell when it is used. Examples: `~/bin/vi`, `$SOME_ENVIRONMENT_VARIABLE`, `"C:\Program Files\Vim\gvim.exe" --nofork`. The order of preference is the `$GIT_EDITOR` @@ -50,7 +50,7 @@ ifdef::git-default-editor[] endif::git-default-editor[] GIT_PAGER:: - Text viewer for use by git commands (e.g., 'less'). The value + Text viewer for use by Git commands (e.g., 'less'). The value is meant to be interpreted by the shell. The order of preference is the `$GIT_PAGER` environment variable, then `core.pager` configuration, then `$PAGER`, and then the default chosen at diff --git a/Documentation/git-verify-pack.txt b/Documentation/git-verify-pack.txt index cd230769fd..0eb9ffbdd2 100644 --- a/Documentation/git-verify-pack.txt +++ b/Documentation/git-verify-pack.txt @@ -3,7 +3,7 @@ git-verify-pack(1) NAME ---- -git-verify-pack - Validate packed git archive files +git-verify-pack - Validate packed Git archive files SYNOPSIS @@ -14,7 +14,7 @@ SYNOPSIS DESCRIPTION ----------- -Reads given idx file for packed git archive created with the +Reads given idx file for packed Git archive created with the 'git pack-objects' command and verifies idx file and the corresponding pack file. diff --git a/Documentation/git-verify-tag.txt b/Documentation/git-verify-tag.txt index 5ff76e892a..e996135be9 100644 --- a/Documentation/git-verify-tag.txt +++ b/Documentation/git-verify-tag.txt @@ -21,7 +21,7 @@ OPTIONS Print the contents of the tag object before validating it. <tag>...:: - SHA1 identifiers of git tag objects. + SHA1 identifiers of Git tag objects. GIT --- diff --git a/Documentation/git-web--browse.txt b/Documentation/git-web--browse.txt index c2bc87bc61..ba79cb4f35 100644 --- a/Documentation/git-web--browse.txt +++ b/Documentation/git-web--browse.txt @@ -3,7 +3,7 @@ git-web{litdd}browse(1) NAME ---- -git-web--browse - git helper script to launch a web browser +git-web--browse - Git helper script to launch a web browser SYNOPSIS -------- @@ -50,7 +50,7 @@ OPTIONS -c <conf.var>:: --config=<conf.var>:: - CONF.VAR is looked up in the git config files. If it's set, + CONF.VAR is looked up in the Git config files. If it's set, then its value specifies the browser that should be used. CONFIGURATION VARIABLES diff --git a/Documentation/git-whatchanged.txt b/Documentation/git-whatchanged.txt index 6c8f510c3f..c600b61e2b 100644 --- a/Documentation/git-whatchanged.txt +++ b/Documentation/git-whatchanged.txt @@ -24,7 +24,7 @@ This manual page describes only the most frequently used options. OPTIONS ------- -p:: - Show textual diffs, instead of the git internal diff + Show textual diffs, instead of the Git internal diff output format that is useful only to tell the changed paths and their nature of changes. @@ -36,7 +36,7 @@ OPTIONS exclusive, top inclusive). -r:: - Show git internal diff output, but for the whole tree, + Show Git internal diff output, but for the whole tree, not just the top level. -m:: diff --git a/Documentation/git.txt b/Documentation/git.txt index c03b7adc97..4307d62bd4 100644 --- a/Documentation/git.txt +++ b/Documentation/git.txt @@ -27,11 +27,11 @@ commands. The link:user-manual.html[Git User's Manual] has a more in-depth introduction. After you mastered the basic concepts, you can come back to this -page to learn what commands git offers. You can learn more about -individual git commands with "git help command". linkgit:gitcli[7] +page to learn what commands Git offers. You can learn more about +individual Git commands with "git help command". linkgit:gitcli[7] manual page gives you an overview of the command line command syntax. -Formatted and hyperlinked version of the latest git documentation +Formatted and hyperlinked version of the latest Git documentation can be viewed at `http://git-htmldocs.googlecode.com/git/git.html`. ifdef::stalenotes[] @@ -39,13 +39,23 @@ ifdef::stalenotes[] ============ You are reading the documentation for the latest (possibly -unreleased) version of git, that is available from 'master' +unreleased) version of Git, that is available from 'master' branch of the `git.git` repository. Documentation for older releases are available here: -* link:v1.8.1/git.html[documentation for release 1.8.1] +* link:v1.8.2/git.html[documentation for release 1.8.2] * release notes for + link:RelNotes/1.8.2.txt[1.8.2]. + +* link:v1.8.1.5/git.html[documentation for release 1.8.1.5] + +* release notes for + link:RelNotes/1.8.1.5.txt[1.8.1.5], + link:RelNotes/1.8.1.4.txt[1.8.1.4], + link:RelNotes/1.8.1.3.txt[1.8.1.3], + link:RelNotes/1.8.1.2.txt[1.8.1.2], + link:RelNotes/1.8.1.1.txt[1.8.1.1], link:RelNotes/1.8.1.txt[1.8.1]. * link:v1.8.0.3/git.html[documentation for release 1.8.0.3] @@ -354,12 +364,12 @@ endif::stalenotes[] OPTIONS ------- --version:: - Prints the git suite version that the 'git' program came from. + Prints the Git suite version that the 'git' program came from. --help:: Prints the synopsis and a list of the most commonly used commands. If the option '--all' or '-a' is given then all - available commands are printed. If a git command is named this + available commands are printed. If a Git command is named this option will bring up the manual page for that command. + Other options are available to control how the manual page is @@ -374,22 +384,22 @@ help ...`. 'git config' (subkeys separated by dots). --exec-path[=<path>]:: - Path to wherever your core git programs are installed. + Path to wherever your core Git programs are installed. This can also be controlled by setting the GIT_EXEC_PATH environment variable. If no path is given, 'git' will print the current setting and then exit. --html-path:: - Print the path, without trailing slash, where git's HTML + Print the path, without trailing slash, where Git's HTML documentation is installed and exit. --man-path:: Print the manpath (see `man(1)`) for the man pages for - this version of git and exit. + this version of Git and exit. --info-path:: Print the path where the Info files documenting this - version of git are installed and exit. + version of Git are installed and exit. -p:: --paginate:: @@ -399,7 +409,7 @@ help ...`. below). --no-pager:: - Do not pipe git output into a pager. + Do not pipe Git output into a pager. --git-dir=<path>:: Set the path to the repository. This can also be controlled by @@ -415,7 +425,7 @@ help ...`. more detailed discussion). --namespace=<path>:: - Set the git namespace. See linkgit:gitnamespaces[7] for more + Set the Git namespace. See linkgit:gitnamespaces[7] for more details. Equivalent to setting the `GIT_NAMESPACE` environment variable. @@ -425,7 +435,7 @@ help ...`. directory. --no-replace-objects:: - Do not use replacement refs to replace git objects. See + Do not use replacement refs to replace Git objects. See linkgit:git-replace[1] for more information. --literal-pathspecs:: @@ -437,7 +447,7 @@ help ...`. GIT COMMANDS ------------ -We divide git into high level ("porcelain") commands and low level +We divide Git into high level ("porcelain") commands and low level ("plumbing") commands. High-level commands (porcelain) @@ -474,7 +484,7 @@ include::cmds-foreignscminterface.txt[] Low-level commands (plumbing) ----------------------------- -Although git includes its +Although Git includes its own porcelain layer, its low-level commands are sufficient to support development of alternative porcelains. Developers of such porcelains might start by reading about linkgit:git-update-index[1] and @@ -532,10 +542,9 @@ include::cmds-purehelpers.txt[] Configuration Mechanism ----------------------- -Starting from 0.99.9 (actually mid 0.99.8.GIT), `.git/config` file -is used to hold per-repository configuration options. It is a -simple text file modeled after `.ini` format familiar to some -people. Here is an example: +Git uses a simple text format to store customizations that are per +repository and are per user. Such a configuration file may look +like this: ------------ # @@ -550,13 +559,13 @@ people. Here is an example: ; user identity [user] name = "Junio C Hamano" - email = "junkio@twinsun.com" + email = "gitster@pobox.com" ------------ Various commands read from the configuration file and adjust their operation accordingly. See linkgit:git-config[1] for a -list. +list and more details about the configuration mechanism. Identifier Terminology @@ -595,7 +604,7 @@ Identifier Terminology Symbolic Identifiers -------------------- -Any git command accepting any <object> can also use the following +Any Git command accepting any <object> can also use the following symbolic notation: HEAD:: @@ -631,13 +640,13 @@ Please see linkgit:gitglossary[7]. Environment Variables --------------------- -Various git commands use the following environment variables: +Various Git commands use the following environment variables: -The git Repository +The Git Repository ~~~~~~~~~~~~~~~~~~ -These environment variables apply to 'all' core git commands. Nb: it +These environment variables apply to 'all' core Git commands. Nb: it is worth noting that they may be used/overridden by SCMS sitting above -git so take care if using Cogito etc. +Git so take care if using Cogito etc. 'GIT_INDEX_FILE':: This environment allows the specification of an alternate @@ -651,10 +660,10 @@ git so take care if using Cogito etc. directory is used. 'GIT_ALTERNATE_OBJECT_DIRECTORIES':: - Due to the immutable nature of git objects, old objects can be + Due to the immutable nature of Git objects, old objects can be archived into shared, read-only directories. This variable specifies a ":" separated (on Windows ";" separated) list - of git object directories which can be used to search for git + of Git object directories which can be used to search for Git objects. New objects will not be written to these directories. 'GIT_DIR':: @@ -671,28 +680,35 @@ git so take care if using Cogito etc. option and the core.worktree configuration variable. 'GIT_NAMESPACE':: - Set the git namespace; see linkgit:gitnamespaces[7] for details. + Set the Git namespace; see linkgit:gitnamespaces[7] for details. The '--namespace' command-line option also sets this value. 'GIT_CEILING_DIRECTORIES':: - This should be a colon-separated list of absolute paths. - If set, it is a list of directories that git should not chdir - up into while looking for a repository directory. - It will not exclude the current working directory or - a GIT_DIR set on the command line or in the environment. - (Useful for excluding slow-loading network directories.) + This should be a colon-separated list of absolute paths. If + set, it is a list of directories that Git should not chdir up + into while looking for a repository directory (useful for + excluding slow-loading network directories). It will not + exclude the current working directory or a GIT_DIR set on the + command line or in the environment. Normally, Git has to read + the entries in this list and resolve any symlink that + might be present in order to compare them with the current + directory. However, if even this access is slow, you + can add an empty entry to the list to tell Git that the + subsequent entries are not symlinks and needn't be resolved; + e.g., + 'GIT_CEILING_DIRECTORIES=/maybe/symlink::/very/slow/non/symlink'. 'GIT_DISCOVERY_ACROSS_FILESYSTEM':: When run in a directory that does not have ".git" repository - directory, git tries to find such a directory in the parent + directory, Git tries to find such a directory in the parent directories to find the top of the working tree, but by default it does not cross filesystem boundaries. This environment variable - can be set to true to tell git not to stop at filesystem + can be set to true to tell Git not to stop at filesystem boundaries. Like 'GIT_CEILING_DIRECTORIES', this will not affect an explicit repository directory set via 'GIT_DIR' or on the command line. -git Commits +Git Commits ~~~~~~~~~~~ 'GIT_AUTHOR_NAME':: 'GIT_AUTHOR_EMAIL':: @@ -703,13 +719,13 @@ git Commits 'EMAIL':: see linkgit:git-commit-tree[1] -git Diffs +Git Diffs ~~~~~~~~~ 'GIT_DIFF_OPTS':: Only valid setting is "--unified=??" or "-u??" to set the number of context lines shown when a unified diff is created. This takes precedence over any "-U" or "--unified" option - value passed on the git diff command line. + value passed on the Git diff command line. 'GIT_EXTERNAL_DIFF':: When the environment variable 'GIT_EXTERNAL_DIFF' is set, the @@ -744,13 +760,13 @@ other 'GIT_PAGER':: This environment variable overrides `$PAGER`. If it is set - to an empty string or to the value "cat", git will not launch + to an empty string or to the value "cat", Git will not launch a pager. See also the `core.pager` option in linkgit:git-config[1]. 'GIT_EDITOR':: This environment variable overrides `$EDITOR` and `$VISUAL`. - It is used by several git commands 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]. @@ -758,9 +774,12 @@ other If this environment variable is set then 'git fetch' and 'git push' will use this command instead of 'ssh' when they need to connect to a remote system. - The '$GIT_SSH' command will be given exactly two arguments: - the 'username@host' (or just 'host') from the URL and the - shell command to execute on that remote system. + The '$GIT_SSH' command will be given exactly two or + four arguments: the 'username@host' (or just 'host') + from the URL and the shell command to execute on that + remote system, optionally preceded by '-p' (literally) and + the 'port' from the URL when it specifies something other + than the default SSH port. + To pass options to the program that you want to list in GIT_SSH you will need to wrap the program and options into a shell script, @@ -771,7 +790,7 @@ personal `.ssh/config` file. Please consult your ssh documentation for further details. 'GIT_ASKPASS':: - If this environment variable is set, then git commands which need to + If this environment variable is set, then Git commands which need to acquire passwords or passphrases (e.g. for HTTP or IMAP authentication) will call this program with a suitable prompt as command line argument and read the password from its STDOUT. See also the 'core.askpass' @@ -792,30 +811,30 @@ for further details. after each commit-oriented record have been flushed. If this variable is set to "0", the output of these commands will be done using completely buffered I/O. If this environment variable is - not set, git will choose buffered or record-oriented flushing + not set, Git will choose buffered or record-oriented flushing based on whether stdout appears to be redirected to a file or not. 'GIT_TRACE':: If this variable is set to "1", "2" or "true" (comparison - is case insensitive), git will print `trace:` messages on + is case insensitive), Git will print `trace:` messages on stderr telling about alias expansion, built-in command execution and external command execution. If this variable is set to an integer value greater than 1 - and lower than 10 (strictly) then git will interpret this + and lower than 10 (strictly) then Git will interpret this value as an open file descriptor and will try to write the trace messages into this file descriptor. Alternatively, if this variable is set to an absolute path - (starting with a '/' character), git will interpret this + (starting with a '/' character), Git will interpret this as a file path and will try to write the trace messages into it. GIT_LITERAL_PATHSPECS:: - Setting this variable to `1` will cause git to treat all + Setting this variable to `1` will cause Git to treat all pathspecs literally, rather than as glob patterns. For example, running `GIT_LITERAL_PATHSPECS=1 git log -- '*.c'` will search for commits that touch the path `*.c`, not any paths that the glob `*.c` matches. You might want this if you are feeding - literal paths to git (e.g., paths previously given to you by + literal paths to Git (e.g., paths previously given to you by `git ls-tree`, `--raw` diff output, etc). @@ -823,10 +842,10 @@ Discussion[[Discussion]] ------------------------ More detail on the following is available from the -link:user-manual.html#git-concepts[git concepts chapter of the +link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7]. -A git project normally consists of a working directory with a ".git" +A Git project normally consists of a working directory with a ".git" subdirectory at the top level. The .git directory contains, among other things, a compressed object database representing the complete history of the project, an "index" file which links that history to the current @@ -876,12 +895,12 @@ FURTHER DOCUMENTATION --------------------- See the references in the "description" section to get started -using git. The following is probably more detail than necessary +using Git. The following is probably more detail than necessary for a first-time user. -The link:user-manual.html#git-concepts[git concepts chapter of the +The link:user-manual.html#git-concepts[Git concepts chapter of the user-manual] and linkgit:gitcore-tutorial[7] both provide -introductions to the underlying git architecture. +introductions to the underlying Git architecture. See linkgit:gitworkflows[7] for an overview of recommended workflows. @@ -889,7 +908,7 @@ See also the link:howto-index.html[howto] documents for some useful examples. The internals are documented in the -link:technical/api-index.html[GIT API documentation]. +link:technical/api-index.html[Git API documentation]. Users migrating from CVS may also want to read linkgit:gitcvs-migration[7]. @@ -898,7 +917,7 @@ read linkgit:gitcvs-migration[7]. Authors ------- Git was started by Linus Torvalds, and is currently maintained by Junio -C Hamano. Numerous contributions have come from the git mailing list +C Hamano. Numerous contributions have come from the Git mailing list <git@vger.kernel.org>. http://www.ohloh.net/p/git/contributors/summary gives you a more complete list of contributors. diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 2698f63cf9..b322a2666c 100644 --- a/Documentation/gitattributes.txt +++ b/Documentation/gitattributes.txt @@ -58,7 +58,7 @@ attribute. The rules how the pattern matches paths are the same as in `.gitignore` files; see linkgit:gitignore[5]. Unlike `.gitignore`, negative patterns are forbidden. -When deciding what attributes are assigned to a path, git +When deciding what attributes are assigned to a path, Git consults `$GIT_DIR/info/attributes` file (which has the highest precedence), `.gitattributes` file in the same directory as the path in question, and its parent directories up to the toplevel of the @@ -94,7 +94,7 @@ the name of the attribute prefixed with an exclamation point `!`. EFFECTS ------- -Certain operations by git can be influenced by assigning +Certain operations by Git can be influenced by assigning particular attributes to a path. Currently, the following operations are attributes-aware. @@ -104,7 +104,7 @@ Checking-out and checking-in These attributes affect how the contents stored in the repository are copied to the working tree files when commands such as 'git checkout' and 'git merge' run. They also affect how -git stores the contents you prepare in the working tree in the +Git stores the contents you prepare in the working tree in the repository upon 'git add' and 'git commit'. `text` @@ -124,22 +124,22 @@ Set:: Unset:: - Unsetting the `text` attribute on a path tells git not to + Unsetting the `text` attribute on a path tells Git not to attempt any end-of-line conversion upon checkin or checkout. Set to string value "auto":: When `text` is set to "auto", the path is marked for automatic - end-of-line normalization. If git decides that the content is + end-of-line normalization. If Git decides that the content is text, its line endings are normalized to LF on checkin. Unspecified:: - If the `text` attribute is unspecified, git uses the + If the `text` attribute is unspecified, Git uses the `core.autocrlf` configuration variable to determine if the file should be converted. -Any other value causes git to act as if `text` has been left +Any other value causes Git to act as if `text` has been left unspecified. `eol` @@ -151,13 +151,13 @@ content checks, effectively setting the `text` attribute. Set to string value "crlf":: - This setting forces git to normalize line endings for this + This setting forces Git to normalize line endings for this file on checkin and convert them to CRLF when the file is checked out. Set to string value "lf":: - This setting forces git to normalize line endings to LF on + This setting forces Git to normalize line endings to LF on checkin and prevents conversion to CRLF when the file is checked out. @@ -176,11 +176,11 @@ crlf=input eol=lf End-of-line conversion ^^^^^^^^^^^^^^^^^^^^^^ -While git normally leaves file contents alone, it can be configured to +While Git normally leaves file contents alone, it can be configured to normalize line endings to LF in the repository and, optionally, to convert them to CRLF when files are checked out. -Here is an example that will make git normalize .txt, .vcproj and .sh +Here is an example that will make Git normalize .txt, .vcproj and .sh files, ensure that .vcproj files have CRLF and .sh files have LF in the working directory, and prevent .jpg files from being normalized regardless of their content. @@ -194,7 +194,7 @@ regardless of their content. Other source code management systems normalize all text files in their repositories, and there are two ways to enable similar automatic -normalization in git. +normalization in Git. If you simply want to have CRLF line endings in your working directory regardless of the repository you are working with, you can set the @@ -219,9 +219,9 @@ attribute to "auto" for _all_ files. * text=auto ------------------------ -This ensures that all files that git considers to be text will have +This ensures that all files that Git considers to be text will have normalized (LF) line endings in the repository. The `core.eol` -configuration variable controls which line endings git will use for +configuration variable controls which line endings Git will use for normalized files in your working directory; the default is to use the native line ending for your platform, or CRLF if `core.autocrlf` is set. @@ -234,7 +234,7 @@ directory: ------------------------------------------------- $ echo "* text=auto" >>.gitattributes -$ rm .git/index # Remove the index to force git to +$ rm .git/index # Remove the index to force Git to $ git reset # re-scan the working directory $ git status # Show files that will be normalized $ git add -u @@ -249,17 +249,17 @@ unset their `text` attribute before running 'git add -u'. manual.pdf -text ------------------------ -Conversely, text files that git does not detect can have normalization +Conversely, text files that Git does not detect can have normalization enabled manually. ------------------------ weirdchars.txt text ------------------------ -If `core.safecrlf` is set to "true" or "warn", git verifies if +If `core.safecrlf` is set to "true" or "warn", Git verifies if the conversion is reversible for the current setting of -`core.autocrlf`. For "true", git rejects irreversible -conversions; for "warn", git only prints a warning but accepts +`core.autocrlf`. For "true", Git rejects irreversible +conversions; for "warn", Git only prints a warning but accepts an irreversible conversion. The safety triggers to prevent such a conversion done to the files in the work tree, but there are a few exceptions. Even though... @@ -280,7 +280,7 @@ few exceptions. Even though... `ident` ^^^^^^^ -When the attribute `ident` is set for a path, git replaces +When the attribute `ident` is set for a path, Git replaces `$Id$` in the blob object with `$Id:`, followed by the 40-character hexadecimal blob object name, followed by a dollar sign `$` upon checkout. Any byte sequence that begins with @@ -311,7 +311,7 @@ the appropriate filter program, the project should still be usable. Another use of the content filtering is to store the content that cannot be directly used in the repository (e.g. a UUID that refers to the true -content stored outside git, or an encrypted content) and turn it into a +content stored outside Git, or an encrypted content) and turn it into a usable form upon checkout (e.g. download the external content, or decrypt the encrypted content). @@ -397,7 +397,7 @@ clean/smudge filter or text/eol/ident attributes, merging anything where the attribute is not in place would normally cause merge conflicts. -To prevent these unnecessary merge conflicts, git can be told to run a +To prevent these unnecessary merge conflicts, Git can be told to run a virtual check-out and check-in of all three stages of a file when resolving a three-way merge by setting the `merge.renormalize` configuration variable. This prevents changes caused by check-in @@ -417,11 +417,11 @@ Generating diff text `diff` ^^^^^^ -The attribute `diff` affects how 'git' generates diffs for particular -files. It can tell git whether to generate a textual patch for the path +The attribute `diff` affects how Git generates diffs for particular +files. It can tell Git whether to generate a textual patch for the path or to treat the path as a binary file. It can also affect what line is -shown on the hunk header `@@ -k,l +n,m @@` line, tell git to use an -external command to generate the diff, or ask git to convert binary +shown on the hunk header `@@ -k,l +n,m @@` line, tell Git to use an +external command to generate the diff, or ask Git to convert binary files to a text format before generating the diff. Set:: @@ -449,7 +449,7 @@ String:: specify one or more options, as described in the following section. The options for the diff driver "foo" are defined by the configuration variables in the "diff.foo" section of the - git config file. + Git config file. Defining an external diff driver @@ -467,7 +467,7 @@ To define an external diff driver `jcdiff`, add a section to your command = j-c-diff ---------------------------------------------------------------- -When git needs to show you a diff for the path with `diff` +When Git needs to show you a diff for the path with `diff` attribute set to `jcdiff`, it calls the command you specified with the above configuration, i.e. `j-c-diff`, with 7 parameters, just like `GIT_EXTERNAL_DIFF` program is called. @@ -606,7 +606,7 @@ should generate it separately and send it as a comment _in addition to_ the usual binary diff that you might send. Because text conversion can be slow, especially when doing a -large number of them with `git log -p`, git provides a mechanism +large number of them with `git log -p`, Git provides a mechanism to cache the output and use it in future diffs. To enable caching, set the "cachetextconv" variable in your diff driver's config. For example: @@ -619,7 +619,7 @@ config. For example: This will cache the result of running "exif" on each blob indefinitely. If you change the textconv config variable for a -diff driver, git will automatically invalidate the cache entries +diff driver, Git will automatically invalidate the cache entries and re-run the textconv filter. If you want to invalidate the cache manually (e.g., because your version of "exif" was updated and now produces better output), you can remove the cache @@ -640,7 +640,7 @@ output to resemble unified diff. You are free to locate and report changes in the most appropriate way for your data format. A textconv, by comparison, is much more limiting. You provide a -transformation of the data into a line-oriented text format, and git +transformation of the data into a line-oriented text format, and Git uses its regular diff tools to generate the output. There are several advantages to choosing this method: @@ -650,7 +650,7 @@ advantages to choosing this method: odt2txt). 2. Git diff features. By performing only the transformation step - yourself, you can still utilize many of git's diff features, + yourself, you can still utilize many of Git's diff features, including colorization, word-diff, and combined diffs for merges. 3. Caching. Textconv caching can speed up repeated diffs, such as those @@ -675,7 +675,7 @@ attribute in the `.gitattributes` file: *.ps -diff ------------------------ -This will cause git to generate `Binary files differ` (or a binary +This will cause Git to generate `Binary files differ` (or a binary patch, if binary patches are enabled) instead of a regular diff. However, one may also want to specify other diff driver attributes. For @@ -831,7 +831,7 @@ control per path. Set:: - Notice all types of potential whitespace errors known to git. + Notice all types of potential whitespace errors known to Git. The tab width is taken from the value of the `core.whitespace` configuration variable. @@ -863,7 +863,7 @@ archive files. `export-subst` ^^^^^^^^^^^^^^ -If the attribute `export-subst` is set for a file then git will expand +If the attribute `export-subst` is set for a file then Git will expand several placeholders when adding this file to an archive. The expansion depends on the availability of a commit ID, i.e., if linkgit:git-archive[1] has been given a tree instead of a commit or a @@ -961,7 +961,7 @@ abc -foo -bar the attributes given to path `t/abc` are computed as follows: 1. By examining `t/.gitattributes` (which is in the same - directory as the path in question), git finds that the first + directory as the path in question), Git finds that the first line matches. `merge` attribute is set. It also finds that the second line matches, and attributes `foo` and `bar` are unset. diff --git a/Documentation/gitcli.txt b/Documentation/gitcli.txt index 3bc1500eda..9ac5088acd 100644 --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -3,7 +3,7 @@ gitcli(7) NAME ---- -gitcli - git command line interface and conventions +gitcli - Git command line interface and conventions SYNOPSIS -------- @@ -13,7 +13,7 @@ gitcli DESCRIPTION ----------- -This manual describes the convention used throughout git CLI. +This manual describes the convention used throughout Git CLI. Many commands take revisions (most often "commits", but sometimes "tree-ish", depending on the context and command) and paths as their @@ -32,7 +32,7 @@ arguments. Here are the rules: between the HEAD commit and the work tree as a whole". You can say `git diff HEAD --` to ask for the latter. - * Without disambiguating `--`, git makes a reasonable guess, but errors + * Without disambiguating `--`, Git makes a reasonable guess, but errors out and asking you to disambiguate when ambiguous. E.g. if you have a file called HEAD in your work tree, `git diff HEAD` is ambiguous, and you have to say either `git diff HEAD --` or `git diff -- HEAD` to @@ -60,9 +60,9 @@ see `hello.c` in your working tree with the former, but with the latter you will. Here are the rules regarding the "flags" that you should follow when you are -scripting git: +scripting Git: - * it's preferred to use the non dashed form of git commands, which means that + * it's preferred to use the non dashed form of Git commands, which means that you should prefer `git foo` to `git-foo`. * splitting short options to separate words (prefer `git foo -a -b` @@ -90,7 +90,7 @@ scripting git: ENHANCED OPTION PARSER ---------------------- -From the git 1.5.4 series and further, many git commands (not all of them at the +From the Git 1.5.4 series and further, many Git commands (not all of them at the time of the writing though) come with an enhanced option parser. Here is a list of the facilities provided by this option parser. @@ -107,17 +107,18 @@ couple of magic command line options: --------------------------------------------- $ git describe -h usage: git describe [options] <committish>* + or: git describe [options] --dirty --contains find the tag that comes after the commit --debug debug search strategy on stderr - --all use any ref in .git/refs - --tags use any tag in .git/refs/tags - --abbrev [<n>] use <n> digits to display SHA-1s - --candidates <n> consider <n> most recent tags (default: 10) + --all use any ref + --tags use any tag, even unannotated + --long always use long format + --abbrev[=<n>] use <n> digits to display SHA-1s --------------------------------------------- --help-all:: - Some git commands take options that are only used for plumbing or that + Some Git commands take options that are only used for plumbing or that are deprecated, and such options are hidden from the default usage. This option gives the full list of options. diff --git a/Documentation/gitcore-tutorial.txt b/Documentation/gitcore-tutorial.txt index 5325c5a7d5..59c1c17cca 100644 --- a/Documentation/gitcore-tutorial.txt +++ b/Documentation/gitcore-tutorial.txt @@ -3,7 +3,7 @@ gitcore-tutorial(7) NAME ---- -gitcore-tutorial - A git core tutorial for developers +gitcore-tutorial - A Git core tutorial for developers SYNOPSIS -------- @@ -12,17 +12,17 @@ git * DESCRIPTION ----------- -This tutorial explains how to use the "core" git commands to set up and -work with a git repository. +This tutorial explains how to use the "core" Git commands to set up and +work with a Git repository. -If you just need to use git as a revision control system you may prefer -to start with "A Tutorial Introduction to GIT" (linkgit:gittutorial[7]) or -link:user-manual.html[the GIT User Manual]. +If you just need to use Git as a revision control system you may prefer +to start with "A Tutorial Introduction to Git" (linkgit:gittutorial[7]) or +link:user-manual.html[the Git User Manual]. However, an understanding of these low-level tools can be helpful if -you want to understand git's internals. +you want to understand Git's internals. -The core git is often called "plumbing", with the prettier user +The core Git is often called "plumbing", with the prettier user interfaces on top of it called "porcelain". You may not want to use the plumbing directly very often, but it can be good to know what the plumbing does for when the porcelain isn't flushing. @@ -40,19 +40,19 @@ Deeper technical details are often marked as Notes, which you can skip on your first reading. -Creating a git repository +Creating a Git repository ------------------------- -Creating a new git repository couldn't be easier: all git repositories start +Creating a new Git repository couldn't be easier: all Git repositories start out empty, and the only thing you need to do is find yourself a subdirectory that you want to use as a working tree - either an empty one for a totally new project, or an existing working tree that you want -to import into git. +to import into Git. For our first example, we're going to start a totally new repository from scratch, with no pre-existing files, and we'll call it 'git-tutorial'. To start up, create a subdirectory for it, change into that -subdirectory, and initialize the git infrastructure with 'git init': +subdirectory, and initialize the Git infrastructure with 'git init': ------------------------------------------------ $ mkdir git-tutorial @@ -60,13 +60,13 @@ $ cd git-tutorial $ git init ------------------------------------------------ -to which git will reply +to which Git will reply ---------------- Initialized empty Git repository in .git/ ---------------- -which is just git's way of saying that you haven't been doing anything +which is just Git's way of saying that you haven't been doing anything strange, and that it will have created a local `.git` directory setup for your new project. You will now have a `.git` directory, and you can inspect that with 'ls'. For your new empty project, it should show you @@ -102,7 +102,7 @@ start out expecting to work on the `master` branch. However, this is only a convention, and you can name your branches anything you want, and don't have to ever even 'have' a `master` -branch. A number of the git tools will assume that `.git/HEAD` is +branch. A number of the Git tools will assume that `.git/HEAD` is valid, though. [NOTE] @@ -119,18 +119,18 @@ populating your tree. An advanced user may want to take a look at linkgit:gitrepository-layout[5] after finishing this tutorial. -You have now created your first git repository. Of course, since it's +You have now created your first Git repository. Of course, since it's empty, that's not very useful, so let's start populating it with data. -Populating a git repository +Populating a Git repository --------------------------- We'll keep this simple and stupid, so we'll start off with populating a few trivial files just to get a feel for it. Start off with just creating any random files that you want to maintain -in your git repository. We'll start off with a few bad examples, just to +in your Git repository. We'll start off with a few bad examples, just to get a feel for how this works: ------------------------------------------------ @@ -146,7 +146,7 @@ but to actually check in your hard work, you will have to go through two steps: - commit that index file as an object. -The first step is trivial: when you want to tell git about any changes +The first step is trivial: when you want to tell Git about any changes to your working tree, you use the 'git update-index' program. That program normally just takes a list of filenames you want to update, but to avoid trivial mistakes, it refuses to add new entries to the index @@ -160,10 +160,10 @@ So to populate the index with the two files you just created, you can do $ git update-index --add hello example ------------------------------------------------ -and you have now told git to track those two files. +and you have now told Git to track those two files. In fact, as you did that, if you now look into your object directory, -you'll notice that git will have added two new objects to the object +you'll notice that Git will have added two new objects to the object database. If you did exactly the steps above, you should now be able to do @@ -189,7 +189,7 @@ $ git cat-file -t 557db03de997c86a4a028e1ebd3a1ceb225be238 ---------------- where the `-t` tells 'git cat-file' to tell you what the "type" of the -object is. git will tell you that you have a "blob" object (i.e., just a +object is. Git will tell you that you have a "blob" object (i.e., just a regular file), and you can see the contents with ---------------- @@ -214,28 +214,28 @@ Anyway, as we mentioned previously, you normally never actually take a look at the objects themselves, and typing long 40-character hex names is not something you'd normally want to do. The above digression was just to show that 'git update-index' did something magical, and -actually saved away the contents of your files into the git object +actually saved away the contents of your files into the Git object database. Updating the index did something else too: it created a `.git/index` file. This is the index that describes your current working tree, and something you should be very aware of. Again, you normally never worry about the index file itself, but you should be aware of the fact that -you have not actually really "checked in" your files into git so far, -you've only *told* git about them. +you have not actually really "checked in" your files into Git so far, +you've only *told* Git about them. -However, since git knows about them, you can now start using some of the -most basic git commands to manipulate the files or look at their status. +However, since Git knows about them, you can now start using some of the +most basic Git commands to manipulate the files or look at their status. -In particular, let's not even check in the two files into git yet, we'll +In particular, let's not even check in the two files into Git yet, we'll start off by adding another line to `hello` first: ------------------------------------------------ $ echo "It's a new day for git" >>hello ------------------------------------------------ -and you can now, since you told git about the previous state of `hello`, ask -git what has changed in the tree compared to your old index, using the +and you can now, since you told Git about the previous state of `hello`, ask +Git what has changed in the tree compared to your old index, using the 'git diff-files' command: ------------ @@ -282,11 +282,11 @@ index 557db03..263414f 100644 ------------ -Committing git state +Committing Git state -------------------- -Now, we want to go to the next stage in git, which is to take the files -that git knows about in the index, and commit them as a real tree. We do +Now, we want to go to the next stage in Git, which is to take the files +that Git knows about in the index, and commit them as a real tree. We do that in two phases: creating a 'tree' object, and committing that 'tree' object as a 'commit' object together with an explanation of what the tree was all about, along with information of how we came to that state. @@ -296,7 +296,7 @@ There are no options or other input: `git write-tree` will take the current index state, and write an object that describes that whole index. In other words, we're now tying together all the different filenames with their contents (and their permissions), and we're -creating the equivalent of a git "directory" object: +creating the equivalent of a Git "directory" object: ------------------------------------------------ $ git write-tree @@ -415,9 +415,9 @@ regardless of whether the `--cached` flag is used or not. The `--cached` flag really only determines whether the file *contents* to be compared come from the working tree or not. -This is not hard to understand, as soon as you realize that git simply +This is not hard to understand, as soon as you realize that Git simply never knows (or cares) about files that it is not told about -explicitly. git will never go *looking* for files to compare, it +explicitly. Git will never go *looking* for files to compare, it expects you to tell it what the files are, and that's what the index is there for. ================ @@ -433,7 +433,7 @@ update the index cache: $ git update-index hello ------------------------------------------------ -(note how we didn't need the `--add` flag this time, since git knew +(note how we didn't need the `--add` flag this time, since Git knew about the file already). Note what happens to the different 'git diff-{asterisk}' versions here. @@ -464,7 +464,7 @@ this point (you can continue to edit things and update the index), you can just leave an empty message. Otherwise `git commit` will commit the change for you. -You've now made your first real git commit. And if you're interested in +You've now made your first real Git commit. And if you're interested in looking at what `git commit` really does, feel free to investigate: it's a few very simple shell scripts to generate the helpful (?) commit message headers, and a few one-liners that actually do the @@ -535,7 +535,7 @@ all, but just show the actual commit message. In fact, together with the 'git rev-list' program (which generates a list of revisions), 'git diff-tree' ends up being a veritable fount of changes. A trivial (but very useful) script called 'git whatchanged' is -included with git which does exactly this, and shows a log of recent +included with Git which does exactly this, and shows a log of recent activities. To see the whole history of our pitiful little git-tutorial project, you @@ -563,19 +563,19 @@ the log.showroot configuration variable to false. Having this, you can still show it for each command just adding the `--root` option, which is a flag for 'git diff-tree' accepted by both commands. -With that, you should now be having some inkling of what git does, and +With that, you should now be having some inkling of what Git does, and can explore on your own. [NOTE] Most likely, you are not directly using the core -git Plumbing commands, but using Porcelain such as 'git add', `git-rm' +Git Plumbing commands, but using Porcelain such as 'git add', `git-rm' and `git-commit'. Tagging a version ----------------- -In git, there are two kinds of tags, a "light" one, and an "annotated tag". +In Git, there are two kinds of tags, a "light" one, and an "annotated tag". A "light" tag is technically nothing more than a branch, except we put it in the `.git/refs/tags/` subdirectory instead of calling it a `head`. @@ -598,7 +598,7 @@ obviously be an empty diff, but if you continue to develop and commit stuff, you can use your tag as an "anchor-point" to see what has changed since you tagged it. -An "annotated tag" is actually a real git object, and contains not only a +An "annotated tag" is actually a real Git object, and contains not only a pointer to the state you want to tag, but also a small tag name and message, along with optionally a PGP signature that says that yes, you really did @@ -623,17 +623,17 @@ name for the state at that point. Copying repositories -------------------- -git repositories are normally totally self-sufficient and relocatable. +Git repositories are normally totally self-sufficient and relocatable. Unlike CVS, for example, there is no separate notion of -"repository" and "working tree". A git repository normally *is* the -working tree, with the local git information hidden in the `.git` +"repository" and "working tree". A Git repository normally *is* the +working tree, with the local Git information hidden in the `.git` subdirectory. There is nothing else. What you see is what you got. [NOTE] -You can tell git to split the git internal information from +You can tell Git to split the Git internal information from the directory that it tracks, but we'll ignore that for now: it's not how normal projects work, and it's really only meant for special uses. -So the mental model of "the git information is always tied directly to +So the mental model of "the Git information is always tied directly to the working tree that it describes" may not be technically 100% accurate, but it's a good model for all normal use. @@ -649,13 +649,13 @@ $ rm -rf git-tutorial and it will be gone. There's no external repository, and there's no history outside the project you created. - - if you want to move or duplicate a git repository, you can do so. There + - if you want to move or duplicate a Git repository, you can do so. There is 'git clone' command, but if all you want to do is just to create a copy of your repository (with all the full history that went along with it), you can do so with a regular `cp -a git-tutorial new-git-tutorial`. + -Note that when you've moved or copied a git repository, your git index +Note that when you've moved or copied a Git repository, your Git index file (which caches various information, notably some of the "stat" information for the files involved) will likely need to be refreshed. So after you do a `cp -a` to create a new copy, you'll want to do @@ -667,7 +667,7 @@ $ git update-index --refresh in the new repository to make sure that the index file is up-to-date. Note that the second point is true even across machines. You can -duplicate a remote git repository with *any* regular copy mechanism, be it +duplicate a remote Git repository with *any* regular copy mechanism, be it 'scp', 'rsync' or 'wget'. When copying a remote repository, you'll want to at a minimum update the @@ -694,23 +694,23 @@ The above can also be written as simply $ git reset ---------------- -and in fact a lot of the common git command combinations can be scripted +and in fact a lot of the common Git command combinations can be scripted with the `git xyz` interfaces. You can learn things by just looking at what the various git scripts do. For example, `git reset` used to be the above two lines implemented in 'git reset', but some things like 'git status' and 'git commit' are slightly more complex scripts around -the basic git commands. +the basic Git commands. Many (most?) public remote repositories will not contain any of the checked out files or even an index file, and will *only* contain the -actual core git files. Such a repository usually doesn't even have the -`.git` subdirectory, but has all the git files directly in the +actual core Git files. Such a repository usually doesn't even have the +`.git` subdirectory, but has all the Git files directly in the repository. -To create your own local live copy of such a "raw" git repository, you'd +To create your own local live copy of such a "raw" Git repository, you'd first create your own subdirectory for the project, and then copy the raw repository contents into the `.git` directory. For example, to -create your own copy of the git repository, you'd do the following +create your own copy of the Git repository, you'd do the following ---------------- $ mkdir my-git @@ -725,7 +725,7 @@ $ git read-tree HEAD ---------------- to populate the index. However, now you have populated the index, and -you have all the git internal files, but you will notice that you don't +you have all the Git internal files, but you will notice that you don't actually have any of the working tree files to work on. To get those, you'd check them out with @@ -757,7 +757,7 @@ repository, and checked it out. Creating a new branch --------------------- -Branches in git are really nothing more than pointers into the git +Branches in Git are really nothing more than pointers into the Git object database from within the `.git/refs/` subdirectory, and as we already discussed, the `HEAD` branch is nothing but a symlink to one of these object pointers. @@ -849,7 +849,7 @@ $ git commit -m "Some work." -i hello Here, we just added another line to `hello`, and we used a shorthand for doing both `git update-index hello` and `git commit` by just giving the filename directly to `git commit`, with an `-i` flag (it tells -git to 'include' that file in addition to what you have done to +Git to 'include' that file in addition to what you have done to the index file so far when making the commit). The `-m` flag is to give the commit log message from the command line. @@ -900,7 +900,7 @@ where the first argument is going to be used as the commit message if the merge can be resolved automatically. Now, in this case we've intentionally created a situation where the -merge will need to be fixed up by hand, though, so git will do as much +merge will need to be fixed up by hand, though, so Git will do as much of it as it can automatically (which in this case is just merge the `example` file, which had no differences in the `mybranch` branch), and say: @@ -939,7 +939,7 @@ After you're done, start up `gitk --all` to see graphically what the history looks like. Notice that `mybranch` still exists, and you can switch to it, and continue to work with it if you want to. The `mybranch` branch will not contain the merge, but next time you merge it -from the `master` branch, git will know how you merged it, so you'll not +from the `master` branch, Git will know how you merged it, so you'll not have to do _that_ merge again. Another useful tool, especially if you do not always work in X-Window @@ -1028,7 +1028,7 @@ Merging external work --------------------- It's usually much more common that you merge with somebody else than -merging with your own branches, so it's worth pointing out that git +merging with your own branches, so it's worth pointing out that Git makes that very easy too, and in fact, it's not that different from doing a 'git merge'. In fact, a remote merge ends up being nothing more than "fetch the work from a remote repository into a temporary tag" @@ -1068,7 +1068,7 @@ and requires you to have a log-in privilege over `ssh` to the remote machine. It finds out the set of objects the other side lacks by exchanging the head commits both ends have and transfers (close to) minimum set of objects. It is by far the -most efficient way to exchange git objects between repositories. +most efficient way to exchange Git objects between repositories. Local directory:: `/path/to/repo.git/` @@ -1077,7 +1077,7 @@ This transport is the same as SSH transport but uses 'sh' to run both ends on the local machine instead of running other end on the remote machine via 'ssh'. -git Native:: +Git Native:: `git://remote.machine/path/to/repo.git/` + This transport was designed for anonymous downloading. Like SSH @@ -1099,8 +1099,8 @@ necessary objects. Because of this behavior, they are sometimes also called 'commit walkers'. + The 'commit walkers' are sometimes also called 'dumb -transports', because they do not require any git aware smart -server like git Native transport does. Any stock HTTP server +transports', because they do not require any Git aware smart +server like Git Native transport does. Any stock HTTP server that does not even support directory index would suffice. But you must prepare your repository with 'git update-server-info' to help dumb transport downloaders. @@ -1321,7 +1321,7 @@ update the public repository from it. This is often called [NOTE] This public repository could further be mirrored, and that is -how git repositories at `kernel.org` are managed. +how Git repositories at `kernel.org` are managed. Publishing the changes from your local (private) repository to your remote (public) repository requires a write privilege on @@ -1340,7 +1340,7 @@ done only once. on the remote machine. The communication between the two over the network internally uses an SSH connection. -Your private repository's git directory is usually `.git`, but +Your private repository's Git directory is usually `.git`, but your public repository is often named after the project name, i.e. `<project>.git`. Let's create such a public repository for project `my-git`. After logging into the remote machine, create @@ -1350,7 +1350,7 @@ an empty directory: $ mkdir my-git.git ------------ -Then, make that directory into a git repository by running +Then, make that directory into a Git repository by running 'git init', but this time, since its name is not the usual `.git`, we do things slightly differently: @@ -1389,7 +1389,7 @@ This synchronizes your public repository to match the named branch head (i.e. `master` in this case) and objects reachable from them in your current repository. -As a real example, this is how I update my public git +As a real example, this is how I update my public Git repository. Kernel.org mirror network takes care of the propagation to other publicly visible machines: @@ -1402,9 +1402,9 @@ Packing your repository ----------------------- Earlier, we saw that one file under `.git/objects/??/` directory -is stored for each git object you create. This representation +is stored for each Git object you create. This representation is efficient to create atomically and safely, but -not so convenient to transport over the network. Since git objects are +not so convenient to transport over the network. Since Git objects are immutable once they are created, there is a way to optimize the storage by "packing them together". The command @@ -1472,14 +1472,14 @@ repositories every once in a while. Working with Others ------------------- -Although git is a truly distributed system, it is often +Although Git is a truly distributed system, it is often convenient to organize your project with an informal hierarchy of developers. Linux kernel development is run this way. There is a nice illustration (page 17, "Merges to Mainline") in link:http://www.xenotime.net/linux/mentor/linux-mentoring-2006.pdf[Randy Dunlap's presentation]. It should be stressed that this hierarchy is purely *informal*. -There is nothing fundamental in git that enforces the "chain of +There is nothing fundamental in Git that enforces the "chain of patch flow" this hierarchy implies. You do not have to pull from only one remote repository. @@ -1592,7 +1592,7 @@ Working with Others, Shared Repository Style If you are coming from CVS background, the style of cooperation suggested in the previous section may be new to you. You do not -have to worry. git supports "shared public repository" style of +have to worry. Git supports "shared public repository" style of cooperation you are probably more familiar with as well. See linkgit:gitcvs-migration[7] for the details. @@ -1602,7 +1602,7 @@ Bundling your work together It is likely that you will be working on more than one thing at a time. It is easy to manage those more-or-less independent tasks -using branches with git. +using branches with Git. We have already seen how branches work previously, with "fun and work" example using two branches. The idea is the diff --git a/Documentation/gitcredentials.txt b/Documentation/gitcredentials.txt index 7dfffc0046..47576be5db 100644 --- a/Documentation/gitcredentials.txt +++ b/Documentation/gitcredentials.txt @@ -3,7 +3,7 @@ gitcredentials(7) NAME ---- -gitcredentials - providing usernames and passwords to git +gitcredentials - providing usernames and passwords to Git SYNOPSIS -------- @@ -18,13 +18,13 @@ DESCRIPTION Git will sometimes need credentials from the user in order to perform operations; for example, it may need to ask for a username and password in order to access a remote repository over HTTP. This manual describes -the mechanisms git uses to request these credentials, as well as some +the mechanisms Git uses to request these credentials, as well as some features to avoid inputting these credentials repeatedly. REQUESTING CREDENTIALS ---------------------- -Without any credential helpers defined, git will try the following +Without any credential helpers defined, Git will try the following strategies to ask the user for usernames and passwords: 1. If the `GIT_ASKPASS` environment variable is set, the program @@ -59,7 +59,7 @@ for a password. It is generally configured by adding this to your config: username = me --------------------------------------- -Credential helpers, on the other hand, are external programs from which git can +Credential helpers, on the other hand, are external programs from which Git can request both usernames and passwords; they typically interface with secure storage provided by the OS or other programs. @@ -79,7 +79,7 @@ store:: You may also have third-party helpers installed; search for `credential-*` in the output of `git help -a`, and consult the documentation of individual helpers. Once you have selected a helper, -you can tell git to use it by putting its name into the +you can tell Git to use it by putting its name into the credential.helper variable. 1. Find a helper. @@ -95,7 +95,7 @@ credential-foo $ git help credential-foo ------------------------------------------- -3. Tell git to use it. +3. Tell Git to use it. + ------------------------------------------- $ git config --global credential.helper foo @@ -103,7 +103,7 @@ $ git config --global credential.helper foo If there are multiple instances of the `credential.helper` configuration variable, each helper will be tried in turn, and may provide a username, -password, or nothing. Once git has acquired both a username and a +password, or nothing. Once Git has acquired both a username and a password, no more helpers will be tried. @@ -114,7 +114,7 @@ Git considers each credential to have a context defined by a URL. This context is used to look up context-specific configuration, and is passed to any helpers, which may use it as an index into secure storage. -For instance, imagine we are accessing `https://example.com/foo.git`. When git +For instance, imagine we are accessing `https://example.com/foo.git`. When Git looks into a config file to see if a section matches this context, it will consider the two a match if the context is a more-specific subset of the pattern in the config file. For example, if you have this in your config file: @@ -133,10 +133,10 @@ context would not match: username = foo -------------------------------------- -because the hostnames differ. Nor would it match `foo.example.com`; git +because the hostnames differ. Nor would it match `foo.example.com`; Git compares hostnames exactly, without considering whether two hosts are part of the same domain. Likewise, a config entry for `http://example.com` would not -match: git compares the protocols exactly. +match: Git compares the protocols exactly. CONFIGURATION OPTIONS @@ -164,7 +164,7 @@ username:: useHttpPath:: - By default, git does not consider the "path" component of an http URL + By default, Git does not consider the "path" component of an http URL to be worth matching via external helpers. This means that a credential stored for `https://example.com/foo.git` will also be used for `https://example.com/bar.git`. If you do want to distinguish these @@ -175,7 +175,7 @@ CUSTOM HELPERS -------------- You can write your own custom helpers to interface with any system in -which you keep credentials. See the documentation for git's +which you keep credentials. See the documentation for Git's link:technical/api-credentials.html[credentials API] for details. GIT diff --git a/Documentation/gitcvs-migration.txt b/Documentation/gitcvs-migration.txt index aeb0cdc973..5ab5b0727f 100644 --- a/Documentation/gitcvs-migration.txt +++ b/Documentation/gitcvs-migration.txt @@ -3,7 +3,7 @@ gitcvs-migration(7) NAME ---- -gitcvs-migration - git for CVS users +gitcvs-migration - Git for CVS users SYNOPSIS -------- @@ -19,7 +19,7 @@ important than any other. However, you can emulate the CVS model by designating a single shared repository which people can synchronize with; this document explains how to do that. -Some basic familiarity with git is required. Having gone through +Some basic familiarity with Git is required. Having gone through linkgit:gittutorial[7] and linkgit:gitglossary[7] should be sufficient. @@ -81,7 +81,7 @@ other than `master`. Setting Up a Shared Repository ------------------------------ -We assume you have already created a git repository for your project, +We assume you have already created a Git repository for your project, possibly created from scratch or from a tarball (see linkgit:gittutorial[7]), or imported from an already existing CVS repository (see the next section). @@ -101,7 +101,7 @@ Next, give every team member read/write access to this repository. One easy way to do this is to give all the team members ssh access to the machine where the repository is hosted. If you don't want to give them a full shell on the machine, there is a restricted shell which only allows -users to do git pushes and pulls; see linkgit:git-shell[1]. +users to do Git pushes and pulls; see linkgit:git-shell[1]. Put all the committers in the same group, and make the repository writable by that group: @@ -125,7 +125,7 @@ of the project you are interested in and run linkgit:git-cvsimport[1]: $ git cvsimport -C <destination> <module> ------------------------------------------- -This puts a git archive of the named CVS module in the directory +This puts a Git archive of the named CVS module in the directory <destination>, which will be created if necessary. The import checks out from CVS every revision of every file. Reportedly @@ -133,8 +133,8 @@ cvsimport can average some twenty revisions per second, so for a medium-sized project this should not take more than a couple of minutes. Larger projects or remote repositories may take longer. -The main trunk is stored in the git branch named `origin`, and additional -CVS branches are stored in git branches with the same names. The most +The main trunk is stored in the Git branch named `origin`, and additional +CVS branches are stored in Git branches with the same names. The most recent version of the main trunk is also left checked out on the `master` branch, so you can start adding your own changes right away. @@ -160,10 +160,10 @@ You can enforce finer grained permissions using update hooks. See link:howto/update-hook-example.txt[Controlling access to branches using update hooks]. -Providing CVS Access to a git Repository +Providing CVS Access to a Git Repository ---------------------------------------- -It is also possible to provide true CVS access to a git repository, so +It is also possible to provide true CVS access to a Git repository, so that developers can still use CVS; see linkgit:git-cvsserver[1] for details. @@ -171,8 +171,8 @@ Alternative Development Models ------------------------------ CVS users are accustomed to giving a group of developers commit access to -a common repository. As we've seen, this is also possible with git. -However, the distributed nature of git allows other development models, +a common repository. As we've seen, this is also possible with Git. +However, the distributed nature of Git allows other development models, and you may want to first consider whether one of them might be a better fit for your project. diff --git a/Documentation/gitdiffcore.txt b/Documentation/gitdiffcore.txt index daf1782a31..4ed71c76cb 100644 --- a/Documentation/gitdiffcore.txt +++ b/Documentation/gitdiffcore.txt @@ -254,7 +254,7 @@ pattern. Filepairs that match a glob pattern on an earlier line in the file are output before ones that match a later line, and filepairs that do not match any glob pattern are output last. -As an example, a typical orderfile for the core git probably +As an example, a typical orderfile for the core Git probably would look like this: ------------------------------------------------ diff --git a/Documentation/gitglossary.txt b/Documentation/gitglossary.txt index d77a45aed6..e52de7dbb4 100644 --- a/Documentation/gitglossary.txt +++ b/Documentation/gitglossary.txt @@ -3,7 +3,7 @@ gitglossary(7) NAME ---- -gitglossary - A GIT Glossary +gitglossary - A Git Glossary SYNOPSIS -------- @@ -19,7 +19,7 @@ SEE ALSO linkgit:gittutorial[7], linkgit:gittutorial-2[7], linkgit:gitcvs-migration[7], -link:everyday.html[Everyday git], +link:everyday.html[Everyday Git], link:user-manual.html[The Git User's Manual] GIT diff --git a/Documentation/githooks.txt b/Documentation/githooks.txt index b9003fed24..dc6693fe48 100644 --- a/Documentation/githooks.txt +++ b/Documentation/githooks.txt @@ -3,7 +3,7 @@ githooks(5) NAME ---- -githooks - Hooks used by git +githooks - Hooks used by Git SYNOPSIS -------- @@ -108,7 +108,7 @@ it is not suppressed by the `--no-verify` option. A non-zero exit means a failure of the hook and aborts the commit. It should not be used as replacement for pre-commit hook. -The sample `prepare-commit-msg` hook that comes with git comments +The sample `prepare-commit-msg` hook that comes with Git comments out the `Conflicts:` part of a merge's commit message. commit-msg @@ -140,9 +140,11 @@ the outcome of 'git commit'. pre-rebase ~~~~~~~~~~ -This hook is called by 'git rebase' and can be used to prevent a branch -from getting rebased. - +This hook is called by 'git rebase' and can be used to prevent a +branch from getting rebased. The hook may be called with one or +two parameters. The first parameter is the upstream from which +the series was forked. The second parameter is the branch being +rebased, and is not set when rebasing the current branch. post-checkout ~~~~~~~~~~~~~ @@ -176,6 +178,35 @@ save and restore any form of metadata associated with the working tree (eg: permissions/ownership, ACLS, etc). See contrib/hooks/setgitperms.perl for an example of how to do this. +pre-push +~~~~~~~~ + +This hook is called by 'git push' and can be used to prevent a push from taking +place. The hook is called with two parameters which provide the name and +location of the destination remote, if a named remote is not being used both +values will be the same. + +Information about what is to be pushed is provided on the hook's standard +input with lines of the form: + + <local ref> SP <local sha1> SP <remote ref> SP <remote sha1> LF + +For instance, if the command +git push origin master:foreign+ were run the +hook would receive a line like the following: + + refs/heads/master 67890 refs/heads/foreign 12345 + +although the full, 40-character SHA1s would be supplied. If the foreign ref +does not yet exist the `<remote SHA1>` will be 40 `0`. If a ref is to be +deleted, the `<local ref>` will be supplied as `(delete)` and the `<local +SHA1>` will be 40 `0`. If the local commit was specified by something other +than a name which could be expanded (such as `HEAD~`, or a SHA1) it will be +supplied as it was originally given. + +If this hook exits with a non-zero status, 'git push' will abort without +pushing anything. Information about why the push is rejected may be sent +to the user by writing to standard error. + [[pre-receive]] pre-receive ~~~~~~~~~~~ @@ -275,7 +306,7 @@ for the user. The default 'post-receive' hook is empty, but there is a sample script `post-receive-email` provided in the `contrib/hooks` -directory in git distribution, which implements sending commit +directory in Git distribution, which implements sending commit emails. [[post-update]] @@ -303,7 +334,7 @@ them. When enabled, the default 'post-update' hook runs 'git update-server-info' to keep the information used by dumb transports (e.g., HTTP) up-to-date. If you are publishing -a git repository that is accessible via HTTP, you should +a Git repository that is accessible via HTTP, you should probably enable this hook. Both standard output and standard error output are forwarded to @@ -336,7 +367,7 @@ preceding SP is also omitted. Currently, no commands pass any 'extra-info'. The hook always runs after the automatic note copying (see -"notes.rewrite.<command>" in linkgit:git-config.txt) has happened, and +"notes.rewrite.<command>" in linkgit:git-config.txt[1]) has happened, and thus has access to these notes. The following command-specific comments apply: diff --git a/Documentation/gitignore.txt b/Documentation/gitignore.txt index 91a6438031..54e334e3af 100644 --- a/Documentation/gitignore.txt +++ b/Documentation/gitignore.txt @@ -13,12 +13,12 @@ DESCRIPTION ----------- A `gitignore` file specifies intentionally untracked files that -git should ignore. -Files already tracked by git are not affected; see the NOTES +Git should ignore. +Files already tracked by Git are not affected; see the NOTES below for details. Each line in a `gitignore` file specifies a pattern. -When deciding whether to ignore a path, git normally checks +When deciding whether to ignore a path, Git normally checks `gitignore` patterns from multiple sources, with the following order of precedence, from highest to lowest (within one level of precedence, the last matching pattern decides the outcome): @@ -53,17 +53,17 @@ be used. the repository but are specific to one user's workflow) should go into the `$GIT_DIR/info/exclude` file. - * Patterns which a user wants git to + * Patterns which a user wants Git to ignore in all situations (e.g., backup or temporary files generated by the user's editor of choice) generally go into a file specified by `core.excludesfile` in the user's `~/.gitconfig`. Its default value is $XDG_CONFIG_HOME/git/ignore. If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore is used instead. -The underlying git plumbing tools, such as +The underlying Git plumbing tools, such as 'git ls-files' and 'git read-tree', read `gitignore` patterns specified by command-line options, or from -files specified by command-line options. Higher-level git +files specified by command-line options. Higher-level Git tools, such as 'git status' and 'git add', use patterns from the sources specified above. @@ -89,15 +89,15 @@ PATTERN FORMAT a match with a directory. In other words, `foo/` will match a directory `foo` and paths underneath it, but will not match a regular file or a symbolic link `foo` (this is consistent - with the way how pathspec works in general in git). + with the way how pathspec works in general in Git). - - If the pattern does not contain a slash '/', git treats it as + - If the pattern does not contain a slash '/', Git treats it as a shell glob pattern and checks for a match against the pathname relative to the location of the `.gitignore` file (relative to the toplevel of the work tree if not from a `.gitignore` file). - - Otherwise, git treats the pattern as a shell glob suitable + - Otherwise, Git treats the pattern as a shell glob suitable for consumption by fnmatch(3) with the FNM_PATHNAME flag: wildcards in the pattern will not match a / in the pathname. For example, "Documentation/{asterisk}.html" matches @@ -131,7 +131,7 @@ NOTES ----- The purpose of gitignore files is to ensure that certain files -not tracked by git remain untracked. +not tracked by Git remain untracked. To ignore uncommitted changes in a file that is already tracked, use 'git update-index {litdd}assume-unchanged'. @@ -179,13 +179,15 @@ Another example: $ echo '!/vmlinux*' >arch/foo/kernel/.gitignore -------------------------------------------------------------- -The second .gitignore prevents git from ignoring +The second .gitignore prevents Git from ignoring `arch/foo/kernel/vmlinux.lds.S`. SEE ALSO -------- -linkgit:git-rm[1], linkgit:git-update-index[1], -linkgit:gitrepository-layout[5] +linkgit:git-rm[1], +linkgit:git-update-index[1], +linkgit:gitrepository-layout[5], +linkgit:git-check-ignore[1] GIT --- diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index a17a354936..c17e760184 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -3,7 +3,7 @@ gitk(1) NAME ---- -gitk - The git repository browser +gitk - The Git repository browser SYNOPSIS -------- @@ -18,7 +18,7 @@ the files in the trees of each revision. Historically, gitk was the first repository browser. It's written in tcl/tk and started off in a separate repository but was later merged into the main -git repository. +Git repository. OPTIONS ------- @@ -108,10 +108,10 @@ SEE ALSO 'gitview(1)':: A repository browser written in Python using Gtk. It's based on - 'bzrk(1)' and distributed in the contrib area of the git repository. + 'bzrk(1)' and distributed in the contrib area of the Git repository. 'tig(1)':: - A minimal repository browser and git tool output highlighter written + A minimal repository browser and Git tool output highlighter written in C using Ncurses. GIT diff --git a/Documentation/gitmodules.txt b/Documentation/gitmodules.txt index 52d7ae4313..6a1ca4abad 100644 --- a/Documentation/gitmodules.txt +++ b/Documentation/gitmodules.txt @@ -13,7 +13,7 @@ $GIT_WORK_DIR/.gitmodules DESCRIPTION ----------- -The `.gitmodules` file, located in the top-level directory of a git +The `.gitmodules` file, located in the top-level directory of a Git working tree, is a text file with a syntax matching the requirements of linkgit:git-config[1]. @@ -24,7 +24,7 @@ option of 'git submodule add'. Each submodule section also contains the following required keys: submodule.<name>.path:: - Defines the path, relative to the top-level directory of the git + Defines the path, relative to the top-level directory of the Git working tree, where the submodule is expected to be checked out. The path name must not end with a `/`. All submodule paths must be unique within the .gitmodules file. diff --git a/Documentation/gitnamespaces.txt b/Documentation/gitnamespaces.txt index c6713cf5d7..7685e3651a 100644 --- a/Documentation/gitnamespaces.txt +++ b/Documentation/gitnamespaces.txt @@ -29,7 +29,7 @@ prevent duplication between new objects added to the repositories without ongoing maintenance, while namespaces do. To specify a namespace, set the `GIT_NAMESPACE` environment variable to -the namespace. For each ref namespace, git stores the corresponding +the namespace. For each ref namespace, Git stores the corresponding refs in a directory under `refs/namespaces/`. For example, `GIT_NAMESPACE=foo` will store refs under `refs/namespaces/foo/`. You can also specify namespaces via the `--namespace` option to diff --git a/Documentation/git-remote-helpers.txt b/Documentation/gitremote-helpers.txt index 6d696e0f90..0c91aba861 100644 --- a/Documentation/git-remote-helpers.txt +++ b/Documentation/gitremote-helpers.txt @@ -1,9 +1,9 @@ -git-remote-helpers(1) -===================== +gitremote-helpers(1) +==================== NAME ---- -git-remote-helpers - Helper programs to interact with remote repositories +gitremote-helpers - Helper programs to interact with remote repositories SYNOPSIS -------- @@ -14,17 +14,17 @@ DESCRIPTION ----------- Remote helper programs are normally not used directly by end users, -but they are invoked by git when it needs to interact with remote -repositories git does not support natively. A given helper will -implement a subset of the capabilities documented here. When git +but they are invoked by Git when it needs to interact with remote +repositories Git does not support natively. A given helper will +implement a subset of the capabilities documented here. When Git needs to interact with a repository using a remote helper, it spawns the helper as an independent process, sends commands to the helper's standard input, and expects results from the helper's standard output. Because a remote helper runs as an independent process from -git, there is no need to re-link git to add a new helper, nor any -need to link the helper with the implementation of git. +Git, there is no need to re-link Git to add a new helper, nor any +need to link the helper with the implementation of Git. -Every helper must support the "capabilities" command, which git +Every helper must support the "capabilities" command, which Git uses to determine what other commands the helper will accept. Those other commands can be used to discover and update remote refs, transport objects between the object database and the remote repository, @@ -39,15 +39,15 @@ INVOCATION ---------- Remote helper programs are invoked with one or (optionally) two -arguments. The first argument specifies a remote repository as in git; +arguments. The first argument specifies a remote repository as in Git; it is either the name of a configured remote or a URL. The second argument specifies a URL; it is usually of the form '<transport>://<address>', but any arbitrary string is possible. The 'GIT_DIR' environment variable is set up for the remote helper and can be used to determine where to store additional data or from -which directory to invoke auxiliary git commands. +which directory to invoke auxiliary Git commands. -When git encounters a URL of the form '<transport>://<address>', where +When Git encounters a URL of the form '<transport>://<address>', where '<transport>' is a protocol that it cannot handle natively, it automatically invokes 'git remote-<transport>' with the full URL as the second argument. If such a URL is encountered directly on the @@ -55,14 +55,14 @@ command line, the first argument is the same as the second, and if it is encountered in a configured remote, the first argument is the name of that remote. -A URL of the form '<transport>::<address>' explicitly instructs git to +A URL of the form '<transport>::<address>' explicitly instructs Git to invoke 'git remote-<transport>' with '<address>' as the second argument. If such a URL is encountered directly on the command line, the first argument is '<address>', and if it is encountered in a configured remote, the first argument is the name of that remote. Additionally, when a configured remote has 'remote.<name>.vcs' set to -'<transport>', git explicitly invokes 'git remote-<transport>' with +'<transport>', Git explicitly invokes 'git remote-<transport>' with '<name>' as the first argument. If set, the second argument is 'remote.<name>.url'; otherwise, the second argument is omitted. @@ -85,7 +85,7 @@ Capabilities ~~~~~~~~~~~~ Each remote helper is expected to support only a subset of commands. -The operations a helper supports are declared to git in the response +The operations a helper supports are declared to Git in the response to the `capabilities` command (see COMMANDS, below). In the following, we list all defined capabilities and for @@ -114,10 +114,10 @@ Supported commands: 'list for-push', 'push'. + Supported commands: 'list for-push', 'export'. -If a helper advertises 'connect', git will use it if possible and +If a helper advertises 'connect', Git will use it if possible and fall back to another capability if the helper requests so when connecting (see the 'connect' command under COMMANDS). -When choosing between 'push' and 'export', git prefers 'push'. +When choosing between 'push' and 'export', Git prefers 'push'. Other frontends may have some other order of preference. @@ -126,7 +126,7 @@ Capabilities for Fetching 'connect':: Can try to connect to 'git upload-pack' (for fetching), 'git receive-pack', etc for communication using the - git's native packfile protocol. This + Git's native packfile protocol. This requires a bidirectional, full-duplex connection. + Supported commands: 'connect'. @@ -143,10 +143,10 @@ Supported commands: 'list', 'fetch'. + Supported commands: 'list', 'import'. -If a helper advertises 'connect', git will use it if possible and +If a helper advertises 'connect', Git will use it if possible and fall back to another capability if the helper requests so when connecting (see the 'connect' command under COMMANDS). -When choosing between 'fetch' and 'import', git prefers 'fetch'. +When choosing between 'fetch' and 'import', Git prefers 'fetch'. Other frontends may have some other order of preference. Miscellaneous capabilities @@ -183,22 +183,22 @@ there is an implied `refspec *:*`. to retrieve information about blobs and trees that already exist in fast-import's memory. This requires a channel from fast-import to the remote-helper. - If it is advertised in addition to "import", git establishes a pipe from + If it is advertised in addition to "import", Git establishes a pipe from fast-import to the remote-helper's stdin. - It follows that git and fast-import are both connected to the - remote-helper's stdin. Because git can send multiple commands to + It follows that Git and fast-import are both connected to the + remote-helper's stdin. Because Git can send multiple commands to the remote-helper it is required that helpers that use 'bidi-import' buffer all 'import' commands of a batch before sending data to fast-import. This is to prevent mixing commands and fast-import responses on the helper's stdin. 'export-marks' <file>:: - This modifies the 'export' capability, instructing git to dump the + This modifies the 'export' capability, instructing Git to dump the internal marks table to <file> when complete. For details, read up on '--export-marks=<file>' in linkgit:git-fast-export[1]. 'import-marks' <file>:: - This modifies the 'export' capability, instructing git to load the + This modifies the 'export' capability, instructing Git to load the marks specified in <file> before processing any input. For details, read up on '--import-marks=<file>' in linkgit:git-fast-export[1]. @@ -213,7 +213,7 @@ Commands are given by the caller on the helper's standard input, one per line. 'capabilities':: Lists the capabilities of the helper, one per line, ending with a blank line. Each capability may be preceded with '*', - which marks them mandatory for git versions using the remote + which marks them mandatory for Git versions using the remote helper to understand. Any unknown mandatory capability is a fatal error. + @@ -376,7 +376,7 @@ OPTIONS ------- The following options are defined and (under suitable circumstances) -set by git if the remote helper has the 'option' capability. +set by Git if the remote helper has the 'option' capability. 'option verbosity' <n>:: Changes the verbosity of messages displayed by the helper. diff --git a/Documentation/gitrepository-layout.txt b/Documentation/gitrepository-layout.txt index 9f628862b4..f0eef765b9 100644 --- a/Documentation/gitrepository-layout.txt +++ b/Documentation/gitrepository-layout.txt @@ -12,12 +12,24 @@ $GIT_DIR/* DESCRIPTION ----------- -You may find these things in your git repository (`.git` -directory for a repository associated with your working tree, or -`<project>.git` directory for a public 'bare' repository. It is -also possible to have a working tree where `.git` is a plain -ASCII file containing `gitdir: <path>`, i.e. the path to the -real git repository). +A Git repository comes in two different flavours: + + * a `.git` directory at the root of the working tree; + + * a `<project>.git` directory that is a 'bare' repository + (i.e. without its own working tree), that is typically used for + exchanging histories with others by pushing into it and fetching + from it. + +*Note*: Also you can have a plain text file `.git` at the root of +your working tree, containing `gitdir: <path>` to point at the real +directory that has the repository. This mechanism is often used for +a working tree of a submodule checkout, to allow you in the +containing superproject to `git checkout` a branch that does not +have the submodule. The `checkout` has to remove the entire +submodule working tree, without losing the submodule repository. + +These things may exist in a Git repository. objects:: Object store associated with this repository. Usually @@ -108,7 +120,7 @@ HEAD:: A symref (see glossary) to the `refs/heads/` namespace describing the currently active branch. It does not mean much if the repository is not associated with any working tree - (i.e. a 'bare' repository), but a valid git repository + (i.e. a 'bare' repository), but a valid Git repository *must* have the HEAD file; some porcelains may use it to guess the designated "default" branch of the repository (usually 'master'). It is legal if the named branch @@ -131,7 +143,7 @@ branches:: and not likely to be found in modern repositories. hooks:: - Hooks are customization scripts used by various git + Hooks are customization scripts used by various Git commands. A handful of sample hooks are installed when 'git init' is run, but all of them are disabled by default. To enable, the `.sample` suffix has to be @@ -169,7 +181,7 @@ info/exclude:: This file, by convention among Porcelains, stores the exclude pattern list. `.gitignore` is the per-directory ignore file. 'git status', 'git add', 'git rm' and - 'git clean' look at it but the core git commands do not look + 'git clean' look at it but the core Git commands do not look at it. See also: linkgit:gitignore[5]. remotes:: diff --git a/Documentation/gitrevisions.txt b/Documentation/gitrevisions.txt index fc4789f98e..c0ed6d1925 100644 --- a/Documentation/gitrevisions.txt +++ b/Documentation/gitrevisions.txt @@ -3,7 +3,7 @@ gitrevisions(7) NAME ---- -gitrevisions - specifying revisions and ranges for git +gitrevisions - specifying revisions and ranges for Git SYNOPSIS -------- diff --git a/Documentation/gittutorial-2.txt b/Documentation/gittutorial-2.txt index e00a4d2170..94c906eda8 100644 --- a/Documentation/gittutorial-2.txt +++ b/Documentation/gittutorial-2.txt @@ -3,7 +3,7 @@ gittutorial-2(7) NAME ---- -gittutorial-2 - A tutorial introduction to git: part two +gittutorial-2 - A tutorial introduction to Git: part two SYNOPSIS -------- @@ -16,11 +16,11 @@ DESCRIPTION You should work through linkgit:gittutorial[7] before reading this tutorial. The goal of this tutorial is to introduce two fundamental pieces of -git's architecture--the object database and the index file--and to +Git's architecture--the object database and the index file--and to provide the reader with everything necessary to understand the rest -of the git documentation. +of the Git documentation. -The git object database +The Git object database ----------------------- Let's start a new project and create a small amount of history: @@ -42,14 +42,14 @@ $ git commit -a -m "add emphasis" 1 file changed, 1 insertion(+), 1 deletion(-) ------------------------------------------------ -What are the 7 digits of hex that git responded to the commit with? +What are the 7 digits of hex that Git responded to the commit with? We saw in part one of the tutorial that commits have names like this. -It turns out that every object in the git history is stored under +It turns out that every object in the Git history is stored under a 40-digit hex name. That name is the SHA1 hash of the object's -contents; among other things, this ensures that git will never store +contents; among other things, this ensures that Git will never store the same data twice (since identical data is given an identical SHA1 -name), and that the contents of a git object will never change (since +name), and that the contents of a Git object will never change (since that would change the object's name as well). The 7 char hex strings here are simply the abbreviation of such 40 character long strings. Abbreviations can be used everywhere where the 40 character strings @@ -60,7 +60,7 @@ following the example above generates a different SHA1 hash than the one shown above because the commit object records the time when it was created and the name of the person performing the commit. -We can ask git about this particular object with the `cat-file` +We can ask Git about this particular object with the `cat-file` command. Don't copy the 40 hex digits from this example but use those from your own version. Note that you can shorten it to only a few characters to save yourself typing all 40 hex digits: @@ -102,11 +102,11 @@ $ git cat-file blob 3b18e512 hello world ------------------------------------------------ -Note that this is the old file data; so the object that git named in +Note that this is the old file data; so the object that Git named in its response to the initial tree was a tree with a snapshot of the directory state that was recorded by the first commit. -All of these objects are stored under their SHA1 names inside the git +All of these objects are stored under their SHA1 names inside the Git directory: ------------------------------------------------ @@ -191,7 +191,7 @@ Besides blobs, trees, and commits, the only remaining type of object is a "tag", which we won't discuss here; refer to linkgit:git-tag[1] for details. -So now we know how git uses the object database to represent a +So now we know how Git uses the object database to represent a project's history: * "commit" objects refer to "tree" objects representing the @@ -403,21 +403,21 @@ What next? At this point you should know everything necessary to read the man pages for any of the git commands; one good place to start would be -with the commands mentioned in link:everyday.html[Everyday git]. You +with the commands mentioned in link:everyday.html[Everyday Git]. You should be able to find any unknown jargon in linkgit:gitglossary[7]. The link:user-manual.html[Git User's Manual] provides a more -comprehensive introduction to git. +comprehensive introduction to Git. linkgit:gitcvs-migration[7] explains how to -import a CVS repository into git, and shows how to use git in a +import a CVS repository into Git, and shows how to use Git in a CVS-like way. -For some interesting examples of git use, see the +For some interesting examples of Git use, see the link:howto-index.html[howtos]. -For git developers, linkgit:gitcore-tutorial[7] goes -into detail on the lower-level git mechanisms involved in, for +For Git developers, linkgit:gitcore-tutorial[7] goes +into detail on the lower-level Git mechanisms involved in, for example, creating a new commit. SEE ALSO @@ -427,7 +427,7 @@ linkgit:gitcvs-migration[7], linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], linkgit:git-help[1], -link:everyday.html[Everyday git], +link:everyday.html[Everyday Git], link:user-manual.html[The Git User's Manual] GIT diff --git a/Documentation/gittutorial.txt b/Documentation/gittutorial.txt index f1cb6f3be6..8262196318 100644 --- a/Documentation/gittutorial.txt +++ b/Documentation/gittutorial.txt @@ -3,7 +3,7 @@ gittutorial(7) NAME ---- -gittutorial - A tutorial introduction to git (for version 1.5.1 or newer) +gittutorial - A tutorial introduction to Git (for version 1.5.1 or newer) SYNOPSIS -------- @@ -13,10 +13,10 @@ git * DESCRIPTION ----------- -This tutorial explains how to import a new project into git, make +This tutorial explains how to import a new project into Git, make changes to it, and share changes with other developers. -If you are instead primarily interested in using git to fetch a project, +If you are instead primarily interested in using Git to fetch a project, for example, to test the latest version, you may prefer to start with the first two chapters of link:user-manual.html[The Git User's Manual]. @@ -36,7 +36,7 @@ $ git help log With the latter, you can use the manual viewer of your choice; see linkgit:git-help[1] for more information. -It is a good idea to introduce yourself to git with your name and +It is a good idea to introduce yourself to Git with your name and public email address before doing any operation. The easiest way to do so is: @@ -50,7 +50,7 @@ Importing a new project ----------------------- Assume you have a tarball project.tar.gz with your initial work. You -can place it under git revision control as follows. +can place it under Git revision control as follows. ------------------------------------------------ $ tar xzf project.tar.gz @@ -67,14 +67,14 @@ Initialized empty Git repository in .git/ You've now initialized the working directory--you may notice a new directory created, named ".git". -Next, tell git to take a snapshot of the contents of all files under the +Next, tell Git to take a snapshot of the contents of all files under the current directory (note the '.'), with 'git add': ------------------------------------------------ $ git add . ------------------------------------------------ -This snapshot is now stored in a temporary staging area which git calls +This snapshot is now stored in a temporary staging area which Git calls the "index". You can permanently store the contents of the index in the repository with 'git commit': @@ -83,7 +83,7 @@ $ git commit ------------------------------------------------ This will prompt you for a commit message. You've now stored the first -version of your project in git. +version of your project in Git. Making changes -------------- @@ -141,7 +141,7 @@ begin the commit message with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used -throughout git. For example, linkgit:git-format-patch[1] turns a +throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body. @@ -180,7 +180,7 @@ $ git log --stat --summary Managing branches ----------------- -A single git repository can maintain multiple branches of +A single Git repository can maintain multiple branches of development. To create a new branch named "experimental", use ------------------------------------------------ @@ -276,10 +276,10 @@ $ git branch -D crazy-idea Branches are cheap and easy, so this is a good way to try something out. -Using git for collaboration +Using Git for collaboration --------------------------- -Suppose that Alice has started a new project with a git repository in +Suppose that Alice has started a new project with a Git repository in /home/alice/project, and that Bob, who has a home directory on the same machine, wants to contribute. @@ -320,7 +320,7 @@ Note that in general, Alice would want her local changes committed before initiating this "pull". If Bob's work conflicts with what Alice did since their histories forked, Alice will use her working tree and the index to resolve conflicts, and existing local changes will interfere with the -conflict resolution process (git will still perform the fetch but will +conflict resolution process (Git will still perform the fetch but will refuse to merge --- Alice will have to get rid of her local changes in some way and pull again when this happens). @@ -422,7 +422,7 @@ bob$ git pull ------------------------------------- Note that he doesn't need to give the path to Alice's repository; -when Bob cloned Alice's repository, git stored the location of her +when Bob cloned Alice's repository, Git stored the location of her repository in the repository configuration, and that location is used for pulls: @@ -450,7 +450,7 @@ perform clones and pulls using the ssh protocol: bob$ git clone alice.org:/home/alice/project myrepo ------------------------------------- -Alternatively, git has a native protocol, or can use rsync or http; +Alternatively, Git has a native protocol, or can use rsync or http; see linkgit:git-pull[1] for details. Git can also be used in a CVS-like mode, with a central repository @@ -518,7 +518,7 @@ share this name with other people (for example, to identify a release version), you should create a "tag" object, and perhaps sign it; see linkgit:git-tag[1] for details. -Any git command that needs to know a commit can take any of these +Any Git command that needs to know a commit can take any of these names. For example: ------------------------------------- @@ -554,9 +554,9 @@ files it manages in your current directory. So $ git grep "hello" ------------------------------------- -is a quick way to search just the files that are tracked by git. +is a quick way to search just the files that are tracked by Git. -Many git commands also take sets of commits, which can be specified +Many Git commands also take sets of commits, which can be specified in a number of ways. Here are some examples with 'git log': ------------------------------------- @@ -592,7 +592,7 @@ then merged back together, the order in which 'git log' presents those commits is meaningless. Most projects with multiple contributors (such as the Linux kernel, -or git itself) have frequent merges, and 'gitk' does a better job of +or Git itself) have frequent merges, and 'gitk' does a better job of visualizing their history. For example, ------------------------------------- @@ -623,7 +623,7 @@ Next Steps This tutorial should be enough to perform basic distributed revision control for your projects. However, to fully understand the depth -and power of git you need to understand two simple ideas on which it +and power of Git you need to understand two simple ideas on which it is based: * The object database is the rather elegant system used to @@ -636,7 +636,7 @@ is based: Part two of this tutorial explains the object database, the index file, and a few other odds and ends that you'll -need to make the most of git. You can find it at linkgit:gittutorial-2[7]. +need to make the most of Git. You can find it at linkgit:gittutorial-2[7]. If you don't want to continue with that right away, a few other digressions that may be interesting at this point are: @@ -656,7 +656,7 @@ digressions that may be interesting at this point are: * linkgit:gitworkflows[7]: Gives an overview of recommended workflows. - * link:everyday.html[Everyday GIT with 20 Commands Or So] + * link:everyday.html[Everyday Git with 20 Commands Or So] * linkgit:gitcvs-migration[7]: Git for CVS users. @@ -668,7 +668,7 @@ linkgit:gitcore-tutorial[7], linkgit:gitglossary[7], linkgit:git-help[1], linkgit:gitworkflows[7], -link:everyday.html[Everyday git], +link:everyday.html[Everyday Git], link:user-manual.html[The Git User's Manual] GIT diff --git a/Documentation/gitweb.conf.txt b/Documentation/gitweb.conf.txt index 49474557d8..eb636317be 100644 --- a/Documentation/gitweb.conf.txt +++ b/Documentation/gitweb.conf.txt @@ -3,7 +3,7 @@ gitweb.conf(5) NAME ---- -gitweb.conf - Gitweb (git web interface) configuration file +gitweb.conf - Gitweb (Git web interface) configuration file SYNOPSIS -------- @@ -79,7 +79,7 @@ stops declaring it. You can include other configuration file using read_config_file() subroutine. For example, one might want to put gitweb configuration related to access control for viewing repositories via Gitolite (one -of git repository management tools) in a separate file, e.g. in +of Git repository management tools) in a separate file, e.g. in '/etc/gitweb-gitolite.conf'. To include it, put -------------------------------------------------- @@ -111,7 +111,7 @@ and installing gitweb. Location of repositories ~~~~~~~~~~~~~~~~~~~~~~~~ The configuration variables described below control how gitweb finds -git repositories, and how repositories are displayed and accessed. +Git repositories, and how repositories are displayed and accessed. See also "Repositories" and later subsections in linkgit:gitweb[1] manpage. @@ -159,7 +159,7 @@ will fall back to scanning the `$projectroot` directory for repositories. $project_maxdepth:: If `$projects_list` variable is unset, gitweb will recursively - scan filesystem for git repositories. The `$project_maxdepth` + scan filesystem for Git repositories. The `$project_maxdepth` is used to limit traversing depth, relative to `$projectroot` (starting point); it means that directories which are further from `$projectroot` than `$project_maxdepth` will be skipped. @@ -200,7 +200,7 @@ our $export_ok = "git-daemon-export-ok"; + If not set (default), it means that this feature is disabled. + -See also more involved example in "Controlling access to git repositories" +See also more involved example in "Controlling access to Git repositories" subsection on linkgit:gitweb[1] manpage. $strict_export:: @@ -222,18 +222,18 @@ The values of these variables are paths on the filesystem. $GIT:: Core git executable to use. By default set to `$GIT_BINDIR/git`, which - in turn is by default set to `$(bindir)/git`. If you use git installed + in turn is by default set to `$(bindir)/git`. If you use Git installed from a binary package, you should usually set this to "/usr/bin/git". This can just be "git" if your web server has a sensible PATH; from security point of view it is better to use absolute path to git binary. - If you have multiple git versions installed it can be used to choose + If you have multiple Git versions installed it can be used to choose which one to use. Must be (correctly) set for gitweb to be able to work. $mimetypes_file:: File to use for (filename extension based) guessing of MIME types before trying '/etc/mime.types'. *NOTE* that this path, if relative, is taken - as relative to the current git repository, not to CGI script. If unset, + as relative to the current Git repository, not to CGI script. If unset, only '/etc/mime.types' is used (if present on filesystem). If no mimetypes file is found, mimetype guessing based on extension of file is disabled. Unset by default. @@ -343,8 +343,8 @@ $logo_url:: $logo_label:: URI and label (title) for the Git logo link (or your site logo, if you chose to use different logo image). By default, these both - refer to git homepage, http://git-scm.com[]; in the past, they pointed - to git documentation at http://www.kernel.org[]. + refer to Git homepage, http://git-scm.com[]; in the past, they pointed + to Git documentation at http://www.kernel.org[]. Changing gitweb's look @@ -436,7 +436,7 @@ $fallback_encoding:: detection. + *Note* that rename and especially copy detection can be quite -CPU-intensive. Note also that non git tools can have problems with +CPU-intensive. Note also that non Git tools can have problems with patches generated with options mentioned above, especially when they involve file copies (\'-C') or criss-cross renames (\'-B'). @@ -451,7 +451,7 @@ looks does contain variables configuring administrative side of gitweb affects how "summary" pages look like, or load limiting). @git_base_url_list:: - List of git base URLs. These URLs are used to generate URLs + List of Git base URLs. These URLs are used to generate URLs describing from where to fetch a project, which are shown on project summary page. The full fetch URL is "`$git_base_url/$project`", for each element of this list. You can set up multiple base URLs @@ -616,7 +616,7 @@ override:: (or enabled/disabled) on a per-repository basis. + Usually given "<feature>" is configurable via the `gitweb.<feature>` -config variable in the per-repository git configuration file. +config variable in the per-repository Git configuration file. + *Note* that no feature is overriddable by default. @@ -782,7 +782,7 @@ filesystem (i.e. "$projectroot/$project"), `%h` to the current hash (\'hb' gitweb parameter); `%%` expands to \'%'. + For example, at the time this page was written, the http://repo.or.cz[] -git hosting site set it to the following to enable graphical log +Git hosting site set it to the following to enable graphical log (using the third party tool *git-browser*): + ---------------------------------------------------------------------- @@ -796,10 +796,10 @@ This adds a link titled "graphiclog" after the "summary" link, leading to Project specific override is not supported. timed:: - Enable displaying how much time and how many git commands it took to + Enable displaying how much time and how many Git commands it took to generate and display each page in the page footer (at the bottom of page). For example the footer might contain: "This page took 6.53325 - seconds and 13 git commands to generate." Disabled by default. + seconds and 13 Git commands to generate." Disabled by default. + Project specific override is not supported. diff --git a/Documentation/gitweb.txt b/Documentation/gitweb.txt index 168e8bfed6..40969f1098 100644 --- a/Documentation/gitweb.txt +++ b/Documentation/gitweb.txt @@ -7,14 +7,14 @@ gitweb - Git web interface (web frontend to Git repositories) SYNOPSIS -------- -To get started with gitweb, run linkgit:git-instaweb[1] from a git repository. +To get started with gitweb, run linkgit:git-instaweb[1] from a Git repository. This would configure and start your web server, and run web browser pointing to gitweb. DESCRIPTION ----------- -Gitweb provides a web interface to git repositories. Its features include: +Gitweb provides a web interface to Git repositories. Its features include: * Viewing multiple Git repositories with common root. * Browsing every revision of the repository. @@ -54,9 +54,9 @@ our $projectroot = '/path/to/parent/directory'; The default value for `$projectroot` is '/pub/git'. You can change it during building gitweb via `GITWEB_PROJECTROOT` build configuration variable. -By default all git repositories under `$projectroot` are visible and available +By default all Git repositories under `$projectroot` are visible and available to gitweb. The list of projects is generated by default by scanning the -`$projectroot` directory for git repositories (for object databases to be +`$projectroot` directory for Git repositories (for object databases to be more exact; gitweb is not interested in a working area, and is best suited to showing "bare" repositories). @@ -111,7 +111,7 @@ foo/bar.git O+W+Ner+<owner@example.org> By default this file controls only which projects are *visible* on projects -list page (note that entries that do not point to correctly recognized git +list page (note that entries that do not point to correctly recognized Git repositories won't be displayed by gitweb). Even if a project is not visible on projects list page, you can view it nevertheless by hand-crafting a gitweb URL. By setting `$strict_export` configuration variable (see @@ -151,9 +151,9 @@ as projects list file, which means that you can set `$projects_list` to its filename. -Controlling access to git repositories +Controlling access to Git repositories ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -By default all git repositories under `$projectroot` are visible and +By default all Git repositories under `$projectroot` are visible and available to gitweb. You can however configure how gitweb controls access to repositories. @@ -206,7 +206,7 @@ $export_auth_hook = sub { Per-repository gitweb configuration ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ You can configure individual repositories shown in gitweb by creating file -in the 'GIT_DIR' of git repository, or by setting some repo configuration +in the 'GIT_DIR' of Git repository, or by setting some repo configuration variable (in 'GIT_DIR/config', see linkgit:git-config[1]). You can use the following files in repository: @@ -504,7 +504,7 @@ repositories, you can configure Apache like this: The above configuration expects your public repositories to live under '/pub/git' and will serve them as `http://git.domain.org/dir-under-pub-git`, -both as cloneable GIT URL and as browseable gitweb interface. If you then +both as cloneable Git URL and as browseable gitweb interface. If you then start your linkgit:git-daemon[1] with `--base-path=/pub/git --export-all` then you can even use the `git://` URL with exactly the same path. @@ -584,7 +584,7 @@ $projectroot = $ENV{'GITWEB_PROJECTROOT'} || "/pub/git"; referenced by `$per_request_config`; These configurations enable two things. First, each unix user (`<user>`) of -the server will be able to browse through gitweb git repositories found in +the server will be able to browse through gitweb Git repositories found in '~/public_git/' with the following url: http://git.example.org/~<user>/ @@ -673,7 +673,7 @@ The additional AliasMatch makes it so that http://git.example.com/project.git -will give raw access to the project's git dir (so that the project can be +will give raw access to the project's Git dir (so that the project can be cloned), while http://git.example.com/project diff --git a/Documentation/gitworkflows.txt b/Documentation/gitworkflows.txt index 8b8c6ae5d3..f16c414ea7 100644 --- a/Documentation/gitworkflows.txt +++ b/Documentation/gitworkflows.txt @@ -3,7 +3,7 @@ gitworkflows(7) NAME ---- -gitworkflows - An overview of recommended workflows with git +gitworkflows - An overview of recommended workflows with Git SYNOPSIS -------- @@ -242,10 +242,10 @@ tag to the tip of 'master' indicating the release version: .Release tagging [caption="Recipe: "] ===================================== -`git tag -s -m "GIT X.Y.Z" vX.Y.Z master` +`git tag -s -m "Git X.Y.Z" vX.Y.Z master` ===================================== -You need to push the new tag to a public git server (see +You need to push the new tag to a public Git server (see "DISTRIBUTED WORKFLOWS" below). This makes the tag available to others tracking your project. The push could also trigger a post-update hook to perform release-related items such as building diff --git a/Documentation/glossary-content.txt b/Documentation/glossary-content.txt index f928b57f90..eb7ba84f1f 100644 --- a/Documentation/glossary-content.txt +++ b/Documentation/glossary-content.txt @@ -7,7 +7,7 @@ A bare repository is normally an appropriately named <<def_directory,directory>> with a `.git` suffix that does not have a locally checked-out copy of any of the files under - revision control. That is, all of the `git` + revision control. That is, all of the Git administrative and control files that would normally be present in the hidden `.git` sub-directory are directly present in the `repository.git` directory instead, @@ -22,7 +22,7 @@ <<def_commit,commit>> on a branch is referred to as the tip of that branch. The tip of the branch is referenced by a branch <<def_head,head>>, which moves forward as additional development - is done on the branch. A single git + is done on the branch. A single Git <<def_repository,repository>> can track an arbitrary number of branches, but your <<def_working_tree,working tree>> is associated with just one of them (the "current" or "checked out" @@ -37,9 +37,9 @@ <<def_commit,commit>> could be one of its <<def_parent,parents>>). [[def_changeset]]changeset:: - BitKeeper/cvsps speak for "<<def_commit,commit>>". Since git does not + BitKeeper/cvsps speak for "<<def_commit,commit>>". Since Git does not store changes, but states, it really does not make sense to use the term - "changesets" with git. + "changesets" with Git. [[def_checkout]]checkout:: The action of updating all or part of the @@ -52,7 +52,7 @@ [[def_cherry-picking]]cherry-picking:: In <<def_SCM,SCM>> jargon, "cherry pick" means to choose a subset of changes out of a series of changes (typically commits) and record them - as a new series of changes on top of a different codebase. In GIT, this is + as a new series of changes on top of a different codebase. In Git, this is performed by the "git cherry-pick" command to extract the change introduced by an existing <<def_commit,commit>> and to record it based on the tip of the current <<def_branch,branch>> as a new commit. @@ -64,14 +64,14 @@ [[def_commit]]commit:: As a noun: A single point in the - git history; the entire history of a project is represented as a + Git history; the entire history of a project is represented as a set of interrelated commits. The word "commit" is often - used by git in the same places other revision control systems + used by Git in the same places other revision control systems use the words "revision" or "version". Also used as a short hand for <<def_commit_object,commit object>>. + As a verb: The action of storing a new snapshot of the project's -state in the git history, by creating a new commit representing the current +state in the Git history, by creating a new commit representing the current state of the <<def_index,index>> and advancing <<def_HEAD,HEAD>> to point at the new commit. @@ -82,8 +82,8 @@ to point at the new commit. to the top <<def_directory,directory>> of the stored revision. -[[def_core_git]]core git:: - Fundamental data structures and utilities of git. Exposes only limited +[[def_core_git]]core Git:: + Fundamental data structures and utilities of Git. Exposes only limited source code management tools. [[def_DAG]]DAG:: @@ -100,7 +100,7 @@ to point at the new commit. [[def_detached_HEAD]]detached HEAD:: Normally the <<def_HEAD,HEAD>> stores the name of a - <<def_branch,branch>>. However, git also allows you to <<def_checkout,check out>> + <<def_branch,branch>>. However, Git also allows you to <<def_checkout,check out>> an arbitrary <<def_commit,commit>> that isn't necessarily the tip of any particular branch. In this case HEAD is said to be "detached". @@ -142,22 +142,26 @@ to point at the new commit. and to get them, too. See also linkgit:git-fetch[1]. [[def_file_system]]file system:: - Linus Torvalds originally designed git to be a user space file system, + Linus Torvalds originally designed Git to be a user space file system, i.e. the infrastructure to hold files and directories. That ensured the - efficiency and speed of git. + efficiency and speed of Git. -[[def_git_archive]]git archive:: +[[def_git_archive]]Git archive:: Synonym for <<def_repository,repository>> (for arch people). +[[def_gitfile]]gitfile:: + A plain file `.git` at the root of a working tree that + points at the directory that is the real repository. + [[def_grafts]]grafts:: Grafts enables two otherwise different lines of development to be joined together by recording fake ancestry information for commits. This way - you can make git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has + you can make Git pretend the set of <<def_parent,parents>> a <<def_commit,commit>> has is different from what was recorded when the commit was created. Configured via the `.git/info/grafts` file. [[def_hash]]hash:: - In git's context, synonym to <<def_object_name,object name>>. + In Git's context, synonym to <<def_object_name,object name>>. [[def_head]]head:: A <<def_ref,named reference>> to the <<def_commit,commit>> at the tip of a @@ -177,14 +181,14 @@ to point at the new commit. A synonym for <<def_head,head>>. [[def_hook]]hook:: - During the normal execution of several git commands, call-outs are made + During the normal execution of several Git commands, call-outs are made to optional scripts that allow a developer to add functionality or checking. Typically, the hooks allow for a command to be pre-verified and potentially aborted, and allow for a post-notification after the operation is done. The hook scripts are found in the `$GIT_DIR/hooks/` directory, and are enabled by simply removing the `.sample` suffix from the filename. In earlier versions - of git you had to make them executable. + of Git you had to make them executable. [[def_index]]index:: A collection of files with stat information, whose contents are stored @@ -201,7 +205,7 @@ to point at the new commit. [[def_master]]master:: The default development <<def_branch,branch>>. Whenever you - create a git <<def_repository,repository>>, a branch named + create a Git <<def_repository,repository>>, a branch named "master" is created, and becomes the active branch. In most cases, this contains the local development, though that is purely by convention and is not required. @@ -228,7 +232,7 @@ This commit is referred to as a "merge commit", or sometimes just a "merge". [[def_object]]object:: - The unit of storage in git. It is uniquely identified by the + The unit of storage in Git. It is uniquely identified by the <<def_SHA1,SHA1>> of its contents. Consequently, an object can not be changed. @@ -323,7 +327,7 @@ top `/`;; + Currently only the slash `/` is recognized as the "magic signature", but it is envisioned that we will support more types of magic in later -versions of git. +versions of Git. + A pathspec with only a colon means "there is no pathspec". This form should not be combined with other pathspec. @@ -341,12 +345,12 @@ should not be combined with other pathspec. particular line of text. See linkgit:git-diff[1]. [[def_plumbing]]plumbing:: - Cute name for <<def_core_git,core git>>. + Cute name for <<def_core_git,core Git>>. [[def_porcelain]]porcelain:: Cute name for programs and program suites depending on - <<def_core_git,core git>>, presenting a high level access to - core git. Porcelains expose more of a <<def_SCM,SCM>> + <<def_core_git,core Git>>, presenting a high level access to + core Git. Porcelains expose more of a <<def_SCM,SCM>> interface than the <<def_plumbing,plumbing>>. [[def_pull]]pull:: @@ -406,7 +410,7 @@ should not be combined with other pathspec. linkgit:git-push[1]. [[def_remote_tracking_branch]]remote-tracking branch:: - A regular git <<def_branch,branch>> that is used to follow changes from + A regular Git <<def_branch,branch>> that is used to follow changes from another <<def_repository,repository>>. A remote-tracking branch should not contain direct modifications or have local commits made to it. A remote-tracking branch can usually be @@ -443,7 +447,7 @@ should not be combined with other pathspec. [[def_shallow_repository]]shallow repository:: A shallow <<def_repository,repository>> has an incomplete history some of whose <<def_commit,commits>> have <<def_parent,parents>> cauterized away (in other - words, git is told to pretend that these commits do not have the + words, Git is told to pretend that these commits do not have the parents, even though they are recorded in the <<def_commit_object,commit object>>). This is sometimes useful when you are interested only in the recent history of a project even though the real history recorded in the @@ -464,9 +468,9 @@ should not be combined with other pathspec. object of an arbitrary type (typically a tag points to either a <<def_tag_object,tag>> or a <<def_commit_object,commit object>>). In contrast to a <<def_head,head>>, a tag is not updated by - the `commit` command. A git tag has nothing to do with a Lisp + the `commit` command. A Git tag has nothing to do with a Lisp tag (which would be called an <<def_object_type,object type>> - in git's context). A tag is most typically used to mark a particular + in Git's context). A tag is most typically used to mark a particular point in the commit ancestry <<def_chain,chain>>. [[def_tag_object]]tag object:: @@ -476,7 +480,7 @@ should not be combined with other pathspec. signature, in which case it is called a "signed tag object". [[def_topic_branch]]topic branch:: - A regular git <<def_branch,branch>> that is used by a developer to + A regular Git <<def_branch,branch>> that is used by a developer to identify a conceptual line of development. Since branches are very easy and inexpensive, it is often desirable to have several small branches that each contain very well defined concepts or small incremental yet diff --git a/Documentation/howto-index.sh b/Documentation/howto-index.sh index 34aa30c5b9..a2340864b5 100755 --- a/Documentation/howto-index.sh +++ b/Documentation/howto-index.sh @@ -1,11 +1,11 @@ #!/bin/sh cat <<\EOF -GIT Howto Index +Git Howto Index =============== Here is a collection of mailing list postings made by various -people describing how they use git in their workflow. +people describing how they use Git in their workflow. EOF diff --git a/Documentation/howto/maintain-git.txt b/Documentation/howto/maintain-git.txt index ea6e4a52c9..33ae69c11f 100644 --- a/Documentation/howto/maintain-git.txt +++ b/Documentation/howto/maintain-git.txt @@ -1,7 +1,7 @@ From: Junio C Hamano <gitster@pobox.com> Date: Wed, 21 Nov 2007 16:32:55 -0800 Subject: Addendum to "MaintNotes" -Abstract: Imagine that git development is racing along as usual, when our friendly +Abstract: Imagine that Git development is racing along as usual, when our friendly neighborhood maintainer is struck down by a wayward bus. Out of the hordes of suckers (loyal developers), you have been tricked (chosen) to step up as the new maintainer. This howto will show you "how to" do it. @@ -10,35 +10,42 @@ Content-type: text/asciidoc How to maintain Git =================== -The maintainer's git time is spent on three activities. +Activities +---------- - - Communication (60%) +The maintainer's Git time is spent on three activities. + + - Communication (45%) Mailing list discussions on general design, fielding user questions, diagnosing bug reports; reviewing, commenting on, suggesting alternatives to, and rejecting patches. - - Integration (30%) + - Integration (50%) Applying new patches from the contributors while spotting and correcting minor mistakes, shuffling the integration and testing branches, pushing the results out, cutting the releases, and making announcements. - - Own development (10%) + - Own development (5%) Scratching my own itch and sending proposed patch series out. +The Policy +---------- + The policy on Integration is informally mentioned in "A Note from the maintainer" message, which is periodically posted to this mailing list after each feature release is made. -The policy. - - Feature releases are numbered as vX.Y.Z and are meant to contain bugfixes and enhancements in any area, including functionality, performance and usability, without regression. + - One release cycle for a feature release is expected to last for + eight to ten weeks. + - Maintenance releases are numbered as vX.Y.Z.W and are meant to contain only bugfixes for the corresponding vX.Y.Z feature release and earlier maintenance releases vX.Y.Z.V (V < W). @@ -62,12 +69,15 @@ The policy. - 'pu' branch is used to publish other proposed changes that do not yet pass the criteria set for 'next'. - - The tips of 'master', 'maint' and 'next' branches will always - fast-forward, to allow people to build their own - customization on top of them. + - The tips of 'master' and 'maint' branches will not be rewound to + allow people to build their own customization on top of them. + Early in a new development cycle, 'next' is rewound to the tip of + 'master' once, but otherwise it will not be rewound until the end + of the cycle. - - Usually 'master' contains all of 'maint', 'next' contains all - of 'master' and 'pu' contains all of 'next'. + - Usually 'master' contains all of 'maint' and 'next' contains all + of 'master'. 'pu' contains all the topics merged to 'next', but + is rebuilt directly on 'master'. - The tip of 'master' is meant to be more stable than any tagged releases, and the users are encouraged to follow it. @@ -77,14 +87,22 @@ The policy. are found before new topics are merged to 'master'. -A typical git day for the maintainer implements the above policy +A Typical Git Day +----------------- + +A typical Git day for the maintainer implements the above policy by doing the following: - - Scan mailing list and #git channel log. Respond with review - comments, suggestions etc. Kibitz. Collect potentially - usable patches from the mailing list. Patches about a single - topic go to one mailbox (I read my mail in Gnus, and type - \C-o to save/append messages in files in mbox format). + - Scan mailing list. Respond with review comments, suggestions + etc. Kibitz. Collect potentially usable patches from the + mailing list. Patches about a single topic go to one mailbox (I + read my mail in Gnus, and type \C-o to save/append messages in + files in mbox format). + + - Write his own patches to address issues raised on the list but + nobody has stepped up solving. Send it out just like other + contributors do, and pick them up just like patches from other + contributors (see above). - Review the patches in the saved mailboxes. Edit proposed log message for typofixes and clarifications, and add Acks @@ -100,40 +118,32 @@ by doing the following: - Obviously correct fixes that pertain to the tip of 'master' are directly applied to 'master'. + - Other topics are not handled in this step. + This step is done with "git am". $ git checkout master ;# or "git checkout maint" - $ git am -3 -s mailbox + $ git am -sc3 mailbox $ make test - - Merge downwards (maint->master): - - $ git checkout master - $ git merge maint - $ make test + In practice, almost no patch directly goes to 'master' or + 'maint'. - Review the last issue of "What's cooking" message, review the - topics scheduled for merging upwards (topic->master and - topic->maint), and merge. + topics ready for merging (topic->master and topic->maint). Use + "Meta/cook -w" script (where Meta/ contains a checkout of the + 'todo' branch) to aid this step. + + And perform the merge. Use "Meta/Reintegrate -e" script (see + later) to aid this step. + + $ Meta/cook -w last-issue-of-whats-cooking.mbox $ git checkout master ;# or "git checkout maint" - $ git merge ai/topic ;# or "git merge ai/maint-topic" + $ echo ai/topic | Meta/Reintegrate -e ;# "git merge ai/topic" $ git log -p ORIG_HEAD.. ;# final review $ git diff ORIG_HEAD.. ;# final review $ make test ;# final review - $ git branch -d ai/topic ;# or "git branch -d ai/maint-topic" - - - Merge downwards (maint->master) if needed: - - $ git checkout master - $ git merge maint - $ make test - - - Merge downwards (master->next) if needed: - - $ git checkout next - $ git merge master - $ make test - Handle the remaining patches: @@ -142,9 +152,9 @@ by doing the following: and not in 'master') is applied to a new topic branch that is forked from the tip of 'master'. This includes both enhancements and unobvious fixes to 'master'. A topic - branch is named as ai/topic where "ai" is typically - author's initial and "topic" is a descriptive name of the - topic (in other words, "what's the series is about"). + branch is named as ai/topic where "ai" is two-letter string + named after author's initial and "topic" is a descriptive name + of the topic (in other words, "what's the series is about"). - An unobvious fix meant for 'maint' is applied to a new topic branch that is forked from the tip of 'maint'. The @@ -162,7 +172,8 @@ by doing the following: The above except the "replacement" are all done with: - $ git am -3 -s mailbox + $ git checkout ai/topic ;# or "git checkout -b ai/topic master" + $ git am -sc3 mailbox while patch replacement is often done by: @@ -170,93 +181,170 @@ by doing the following: then replace some parts with the new patch, and reapplying: + $ git checkout ai/topic $ git reset --hard ai/topic~$n - $ git am -3 -s 000*.txt + $ git am -sc3 -s 000*.txt The full test suite is always run for 'maint' and 'master' after patch application; for topic branches the tests are run as time permits. - - Update "What's cooking" message to review the updates to - existing topics, newly added topics and graduated topics. + - Merge maint to master as needed: - This step is helped with Meta/cook script (where Meta/ contains - a checkout of the 'todo' branch). - - - Merge topics to 'next'. For each branch whose tip is not - merged to 'next', one of three things can happen: + $ git checkout master + $ git merge maint + $ make test - - The commits are all next-worthy; merge the topic to next: + - Merge master to next as needed: $ git checkout next - $ git merge ai/topic ;# or "git merge ai/maint-topic" + $ git merge master $ make test + - Review the last issue of "What's cooking" again and see if topics + that are ready to be merged to 'next' are still in good shape + (e.g. has there any new issue identified on the list with the + series?) + + - Prepare 'jch' branch, which is used to represent somewhere + between 'master' and 'pu' and often is slightly ahead of 'next'. + + $ Meta/Reintegrate master..pu >Meta/redo-jch.sh + + The result is a script that lists topics to be merged in order to + rebuild 'pu' as the input to Meta/Reintegrate script. Remove + later topics that should not be in 'jch' yet. Add a line that + consists of '### match next' before the name of the first topic + in the output that should be in 'jch' but not in 'next' yet. + + - Now we are ready to start merging topics to 'next'. For each + branch whose tip is not merged to 'next', one of three things can + happen: + + - The commits are all next-worthy; merge the topic to next; - The new parts are of mixed quality, but earlier ones are - next-worthy; merge the early parts to next: + next-worthy; merge the early parts to next; + - Nothing is next-worthy; do not do anything. + + This step is aided with Meta/redo-jch.sh script created earlier. + If a topic that was already in 'next' gained a patch, the script + would list it as "ai/topic~1". To include the new patch to the + updated 'next', drop the "~1" part; to keep it excluded, do not + touch the line. If a topic that was not in 'next' should be + merged to 'next', add it at the end of the list. Then: + + $ git checkout -B jch master + $ Meta/redo-jch.sh -c1 + + to rebuild the 'jch' branch from scratch. "-c1" tells the script + to stop merging at the first line that begins with '###' + (i.e. the "### match next" line you added earlier). + + At this point, build-test the result. It may reveal semantic + conflicts (e.g. a topic renamed a variable, another added a new + reference to the variable under its old name), in which case + prepare an appropriate merge-fix first (see appendix), and + rebuild the 'jch' branch from scratch, starting at the tip of + 'master'. + + Then do the same to 'next' $ git checkout next - $ git merge ai/topic~2 ;# the tip two are dubious - $ make test + $ sh Meta/redo-jch.sh -c1 -e - - Nothing is next-worthy; do not do anything. + The "-e" option allows the merge message that comes from the + history of the topic and the comments in the "What's cooking" to + be edited. The resulting tree should match 'jch' as the same set + of topics are merged on 'master'; otherwise there is a mismerge. + Investigate why and do not proceed until the mismerge is found + and rectified. - - [** OBSOLETE **] Optionally rebase topics that do not have any commit - in next yet, when they can take advantage of low-level framework - change that is merged to 'master' already. + $ git diff jch next - $ git rebase master ai/topic + When all is well, clean up the redo-jch.sh script with - This step is helped with Meta/git-topic.perl script to - identify which topic is rebaseable. There also is a - pre-rebase hook to make sure that topics that are already in - 'next' are not rebased beyond the merged commit. + $ sh Meta/redo-jch.sh -u - - [** OBSOLETE **] Rebuild "pu" to merge the tips of topics not in 'next'. + This removes topics listed in the script that have already been + merged to 'master'. This may lose '### match next' marker; + add it again to the appropriate place when it happens. - $ git checkout pu - $ git reset --hard next - $ git merge ai/topic ;# repeat for all remaining topics - $ make test + - Rebuild 'pu'. - This step is helped with Meta/PU script + $ Meta/Reintegrate master..pu >Meta/redo-pu.sh - - Push four integration branches to a private repository at - k.org and run "make test" on all of them. + Edit the result by adding new topics that are not still in 'pu' + in the script. Then - - Push four integration branches to /pub/scm/git/git.git at - k.org. This triggers its post-update hook which: + $ git checkout -B pu jch + $ sh Meta/redo-pu.sh - (1) runs "git pull" in $HOME/git-doc/ repository to pull - 'master' just pushed out; + When all is well, clean up the redo-pu.sh script with - (2) runs "make doc" in $HOME/git-doc/, install the generated - documentation in staging areas, which are separate - repositories that have html and man branches checked - out. + $ sh Meta/redo-pu.sh -u - (3) runs "git commit" in the staging areas, and run "git - push" back to /pub/scm/git/git.git/ to update the html - and man branches. + Double check by running - (4) installs generated documentation to /pub/software/scm/git/docs/ - to be viewed from http://www.kernel.org/ + $ git branch --no-merged pu - - Fetch html and man branches back from k.org, and push four - integration branches and the two documentation branches to - repo.or.cz and other mirrors. + to see there is no unexpected leftover topics. + At this point, build-test the result for semantic conflicts, and + if there are, prepare an appropriate merge-fix first (see + appendix), and rebuild the 'pu' branch from scratch, starting at + the tip of 'jch'. + + - Update "What's cooking" message to review the updates to + existing topics, newly added topics and graduated topics. + + This step is helped with Meta/cook script. + + $ Meta/cook + + This script inspects the history between master..pu, finds tips + of topic branches, compares what it found with the current + contents in Meta/whats-cooking.txt, and updates that file. + Topics not listed in the file but are found in master..pu are + added to the "New topics" section, topics listed in the file that + are no longer found in master..pu are moved to the "Graduated to + master" section, and topics whose commits changed their states + (e.g. used to be only in 'pu', now merged to 'next') are updated + with change markers "<<" and ">>". + + Look for lines enclosed in "<<" and ">>"; they hold contents from + old file that are replaced by this integration round. After + verifying them, remove the old part. Review the description for + each topic and update its doneness and plan as needed. To review + the updated plan, run + + $ Meta/cook -w + + which will pick up comments given to the topics, such as "Will + merge to 'next'", etc. (see Meta/cook script to learn what kind + of phrases are supported). + + - Compile, test and install all four (five) integration branches; + Meta/Dothem script may aid this step. + + - Format documentation if the 'master' branch was updated; + Meta/dodoc.sh script may aid this step. + + - Push the integration branches out to public places; Meta/pushall + script may aid this step. + +Observations +------------ Some observations to be made. - * Each topic is tested individually, and also together with - other topics cooking in 'next'. Until it matures, none part - of it is merged to 'master'. + * Each topic is tested individually, and also together with other + topics cooking first in 'pu', then in 'jch' and then in 'next'. + Until it matures, no part of it is merged to 'master'. * A topic already in 'next' can get fixes while still in 'next'. Such a topic will have many merges to 'next' (in other words, "git log --first-parent next" will show many - "Merge ai/topic to next" for the same topic. + "Merge branch 'ai/topic' to next" for the same topic. * An unobvious fix for 'maint' is cooked in 'next' and then merged to 'master' to make extra sure it is Ok and then @@ -278,3 +366,80 @@ Some observations to be made. * Being in the 'next' branch is not a guarantee for a topic to be included in the next feature release. Being in the 'master' branch typically is. + + +Appendix +-------- + +Preparing a "merge-fix" +~~~~~~~~~~~~~~~~~~~~~~~ + +A merge of two topics may not textually conflict but still have +conflict at the semantic level. A classic example is for one topic +to rename an variable and all its uses, while another topic adds a +new use of the variable under its old name. When these two topics +are merged together, the reference to the variable newly added by +the latter topic will still use the old name in the result. + +The Meta/Reintegrate script that is used by redo-jch and redo-pu +scripts implements a crude but usable way to work this issue around. +When the script merges branch $X, it checks if "refs/merge-fix/$X" +exists, and if so, the effect of it is squashed into the result of +the mechanical merge. In other words, + + $ echo $X | Meta/Reintegrate + +is roughly equivalent to this sequence: + + $ git merge --rerere-autoupdate $X + $ git commit + $ git cherry-pick -n refs/merge-fix/$X + $ git commit --amend + +The goal of this "prepare a merge-fix" step is to come up with a +commit that can be squashed into a result of mechanical merge to +correct semantic conflicts. + +After finding that the result of merging branch "ai/topic" to an +integration branch had such a semantic conflict, say pu~4, check the +problematic merge out on a detached HEAD, edit the working tree to +fix the semantic conflict, and make a separate commit to record the +fix-up: + + $ git checkout pu~4 + $ git show -s --pretty=%s ;# double check + Merge branch 'ai/topic' to pu + $ edit + $ git commit -m 'merge-fix/ai/topic' -a + +Then make a reference "refs/merge-fix/ai/topic" to point at this +result: + + $ git update-ref refs/merge-fix/ai/topic HEAD + +Then double check the result by asking Meta/Reintegrate to redo the +merge: + + $ git checkout pu~5 ;# the parent of the problem merge + $ echo ai/topic | Meta/Reintegrate + $ git diff pu~4 + +This time, because you prepared refs/merge-fix/ai/topic, the +resulting merge should have been tweaked to include the fix for the +semantic conflict. + +Note that this assumes that the order in which conflicting branches +are merged does not change. If the reason why merging ai/topic +branch needs this merge-fix is because another branch merged earlier +to the integration branch changed the underlying assumption ai/topic +branch made (e.g. ai/topic branch added a site to refer to a +variable, while the other branch renamed that variable and adjusted +existing use sites), and if you changed redo-jch (or redo-pu) script +to merge ai/topic branch before the other branch, then the above +merge-fix should not be applied while merging ai/topic, but should +instead be applied while merging the other branch. You would need +to move the fix to apply to the other branch, perhaps like this: + + $ mf=refs/merge-fix + $ git update-ref $mf/$the_other_branch $mf/ai/topic + $ git update-ref -d $mf/ai/topic diff --git a/Documentation/howto/new-command.txt b/Documentation/howto/new-command.txt index 36502f6718..2abc3a0a0e 100644 --- a/Documentation/howto/new-command.txt +++ b/Documentation/howto/new-command.txt @@ -1,25 +1,25 @@ From: Eric S. Raymond <esr@thyrsus.com> Abstract: This is how-to documentation for people who want to add extension - commands to git. It should be read alongside api-builtin.txt. + commands to Git. It should be read alongside api-builtin.txt. Content-type: text/asciidoc How to integrate new subcommands ================================ This is how-to documentation for people who want to add extension -commands to git. It should be read alongside api-builtin.txt. +commands to Git. It should be read alongside api-builtin.txt. Runtime environment ------------------- -git subcommands are standalone executables that live in the git exec +Git subcommands are standalone executables that live in the Git exec path, normally /usr/lib/git-core. The git executable itself is a thin wrapper that knows where the subcommands live, and runs them by passing command-line arguments to them. -(If "git foo" is not found in the git exec path, the wrapper +(If "git foo" is not found in the Git exec path, the wrapper will look in the rest of your $PATH for it. Thus, it's possible -to write local git extensions that don't live in system space.) +to write local Git extensions that don't live in system space.) Implementation languages ------------------------ @@ -30,13 +30,13 @@ Perl. While we strongly encourage coding in portable C for portability, these specific scripting languages are also acceptable. We won't accept more without a very strong technical case, as we don't want -to broaden the git suite's required dependencies. Import utilities, +to broaden the Git suite's required dependencies. Import utilities, surgical tools, remote helpers and other code at the edges of the -git suite are more lenient and we allow Python (and even Tcl/tk), +Git suite are more lenient and we allow Python (and even Tcl/tk), but they should not be used for core functions. This may change in the future. Especially Python is not allowed in -core because we need better Python integration in the git Windows +core because we need better Python integration in the Git Windows installer before we can be confident people in that environment won't experience an unacceptably large loss of capability. @@ -54,7 +54,7 @@ functions available to built-in commands written in C. What every extension command needs ---------------------------------- -You must have a man page, written in asciidoc (this is what git help +You must have a man page, written in asciidoc (this is what Git help followed by your subcommand name will display). Be aware that there is a local asciidoc configuration and macros which you should use. It's often helpful to start by cloning an existing page and replacing the @@ -74,7 +74,7 @@ Integrating a command --------------------- Here are the things you need to do when you want to merge a new -subcommand into the git tree. +subcommand into the Git tree. 1. Don't forget to sign off your patch! diff --git a/Documentation/howto/rebase-from-internal-branch.txt b/Documentation/howto/rebase-from-internal-branch.txt index 4627ee47f2..19ab604f1f 100644 --- a/Documentation/howto/rebase-from-internal-branch.txt +++ b/Documentation/howto/rebase-from-internal-branch.txt @@ -4,7 +4,7 @@ Cc: Petr Baudis <pasky@suse.cz>, Linus Torvalds <torvalds@osdl.org> Subject: Re: sending changesets from the middle of a git tree Date: Sun, 14 Aug 2005 18:37:39 -0700 Abstract: In this article, JC talks about how he rebases the - public "pu" branch using the core GIT tools when he updates + public "pu" branch using the core Git tools when he updates the "master" branch, and how "rebase" works. Also discussed is how this applies to individual developers who sends patches upstream. @@ -31,7 +31,7 @@ up. With its basing philosophical ancestry on quilt, this is the kind of task StGIT is designed to do. I just have done a simpler one, this time using only the core -GIT tools. +Git tools. I had a handful of commits that were ahead of master in pu, and I wanted to add some documentation bypassing my usual habit of @@ -96,7 +96,7 @@ you ran fsck-cache, which is normal. After testing "pu", you can run "git prune" to get rid of those original three commits. While I am talking about "git rebase", I should talk about how -to do cherrypicking using only the core GIT tools. +to do cherrypicking using only the core Git tools. Let's go back to the earlier picture, with different labels. diff --git a/Documentation/howto/rebuild-from-update-hook.txt b/Documentation/howto/rebuild-from-update-hook.txt index 00c1b45b79..25378f68d3 100644 --- a/Documentation/howto/rebuild-from-update-hook.txt +++ b/Documentation/howto/rebuild-from-update-hook.txt @@ -3,7 +3,7 @@ Message-ID: <7vy86o6usx.fsf@assigned-by-dhcp.cox.net> From: Junio C Hamano <gitster@pobox.com> Date: Fri, 26 Aug 2005 18:19:10 -0700 Abstract: In this how-to article, JC talks about how he - uses the post-update hook to automate git documentation page + uses the post-update hook to automate Git documentation page shown at http://www.kernel.org/pub/software/scm/git/docs/. Content-type: text/asciidoc @@ -15,11 +15,11 @@ are built from Documentation/ directory of the git.git project and needed to be kept up-to-date. The www.kernel.org/ servers are mirrored and I was told that the origin of the mirror is on the machine $some.kernel.org, on which I was given an account -when I took over git maintainership from Linus. +when I took over Git maintainership from Linus. The directories relevant to this how-to are these two: - /pub/scm/git/git.git/ The public git repository. + /pub/scm/git/git.git/ The public Git repository. /pub/software/scm/git/docs/ The HTML documentation page. So I made a repository to generate the documentation under my @@ -46,7 +46,7 @@ script: EOF Initially I used to run this by hand whenever I push into the -public git repository. Then I did a cron job that ran twice a +public Git repository. Then I did a cron job that ran twice a day. The current round uses the post-update hook mechanism, like this: diff --git a/Documentation/howto/recover-corrupted-blob-object.txt b/Documentation/howto/recover-corrupted-blob-object.txt index 7484735320..6d362ceb10 100644 --- a/Documentation/howto/recover-corrupted-blob-object.txt +++ b/Documentation/howto/recover-corrupted-blob-object.txt @@ -20,7 +20,7 @@ itself doesn't actually tell you anything, in order to fix a corrupt object you basically have to find the "original source" for it. The easiest way to do that is almost always to have backups, and find the -same object somewhere else. Backups really are a good idea, and git makes +same object somewhere else. Backups really are a good idea, and Git makes it pretty easy (if nothing else, just clone the repository somewhere else, and make sure that you do *not* use a hard-linked clone, and preferably not the same disk/machine). @@ -134,7 +134,7 @@ and your repository is good again! git log --raw --all and just looked for the sha of the missing object (4b9458b..) in that -whole thing. It's up to you - git does *have* a lot of information, it is +whole thing. It's up to you - Git does *have* a lot of information, it is just missing one particular blob version. Trying to recreate trees and especially commits is *much* harder. So you diff --git a/Documentation/howto/revert-a-faulty-merge.txt b/Documentation/howto/revert-a-faulty-merge.txt index 8a685483f4..075418eeeb 100644 --- a/Documentation/howto/revert-a-faulty-merge.txt +++ b/Documentation/howto/revert-a-faulty-merge.txt @@ -164,7 +164,7 @@ merged. So it's debugging hell, because now you don't have lots of small changes that you can try to pinpoint which _part_ of it changes. But does it all work? Sure it does. You can revert a merge, and from a -purely technical angle, git did it very naturally and had no real +purely technical angle, Git did it very naturally and had no real troubles. It just considered it a change from "state before merge" to "state after merge", and that was it. Nothing complicated, nothing odd, nothing really dangerous. Git will do it without even thinking about it. diff --git a/Documentation/howto/revert-branch-rebase.txt b/Documentation/howto/revert-branch-rebase.txt index a59ced8d04..84dd839db4 100644 --- a/Documentation/howto/revert-branch-rebase.txt +++ b/Documentation/howto/revert-branch-rebase.txt @@ -12,10 +12,10 @@ How to revert an existing commit ================================ One of the changes I pulled into the 'master' branch turns out to -break building GIT with GCC 2.95. While they were well intentioned +break building Git with GCC 2.95. While they were well intentioned portability fixes, keeping things working with gcc-2.95 was also important. Here is what I did to revert the change in the 'master' -branch and to adjust the 'pu' branch, using core GIT tools and +branch and to adjust the 'pu' branch, using core Git tools and barebone Porcelain. First, prepare a throw-away branch in case I screw things up. diff --git a/Documentation/howto/setup-git-server-over-http.txt b/Documentation/howto/setup-git-server-over-http.txt index a695f01f0e..7f4943e102 100644 --- a/Documentation/howto/setup-git-server-over-http.txt +++ b/Documentation/howto/setup-git-server-over-http.txt @@ -1,9 +1,9 @@ From: Rutger Nijlunsing <rutger@nospam.com> -Subject: Setting up a git repository which can be pushed into and pulled from over HTTP(S). +Subject: Setting up a Git repository which can be pushed into and pulled from over HTTP(S). Date: Thu, 10 Aug 2006 22:00:26 +0200 Content-type: text/asciidoc -How to setup git server over http +How to setup Git server over http ================================= Since Apache is one of those packages people like to compile @@ -44,20 +44,20 @@ What's needed: - have permissions to chown a directory -- have git installed on the client, and +- have Git installed on the client, and -- either have git installed on the server or have a webdav client on +- either have Git installed on the server or have a webdav client on the client. In effect, this means you're going to be root, or that you're using a preconfigured WebDAV server. -Step 1: setup a bare GIT repository +Step 1: setup a bare Git repository ----------------------------------- -At the time of writing, git-http-push cannot remotely create a GIT -repository. So we have to do that at the server side with git. Another +At the time of writing, git-http-push cannot remotely create a Git +repository. So we have to do that at the server side with Git. Another option is to generate an empty bare repository at the client and copy it to the server with a WebDAV client (which is the only option if Git is not installed on the server). @@ -189,7 +189,7 @@ http://<servername>/my-new-repo.git [x] Open as webfolder -> login . Step 3: setup the client ------------------------ -Make sure that you have HTTP support, i.e. your git was built with +Make sure that you have HTTP support, i.e. your Git was built with libcurl (version more recent than 7.10). The command 'git http-push' with no argument should display a usage message. @@ -268,7 +268,7 @@ Reading /usr/local/apache2/logs/error_log is often helpful. On Debian: Read /var/log/apache2/error.log instead. -If you access HTTPS locations, git may fail verifying the SSL +If you access HTTPS locations, Git may fail verifying the SSL certificate (this is return code 60). Setting http.sslVerify=false can help diagnosing the problem, but removes security checks. diff --git a/Documentation/howto/use-git-daemon.txt b/Documentation/howto/use-git-daemon.txt index 23cdf35435..7af2e52cf3 100644 --- a/Documentation/howto/use-git-daemon.txt +++ b/Documentation/howto/use-git-daemon.txt @@ -4,7 +4,7 @@ How to use git-daemon ===================== Git can be run in inetd mode and in stand alone mode. But all you want is -let a coworker pull from you, and therefore need to set up a git server +let a coworker pull from you, and therefore need to set up a Git server real quick, right? Note that git-daemon is not really chatty at the moment, especially when diff --git a/Documentation/howto/using-signed-tag-in-pull-request.txt b/Documentation/howto/using-signed-tag-in-pull-request.txt index 00f693bde8..bbf040eda8 100644 --- a/Documentation/howto/using-signed-tag-in-pull-request.txt +++ b/Documentation/howto/using-signed-tag-in-pull-request.txt @@ -23,7 +23,7 @@ Earlier, a typical pull request may have started like this: Froboz 3.2 (2011-09-30 14:20:57 -0700) - are available in the git repository at: + are available in the Git repository at: example.com:/git/froboz.git for-xyzzy ------------ @@ -107,7 +107,7 @@ The resulting msg.txt file begins like so: Froboz 3.2 (2011-09-30 14:20:57 -0700) - are available in the git repository at: + are available in the Git repository at: example.com:/git/froboz.git tags/frotz-for-xyzzy diff --git a/Documentation/i18n.txt b/Documentation/i18n.txt index 625d3154ea..e9a1d5d25a 100644 --- a/Documentation/i18n.txt +++ b/Documentation/i18n.txt @@ -1,9 +1,9 @@ -At the core level, git is character encoding agnostic. +At the core level, Git is character encoding agnostic. - The pathnames recorded in the index and in the tree objects are treated as uninterpreted sequences of non-NUL bytes. What readdir(2) returns are what are recorded and compared - with the data git keeps track of, which in turn are expected + with the data Git keeps track of, which in turn are expected to be what lstat(2) and creat(2) accepts. There is no such thing as pathname encoding translation. @@ -15,9 +15,9 @@ At the core level, git is character encoding agnostic. bytes. Although we encourage that the commit log messages are encoded -in UTF-8, both the core and git Porcelain are designed not to +in UTF-8, both the core and Git Porcelain are designed not to force UTF-8 on projects. If all participants of a particular -project find it more convenient to use legacy encodings, git +project find it more convenient to use legacy encodings, Git does not forbid it. However, there are a few things to keep in mind. diff --git a/Documentation/merge-config.txt b/Documentation/merge-config.txt index 9bb4956ccd..d78d6d854e 100644 --- a/Documentation/merge-config.txt +++ b/Documentation/merge-config.txt @@ -17,10 +17,10 @@ merge.defaultToUpstream:: these tracking branches are merged. merge.ff:: - By default, git does not create an extra merge commit when merging + By default, Git does not create an extra merge commit when merging a commit that is a descendant of the current commit. Instead, the tip of the current branch is fast-forwarded. When set to `false`, - this variable tells git to create an extra merge commit in such + this variable tells Git to create an extra merge commit in such a case (equivalent to giving the `--no-ff` option from the command line). When set to `only`, only such fast-forward merges are allowed (equivalent to giving the `--ff-only` option from the @@ -38,10 +38,10 @@ merge.renameLimit:: diff.renameLimit. merge.renormalize:: - Tell git that canonical representation of files in the + Tell Git that canonical representation of files in the repository has changed over time (e.g. earlier commits record text files with CRLF line endings, but recent ones use LF line - endings). In such a repository, git can convert the data + endings). In such a repository, Git can convert the data recorded in commits to a canonical form before performing a merge to reduce unnecessary conflicts. For more information, see section "Merging branches with differing checkin/checkout @@ -52,12 +52,12 @@ merge.stat:: at the end of the merge. True by default. merge.tool:: - Controls which merge resolution program is used by - linkgit:git-mergetool[1]. Valid built-in values are: "araxis", - "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld", - "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff" - and "xxdiff". Any other value is treated is custom merge tool - and there must be a corresponding mergetool.<tool>.cmd option. + Controls which merge tool is used by linkgit:git-mergetool[1]. + The list below shows the valid built-in values. + Any other value is treated as a custom merge tool and requires + that a corresponding mergetool.<tool>.cmd variable is defined. + +include::mergetools-merge.txt[] merge.verbosity:: Controls the amount of output shown by the recursive merge diff --git a/Documentation/pretty-formats.txt b/Documentation/pretty-formats.txt index 105f18a6f9..293965524e 100644 --- a/Documentation/pretty-formats.txt +++ b/Documentation/pretty-formats.txt @@ -133,6 +133,7 @@ The placeholders are: - '%GG': raw verification message from GPG for a signed commit - '%G?': show either "G" for Good or "B" for Bad for a signed commit - '%GS': show the name of the signer for a signed commit +- '%GK': show the key used to sign a signed commit - '%gD': reflog selector, e.g., `refs/stash@{1}` - '%gd': shortened reflog selector, e.g., `stash@{1}` - '%gn': reflog identity name diff --git a/Documentation/rev-list-options.txt b/Documentation/rev-list-options.txt index 1ec14a068e..3bdbf5e856 100644 --- a/Documentation/rev-list-options.txt +++ b/Documentation/rev-list-options.txt @@ -649,7 +649,7 @@ together. Object Traversal ~~~~~~~~~~~~~~~~ -These options are mostly targeted for packing of git repositories. +These options are mostly targeted for packing of Git repositories. --objects:: @@ -717,7 +717,7 @@ format, often found in E-mail messages. + `--date=short` shows only date but not time, in `YYYY-MM-DD` format. + -`--date=raw` shows the date in the internal raw git format `%s %z` format. +`--date=raw` shows the date in the internal raw Git format `%s %z` format. + `--date=default` shows timestamps in the original timezone (either committer's or author's). diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt index 991fcd8f3f..314e25da73 100644 --- a/Documentation/revisions.txt +++ b/Documentation/revisions.txt @@ -23,7 +23,7 @@ blobs contained in a commit. A symbolic ref name. E.g. 'master' typically means the commit object referenced by 'refs/heads/master'. If you happen to have both 'heads/master' and 'tags/master', you can - explicitly say 'heads/master' to tell git which one you mean. + explicitly say 'heads/master' to tell Git which one you mean. When ambiguous, a '<refname>' is disambiguated by taking the first match in the following rules: @@ -88,10 +88,10 @@ some output processing may assume ref names in UTF-8. The construct '@\{-<n>\}' means the <n>th branch checked out before the current one. -'<refname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: - The suffix '@\{upstream\}' to a ref (short form '<refname>@\{u\}') refers to - the branch the ref is set to build on top of. A missing ref defaults - to the current branch. +'<branchname>@\{upstream\}', e.g. 'master@\{upstream\}', '@\{u\}':: + The suffix '@\{upstream\}' to a branchname (short form '<branchname>@\{u\}') + refers to the branch that the branch specified by branchname is set to build on + top of. A missing branchname defaults to the current one. '<rev>{caret}', e.g. 'HEAD{caret}, v1.5.1{caret}0':: A suffix '{caret}' to a revision parameter means the first parent of diff --git a/Documentation/technical/api-builtin.txt b/Documentation/technical/api-builtin.txt index b0cafe87be..4a4228b896 100644 --- a/Documentation/technical/api-builtin.txt +++ b/Documentation/technical/api-builtin.txt @@ -5,7 +5,7 @@ Adding a new built-in --------------------- There are 4 things to do to add a built-in command implementation to -git: +Git: . Define the implementation of the built-in command `foo` with signature: @@ -23,7 +23,7 @@ where options is the bitwise-or of: `RUN_SETUP`:: - Make sure there is a git directory to work on, and if there is a + Make sure there is a Git directory to work on, and if there is a work tree, chdir to the top of it if the command was invoked in a subdirectory. If there is no work tree, no chdir() is done. diff --git a/Documentation/technical/api-config.txt b/Documentation/technical/api-config.txt index edf8dfb99b..230b3a0f60 100644 --- a/Documentation/technical/api-config.txt +++ b/Documentation/technical/api-config.txt @@ -1,7 +1,7 @@ config API ========== -The config API gives callers a way to access git configuration files +The config API gives callers a way to access Git configuration files (and files which have the same syntax). See linkgit:git-config[1] for a discussion of the config file syntax. @@ -12,7 +12,7 @@ Config files are parsed linearly, and each variable found is passed to a caller-provided callback function. The callback function is responsible for any actions to be taken on the config option, and is free to ignore some options. It is not uncommon for the configuration to be parsed -several times during the run of a git program, with different callbacks +several times during the run of a Git program, with different callbacks picking out different variables useful to themselves. A config callback function takes three parameters: @@ -36,7 +36,7 @@ Basic Config Querying --------------------- Most programs will simply want to look up variables in all config files -that git knows about, using the normal precedence rules. To do this, +that Git knows about, using the normal precedence rules. To do this, call `git_config` with a callback function and void data pointer. `git_config` will read all config sources in order of increasing @@ -49,7 +49,7 @@ value is left at the end). The `git_config_with_options` function lets the caller examine config while adjusting some of the default behavior of `git_config`. It should -almost never be used by "regular" git code that is looking up +almost never be used by "regular" Git code that is looking up configuration variables. It is intended for advanced callers like `git-config`, which are intentionally tweaking the normal config-lookup process. It takes two extra parameters: @@ -66,7 +66,7 @@ Regular `git_config` defaults to `1`. There is a special version of `git_config` called `git_config_early`. This version takes an additional parameter to specify the repository config, instead of having it looked up via `git_path`. This is useful -early in a git program before the repository has been found. Unless +early in a Git program before the repository has been found. Unless you're working with early setup code, you probably don't want to use this. diff --git a/Documentation/technical/api-credentials.txt b/Documentation/technical/api-credentials.txt index 5977b58e57..516fda7412 100644 --- a/Documentation/technical/api-credentials.txt +++ b/Documentation/technical/api-credentials.txt @@ -7,9 +7,9 @@ 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 +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 +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. @@ -18,7 +18,7 @@ Typical setup ------------ +-----------------------+ -| git code (C) |--- to server requiring ---> +| Git code (C) |--- to server requiring ---> | | authentication |.......................| | C credential API |--- prompt ---> User @@ -27,11 +27,11 @@ Typical setup | pipe | | v +-----------------------+ -| git credential helper | +| Git credential helper | +-----------------------+ ------------ -The git code (typically a remote-helper) will call the C API to obtain +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 @@ -42,7 +42,7 @@ 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 +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), @@ -177,14 +177,14 @@ int foo_login(struct foo_connection *f) Credential Helpers ------------------ -Credential helpers are programs executed by git to fetch or save +Credential helpers are programs executed by Git to fetch or save credentials from and to long-term storage (where "long-term" is simply -longer than a single git process; e.g., credentials may be stored +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 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 +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 @@ -248,7 +248,7 @@ FORMAT` in linkgit:git-credential[7] for a detailed specification). For a `get` operation, the helper should produce a list of attributes on stdout in the same format. A helper is free to produce a subset, or even no values at all if it has nothing useful to provide. Any provided -attributes will overwrite those already known about by git. +attributes will overwrite those already known about by Git. For a `store` or `erase` operation, the helper's output is ignored. If it fails to perform the requested operation, it may complain to diff --git a/Documentation/technical/api-directory-listing.txt b/Documentation/technical/api-directory-listing.txt index 944fc39fac..1f349b28ae 100644 --- a/Documentation/technical/api-directory-listing.txt +++ b/Documentation/technical/api-directory-listing.txt @@ -39,7 +39,7 @@ The notable options are: `DIR_NO_GITLINKS`::: - If set, recurse into a directory that looks like a git + If set, recurse into a directory that looks like a Git directory. Otherwise it is shown as a directory. The result of the enumeration is left in these fields: @@ -67,11 +67,13 @@ marked. If you to exclude files, make sure you have loaded index first. * Prepare `struct dir_struct dir` and clear it with `memset(&dir, 0, sizeof(dir))`. -* Call `add_exclude()` to add single exclude pattern, - `add_excludes_from_file()` to add patterns from a file - (e.g. `.git/info/exclude`), and/or set `dir.exclude_per_dir`. A - short-hand function `setup_standard_excludes()` can be used to set up - the standard set of exclude settings. +* To add single exclude pattern, call `add_exclude_list()` and then + `add_exclude()`. + +* To add patterns from a file (e.g. `.git/info/exclude`), call + `add_excludes_from_file()` , and/or set `dir.exclude_per_dir`. A + short-hand function `setup_standard_excludes()` can be used to set + up the standard set of exclude settings. * Set options described in the Data Structure section above. @@ -79,4 +81,6 @@ marked. If you to exclude files, make sure you have loaded index first. * Use `dir.entries[]`. +* Call `clear_directory()` when none of the contained elements are no longer in use. + (JC) diff --git a/Documentation/technical/api-index-skel.txt b/Documentation/technical/api-index-skel.txt index 730cfacf78..eda8c195c1 100644 --- a/Documentation/technical/api-index-skel.txt +++ b/Documentation/technical/api-index-skel.txt @@ -1,7 +1,7 @@ -GIT API Documents +Git API Documents ================= -GIT has grown a set of internal API over time. This collection +Git has grown a set of internal API over time. This collection documents them. //////////////////////////////////////////////////////////////// diff --git a/Documentation/technical/api-parse-options.txt b/Documentation/technical/api-parse-options.txt index 3062389404..32ddc1cf13 100644 --- a/Documentation/technical/api-parse-options.txt +++ b/Documentation/technical/api-parse-options.txt @@ -1,7 +1,7 @@ parse-options API ================= -The parse-options API is used to parse and massage options in git +The parse-options API is used to parse and massage options in Git and to provide a usage help with consistent look. Basics diff --git a/Documentation/technical/api-remote.txt b/Documentation/technical/api-remote.txt index c54b17db69..4be87768f6 100644 --- a/Documentation/technical/api-remote.txt +++ b/Documentation/technical/api-remote.txt @@ -3,7 +3,7 @@ Remotes configuration API The API in remote.h gives access to the configuration related to remotes. It handles all three configuration mechanisms historically -and currently used by git, and presents the information in a uniform +and currently used by Git, and presents the information in a uniform fashion. Note that the code also handles plain URLs without any configuration, giving them just the default information. @@ -45,7 +45,7 @@ struct remote `receivepack`, `uploadpack`:: The configured helper programs to run on the remote side, for - git-native protocols. + Git-native protocols. `http_proxy`:: diff --git a/Documentation/technical/api-strbuf.txt b/Documentation/technical/api-strbuf.txt index 84686b5c69..2c59cb2259 100644 --- a/Documentation/technical/api-strbuf.txt +++ b/Documentation/technical/api-strbuf.txt @@ -156,6 +156,11 @@ then they will free() it. Remove the bytes between `pos..pos+len` and replace it with the given data. +`strbuf_add_commented_lines`:: + + Add a NUL-terminated string to the buffer. Each line will be prepended + by a comment character and a blank. + `strbuf_add`:: Add data of given length to the buffer. @@ -229,6 +234,11 @@ which can be used by the programmer of the callback as she sees fit. Add a formatted string to the buffer. +`strbuf_commented_addf`:: + + Add a formatted string prepended by a comment character and a + blank to the buffer. + `strbuf_fread`:: Read a given size of data from a FILE* pointer to the buffer. diff --git a/Documentation/technical/index-format.txt b/Documentation/technical/index-format.txt index 7324154838..0810251f5a 100644 --- a/Documentation/technical/index-format.txt +++ b/Documentation/technical/index-format.txt @@ -1,7 +1,7 @@ -GIT index format +Git index format ================ -== The git index file has the following format +== The Git index file has the following format All binary numbers are in network byte order. Version 2 is described here unless stated otherwise. @@ -12,7 +12,7 @@ GIT index format The signature is { 'D', 'I', 'R', 'C' } (stands for "dircache") 4-byte version number: - The current supported versions are 2 and 3. + The current supported versions are 2, 3 and 4. 32-bit number of index entries. @@ -21,9 +21,9 @@ GIT index format - Extensions Extensions are identified by signature. Optional extensions can - be ignored if GIT does not understand them. + be ignored if Git does not understand them. - GIT currently supports cached tree and resolve undo extensions. + Git currently supports cached tree and resolve undo extensions. 4-byte extension signature. If the first byte is 'A'..'Z' the extension is optional and can be ignored. @@ -93,8 +93,8 @@ GIT index format 12-bit name length if the length is less than 0xFFF; otherwise 0xFFF is stored in this field. - (Version 3) A 16-bit field, only applicable if the "extended flag" - above is 1, split into (high to low bits). + (Version 3 or later) A 16-bit field, only applicable if the + "extended flag" above is 1, split into (high to low bits). 1-bit reserved for future diff --git a/Documentation/technical/pack-format.txt b/Documentation/technical/pack-format.txt index a7871fb865..0e37ec9de5 100644 --- a/Documentation/technical/pack-format.txt +++ b/Documentation/technical/pack-format.txt @@ -1,4 +1,4 @@ -GIT pack format +Git pack format =============== == pack-*.pack files have the following format: @@ -9,7 +9,7 @@ GIT pack format The signature is: {'P', 'A', 'C', 'K'} 4-byte version number (network byte order): - GIT currently accepts version number 2 or 3 but + Git currently accepts version number 2 or 3 but generates version 2 only. 4-byte number of objects contained in the pack (network byte order) diff --git a/Documentation/technical/pack-heuristics.txt b/Documentation/technical/pack-heuristics.txt index 103eb5d989..dbdf7ba9c8 100644 --- a/Documentation/technical/pack-heuristics.txt +++ b/Documentation/technical/pack-heuristics.txt @@ -5,11 +5,11 @@ Where do I go to learn the details - of git's packing heuristics? + of Git's packing heuristics? Be careful what you ask! -Followers of the git, please open the git IRC Log and turn to +Followers of the Git, please open the Git IRC Log and turn to February 10, 2006. It's a rare occasion, and we are joined by the King Git Himself, @@ -19,7 +19,7 @@ and seeks enlightenment. Others are present, but silent. Let's listen in! <njs`> Oh, here's a really stupid question -- where do I go to - learn the details of git's packing heuristics? google avails + learn the details of Git's packing heuristics? google avails me not, reading the source didn't help a lot, and wading through the whole mailing list seems less efficient than any of that. @@ -37,7 +37,7 @@ Ah! Modesty after all. <linus> njs, I don't think the docs exist. That's something where I don't think anybody else than me even really got involved. - Most of the rest of git others have been busy with (especially + Most of the rest of Git others have been busy with (especially Junio), but packing nobody touched after I did it. It's cryptic, yet vague. Linus in style for sure. Wise men @@ -57,7 +57,7 @@ Bait... And switch. That ought to do it! - <linus> Remember: git really doesn't follow files. So what it does is + <linus> Remember: Git really doesn't follow files. So what it does is - generate a list of all objects - sort the list according to magic heuristics - walk the list, using a sliding window, seeing if an object @@ -382,7 +382,7 @@ The 'net never forgets, so that should be good until the end of time. <njs`> (if only it happened more...) <linus> Anyway, the pack-file could easily be denser still, but - because it's used both for streaming (the git protocol) and + because it's used both for streaming (the Git protocol) and for on-disk, it has a few pessimizations. Actually, it is a made-up word. But it is a made-up word being @@ -432,12 +432,12 @@ Gasp! OK, saved. That's a fair Engineering trade off. Close call! In fact, Linus reflects on some Basic Engineering Fundamentals, design options, etc. - <linus> More importantly, they allow git to still _conceptually_ + <linus> More importantly, they allow Git to still _conceptually_ never deal with deltas at all, and be a "whole object" store. Which has some problems (we discussed bad huge-file - behaviour on the git lists the other day), but it does mean - that the basic git concepts are really really simple and + behaviour on the Git lists the other day), but it does mean + that the basic Git concepts are really really simple and straightforward. It's all been quite stable. @@ -461,6 +461,6 @@ Nuff said. <njs`> :-) <njs`> appreciate the infodump, I really was failing to find the - details on git packs :-) + details on Git packs :-) And now you know the rest of the story. diff --git a/Documentation/technical/racy-git.txt b/Documentation/technical/racy-git.txt index 53aa0c82c2..6dc82ca5a8 100644 --- a/Documentation/technical/racy-git.txt +++ b/Documentation/technical/racy-git.txt @@ -1,21 +1,21 @@ -Use of index and Racy git problem +Use of index and Racy Git problem ================================= Background ---------- -The index is one of the most important data structures in git. +The index is one of the most important data structures in Git. It represents a virtual working tree state by recording list of paths and their object names and serves as a staging area to write out the next tree object to be committed. The state is "virtual" in the sense that it does not necessarily have to, and often does not, match the files in the working tree. -There are cases git needs to examine the differences between the +There are cases Git needs to examine the differences between the virtual working tree state in the index and the files in the working tree. The most obvious case is when the user asks `git diff` (or its low level implementation, `git diff-files`) or -`git-ls-files --modified`. In addition, git internally checks +`git-ls-files --modified`. In addition, Git internally checks if the files in the working tree are different from what are recorded in the index to avoid stomping on local changes in them during patch application, switching branches, and merging. @@ -24,16 +24,16 @@ In order to speed up this comparison between the files in the working tree and the index entries, the index entries record the information obtained from the filesystem via `lstat(2)` system call when they were last updated. When checking if they differ, -git first runs `lstat(2)` on the files and compares the result +Git first runs `lstat(2)` on the files and compares the result with this information (this is what was originally done by the `ce_match_stat()` function, but the current code does it in `ce_match_stat_basic()` function). If some of these "cached -stat information" fields do not match, git can tell that the +stat information" fields do not match, Git can tell that the files are modified without even looking at their contents. Note: not all members in `struct stat` obtained via `lstat(2)` are used for this comparison. For example, `st_atime` obviously -is not useful. Currently, git compares the file type (regular +is not useful. Currently, Git compares the file type (regular files vs symbolic links) and executable bits (only for regular files) from `st_mode` member, `st_mtime` and `st_ctime` timestamps, `st_uid`, `st_gid`, `st_ino`, and `st_size` members. @@ -49,7 +49,7 @@ of git://git.kernel.org/pub/scm/linux/kernel/git/tglx/history.git ([PATCH] Sync in core time granuality with filesystems, 2005-01-04). -Racy git +Racy Git -------- There is one slight problem with the optimization based on the @@ -67,13 +67,13 @@ timestamp does not change, after this sequence, the cached stat information the index entry records still exactly match what you would see in the filesystem, even though the file `foo` is now different. -This way, git can incorrectly think files in the working tree +This way, Git can incorrectly think files in the working tree are unmodified even though they actually are. This is called -the "racy git" problem (discovered by Pasky), and the entries +the "racy Git" problem (discovered by Pasky), and the entries that appear clean when they may not be because of this problem are called "racily clean". -To avoid this problem, git does two things: +To avoid this problem, Git does two things: . When the cached stat information says the file has not been modified, and the `st_mtime` is the same as (or newer than) @@ -116,7 +116,7 @@ timestamp comparison check done with the former logic anymore. The latter makes sure that the cached stat information for `foo` would never match with the file in the working tree, so later checks by `ce_match_stat_basic()` would report that the index entry -does not match the file and git does not have to fall back on more +does not match the file and Git does not have to fall back on more expensive `ce_modified_check_fs()`. @@ -159,7 +159,7 @@ of the cached stat information. Avoiding runtime penalty ------------------------ -In order to avoid the above runtime penalty, post 1.4.2 git used +In order to avoid the above runtime penalty, post 1.4.2 Git used to have a code that made sure the index file got timestamp newer than the youngest files in the index when there are many young files with the same timestamp as the diff --git a/Documentation/technical/shallow.txt b/Documentation/technical/shallow.txt index 0502a5471e..ea2f69faf5 100644 --- a/Documentation/technical/shallow.txt +++ b/Documentation/technical/shallow.txt @@ -53,3 +53,6 @@ It also writes an appropriate $GIT_DIR/shallow. You can deepen a shallow repository with "git-fetch --depth 20 repo branch", which will fetch branch from repo, but stop at depth 20, updating $GIT_DIR/shallow. + +The special depth 2147483647 (or 0x7fffffff, the largest positive +number a signed 32-bit integer can contain) means infinite depth. diff --git a/Documentation/urls-remotes.txt b/Documentation/urls-remotes.txt index 00f7e79c44..282758e768 100644 --- a/Documentation/urls-remotes.txt +++ b/Documentation/urls-remotes.txt @@ -6,7 +6,7 @@ REMOTES[[REMOTES]] The name of one of the following can be used instead of a URL as `<repository>` argument: -* a remote in the git configuration file: `$GIT_DIR/config`, +* a remote in the Git configuration file: `$GIT_DIR/config`, * a file in the `$GIT_DIR/remotes` directory, or * a file in the `$GIT_DIR/branches` directory. diff --git a/Documentation/urls.txt b/Documentation/urls.txt index 1d15ee7e52..3ca122faed 100644 --- a/Documentation/urls.txt +++ b/Documentation/urls.txt @@ -29,7 +29,7 @@ The ssh and git protocols additionally support ~username expansion: - git://host.xz{startsb}:port{endsb}/~{startsb}user{endsb}/path/to/repo.git/ - {startsb}user@{endsb}host.xz:/~{startsb}user{endsb}/path/to/repo.git/ -For local repositories, also supported by git natively, the following +For local repositories, also supported by Git natively, the following syntaxes may be used: - /path/to/repo.git/ @@ -46,7 +46,7 @@ These two syntaxes are mostly equivalent, except the former implies --local option. endif::git-clone[] -When git doesn't know how to handle a certain transport protocol, it +When Git doesn't know how to handle a certain transport protocol, it attempts to use the 'remote-<transport>' remote helper, if one exists. To explicitly request a remote helper, the following syntax may be used: @@ -55,7 +55,7 @@ may be used: where <address> may be a path, a server and path, or an arbitrary URL-like string recognized by the specific remote helper being -invoked. See linkgit:git-remote-helpers[1] for details. +invoked. See linkgit:gitremote-helpers[1] for details. If there are a large number of similarly-named remote repositories and you want to use a different format for them (such that the URLs you diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 1b377dc207..e831cc2020 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -5,7 +5,7 @@ ______________________________________________ Git is a fast distributed revision control system. This manual is designed to be readable by someone with basic UNIX -command-line skills, but no previous knowledge of git. +command-line skills, but no previous knowledge of Git. <<repositories-and-branches>> and <<exploring-git-history>> explain how to fetch and study a project using git--read these chapters to learn how @@ -19,7 +19,7 @@ Further chapters cover more specialized topics. Comprehensive reference documentation is available through the man pages, or linkgit:git-help[1] command. For example, for the command -"git clone <repo>", you can either use: +`git clone <repo>`, you can either use: ------------------------------------------------ $ man git-clone @@ -34,7 +34,7 @@ $ git help clone With the latter, you can use the manual viewer of your choice; see linkgit:git-help[1] for more information. -See also <<git-quick-start>> for a brief overview of git commands, +See also <<git-quick-start>> for a brief overview of Git commands, without any explanation. Finally, see <<todo>> for ways that you can help make this manual more @@ -46,10 +46,10 @@ Repositories and Branches ========================= [[how-to-get-a-git-repository]] -How to get a git repository +How to get a Git repository --------------------------- -It will be useful to have a git repository to experiment with as you +It will be useful to have a Git repository to experiment with as you read this manual. The best way to get one is by using the linkgit:git-clone[1] command to @@ -57,7 +57,7 @@ download a copy of an existing repository. If you don't already have a project in mind, here are some interesting examples: ------------------------------------------------ - # git itself (approx. 10MB download): + # Git itself (approx. 10MB download): $ git clone git://git.kernel.org/pub/scm/git/git.git # the Linux kernel (approx. 150MB download): $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git @@ -66,11 +66,11 @@ $ git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git The initial clone may be time-consuming for a large project, but you will only need to clone once. -The clone command creates a new directory named after the project ("git" -or "linux-2.6" in the examples above). After you cd into this +The clone command creates a new directory named after the project (`git` +or `linux-2.6` in the examples above). After you cd into this directory, you will see that it contains a copy of the project files, called the <<def_working_tree,working tree>>, together with a special -top-level directory named ".git", which contains all the information +top-level directory named `.git`, which contains all the information about the history of the project. [[how-to-check-out]] @@ -79,7 +79,7 @@ How to check out a different version of a project Git is best thought of as a tool for storing the history of a collection of files. It stores the history as a compressed collection of -interrelated snapshots of the project's contents. In git each such +interrelated snapshots of the project's contents. In Git each such version is called a <<def_commit,commit>>. Those snapshots aren't necessarily all arranged in a single line from @@ -87,7 +87,7 @@ oldest to newest; instead, work may simultaneously proceed along parallel lines of development, called <<def_branch,branches>>, which may merge and diverge. -A single git repository can track development on multiple branches. It +A single Git repository can track development on multiple branches. It does this by keeping a list of <<def_head,heads>> which reference the latest commit on each branch; the linkgit:git-branch[1] command shows you the list of branch heads: @@ -188,7 +188,7 @@ As you can see, a commit shows who made the latest change, what they did, and why. Every commit has a 40-hexdigit id, sometimes called the "object name" or the -"SHA-1 id", shown on the first line of the "git show" output. You can usually +"SHA-1 id", shown on the first line of the `git show` output. You can usually refer to a commit by a shorter name, such as a tag or a branch name, but this longer name can also be useful. Most importantly, it is a globally unique name for this commit: so if you tell somebody else the object name (for @@ -198,7 +198,7 @@ has that commit at all). Since the object name is computed as a hash over the contents of the commit, you are guaranteed that the commit can never change without its name also changing. -In fact, in <<git-concepts>> we shall see that everything stored in git +In fact, in <<git-concepts>> we shall see that everything stored in Git history, including file data and directory contents, is stored in an object with a name that is a hash of its contents. @@ -211,7 +211,7 @@ parent commit which shows what happened before this commit. Following the chain of parents will eventually take you back to the beginning of the project. -However, the commits do not form a simple list; git allows lines of +However, the commits do not form a simple list; Git allows lines of development to diverge and then reconverge, and the point where two lines of development reconverge is called a "merge". The commit representing a merge can therefore have more than one parent, with @@ -219,8 +219,8 @@ each parent representing the most recent commit on one of the lines of development leading to that point. The best way to see how this works is using the linkgit:gitk[1] -command; running gitk now on a git repository and looking for merge -commits will help understand how the git organizes history. +command; running gitk now on a Git repository and looking for merge +commits will help understand how the Git organizes history. In the following, we say that commit X is "reachable" from commit Y if commit X is an ancestor of commit Y. Equivalently, you could say @@ -231,7 +231,7 @@ leading from commit Y to commit X. Understanding history: History diagrams ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -We will sometimes represent git history using diagrams like the one +We will sometimes represent Git history using diagrams like the one below. Commits are shown as "o", and the links between them with lines drawn with - / and \. Time goes left to right: @@ -268,35 +268,35 @@ Manipulating branches Creating, deleting, and modifying branches is quick and easy; here's a summary of the commands: -git branch:: +`git branch`:: list all branches -git branch <branch>:: - create a new branch named <branch>, referencing the same +`git branch <branch>`:: + create a new branch named `<branch>`, referencing the same point in history as the current branch -git branch <branch> <start-point>:: - create a new branch named <branch>, referencing - <start-point>, which may be specified any way you like, +`git branch <branch> <start-point>`:: + create a new branch named `<branch>`, referencing + `<start-point>`, which may be specified any way you like, including using a branch name or a tag name -git branch -d <branch>:: - delete the branch <branch>; if the branch you are deleting +`git branch -d <branch>`:: + delete the branch `<branch>`; if the branch you are deleting points to a commit which is not reachable from the current branch, this command will fail with a warning. -git branch -D <branch>:: +`git branch -D <branch>`:: even if the branch points to a commit not reachable from the current branch, you may know that that commit is still reachable from some other branch or tag. In that - case it is safe to use this command to force git to delete + case it is safe to use this command to force Git to delete the branch. -git checkout <branch>:: - make the current branch <branch>, updating the working - directory to reflect the version referenced by <branch> -git checkout -b <new> <start-point>:: - create a new branch <new> referencing <start-point>, and +`git checkout <branch>`:: + make the current branch `<branch>`, updating the working + directory to reflect the version referenced by `<branch>` +`git checkout -b <new> <start-point>`:: + create a new branch `<new>` referencing `<start-point>`, and check it out. The special symbol "HEAD" can always be used to refer to the current -branch. In fact, git uses a file named "HEAD" in the .git directory to -remember which branch is current: +branch. In fact, Git uses a file named `HEAD` in the `.git` directory +to remember which branch is current: ------------------------------------------------ $ cat .git/HEAD @@ -346,7 +346,7 @@ of the HEAD in the repository that you cloned from. That repository may also have had other branches, though, and your local repository keeps branches which track each of those remote branches, called remote-tracking branches, which you -can view using the "-r" option to linkgit:git-branch[1]: +can view using the `-r` option to linkgit:git-branch[1]: ------------------------------------------------ $ git branch -r @@ -364,7 +364,7 @@ In this example, "origin" is called a remote repository, or "remote" for short. The branches of this repository are called "remote branches" from our point of view. The remote-tracking branches listed above were created based on the remote branches at clone time and will -be updated by "git fetch" (hence "git pull") and "git push". See +be updated by `git fetch` (hence `git pull`) and `git push`. See <<Updating-a-repository-With-git-fetch>> for details. You might want to build on one of these remote-tracking branches @@ -374,10 +374,10 @@ on a branch of your own, just as you would for a tag: $ git checkout -b my-todo-copy origin/todo ------------------------------------------------ -You can also check out "origin/todo" directly to examine it or +You can also check out `origin/todo` directly to examine it or write a one-off patch. See <<detached-head,detached head>>. -Note that the name "origin" is just the name that git uses by default +Note that the name "origin" is just the name that Git uses by default to refer to the repository that you cloned from. [[how-git-stores-references]] @@ -386,17 +386,17 @@ Naming branches, tags, and other references Branches, remote-tracking branches, and tags are all references to commits. All references are named with a slash-separated path name -starting with "refs"; the names we've been using so far are actually +starting with `refs`; the names we've been using so far are actually shorthand: - - The branch "test" is short for "refs/heads/test". - - The tag "v2.6.18" is short for "refs/tags/v2.6.18". - - "origin/master" is short for "refs/remotes/origin/master". + - The branch `test` is short for `refs/heads/test`. + - The tag `v2.6.18` is short for `refs/tags/v2.6.18`. + - `origin/master` is short for `refs/remotes/origin/master`. The full name is occasionally useful if, for example, there ever exists a tag and a branch with the same name. -(Newly created refs are actually stored in the .git/refs directory, +(Newly created refs are actually stored in the `.git/refs` directory, under the path given by their name. However, for efficiency reasons they may also be packed together in a single file; see linkgit:git-pack-refs[1]). @@ -405,7 +405,7 @@ As another useful shortcut, the "HEAD" of a repository can be referred to just using the name of that repository. So, for example, "origin" is usually a shortcut for the HEAD branch in the repository "origin". -For the complete list of paths which git checks for references, and +For the complete list of paths which Git checks for references, and the order it uses to decide which to choose when there are multiple references with the same shorthand name, see the "SPECIFYING REVISIONS" section of linkgit:gitrevisions[7]. @@ -418,7 +418,7 @@ Eventually the developer cloned from will do additional work in her repository, creating new commits and advancing the branches to point at the new commits. -The command "git fetch", with no arguments, will update all of the +The command `git fetch`, with no arguments, will update all of the remote-tracking branches to the latest version found in her repository. It will not touch any of your own branches--not even the "master" branch that was created for you on clone. @@ -438,7 +438,7 @@ $ git fetch linux-nfs ------------------------------------------------- New remote-tracking branches will be stored under the shorthand name -that you gave "git remote add", in this case linux-nfs: +that you gave `git remote add`, in this case `linux-nfs`: ------------------------------------------------- $ git branch -r @@ -446,10 +446,10 @@ linux-nfs/master origin/master ------------------------------------------------- -If you run "git fetch <remote>" later, the remote-tracking branches for the -named <remote> will be updated. +If you run `git fetch <remote>` later, the remote-tracking branches +for the named `<remote>` will be updated. -If you examine the file .git/config, you will see that git has added +If you examine the file `.git/config`, you will see that Git has added a new stanza: ------------------------------------------------- @@ -461,13 +461,13 @@ $ cat .git/config ... ------------------------------------------------- -This is what causes git to track the remote's branches; you may modify -or delete these configuration options by editing .git/config with a +This is what causes Git to track the remote's branches; you may modify +or delete these configuration options by editing `.git/config` with a text editor. (See the "CONFIGURATION FILE" section of linkgit:git-config[1] for details.) [[exploring-git-history]] -Exploring git history +Exploring Git history ===================== Git is best thought of as a tool for storing the history of a @@ -499,7 +499,7 @@ Bisecting: 3537 revisions left to test after this [65934a9a028b88e83e2b0f8b36618fe503349f8e] BLOCK: Make USB storage depend on SCSI rather than selecting it [try #6] ------------------------------------------------- -If you run "git branch" at this point, you'll see that git has +If you run `git branch` at this point, you'll see that Git has temporarily moved you in "(no branch)". HEAD is now detached from any branch and points directly to a commit (with commit id 65934...) that is reachable from "master" but not from v2.6.18. Compile and test it, @@ -511,7 +511,7 @@ Bisecting: 1769 revisions left to test after this [7eff82c8b1511017ae605f0c99ac275a7e21b867] i2c-core: Drop useless bitmaskings ------------------------------------------------- -checks out an older version. Continue like this, telling git at each +checks out an older version. Continue like this, telling Git at each stage whether the version it gives you is good or bad, and notice that the number of revisions left to test is cut approximately in half each time. @@ -545,24 +545,24 @@ id, and check it out with: $ git reset --hard fb47ddb2db... ------------------------------------------------- -then test, run "bisect good" or "bisect bad" as appropriate, and +then test, run `bisect good` or `bisect bad` as appropriate, and continue. -Instead of "git bisect visualize" and then "git reset --hard -fb47ddb2db...", you might just want to tell git that you want to skip +Instead of `git bisect visualize` and then `git reset --hard +fb47ddb2db...`, you might just want to tell Git that you want to skip the current commit: ------------------------------------------------- $ git bisect skip ------------------------------------------------- -In this case, though, git may not eventually be able to tell the first +In this case, though, Git may not eventually be able to tell the first bad one between some first skipped commits and a later bad commit. There are also ways to automate the bisecting process if you have a test script that can tell a good from a bad commit. See -linkgit:git-bisect[1] for more information about this and other "git -bisect" features. +linkgit:git-bisect[1] for more information about this and other `git +bisect` features. [[naming-commits]] Naming commits @@ -591,7 +591,7 @@ $ git show HEAD~4 # the great-great-grandparent ------------------------------------------------- Recall that merge commits may have more than one parent; by default, -^ and ~ follow the first parent listed in the commit, but you can +`^` and `~` follow the first parent listed in the commit, but you can also choose: ------------------------------------------------- @@ -640,7 +640,7 @@ running $ git tag stable-1 1b2e1d63ff ------------------------------------------------- -You can use stable-1 to refer to the commit 1b2e1d63ff. +You can use `stable-1` to refer to the commit 1b2e1d63ff. This creates a "lightweight" tag. If you would also like to include a comment with the tag, and possibly sign it cryptographically, then you @@ -669,7 +669,7 @@ $ git log -S'foo()' # commits which add or remove any file data ------------------------------------------------- And of course you can combine all of these; the following finds -commits since v2.5 which touch the Makefile or any file under fs: +commits since v2.5 which touch the `Makefile` or any file under `fs`: ------------------------------------------------- $ git log v2.5.. Makefile fs/ @@ -681,11 +681,11 @@ You can also ask git log to show patches: $ git log -p ------------------------------------------------- -See the "--pretty" option in the linkgit:git-log[1] man page for more +See the `--pretty` option in the linkgit:git-log[1] man page for more display options. Note that git log starts with the most recent commit and works -backwards through the parents; however, since git history can contain +backwards through the parents; however, since Git history can contain multiple independent lines of development, the particular order that commits are listed in may be somewhat arbitrary. @@ -732,7 +732,7 @@ $ git show v2.5:fs/locks.c ------------------------------------------------- Before the colon may be anything that names a commit, and after it -may be any path to a file tracked by git. +may be any path to a file tracked by Git. [[history-examples]] Examples @@ -742,8 +742,8 @@ Examples Counting the number of commits on a branch ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Suppose you want to know how many commits you've made on "mybranch" -since it diverged from "origin": +Suppose you want to know how many commits you've made on `mybranch` +since it diverged from `origin`: ------------------------------------------------- $ git log --pretty=oneline origin..mybranch | wc -l @@ -780,9 +780,9 @@ $ git rev-list master e05db0fd4f31dde7005f075a84f96b360d05984b ------------------------------------------------- -Or you could recall that the ... operator selects all commits +Or you could recall that the `...` operator selects all commits contained reachable from either one reference or the other but not -both: so +both; so ------------------------------------------------- $ git log origin...master @@ -880,7 +880,7 @@ Showing commits unique to a given branch ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Suppose you would like to see all the commits reachable from the branch -head named "master" but not from any other head in your repository. +head named `master` but not from any other head in your repository. We can list all the heads in this repository with linkgit:git-show-ref[1]: @@ -894,7 +894,7 @@ a07157ac624b2524a059a3414e99f6f44bebc1e7 refs/heads/master 1e87486ae06626c2f31eaa63d26fc0fd646c8af2 refs/heads/tutorial-fixes ------------------------------------------------- -We can get just the branch-head names, and remove "master", with +We can get just the branch-head names, and remove `master`, with the help of the standard utilities cut and grep: ------------------------------------------------- @@ -931,11 +931,20 @@ The linkgit:git-archive[1] command can create a tar or zip archive from any version of a project; for example: ------------------------------------------------- -$ git archive --format=tar --prefix=project/ HEAD | gzip >latest.tar.gz +$ git archive -o latest.tar.gz --prefix=project/ HEAD ------------------------------------------------- -will use HEAD to produce a tar archive in which each filename is -preceded by "project/". +will use HEAD to produce a gzipped tar archive in which each filename +is preceded by `project/`. The output file format is inferred from +the output file extension if possible, see linkgit:git-archive[1] for +details. + +Versions of Git older than 1.7.7 don't know about the `tar.gz` format, +you'll need to use gzip explicitly: + +------------------------------------------------- +$ git archive --format=tar --prefix=project/ HEAD | gzip >latest.tar.gz +------------------------------------------------- If you're releasing a new version of a software project, you may want to simultaneously make a changelog to include in the release @@ -984,16 +993,23 @@ student. The linkgit:git-log[1], linkgit:git-diff-tree[1], and linkgit:git-hash-object[1] man pages may prove helpful. [[Developing-With-git]] -Developing with git +Developing with Git =================== [[telling-git-your-name]] -Telling git your name +Telling Git your name --------------------- -Before creating any commits, you should introduce yourself to git. The -easiest way to do so is to make sure the following lines appear in a -file named .gitconfig in your home directory: +Before creating any commits, you should introduce yourself to Git. +The easiest way to do so is to use linkgit:git-config[1]: + +------------------------------------------------ +$ git config --global user.name 'Your Name Comes Here' +$ git config --global user.email 'you@yourdomain.example.com' +------------------------------------------------ + +Which will add the following to a file named `.gitconfig` in your +home directory: ------------------------------------------------ [user] @@ -1001,8 +1017,9 @@ file named .gitconfig in your home directory: email = you@yourdomain.example.com ------------------------------------------------ -(See the "CONFIGURATION FILE" section of linkgit:git-config[1] for -details on the configuration file.) +See the "CONFIGURATION FILE" section of linkgit:git-config[1] for +details on the configuration file. The file is plain text, so you can +also edit it with your favorite editor. [[creating-a-new-repository]] @@ -1035,17 +1052,17 @@ Creating a new commit takes three steps: 1. Making some changes to the working directory using your favorite editor. - 2. Telling git about your changes. - 3. Creating the commit using the content you told git about + 2. Telling Git about your changes. + 3. Creating the commit using the content you told Git about in step 2. In practice, you can interleave and repeat steps 1 and 2 as many times as you want: in order to keep track of what you want committed -at step 3, git maintains a snapshot of the tree's contents in a +at step 3, Git maintains a snapshot of the tree's contents in a special staging area called "the index." At the beginning, the content of the index will be identical to -that of the HEAD. The command "git diff --cached", which shows +that of the HEAD. The command `git diff --cached`, which shows the difference between the HEAD and the index, should therefore produce no output at that point. @@ -1084,7 +1101,7 @@ $ git diff shows the difference between the working tree and the index file. -Note that "git add" always adds just the current contents of a file +Note that `git add` always adds just the current contents of a file to the index; further changes to the same file will be ignored unless you run `git add` on the file again. @@ -1094,7 +1111,7 @@ When you're ready, just run $ git commit ------------------------------------------------- -and git will prompt you for a commit message and then create the new +and Git will prompt you for a commit message and then create the new commit. Check to make sure it looks like what you expected with ------------------------------------------------- @@ -1138,7 +1155,7 @@ with a single short (less than 50 character) line summarizing the change, followed by a blank line and then a more thorough description. The text up to the first blank line in a commit message is treated as the commit title, and that title is used -throughout git. For example, linkgit:git-format-patch[1] turns a +throughout Git. For example, linkgit:git-format-patch[1] turns a commit into email, and it uses the title on the Subject line and the rest of the commit in the body. @@ -1147,16 +1164,17 @@ rest of the commit in the body. Ignoring files -------------- -A project will often generate files that you do 'not' want to track with git. +A project will often generate files that you do 'not' want to track with Git. This typically includes files generated by a build process or temporary -backup files made by your editor. Of course, 'not' tracking files with git +backup files made by your editor. Of course, 'not' tracking files with Git is just a matter of 'not' calling `git add` on them. But it quickly becomes annoying to have these untracked files lying around; e.g. they make `git add .` practically useless, and they keep showing up in the output of `git status`. -You can tell git to ignore certain files by creating a file called .gitignore -in the top level of your working directory, with contents such as: +You can tell Git to ignore certain files by creating a file called +`.gitignore` in the top level of your working directory, with contents +such as: ------------------------------------------------- # Lines starting with '#' are considered comments. @@ -1180,10 +1198,10 @@ for other users who clone your repository. If you wish the exclude patterns to affect only certain repositories (instead of every repository for a given project), you may instead put -them in a file in your repository named .git/info/exclude, or in any file -specified by the `core.excludesfile` configuration variable. Some git -commands can also take exclude patterns directly on the command line. -See linkgit:gitignore[5] for the details. +them in a file in your repository named `.git/info/exclude`, or in any +file specified by the `core.excludesfile` configuration variable. +Some Git commands can also take exclude patterns directly on the +command line. See linkgit:gitignore[5] for the details. [[how-to-merge]] How to merge @@ -1196,10 +1214,10 @@ linkgit:git-merge[1]: $ git merge branchname ------------------------------------------------- -merges the development in the branch "branchname" into the current +merges the development in the branch `branchname` into the current branch. -A merge is made by combining the changes made in "branchname" and the +A merge is made by combining the changes made in `branchname` and the changes made up to the latest commit in your current branch since their histories forked. The work tree is overwritten by the result of the merge when this combining is done cleanly, or overwritten by a @@ -1227,7 +1245,7 @@ Automatic merge failed; fix conflicts and then commit the result. Conflict markers are left in the problematic files, and after you resolve the conflicts manually, you can update the index -with the contents and run git commit, as you normally would when +with the contents and run Git commit, as you normally would when creating a new file. If you examine the resulting commit using gitk, you will see that it @@ -1238,7 +1256,7 @@ one to the top of the other branch. Resolving a merge ----------------- -When a merge isn't resolved automatically, git leaves the index and +When a merge isn't resolved automatically, Git leaves the index and the working tree in a special state that gives you all the information you need to help resolve the merge. @@ -1274,14 +1292,14 @@ some information about the merge. Normally you can just use this default message unchanged, but you may add additional commentary of your own if desired. -The above is all you need to know to resolve a simple merge. But git +The above is all you need to know to resolve a simple merge. But Git also provides more information to help resolve conflicts: [[conflict-resolution]] Getting conflict-resolution help during a merge ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -All of the changes that git was able to merge automatically are +All of the changes that Git was able to merge automatically are already added to the index file, so linkgit:git-diff[1] shows only the conflicts. It uses an unusual syntax: @@ -1321,7 +1339,7 @@ that part is not conflicting and is not shown. Same for stage 3). The diff above shows the differences between the working-tree version of file.txt and the stage 2 and stage 3 versions. So instead of preceding -each line by a single "+" or "-", it now uses two columns: the first +each line by a single `+` or `-`, it now uses two columns: the first column is used for differences between the first parent and the working directory copy, and the second for differences between the second parent and the working directory copy. (See the "COMBINED DIFF FORMAT" section @@ -1413,7 +1431,7 @@ parents, one pointing at each of the two lines of development that were merged. However, if the current branch is a descendant of the other--so every -commit present in the one is already contained in the other--then git +commit present in the one is already contained in the other--then Git just performs a "fast-forward"; the head of the current branch is moved forward to point at the head of the merged-in branch, without any new commits being created. @@ -1439,7 +1457,7 @@ fundamentally different ways to fix the problem: 2. You can go back and modify the old commit. You should never do this if you have already made the history public; - git does not normally expect the "history" of a project to + Git does not normally expect the "history" of a project to change, and cannot correctly perform repeated merges from a branch that has had its history changed. @@ -1464,7 +1482,7 @@ You can also revert an earlier change, for example, the next-to-last: $ git revert HEAD^ ------------------------------------------------- -In this case git will attempt to undo the old change while leaving +In this case Git will attempt to undo the old change while leaving intact any changes made since then. If more recent changes overlap with the changes to be reverted, then you will be asked to fix conflicts manually, just as in the case of <<resolving-a-merge, @@ -1561,18 +1579,12 @@ $ git stash pop Ensuring good performance ------------------------- -On large repositories, git depends on compression to keep the history -information from taking up too much space on disk or in memory. - -This compression is not performed automatically. Therefore you -should occasionally run linkgit:git-gc[1]: - -------------------------------------------------- -$ git gc -------------------------------------------------- - -to recompress the archive. This can be very time-consuming, so -you may prefer to run `git gc` when you are not doing other work. +On large repositories, Git depends on compression to keep the history +information from taking up too much space on disk or in memory. Some +Git commands may automatically run linkgit:git-gc[1], so you don't +have to worry about running it manually. However, compressing a large +repository may take a while, so you may want to call `gc` explicitly +to avoid automatic compression kicking in when it is not convenient. [[ensuring-reliability]] @@ -1602,7 +1614,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". +your branches, and can (and will) be removed after a while with `gc`. You can run `git fsck --no-dangling` to suppress these messages, and still view real errors. @@ -1614,11 +1626,11 @@ Recovering lost changes Reflogs ^^^^^^^ -Say you modify a branch with +linkgit:git-reset[1] \--hard+, and then -realize that the branch was the only reference you had to that point in -history. +Say you modify a branch with <<fixing-mistakes,`git reset --hard`>>, +and then realize that the branch was the only reference you had to +that point in history. -Fortunately, git also keeps a log, called a "reflog", of all the +Fortunately, Git also keeps a log, called a "reflog", of all the previous values of each branch. So in this case you can still find the old history using, for example, @@ -1627,8 +1639,8 @@ $ git log master@{1} ------------------------------------------------- This lists the commits reachable from the previous version of the -"master" branch head. This syntax can be used with any git command -that accepts a commit, not just with git log. Some other examples: +`master` branch head. This syntax can be used with any Git command +that accepts a commit, not just with `git log`. Some other examples: ------------------------------------------------- $ git show master@{2} # See where the branch pointed 2, @@ -1653,7 +1665,7 @@ pruned. See linkgit:git-reflog[1] and linkgit:git-gc[1] to learn how to control this pruning, and see the "SPECIFYING REVISIONS" section of linkgit:gitrevisions[7] for details. -Note that the reflog history is very different from normal git history. +Note that the reflog history is very different from normal Git history. While normal history is shared by every repository that works on the same project, the reflog history is not shared: it tells you only about how the branches in your local repository have changed over time. @@ -1732,8 +1744,8 @@ one step: $ git pull origin master ------------------------------------------------- -In fact, if you have "master" checked out, then this branch has been -configured by "git clone" to get changes from the HEAD branch of the +In fact, if you have `master` checked out, then this branch has been +configured by `git clone` to get changes from the HEAD branch of the origin repository. So often you can accomplish the above with just a simple @@ -1748,11 +1760,11 @@ the current branch. More generally, a branch that is created from a remote-tracking branch will pull by default from that branch. See the descriptions of the -branch.<name>.remote and branch.<name>.merge options in +`branch.<name>.remote` and `branch.<name>.merge` options in linkgit:git-config[1], and the discussion of the `--track` option in linkgit:git-checkout[1], to learn how to control these defaults. -In addition to saving you keystrokes, "git pull" also helps you by +In addition to saving you keystrokes, `git pull` also helps you by producing a default commit message documenting the branch and repository that you pulled from. @@ -1760,7 +1772,7 @@ repository that you pulled from. <<fast-forwards,fast-forward>>; instead, your branch will just be updated to point to the latest commit from the upstream branch.) -The `git pull` command can also be given "." as the "remote" repository, +The `git pull` command can also be given `.` as the "remote" repository, in which case it just merges in a branch from the current repository; so the commands @@ -1785,7 +1797,7 @@ $ git format-patch origin ------------------------------------------------- will produce a numbered series of files in the current directory, one -for each patch in the current branch but not in origin/HEAD. +for each patch in the current branch but not in `origin/HEAD`. `git format-patch` can include an initial "cover letter". You can insert commentary on individual patches after the three dash line which @@ -1807,7 +1819,7 @@ Importing patches to a project Git also provides a tool called linkgit:git-am[1] (am stands for "apply mailbox"), for importing such an emailed series of patches. Just save all of the patch-containing messages, in order, into a -single mailbox file, say "patches.mbox", then run +single mailbox file, say `patches.mbox`, then run ------------------------------------------------- $ git am -3 patches.mbox @@ -1815,8 +1827,8 @@ $ git am -3 patches.mbox Git will apply each patch in order; if any conflicts are found, it will stop, and you can fix the conflicts as described in -"<<resolving-a-merge,Resolving a merge>>". (The "-3" option tells -git to perform a merge; if you would prefer it just to abort and +"<<resolving-a-merge,Resolving a merge>>". (The `-3` option tells +Git to perform a merge; if you would prefer it just to abort and leave your tree and index untouched, you may omit that option.) Once the index is updated with the results of the conflict @@ -1826,7 +1838,7 @@ resolution, instead of creating a new commit, just run $ git am --resolved ------------------------------------------------- -and git will create the commit for you and continue applying the +and Git will create the commit for you and continue applying the remaining patches from the mailbox. The final result will be a series of commits, one for each patch in @@ -1834,7 +1846,7 @@ the original mailbox, with authorship and commit log message each taken from the message containing each patch. [[public-repositories]] -Public git repositories +Public Git repositories ----------------------- Another way to submit changes to a project is to tell the maintainer @@ -1891,7 +1903,7 @@ We explain how to do this in the following sections. Setting up a public repository ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Assume your personal repository is in the directory ~/proj. We +Assume your personal repository is in the directory `~/proj`. We first create a new clone of the repository and tell `git daemon` that it is meant to be public: @@ -1901,28 +1913,28 @@ $ touch proj.git/git-daemon-export-ok ------------------------------------------------- The resulting directory proj.git contains a "bare" git repository--it is -just the contents of the ".git" directory, without any files checked out +just the contents of the `.git` directory, without any files checked out around it. -Next, copy proj.git to the server where you plan to host the +Next, copy `proj.git` to the server where you plan to host the public repository. You can use scp, rsync, or whatever is most convenient. [[exporting-via-git]] -Exporting a git repository via the git protocol +Exporting a Git repository via the Git protocol ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ This is the preferred method. If someone else administers the server, they should tell you what -directory to put the repository in, and what git:// URL it will appear -at. You can then skip to the section +directory to put the repository in, and what `git://` URL it will +appear at. You can then skip to the section "<<pushing-changes-to-a-public-repository,Pushing changes to a public repository>>", below. Otherwise, all you need to do is start linkgit:git-daemon[1]; it will listen on port 9418. By default, it will allow access to any directory -that looks like a git directory and contains the magic file +that looks like a Git directory and contains the magic file git-daemon-export-ok. Passing some directory paths as `git daemon` arguments will further restrict the exports to those paths. @@ -1931,13 +1943,13 @@ linkgit:git-daemon[1] man page for details. (See especially the examples section.) [[exporting-via-http]] -Exporting a git repository via http +Exporting a git repository via HTTP ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -The git protocol gives better performance and reliability, but on a -host with a web server set up, http exports may be simpler to set up. +The Git protocol gives better performance and reliability, but on a +host with a web server set up, HTTP exports may be simpler to set up. -All you need to do is place the newly created bare git repository in +All you need to do is place the newly created bare Git repository in a directory that is exported by the web server, and make some adjustments to give web clients some extra information they need: @@ -1951,7 +1963,7 @@ $ mv hooks/post-update.sample hooks/post-update (For an explanation of the last two lines, see linkgit:git-update-server-info[1] and linkgit:githooks[5].) -Advertise the URL of proj.git. Anybody else should then be able to +Advertise the URL of `proj.git`. Anybody else should then be able to clone or pull from that URL, for example with a command line like: ------------------------------------------------- @@ -1961,7 +1973,7 @@ $ git clone http://yourserver.com/~you/proj.git (See also link:howto/setup-git-server-over-http.txt[setup-git-server-over-http] for a slightly more sophisticated setup using WebDAV which also -allows pushing over http.) +allows pushing over HTTP.) [[pushing-changes-to-a-public-repository]] Pushing changes to a public repository @@ -1974,8 +1986,8 @@ access, which you will need to update the public repository with the latest changes created in your private repository. The simplest way to do this is using linkgit:git-push[1] and ssh; to -update the remote branch named "master" with the latest state of your -branch named "master", run +update the remote branch named `master` with the latest state of your +branch named `master`, run ------------------------------------------------- $ git push ssh://yourserver.com/~you/proj.git master:master @@ -1991,31 +2003,37 @@ As with `git fetch`, `git push` will complain if this does not result in a <<fast-forwards,fast-forward>>; see the following section for details on handling this case. -Note that the target of a "push" is normally a +Note that the target of a `push` is normally a <<def_bare_repository,bare>> repository. You can also push to a -repository that has a checked-out working tree, but the working tree -will not be updated by the push. This may lead to unexpected results if -the branch you push to is the currently checked-out branch! +repository that has a checked-out working tree, but a push to update the +currently checked-out branch is denied by default to prevent confusion. +See the description of the receive.denyCurrentBranch option +in linkgit:git-config[1] for details. As with `git fetch`, you may also set up configuration options to -save typing; so, for example, after +save typing; so, for example: + +------------------------------------------------- +$ git remote add public-repo ssh://yourserver.com/~you/proj.git +------------------------------------------------- + +adds the following to `.git/config`: ------------------------------------------------- -$ cat >>.git/config <<EOF [remote "public-repo"] - url = ssh://yourserver.com/~you/proj.git -EOF + url = yourserver.com:proj.git + fetch = +refs/heads/*:refs/remotes/example/* ------------------------------------------------- -you should be able to perform the above push with just +which lets you do the same push with just ------------------------------------------------- $ git push public-repo master ------------------------------------------------- -See the explanations of the remote.<name>.url, branch.<name>.remote, -and remote.<name>.push options in linkgit:git-config[1] for -details. +See the explanations of the `remote.<name>.url`, +`branch.<name>.remote`, and `remote.<name>.push` options in +linkgit:git-config[1] for details. [[forcing-push]] What to do when a push fails @@ -2046,6 +2064,13 @@ branch name with a plus sign: $ git push ssh://yourserver.com/~you/proj.git +master ------------------------------------------------- +Note the addition of the `+` sign. Alternatively, you can use the +`-f` flag to force the remote update, as in: + +------------------------------------------------- +$ git push -f ssh://yourserver.com/~you/proj.git master +------------------------------------------------- + Normally whenever a branch head in a public repository is modified, it is modified to point to a descendant of the commit that it pointed to before. By forcing a push in this situation, you break that convention. @@ -2073,9 +2098,9 @@ all push to and pull from a single shared repository. See linkgit:gitcvs-migration[7] for instructions on how to set this up. -However, while there is nothing wrong with git's support for shared +However, while there is nothing wrong with Git's support for shared repositories, this mode of operation is not generally recommended, -simply because the mode of collaboration that git supports--by +simply because the mode of collaboration that Git supports--by exchanging patches and pulling from public repositories--has so many advantages over the central shared repository: @@ -2099,8 +2124,8 @@ Allowing web browsing of a repository ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The gitweb cgi script provides users an easy way to browse your -project's files and history without having to install git; see the file -gitweb/INSTALL in the git source tree for instructions on setting it up. +project's files and history without having to install Git; see the file +gitweb/INSTALL in the Git source tree for instructions on setting it up. [[sharing-development-examples]] Examples @@ -2110,7 +2135,7 @@ Examples Maintaining topic branches for a Linux subsystem maintainer ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -This describes how Tony Luck uses git in his role as maintainer of the +This describes how Tony Luck uses Git in his role as maintainer of the IA64 architecture for the Linux kernel. He uses two public branches: @@ -2143,7 +2168,7 @@ linkgit:git-fetch[1] to keep them up-to-date; see Now create the branches in which you are going to work; these start out at the current tip of origin/master branch, and should be set up (using -the --track option to linkgit:git-branch[1]) to merge changes in from +the `--track` option to linkgit:git-branch[1]) to merge changes in from Linus by default. ------------------------------------------------- @@ -2160,9 +2185,9 @@ $ git checkout release && git pull Important note! If you have any local changes in these branches, then this merge will create a commit object in the history (with no local -changes git will simply do a "fast-forward" merge). Many people dislike +changes Git will simply do a "fast-forward" merge). Many people dislike the "noise" that this creates in the Linux history, so you should avoid -doing this capriciously in the "release" branch, as these noisy commits +doing this capriciously in the `release` branch, as these noisy commits will become part of the permanent history when you ask Linus to pull from the release branch. @@ -2204,7 +2229,7 @@ patches), and create a new branch from a recent stable tag of Linus's branch. Picking a stable base for your branch will: 1) help you: by avoiding inclusion of unrelated and perhaps lightly tested changes -2) help future bug hunters that use "git bisect" to find problems +2) help future bug hunters that use `git bisect` to find problems ------------------------------------------------- $ git checkout -b speed-up-spinlocks v2.6.35 @@ -2229,9 +2254,9 @@ It is unlikely that you would have any conflicts here ... but you might if you spent a while on this step and had also pulled new versions from upstream. Some time later when enough time has passed and testing done, you can pull the -same branch into the "release" tree ready to go upstream. This is where you +same branch into the `release` tree ready to go upstream. This is where you see the value of keeping each patch (or patch series) in its own branch. It -means that the patches can be moved into the "release" tree in any order. +means that the patches can be moved into the `release` tree in any order. ------------------------------------------------- $ git checkout release && git pull . speed-up-spinlocks @@ -2264,7 +2289,7 @@ If it has been merged, then there will be no output.) Once a patch completes the great cycle (moving from test to release, then pulled by Linus, and finally coming back into your local -"origin/master" branch), the branch for this change is no longer needed. +`origin/master` branch), the branch for this change is no longer needed. You detect this when the output from: ------------------------------------------------- @@ -2279,27 +2304,23 @@ $ git branch -d branchname Some changes are so trivial that it is not necessary to create a separate branch and then merge into each of the test and release branches. For -these changes, just apply directly to the "release" branch, and then -merge that into the "test" branch. - -To create diffstat and shortlog summaries of changes to include in a "please -pull" request to Linus you can use: - -------------------------------------------------- -$ git diff --stat origin..release -------------------------------------------------- +these changes, just apply directly to the `release` branch, and then +merge that into the `test` branch. -and +After pushing your work to `mytree`, you can use +linkgit:git-request-pull[1] to prepare a "please pull" request message +to send to Linus: ------------------------------------------------- -$ git log -p origin..release | git shortlog +$ git push mytree +$ git request-pull origin mytree release ------------------------------------------------- Here are some of the scripts that simplify all this even further. ------------------------------------------------- ==== update script ==== -# Update a branch in my GIT tree. If the branch to be updated +# Update a branch in my Git tree. If the branch to be updated # is origin, then pull from kernel.org. Otherwise merge # origin/master branch into test|release branch @@ -2317,7 +2338,7 @@ origin) fi ;; *) - echo "Usage: $0 origin|test|release" 1>&2 + echo "usage: $0 origin|test|release" 1>&2 exit 1 ;; esac @@ -2331,7 +2352,7 @@ pname=$0 usage() { - echo "Usage: $pname branch test|release" 1>&2 + echo "usage: $pname branch test|release" 1>&2 exit 1 } @@ -2357,7 +2378,7 @@ esac ------------------------------------------------- ==== status script ==== -# report on status of my ia64 GIT tree +# report on status of my ia64 Git tree gb=$(tput setab 2) rb=$(tput setab 1) @@ -2413,7 +2434,7 @@ Rewriting history and maintaining patch series Normally commits are only added to a project, never taken away or replaced. Git is designed with this assumption, and violating it will -cause git's merge machinery (for example) to do the wrong thing. +cause Git's merge machinery (for example) to do the wrong thing. However, there is a situation in which it can be useful to violate this assumption. @@ -2455,8 +2476,8 @@ you are rewriting history. Keeping a patch series up to date using git rebase -------------------------------------------------- -Suppose that you create a branch "mywork" on a remote-tracking branch -"origin", and create some commits on top of it: +Suppose that you create a branch `mywork` on a remote-tracking branch +`origin`, and create some commits on top of it: ------------------------------------------------- $ git checkout -b mywork origin @@ -2468,7 +2489,7 @@ $ git commit ------------------------------------------------- You have performed no merges into mywork, so it is just a simple linear -sequence of patches on top of "origin": +sequence of patches on top of `origin`: ................................................ o--o--O <-- origin @@ -2477,7 +2498,7 @@ sequence of patches on top of "origin": ................................................ Some more interesting work has been done in the upstream project, and -"origin" has advanced: +`origin` has advanced: ................................................ o--o--O--o--o--o <-- origin @@ -2485,7 +2506,7 @@ Some more interesting work has been done in the upstream project, and a--b--c <-- mywork ................................................ -At this point, you could use "pull" to merge your changes back in; +At this point, you could use `pull` to merge your changes back in; the result would create a new merge commit, like this: ................................................ @@ -2504,7 +2525,7 @@ $ git rebase origin ------------------------------------------------- This will remove each of your commits from mywork, temporarily saving -them as patches (in a directory named ".git/rebase-apply"), update mywork to +them as patches (in a directory named `.git/rebase-apply`), update mywork to point at the latest version of origin, then apply each of the saved patches to the new mywork. The result will look like: @@ -2524,7 +2545,7 @@ running `git commit`, just run $ git rebase --continue ------------------------------------------------- -and git will continue applying the rest of the patches. +and Git will continue applying the rest of the patches. At any point you may use the `--abort` option to abort this process and return mywork to the state it had before you started the rebase: @@ -2533,6 +2554,12 @@ return mywork to the state it had before you started the rebase: $ git rebase --abort ------------------------------------------------- +If you need to reorder or edit a number of commits in a branch, it may +be easier to use `git rebase -i`, which allows you to reorder and +squash commits, as well as marking them for individual editing during +the rebase. See <<interactive-rebase>> for details, and +<<reordering-patch-series>> for alternatives. + [[rewriting-one-commit]] Rewriting a single commit ------------------------- @@ -2546,72 +2573,89 @@ $ git commit --amend which will replace the old commit by a new commit incorporating your changes, giving you a chance to edit the old commit message first. +This is useful for fixing typos in your last commit, or for adjusting +the patch contents of a poorly staged commit. -You can also use a combination of this and linkgit:git-rebase[1] to -replace a commit further back in your history and recreate the -intervening changes on top of it. First, tag the problematic commit -with - -------------------------------------------------- -$ git tag bad mywork~5 -------------------------------------------------- +If you need to amend commits from deeper in your history, you can +use <<interactive-rebase,interactive rebase's `edit` instruction>>. -(Either gitk or `git log` may be useful for finding the commit.) +[[reordering-patch-series]] +Reordering or selecting from a patch series +------------------------------------------- -Then check out that commit, edit it, and rebase the rest of the series -on top of it (note that we could check out the commit on a temporary -branch, but instead we're using a <<detached-head,detached head>>): +Sometimes you want to edit a commit deeper in your history. One +approach is to use `git format-patch` to create a series of patches +and then reset the state to before the patches: ------------------------------------------------- -$ git checkout bad -$ # make changes here and update the index -$ git commit --amend -$ git rebase --onto HEAD bad mywork +$ git format-patch origin +$ git reset --hard origin ------------------------------------------------- -When you're done, you'll be left with mywork checked out, with the top -patches on mywork reapplied on top of your modified commit. You can -then clean up with +Then modify, reorder, or eliminate patches as needed before applying +them again with linkgit:git-am[1]: ------------------------------------------------- -$ git tag -d bad +$ git am *.patch ------------------------------------------------- -Note that the immutable nature of git history means that you haven't really -"modified" existing commits; instead, you have replaced the old commits with -new commits having new object names. +[[interactive-rebase]] +Using interactive rebases +------------------------- -[[reordering-patch-series]] -Reordering or selecting from a patch series -------------------------------------------- +You can also edit a patch series with an interactive rebase. This is +the same as <<reordering-patch-series,reordering a patch series using +`format-patch`>>, so use whichever interface you like best. -Given one existing commit, the linkgit:git-cherry-pick[1] command -allows you to apply the change introduced by that commit and create a -new commit that records it. So, for example, if "mywork" points to a -series of patches on top of "origin", you might do something like: +Rebase your current HEAD on the last commit you want to retain as-is. +For example, if you want to reorder the last 5 commits, use: ------------------------------------------------- -$ git checkout -b mywork-new origin -$ gitk origin..mywork & +$ git rebase -i HEAD~5 ------------------------------------------------- -and browse through the list of patches in the mywork branch using gitk, -applying them (possibly in a different order) to mywork-new using -cherry-pick, and possibly modifying them as you go using `git commit --amend`. -The linkgit:git-gui[1] command may also help as it allows you to -individually select diff hunks for inclusion in the index (by -right-clicking on the diff hunk and choosing "Stage Hunk for Commit"). - -Another technique is to use `git format-patch` to create a series of -patches, then reset the state to before the patches: +This will open your editor with a list of steps to be taken to perform +your rebase. ------------------------------------------------- -$ git format-patch origin -$ git reset --hard origin -------------------------------------------------- +pick deadbee The oneline of this commit +pick fa1afe1 The oneline of the next commit +... -Then modify, reorder, or eliminate patches as preferred before applying -them again with linkgit:git-am[1]. +# Rebase c0ffeee..deadbee onto c0ffeee +# +# Commands: +# p, pick = use commit +# r, reword = use commit, but edit the commit message +# e, edit = use commit, but stop for amending +# s, squash = use commit, but meld into previous commit +# f, fixup = like "squash", but discard this commit's log message +# x, exec = run command (the rest of the line) using shell +# +# These lines can be re-ordered; they are executed from top to bottom. +# +# If you remove a line here THAT COMMIT WILL BE LOST. +# +# However, if you remove everything, the rebase will be aborted. +# +# Note that empty commits are commented out +------------------------------------------------- + +As explained in the comments, you can reorder commits, squash them +together, edit commit messages, etc. by editing the list. Once you +are satisfied, save the list and close your editor, and the rebase +will begin. + +The rebase will stop where `pick` has been replaced with `edit` or +when a step in the list fails to mechanically resolve conflicts and +needs your help. When you are done editing and/or resolving conflicts +you can continue with `git rebase --continue`. If you decide that +things are getting too hairy, you can always bail out with `git rebase +--abort`. Even after the rebase is complete, you can still recover +the original branch by using the <<reflogs,reflog>>. + +For a more detailed discussion of the procedure and additional tips, +see the "INTERACTIVE MODE" section of linkgit:git-rebase[1]. [[patch-series-tools]] Other tools @@ -2658,7 +2702,7 @@ Git has no way of knowing that the new head is an updated version of the old head; it treats this situation exactly the same as it would if two developers had independently done the work on the old and new heads in parallel. At this point, if someone attempts to merge the new head -in to their branch, git will attempt to merge together the two (old and +in to their branch, Git will attempt to merge together the two (old and new) lines of development, instead of trying to replace the old by the new. The results are likely to be unexpected. @@ -2731,7 +2775,7 @@ linear history: Bisecting between Z and D* would hit a single culprit commit Y*, and understanding why Y* was broken would probably be easier. -Partly for this reason, many experienced git users, even when +Partly for this reason, many experienced Git users, even when working on an otherwise merge-heavy project, keep the history linear by rebasing against the latest upstream version before publishing. @@ -2752,10 +2796,10 @@ arbitrary name: $ git fetch origin todo:my-todo-work ------------------------------------------------- -The first argument, "origin", just tells git to fetch from the -repository you originally cloned from. The second argument tells git -to fetch the branch named "todo" from the remote repository, and to -store it locally under the name refs/heads/my-todo-work. +The first argument, `origin`, just tells Git to fetch from the +repository you originally cloned from. The second argument tells Git +to fetch the branch named `todo` from the remote repository, and to +store it locally under the name `refs/heads/my-todo-work`. You can also fetch branches from other repositories; so @@ -2763,8 +2807,8 @@ You can also fetch branches from other repositories; so $ git fetch git://example.com/proj.git master:example-master ------------------------------------------------- -will create a new branch named "example-master" and store in it the -branch named "master" from the repository at the given URL. If you +will create a new branch named `example-master` and store in it the +branch named `master` from the repository at the given URL. If you already have a branch named example-master, it will attempt to <<fast-forwards,fast-forward>> to the commit given by example.com's master branch. In more detail: @@ -2773,7 +2817,7 @@ master branch. In more detail: git fetch and fast-forwards --------------------------- -In the previous example, when updating an existing branch, "git fetch" +In the previous example, when updating an existing branch, `git fetch` checks to make sure that the most recent commit on the remote branch is a descendant of the most recent commit on your copy of the branch before updating your copy of the branch to point at the new @@ -2799,11 +2843,11 @@ resulting in a situation like: o--o--o <-- new head of the branch ................................................ -In this case, "git fetch" will fail, and print out a warning. +In this case, `git fetch` will fail, and print out a warning. -In that case, you can still force git to update to the new head, as +In that case, you can still force Git to update to the new head, as described in the following section. However, note that in the -situation above this may mean losing the commits labeled "a" and "b", +situation above this may mean losing the commits labeled `a` and `b`, unless you've already created a reference of your own pointing to them. @@ -2818,7 +2862,7 @@ descendant of the old head, you may force the update with: $ git fetch git://example.com/proj.git +master:refs/remotes/example/master ------------------------------------------------- -Note the addition of the "+" sign. Alternatively, you can use the "-f" +Note the addition of the `+` sign. Alternatively, you can use the `-f` flag to force updates of all the fetched branches, as in: ------------------------------------------------- @@ -2832,9 +2876,9 @@ may be lost, as we saw in the previous section. Configuring remote-tracking branches ------------------------------------ -We saw above that "origin" is just a shortcut to refer to the +We saw above that `origin` is just a shortcut to refer to the repository that you originally cloned from. This information is -stored in git configuration variables, which you can see using +stored in Git configuration variables, which you can see using linkgit:git-config[1]: ------------------------------------------------- @@ -2850,48 +2894,34 @@ branch.master.merge=refs/heads/master If there are other repositories that you also use frequently, you can create similar configuration options to save typing; for example, -after ------------------------------------------------- -$ git config remote.example.url git://example.com/proj.git +$ git remote add example git://example.com/proj.git ------------------------------------------------- -then the following two commands will do the same thing: +adds the following to `.git/config`: ------------------------------------------------- -$ git fetch git://example.com/proj.git master:refs/remotes/example/master -$ git fetch example master:refs/remotes/example/master +[remote "example"] + url = git://example.com/proj.git + fetch = +refs/heads/*:refs/remotes/example/* ------------------------------------------------- -Even better, if you add one more option: +Also note that the above configuration can be performed by directly +editing the file `.git/config` instead of using linkgit:git-remote[1]. -------------------------------------------------- -$ git config remote.example.fetch master:refs/remotes/example/master -------------------------------------------------- - -then the following commands will all do the same thing: +After configuring the remote, the following three commands will do the +same thing: ------------------------------------------------- -$ git fetch git://example.com/proj.git master:refs/remotes/example/master -$ git fetch example master:refs/remotes/example/master +$ git fetch git://example.com/proj.git +refs/heads/*:refs/remotes/example/* +$ git fetch example +refs/heads/*:refs/remotes/example/* $ git fetch example ------------------------------------------------- -You can also add a "+" to force the update each time: - -------------------------------------------------- -$ git config remote.example.fetch +master:refs/remotes/example/master -------------------------------------------------- - -Don't do this unless you're sure you won't mind "git fetch" possibly -throwing away commits on 'example/master'. - -Also note that all of the above configuration can be performed by -directly editing the file .git/config instead of using -linkgit:git-config[1]. - See linkgit:git-config[1] for more details on the configuration -options mentioned above. +options mentioned above and linkgit:git-fetch[1] for more details on +the refspec syntax. [[git-concepts]] @@ -2900,7 +2930,7 @@ Git concepts Git is built on a small number of simple but powerful ideas. While it is possible to get things done without understanding them, you will find -git much more intuitive if you do. +Git much more intuitive if you do. We start with the most important, the <<def_object_database,object database>> and the <<def_index,index>>. @@ -2955,7 +2985,7 @@ Commit Object ~~~~~~~~~~~~~ The "commit" object links a physical state of a tree with a description -of how we got there and why. Use the --pretty=raw option to +of how we got there and why. Use the `--pretty=raw` option to linkgit:git-show[1] or linkgit:git-log[1] to examine your favorite commit: @@ -2994,10 +3024,10 @@ As you can see, a commit is defined by: Note that a commit does not itself contain any information about what actually changed; all changes are calculated by comparing the contents of the tree referred to by this commit with the trees associated with -its parents. In particular, git does not attempt to record file renames +its parents. In particular, Git does not attempt to record file renames explicitly, though it can identify cases where the existence of the same file data at changing paths suggests a rename. (See, for example, the --M option to linkgit:git-diff[1]). +`-M` option to linkgit:git-diff[1]). A commit is usually created by linkgit:git-commit[1], which creates a commit whose parent is normally the current HEAD, and whose tree is @@ -3033,14 +3063,14 @@ another tree, representing the contents of a subdirectory. Since trees and blobs, like all other objects, are named by the SHA-1 hash of their contents, two trees have the same SHA-1 name if and only if their contents (including, recursively, the contents of all subdirectories) -are identical. This allows git to quickly determine the differences +are identical. This allows Git to quickly determine the differences between two related tree objects, since it can ignore any entries with identical object names. (Note: in the presence of submodules, trees may also have commits as entries. See <<submodules>> for documentation.) -Note that the files all have mode 644 or 755: git actually only pays +Note that the files all have mode 644 or 755: Git actually only pays attention to the executable bit. [[blob-object]] @@ -3048,7 +3078,7 @@ Blob Object ~~~~~~~~~~~ You can use linkgit:git-show[1] to examine the contents of a blob; take, -for example, the blob in the entry for "COPYING" from the tree above: +for example, the blob in the entry for `COPYING` from the tree above: ------------------------------------------------ $ git show 6ff87c4664 @@ -3101,7 +3131,7 @@ sending out a single email that tells the people the name (SHA-1 hash) of the top commit, and digitally sign that email using something like GPG/PGP. -To assist in this, git also provides the tag object... +To assist in this, Git also provides the tag object... [[tag-object]] Tag Object @@ -3131,14 +3161,14 @@ nLE/L9aUXdWeTFPron96DLA= See the linkgit:git-tag[1] command to learn how to create and verify tag objects. (Note that linkgit:git-tag[1] can also be used to create "lightweight tags", which are not tag objects at all, but just simple -references whose names begin with "refs/tags/"). +references whose names begin with `refs/tags/`). [[pack-files]] -How git stores objects efficiently: pack files +How Git stores objects efficiently: pack files ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Newly created objects are initially created in a file named after the -object's SHA-1 hash (stored in .git/objects). +object's SHA-1 hash (stored in `.git/objects`). Unfortunately this system becomes inefficient once a project has a lot of objects. Try this on an old project: @@ -3152,7 +3182,7 @@ The first number is the number of objects which are kept in individual files. The second is the amount of space taken up by those "loose" objects. -You can save space and make git faster by moving these loose objects in +You can save space and make Git faster by moving these loose objects in to a "pack file", which stores a group of objects in an efficient compressed format; the details of how pack files are formatted can be found in link:technical/pack-format.txt[technical/pack-format.txt]. @@ -3179,9 +3209,9 @@ $ git prune to remove any of the "loose" objects that are now contained in the pack. This will also remove any unreferenced objects (which may be -created when, for example, you use "git reset" to remove a commit). +created when, for example, you use `git reset` to remove a commit). You can verify that the loose objects are gone by looking at the -.git/objects directory or by running +`.git/objects` directory or by running ------------------------------------------------ $ git count-objects @@ -3208,7 +3238,7 @@ branch still exists, as does everything it pointed to. The branch pointer itself just doesn't, since you replaced it with another one. There are also other situations that cause dangling objects. For -example, a "dangling blob" may arise because you did a "git add" of a +example, a "dangling blob" may arise because you did a `git add` of a file, but then, before you actually committed it and made it part of the bigger picture, you changed something else in that file and committed that *updated* thing--the old state that you added originally ends up @@ -3251,14 +3281,14 @@ $ git show <dangling-blob/tree-sha-goes-here> ------------------------------------------------ to show what the contents of the blob were (or, for a tree, basically -what the "ls" for that directory was), and that may give you some idea +what the `ls` for that directory was), and that may give you some idea of what the operation was that left that dangling object. Usually, dangling blobs and trees aren't very interesting. They're almost always the result of either being a half-way mergebase (the blob will often even have the conflict markers from a merge in it, if you have had conflicting merges that you fixed up by hand), or simply -because you interrupted a "git fetch" with ^C or something like that, +because you interrupted a `git fetch` with ^C or something like that, leaving _some_ of the new objects in the object database, but just dangling and useless. @@ -3269,28 +3299,28 @@ state, you can just prune all unreachable objects: $ git prune ------------------------------------------------ -and they'll be gone. But you should only run "git prune" on a quiescent +and they'll be gone. But you should only run `git prune` on a quiescent repository--it's kind of like doing a filesystem fsck recovery: you don't want to do that while the filesystem is mounted. -(The same is true of "git fsck" itself, btw, but since +(The same is true of `git fsck` itself, btw, but since `git fsck` never actually *changes* the repository, it just reports on what it found, `git fsck` itself is never 'dangerous' to run. Running it while somebody is actually changing the repository can cause confusing and scary messages, but it won't actually do anything bad. In -contrast, running "git prune" while somebody is actively changing the +contrast, running `git prune` while somebody is actively changing the repository is a *BAD* idea). [[recovering-from-repository-corruption]] Recovering from repository corruption ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -By design, git treats data trusted to it with caution. However, even in -the absence of bugs in git itself, it is still possible that hardware or +By design, Git treats data trusted to it with caution. However, even in +the absence of bugs in Git itself, it is still possible that hardware or operating system errors could corrupt data. The first defense against such problems is backups. You can back up a -git directory using clone, or just using cp, tar, or any other backup +Git directory using clone, or just using cp, tar, or any other backup mechanism. As a last resort, you can search for the corrupted objects and attempt @@ -3316,7 +3346,7 @@ missing blob 4b9458b3786228369c63936db65827de3cc06200 Now you know that blob 4b9458b3 is missing, and that the tree 2d9263c6 points to it. If you could find just one copy of that missing blob object, possibly in some other repository, you could move it into -.git/objects/4b/9458b3... and be done. Suppose you can't. You can +`.git/objects/4b/9458b3...` and be done. Suppose you can't. You can still examine the tree that pointed to it with linkgit:git-ls-tree[1], which might output something like: @@ -3331,10 +3361,10 @@ $ git ls-tree 2d9263c6d23595e7cb2a21e5ebbb53655278dff8 ------------------------------------------------ So now you know that the missing blob was the data for a file named -"myfile". And chances are you can also identify the directory--let's -say it's in "somedirectory". If you're lucky the missing copy might be +`myfile`. And chances are you can also identify the directory--let's +say it's in `somedirectory`. If you're lucky the missing copy might be the same as the copy you have checked out in your working tree at -"somedirectory/myfile"; you can test whether that's right with +`somedirectory/myfile`; you can test whether that's right with linkgit:git-hash-object[1]: ------------------------------------------------ @@ -3389,21 +3419,21 @@ $ git hash-object -w <recreated-file> and your repository is good again! -(Btw, you could have ignored the fsck, and started with doing a +(Btw, you could have ignored the `fsck`, and started with doing a ------------------------------------------------ $ git log --raw --all ------------------------------------------------ and just looked for the sha of the missing object (4b9458b..) in that -whole thing. It's up to you - git does *have* a lot of information, it is +whole thing. It's up to you--Git does *have* a lot of information, it is just missing one particular blob version. [[the-index]] The index ----------- -The index is a binary file (generally kept in .git/index) containing a +The index is a binary file (generally kept in `.git/index`) containing a sorted list of path names, each with permissions and the SHA-1 of a blob object; linkgit:git-ls-files[1] can show you the contents of the index: @@ -3438,7 +3468,7 @@ It does this by storing some additional data for each entry (such as the last modified time). This data is not displayed above, and is not stored in the created tree object, but it can be used to determine quickly which files in the working directory differ from what was -stored in the index, and thus save git from having to read all of the +stored in the index, and thus save Git from having to read all of the data from such files to look for changes. 3. It can efficiently represent information about merge conflicts @@ -3543,7 +3573,7 @@ $ ls -a The `git submodule add <repo> <path>` command does a couple of things: -- It clones the submodule from <repo> to the given <path> under the +- It clones the submodule from `<repo>` to the given `<path>` under the current directory and by default checks out the master branch. - It adds the submodule's clone path to the linkgit:gitmodules[5] file and adds this file to the index, ready to be committed. @@ -3669,13 +3699,13 @@ Did you forget to 'git add'? Unable to checkout '261dfac35cb99d380eb966e102c1197139f7fa24' in submodule path 'a' ------------------------------------------------- -In older git versions it could be easily forgotten to commit new or modified +In older Git versions it could be easily forgotten to commit new or modified files in a submodule, which silently leads to similar problems as not pushing -the submodule changes. Starting with git 1.7.0 both "git status" and "git diff" +the submodule changes. Starting with Git 1.7.0 both `git status` and `git diff` in the superproject show submodules as modified when they contain new or -modified files to protect against accidentally committing such a state. "git -diff" will also add a "-dirty" to the work tree side when generating patch -output or used with the --submodule option: +modified files to protect against accidentally committing such a state. `git +diff` will also add a `-dirty` to the work tree side when generating patch +output or used with the `--submodule` option: ------------------------------------------------- $ git diff @@ -3711,15 +3741,17 @@ module a NOTE: The changes are still visible in the submodule's reflog. -This is not the case if you did not commit your changes. +If you have uncommitted changes in your submodule working tree, `git +submodule update` will not overwrite them. Instead, you get the usual +warning about not being able switch from a dirty branch. [[low-level-operations]] -Low-level git operations +Low-level Git operations ======================== Many of the higher-level commands were originally implemented as shell -scripts using a smaller core of low-level git commands. These can still -be useful when doing unusual things with git, or just as a way to +scripts using a smaller core of low-level Git commands. These can still +be useful when doing unusual things with Git, or just as a way to understand its inner workings. [[object-manipulation]] @@ -3750,7 +3782,7 @@ between the working tree, the index, and the object database. Git provides low-level operations which perform each of these steps individually. -Generally, all "git" operations work on the index file. Some operations +Generally, all Git operations work on the index file. Some operations work *purely* on the index file (showing the current state of the index), but most operations move data between the index file and either the database or the working directory. Thus there are four main @@ -3773,7 +3805,7 @@ but to avoid common mistakes with filename globbing etc, the command will not normally add totally new entries or remove old entries, i.e. it will normally just update existing cache entries. -To tell git that yes, you really do realize that certain files no +To tell Git that yes, you really do realize that certain files no longer exist, or that new files should be added, you should use the `--remove` and `--add` flags respectively. @@ -3849,7 +3881,7 @@ or, if you want to check out all of the index, use `-a`. NOTE! `git checkout-index` normally refuses to overwrite old files, so if you have an old version of the tree already checked out, you will -need to use the "-f" flag ('before' the "-a" flag or the filename) to +need to use the `-f` flag ('before' the `-a` flag or the filename) to 'force' the checkout. @@ -3860,7 +3892,7 @@ from one representation to the other: Tying it all together ~~~~~~~~~~~~~~~~~~~~~ -To commit a tree you have instantiated with "git write-tree", you'd +To commit a tree you have instantiated with `git write-tree`, you'd create a "commit" object that refers to that tree and the history behind it--most notably the "parent" commits that preceded it in history. @@ -3887,7 +3919,7 @@ redirection from a pipe or file, or by just typing it at the tty). `git commit-tree` will return the name of the object that represents that commit, and you should save it away for later use. Normally, -you'd commit a new `HEAD` state, and while git doesn't care where you +you'd commit a new `HEAD` state, and while Git doesn't care where you save the note about that state, in practice we tend to just write the result to the file pointed at by `.git/HEAD`, so that we can always see what the last committed state was. @@ -4044,7 +4076,7 @@ $ git ls-files --unmerged Each line of the `git ls-files --unmerged` output begins with the blob mode bits, blob SHA-1, 'stage number', and the -filename. The 'stage number' is git's way to say which tree it +filename. The 'stage number' is Git's way to say which tree it came from: stage 1 corresponds to the `$orig` tree, stage 2 to the `HEAD` tree, and stage 3 to the `$target` tree. @@ -4056,7 +4088,7 @@ obviously the final outcome is what is in `HEAD`. What the above example shows is that file `hello.c` was changed from `$orig` to `HEAD` and `$orig` to `$target` in a different way. You could resolve this by running your favorite 3-way merge -program, e.g. `diff3`, `merge`, or git's own merge-file, on +program, e.g. `diff3`, `merge`, or Git's own merge-file, on the blob objects from these three stages yourself, like this: ------------------------------------------------ @@ -4068,7 +4100,7 @@ $ git merge-file hello.c~2 hello.c~1 hello.c~3 This would leave the merge result in `hello.c~2` file, along with conflict markers if there are conflicts. After verifying -the merge result makes sense, you can tell git what the final +the merge result makes sense, you can tell Git what the final merge result for this file is by: ------------------------------------------------- @@ -4077,11 +4109,11 @@ $ git update-index hello.c ------------------------------------------------- When a path is in the "unmerged" state, running `git update-index` for -that path tells git to mark the path resolved. +that path tells Git to mark the path resolved. -The above is the description of a git merge at the lowest level, +The above is the description of a Git merge at the lowest level, to help you understand what conceptually happens under the hood. -In practice, nobody, not even git itself, runs `git cat-file` three times +In practice, nobody, not even Git itself, runs `git cat-file` three times for this. There is a `git merge-index` program that extracts the stages to temporary files and calls a "merge" script on it: @@ -4092,11 +4124,11 @@ $ git merge-index git-merge-one-file hello.c and that is what higher level `git merge -s resolve` is implemented with. [[hacking-git]] -Hacking git +Hacking Git =========== -This chapter covers internal details of the git implementation which -probably only git developers need to understand. +This chapter covers internal details of the Git implementation which +probably only Git developers need to understand. [[object-details]] Object storage format @@ -4114,15 +4146,16 @@ about the data in the object. It's worth noting that the SHA-1 hash that is used to name the object is the hash of the original data plus this header, so `sha1sum` 'file' does not match the object name for 'file'. -(Historical note: in the dawn of the age of git the hash +(Historical note: in the dawn of the age of Git the hash was the SHA-1 of the 'compressed' object.) As a result, the general consistency of an object can always be tested independently of the contents or the type of the object: all objects can be validated by verifying that (a) their hashes match the content of the file and (b) the object successfully inflates to a stream of bytes that -forms a sequence of <ascii type without space> {plus} <space> {plus} <ascii decimal -size> {plus} <byte\0> {plus} <binary object data>. +forms a sequence of +`<ascii type without space> + <space> + <ascii decimal size> + +<byte\0> + <binary object data>`. The structured objects can further have their structure and connectivity to other objects verified. This is generally done with @@ -4144,7 +4177,7 @@ A good place to start is with the contents of the initial commit, with: $ git checkout e83c5163 ---------------------------------------------------- -The initial revision lays the foundation for almost everything git has +The initial revision lays the foundation for almost everything Git has today, but is small enough to read in one sitting. Note that terminology has changed since that revision. For example, the @@ -4298,7 +4331,7 @@ Now, for the meat: This is how you read a blob (actually, not only a blob, but any type of object). To know how the function `read_object_with_reference()` actually works, find the source code for it (something like `git grep -read_object_with | grep ":[a-z]"` in the git repository), and read +read_object_with | grep ":[a-z]"` in the Git repository), and read the source. To find out how the result can be used, just read on in `cmd_cat_file()`: @@ -4479,7 +4512,7 @@ $ git bisect bad # if this revision is bad. Making changes -------------- -Make sure git knows who to blame: +Make sure Git knows who to blame: ------------------------------------------------ $ cat >>~/.gitconfig <<\EOF @@ -4529,7 +4562,7 @@ $ git format-patch origin..HEAD # format a patch for each commit $ git am mbox # import patches from the mailbox "mbox" ----------------------------------------------- -Fetch a branch in a different git repository, then merge into the +Fetch a branch in a different Git repository, then merge into the current branch: ----------------------------------------------- @@ -4590,7 +4623,7 @@ The basic requirements: - It must be readable in order, from beginning to end, by someone intelligent with a basic grasp of the UNIX command line, but without - any special knowledge of git. If necessary, any other prerequisites + any special knowledge of Git. If necessary, any other prerequisites should be specifically mentioned as they arise. - Whenever possible, section headings should clearly describe the task they explain how to do, in language that requires no more knowledge @@ -4601,10 +4634,10 @@ Think about how to create a clear chapter dependency graph that will allow people to get to important topics without necessarily reading everything in between. -Scan Documentation/ for other stuff left out; in particular: +Scan `Documentation/` for other stuff left out; in particular: - howto's -- some of technical/? +- some of `technical/`? - hooks - list of commands in linkgit:git[1] diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index e9f7abca91..6722e621d1 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.8.1.GIT +DEF_VER=v1.8.2.GIT LF=' ' @@ -131,8 +131,9 @@ Issues of note: use English. Under autoconf the configure script will do this automatically if it can't find libintl on the system. - - Python version 2.6 or later is needed to use the git-p4 - interface to Perforce. + - Python version 2.4 or later (but not 3.x, which is not + supported by Perforce) is needed to use the git-p4 interface + to Perforce. - Some platform specific issues are dealt with Makefile rules, but depending on your specific installation, you may not @@ -43,6 +43,9 @@ all:: # Define EXPATDIR=/foo/bar if your expat header and library files are in # /foo/bar/include and /foo/bar/lib directories. # +# Define EXPAT_NEEDS_XMLPARSE_H if you have an old version of expat (e.g., +# 1.1 or 1.2) that provides xmlparse.h instead of expat.h. +# # Define NO_GETTEXT if you don't want Git output to be translated. # A translated Git requires GNU libintl or another gettext implementation, # plus libintl-perl at runtime. @@ -98,13 +101,14 @@ all:: # # Define NO_MKSTEMPS if you don't have mkstemps in the C library. # -# Define NO_STRTOK_R if you don't have strtok_r in the C library. -# # Define NO_FNMATCH if you don't have fnmatch in the C library. # # Define NO_FNMATCH_CASEFOLD if your fnmatch function doesn't have the # FNM_CASEFOLD GNU extension. # +# Define USE_WILDMATCH if you want to use Git's wildmatch +# implementation as fnmatch +# # Define NO_GECOS_IN_PWENT if you don't have pw_gecos in struct passwd # in the C library. # @@ -241,11 +245,16 @@ all:: # apostrophes to be ASCII so that cut&pasting examples to the shell # will work. # +# Define PERL_PATH to the path of your Perl binary (usually /usr/bin/perl). +# # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's # MakeMaker (e.g. using ActiveState under Cygwin). # # Define NO_PERL if you do not want Perl scripts or libraries at all. # +# Define PYTHON_PATH to the path of your Python binary (often /usr/bin/python +# but /usr/bin/python2.7 on some platforms). +# # Define NO_PYTHON if you do not want Python scripts or libraries at all. # # Define NO_TCLTK if you do not want Tcl/Tk GUI. @@ -472,9 +481,38 @@ SCRIPT_PERL += git-svn.perl SCRIPT_PYTHON += git-remote-testpy.py SCRIPT_PYTHON += git-p4.py -SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ - $(patsubst %.perl,%,$(SCRIPT_PERL)) \ - $(patsubst %.py,%,$(SCRIPT_PYTHON)) \ +# Generated files for scripts +SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH)) +SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL)) +SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON)) + +# Individual rules to allow e.g. +# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script" +# from subdirectories like contrib/*/ +.PHONY: build-perl-script build-sh-script build-python-script +build-perl-script: $(SCRIPT_PERL_GEN) +build-sh-script: $(SCRIPT_SH_GEN) +build-python-script: $(SCRIPT_PYTHON_GEN) + +.PHONY: install-perl-script install-sh-script install-python-script +install-sh-script: $(SCRIPT_SH_GEN) + $(INSTALL) $(SCRIPT_SH_GEN) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +install-perl-script: $(SCRIPT_PERL_GEN) + $(INSTALL) $(SCRIPT_PERL_GEN) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' +install-python-script: $(SCRIPT_PYTHON_GEN) + $(INSTALL) $(SCRIPT_PYTHON_GEN) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)' + +.PHONY: clean-perl-script clean-sh-script clean-python-script +clean-sh-script: + $(RM) $(SCRIPT_SH_GEN) +clean-perl-script: + $(RM) $(SCRIPT_PERL_GEN) +clean-python-script: + $(RM) $(SCRIPT_PYTHON_GEN) + +SCRIPTS = $(SCRIPT_SH_GEN) \ + $(SCRIPT_PERL_GEN) \ + $(SCRIPT_PYTHON_GEN) \ git-instaweb ETAGS_TARGET = TAGS @@ -579,22 +617,6 @@ LIB_FILE = libgit.a XDIFF_LIB = xdiff/lib.a VCSSVN_LIB = vcs-svn/lib.a -LIB_H += xdiff/xinclude.h -LIB_H += xdiff/xmacros.h -LIB_H += xdiff/xdiff.h -LIB_H += xdiff/xtypes.h -LIB_H += xdiff/xutils.h -LIB_H += xdiff/xprepare.h -LIB_H += xdiff/xdiffi.h -LIB_H += xdiff/xemit.h - -LIB_H += vcs-svn/line_buffer.h -LIB_H += vcs-svn/sliding_window.h -LIB_H += vcs-svn/repo_tree.h -LIB_H += vcs-svn/fast_export.h -LIB_H += vcs-svn/svndiff.h -LIB_H += vcs-svn/svndump.h - GENERATED_H += common-cmds.h LIB_H += advice.h @@ -649,7 +671,7 @@ LIB_H += list-objects.h LIB_H += ll-merge.h LIB_H += log-tree.h LIB_H += mailmap.h -LIB_H += merge-file.h +LIB_H += merge-blobs.h LIB_H += merge-recursive.h LIB_H += mergesort.h LIB_H += notes-cache.h @@ -661,6 +683,7 @@ LIB_H += pack-revindex.h LIB_H += pack.h LIB_H += parse-options.h LIB_H += patch-ids.h +LIB_H += pathspec.h LIB_H += pkt-line.h LIB_H += progress.h LIB_H += prompt.h @@ -695,11 +718,24 @@ LIB_H += url.h LIB_H += userdiff.h LIB_H += utf8.h LIB_H += varint.h +LIB_H += vcs-svn/fast_export.h +LIB_H += vcs-svn/line_buffer.h +LIB_H += vcs-svn/repo_tree.h +LIB_H += vcs-svn/sliding_window.h +LIB_H += vcs-svn/svndiff.h +LIB_H += vcs-svn/svndump.h LIB_H += walker.h LIB_H += wildmatch.h LIB_H += wt-status.h LIB_H += xdiff-interface.h LIB_H += xdiff/xdiff.h +LIB_H += xdiff/xdiffi.h +LIB_H += xdiff/xemit.h +LIB_H += xdiff/xinclude.h +LIB_H += xdiff/xmacros.h +LIB_H += xdiff/xprepare.h +LIB_H += xdiff/xtypes.h +LIB_H += xdiff/xutils.h LIB_OBJS += abspath.o LIB_OBJS += advice.o @@ -784,6 +820,7 @@ LIB_OBJS += parse-options-cb.o LIB_OBJS += patch-delta.o LIB_OBJS += patch-ids.o LIB_OBJS += path.o +LIB_OBJS += pathspec.o LIB_OBJS += pkt-line.o LIB_OBJS += preload-index.o LIB_OBJS += pretty.o @@ -849,6 +886,7 @@ BUILTIN_OBJS += builtin/branch.o BUILTIN_OBJS += builtin/bundle.o BUILTIN_OBJS += builtin/cat-file.o BUILTIN_OBJS += builtin/check-attr.o +BUILTIN_OBJS += builtin/check-ignore.o BUILTIN_OBJS += builtin/check-ref-format.o BUILTIN_OBJS += builtin/checkout-index.o BUILTIN_OBJS += builtin/checkout.o @@ -962,7 +1000,8 @@ endif ifeq ($(COMPUTE_HEADER_DEPENDENCIES),auto) dep_check = $(shell $(CC) $(ALL_CFLAGS) \ - -c -MF /dev/null -MMD -MP -x c /dev/null -o /dev/null 2>&1; \ + -c -MF /dev/null -MQ /dev/null -MMD -MP \ + -x c /dev/null -o /dev/null 2>&1; \ echo $$?) ifeq ($(dep_check),0) override COMPUTE_HEADER_DEPENDENCIES = yes @@ -1077,6 +1116,9 @@ else else EXPAT_LIBEXPAT = -lexpat endif + ifdef EXPAT_NEEDS_XMLPARSE_H + BASIC_CFLAGS += -DEXPAT_NEEDS_XMLPARSE_H + endif endif endif @@ -1202,10 +1244,6 @@ endif ifdef NO_STRTOULL COMPAT_CFLAGS += -DNO_STRTOULL endif -ifdef NO_STRTOK_R - COMPAT_CFLAGS += -DNO_STRTOK_R - COMPAT_OBJS += compat/strtok_r.o -endif ifdef NO_FNMATCH COMPAT_CFLAGS += -Icompat/fnmatch COMPAT_CFLAGS += -DNO_FNMATCH @@ -1217,6 +1255,9 @@ ifdef NO_FNMATCH_CASEFOLD COMPAT_OBJS += compat/fnmatch/fnmatch.o endif endif +ifdef USE_WILDMATCH + COMPAT_CFLAGS += -DUSE_WILDMATCH +endif ifdef NO_SETENV COMPAT_CFLAGS += -DNO_SETENV COMPAT_OBJS += compat/setenv.o @@ -1771,12 +1812,14 @@ $(patsubst %.py,%,$(SCRIPT_PYTHON)): % : unimplemented.sh mv $@+ $@ endif # NO_PYTHON +CONFIGURE_RECIPE = $(RM) configure configure.ac+ && \ + sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ + configure.ac >configure.ac+ && \ + autoconf -o configure configure.ac+ && \ + $(RM) configure.ac+ + configure: configure.ac GIT-VERSION-FILE - $(QUIET_GEN)$(RM) $@ $<+ && \ - sed -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ - $< > $<+ && \ - autoconf -o $@ $<+ && \ - $(RM) $<+ + $(QUIET_GEN)$(CONFIGURE_RECIPE) ifdef AUTOCONFIGURED # We avoid depending on 'configure' here, because it gets rebuilt @@ -1785,7 +1828,7 @@ ifdef AUTOCONFIGURED # do want to recheck when the platform/environment detection logic # changes, hence this depends on configure.ac. config.status: configure.ac - $(QUIET_GEN)$(MAKE) configure && \ + $(QUIET_GEN)$(CONFIGURE_RECIPE) && \ if test -f config.status; then \ ./config.status --recheck; \ else \ @@ -1829,7 +1872,7 @@ $(dep_dirs): missing_dep_dirs := $(filter-out $(wildcard $(dep_dirs)),$(dep_dirs)) dep_file = $(dir $@).depend/$(notdir $@).d -dep_args = -MF $(dep_file) -MMD -MP +dep_args = -MF $(dep_file) -MQ $@ -MMD -MP ifdef CHECK_HEADER_DEPENDENCIES $(error cannot compute header dependencies outside a normal build. \ Please unset CHECK_HEADER_DEPENDENCIES and try again) @@ -2399,8 +2442,7 @@ clean: profile-clean builtin/*.o $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB) $(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X $(RM) $(TEST_PROGRAMS) - $(RM) -r bin-wrappers - $(RM) -r $(dep_dirs) + $(RM) -r bin-wrappers $(dep_dirs) $(RM) -r po/build/ $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo common-cmds.h $(ETAGS_TARGET) tags cscope* $(RM) -r $(GIT_TARNAME) .doc-tmp-dir @@ -1,6 +1,6 @@ //////////////////////////////////////////////////////////////// - GIT - the stupid content tracker + Git - the stupid content tracker //////////////////////////////////////////////////////////////// @@ -47,11 +47,10 @@ requests, comments and patches to git@vger.kernel.org (read Documentation/SubmittingPatches for instructions on patch submission). To subscribe to the list, send an email with just "subscribe git" in the body to majordomo@vger.kernel.org. The mailing list archives are -available at http://marc.theaimsgroup.com/?l=git and other archival -sites. - -The messages titled "A note from the maintainer", "What's in -git.git (stable)" and "What's cooking in git.git (topics)" and -the discussion following them on the mailing list give a good -reference for project status, development direction and -remaining tasks. +available at http://news.gmane.org/gmane.comp.version-control.git/, +http://marc.info/?l=git and other archival sites. + +The maintainer frequently sends the "What's cooking" reports that +list the current status of various development topics to the mailing +list. The discussion following them give a good reference for +project status, development direction and remaining tasks. @@ -1 +1 @@ -Documentation/RelNotes/1.8.2.txt
\ No newline at end of file +Documentation/RelNotes/1.8.3.txt
\ No newline at end of file @@ -5,7 +5,10 @@ int advice_push_non_ff_current = 1; int advice_push_non_ff_default = 1; int advice_push_non_ff_matching = 1; int advice_push_already_exists = 1; +int advice_push_fetch_first = 1; +int advice_push_needs_force = 1; int advice_status_hints = 1; +int advice_status_u_option = 1; int advice_commit_before_merge = 1; int advice_resolve_conflict = 1; int advice_implicit_identity = 1; @@ -20,7 +23,10 @@ static struct { { "pushnonffdefault", &advice_push_non_ff_default }, { "pushnonffmatching", &advice_push_non_ff_matching }, { "pushalreadyexists", &advice_push_already_exists }, + { "pushfetchfirst", &advice_push_fetch_first }, + { "pushneedsforce", &advice_push_needs_force }, { "statushints", &advice_status_hints }, + { "statusuoption", &advice_status_u_option }, { "commitbeforemerge", &advice_commit_before_merge }, { "resolveconflict", &advice_resolve_conflict }, { "implicitidentity", &advice_implicit_identity }, @@ -8,7 +8,10 @@ extern int advice_push_non_ff_current; extern int advice_push_non_ff_default; extern int advice_push_non_ff_matching; extern int advice_push_already_exists; +extern int advice_push_fetch_first; +extern int advice_push_needs_force; extern int advice_status_hints; +extern int advice_status_u_option; extern int advice_commit_before_merge; extern int advice_resolve_conflict; extern int advice_implicit_identity; diff --git a/archive-tar.c b/archive-tar.c index d1cce46e33..719b6298e6 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -327,20 +327,12 @@ static struct archiver *find_tar_filter(const char *name, int len) static int tar_filter_config(const char *var, const char *value, void *data) { struct archiver *ar; - const char *dot; const char *name; const char *type; int namelen; - if (prefixcmp(var, "tar.")) + if (parse_config_key(var, "tar", &name, &namelen, &type) < 0 || !name) return 0; - dot = strrchr(var, '.'); - if (dot == var + 9) - return 0; - - name = var + 4; - namelen = dot - name; - type = dot + 1; ar = find_tar_filter(name, namelen); if (!ar) { @@ -234,7 +234,7 @@ static void parse_pathspec_arg(const char **pathspec, ar_args->pathspec = pathspec = get_pathspec("", pathspec); if (pathspec) { while (*pathspec) { - if (!path_exists(ar_args->tree, *pathspec)) + if (**pathspec && !path_exists(ar_args->tree, *pathspec)) die("path not found: %s", *pathspec); pathspec++; } @@ -255,9 +255,11 @@ static struct match_attr *parse_attr_line(const char *line, const char *src, &res->u.pat.patternlen, &res->u.pat.flags, &res->u.pat.nowildcardlen); - if (res->u.pat.flags & EXC_FLAG_NEGATIVE) - die(_("Negative patterns are forbidden in git attributes\n" - "Use '\\!' for literal leading exclamation.")); + if (res->u.pat.flags & EXC_FLAG_NEGATIVE) { + warning(_("Negative patterns are ignored in git attributes\n" + "Use '\\!' for literal leading exclamation.")); + return NULL; + } } res->is_macro = is_macro; res->num_attr = num_attr; @@ -564,25 +566,12 @@ static void bootstrap_attr_stack(void) attr_stack = elem; } -static const char *find_basename(const char *path) -{ - const char *cp, *last_slash = NULL; - - for (cp = path; *cp; cp++) { - if (*cp == '/' && cp[1]) - last_slash = cp; - } - return last_slash ? last_slash + 1 : path; -} - -static void prepare_attr_stack(const char *path) +static void prepare_attr_stack(const char *path, int dirlen) { struct attr_stack *elem, *info; - int dirlen, len; + int len; const char *cp; - dirlen = find_basename(path) - path; - /* * At the bottom of the attribute stack is the built-in * set of attribute definitions, followed by the contents @@ -704,7 +693,7 @@ static int fill_one(const char *what, struct match_attr *a, int rem) if (*n == ATTR__UNKNOWN) { debug_set(what, - a->is_macro ? a->u.attr->name : a->u.pattern, + a->is_macro ? a->u.attr->name : a->u.pat.pattern, attr, v); *n = v; rem--; @@ -762,15 +751,26 @@ static int macroexpand_one(int attr_nr, int rem) static void collect_all_attrs(const char *path) { struct attr_stack *stk; - int i, pathlen, rem; - const char *basename; + int i, pathlen, rem, dirlen; + const char *basename, *cp, *last_slash = NULL; + + for (cp = path; *cp; cp++) { + if (*cp == '/' && cp[1]) + last_slash = cp; + } + pathlen = cp - path; + if (last_slash) { + basename = last_slash + 1; + dirlen = last_slash - path; + } else { + basename = path; + dirlen = 0; + } - prepare_attr_stack(path); + prepare_attr_stack(path, dirlen); for (i = 0; i < attr_nr; i++) check_all_attr[i].value = ATTR__UNKNOWN; - basename = find_basename(path); - pathlen = strlen(path); rem = attr_nr; for (stk = attr_stack; 0 < rem && stk; stk = stk->prev) rem = fill(path, pathlen, basename, stk, rem); @@ -52,6 +52,7 @@ extern int cmd_cat_file(int argc, const char **argv, const char *prefix); extern int cmd_checkout(int argc, const char **argv, const char *prefix); extern int cmd_checkout_index(int argc, const char **argv, const char *prefix); extern int cmd_check_attr(int argc, const char **argv, const char *prefix); +extern int cmd_check_ignore(int argc, const char **argv, const char *prefix); extern int cmd_check_ref_format(int argc, const char **argv, const char *prefix); extern int cmd_cherry(int argc, const char **argv, const char *prefix); extern int cmd_cherry_pick(int argc, const char **argv, const char *prefix); diff --git a/builtin/add.c b/builtin/add.c index 075312afcd..ab1c9e8fb7 100644 --- a/builtin/add.c +++ b/builtin/add.c @@ -6,6 +6,7 @@ #include "cache.h" #include "builtin.h" #include "dir.h" +#include "pathspec.h" #include "exec_cmd.h" #include "cache-tree.h" #include "run-command.h" @@ -16,7 +17,7 @@ #include "bulk-checkin.h" static const char * const builtin_add_usage[] = { - N_("git add [options] [--] <filepattern>..."), + N_("git add [options] [--] <pathspec>..."), NULL }; static int patch_interactive, add_interactive, edit_interactive; @@ -97,39 +98,6 @@ int add_files_to_cache(const char *prefix, const char **pathspec, int flags) return !!data.add_errors; } -static void fill_pathspec_matches(const char **pathspec, char *seen, int specs) -{ - int num_unmatched = 0, i; - - /* - * Since we are walking the index as if we were walking the directory, - * we have to mark the matched pathspec as seen; otherwise we will - * mistakenly think that the user gave a pathspec that did not match - * anything. - */ - for (i = 0; i < specs; i++) - if (!seen[i]) - num_unmatched++; - if (!num_unmatched) - return; - for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen); - } -} - -static char *find_used_pathspec(const char **pathspec) -{ - char *seen; - int i; - - for (i = 0; pathspec[i]; i++) - ; /* just counting */ - seen = xcalloc(i, 1); - fill_pathspec_matches(pathspec, seen, i); - return seen; -} - static char *prune_directory(struct dir_struct *dir, const char **pathspec, int prefix) { char *seen; @@ -149,10 +117,14 @@ static char *prune_directory(struct dir_struct *dir, const char **pathspec, int *dst++ = entry; } dir->nr = dst - dir->entries; - fill_pathspec_matches(pathspec, seen, specs); + add_pathspec_matches_against_index(pathspec, seen, specs); return seen; } +/* + * Checks the index to see whether any path in pathspec refers to + * something inside a submodule. If so, dies with an error message. + */ static void treat_gitlinks(const char **pathspec) { int i; @@ -160,24 +132,8 @@ static void treat_gitlinks(const char **pathspec) if (!pathspec || !*pathspec) return; - for (i = 0; i < active_nr; i++) { - struct cache_entry *ce = active_cache[i]; - if (S_ISGITLINK(ce->ce_mode)) { - int len = ce_namelen(ce), j; - for (j = 0; pathspec[j]; j++) { - int len2 = strlen(pathspec[j]); - if (len2 <= len || pathspec[j][len] != '/' || - memcmp(ce->name, pathspec[j], len)) - continue; - if (len2 == len + 1) - /* strip trailing slash */ - pathspec[j] = xstrndup(ce->name, len); - else - die (_("Path '%s' is in submodule '%.*s'"), - pathspec[j], len, ce->name); - } - } - } + for (i = 0; pathspec[i]; i++) + pathspec[i] = check_path_for_gitlink(pathspec[i]); } static void refresh(int verbose, const char **pathspec) @@ -197,17 +153,19 @@ static void refresh(int verbose, const char **pathspec) free(seen); } -static const char **validate_pathspec(int argc, const char **argv, const char *prefix) +/* + * Normalizes argv relative to prefix, via get_pathspec(), and then + * runs die_if_path_beyond_symlink() on each path in the normalized + * list. + */ +static const char **validate_pathspec(const char **argv, const char *prefix) { const char **pathspec = get_pathspec(prefix, argv); if (pathspec) { const char **p; for (p = pathspec; *p; p++) { - if (has_symlink_leading_path(*p, strlen(*p))) { - int len = prefix ? strlen(prefix) : 0; - die(_("'%s' is beyond a symbolic link"), *p + len); - } + die_if_path_beyond_symlink(*p, prefix); } } @@ -248,7 +206,7 @@ int interactive_add(int argc, const char **argv, const char *prefix, int patch) const char **pathspec = NULL; if (argc) { - pathspec = validate_pathspec(argc, argv, prefix); + pathspec = validate_pathspec(argv, prefix); if (!pathspec) return -1; } @@ -363,6 +321,35 @@ static int add_files(struct dir_struct *dir, int flags) return exit_status; } +static void warn_pathless_add(const char *option_name, const char *short_name) { + /* + * To be consistent with "git add -p" and most Git + * commands, we should default to being tree-wide, but + * this is not the original behavior and can't be + * changed until users trained themselves not to type + * "git add -u" or "git add -A". For now, we warn and + * keep the old behavior. Later, the behavior can be changed + * to tree-wide, keeping the warning for a while, and + * eventually we can drop the warning. + */ + warning(_("The behavior of 'git add %s (or %s)' with no path argument from a\n" + "subdirectory of the tree will change in Git 2.0 and should not be used anymore.\n" + "To add content for the whole tree, run:\n" + "\n" + " git add %s :/\n" + " (or git add %s :/)\n" + "\n" + "To restrict the command to the current directory, run:\n" + "\n" + " git add %s .\n" + " (or git add %s .)\n" + "\n" + "With the current Git version, the command is restricted to the current directory."), + option_name, short_name, + option_name, short_name, + option_name, short_name); +} + int cmd_add(int argc, const char **argv, const char *prefix) { int exit_status = 0; @@ -373,6 +360,8 @@ int cmd_add(int argc, const char **argv, const char *prefix) int add_new_files; int require_pathspec; char *seen = NULL; + const char *option_with_implicit_dot = NULL; + const char *short_option_with_implicit_dot = NULL; git_config(add_config, NULL); @@ -392,8 +381,19 @@ int cmd_add(int argc, const char **argv, const char *prefix) die(_("-A and -u are mutually incompatible")); if (!show_only && ignore_missing) die(_("Option --ignore-missing can only be used together with --dry-run")); - if ((addremove || take_worktree_changes) && !argc) { + if (addremove) { + option_with_implicit_dot = "--all"; + short_option_with_implicit_dot = "-A"; + } + if (take_worktree_changes) { + option_with_implicit_dot = "--update"; + short_option_with_implicit_dot = "-u"; + } + if (option_with_implicit_dot && !argc) { static const char *here[2] = { ".", NULL }; + if (prefix) + warn_pathless_add(option_with_implicit_dot, + short_option_with_implicit_dot); argc = 1; argv = here; } @@ -415,7 +415,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) fprintf(stderr, _("Maybe you wanted to say 'git add .'?\n")); return 0; } - pathspec = validate_pathspec(argc, argv, prefix); + pathspec = validate_pathspec(argv, prefix); if (read_cache() < 0) die(_("index file corrupt")); @@ -448,7 +448,7 @@ int cmd_add(int argc, const char **argv, const char *prefix) path_exclude_check_init(&check, &dir); if (!seen) - seen = find_used_pathspec(pathspec); + seen = find_pathspecs_matching_against_index(pathspec); for (i = 0; pathspec[i]; i++) { if (!seen[i] && pathspec[i][0] && !file_exists(pathspec[i])) { diff --git a/builtin/apply.c b/builtin/apply.c index 6c11e8bc73..06f5320b18 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -1041,15 +1041,17 @@ static int gitdiff_renamedst(const char *line, struct patch *patch) static int gitdiff_similarity(const char *line, struct patch *patch) { - if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) - patch->score = 0; + unsigned long val = strtoul(line, NULL, 10); + if (val <= 100) + patch->score = val; return 0; } static int gitdiff_dissimilarity(const char *line, struct patch *patch) { - if ((patch->score = strtoul(line, NULL, 10)) == ULONG_MAX) - patch->score = 0; + unsigned long val = strtoul(line, NULL, 10); + if (val <= 100) + patch->score = val; return 0; } @@ -3598,6 +3600,40 @@ static int get_current_sha1(const char *path, unsigned char *sha1) return 0; } +static int preimage_sha1_in_gitlink_patch(struct patch *p, unsigned char sha1[20]) +{ + /* + * A usable gitlink patch has only one fragment (hunk) that looks like: + * @@ -1 +1 @@ + * -Subproject commit <old sha1> + * +Subproject commit <new sha1> + * or + * @@ -1 +0,0 @@ + * -Subproject commit <old sha1> + * for a removal patch. + */ + struct fragment *hunk = p->fragments; + static const char heading[] = "-Subproject commit "; + char *preimage; + + if (/* does the patch have only one hunk? */ + hunk && !hunk->next && + /* is its preimage one line? */ + hunk->oldpos == 1 && hunk->oldlines == 1 && + /* does preimage begin with the heading? */ + (preimage = memchr(hunk->patch, '\n', hunk->size)) != NULL && + !prefixcmp(++preimage, heading) && + /* does it record full SHA-1? */ + !get_sha1_hex(preimage + sizeof(heading) - 1, sha1) && + preimage[sizeof(heading) + 40 - 1] == '\n' && + /* does the abbreviated name on the index line agree with it? */ + !prefixcmp(preimage + sizeof(heading) - 1, p->old_sha1_prefix)) + return 0; /* it all looks fine */ + + /* we may have full object name on the index line */ + return get_sha1_hex(p->old_sha1_prefix, sha1); +} + /* Build an index that contains the just the files needed for a 3way merge */ static void build_fake_ancestor(struct patch *list, const char *filename) { @@ -3609,7 +3645,6 @@ static void build_fake_ancestor(struct patch *list, const char *filename) * worth showing the new sha1 prefix, but until then... */ for (patch = list; patch; patch = patch->next) { - const unsigned char *sha1_ptr; unsigned char sha1[20]; struct cache_entry *ce; const char *name; @@ -3617,20 +3652,25 @@ static void build_fake_ancestor(struct patch *list, const char *filename) name = patch->old_name ? patch->old_name : patch->new_name; if (0 < patch->is_new) continue; - else if (get_sha1_blob(patch->old_sha1_prefix, sha1)) - /* git diff has no index line for mode/type changes */ - if (!patch->lines_added && !patch->lines_deleted) { - if (get_current_sha1(patch->old_name, sha1)) - die("mode change for %s, which is not " - "in current HEAD", name); - sha1_ptr = sha1; - } else - die("sha1 information is lacking or useless " - "(%s).", name); - else - sha1_ptr = sha1; - ce = make_cache_entry(patch->old_mode, sha1_ptr, name, 0, 0); + if (S_ISGITLINK(patch->old_mode)) { + if (!preimage_sha1_in_gitlink_patch(patch, sha1)) + ; /* ok, the textual part looks sane */ + else + die("sha1 information is lacking or useless for submoule %s", + name); + } else if (!get_sha1_blob(patch->old_sha1_prefix, sha1)) { + ; /* ok */ + } else if (!patch->lines_added && !patch->lines_deleted) { + /* mode-only change: update the current */ + if (get_current_sha1(patch->old_name, sha1)) + die("mode change for %s, which is not " + "in current HEAD", name); + } else + die("sha1 information is lacking or useless " + "(%s).", name); + + ce = make_cache_entry(patch->old_mode, sha1, name, 0, 0); if (!ce) die(_("make_cache_entry failed for path '%s'"), name); if (add_index_entry(&result, ce, ADD_CACHE_OK_TO_ADD)) diff --git a/builtin/blame.c b/builtin/blame.c index cfae569905..86100e9662 100644 --- a/builtin/blame.c +++ b/builtin/blame.c @@ -42,6 +42,7 @@ static int blank_boundary; static int incremental; static int xdl_opts; static int abbrev = -1; +static int no_whole_file_rename; static enum date_mode blame_date_mode = DATE_ISO8601; static size_t blame_date_width; @@ -1226,7 +1227,7 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt) * The first pass looks for unrenamed path to optimize for * common cases, then we look for renames in the second pass. */ - for (pass = 0; pass < 2; pass++) { + for (pass = 0; pass < 2 - no_whole_file_rename; pass++) { struct origin *(*find)(struct scoreboard *, struct commit *, struct origin *); find = pass ? find_rename : find_origin; @@ -1321,30 +1322,31 @@ static void pass_blame(struct scoreboard *sb, struct origin *origin, int opt) * Information on commits, used for output. */ struct commit_info { - const char *author; - const char *author_mail; + struct strbuf author; + struct strbuf author_mail; unsigned long author_time; - const char *author_tz; + struct strbuf author_tz; /* filled only when asked for details */ - const char *committer; - const char *committer_mail; + struct strbuf committer; + struct strbuf committer_mail; unsigned long committer_time; - const char *committer_tz; + struct strbuf committer_tz; - const char *summary; + struct strbuf summary; }; /* * Parse author/committer line in the commit object buffer */ static void get_ac_line(const char *inbuf, const char *what, - int person_len, char *person, - int mail_len, char *mail, - unsigned long *time, const char **tz) + struct strbuf *name, struct strbuf *mail, + unsigned long *time, struct strbuf *tz) { - int len, tzlen, maillen; - char *tmp, *endp, *timepos, *mailpos; + struct ident_split ident; + size_t len, maillen, namelen; + char *tmp, *endp; + const char *namebuf, *mailbuf; tmp = strstr(inbuf, what); if (!tmp) @@ -1355,69 +1357,61 @@ static void get_ac_line(const char *inbuf, const char *what, len = strlen(tmp); else len = endp - tmp; - if (person_len <= len) { + + if (split_ident_line(&ident, tmp, len)) { error_out: /* Ugh */ - *tz = "(unknown)"; - strcpy(person, *tz); - strcpy(mail, *tz); + tmp = "(unknown)"; + strbuf_addstr(name, tmp); + strbuf_addstr(mail, tmp); + strbuf_addstr(tz, tmp); *time = 0; return; } - memcpy(person, tmp, len); - - tmp = person; - tmp += len; - *tmp = 0; - while (person < tmp && *tmp != ' ') - tmp--; - if (tmp <= person) - goto error_out; - *tz = tmp+1; - tzlen = (person+len)-(tmp+1); - *tmp = 0; - while (person < tmp && *tmp != ' ') - tmp--; - if (tmp <= person) - goto error_out; - *time = strtoul(tmp, NULL, 10); - timepos = tmp; + namelen = ident.name_end - ident.name_begin; + namebuf = ident.name_begin; - *tmp = 0; - while (person < tmp && !(*tmp == ' ' && tmp[1] == '<')) - tmp--; - if (tmp <= person) - return; - mailpos = tmp + 1; - *tmp = 0; - maillen = timepos - tmp; - memcpy(mail, mailpos, maillen); + maillen = ident.mail_end - ident.mail_begin; + mailbuf = ident.mail_begin; - if (!mailmap.nr) - return; + *time = strtoul(ident.date_begin, NULL, 10); - /* - * mailmap expansion may make the name longer. - * make room by pushing stuff down. - */ - tmp = person + person_len - (tzlen + 1); - memmove(tmp, *tz, tzlen); - tmp[tzlen] = 0; - *tz = tmp; + len = ident.tz_end - ident.tz_begin; + strbuf_add(tz, ident.tz_begin, len); /* * Now, convert both name and e-mail using mailmap */ - if (map_user(&mailmap, mail+1, mail_len-1, person, tmp-person-1)) { - /* Add a trailing '>' to email, since map_user returns plain emails - Note: It already has '<', since we replace from mail+1 */ - mailpos = memchr(mail, '\0', mail_len); - if (mailpos && mailpos-mail < mail_len - 1) { - *mailpos = '>'; - *(mailpos+1) = '\0'; - } - } + map_user(&mailmap, &mailbuf, &maillen, + &namebuf, &namelen); + + strbuf_addf(mail, "<%.*s>", (int)maillen, mailbuf); + strbuf_add(name, namebuf, namelen); +} + +static void commit_info_init(struct commit_info *ci) +{ + + strbuf_init(&ci->author, 0); + strbuf_init(&ci->author_mail, 0); + strbuf_init(&ci->author_tz, 0); + strbuf_init(&ci->committer, 0); + strbuf_init(&ci->committer_mail, 0); + strbuf_init(&ci->committer_tz, 0); + strbuf_init(&ci->summary, 0); +} + +static void commit_info_destroy(struct commit_info *ci) +{ + + strbuf_release(&ci->author); + strbuf_release(&ci->author_mail); + strbuf_release(&ci->author_tz); + strbuf_release(&ci->committer); + strbuf_release(&ci->committer_mail); + strbuf_release(&ci->committer_tz); + strbuf_release(&ci->summary); } static void get_commit_info(struct commit *commit, @@ -1426,57 +1420,32 @@ static void get_commit_info(struct commit *commit, { int len; const char *subject, *encoding; - char *reencoded, *message; - static char author_name[1024]; - static char author_mail[1024]; - static char committer_name[1024]; - static char committer_mail[1024]; - static char summary_buf[1024]; + char *message; + + commit_info_init(ret); - /* - * We've operated without save_commit_buffer, so - * we now need to populate them for output. - */ - if (!commit->buffer) { - enum object_type type; - unsigned long size; - commit->buffer = - read_sha1_file(commit->object.sha1, &type, &size); - if (!commit->buffer) - die("Cannot read commit %s", - sha1_to_hex(commit->object.sha1)); - } encoding = get_log_output_encoding(); - reencoded = logmsg_reencode(commit, encoding); - message = reencoded ? reencoded : commit->buffer; - ret->author = author_name; - ret->author_mail = author_mail; + message = logmsg_reencode(commit, encoding); get_ac_line(message, "\nauthor ", - sizeof(author_name), author_name, - sizeof(author_mail), author_mail, + &ret->author, &ret->author_mail, &ret->author_time, &ret->author_tz); if (!detailed) { - free(reencoded); + logmsg_free(message, commit); return; } - ret->committer = committer_name; - ret->committer_mail = committer_mail; get_ac_line(message, "\ncommitter ", - sizeof(committer_name), committer_name, - sizeof(committer_mail), committer_mail, + &ret->committer, &ret->committer_mail, &ret->committer_time, &ret->committer_tz); - ret->summary = summary_buf; len = find_commit_subject(message, &subject); - if (len && len < sizeof(summary_buf)) { - memcpy(summary_buf, subject, len); - summary_buf[len] = 0; - } else { - sprintf(summary_buf, "(%s)", sha1_to_hex(commit->object.sha1)); - } - free(reencoded); + if (len) + strbuf_add(&ret->summary, subject, len); + else + strbuf_addf(&ret->summary, "(%s)", sha1_to_hex(commit->object.sha1)); + + logmsg_free(message, commit); } /* @@ -1504,15 +1473,15 @@ static int emit_one_suspect_detail(struct origin *suspect, int repeat) suspect->commit->object.flags |= METAINFO_SHOWN; get_commit_info(suspect->commit, &ci, 1); - printf("author %s\n", ci.author); - printf("author-mail %s\n", ci.author_mail); + printf("author %s\n", ci.author.buf); + printf("author-mail %s\n", ci.author_mail.buf); printf("author-time %lu\n", ci.author_time); - printf("author-tz %s\n", ci.author_tz); - printf("committer %s\n", ci.committer); - printf("committer-mail %s\n", ci.committer_mail); + printf("author-tz %s\n", ci.author_tz.buf); + printf("committer %s\n", ci.committer.buf); + printf("committer-mail %s\n", ci.committer_mail.buf); printf("committer-time %lu\n", ci.committer_time); - printf("committer-tz %s\n", ci.committer_tz); - printf("summary %s\n", ci.summary); + printf("committer-tz %s\n", ci.committer_tz.buf); + printf("summary %s\n", ci.summary.buf); if (suspect->commit->object.flags & UNINTERESTING) printf("boundary\n"); if (suspect->previous) { @@ -1520,6 +1489,9 @@ static int emit_one_suspect_detail(struct origin *suspect, int repeat) printf("previous %s ", sha1_to_hex(prev->commit->object.sha1)); write_name_quoted(prev->path, stdout, '\n'); } + + commit_info_destroy(&ci); + return 1; } @@ -1706,11 +1678,11 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) if (opt & OUTPUT_ANNOTATE_COMPAT) { const char *name; if (opt & OUTPUT_SHOW_EMAIL) - name = ci.author_mail; + name = ci.author_mail.buf; else - name = ci.author; + name = ci.author.buf; printf("\t(%10s\t%10s\t%d)", name, - format_time(ci.author_time, ci.author_tz, + format_time(ci.author_time, ci.author_tz.buf, show_raw_time), ent->lno + 1 + cnt); } else { @@ -1729,14 +1701,14 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) const char *name; int pad; if (opt & OUTPUT_SHOW_EMAIL) - name = ci.author_mail; + name = ci.author_mail.buf; else - name = ci.author; + name = ci.author.buf; pad = longest_author - utf8_strwidth(name); printf(" (%s%*s %10s", name, pad, "", format_time(ci.author_time, - ci.author_tz, + ci.author_tz.buf, show_raw_time)); } printf(" %*d) ", @@ -1751,6 +1723,8 @@ static void emit_other(struct scoreboard *sb, struct blame_entry *ent, int opt) if (sb->final_buf_size && cp[-1] != '\n') putchar('\n'); + + commit_info_destroy(&ci); } static void output(struct scoreboard *sb, int option) @@ -1875,9 +1849,9 @@ static void find_alignment(struct scoreboard *sb, int *option) suspect->commit->object.flags |= METAINFO_SHOWN; get_commit_info(suspect->commit, &ci, 1); if (*option & OUTPUT_SHOW_EMAIL) - num = utf8_strwidth(ci.author_mail); + num = utf8_strwidth(ci.author_mail.buf); else - num = utf8_strwidth(ci.author); + num = utf8_strwidth(ci.author.buf); if (longest_author < num) longest_author = num; } @@ -1889,6 +1863,8 @@ static void find_alignment(struct scoreboard *sb, int *option) longest_dst_lines = num; if (largest_score < ent_score(sb, e)) largest_score = ent_score(sb, e); + + commit_info_destroy(&ci); } max_orig_digits = decimal_width(longest_src_lines); max_digits = decimal_width(longest_dst_lines); @@ -2403,6 +2379,7 @@ int cmd_blame(int argc, const char **argv, const char *prefix) init_revisions(&revs, NULL); revs.date_mode = blame_date_mode; DIFF_OPT_SET(&revs.diffopt, ALLOW_TEXTCONV); + DIFF_OPT_SET(&revs.diffopt, FOLLOW_RENAMES); save_commit_buffer = 0; dashdash_pos = 0; @@ -2426,6 +2403,8 @@ int cmd_blame(int argc, const char **argv, const char *prefix) parse_revision_opt(&revs, &ctx, options, blame_opt_usage); } parse_done: + no_whole_file_rename = !DIFF_OPT_TST(&revs.diffopt, FOLLOW_RENAMES); + DIFF_OPT_CLR(&revs.diffopt, FOLLOW_RENAMES); argc = parse_options_end(&ctx); if (0 < abbrev) diff --git a/builtin/branch.c b/builtin/branch.c index 873f624d1c..00d17d25d1 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -466,7 +466,7 @@ static void add_verbose_info(struct strbuf *out, struct ref_item *item, int verbose, int abbrev) { struct strbuf subject = STRBUF_INIT, stat = STRBUF_INIT; - const char *sub = " **** invalid ref ****"; + const char *sub = _(" **** invalid ref ****"); struct commit *commit = item->commit; if (commit && !parse_commit(commit)) { @@ -590,7 +590,7 @@ static int print_ref_list(int kinds, int detached, int verbose, int abbrev, stru struct commit *filter; filter = lookup_commit_reference_gently(merge_filter_ref, 0); if (!filter) - die("object '%s' does not point to a commit", + die(_("object '%s' does not point to a commit"), sha1_to_hex(merge_filter_ref)); filter->object.flags |= UNINTERESTING; @@ -706,11 +706,11 @@ static int edit_branch_description(const char *branch_name) read_branch_desc(&buf, branch_name); if (!buf.len || buf.buf[buf.len-1] != '\n') strbuf_addch(&buf, '\n'); - strbuf_addf(&buf, - "# Please edit the description for the branch\n" - "# %s\n" - "# Lines starting with '#' will be stripped.\n", - branch_name); + strbuf_commented_addf(&buf, + "Please edit the description for the branch\n" + " %s\n" + "Lines starting with '%c' will be stripped.\n", + branch_name, comment_line_char); fp = fopen(git_path(edit_description), "w"); if ((fwrite(buf.buf, 1, buf.len, fp) < buf.len) || fclose(fp)) { strbuf_release(&buf); @@ -825,6 +825,9 @@ int cmd_branch(int argc, const char **argv, const char *prefix) if (!delete && !rename && !edit_description && !new_upstream && !unset_upstream && argc == 0) list = 1; + if (with_commit || merge_filter != NO_FILTER) + list = 1; + if (!!delete + !!rename + !!force_create + !!list + !!new_upstream + !!unset_upstream > 1) usage_with_options(builtin_branch_usage, options); @@ -837,9 +840,11 @@ int cmd_branch(int argc, const char **argv, const char *prefix) colopts = 0; } - if (delete) + if (delete) { + if (!argc) + die(_("branch name required")); return delete_branches(argc, argv, delete > 1, kinds, quiet); - else if (list) { + } else if (list) { int ret = print_ref_list(kinds, detached, verbose, abbrev, with_commit, argv); print_columns(&output, colopts, NULL); @@ -850,24 +855,25 @@ int cmd_branch(int argc, const char **argv, const char *prefix) const char *branch_name; struct strbuf branch_ref = STRBUF_INIT; - if (detached) - die("Cannot give description to detached HEAD"); - if (!argc) + if (!argc) { + if (detached) + die(_("Cannot give description to detached HEAD")); branch_name = head; - else if (argc == 1) + } else if (argc == 1) branch_name = argv[0]; else - usage_with_options(builtin_branch_usage, options); + die(_("cannot edit description of more than one branch")); strbuf_addf(&branch_ref, "refs/heads/%s", branch_name); if (!ref_exists(branch_ref.buf)) { strbuf_release(&branch_ref); if (!argc) - return error("No commit on branch '%s' yet.", + return error(_("No commit on branch '%s' yet."), branch_name); else - return error("No such branch '%s'.", branch_name); + return error(_("No branch named '%s'."), + branch_name); } strbuf_release(&branch_ref); @@ -879,10 +885,21 @@ int cmd_branch(int argc, const char **argv, const char *prefix) else if (argc == 2) rename_branch(argv[0], argv[1], rename > 1); else - usage_with_options(builtin_branch_usage, options); + die(_("too many branches for a rename operation")); } else if (new_upstream) { struct branch *branch = branch_get(argv[0]); + if (argc > 1) + die(_("too many branches to set new upstream")); + + if (!branch) { + if (!argc || !strcmp(argv[0], "HEAD")) + die(_("could not set upstream of HEAD to %s when " + "it does not point to any branch."), + new_upstream); + die(_("no such branch '%s'"), argv[0]); + } + if (!ref_exists(branch->refname)) die(_("branch '%s' does not exist"), branch->name); @@ -895,6 +912,16 @@ int cmd_branch(int argc, const char **argv, const char *prefix) struct branch *branch = branch_get(argv[0]); struct strbuf buf = STRBUF_INIT; + if (argc > 1) + die(_("too many branches to unset upstream")); + + if (!branch) { + if (!argc || !strcmp(argv[0], "HEAD")) + die(_("could not unset upstream of HEAD when " + "it does not point to any branch.")); + die(_("no such branch '%s'"), argv[0]); + } + if (!branch_has_merge_config(branch)) { die(_("Branch '%s' has no upstream information"), branch->name); } @@ -910,6 +937,12 @@ int cmd_branch(int argc, const char **argv, const char *prefix) int branch_existed = 0, remote_tracking = 0; struct strbuf buf = STRBUF_INIT; + if (!strcmp(argv[0], "HEAD")) + die(_("it does not make sense to create 'HEAD' manually")); + + if (!branch) + die(_("no such branch '%s'"), argv[0]); + if (kinds != REF_LOCAL_BRANCH) die(_("-a and -r options to 'git branch' do not make sense with a branch name")); diff --git a/builtin/cat-file.c b/builtin/cat-file.c index 00528ddc38..ad29000736 100644 --- a/builtin/cat-file.c +++ b/builtin/cat-file.c @@ -193,7 +193,7 @@ static int batch_one_object(const char *obj_name, int print_contents) unsigned char sha1[20]; enum object_type type = 0; unsigned long size; - void *contents = contents; + void *contents; if (!obj_name) return 1; diff --git a/builtin/check-ignore.c b/builtin/check-ignore.c new file mode 100644 index 0000000000..0240f99b57 --- /dev/null +++ b/builtin/check-ignore.c @@ -0,0 +1,173 @@ +#include "builtin.h" +#include "cache.h" +#include "dir.h" +#include "quote.h" +#include "pathspec.h" +#include "parse-options.h" + +static int quiet, verbose, stdin_paths; +static const char * const check_ignore_usage[] = { +"git check-ignore [options] pathname...", +"git check-ignore [options] --stdin < <list-of-paths>", +NULL +}; + +static int null_term_line; + +static const struct option check_ignore_options[] = { + OPT__QUIET(&quiet, N_("suppress progress reporting")), + OPT__VERBOSE(&verbose, N_("be verbose")), + OPT_GROUP(""), + OPT_BOOLEAN(0, "stdin", &stdin_paths, + N_("read file names from stdin")), + OPT_BOOLEAN('z', NULL, &null_term_line, + N_("input paths are terminated by a null character")), + OPT_END() +}; + +static void output_exclude(const char *path, struct exclude *exclude) +{ + char *bang = exclude->flags & EXC_FLAG_NEGATIVE ? "!" : ""; + char *slash = exclude->flags & EXC_FLAG_MUSTBEDIR ? "/" : ""; + if (!null_term_line) { + if (!verbose) { + write_name_quoted(path, stdout, '\n'); + } else { + quote_c_style(exclude->el->src, NULL, stdout, 0); + printf(":%d:%s%s%s\t", + exclude->srcpos, + bang, exclude->pattern, slash); + quote_c_style(path, NULL, stdout, 0); + fputc('\n', stdout); + } + } else { + if (!verbose) { + printf("%s%c", path, '\0'); + } else { + printf("%s%c%d%c%s%s%s%c%s%c", + exclude->el->src, '\0', + exclude->srcpos, '\0', + bang, exclude->pattern, slash, '\0', + path, '\0'); + } + } +} + +static int check_ignore(const char *prefix, const char **pathspec) +{ + struct dir_struct dir; + const char *path, *full_path; + char *seen; + int num_ignored = 0, dtype = DT_UNKNOWN, i; + struct path_exclude_check check; + struct exclude *exclude; + + /* read_cache() is only necessary so we can watch out for submodules. */ + if (read_cache() < 0) + die(_("index file corrupt")); + + memset(&dir, 0, sizeof(dir)); + dir.flags |= DIR_COLLECT_IGNORED; + setup_standard_excludes(&dir); + + if (!pathspec || !*pathspec) { + if (!quiet) + fprintf(stderr, "no pathspec given.\n"); + return 0; + } + + path_exclude_check_init(&check, &dir); + /* + * look for pathspecs matching entries in the index, since these + * should not be ignored, in order to be consistent with + * 'git status', 'git add' etc. + */ + seen = find_pathspecs_matching_against_index(pathspec); + for (i = 0; pathspec[i]; i++) { + path = pathspec[i]; + full_path = prefix_path(prefix, prefix + ? strlen(prefix) : 0, path); + full_path = check_path_for_gitlink(full_path); + die_if_path_beyond_symlink(full_path, prefix); + if (!seen[i]) { + exclude = last_exclude_matching_path(&check, full_path, + -1, &dtype); + if (exclude) { + if (!quiet) + output_exclude(path, exclude); + num_ignored++; + } + } + } + free(seen); + clear_directory(&dir); + path_exclude_check_clear(&check); + + return num_ignored; +} + +static int check_ignore_stdin_paths(const char *prefix) +{ + struct strbuf buf, nbuf; + char **pathspec = NULL; + size_t nr = 0, alloc = 0; + int line_termination = null_term_line ? 0 : '\n'; + int num_ignored; + + strbuf_init(&buf, 0); + strbuf_init(&nbuf, 0); + while (strbuf_getline(&buf, stdin, line_termination) != EOF) { + if (line_termination && buf.buf[0] == '"') { + strbuf_reset(&nbuf); + if (unquote_c_style(&nbuf, buf.buf, NULL)) + die("line is badly quoted"); + strbuf_swap(&buf, &nbuf); + } + ALLOC_GROW(pathspec, nr + 1, alloc); + pathspec[nr] = xcalloc(strlen(buf.buf) + 1, sizeof(*buf.buf)); + strcpy(pathspec[nr++], buf.buf); + } + ALLOC_GROW(pathspec, nr + 1, alloc); + pathspec[nr] = NULL; + num_ignored = check_ignore(prefix, (const char **)pathspec); + maybe_flush_or_die(stdout, "attribute to stdout"); + strbuf_release(&buf); + strbuf_release(&nbuf); + free(pathspec); + return num_ignored; +} + +int cmd_check_ignore(int argc, const char **argv, const char *prefix) +{ + int num_ignored; + + git_config(git_default_config, NULL); + + argc = parse_options(argc, argv, prefix, check_ignore_options, + check_ignore_usage, 0); + + if (stdin_paths) { + if (argc > 0) + die(_("cannot specify pathnames with --stdin")); + } else { + if (null_term_line) + die(_("-z only makes sense with --stdin")); + if (argc == 0) + die(_("no path specified")); + } + if (quiet) { + if (argc > 1) + die(_("--quiet is only valid with a single pathname")); + if (verbose) + die(_("cannot have both --quiet and --verbose")); + } + + if (stdin_paths) { + num_ignored = check_ignore_stdin_paths(prefix); + } else { + num_ignored = check_ignore(prefix, argv); + maybe_flush_or_die(stdout, "ignore to stdout"); + } + + return !num_ignored; +} diff --git a/builtin/clean.c b/builtin/clean.c index 69c1cda906..04e396b17a 100644 --- a/builtin/clean.c +++ b/builtin/clean.c @@ -10,6 +10,7 @@ #include "cache.h" #include "dir.h" #include "parse-options.h" +#include "refs.h" #include "string-list.h" #include "quote.h" @@ -20,6 +21,12 @@ static const char *const builtin_clean_usage[] = { NULL }; +static const char *msg_remove = N_("Removing %s\n"); +static const char *msg_would_remove = N_("Would remove %s\n"); +static const char *msg_skip_git_dir = N_("Skipping repository %s\n"); +static const char *msg_would_skip_git_dir = N_("Would skip repository %s\n"); +static const char *msg_warn_remove_failed = N_("failed to remove %s"); + static int git_clean_config(const char *var, const char *value, void *cb) { if (!strcmp(var, "clean.requireforce")) @@ -34,22 +41,124 @@ static int exclude_cb(const struct option *opt, const char *arg, int unset) return 0; } +static int remove_dirs(struct strbuf *path, const char *prefix, int force_flag, + int dry_run, int quiet, int *dir_gone) +{ + DIR *dir; + struct strbuf quoted = STRBUF_INIT; + struct dirent *e; + int res = 0, ret = 0, gone = 1, original_len = path->len, len, i; + unsigned char submodule_head[20]; + struct string_list dels = STRING_LIST_INIT_DUP; + + *dir_gone = 1; + + if ((force_flag & REMOVE_DIR_KEEP_NESTED_GIT) && + !resolve_gitlink_ref(path->buf, "HEAD", submodule_head)) { + if (!quiet) { + quote_path_relative(path->buf, strlen(path->buf), "ed, prefix); + printf(dry_run ? _(msg_would_skip_git_dir) : _(msg_skip_git_dir), + quoted.buf); + } + + *dir_gone = 0; + return 0; + } + + dir = opendir(path->buf); + if (!dir) { + /* an empty dir could be removed even if it is unreadble */ + res = dry_run ? 0 : rmdir(path->buf); + if (res) { + quote_path_relative(path->buf, strlen(path->buf), "ed, prefix); + warning(_(msg_warn_remove_failed), quoted.buf); + *dir_gone = 0; + } + return res; + } + + if (path->buf[original_len - 1] != '/') + strbuf_addch(path, '/'); + + len = path->len; + while ((e = readdir(dir)) != NULL) { + struct stat st; + if (is_dot_or_dotdot(e->d_name)) + continue; + + strbuf_setlen(path, len); + strbuf_addstr(path, e->d_name); + if (lstat(path->buf, &st)) + ; /* fall thru */ + else if (S_ISDIR(st.st_mode)) { + if (remove_dirs(path, prefix, force_flag, dry_run, quiet, &gone)) + ret = 1; + if (gone) { + quote_path_relative(path->buf, strlen(path->buf), "ed, prefix); + string_list_append(&dels, quoted.buf); + } else + *dir_gone = 0; + continue; + } else { + res = dry_run ? 0 : unlink(path->buf); + if (!res) { + quote_path_relative(path->buf, strlen(path->buf), "ed, prefix); + string_list_append(&dels, quoted.buf); + } else { + quote_path_relative(path->buf, strlen(path->buf), "ed, prefix); + warning(_(msg_warn_remove_failed), quoted.buf); + *dir_gone = 0; + ret = 1; + } + continue; + } + + /* path too long, stat fails, or non-directory still exists */ + *dir_gone = 0; + ret = 1; + break; + } + closedir(dir); + + strbuf_setlen(path, original_len); + + if (*dir_gone) { + res = dry_run ? 0 : rmdir(path->buf); + if (!res) + *dir_gone = 1; + else { + quote_path_relative(path->buf, strlen(path->buf), "ed, prefix); + warning(_(msg_warn_remove_failed), quoted.buf); + *dir_gone = 0; + ret = 1; + } + } + + if (!*dir_gone && !quiet) { + for (i = 0; i < dels.nr; i++) + printf(dry_run ? _(msg_would_remove) : _(msg_remove), dels.items[i].string); + } + string_list_clear(&dels, 0); + return ret; +} + int cmd_clean(int argc, const char **argv, const char *prefix) { - int i; - int show_only = 0, remove_directories = 0, quiet = 0, ignored = 0; - int ignored_only = 0, config_set = 0, errors = 0; + int i, res; + int dry_run = 0, remove_directories = 0, quiet = 0, ignored = 0; + int ignored_only = 0, config_set = 0, errors = 0, gone = 1; int rm_flags = REMOVE_DIR_KEEP_NESTED_GIT; struct strbuf directory = STRBUF_INIT; struct dir_struct dir; static const char **pathspec; struct strbuf buf = STRBUF_INIT; struct string_list exclude_list = STRING_LIST_INIT_NODUP; + struct exclude_list *el; const char *qname; char *seen = NULL; struct option options[] = { OPT__QUIET(&quiet, N_("do not print names of files removed")), - OPT__DRY_RUN(&show_only, N_("dry run")), + OPT__DRY_RUN(&dry_run, N_("dry run")), OPT__FORCE(&force, N_("force")), OPT_BOOLEAN('d', NULL, &remove_directories, N_("remove whole directories")), @@ -77,7 +186,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (ignored && ignored_only) die(_("-x and -X cannot be used together")); - if (!show_only && !force) { + if (!dry_run && !force) { if (config_set) die(_("clean.requireForce set to true and neither -n nor -f given; " "refusing to clean")); @@ -97,9 +206,9 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (!ignored) setup_standard_excludes(&dir); + el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); for (i = 0; i < exclude_list.nr; i++) - add_exclude(exclude_list.items[i].string, "", 0, - &dir.exclude_list[EXC_CMDL]); + add_exclude(exclude_list.items[i].string, "", 0, el, -(i+1)); pathspec = get_pathspec(prefix, argv); @@ -149,38 +258,26 @@ int cmd_clean(int argc, const char **argv, const char *prefix) if (S_ISDIR(st.st_mode)) { strbuf_addstr(&directory, ent->name); - qname = quote_path_relative(directory.buf, directory.len, &buf, prefix); - if (show_only && (remove_directories || - (matches == MATCHED_EXACTLY))) { - printf(_("Would remove %s\n"), qname); - } else if (remove_directories || - (matches == MATCHED_EXACTLY)) { - if (!quiet) - printf(_("Removing %s\n"), qname); - if (remove_dir_recursively(&directory, - rm_flags) != 0) { - warning(_("failed to remove %s"), qname); + if (remove_directories || (matches == MATCHED_EXACTLY)) { + if (remove_dirs(&directory, prefix, rm_flags, dry_run, quiet, &gone)) errors++; + if (gone && !quiet) { + qname = quote_path_relative(directory.buf, directory.len, &buf, prefix); + printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname); } - } else if (show_only) { - printf(_("Would not remove %s\n"), qname); - } else { - printf(_("Not removing %s\n"), qname); } strbuf_reset(&directory); } else { if (pathspec && !matches) continue; - qname = quote_path_relative(ent->name, -1, &buf, prefix); - if (show_only) { - printf(_("Would remove %s\n"), qname); - continue; - } else if (!quiet) { - printf(_("Removing %s\n"), qname); - } - if (unlink(ent->name) != 0) { - warning(_("failed to remove %s"), qname); + res = dry_run ? 0 : unlink(ent->name); + if (res) { + qname = quote_path_relative(ent->name, -1, &buf, prefix); + warning(_(msg_warn_remove_failed), qname); errors++; + } else if (!quiet) { + qname = quote_path_relative(ent->name, -1, &buf, prefix); + printf(dry_run ? _(msg_would_remove) : _(msg_remove), qname); } } } diff --git a/builtin/clone.c b/builtin/clone.c index 8d23a62e8a..e0aaf13583 100644 --- a/builtin/clone.c +++ b/builtin/clone.c @@ -704,6 +704,8 @@ int cmd_clone(int argc, const char **argv, const char *prefix) if (option_origin) die(_("--bare and --origin %s options are incompatible."), option_origin); + if (real_git_dir) + die(_("--bare and --separate-git-dir are incompatible.")); option_no_checkout = 1; } @@ -765,8 +767,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix) atexit(remove_junk); sigchain_push_common(remove_junk_on_signal); - setenv(CONFIG_ENVIRONMENT, mkpath("%s/config", git_dir), 1); - if (safe_create_leading_directories_const(git_dir) < 0) die(_("could not create leading directories of '%s'"), git_dir); @@ -785,13 +785,6 @@ int cmd_clone(int argc, const char **argv, const char *prefix) init_db(option_template, INIT_DB_QUIET); write_config(&option_config); - /* - * At this point, the config exists, so we do not need the - * environment variable. We actually need to unset it, too, to - * re-enable parsing of the global configs. - */ - unsetenv(CONFIG_ENVIRONMENT); - git_config(git_default_config, NULL); if (option_bare) { diff --git a/builtin/commit.c b/builtin/commit.c index d6dd3df8b1..d21d07a1a8 100644 --- a/builtin/commit.c +++ b/builtin/commit.c @@ -31,12 +31,12 @@ #include "sequencer.h" static const char * const builtin_commit_usage[] = { - N_("git commit [options] [--] <filepattern>..."), + N_("git commit [options] [--] <pathspec>..."), NULL }; static const char * const builtin_status_usage[] = { - N_("git status [options] [--] <filepattern>..."), + N_("git status [options] [--] <pathspec>..."), NULL }; @@ -103,7 +103,7 @@ static enum { CLEANUP_NONE, CLEANUP_ALL } cleanup_mode; -static char *cleanup_arg; +static const char *cleanup_arg; static enum commit_whence whence; static int use_editor = 1, include_status = 1; @@ -124,8 +124,10 @@ static int opt_parse_m(const struct option *opt, const char *arg, int unset) if (unset) strbuf_setlen(buf, 0); else { + if (buf->len) + strbuf_addch(buf, '\n'); strbuf_addstr(buf, arg); - strbuf_addstr(buf, "\n\n"); + strbuf_complete_line(buf); } return 0; } @@ -733,15 +735,15 @@ static int prepare_to_commit(const char *index_file, const char *prefix, if (cleanup_mode == CLEANUP_ALL) status_printf(s, GIT_COLOR_NORMAL, _("Please enter the commit message for your changes." - " Lines starting\nwith '#' will be ignored, and an empty" - " message aborts the commit.\n")); + " Lines starting\nwith '%c' will be ignored, and an empty" + " message aborts the commit.\n"), comment_line_char); else /* CLEANUP_SPACE, that is. */ status_printf(s, GIT_COLOR_NORMAL, _("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")); + " Lines starting\n" + "with '%c' will be kept; you may remove them" + " yourself if you want to.\n" + "An empty message aborts the commit.\n"), comment_line_char); if (only_include_assumed) status_printf_ln(s, GIT_COLOR_NORMAL, "%s", only_include_assumed); @@ -946,24 +948,14 @@ static void handle_untracked_files_arg(struct wt_status *s) static const char *read_commit_message(const char *name) { - const char *out_enc, *out; + const char *out_enc; struct commit *commit; commit = lookup_commit_reference_by_name(name); if (!commit) die(_("could not lookup commit %s"), name); out_enc = get_commit_output_encoding(); - out = logmsg_reencode(commit, out_enc); - - /* - * If we failed to reencode the buffer, just copy it - * byte for byte so the user can try to fix it up. - * This also handles the case where input and output - * encodings are identical. - */ - if (out == NULL) - out = xstrdup(commit->buffer); - return out; + return logmsg_reencode(commit, out_enc); } static int parse_and_validate_options(int argc, const char *argv[], @@ -1320,6 +1312,8 @@ static int git_commit_config(const char *k, const char *v, void *cb) include_status = git_config_bool(k, v); return 0; } + if (!strcmp(k, "commit.cleanup")) + return git_config_string(&cleanup_arg, k, v); status = git_gpg_config(k, v, NULL); if (status) @@ -1327,8 +1321,6 @@ static int git_commit_config(const char *k, const char *v, void *cb) return git_status_config(k, v, s); } -static const char post_rewrite_hook[] = "hooks/post-rewrite"; - static int run_rewrite_hook(const unsigned char *oldsha1, const unsigned char *newsha1) { @@ -1339,10 +1331,10 @@ static int run_rewrite_hook(const unsigned char *oldsha1, int code; size_t n; - if (access(git_path(post_rewrite_hook), X_OK) < 0) + argv[0] = find_hook("post-rewrite"); + if (!argv[0]) return 0; - argv[0] = git_path(post_rewrite_hook); argv[1] = "amend"; argv[2] = NULL; diff --git a/builtin/count-objects.c b/builtin/count-objects.c index 9afaa88f77..3a01a8d085 100644 --- a/builtin/count-objects.c +++ b/builtin/count-objects.c @@ -9,11 +9,22 @@ #include "builtin.h" #include "parse-options.h" +static unsigned long garbage; +static off_t size_garbage; + +static void real_report_garbage(const char *desc, const char *path) +{ + struct stat st; + if (!stat(path, &st)) + size_garbage += st.st_size; + warning("%s: %s", desc, path); + garbage++; +} + static void count_objects(DIR *d, char *path, int len, int verbose, unsigned long *loose, off_t *loose_size, - unsigned long *packed_loose, - unsigned long *garbage) + unsigned long *packed_loose) { struct dirent *ent; while ((ent = readdir(d)) != NULL) { @@ -46,9 +57,11 @@ static void count_objects(DIR *d, char *path, int len, int verbose, } if (bad) { if (verbose) { - error("garbage found: %.*s/%s", - len + 2, path, ent->d_name); - (*garbage)++; + struct strbuf sb = STRBUF_INIT; + strbuf_addf(&sb, "%.*s/%s", + len + 2, path, ent->d_name); + report_garbage("garbage found", sb.buf); + strbuf_release(&sb); } continue; } @@ -76,7 +89,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix) const char *objdir = get_object_directory(); int len = strlen(objdir); char *path = xmalloc(len + 50); - unsigned long loose = 0, packed = 0, packed_loose = 0, garbage = 0; + unsigned long loose = 0, packed = 0, packed_loose = 0; off_t loose_size = 0; struct option opts[] = { OPT__VERBOSE(&verbose, N_("be verbose")), @@ -87,6 +100,8 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix) /* we do not take arguments other than flags for now */ if (argc) usage_with_options(count_objects_usage, opts); + if (verbose) + report_garbage = real_report_garbage; memcpy(path, objdir, len); if (len && objdir[len-1] != '/') path[len++] = '/'; @@ -97,7 +112,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix) if (!d) continue; count_objects(d, path, len, verbose, - &loose, &loose_size, &packed_loose, &garbage); + &loose, &loose_size, &packed_loose); closedir(d); } if (verbose) { @@ -122,6 +137,7 @@ int cmd_count_objects(int argc, const char **argv, const char *prefix) printf("size-pack: %lu\n", (unsigned long) (size_pack / 1024)); printf("prune-packable: %lu\n", packed_loose); printf("garbage: %lu\n", garbage); + printf("size-garbage: %lu\n", (unsigned long) (size_garbage / 1024)); } else printf("%lu objects, %lu kilobytes\n", diff --git a/builtin/describe.c b/builtin/describe.c index 04c185b1fb..6636a68cd9 100644 --- a/builtin/describe.c +++ b/builtin/describe.c @@ -137,40 +137,39 @@ static void add_to_known_names(const char *path, static int get_name(const char *path, const unsigned char *sha1, int flag, void *cb_data) { - int might_be_tag = !prefixcmp(path, "refs/tags/"); + int is_tag = !prefixcmp(path, "refs/tags/"); unsigned char peeled[20]; - int is_tag, prio; + int is_annotated, prio; - if (!all && !might_be_tag) + /* Reject anything outside refs/tags/ unless --all */ + if (!all && !is_tag) return 0; + /* Accept only tags that match the pattern, if given */ + if (pattern && (!is_tag || fnmatch(pattern, path + 10, 0))) + return 0; + + /* Is it annotated? */ if (!peel_ref(path, peeled)) { - is_tag = !!hashcmp(sha1, peeled); + is_annotated = !!hashcmp(sha1, peeled); } else { hashcpy(peeled, sha1); - is_tag = 0; + is_annotated = 0; } - /* If --all, then any refs are used. - * If --tags, then any tags are used. - * Otherwise only annotated tags are used. + /* + * By default, we only use annotated tags, but with --tags + * we fall back to lightweight ones (even without --tags, + * we still remember lightweight ones, only to give hints + * in an error message). --all allows any refs to be used. */ - if (might_be_tag) { - if (is_tag) - prio = 2; - else - prio = 1; - - if (pattern && fnmatch(pattern, path + 10, 0)) - prio = 0; - } + if (is_annotated) + prio = 2; + else if (is_tag) + prio = 1; else prio = 0; - if (!all) { - if (!prio) - return 0; - } add_to_known_names(all ? path + 5 : path + 10, peeled, prio, sha1); return 0; } @@ -402,8 +401,8 @@ int cmd_describe(int argc, const char **argv, const char *prefix) struct option options[] = { OPT_BOOLEAN(0, "contains", &contains, N_("find the tag that comes after the commit")), OPT_BOOLEAN(0, "debug", &debug, N_("debug search strategy on stderr")), - OPT_BOOLEAN(0, "all", &all, N_("use any ref in .git/refs")), - OPT_BOOLEAN(0, "tags", &tags, N_("use any tag in .git/refs/tags")), + OPT_BOOLEAN(0, "all", &all, N_("use any ref")), + OPT_BOOLEAN(0, "tags", &tags, N_("use any tag, even unannotated")), OPT_BOOLEAN(0, "long", &longformat, N_("always use long format")), OPT__ABBREV(&abbrev), OPT_SET_INT(0, "exact-match", &max_candidates, diff --git a/builtin/fast-export.c b/builtin/fast-export.c index 77dffd1ce3..d380155d9c 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -113,12 +113,13 @@ static void show_progress(void) printf("progress %d objects\n", counter); } -static void handle_object(const unsigned char *sha1) +static void export_blob(const unsigned char *sha1) { unsigned long size; enum object_type type; char *buf; struct object *object; + int eaten; if (no_data) return; @@ -126,16 +127,18 @@ static void handle_object(const unsigned char *sha1) if (is_null_sha1(sha1)) return; - object = parse_object(sha1); - if (!object) - die ("Could not read blob %s", sha1_to_hex(sha1)); - - if (object->flags & SHOWN) + object = lookup_object(sha1); + if (object && object->flags & SHOWN) return; buf = read_sha1_file(sha1, &type, &size); if (!buf) die ("Could not read blob %s", sha1_to_hex(sha1)); + if (check_sha1_signature(sha1, buf, size, typename(type)) < 0) + die("sha1 mismatch in blob %s", sha1_to_hex(sha1)); + object = parse_object_buffer(sha1, type, size, buf, &eaten); + if (!object) + die("Could not read blob %s", sha1_to_hex(sha1)); mark_next_object(object); @@ -147,7 +150,8 @@ static void handle_object(const unsigned char *sha1) show_progress(); object->flags |= SHOWN; - free(buf); + if (!eaten) + free(buf); } static int depth_first(const void *a_, const void *b_) @@ -312,7 +316,7 @@ static void handle_commit(struct commit *commit, struct rev_info *rev) /* Export the referenced blobs, and remember the marks. */ for (i = 0; i < diff_queued_diff.nr; i++) if (!S_ISGITLINK(diff_queued_diff.queue[i]->two->mode)) - handle_object(diff_queued_diff.queue[i]->two->sha1); + export_blob(diff_queued_diff.queue[i]->two->sha1); mark_next_object(&commit->object); if (!is_encoding_utf8(encoding)) @@ -512,7 +516,7 @@ static void get_tags_and_duplicates(struct rev_cmdline_info *info, commit = (struct commit *)tag; break; case OBJ_BLOB: - handle_object(tag->object.sha1); + export_blob(tag->object.sha1); continue; default: /* OBJ_TAG (nested tags) is already handled */ warning("Tag points to object of unexpected type %s, skipping.", diff --git a/builtin/fetch-pack.c b/builtin/fetch-pack.c index 940ae35dc2..670e81fd99 100644 --- a/builtin/fetch-pack.c +++ b/builtin/fetch-pack.c @@ -7,12 +7,31 @@ static const char fetch_pack_usage[] = "[--include-tag] [--upload-pack=<git-upload-pack>] [--depth=<n>] " "[--no-progress] [-v] [<host>:]<directory> [<refs>...]"; +static void add_sought_entry_mem(struct ref ***sought, int *nr, int *alloc, + const char *name, int namelen) +{ + struct ref *ref = xcalloc(1, sizeof(*ref) + namelen + 1); + + memcpy(ref->name, name, namelen); + ref->name[namelen] = '\0'; + (*nr)++; + ALLOC_GROW(*sought, *nr, *alloc); + (*sought)[*nr - 1] = ref; +} + +static void add_sought_entry(struct ref ***sought, int *nr, int *alloc, + const char *string) +{ + add_sought_entry_mem(sought, nr, alloc, string, strlen(string)); +} + int cmd_fetch_pack(int argc, const char **argv, const char *prefix) { int i, ret; struct ref *ref = NULL; const char *dest = NULL; - struct string_list sought = STRING_LIST_INIT_DUP; + struct ref **sought = NULL; + int nr_sought = 0, alloc_sought = 0; int fd[2]; char *pack_lockfile = NULL; char **pack_lockfile_ptr = NULL; @@ -94,7 +113,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) * refs from the standard input: */ for (; i < argc; i++) - string_list_append(&sought, xstrdup(argv[i])); + add_sought_entry(&sought, &nr_sought, &alloc_sought, argv[i]); if (args.stdin_refs) { if (args.stateless_rpc) { /* in stateless RPC mode we use pkt-line to read @@ -107,14 +126,14 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) break; if (line[n-1] == '\n') n--; - string_list_append(&sought, xmemdupz(line, n)); + add_sought_entry_mem(&sought, &nr_sought, &alloc_sought, line, n); } } else { /* read from stdin one ref per line, until EOF */ struct strbuf line = STRBUF_INIT; while (strbuf_getline(&line, stdin, '\n') != EOF) - string_list_append(&sought, strbuf_detach(&line, NULL)); + add_sought_entry(&sought, &nr_sought, &alloc_sought, line.buf); strbuf_release(&line); } } @@ -131,7 +150,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) get_remote_heads(fd[0], &ref, 0, NULL); ref = fetch_pack(&args, fd, conn, ref, dest, - &sought, pack_lockfile_ptr); + sought, nr_sought, pack_lockfile_ptr); if (pack_lockfile) { printf("lock %s\n", pack_lockfile); fflush(stdout); @@ -141,7 +160,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) if (finish_connect(conn)) return 1; - ret = !ref || sought.nr; + ret = !ref; /* * If the heads to pull were given, we should have consumed @@ -149,8 +168,13 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix) * remote no-such-ref' would silently succeed without issuing * an error. */ - for (i = 0; i < sought.nr; i++) - error("no such remote ref %s", sought.items[i].string); + for (i = 0; i < nr_sought; i++) { + if (!sought[i] || sought[i]->matched) + continue; + error("no such remote ref %s", sought[i]->name); + ret = 1; + } + while (ref) { printf("%s %s\n", sha1_to_hex(ref->old_sha1), ref->name); diff --git a/builtin/fetch.c b/builtin/fetch.c index 4b5a89839b..4b6b1dfe66 100644 --- a/builtin/fetch.c +++ b/builtin/fetch.c @@ -32,7 +32,7 @@ enum { static int all, append, dry_run, force, keep, multiple, prune, update_head_ok, verbosity; static int progress = -1, recurse_submodules = RECURSE_SUBMODULES_DEFAULT; -static int tags = TAGS_DEFAULT; +static int tags = TAGS_DEFAULT, unshallow; static const char *depth; static const char *upload_pack; static struct strbuf default_rla = STRBUF_INIT; @@ -82,6 +82,9 @@ static struct option builtin_fetch_options[] = { OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), OPT_STRING(0, "depth", &depth, N_("depth"), N_("deepen history of shallow clone")), + { OPTION_SET_INT, 0, "unshallow", &unshallow, NULL, + N_("convert to a complete repository"), + PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1 }, { OPTION_STRING, 0, "submodule-prefix", &submodule_prefix, N_("dir"), N_("prepend this to submodule path output"), PARSE_OPT_HIDDEN }, { OPTION_STRING, 0, "recurse-submodules-default", @@ -959,6 +962,9 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) struct string_list list = STRING_LIST_INIT_NODUP; struct remote *remote; int result = 0; + static const char *argv_gc_auto[] = { + "gc", "--auto", NULL, + }; packet_trace_identity("fetch"); @@ -970,6 +976,18 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, builtin_fetch_options, builtin_fetch_usage, 0); + if (unshallow) { + if (depth) + die(_("--depth and --unshallow cannot be used together")); + else if (!is_repository_shallow()) + die(_("--unshallow on a complete repository does not make sense")); + else { + static char inf_depth[12]; + sprintf(inf_depth, "%d", INFINITE_DEPTH); + depth = inf_depth; + } + } + if (recurse_submodules != RECURSE_SUBMODULES_OFF) { if (recurse_submodules_default) { int arg = parse_fetch_recurse_submodules_arg("--recurse-submodules-default", recurse_submodules_default); @@ -1026,5 +1044,7 @@ int cmd_fetch(int argc, const char **argv, const char *prefix) list.strdup_strings = 1; string_list_clear(&list, 0); + run_command_v_opt(argv_gc_auto, RUN_GIT_CMD); + return result; } diff --git a/builtin/fmt-merge-msg.c b/builtin/fmt-merge-msg.c index d9af43c257..265a9253bf 100644 --- a/builtin/fmt-merge-msg.c +++ b/builtin/fmt-merge-msg.c @@ -470,7 +470,7 @@ static void fmt_tag_signature(struct strbuf *tagbuf, strbuf_complete_line(tagbuf); if (sig->len) { strbuf_addch(tagbuf, '\n'); - strbuf_add_lines(tagbuf, "# ", sig->buf, sig->len); + strbuf_add_commented_lines(tagbuf, sig->buf, sig->len); } } @@ -492,7 +492,7 @@ static void fmt_merge_msg_sigs(struct strbuf *out) if (size == len) ; /* merely annotated */ - else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig)) { + else if (verify_signed_buffer(buf, len, buf + len, size - len, &sig, NULL)) { if (!sig.len) strbuf_addstr(&sig, "gpg verification failed.\n"); } diff --git a/builtin/grep.c b/builtin/grep.c index 0e1b6c860e..159e65d47a 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -820,9 +820,9 @@ int cmd_grep(int argc, const char **argv, const char *prefix) unsigned char sha1[20]; /* Is it a rev? */ if (!get_sha1(arg, sha1)) { - struct object *object = parse_object(sha1); - if (!object) - die(_("bad object %s"), arg); + struct object *object = parse_object_or_die(sha1, arg); + if (!seen_dashdash) + verify_non_filename(prefix, arg); add_object_array(object, arg, &list); continue; } diff --git a/builtin/help.c b/builtin/help.c index bd86253d83..d1d71816a9 100644 --- a/builtin/help.c +++ b/builtin/help.c @@ -6,7 +6,6 @@ #include "cache.h" #include "builtin.h" #include "exec_cmd.h" -#include "common-cmds.h" #include "parse-options.h" #include "run-command.h" #include "column.h" @@ -237,21 +236,21 @@ static int add_man_viewer_cmd(const char *name, static int add_man_viewer_info(const char *var, const char *value) { - const char *name = var + 4; - const char *subkey = strrchr(name, '.'); + const char *name, *subkey; + int namelen; - if (!subkey) + if (parse_config_key(var, "man", &name, &namelen, &subkey) < 0 || !name) return 0; - if (!strcmp(subkey, ".path")) { + if (!strcmp(subkey, "path")) { if (!value) return config_error_nonbool(var); - return add_man_viewer_path(name, subkey - name, value); + return add_man_viewer_path(name, namelen, value); } - if (!strcmp(subkey, ".cmd")) { + if (!strcmp(subkey, "cmd")) { if (!value) return config_error_nonbool(var); - return add_man_viewer_cmd(name, subkey - name, value); + return add_man_viewer_cmd(name, namelen, value); } return 0; @@ -287,23 +286,6 @@ static int git_help_config(const char *var, const char *value, void *cb) static struct cmdnames main_cmds, other_cmds; -void list_common_cmds_help(void) -{ - int i, longest = 0; - - for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { - if (longest < strlen(common_cmds[i].name)) - longest = strlen(common_cmds[i].name); - } - - puts(_("The most commonly used git commands are:")); - for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { - printf(" %s ", common_cmds[i].name); - mput_char(' ', longest - strlen(common_cmds[i].name)); - puts(_(common_cmds[i].help)); - } -} - static int is_git_command(const char *s) { return is_in_cmdlist(&main_cmds, s) || diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 43d364b8d5..ef62124aa4 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -1099,7 +1099,7 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha if (fix_thin_pack) { struct sha1file *f; unsigned char read_sha1[20], tail_sha1[20]; - char msg[48]; + struct strbuf msg = STRBUF_INIT; int nr_unresolved = nr_deltas - nr_resolved_deltas; int nr_objects_initial = nr_objects; if (nr_unresolved <= 0) @@ -1109,9 +1109,10 @@ static void conclude_pack(int fix_thin_pack, const char *curr_pack, unsigned cha * sizeof(*objects)); f = sha1fd(output_fd, curr_pack); fix_unresolved_deltas(f, nr_unresolved); - sprintf(msg, _("completed with %d local objects"), - nr_objects - nr_objects_initial); - stop_progress_msg(&progress, msg); + strbuf_addf(&msg, _("completed with %d local objects"), + nr_objects - nr_objects_initial); + stop_progress_msg(&progress, msg.buf); + strbuf_release(&msg); sha1close(f, tail_sha1, 0); hashcpy(read_sha1, pack_sha1); fixup_pack_header_footer(output_fd, pack_sha1, diff --git a/builtin/log.c b/builtin/log.c index 5a4055eb0b..8f0b2e84fe 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -22,6 +22,7 @@ #include "branch.h" #include "streaming.h" #include "version.h" +#include "mailmap.h" /* Set a default date-time format for git log ("log.date" config variable) */ static const char *default_date_mode = NULL; @@ -30,6 +31,7 @@ static int default_abbrev_commit; static int default_show_root = 1; static int decoration_style; static int decoration_given; +static int use_mailmap_config; static const char *fmt_patch_subject_prefix = "PATCH"; static const char *fmt_pretty; @@ -94,16 +96,18 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, struct rev_info *rev, struct setup_revision_opt *opt) { struct userformat_want w; - int quiet = 0, source = 0; + int quiet = 0, source = 0, mailmap = 0; const struct option builtin_log_options[] = { OPT_BOOLEAN(0, "quiet", &quiet, N_("suppress diff output")), OPT_BOOLEAN(0, "source", &source, N_("show source")), + OPT_BOOLEAN(0, "use-mailmap", &mailmap, N_("Use mail map file")), { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"), PARSE_OPT_OPTARG, decorate_callback}, OPT_END() }; + mailmap = use_mailmap_config; argc = parse_options(argc, argv, prefix, builtin_log_options, builtin_log_usage, PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN | @@ -136,6 +140,11 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix, if (source) rev->show_source = 1; + if (mailmap) { + rev->mailmap = xcalloc(1, sizeof(struct string_list)); + read_mailmap(rev->mailmap, NULL); + } + if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) { /* * "log --pretty=raw" is special; ignore UI oriented @@ -351,6 +360,11 @@ static int git_log_config(const char *var, const char *value, void *cb) } if (!prefixcmp(var, "color.decorate.")) return parse_decorate_color_config(var, 15, value); + if (!strcmp(var, "log.mailmap")) { + use_mailmap_config = git_config_bool(var, value); + return 0; + } + if (grep_config(var, value, cb) < 0) return -1; return git_diff_ui_config(var, value, cb); diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 373c573449..175e6e3e72 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -35,6 +35,7 @@ static int error_unmatch; static char *ps_matched; static const char *with_tree; static int exc_given; +static int exclude_args; static const char *tag_cached = ""; static const char *tag_unmerged = ""; @@ -420,10 +421,10 @@ static int option_parse_z(const struct option *opt, static int option_parse_exclude(const struct option *opt, const char *arg, int unset) { - struct exclude_list *list = opt->value; + struct string_list *exclude_list = opt->value; exc_given = 1; - add_exclude(arg, "", 0, list); + string_list_append(exclude_list, arg); return 0; } @@ -452,9 +453,11 @@ static int option_parse_exclude_standard(const struct option *opt, int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) { - int require_work_tree = 0, show_tag = 0; + int require_work_tree = 0, show_tag = 0, i; const char *max_prefix; struct dir_struct dir; + struct exclude_list *el; + struct string_list exclude_list = STRING_LIST_INIT_NODUP; struct option builtin_ls_files_options[] = { { OPTION_CALLBACK, 'z', NULL, NULL, NULL, N_("paths are separated with NUL character"), @@ -488,7 +491,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) N_("show unmerged files in the output")), OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo, N_("show resolve-undo information")), - { OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL], N_("pattern"), + { OPTION_CALLBACK, 'x', "exclude", &exclude_list, N_("pattern"), N_("skip files matching pattern"), 0, option_parse_exclude }, { OPTION_CALLBACK, 'X', "exclude-from", &dir, N_("file"), @@ -525,6 +528,10 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) argc = parse_options(argc, argv, prefix, builtin_ls_files_options, ls_files_usage, 0); + el = add_exclude_list(&dir, EXC_CMDL, "--exclude option"); + for (i = 0; i < exclude_list.nr; i++) { + add_exclude(exclude_list.items[i].string, "", 0, el, --exclude_args); + } if (show_tag || show_valid_bit) { tag_cached = "H "; tag_unmerged = "M "; diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c index 2d4327801e..06296d4bdf 100644 --- a/builtin/mailsplit.c +++ b/builtin/mailsplit.c @@ -130,6 +130,27 @@ static int populate_maildir_list(struct string_list *list, const char *path) return 0; } +static int maildir_filename_cmp(const char *a, const char *b) +{ + while (*a && *b) { + if (isdigit(*a) && isdigit(*b)) { + long int na, nb; + na = strtol(a, (char **)&a, 10); + nb = strtol(b, (char **)&b, 10); + if (na != nb) + return na - nb; + /* strtol advanced our pointers */ + } + else { + if (*a != *b) + return (unsigned char)*a - (unsigned char)*b; + a++; + b++; + } + } + return (unsigned char)*a - (unsigned char)*b; +} + static int split_maildir(const char *maildir, const char *dir, int nr_prec, int skip) { @@ -139,6 +160,8 @@ static int split_maildir(const char *maildir, const char *dir, int i; struct string_list list = STRING_LIST_INIT_DUP; + list.cmp = maildir_filename_cmp; + if (populate_maildir_list(&list, maildir) < 0) goto out; diff --git a/builtin/merge.c b/builtin/merge.c index 9307e9c726..7c8922c8b0 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -788,17 +788,16 @@ static const char merge_editor_comment[] = N_("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" + "Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n"); static void prepare_to_commit(struct commit_list *remoteheads) { struct strbuf msg = STRBUF_INIT; - const char *comment = _(merge_editor_comment); strbuf_addbuf(&msg, &merge_msg); strbuf_addch(&msg, '\n'); if (0 < option_edit) - strbuf_add_lines(&msg, "# ", comment, strlen(comment)); + strbuf_commented_addf(&msg, _(merge_editor_comment), comment_line_char); write_merge_msg(&msg); if (run_hook(get_index_file(), "prepare-commit-msg", git_path("MERGE_MSG"), "merge", NULL, NULL)) diff --git a/builtin/notes.c b/builtin/notes.c index 453457adb9..57748a6fb6 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -92,10 +92,7 @@ static const char * const git_notes_get_ref_usage[] = { }; static const char note_template[] = - "\n" - "#\n" - "# Write/edit the notes for the following object:\n" - "#\n"; + "\nWrite/edit the notes for the following object:\n"; struct msg_arg { int given; @@ -129,7 +126,7 @@ static void write_commented_object(int fd, const unsigned char *object) {"show", "--stat", "--no-notes", sha1_to_hex(object), NULL}; struct child_process show; struct strbuf buf = STRBUF_INIT; - FILE *show_out; + struct strbuf cbuf = STRBUF_INIT; /* Invoke "git show --stat --no-notes $object" */ memset(&show, 0, sizeof(show)); @@ -142,21 +139,14 @@ static void write_commented_object(int fd, const unsigned char *object) die(_("unable to start 'show' for object '%s'"), sha1_to_hex(object)); - /* Open the output as FILE* so strbuf_getline() can be used. */ - show_out = xfdopen(show.out, "r"); - if (show_out == NULL) - die_errno(_("can't fdopen 'show' output fd")); + if (strbuf_read(&buf, show.out, 0) < 0) + die_errno(_("could not read 'show' output")); + strbuf_add_commented_lines(&cbuf, buf.buf, buf.len); + write_or_die(fd, cbuf.buf, cbuf.len); - /* Prepend "# " to each output line and write result to 'fd' */ - while (strbuf_getline(&buf, show_out, '\n') != EOF) { - write_or_die(fd, "# ", 2); - write_or_die(fd, buf.buf, buf.len); - write_or_die(fd, "\n", 1); - } + strbuf_release(&cbuf); strbuf_release(&buf); - if (fclose(show_out)) - die_errno(_("failed to close pipe to 'show' for object '%s'"), - sha1_to_hex(object)); + if (finish_command(&show)) die(_("failed to finish 'show' for object '%s'"), sha1_to_hex(object)); @@ -170,6 +160,7 @@ static void create_note(const unsigned char *object, struct msg_arg *msg, if (msg->use_editor || !msg->given) { int fd; + struct strbuf buf = STRBUF_INIT; /* write the template message before editing: */ path = git_pathdup("NOTES_EDITMSG"); @@ -181,11 +172,16 @@ static void create_note(const unsigned char *object, struct msg_arg *msg, write_or_die(fd, msg->buf.buf, msg->buf.len); else if (prev && !append_only) write_note_data(fd, prev); - write_or_die(fd, note_template, strlen(note_template)); + + strbuf_addch(&buf, '\n'); + strbuf_add_commented_lines(&buf, note_template, strlen(note_template)); + strbuf_addch(&buf, '\n'); + write_or_die(fd, buf.buf, buf.len); write_commented_object(fd, object); close(fd); + strbuf_release(&buf); strbuf_reset(&(msg->buf)); if (launch_editor(path, &(msg->buf), NULL)) { diff --git a/builtin/prune.c b/builtin/prune.c index 8cb8b9186a..85843d4f17 100644 --- a/builtin/prune.c +++ b/builtin/prune.c @@ -149,9 +149,7 @@ int cmd_prune(int argc, const char **argv, const char *prefix) const char *name = *argv++; if (!get_sha1(name, sha1)) { - struct object *object = parse_object(sha1); - if (!object) - die("bad object: %s", name); + struct object *object = parse_object_or_die(sha1, name); add_pending_object(&revs, object, ""); } else diff --git a/builtin/push.c b/builtin/push.c index 8491e431e4..5e4a0e958f 100644 --- a/builtin/push.c +++ b/builtin/push.c @@ -220,9 +220,20 @@ static const char message_advice_checkout_pull_push[] = "(e.g. 'git pull') before pushing again.\n" "See the 'Note about fast-forwards' in 'git push --help' for details."); +static const char message_advice_ref_fetch_first[] = + N_("Updates were rejected because the remote contains work that you do\n" + "not have locally. This is usually caused by another repository pushing\n" + "to the same ref. You may want to first merge the remote changes (e.g.,\n" + "'git pull') before pushing again.\n" + "See the 'Note about fast-forwards' in 'git push --help' for details."); + static const char message_advice_ref_already_exists[] = - N_("Updates were rejected because the destination reference already exists\n" - "in the remote."); + N_("Updates were rejected because the tag already exists in the remote."); + +static const char message_advice_ref_needs_force[] = + N_("You cannot update a remote ref that points at a non-commit object,\n" + "or update a remote ref to make it point at a non-commit object,\n" + "without using the '--force' option.\n"); static void advise_pull_before_push(void) { @@ -252,6 +263,20 @@ static void advise_ref_already_exists(void) advise(_(message_advice_ref_already_exists)); } +static void advise_ref_fetch_first(void) +{ + if (!advice_push_fetch_first || !advice_push_update_rejected) + return; + advise(_(message_advice_ref_fetch_first)); +} + +static void advise_ref_needs_force(void) +{ + if (!advice_push_needs_force || !advice_push_update_rejected) + return; + advise(_(message_advice_ref_needs_force)); +} + static int push_with_options(struct transport *transport, int flags) { int err; @@ -285,6 +310,10 @@ static int push_with_options(struct transport *transport, int flags) advise_checkout_pull_push(); } else if (reject_reasons & REJECT_ALREADY_EXISTS) { advise_ref_already_exists(); + } else if (reject_reasons & REJECT_FETCH_FIRST) { + advise_ref_fetch_first(); + } else if (reject_reasons & REJECT_NEEDS_FORCE) { + advise_ref_needs_force(); } return 1; @@ -407,6 +436,9 @@ int cmd_push(int argc, const char **argv, const char *prefix) OPT_BOOL(0, "progress", &progress, N_("force progress reporting")), OPT_BIT(0, "prune", &flags, N_("prune locally removed refs"), TRANSPORT_PUSH_PRUNE), + OPT_BIT(0, "no-verify", &flags, N_("bypass pre-push hook"), TRANSPORT_PUSH_NO_HOOK), + OPT_BIT(0, "follow-tags", &flags, N_("push missing but relevant tags"), + TRANSPORT_PUSH_FOLLOW_TAGS), OPT_END() }; diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index ff781febca..62ba6e7a3d 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -59,6 +59,11 @@ static enum deny_action parse_deny_action(const char *var, const char *value) static int receive_pack_config(const char *var, const char *value, void *cb) { + int status = parse_hide_refs_config(var, value, "receive"); + + if (status) + return status; + if (strcmp(var, "receive.denydeletes") == 0) { deny_deletes = git_config_bool(var, value); return 0; @@ -119,6 +124,9 @@ static int receive_pack_config(const char *var, const char *value, void *cb) static void show_ref(const char *path, const unsigned char *sha1) { + if (ref_is_hidden(path)) + return; + if (sent_capabilities) packet_write(1, "%s %s\n", sha1_to_hex(sha1), path); else @@ -182,9 +190,6 @@ struct command { char ref_name[FLEX_ARRAY]; /* more */ }; -static const char pre_receive_hook[] = "hooks/pre-receive"; -static const char post_receive_hook[] = "hooks/post-receive"; - static void rp_error(const char *err, ...) __attribute__((format (printf, 1, 2))); static void rp_warning(const char *err, ...) __attribute__((format (printf, 1, 2))); @@ -242,10 +247,10 @@ static int run_and_feed_hook(const char *hook_name, feed_fn feed, void *feed_sta const char *argv[2]; int code; - if (access(hook_name, X_OK) < 0) + argv[0] = find_hook(hook_name); + if (!argv[0]) return 0; - argv[0] = hook_name; argv[1] = NULL; memset(&proc, 0, sizeof(proc)); @@ -331,15 +336,14 @@ static int run_receive_hook(struct command *commands, const char *hook_name, static int run_update_hook(struct command *cmd) { - static const char update_hook[] = "hooks/update"; const char *argv[5]; struct child_process proc; int code; - if (access(update_hook, X_OK) < 0) + argv[0] = find_hook("update"); + if (!argv[0]) return 0; - argv[0] = update_hook; argv[1] = cmd->ref_name; argv[2] = sha1_to_hex(cmd->old_sha1); argv[3] = sha1_to_hex(cmd->new_sha1); @@ -532,24 +536,25 @@ static const char *update(struct command *cmd) } } -static char update_post_hook[] = "hooks/post-update"; - static void run_update_post_hook(struct command *commands) { struct command *cmd; int argc; const char **argv; struct child_process proc; + char *hook; + hook = find_hook("post-update"); for (argc = 0, cmd = commands; cmd; cmd = cmd->next) { if (cmd->error_string || cmd->did_not_exist) continue; argc++; } - if (!argc || access(update_post_hook, X_OK) < 0) + if (!argc || !hook) return; + argv = xmalloc(sizeof(*argv) * (2 + argc)); - argv[0] = update_post_hook; + argv[0] = hook; for (argc = 1, cmd = commands; cmd; cmd = cmd->next) { char *p; @@ -688,6 +693,20 @@ static int iterate_receive_command_list(void *cb_data, unsigned char sha1[20]) return -1; /* end of list */ } +static void reject_updates_to_hidden(struct command *commands) +{ + struct command *cmd; + + for (cmd = commands; cmd; cmd = cmd->next) { + if (cmd->error_string || !ref_is_hidden(cmd->ref_name)) + continue; + if (is_null_sha1(cmd->new_sha1)) + cmd->error_string = "deny deleting a hidden ref"; + else + cmd->error_string = "deny updating a hidden ref"; + } +} + static void execute_commands(struct command *commands, const char *unpacker_error) { struct command *cmd; @@ -704,7 +723,9 @@ static void execute_commands(struct command *commands, const char *unpacker_erro 0, &cmd)) set_connectivity_errors(commands); - if (run_receive_hook(commands, pre_receive_hook, 0)) { + reject_updates_to_hidden(commands); + + if (run_receive_hook(commands, "pre-receive", 0)) { for (cmd = commands; cmd; cmd = cmd->next) { if (!cmd->error_string) cmd->error_string = "pre-receive hook declined"; @@ -994,7 +1015,7 @@ int cmd_receive_pack(int argc, const char **argv, const char *prefix) unlink_or_warn(pack_lockfile); if (report_status) report(commands, unpack_status); - run_receive_hook(commands, post_receive_hook, 1); + run_receive_hook(commands, "post-receive", 1); run_update_post_hook(commands); if (auto_gc) { const char *argv_gc_auto[] = { diff --git a/builtin/reflog.c b/builtin/reflog.c index b3c9e27bde..72a0af70c3 100644 --- a/builtin/reflog.c +++ b/builtin/reflog.c @@ -414,7 +414,7 @@ static int expire_reflog(const char *ref, const unsigned char *sha1, int unused, if (cb.unreachable_expire_kind == UE_HEAD) { struct commit_list *elem; for (elem = tips; elem; elem = elem->next) - clear_commit_marks(tip_commit, REACHABLE); + clear_commit_marks(elem->item, REACHABLE); free_commit_list(tips); } else { clear_commit_marks(tip_commit, REACHABLE); @@ -510,26 +510,27 @@ static int parse_expire_cfg_value(const char *var, const char *value, unsigned l static int reflog_expire_config(const char *var, const char *value, void *cb) { - const char *lastdot = strrchr(var, '.'); + const char *pattern, *key; + int pattern_len; unsigned long expire; int slot; struct reflog_expire_cfg *ent; - if (!lastdot || prefixcmp(var, "gc.")) + if (parse_config_key(var, "gc", &pattern, &pattern_len, &key) < 0) return git_default_config(var, value, cb); - if (!strcmp(lastdot, ".reflogexpire")) { + if (!strcmp(key, "reflogexpire")) { slot = EXPIRE_TOTAL; if (parse_expire_cfg_value(var, value, &expire)) return -1; - } else if (!strcmp(lastdot, ".reflogexpireunreachable")) { + } else if (!strcmp(key, "reflogexpireunreachable")) { slot = EXPIRE_UNREACH; if (parse_expire_cfg_value(var, value, &expire)) return -1; } else return git_default_config(var, value, cb); - if (lastdot == var + 2) { + if (!pattern) { switch (slot) { case EXPIRE_TOTAL: default_reflog_expire = expire; @@ -541,7 +542,7 @@ static int reflog_expire_config(const char *var, const char *value, void *cb) return 0; } - ent = find_cfg_ent(var + 3, lastdot - (var+3)); + ent = find_cfg_ent(pattern, pattern_len); if (!ent) return -1; switch (slot) { diff --git a/builtin/reset.c b/builtin/reset.c index 915cc9f86f..6032131a90 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -23,8 +23,8 @@ static const char * const git_reset_usage[] = { N_("git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]"), - N_("git reset [-q] <commit> [--] <paths>..."), - N_("git reset --patch [<commit>] [--] [<paths>...]"), + N_("git reset [-q] <tree-ish> [--] <paths>..."), + N_("git reset --patch [<tree-ish>] [--] [<paths>...]"), NULL }; @@ -38,14 +38,12 @@ static inline int is_merge(void) return !access(git_path("MERGE_HEAD"), F_OK); } -static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet) +static int reset_index(const unsigned char *sha1, int reset_type, int quiet) { int nr = 1; - int newfd; struct tree_desc desc[2]; struct tree *tree; struct unpack_trees_options opts; - struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); memset(&opts, 0, sizeof(opts)); opts.head_idx = 1; @@ -67,8 +65,6 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet opts.reset = 1; } - newfd = hold_locked_index(lock, 1); - read_cache_unmerged(); if (reset_type == KEEP) { @@ -91,10 +87,6 @@ static int reset_index_file(const unsigned char *sha1, int reset_type, int quiet prime_cache_tree(&active_cache_tree, tree); } - if (write_cache(newfd, active_cache, active_nr) || - commit_locked_index(lock)) - return error(_("Could not write new index file.")); - return 0; } @@ -117,36 +109,10 @@ static void print_new_head_line(struct commit *commit) printf("\n"); } -static int update_index_refresh(int fd, struct lock_file *index_lock, int flags) -{ - int result; - - if (!index_lock) { - index_lock = xcalloc(1, sizeof(struct lock_file)); - fd = hold_locked_index(index_lock, 1); - } - - if (read_cache() < 0) - return error(_("Could not read index")); - - result = refresh_index(&the_index, (flags), NULL, NULL, - _("Unstaged changes after reset:")) ? 1 : 0; - if (write_cache(fd, active_cache, active_nr) || - commit_locked_index(index_lock)) - return error ("Could not refresh index"); - return result; -} - static void update_index_from_diff(struct diff_queue_struct *q, struct diff_options *opt, void *data) { int i; - int *discard_flag = data; - - /* do_diff_cache() mangled the index */ - discard_cache(); - *discard_flag = 1; - read_cache(); for (i = 0; i < q->nr; i++) { struct diff_filespec *one = q->queue[i]->one; @@ -164,32 +130,15 @@ static void update_index_from_diff(struct diff_queue_struct *q, } } -static int interactive_reset(const char *revision, const char **argv, - const char *prefix) +static int read_from_tree(const char **pathspec, unsigned char *tree_sha1) { - const char **pathspec = NULL; - - if (*argv) - pathspec = get_pathspec(prefix, argv); - - return run_add_interactive(revision, "--patch=reset", pathspec); -} - -static int read_from_tree(const char *prefix, const char **argv, - unsigned char *tree_sha1, int refresh_flags) -{ - struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); - int index_fd, index_was_discarded = 0; struct diff_options opt; memset(&opt, 0, sizeof(opt)); - diff_tree_setup_paths(get_pathspec(prefix, (const char **)argv), &opt); + diff_tree_setup_paths(pathspec, &opt); opt.output_format = DIFF_FORMAT_CALLBACK; opt.format_callback = update_index_from_diff; - opt.format_callback_data = &index_was_discarded; - index_fd = hold_locked_index(lock, 1); - index_was_discarded = 0; read_cache(); if (do_diff_cache(tree_sha1, &opt)) return 1; @@ -197,10 +146,7 @@ static int read_from_tree(const char *prefix, const char **argv, diff_flush(&opt); diff_tree_release_paths(&opt); - if (!index_was_discarded) - /* The index is still clobbered from do_diff_cache() */ - discard_cache(); - return update_index_refresh(index_fd, lock, refresh_flags); + return 0; } static void set_reflog_message(struct strbuf *sb, const char *action, @@ -225,15 +171,79 @@ static void die_if_unmerged_cache(int reset_type) } -int cmd_reset(int argc, const char **argv, const char *prefix) +static const char **parse_args(const char **argv, const char *prefix, const char **rev_ret) { - int i = 0, reset_type = NONE, update_ref_status = 0, quiet = 0; - int patch_mode = 0; const char *rev = "HEAD"; - unsigned char sha1[20], *orig = NULL, sha1_orig[20], - *old_orig = NULL, sha1_old_orig[20]; - struct commit *commit; + unsigned char unused[20]; + /* + * Possible arguments are: + * + * git reset [-opts] [<rev>] + * git reset [-opts] <tree> [<paths>...] + * git reset [-opts] <tree> -- [<paths>...] + * git reset [-opts] -- [<paths>...] + * git reset [-opts] <paths>... + * + * At this point, argv points immediately after [-opts]. + */ + + if (argv[0]) { + if (!strcmp(argv[0], "--")) { + argv++; /* reset to HEAD, possibly with paths */ + } else if (argv[1] && !strcmp(argv[1], "--")) { + rev = argv[0]; + argv += 2; + } + /* + * Otherwise, argv[0] could be either <rev> or <paths> and + * has to be unambiguous. If there is a single argument, it + * can not be a tree + */ + else if ((!argv[1] && !get_sha1_committish(argv[0], unused)) || + (argv[1] && !get_sha1_treeish(argv[0], unused))) { + /* + * Ok, argv[0] looks like a commit/tree; it should not + * be a filename. + */ + verify_non_filename(prefix, argv[0]); + rev = *argv++; + } else { + /* Otherwise we treat this as a filename */ + verify_filename(prefix, argv[0], 1); + } + } + *rev_ret = rev; + return argv[0] ? get_pathspec(prefix, argv) : NULL; +} + +static int update_refs(const char *rev, const unsigned char *sha1) +{ + int update_ref_status; struct strbuf msg = STRBUF_INIT; + unsigned char *orig = NULL, sha1_orig[20], + *old_orig = NULL, sha1_old_orig[20]; + + if (!get_sha1("ORIG_HEAD", sha1_old_orig)) + old_orig = sha1_old_orig; + if (!get_sha1("HEAD", sha1_orig)) { + orig = sha1_orig; + set_reflog_message(&msg, "updating ORIG_HEAD", NULL); + update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR); + } else if (old_orig) + delete_ref("ORIG_HEAD", old_orig, 0); + set_reflog_message(&msg, "updating HEAD", rev); + update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0, MSG_ON_ERR); + strbuf_release(&msg); + return update_ref_status; +} + +int cmd_reset(int argc, const char **argv, const char *prefix) +{ + int reset_type = NONE, update_ref_status = 0, quiet = 0; + int patch_mode = 0, unborn; + const char *rev; + unsigned char sha1[20]; + const char **pathspec = NULL; const struct option options[] = { OPT__QUIET(&quiet, N_("be quiet, only report errors")), OPT_SET_INT(0, "mixed", &reset_type, @@ -253,73 +263,45 @@ int cmd_reset(int argc, const char **argv, const char *prefix) argc = parse_options(argc, argv, prefix, options, git_reset_usage, PARSE_OPT_KEEP_DASHDASH); - - /* - * Possible arguments are: - * - * git reset [-opts] <rev> <paths>... - * git reset [-opts] <rev> -- <paths>... - * git reset [-opts] -- <paths>... - * git reset [-opts] <paths>... - * - * At this point, argv[i] points immediately after [-opts]. - */ - - if (i < argc) { - if (!strcmp(argv[i], "--")) { - i++; /* reset to HEAD, possibly with paths */ - } else if (i + 1 < argc && !strcmp(argv[i+1], "--")) { - rev = argv[i]; - i += 2; - } - /* - * Otherwise, argv[i] could be either <rev> or <paths> and - * has to be unambiguous. - */ - else if (!get_sha1_committish(argv[i], sha1)) { - /* - * Ok, argv[i] looks like a rev; it should not - * be a filename. - */ - verify_non_filename(prefix, argv[i]); - rev = argv[i++]; - } else { - /* Otherwise we treat this as a filename */ - verify_filename(prefix, argv[i], 1); - } + pathspec = parse_args(argv, prefix, &rev); + + unborn = !strcmp(rev, "HEAD") && get_sha1("HEAD", sha1); + if (unborn) { + /* reset on unborn branch: treat as reset to empty tree */ + hashcpy(sha1, EMPTY_TREE_SHA1_BIN); + } else if (!pathspec) { + struct commit *commit; + if (get_sha1_committish(rev, sha1)) + die(_("Failed to resolve '%s' as a valid revision."), rev); + commit = lookup_commit_reference(sha1); + if (!commit) + die(_("Could not parse object '%s'."), rev); + hashcpy(sha1, commit->object.sha1); + } else { + struct tree *tree; + if (get_sha1_treeish(rev, sha1)) + die(_("Failed to resolve '%s' as a valid tree."), rev); + tree = parse_tree_indirect(sha1); + if (!tree) + die(_("Could not parse object '%s'."), rev); + hashcpy(sha1, tree->object.sha1); } - if (get_sha1_committish(rev, sha1)) - die(_("Failed to resolve '%s' as a valid ref."), rev); - - /* - * NOTE: As "git reset $treeish -- $path" should be usable on - * any tree-ish, this is not strictly correct. We are not - * moving the HEAD to any commit; we are merely resetting the - * entries in the index to that of a treeish. - */ - commit = lookup_commit_reference(sha1); - if (!commit) - die(_("Could not parse object '%s'."), rev); - hashcpy(sha1, commit->object.sha1); - if (patch_mode) { if (reset_type != NONE) die(_("--patch is incompatible with --{hard,mixed,soft}")); - return interactive_reset(rev, argv + i, prefix); + return run_add_interactive(sha1_to_hex(sha1), "--patch=reset", pathspec); } /* git reset tree [--] paths... can be used to * load chosen paths from the tree into the index without * affecting the working tree nor HEAD. */ - if (i < argc) { + if (pathspec) { if (reset_type == MIXED) warning(_("--mixed with paths is deprecated; use 'git reset -- <paths>' instead.")); else if (reset_type != NONE) die(_("Cannot do %s reset with paths."), _(reset_type_names[reset_type])); - return read_from_tree(prefix, argv + i, sha1, - quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN); } if (reset_type == NONE) reset_type = MIXED; /* by default */ @@ -334,49 +316,44 @@ int cmd_reset(int argc, const char **argv, const char *prefix) /* Soft reset does not touch the index file nor the working tree * at all, but requires them in a good order. Other resets reset * the index file to the tree object we are switching to. */ - if (reset_type == SOFT) + if (reset_type == SOFT || reset_type == KEEP) die_if_unmerged_cache(reset_type); - else { - int err; - if (reset_type == KEEP) - die_if_unmerged_cache(reset_type); - err = reset_index_file(sha1, reset_type, quiet); - if (reset_type == KEEP) - err = err || reset_index_file(sha1, MIXED, quiet); - if (err) - die(_("Could not reset index file to revision '%s'."), rev); - } - /* Any resets update HEAD to the head being switched to, - * saving the previous head in ORIG_HEAD before. */ - if (!get_sha1("ORIG_HEAD", sha1_old_orig)) - old_orig = sha1_old_orig; - if (!get_sha1("HEAD", sha1_orig)) { - orig = sha1_orig; - set_reflog_message(&msg, "updating ORIG_HEAD", NULL); - update_ref(msg.buf, "ORIG_HEAD", orig, old_orig, 0, MSG_ON_ERR); - } - else if (old_orig) - delete_ref("ORIG_HEAD", old_orig, 0); - set_reflog_message(&msg, "updating HEAD", rev); - update_ref_status = update_ref(msg.buf, "HEAD", sha1, orig, 0, MSG_ON_ERR); + if (reset_type != SOFT) { + struct lock_file *lock = xcalloc(1, sizeof(struct lock_file)); + int newfd = hold_locked_index(lock, 1); + if (reset_type == MIXED) { + if (read_from_tree(pathspec, sha1)) + return 1; + } else { + int err = reset_index(sha1, reset_type, quiet); + if (reset_type == KEEP && !err) + err = reset_index(sha1, MIXED, quiet); + if (err) + die(_("Could not reset index file to revision '%s'."), rev); + } - switch (reset_type) { - case HARD: - if (!update_ref_status && !quiet) - print_new_head_line(commit); - break; - case SOFT: /* Nothing else to do. */ - break; - case MIXED: /* Report what has not been updated. */ - update_index_refresh(0, NULL, - quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN); - break; + if (reset_type == MIXED) { /* Report what has not been updated. */ + int flags = quiet ? REFRESH_QUIET : REFRESH_IN_PORCELAIN; + refresh_index(&the_index, flags, NULL, NULL, + _("Unstaged changes after reset:")); + } + + if (write_cache(newfd, active_cache, active_nr) || + commit_locked_index(lock)) + die(_("Could not write new index file.")); } - remove_branch_state(); + if (!pathspec && !unborn) { + /* Any resets without paths update HEAD to the head being + * switched to, saving the previous head in ORIG_HEAD before. */ + update_ref_status = update_refs(rev, sha1); - strbuf_release(&msg); + if (reset_type == HARD && !update_ref_status && !quiet) + print_new_head_line(lookup_commit_reference(sha1)); + } + if (!pathspec) + remove_branch_state(); return update_ref_status; } diff --git a/builtin/send-pack.c b/builtin/send-pack.c index f849e0a4a0..57a46b2654 100644 --- a/builtin/send-pack.c +++ b/builtin/send-pack.c @@ -44,6 +44,16 @@ static void print_helper_status(struct ref *ref) msg = "non-fast forward"; break; + case REF_STATUS_REJECT_FETCH_FIRST: + res = "error"; + msg = "fetch first"; + break; + + case REF_STATUS_REJECT_NEEDS_FORCE: + res = "error"; + msg = "needs force"; + break; + case REF_STATUS_REJECT_ALREADY_EXISTS: res = "error"; msg = "already exists"; diff --git a/builtin/shortlog.c b/builtin/shortlog.c index 83605143ac..240bff3efa 100644 --- a/builtin/shortlog.c +++ b/builtin/shortlog.c @@ -36,52 +36,28 @@ static void insert_one_record(struct shortlog *log, const char *dot3 = log->common_repo_prefix; char *buffer, *p; struct string_list_item *item; - char namebuf[1024]; - char emailbuf[1024]; - size_t len; + const char *mailbuf, *namebuf; + size_t namelen, maillen; const char *eol; - const char *boemail, *eoemail; struct strbuf subject = STRBUF_INIT; + struct strbuf namemailbuf = STRBUF_INIT; + struct ident_split ident; - boemail = strchr(author, '<'); - if (!boemail) - return; - eoemail = strchr(boemail, '>'); - if (!eoemail) + if (split_ident_line(&ident, author, strlen(author))) return; - /* copy author name to namebuf, to support matching on both name and email */ - memcpy(namebuf, author, boemail - author); - len = boemail - author; - while (len > 0 && isspace(namebuf[len-1])) - len--; - namebuf[len] = 0; - - /* copy email name to emailbuf, to allow email replacement as well */ - memcpy(emailbuf, boemail+1, eoemail - boemail); - emailbuf[eoemail - boemail - 1] = 0; - - if (!map_user(&log->mailmap, emailbuf, sizeof(emailbuf), namebuf, sizeof(namebuf))) { - while (author < boemail && isspace(*author)) - author++; - for (len = 0; - len < sizeof(namebuf) - 1 && author + len < boemail; - len++) - namebuf[len] = author[len]; - while (0 < len && isspace(namebuf[len-1])) - len--; - namebuf[len] = '\0'; - } - else - len = strlen(namebuf); + namebuf = ident.name_begin; + mailbuf = ident.mail_begin; + namelen = ident.name_end - ident.name_begin; + maillen = ident.mail_end - ident.mail_begin; - if (log->email) { - size_t room = sizeof(namebuf) - len - 1; - int maillen = strlen(emailbuf); - snprintf(namebuf + len, room, " <%.*s>", maillen, emailbuf); - } + map_user(&log->mailmap, &mailbuf, &maillen, &namebuf, &namelen); + strbuf_add(&namemailbuf, namebuf, namelen); + + if (log->email) + strbuf_addf(&namemailbuf, " <%.*s>", (int)maillen, mailbuf); - item = string_list_insert(&log->list, namebuf); + item = string_list_insert(&log->list, namemailbuf.buf); if (item->util == NULL) item->util = xcalloc(1, sizeof(struct string_list)); diff --git a/builtin/stripspace.c b/builtin/stripspace.c index f16986c0ae..e981dfb9f0 100644 --- a/builtin/stripspace.c +++ b/builtin/stripspace.c @@ -30,7 +30,8 @@ static size_t cleanup(char *line, size_t len) * * If last line does not have a newline at the end, one is added. * - * Enable skip_comments to skip every line starting with "#". + * Enable skip_comments to skip every line starting with comment + * character. */ void stripspace(struct strbuf *sb, int skip_comments) { @@ -45,7 +46,7 @@ void stripspace(struct strbuf *sb, int skip_comments) eol = memchr(sb->buf + i, '\n', sb->len - i); len = eol ? eol - (sb->buf + i) + 1 : sb->len - i; - if (skip_comments && len && sb->buf[i] == '#') { + if (skip_comments && len && sb->buf[i] == comment_line_char) { newlen = 0; continue; } @@ -66,21 +67,53 @@ void stripspace(struct strbuf *sb, int skip_comments) strbuf_setlen(sb, j); } +static void comment_lines(struct strbuf *buf) +{ + char *msg; + size_t len; + + msg = strbuf_detach(buf, &len); + strbuf_add_commented_lines(buf, msg, len); + free(msg); +} + +static const char *usage_msg = "\n" +" git stripspace [-s | --strip-comments] < input\n" +" git stripspace [-c | --comment-lines] < input"; + int cmd_stripspace(int argc, const char **argv, const char *prefix) { struct strbuf buf = STRBUF_INIT; int strip_comments = 0; + enum { INVAL = 0, STRIP_SPACE = 1, COMMENT_LINES = 2 } mode = STRIP_SPACE; + + if (argc == 2) { + if (!strcmp(argv[1], "-s") || + !strcmp(argv[1], "--strip-comments")) { + strip_comments = 1; + } else if (!strcmp(argv[1], "-c") || + !strcmp(argv[1], "--comment-lines")) { + mode = COMMENT_LINES; + } else { + mode = INVAL; + } + } else if (argc > 1) { + mode = INVAL; + } + + if (mode == INVAL) + usage(usage_msg); - if (argc == 2 && (!strcmp(argv[1], "-s") || - !strcmp(argv[1], "--strip-comments"))) - strip_comments = 1; - else if (argc > 1) - usage("git stripspace [-s | --strip-comments] < input"); + if (strip_comments || mode == COMMENT_LINES) + git_config(git_default_config, NULL); if (strbuf_read(&buf, 0, 1024) < 0) die_errno("could not read the input"); - stripspace(&buf, strip_comments); + if (mode == STRIP_SPACE) + stripspace(&buf, strip_comments); + else + comment_lines(&buf); write_or_die(1, buf.buf, buf.len); strbuf_release(&buf); diff --git a/builtin/tag.c b/builtin/tag.c index 9c3e0673d5..af3af3f649 100644 --- a/builtin/tag.c +++ b/builtin/tag.c @@ -246,19 +246,13 @@ static int do_sign(struct strbuf *buffer) } static const char tag_template[] = - N_("\n" - "#\n" - "# Write a tag message\n" - "# Lines starting with '#' will be ignored.\n" - "#\n"); + N_("\nWrite a tag message\n" + "Lines starting with '%c' will be ignored.\n"); static const char tag_template_nocleanup[] = - N_("\n" - "#\n" - "# Write a tag message\n" - "# Lines starting with '#' will be kept; you may remove them" - " yourself if you want to.\n" - "#\n"); + N_("\nWrite a tag message\n" + "Lines starting with '%c' will be kept; you may remove them" + " yourself if you want to.\n"); static int git_tag_config(const char *var, const char *value, void *cb) { @@ -346,14 +340,18 @@ static void create_tag(const unsigned char *object, const char *tag, if (fd < 0) die_errno(_("could not create file '%s'"), path); - if (!is_null_sha1(prev)) + if (!is_null_sha1(prev)) { write_tag_body(fd, prev); - else if (opt->cleanup_mode == CLEANUP_ALL) - write_or_die(fd, _(tag_template), - strlen(_(tag_template))); - else - write_or_die(fd, _(tag_template_nocleanup), - strlen(_(tag_template_nocleanup))); + } else { + struct strbuf buf = STRBUF_INIT; + strbuf_addch(&buf, '\n'); + if (opt->cleanup_mode == CLEANUP_ALL) + strbuf_commented_addf(&buf, _(tag_template), comment_line_char); + else + strbuf_commented_addf(&buf, _(tag_template_nocleanup), comment_line_char); + write_or_die(fd, buf.buf, buf.len); + strbuf_release(&buf); + } close(fd); if (launch_editor(path, buf, NULL)) { @@ -584,7 +582,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix) die(_("%s: cannot lock the ref"), ref.buf); if (write_ref_sha1(lock, object, NULL) < 0) die(_("%s: cannot update the ref"), ref.buf); - if (force && hashcmp(prev, object)) + if (force && !is_null_sha1(prev) && hashcmp(prev, object)) printf(_("Updated tag '%s' (was %s)\n"), tag, find_unique_abbrev(prev, DEFAULT_ABBREV)); strbuf_release(&buf); diff --git a/builtin/update-index.c b/builtin/update-index.c index ada1dff846..5c7762eef4 100644 --- a/builtin/update-index.c +++ b/builtin/update-index.c @@ -796,7 +796,7 @@ int cmd_update_index(int argc, const char **argv, const char *prefix) }; if (argc == 2 && !strcmp(argv[1], "-h")) - usage(update_index_usage[0]); + usage_with_options(update_index_usage, options); git_config(git_default_config, NULL); diff --git a/builtin/verify-tag.c b/builtin/verify-tag.c index a8eee886a5..9cdf332333 100644 --- a/builtin/verify-tag.c +++ b/builtin/verify-tag.c @@ -29,7 +29,7 @@ static int run_gpg_verify(const char *buf, unsigned long size, int verbose) if (size == len) return error("no signature found"); - return verify_signed_buffer(buf, len, buf + len, size - len, NULL); + return verify_signed_buffer(buf, len, buf + len, size - len, NULL, NULL); } static int verify_tag(const char *name, int verbose) @@ -183,17 +183,17 @@ int verify_bundle(struct bundle_header *header, int verbose) struct ref_list *r; r = &header->references; - printf_ln(Q_("The bundle contains %d ref", - "The bundle contains %d refs", + printf_ln(Q_("The bundle contains this ref:", + "The bundle contains these %d refs:", r->nr), r->nr); list_refs(r, 0, NULL); + r = &header->prerequisites; 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", + printf_ln(Q_("The bundle requires this ref:", + "The bundle requires these %d refs:", r->nr), r->nr); list_refs(r, 0, NULL); @@ -279,12 +279,12 @@ int create_bundle(struct bundle_header *header, const char *path, if (buf.len > 0 && buf.buf[0] == '-') { write_or_die(bundle_fd, buf.buf, buf.len); if (!get_sha1_hex(buf.buf + 1, sha1)) { - struct object *object = parse_object(sha1); + struct object *object = parse_object_or_die(sha1, buf.buf); object->flags |= UNINTERESTING; add_pending_object(&revs, object, xstrdup(buf.buf)); } } else if (!get_sha1_hex(buf.buf, sha1)) { - struct object *object = parse_object(sha1); + struct object *object = parse_object_or_die(sha1, buf.buf); object->flags |= SHOWN; } } @@ -361,7 +361,7 @@ int create_bundle(struct bundle_header *header, const char *path, * end up triggering "empty bundle" * error. */ - obj = parse_object(sha1); + obj = parse_object_or_die(sha1, e->name); obj->flags |= SHOWN; add_pending_object(&revs, obj, e->name); } @@ -342,9 +342,11 @@ static inline enum object_type object_type(unsigned int mode) OBJ_BLOB; } +/* Double-check local_repo_env below if you add to this list. */ #define GIT_DIR_ENVIRONMENT "GIT_DIR" #define GIT_NAMESPACE_ENVIRONMENT "GIT_NAMESPACE" #define GIT_WORK_TREE_ENVIRONMENT "GIT_WORK_TREE" +#define GIT_PREFIX_ENVIRONMENT "GIT_PREFIX" #define DEFAULT_GIT_DIR_ENVIRONMENT ".git" #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY" #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" @@ -366,13 +368,24 @@ static inline enum object_type object_type(unsigned int mode) #define GIT_LITERAL_PATHSPECS_ENVIRONMENT "GIT_LITERAL_PATHSPECS" /* - * Repository-local GIT_* environment variables - * The array is NULL-terminated to simplify its usage in contexts such - * environment creation or simple walk of the list. - * The number of non-NULL entries is available as a macro. + * This environment variable is expected to contain a boolean indicating + * whether we should or should not treat: + * + * GIT_DIR=foo.git git ... + * + * as if GIT_WORK_TREE=. was given. It's not expected that users will make use + * of this, but we use it internally to communicate to sub-processes that we + * are in a bare repo. If not set, defaults to true. */ -#define LOCAL_REPO_ENV_SIZE 9 -extern const char *const local_repo_env[LOCAL_REPO_ENV_SIZE + 1]; +#define GIT_IMPLICIT_WORK_TREE_ENVIRONMENT "GIT_IMPLICIT_WORK_TREE" + +/* + * Repository-local GIT_* environment variables; these will be cleared + * when git spawns a sub-process that runs inside another repository. + * The array is NULL-terminated, which makes it easy to pass in the "env" + * parameter of a run-command invocation, or to do a simple walk. + */ +extern const char * const local_repo_env[]; extern int is_bare_repository_cfg; extern int is_bare_repository(void); @@ -537,6 +550,7 @@ extern int delete_ref(const char *, const unsigned char *sha1, int delopt); /* Environment bits from configuration mechanism */ extern int trust_executable_bit; extern int trust_ctime; +extern int check_stat; extern int quote_path_fully; extern int has_symlinks; extern int minimum_abbrev, default_abbrev; @@ -563,6 +577,12 @@ extern int core_preload_index; extern int core_apply_sparse_checkout; extern int precomposed_unicode; +/* + * The character that begins a commented line in user-editable file + * that is subject to stripspace. + */ +extern char comment_line_char; + enum branch_track { BRANCH_TRACK_UNSPECIFIED = -1, BRANCH_TRACK_NEVER = 0, @@ -1009,18 +1029,18 @@ struct ref { char *symref; unsigned int force:1, - requires_force:1, + forced_update:1, merge:1, - nonfastforward:1, - not_forwardable:1, - update:1, - deletion:1; + deletion:1, + matched:1; enum { REF_STATUS_NONE = 0, REF_STATUS_OK, REF_STATUS_REJECT_NONFASTFORWARD, REF_STATUS_REJECT_ALREADY_EXISTS, REF_STATUS_REJECT_NODELETE, + REF_STATUS_REJECT_FETCH_FIRST, + REF_STATUS_REJECT_NEEDS_FORCE, REF_STATUS_UPTODATE, REF_STATUS_REMOTE_REJECT, REF_STATUS_EXPECTING_REPORT @@ -1052,6 +1072,9 @@ extern const char *parse_feature_value(const char *feature_list, const char *fea extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path); +/* A hook for count-objects to report invalid files in pack directory */ +extern void (*report_garbage)(const char *desc, const char *path); + extern void prepare_packed_git(void); extern void reprepare_packed_git(void); extern void install_packed_git(struct packed_git *pack); @@ -1149,7 +1172,7 @@ extern int check_repository_format_version(const char *var, const char *value, v extern int git_env_bool(const char *, int); extern int git_config_system(void); extern int config_error_nonbool(const char *); -#ifdef __GNUC__ +#if defined(__GNUC__) && ! defined(__clang__) #define config_error_nonbool(s) (config_error_nonbool(s), -1) #endif extern const char *get_log_output_encoding(void); @@ -1165,6 +1188,21 @@ struct config_include_data { #define CONFIG_INCLUDE_INIT { 0 } extern int git_config_include(const char *name, const char *value, void *data); +/* + * Match and parse a config key of the form: + * + * section.(subsection.)?key + * + * (i.e., what gets handed to a config_fn_t). The caller provides the section; + * we return -1 if it does not match, 0 otherwise. The subsection and key + * out-parameters are filled by the function (and subsection is NULL if it is + * missing). + */ +extern int parse_config_key(const char *var, + const char *section, + const char **subsection, int *subsection_len, + const char **key); + extern int committer_ident_sufficiently_given(void); extern int author_ident_sufficiently_given(void); diff --git a/combine-diff.c b/combine-diff.c index bb1cc96c4e..6288485965 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -5,6 +5,7 @@ #include "diffcore.h" #include "quote.h" #include "xdiff-interface.h" +#include "xdiff/xmacros.h" #include "log-tree.h" #include "refs.h" #include "userdiff.h" @@ -122,7 +123,47 @@ static char *grab_blob(const unsigned char *sha1, unsigned int mode, return blob; } -static void append_lost(struct sline *sline, int n, const char *line, int len) +static int match_string_spaces(const char *line1, int len1, + const char *line2, int len2, + long flags) +{ + if (flags & XDF_WHITESPACE_FLAGS) { + for (; len1 > 0 && XDL_ISSPACE(line1[len1 - 1]); len1--); + for (; len2 > 0 && XDL_ISSPACE(line2[len2 - 1]); len2--); + } + + if (!(flags & (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE))) + return (len1 == len2 && !memcmp(line1, line2, len1)); + + while (len1 > 0 && len2 > 0) { + len1--; + len2--; + if (XDL_ISSPACE(line1[len1]) || XDL_ISSPACE(line2[len2])) { + if ((flags & XDF_IGNORE_WHITESPACE_CHANGE) && + (!XDL_ISSPACE(line1[len1]) || !XDL_ISSPACE(line2[len2]))) + return 0; + + for (; len1 > 0 && XDL_ISSPACE(line1[len1]); len1--); + for (; len2 > 0 && XDL_ISSPACE(line2[len2]); len2--); + } + if (line1[len1] != line2[len2]) + return 0; + } + + if (flags & XDF_IGNORE_WHITESPACE) { + /* Consume remaining spaces */ + for (; len1 > 0 && XDL_ISSPACE(line1[len1 - 1]); len1--); + for (; len2 > 0 && XDL_ISSPACE(line2[len2 - 1]); len2--); + } + + /* We matched full line1 and line2 */ + if (!len1 && !len2) + return 1; + + return 0; +} + +static void append_lost(struct sline *sline, int n, const char *line, int len, long flags) { struct lline *lline; unsigned long this_mask = (1UL<<n); @@ -133,8 +174,8 @@ static void append_lost(struct sline *sline, int n, const char *line, int len) if (sline->lost_head) { lline = sline->next_lost; while (lline) { - if (lline->len == len && - !memcmp(lline->line, line, len)) { + if (match_string_spaces(lline->line, lline->len, + line, len, flags)) { lline->parent_map |= this_mask; sline->next_lost = lline->next; return; @@ -162,6 +203,7 @@ struct combine_diff_state { int n; struct sline *sline; struct sline *lost_bucket; + long flags; }; static void consume_line(void *state_, char *line, unsigned long len) @@ -201,7 +243,7 @@ static void consume_line(void *state_, char *line, unsigned long len) return; /* not in any hunk yet */ switch (line[0]) { case '-': - append_lost(state->lost_bucket, state->n, line+1, len-1); + append_lost(state->lost_bucket, state->n, line+1, len-1, state->flags); break; case '+': state->sline[state->lno-1].flag |= state->nmask; @@ -215,7 +257,7 @@ static void combine_diff(const unsigned char *parent, unsigned int mode, struct sline *sline, unsigned int cnt, int n, int num_parent, int result_deleted, struct userdiff_driver *textconv, - const char *path) + const char *path, long flags) { unsigned int p_lno, lno; unsigned long nmask = (1UL << n); @@ -231,9 +273,10 @@ static void combine_diff(const unsigned char *parent, unsigned int mode, parent_file.ptr = grab_blob(parent, mode, &sz, textconv, path); parent_file.size = sz; memset(&xpp, 0, sizeof(xpp)); - xpp.flags = 0; + xpp.flags = flags; memset(&xecfg, 0, sizeof(xecfg)); memset(&state, 0, sizeof(state)); + state.flags = flags; state.nmask = nmask; state.sline = sline; state.lno = 1; @@ -526,7 +569,8 @@ static void show_line_to_eol(const char *line, int len, const char *reset) saw_cr_at_eol ? "\r" : ""); } -static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent, +static void dump_sline(struct sline *sline, const char *line_prefix, + unsigned long cnt, int num_parent, int use_color, int result_deleted) { unsigned long mark = (1UL<<num_parent); @@ -582,7 +626,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent, rlines -= null_context; } - fputs(c_frag, stdout); + printf("%s%s", line_prefix, c_frag); for (i = 0; i <= num_parent; i++) putchar(combine_marker); for (i = 0; i < num_parent; i++) show_parent_lno(sline, lno, hunk_end, i, null_context); @@ -614,7 +658,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent, struct sline *sl = &sline[lno++]; ll = (sl->flag & no_pre_delete) ? NULL : sl->lost_head; while (ll) { - fputs(c_old, stdout); + printf("%s%s", line_prefix, c_old); for (j = 0; j < num_parent; j++) { if (ll->parent_map & (1UL<<j)) putchar('-'); @@ -627,6 +671,7 @@ static void dump_sline(struct sline *sline, unsigned long cnt, int num_parent, if (cnt < lno) break; p_mask = 1; + fputs(line_prefix, stdout); if (!(sl->flag & (mark-1))) { /* * This sline was here to hang the @@ -680,11 +725,13 @@ static void reuse_combine_diff(struct sline *sline, unsigned long cnt, static void dump_quoted_path(const char *head, const char *prefix, const char *path, + const char *line_prefix, const char *c_meta, const char *c_reset) { static struct strbuf buf = STRBUF_INIT; strbuf_reset(&buf); + strbuf_addstr(&buf, line_prefix); strbuf_addstr(&buf, c_meta); strbuf_addstr(&buf, head); quote_two_c_style(&buf, prefix, path, 0); @@ -696,6 +743,7 @@ static void show_combined_header(struct combine_diff_path *elem, int num_parent, int dense, struct rev_info *rev, + const char *line_prefix, int mode_differs, int show_file_header) { @@ -714,8 +762,8 @@ static void show_combined_header(struct combine_diff_path *elem, show_log(rev); dump_quoted_path(dense ? "diff --cc " : "diff --combined ", - "", elem->path, c_meta, c_reset); - printf("%sindex ", c_meta); + "", elem->path, line_prefix, c_meta, c_reset); + printf("%s%sindex ", line_prefix, c_meta); for (i = 0; i < num_parent; i++) { abb = find_unique_abbrev(elem->parent[i].sha1, abbrev); @@ -734,11 +782,12 @@ static void show_combined_header(struct combine_diff_path *elem, DIFF_STATUS_ADDED) added = 0; if (added) - printf("%snew file mode %06o", - c_meta, elem->mode); + printf("%s%snew file mode %06o", + line_prefix, c_meta, elem->mode); else { if (deleted) - printf("%sdeleted file ", c_meta); + printf("%s%sdeleted file ", + line_prefix, c_meta); printf("mode "); for (i = 0; i < num_parent; i++) { printf("%s%06o", i ? "," : "", @@ -755,16 +804,16 @@ static void show_combined_header(struct combine_diff_path *elem, if (added) dump_quoted_path("--- ", "", "/dev/null", - c_meta, c_reset); + line_prefix, c_meta, c_reset); else dump_quoted_path("--- ", a_prefix, elem->path, - c_meta, c_reset); + line_prefix, c_meta, c_reset); if (deleted) dump_quoted_path("+++ ", "", "/dev/null", - c_meta, c_reset); + line_prefix, c_meta, c_reset); else dump_quoted_path("+++ ", b_prefix, elem->path, - c_meta, c_reset); + line_prefix, c_meta, c_reset); } static void show_patch_diff(struct combine_diff_path *elem, int num_parent, @@ -782,6 +831,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, struct userdiff_driver *userdiff; struct userdiff_driver *textconv = NULL; int is_binary; + const char *line_prefix = diff_line_prefix(opt); context = opt->context; userdiff = userdiff_find_by_path(elem->path); @@ -901,7 +951,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, } if (is_binary) { show_combined_header(elem, num_parent, dense, rev, - mode_differs, 0); + line_prefix, mode_differs, 0); printf("Binary files differ\n"); free(result); return; @@ -955,15 +1005,15 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, elem->parent[i].mode, &result_file, sline, cnt, i, num_parent, result_deleted, - textconv, elem->path); + textconv, elem->path, opt->xdl_opts); } show_hunks = make_hunks(sline, cnt, num_parent, dense); if (show_hunks || mode_differs || working_tree_file) { show_combined_header(elem, num_parent, dense, rev, - mode_differs, 1); - dump_sline(sline, cnt, num_parent, + line_prefix, mode_differs, 1); + dump_sline(sline, line_prefix, cnt, num_parent, opt->use_color, result_deleted); } free(result); @@ -982,14 +1032,11 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent, free(sline); } -#define COLONS "::::::::::::::::::::::::::::::::" - static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct rev_info *rev) { struct diff_options *opt = &rev->diffopt; - int i, offset; - const char *prefix; - int line_termination, inter_name_termination; + int line_termination, inter_name_termination, i; + const char *line_prefix = diff_line_prefix(opt); line_termination = opt->line_termination; inter_name_termination = '\t'; @@ -999,18 +1046,18 @@ static void show_raw_diff(struct combine_diff_path *p, int num_parent, struct re if (rev->loginfo && !rev->no_commit_id) show_log(rev); + if (opt->output_format & DIFF_FORMAT_RAW) { - offset = strlen(COLONS) - num_parent; - if (offset < 0) - offset = 0; - prefix = COLONS + offset; + printf("%s", line_prefix); + + /* As many colons as there are parents */ + for (i = 0; i < num_parent; i++) + putchar(':'); /* Show the modes */ - for (i = 0; i < num_parent; i++) { - printf("%s%06o", prefix, p->parent[i].mode); - prefix = " "; - } - printf("%s%06o", prefix, p->mode); + for (i = 0; i < num_parent; i++) + printf("%06o ", p->parent[i].mode); + printf("%06o", p->mode); /* Show sha1's */ for (i = 0; i < num_parent; i++) @@ -1040,6 +1087,7 @@ void show_combined_diff(struct combine_diff_path *p, struct rev_info *rev) { struct diff_options *opt = &rev->diffopt; + if (!p->len) return; if (opt->output_format & (DIFF_FORMAT_RAW | @@ -1150,8 +1198,10 @@ void diff_tree_combined(const unsigned char *sha1, if (show_log_first && i == 0) { show_log(rev); + if (rev->verbose_header && opt->output_format) - putchar(opt->line_termination); + printf("%s%c", diff_line_prefix(opt), + opt->line_termination); } diff_flush(&diffopts); } @@ -1179,7 +1229,8 @@ void diff_tree_combined(const unsigned char *sha1, if (opt->output_format & DIFF_FORMAT_PATCH) { if (needsep) - putchar(opt->line_termination); + printf("%s%c", diff_line_prefix(opt), + opt->line_termination); for (p = paths; p; p = p->next) { if (p->len) show_patch_diff(p, num_parent, dense, diff --git a/command-list.txt b/command-list.txt index 7e8cfec29d..bf83303c48 100644 --- a/command-list.txt +++ b/command-list.txt @@ -12,6 +12,7 @@ git-branch mainporcelain common git-bundle mainporcelain git-cat-file plumbinginterrogators git-check-attr purehelpers +git-check-ignore purehelpers git-checkout mainporcelain common git-checkout-index plumbingmanipulators git-check-ref-format purehelpers @@ -463,14 +463,23 @@ static void clear_commit_marks_1(struct commit_list **plist, } } -void clear_commit_marks(struct commit *commit, unsigned int mark) +void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark) { struct commit_list *list = NULL; - commit_list_insert(commit, &list); + + while (nr--) { + commit_list_insert(*commit, &list); + commit++; + } while (list) clear_commit_marks_1(&list, pop_commit(&list), mark); } +void clear_commit_marks(struct commit *commit, unsigned int mark) +{ + clear_commit_marks_many(1, &commit, mark); +} + void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark) { struct object *object; @@ -797,8 +806,7 @@ struct commit_list *get_merge_bases_many(struct commit *one, if (!result || !result->next) { if (cleanup) { clear_commit_marks(one, all_flags); - for (i = 0; i < n; i++) - clear_commit_marks(twos[i], all_flags); + clear_commit_marks_many(n, twos, all_flags); } return result; } @@ -816,8 +824,7 @@ struct commit_list *get_merge_bases_many(struct commit *one, free_commit_list(result); clear_commit_marks(one, all_flags); - for (i = 0; i < n; i++) - clear_commit_marks(twos[i], all_flags); + clear_commit_marks_many(n, twos, all_flags); cnt = remove_redundant(rslt, cnt); result = NULL; @@ -852,25 +859,36 @@ int is_descendant_of(struct commit *commit, struct commit_list *with_commit) } /* - * Is "commit" an ancestor of (i.e. reachable from) the "reference"? + * Is "commit" an ancestor of one of the "references"? */ -int in_merge_bases(struct commit *commit, struct commit *reference) +int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference) { struct commit_list *bases; - int ret = 0; + int ret = 0, i; - if (parse_commit(commit) || parse_commit(reference)) + if (parse_commit(commit)) return ret; + for (i = 0; i < nr_reference; i++) + if (parse_commit(reference[i])) + return ret; - bases = paint_down_to_common(commit, 1, &reference); + bases = paint_down_to_common(commit, nr_reference, reference); if (commit->object.flags & PARENT2) ret = 1; clear_commit_marks(commit, all_flags); - clear_commit_marks(reference, all_flags); + clear_commit_marks_many(nr_reference, reference, all_flags); free_commit_list(bases); return ret; } +/* + * Is "commit" an ancestor of (i.e. reachable from) the "reference"? + */ +int in_merge_bases(struct commit *commit, struct commit *reference) +{ + return in_merge_bases_many(commit, 1, &reference); +} + struct commit_list *reduce_heads(struct commit_list *heads) { struct commit_list *p; @@ -89,6 +89,7 @@ struct pretty_print_context { char *notes_message; struct reflog_walk_info *reflog_info; const char *output_encoding; + struct string_list *mailmap; int color; }; @@ -100,6 +101,7 @@ extern int has_non_ascii(const char *text); struct rev_info; /* in revision.h, it circularly uses enum cmit_fmt */ extern char *logmsg_reencode(const struct commit *commit, const char *output_encoding); +extern void logmsg_free(char *msg, const struct commit *commit); extern void get_commit_format(const char *arg, struct rev_info *); extern const char *format_subject(struct strbuf *sb, const char *msg, const char *line_separator); @@ -135,6 +137,7 @@ struct commit *pop_most_recent_commit(struct commit_list **list, struct commit *pop_commit(struct commit_list **stack); void clear_commit_marks(struct commit *commit, unsigned int mark); +void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark); void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark); /* @@ -162,6 +165,9 @@ extern struct commit_list *get_merge_bases(struct commit *rev1, struct commit *r extern struct commit_list *get_merge_bases_many(struct commit *one, int n, struct commit **twos, int cleanup); extern struct commit_list *get_octopus_merge_bases(struct commit_list *in); +/* largest postive number a signed 32-bit integer can contain */ +#define INFINITE_DEPTH 0x7fffffff + extern int register_shallow(const unsigned char *sha1); extern int unregister_shallow(const unsigned char *sha1); extern int for_each_commit_graft(each_commit_graft_fn, void *); @@ -171,6 +177,7 @@ extern struct commit_list *get_shallow_commits(struct object_array *heads, int is_descendant_of(struct commit *, struct commit_list *); int in_merge_bases(struct commit *, struct commit *); +int in_merge_bases_many(struct commit *, int, struct commit **); extern int interactive_add(int argc, const char **argv, const char *prefix, int patch); extern int run_add_interactive(const char *revision, const char *patch_mode, diff --git a/compat/msvc.h b/compat/msvc.h index aa4b56315a..96b6d605da 100644 --- a/compat/msvc.h +++ b/compat/msvc.h @@ -12,6 +12,8 @@ #define __attribute__(x) #define strncasecmp _strnicmp #define ftruncate _chsize +#define strtoull _strtoui64 +#define strtoll _strtoi64 static __inline int strcasecmp (const char *s1, const char *s2) { diff --git a/compat/strtok_r.c b/compat/strtok_r.c deleted file mode 100644 index 7b5d568a96..0000000000 --- a/compat/strtok_r.c +++ /dev/null @@ -1,61 +0,0 @@ -/* Reentrant string tokenizer. Generic version. - Copyright (C) 1991,1996-1999,2001,2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include "../git-compat-util.h" - -/* Parse S into tokens separated by characters in DELIM. - If S is NULL, the saved pointer in SAVE_PTR is used as - the next starting point. For example: - char s[] = "-abc-=-def"; - char *sp; - x = strtok_r(s, "-", &sp); // x = "abc", sp = "=-def" - x = strtok_r(NULL, "-=", &sp); // x = "def", sp = NULL - x = strtok_r(NULL, "=", &sp); // x = NULL - // s = "abc\0-def\0" -*/ -char * -gitstrtok_r (char *s, const char *delim, char **save_ptr) -{ - char *token; - - if (s == NULL) - s = *save_ptr; - - /* Scan leading delimiters. */ - s += strspn (s, delim); - if (*s == '\0') - { - *save_ptr = s; - return NULL; - } - - /* Find the end of the token. */ - token = s; - s = strpbrk (token, delim); - if (s == NULL) - /* This token finishes the string. */ - *save_ptr = token + strlen (token); - else - { - /* Terminate the token and make *SAVE_PTR point past it. */ - *s = '\0'; - *save_ptr = s + 1; - } - return token; -} diff --git a/compat/vcbuild/include/sys/poll.h b/compat/vcbuild/include/sys/poll.h deleted file mode 100644 index 0d8552a2c6..0000000000 --- a/compat/vcbuild/include/sys/poll.h +++ /dev/null @@ -1 +0,0 @@ -/* Intentionally empty file to support building git with MSVC */ diff --git a/compat/vcbuild/include/unistd.h b/compat/vcbuild/include/unistd.h index b14fcf94da..c65c2cd566 100644 --- a/compat/vcbuild/include/unistd.h +++ b/compat/vcbuild/include/unistd.h @@ -49,6 +49,9 @@ typedef int64_t off64_t; #define INTMAX_MAX _I64_MAX #define UINTMAX_MAX _UI64_MAX +#define UINT32_MAX 0xffffffff /* 4294967295U */ + +#define STDIN_FILENO 0 #define STDOUT_FILENO 1 #define STDERR_FILENO 2 @@ -566,6 +566,12 @@ static int git_default_core_config(const char *var, const char *value) trust_ctime = git_config_bool(var, value); return 0; } + if (!strcmp(var, "core.statinfo")) { + if (!strcasecmp(value, "default")) + check_stat = 1; + else if (!strcasecmp(value, "minimal")) + check_stat = 0; + } if (!strcmp(var, "core.quotepath")) { quote_path_fully = git_config_bool(var, value); @@ -717,6 +723,14 @@ static int git_default_core_config(const char *var, const char *value) if (!strcmp(var, "core.editor")) return git_config_string(&editor_program, var, value); + if (!strcmp(var, "core.commentchar")) { + const char *comment; + int ret = git_config_string(&comment, var, value); + if (!ret) + comment_line_char = comment[0]; + return ret; + } + if (!strcmp(var, "core.askpass")) return git_config_string(&askpass_program, var, value); @@ -1667,3 +1681,36 @@ int config_error_nonbool(const char *var) { return error("Missing value for '%s'", var); } + +int parse_config_key(const char *var, + const char *section, + const char **subsection, int *subsection_len, + const char **key) +{ + int section_len = strlen(section); + const char *dot; + + /* Does it start with "section." ? */ + if (prefixcmp(var, section) || var[section_len] != '.') + return -1; + + /* + * Find the key; we don't know yet if we have a subsection, but we must + * parse backwards from the end, since the subsection may have dots in + * it, too. + */ + dot = strrchr(var, '.'); + *key = dot + 1; + + /* Did we have a subsection at all? */ + if (dot == var + section_len) { + *subsection = NULL; + *subsection_len = 0; + } + else { + *subsection = var + section_len + 1; + *subsection_len = dot - *subsection; + } + + return 0; +} diff --git a/config.mak.in b/config.mak.in index e8a9bb4682..fa02bdd82a 100644 --- a/config.mak.in +++ b/config.mak.in @@ -8,6 +8,7 @@ LDFLAGS = @LDFLAGS@ AR = @AR@ TAR = @TAR@ DIFF = @DIFF@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ #INSTALL = @INSTALL@ # needs install-sh or install.sh in sources prefix = @prefix@ @@ -17,8 +18,10 @@ gitexecdir = @libexecdir@/git-core datarootdir = @datarootdir@ template_dir = @datadir@/git-core/templates sysconfdir = @sysconfdir@ +docdir = @docdir@ mandir = @mandir@ +htmldir = @htmldir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/config.mak.uname b/config.mak.uname index bea34f0511..9080054f76 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -321,13 +321,11 @@ ifeq ($(uname_S),Windows) NO_UNSETENV = YesPlease NO_STRCASESTR = YesPlease NO_STRLCPY = YesPlease - NO_STRTOK_R = YesPlease NO_FNMATCH = YesPlease NO_MEMMEM = YesPlease # NEEDS_LIBICONV = YesPlease NO_ICONV = YesPlease NO_STRTOUMAX = YesPlease - NO_STRTOULL = YesPlease NO_MKDTEMP = YesPlease NO_MKSTEMPS = YesPlease SNPRINTF_RETURNS_BOGUS = YesPlease @@ -344,6 +342,9 @@ ifeq ($(uname_S),Windows) NO_CURL = YesPlease NO_PYTHON = YesPlease BLK_SHA1 = YesPlease + ETAGS_TARGET = ETAGS + NO_INET_PTON = YesPlease + NO_INET_NTOP = YesPlease NO_POSIX_GOODIES = UnfortunatelyYes NATIVE_CRLF = YesPlease DEFAULT_HELP_FORMAT = html @@ -476,7 +477,6 @@ ifneq (,$(findstring MINGW,$(uname_S))) NO_UNSETENV = YesPlease NO_STRCASESTR = YesPlease NO_STRLCPY = YesPlease - NO_STRTOK_R = YesPlease NO_FNMATCH = YesPlease NO_MEMMEM = YesPlease NEEDS_LIBICONV = YesPlease @@ -523,6 +523,7 @@ endif endif ifeq ($(uname_S),QNX) COMPAT_CFLAGS += -DSA_RESTART=0 + EXPAT_NEEDS_XMLPARSE_H = YesPlease HAVE_STRINGS_H = YesPlease NEEDS_SOCKET = YesPlease NO_FNMATCH_CASEFOLD = YesPlease diff --git a/configure.ac b/configure.ac index 1991258ae0..f3462d9c81 100644 --- a/configure.ac +++ b/configure.ac @@ -901,12 +901,6 @@ GIT_CHECK_FUNC(strcasestr, [NO_STRCASESTR=YesPlease]) GIT_CONF_SUBST([NO_STRCASESTR]) # -# Define NO_STRTOK_R if you don't have strtok_r -GIT_CHECK_FUNC(strtok_r, -[NO_STRTOK_R=], -[NO_STRTOK_R=YesPlease]) -GIT_CONF_SUBST([NO_STRTOK_R]) -# # Define NO_FNMATCH if you don't have fnmatch GIT_CHECK_FUNC(fnmatch, [NO_FNMATCH=], diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index a4c48e179e..2ba1461422 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -13,6 +13,7 @@ # *) .git/remotes file names # *) git 'subcommands' # *) tree paths within 'ref:path/to/file' expressions +# *) file paths within current working directory and index # *) common --long-options # # To use these routines: @@ -233,6 +234,124 @@ __gitcomp_nl () COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}")) } +# Generates completion reply with compgen from newline-separated possible +# completion filenames. +# It accepts 1 to 3 arguments: +# 1: List of possible completion filenames, separated by a single newline. +# 2: A directory prefix to be added to each possible completion filename +# (optional). +# 3: Generate possible completion matches for this word (optional). +__gitcomp_file () +{ + local IFS=$'\n' + + # XXX does not work when the directory prefix contains a tilde, + # since tilde expansion is not applied. + # This means that COMPREPLY will be empty and Bash default + # completion will be used. + COMPREPLY=($(compgen -P "${2-}" -W "$1" -- "${3-$cur}")) + + # Tell Bash that compspec generates filenames. + compopt -o filenames 2>/dev/null +} + +__git_index_file_list_filter_compat () +{ + local path + + while read -r path; do + case "$path" in + ?*/*) echo "${path%%/*}/" ;; + *) echo "$path" ;; + esac + done +} + +__git_index_file_list_filter_bash () +{ + local path + + while read -r path; do + case "$path" in + ?*/*) + # XXX if we append a slash to directory names when using + # `compopt -o filenames`, Bash will append another slash. + # This is pretty stupid, and this the reason why we have to + # define a compatible version for this function. + echo "${path%%/*}" ;; + *) + echo "$path" ;; + esac + done +} + +# Process path list returned by "ls-files" and "diff-index --name-only" +# commands, in order to list only file names relative to a specified +# directory, and append a slash to directory names. +__git_index_file_list_filter () +{ + # Default to Bash >= 4.x + __git_index_file_list_filter_bash +} + +# Execute git ls-files, returning paths relative to the directory +# specified in the first argument, and using the options specified in +# the second argument. +__git_ls_files_helper () +{ + ( + test -n "${CDPATH+set}" && unset CDPATH + # NOTE: $2 is not quoted in order to support multiple options + cd "$1" && git ls-files --exclude-standard $2 + ) 2>/dev/null +} + + +# Execute git diff-index, returning paths relative to the directory +# specified in the first argument, and using the tree object id +# specified in the second argument. +__git_diff_index_helper () +{ + ( + test -n "${CDPATH+set}" && unset CDPATH + cd "$1" && git diff-index --name-only --relative "$2" + ) 2>/dev/null +} + +# __git_index_files accepts 1 or 2 arguments: +# 1: Options to pass to ls-files (required). +# Supported options are --cached, --modified, --deleted, --others, +# and --directory. +# 2: A directory path (optional). +# If provided, only files within the specified directory are listed. +# Sub directories are never recursed. Path must have a trailing +# slash. +__git_index_files () +{ + local dir="$(__gitdir)" root="${2-.}" + + if [ -d "$dir" ]; then + __git_ls_files_helper "$root" "$1" | __git_index_file_list_filter | + sort | uniq + fi +} + +# __git_diff_index_files accepts 1 or 2 arguments: +# 1) The id of a tree object. +# 2) A directory path (optional). +# If provided, only files within the specified directory are listed. +# Sub directories are never recursed. Path must have a trailing +# slash. +__git_diff_index_files () +{ + local dir="$(__gitdir)" root="${2-.}" + + if [ -d "$dir" ]; then + __git_diff_index_helper "$root" "$1" | __git_index_file_list_filter | + sort | uniq + fi +} + __git_heads () { local dir="$(__gitdir)" @@ -397,7 +516,7 @@ __git_complete_revlist_file () *) pfx="$ref:$pfx" ;; esac - __gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" \ + __gitcomp_nl "$(git --git-dir="$(__gitdir)" ls-tree "$ls" 2>/dev/null \ | sed '/^100... blob /{ s,^.* ,, s,$, , @@ -430,6 +549,46 @@ __git_complete_revlist_file () } +# __git_complete_index_file requires 1 argument: the options to pass to +# ls-file +__git_complete_index_file () +{ + local pfx cur_="$cur" + + case "$cur_" in + ?*/*) + pfx="${cur_%/*}" + cur_="${cur_##*/}" + pfx="${pfx}/" + + __gitcomp_file "$(__git_index_files "$1" "$pfx")" "$pfx" "$cur_" + ;; + *) + __gitcomp_file "$(__git_index_files "$1")" "" "$cur_" + ;; + esac +} + +# __git_complete_diff_index_file requires 1 argument: the id of a tree +# object +__git_complete_diff_index_file () +{ + local pfx cur_="$cur" + + case "$cur_" in + ?*/*) + pfx="${cur_%/*}" + cur_="${cur_##*/}" + pfx="${pfx}/" + + __gitcomp_file "$(__git_diff_index_files "$1" "$pfx")" "$pfx" "$cur_" + ;; + *) + __gitcomp_file "$(__git_diff_index_files "$1")" "" "$cur_" + ;; + esac +} + __git_complete_file () { __git_complete_revlist_file @@ -531,10 +690,19 @@ __git_complete_strategy () return 1 } +__git_commands () { + if test -n "${GIT_TESTING_COMMAND_COMPLETION:-}" + then + printf "%s" "${GIT_TESTING_COMMAND_COMPLETION}" + else + git help -a|egrep '^ [a-zA-Z0-9]' + fi +} + __git_list_all_commands () { local i IFS=" "$'\n' - for i in $(git help -a|egrep '^ [a-zA-Z0-9]') + for i in $(__git_commands) do case $i in *--*) : helper pattern;; @@ -563,6 +731,7 @@ __git_list_porcelain_commands () archimport) : import;; cat-file) : plumbing;; check-attr) : plumbing;; + check-ignore) : plumbing;; check-ref-format) : plumbing;; checkout-index) : plumbing;; commit-tree) : plumbing;; @@ -722,6 +891,43 @@ __git_has_doubledash () return 1 } +# Try to count non option arguments passed on the command line for the +# specified git command. +# When options are used, it is necessary to use the special -- option to +# tell the implementation were non option arguments begin. +# XXX this can not be improved, since options can appear everywhere, as +# an example: +# git mv x -n y +# +# __git_count_arguments requires 1 argument: the git command executed. +__git_count_arguments () +{ + local word i c=0 + + # Skip "git" (first argument) + for ((i=1; i < ${#words[@]}; i++)); do + word="${words[i]}" + + case "$word" in + --) + # Good; we can assume that the following are only non + # option arguments. + ((c = 0)) + ;; + "$1") + # Skip the specified git command and discard git + # main options + ((c = 0)) + ;; + ?*) + ((c++)) + ;; + esac + done + + printf "%d" $c +} + __git_whitespacelist="nowarn warn error error-all fix" _git_am () @@ -770,8 +976,6 @@ _git_apply () _git_add () { - __git_has_doubledash && return - case "$cur" in --*) __gitcomp " @@ -780,7 +984,9 @@ _git_add () " return esac - COMPREPLY=() + + # XXX should we check for --update and --all options ? + __git_complete_index_file "--others --modified" } _git_archive () @@ -930,15 +1136,15 @@ _git_cherry_pick () _git_clean () { - __git_has_doubledash && return - case "$cur" in --*) __gitcomp "--dry-run --quiet" return ;; esac - COMPREPLY=() + + # XXX should we check for -x option ? + __git_complete_index_file "--others" } _git_clone () @@ -969,7 +1175,12 @@ _git_clone () _git_commit () { - __git_has_doubledash && return + case "$prev" in + -c|-C) + __gitcomp_nl "$(__git_refs)" "" "${cur}" + return + ;; + esac case "$prev" in -c|-C) @@ -1005,7 +1216,13 @@ _git_commit () " return esac - COMPREPLY=() + + if git rev-parse --verify --quiet HEAD >/dev/null; then + __git_complete_diff_index_file "HEAD" + else + # This is the first commit + __git_complete_index_file "--cached" + fi } _git_describe () @@ -1021,6 +1238,8 @@ _git_describe () __gitcomp_nl "$(__git_refs)" } +__git_diff_algorithms="myers minimal patience histogram" + __git_diff_common_options="--stat --numstat --shortstat --summary --patch-with-stat --name-only --name-status --color --no-color --color-words --no-renames --check @@ -1031,10 +1250,11 @@ __git_diff_common_options="--stat --numstat --shortstat --summary --no-ext-diff --no-prefix --src-prefix= --dst-prefix= --inter-hunk-context= - --patience + --patience --histogram --minimal --raw --dirstat --dirstat= --dirstat-by-file --dirstat-by-file= --cumulative + --diff-algorithm= " _git_diff () @@ -1042,6 +1262,10 @@ _git_diff () __git_has_doubledash && return case "$cur" in + --diff-algorithm=*) + __gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}" + return + ;; --*) __gitcomp "--cached --staged --pickaxe-all --pickaxe-regex --base --ours --theirs --no-index @@ -1223,8 +1447,6 @@ _git_init () _git_ls_files () { - __git_has_doubledash && return - case "$cur" in --*) __gitcomp "--cached --deleted --modified --others --ignored @@ -1237,7 +1459,10 @@ _git_ls_files () return ;; esac - COMPREPLY=() + + # XXX ignore options like --modified and always suggest all cached + # files. + __git_complete_index_file "--cached" } _git_ls_remote () @@ -1369,7 +1594,14 @@ _git_mv () return ;; esac - COMPREPLY=() + + if [ $(__git_count_arguments "mv") -gt 0 ]; then + # We need to show both cached and untracked files (including + # empty directories) since this may not be the last argument. + __git_complete_index_file "--cached --others --directory" + else + __git_complete_index_file "--cached" + fi } _git_name_rev () @@ -1560,7 +1792,7 @@ __git_config_get_set_variables () while [ $c -gt 1 ]; do word="${words[c]}" case "$word" in - --global|--system|--file=*) + --system|--global|--local|--file=*) config_file="$word" break ;; @@ -1666,7 +1898,7 @@ _git_config () case "$cur" in --*) __gitcomp " - --global --system --file= + --system --global --local --file= --list --replace-all --get --get-all --get-regexp --add --unset --unset-all @@ -1839,6 +2071,7 @@ _git_config () diff.suppressBlankEmpty diff.tool diff.wordRegex + diff.algorithm difftool. difftool.prompt fetch.recurseSubmodules @@ -2075,15 +2308,14 @@ _git_revert () _git_rm () { - __git_has_doubledash && return - case "$cur" in --*) __gitcomp "--cached --dry-run --ignore-unmatch --quiet" return ;; esac - COMPREPLY=() + + __git_complete_index_file "--cached" } _git_shortlog () @@ -2113,6 +2345,10 @@ _git_show () " "" "${cur#*=}" return ;; + --diff-algorithm=*) + __gitcomp "$__git_diff_algorithms" "" "${cur##--diff-algorithm=}" + return + ;; --*) __gitcomp "--pretty= --format= --abbrev-commit --oneline $__git_diff_common_options @@ -2183,7 +2419,7 @@ _git_submodule () { __git_has_doubledash && return - local subcommands="add status init update summary foreach sync" + local subcommands="add status init deinit update summary foreach sync" if [ -z "$(__git_find_on_cmdline "$subcommands")" ]; then case "$cur" in --*) @@ -2431,7 +2667,7 @@ if [[ -n ${ZSH_VERSION-} ]]; then --*=*|*.) ;; *) c="$c " ;; esac - array+=("$c") + array[$#array+1]="$c" done compset -P '*[=:]' compadd -Q -S '' -p "${2-}" -a -- array && _ret=0 @@ -2448,6 +2684,15 @@ if [[ -n ${ZSH_VERSION-} ]]; then compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } + __gitcomp_file () + { + emulate -L zsh + + local IFS=$'\n' + compset -P '*[=:]' + compadd -Q -p "${2-}" -f -- ${=1} && _ret=0 + } + __git_zsh_helper () { emulate -L ksh @@ -2469,6 +2714,14 @@ if [[ -n ${ZSH_VERSION-} ]]; then compdef _git git gitk return +elif [[ -n ${BASH_VERSION-} ]]; then + if ((${BASH_VERSINFO[0]} < 4)); then + # compopt is not supported + __git_index_file_list_filter () + { + __git_index_file_list_filter_compat + } + fi fi __git_func_wrap () diff --git a/contrib/completion/git-completion.tcsh b/contrib/completion/git-completion.tcsh index 8aafb63315..eaacaf0c3e 100644 --- a/contrib/completion/git-completion.tcsh +++ b/contrib/completion/git-completion.tcsh @@ -13,6 +13,7 @@ # # To use this completion script: # +# 0) You need tcsh 6.16.00 or newer. # 1) Copy both this file and the bash completion script to ${HOME}. # You _must_ use the name ${HOME}/.git-completion.bash for the # bash script. @@ -24,6 +25,15 @@ # set autolist=ambiguous # It will tell tcsh to list the possible completion choices. +set __git_tcsh_completion_version = `\echo ${tcsh} | \sed 's/\./ /g'` +if ( ${__git_tcsh_completion_version[1]} < 6 || \ + ( ${__git_tcsh_completion_version[1]} == 6 && \ + ${__git_tcsh_completion_version[2]} < 16 ) ) then + echo "git-completion.tcsh: Your version of tcsh is too old, you need version 6.16.00 or newer. Git completion will not work." + exit +endif +unset __git_tcsh_completion_version + set __git_tcsh_completion_original_script = ${HOME}/.git-completion.bash set __git_tcsh_completion_script = ${HOME}/.git-completion.tcsh.bash @@ -42,6 +52,18 @@ cat << EOF > ${__git_tcsh_completion_script} source ${__git_tcsh_completion_original_script} +# Remove the colon as a completion separator because tcsh cannot handle it +COMP_WORDBREAKS=\${COMP_WORDBREAKS//:} + +# For file completion, tcsh needs the '/' to be appended to directories. +# By default, the bash script does not do that. +# We can achieve this by using the below compatibility +# method of the git-completion.bash script. +__git_index_file_list_filter () +{ + __git_index_file_list_filter_compat +} + # Set COMP_WORDS in a way that can be handled by the bash script. COMP_WORDS=(\$2) @@ -64,9 +86,7 @@ fi _\${1} IFS=\$'\n' -if [ \${#COMPREPLY[*]} -gt 0 ]; then - echo "\${COMPREPLY[*]}" | sort | uniq -else +if [ \${#COMPREPLY[*]} -eq 0 ]; then # No completions suggested. In this case, we want tcsh to perform # standard file completion. However, there does not seem to be way # to tell tcsh to do that. To help the user, we try to simulate @@ -85,19 +105,20 @@ else # We don't support ~ expansion: too tricky. if [ "\${TO_COMPLETE:0:1}" != "~" ]; then # Use ls so as to add the '/' at the end of directories. - RESULT=(\`ls -dp \${TO_COMPLETE}* 2> /dev/null\`) - echo \${RESULT[*]} - - # If there is a single completion and it is a directory, - # we output it a second time to trick tcsh into not adding a space - # after it. - if [ \${#RESULT[*]} -eq 1 ] && [ "\${RESULT[0]: -1}" == "/" ]; then - echo \${RESULT[*]} - fi + COMPREPLY=(\`ls -dp \${TO_COMPLETE}* 2> /dev/null\`) fi fi fi +# tcsh does not automatically remove duplicates, so we do it ourselves +echo "\${COMPREPLY[*]}" | sort | uniq + +# If there is a single completion and it is a directory, we output it +# a second time to trick tcsh into not adding a space after it. +if [ \${#COMPREPLY[*]} -eq 1 ] && [ "\${COMPREPLY[0]: -1}" == "/" ]; then + echo "\${COMPREPLY[*]}" +fi + EOF # Don't need this variable anymore, so don't pollute the users environment diff --git a/contrib/completion/git-completion.zsh b/contrib/completion/git-completion.zsh index 45775021ff..cf8116d477 100644 --- a/contrib/completion/git-completion.zsh +++ b/contrib/completion/git-completion.zsh @@ -60,6 +60,15 @@ __gitcomp_nl () compadd -Q -S "${4- }" -p "${2-}" -- ${=1} && _ret=0 } +__gitcomp_file () +{ + emulate -L zsh + + local IFS=$'\n' + compset -P '*[=:]' + compadd -Q -p "${2-}" -f -- ${=1} && _ret=0 +} + _git () { local _ret=1 diff --git a/contrib/completion/git-prompt.sh b/contrib/completion/git-prompt.sh index 9bef0531c5..341422a766 100644 --- a/contrib/completion/git-prompt.sh +++ b/contrib/completion/git-prompt.sh @@ -43,7 +43,10 @@ # # If you would like to see if there're untracked files, then you can set # GIT_PS1_SHOWUNTRACKEDFILES to a nonempty value. If there're untracked -# files, then a '%' will be shown next to the branch name. +# files, then a '%' will be shown next to the branch name. You can +# configure this per-repository with the bash.showUntrackedFiles +# variable, which defaults to true once GIT_PS1_SHOWUNTRACKEDFILES is +# enabled. # # If you would like to see the difference between HEAD and its upstream, # set GIT_PS1_SHOWUPSTREAM="auto". A "<" indicates you are behind, ">" @@ -317,24 +320,25 @@ __git_ps1 () b="GIT_DIR!" fi elif [ "true" = "$(git rev-parse --is-inside-work-tree 2>/dev/null)" ]; then - if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ]; then - if [ "$(git config --bool bash.showDirtyState)" != "false" ]; then - git diff --no-ext-diff --quiet --exit-code || w="*" - if git rev-parse --quiet --verify HEAD >/dev/null; then - git diff-index --cached --quiet HEAD -- || i="+" - else - i="#" - fi + if [ -n "${GIT_PS1_SHOWDIRTYSTATE-}" ] && + [ "$(git config --bool bash.showDirtyState)" != "false" ] + then + git diff --no-ext-diff --quiet --exit-code || w="*" + if git rev-parse --quiet --verify HEAD >/dev/null; then + git diff-index --cached --quiet HEAD -- || i="+" + else + i="#" fi fi if [ -n "${GIT_PS1_SHOWSTASHSTATE-}" ]; then git rev-parse --verify refs/stash >/dev/null 2>&1 && s="$" fi - if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ]; then - if [ -n "$(git ls-files --others --exclude-standard)" ]; then - u="%" - fi + if [ -n "${GIT_PS1_SHOWUNTRACKEDFILES-}" ] && + [ "$(git config --bool bash.showUntrackedFiles)" != "false" ] && + [ -n "$(git ls-files --others --exclude-standard)" ] + then + u="%" fi if [ -n "${GIT_PS1_SHOWUPSTREAM-}" ]; then diff --git a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c index 41f61c5db3..f2cdefee60 100644 --- a/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c +++ b/contrib/credential/gnome-keyring/git-credential-gnome-keyring.c @@ -401,7 +401,7 @@ static void usage(const char *name) const char *basename = strrchr(name,'/'); basename = (basename) ? basename + 1 : name; - fprintf(stderr, "Usage: %s <", basename); + fprintf(stderr, "usage: %s <", basename); while(try_op->name) { fprintf(stderr,"%s",(try_op++)->name); if(try_op->name) diff --git a/contrib/credential/netrc/Makefile b/contrib/credential/netrc/Makefile new file mode 100644 index 0000000000..51b76138a5 --- /dev/null +++ b/contrib/credential/netrc/Makefile @@ -0,0 +1,5 @@ +test: + ./test.pl + +testverbose: + ./test.pl -d -v diff --git a/contrib/credential/netrc/git-credential-netrc b/contrib/credential/netrc/git-credential-netrc new file mode 100755 index 0000000000..6c51c43885 --- /dev/null +++ b/contrib/credential/netrc/git-credential-netrc @@ -0,0 +1,421 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use Getopt::Long; +use File::Basename; + +my $VERSION = "0.1"; + +my %options = ( + help => 0, + debug => 0, + verbose => 0, + insecure => 0, + file => [], + + # identical token maps, e.g. host -> host, will be inserted later + tmap => { + port => 'protocol', + machine => 'host', + path => 'path', + login => 'username', + user => 'username', + password => 'password', + } + ); + +# Map each credential protocol token to itself on the netrc side. +foreach (values %{$options{tmap}}) { + $options{tmap}->{$_} = $_; +} + +# Now, $options{tmap} has a mapping from the netrc format to the Git credential +# helper protocol. + +# Next, we build the reverse token map. + +# When $rmap{foo} contains 'bar', that means that what the Git credential helper +# protocol calls 'bar' is found as 'foo' in the netrc/authinfo file. Keys in +# %rmap are what we expect to read from the netrc/authinfo file. + +my %rmap; +foreach my $k (keys %{$options{tmap}}) { + push @{$rmap{$options{tmap}->{$k}}}, $k; +} + +Getopt::Long::Configure("bundling"); + +# TODO: maybe allow the token map $options{tmap} to be configurable. +GetOptions(\%options, + "help|h", + "debug|d", + "insecure|k", + "verbose|v", + "file|f=s@", + ); + +if ($options{help}) { + my $shortname = basename($0); + $shortname =~ s/git-credential-//; + + print <<EOHIPPUS; + +$0 [-f AUTHFILE1] [-f AUTHFILEN] [-d] [-v] [-k] get + +Version $VERSION by tzz\@lifelogs.com. License: BSD. + +Options: + + -f|--file AUTHFILE : specify netrc-style files. Files with the .gpg extension + will be decrypted by GPG before parsing. Multiple -f + arguments are OK. They are processed in order, and the + first matching entry found is returned via the credential + helper protocol (see below). + + When no -f option is given, .authinfo.gpg, .netrc.gpg, + .authinfo, and .netrc files in your home directory are used + in this order. + + -k|--insecure : ignore bad file ownership or permissions + + -d|--debug : turn on debugging (developer info) + + -v|--verbose : be more verbose (show files and information found) + +To enable this credential helper: + + git config credential.helper '$shortname -f AUTHFILE1 -f AUTHFILE2' + +(Note that Git will prepend "git-credential-" to the helper name and look for it +in the path.) + +...and if you want lots of debugging info: + + git config credential.helper '$shortname -f AUTHFILE -d' + +...or to see the files opened and data found: + + git config credential.helper '$shortname -f AUTHFILE -v' + +Only "get" mode is supported by this credential helper. It opens every AUTHFILE +and looks for the first entry that matches the requested search criteria: + + 'port|protocol': + The protocol that will be used (e.g., https). (protocol=X) + + 'machine|host': + The remote hostname for a network credential. (host=X) + + 'path': + The path with which the credential will be used. (path=X) + + 'login|user|username': + The credential’s username, if we already have one. (username=X) + +Thus, when we get this query on STDIN: + +host=github.com +protocol=https +username=tzz + +this credential helper will look for the first entry in every AUTHFILE that +matches + +machine github.com port https login tzz + +OR + +machine github.com protocol https login tzz + +OR... etc. acceptable tokens as listed above. Any unknown tokens are +simply ignored. + +Then, the helper will print out whatever tokens it got from the entry, including +"password" tokens, mapping back to Git's helper protocol; e.g. "port" is mapped +back to "protocol". Any redundant entry tokens (part of the original query) are +skipped. + +Again, note that only the first matching entry from all the AUTHFILEs, processed +in the sequence given on the command line, is used. + +Netrc/authinfo tokens can be quoted as 'STRING' or "STRING". + +No caching is performed by this credential helper. + +EOHIPPUS + + exit 0; +} + +my $mode = shift @ARGV; + +# Credentials must get a parameter, so die if it's missing. +die "Syntax: $0 [-f AUTHFILE1] [-f AUTHFILEN] [-d] get" unless defined $mode; + +# Only support 'get' mode; with any other unsupported ones we just exit. +exit 0 unless $mode eq 'get'; + +my $files = $options{file}; + +# if no files were given, use a predefined list. +# note that .gpg files come first +unless (scalar @$files) { + my @candidates = qw[ + ~/.authinfo.gpg + ~/.netrc.gpg + ~/.authinfo + ~/.netrc + ]; + + $files = $options{file} = [ map { glob $_ } @candidates ]; +} + +my $query = read_credential_data_from_stdin(); + +FILE: +foreach my $file (@$files) { + my $gpgmode = $file =~ m/\.gpg$/; + unless (-r $file) { + log_verbose("Unable to read $file; skipping it"); + next FILE; + } + + # the following check is copied from Net::Netrc, for non-GPG files + # OS/2 and Win32 do not handle stat in a way compatible with this check :-( + unless ($gpgmode || $options{insecure} || + $^O eq 'os2' + || $^O eq 'MSWin32' + || $^O eq 'MacOS' + || $^O =~ /^cygwin/) { + my @stat = stat($file); + + if (@stat) { + if ($stat[2] & 077) { + log_verbose("Insecure $file (mode=%04o); skipping it", + $stat[2] & 07777); + next FILE; + } + + if ($stat[4] != $<) { + log_verbose("Not owner of $file; skipping it"); + next FILE; + } + } + } + + my @entries = load_netrc($file, $gpgmode); + + unless (scalar @entries) { + if ($!) { + log_verbose("Unable to open $file: $!"); + } else { + log_verbose("No netrc entries found in $file"); + } + + next FILE; + } + + my $entry = find_netrc_entry($query, @entries); + if ($entry) { + print_credential_data($entry, $query); + # we're done! + last FILE; + } +} + +exit 0; + +sub load_netrc { + my $file = shift @_; + my $gpgmode = shift @_; + + my $io; + if ($gpgmode) { + my @cmd = (qw(gpg --decrypt), $file); + log_verbose("Using GPG to open $file: [@cmd]"); + open $io, "-|", @cmd; + } else { + log_verbose("Opening $file..."); + open $io, '<', $file; + } + + # nothing to do if the open failed (we log the error later) + return unless $io; + + # Net::Netrc does this, but the functionality is merged with the file + # detection logic, so we have to extract just the part we need + my @netrc_entries = net_netrc_loader($io); + + # these entries will use the credential helper protocol token names + my @entries; + + foreach my $nentry (@netrc_entries) { + my %entry; + my $num_port; + + if (!defined $nentry->{machine}) { + next; + } + if (defined $nentry->{port} && $nentry->{port} =~ m/^\d+$/) { + $num_port = $nentry->{port}; + delete $nentry->{port}; + } + + # create the new entry for the credential helper protocol + $entry{$options{tmap}->{$_}} = $nentry->{$_} foreach keys %$nentry; + + # for "host X port Y" where Y is an integer (captured by + # $num_port above), set the host to "X:Y" + if (defined $entry{host} && defined $num_port) { + $entry{host} = join(':', $entry{host}, $num_port); + } + + push @entries, \%entry; + } + + return @entries; +} + +sub net_netrc_loader { + my $fh = shift @_; + my @entries; + my ($mach, $macdef, $tok, @tok); + + LINE: + while (<$fh>) { + undef $macdef if /\A\n\Z/; + + if ($macdef) { + next LINE; + } + + s/^\s*//; + chomp; + + while (length && s/^("((?:[^"]+|\\.)*)"|((?:[^\\\s]+|\\.)*))\s*//) { + (my $tok = $+) =~ s/\\(.)/$1/g; + push(@tok, $tok); + } + + TOKEN: + while (@tok) { + if ($tok[0] eq "default") { + shift(@tok); + $mach = { machine => undef }; + next TOKEN; + } + + $tok = shift(@tok); + + if ($tok eq "machine") { + my $host = shift @tok; + $mach = { machine => $host }; + push @entries, $mach; + } elsif (exists $options{tmap}->{$tok}) { + unless ($mach) { + log_debug("Skipping token $tok because no machine was given"); + next TOKEN; + } + + my $value = shift @tok; + unless (defined $value) { + log_debug("Token $tok had no value, skipping it."); + next TOKEN; + } + + # Following line added by rmerrell to remove '/' escape char in .netrc + $value =~ s/\/\\/\\/g; + $mach->{$tok} = $value; + } elsif ($tok eq "macdef") { # we ignore macros + next TOKEN unless $mach; + my $value = shift @tok; + $macdef = 1; + } + } + } + + return @entries; +} + +sub read_credential_data_from_stdin { + # the query: start with every token with no value + my %q = map { $_ => undef } values(%{$options{tmap}}); + + while (<STDIN>) { + next unless m/^([^=]+)=(.+)/; + + my ($token, $value) = ($1, $2); + die "Unknown search token $token" unless exists $q{$token}; + $q{$token} = $value; + log_debug("We were given search token $token and value $value"); + } + + foreach (sort keys %q) { + log_debug("Searching for %s = %s", $_, $q{$_} || '(any value)'); + } + + return \%q; +} + +# takes the search tokens and then a list of entries +# each entry is a hash reference +sub find_netrc_entry { + my $query = shift @_; + + ENTRY: + foreach my $entry (@_) + { + my $entry_text = join ', ', map { "$_=$entry->{$_}" } keys %$entry; + foreach my $check (sort keys %$query) { + if (defined $query->{$check}) { + log_debug("compare %s [%s] to [%s] (entry: %s)", + $check, + $entry->{$check}, + $query->{$check}, + $entry_text); + unless ($query->{$check} eq $entry->{$check}) { + next ENTRY; + } + } else { + log_debug("OK: any value satisfies check $check"); + } + } + + return $entry; + } + + # nothing was found + return; +} + +sub print_credential_data { + my $entry = shift @_; + my $query = shift @_; + + log_debug("entry has passed all the search checks"); + TOKEN: + foreach my $git_token (sort keys %$entry) { + log_debug("looking for useful token $git_token"); + # don't print unknown (to the credential helper protocol) tokens + next TOKEN unless exists $query->{$git_token}; + + # don't print things asked in the query (the entry matches them) + next TOKEN if defined $query->{$git_token}; + + log_debug("FOUND: $git_token=$entry->{$git_token}"); + printf "%s=%s\n", $git_token, $entry->{$git_token}; + } +} +sub log_verbose { + return unless $options{verbose}; + printf STDERR @_; + printf STDERR "\n"; +} + +sub log_debug { + return unless $options{debug}; + printf STDERR @_; + printf STDERR "\n"; +} diff --git a/contrib/credential/netrc/test.netrc b/contrib/credential/netrc/test.netrc new file mode 100644 index 0000000000..ba119a937f --- /dev/null +++ b/contrib/credential/netrc/test.netrc @@ -0,0 +1,13 @@ +machine imap login tzz@lifelogs.com port imaps password letmeknow +machine imap login bob port imaps password bobwillknow + +# comment test + +machine imap2 login tzz port 1099 password tzzknow +machine imap2 login bob password bobwillknow + +# another command + +machine github.com + multilinetoken anothervalue + login carol password carolknows diff --git a/contrib/credential/netrc/test.pl b/contrib/credential/netrc/test.pl new file mode 100755 index 0000000000..169b6463c3 --- /dev/null +++ b/contrib/credential/netrc/test.pl @@ -0,0 +1,106 @@ +#!/usr/bin/perl + +use warnings; +use strict; +use Test; +use IPC::Open2; + +BEGIN { plan tests => 15 } + +my @global_credential_args = @ARGV; +my $netrc = './test.netrc'; +print "# Testing insecure file, nothing should be found\n"; +chmod 0644, $netrc; +my $cred = run_credential(['-f', $netrc, 'get'], + { host => 'github.com' }); + +ok(scalar keys %$cred, 0, "Got 0 keys from insecure file"); + +print "# Testing missing file, nothing should be found\n"; +chmod 0644, $netrc; +$cred = run_credential(['-f', '///nosuchfile///', 'get'], + { host => 'github.com' }); + +ok(scalar keys %$cred, 0, "Got 0 keys from missing file"); + +chmod 0600, $netrc; + +print "# Testing with invalid data\n"; +$cred = run_credential(['-f', $netrc, 'get'], + "bad data"); +ok(scalar keys %$cred, 4, "Got first found keys with bad data"); + +print "# Testing netrc file for a missing corovamilkbar entry\n"; +$cred = run_credential(['-f', $netrc, 'get'], + { host => 'corovamilkbar' }); + +ok(scalar keys %$cred, 0, "Got no corovamilkbar keys"); + +print "# Testing netrc file for a github.com entry\n"; +$cred = run_credential(['-f', $netrc, 'get'], + { host => 'github.com' }); + +ok(scalar keys %$cred, 2, "Got 2 Github keys"); + +ok($cred->{password}, 'carolknows', "Got correct Github password"); +ok($cred->{username}, 'carol', "Got correct Github username"); + +print "# Testing netrc file for a username-specific entry\n"; +$cred = run_credential(['-f', $netrc, 'get'], + { host => 'imap', username => 'bob' }); + +ok(scalar keys %$cred, 2, "Got 2 username-specific keys"); + +ok($cred->{password}, 'bobwillknow', "Got correct user-specific password"); +ok($cred->{protocol}, 'imaps', "Got correct user-specific protocol"); + +print "# Testing netrc file for a host:port-specific entry\n"; +$cred = run_credential(['-f', $netrc, 'get'], + { host => 'imap2:1099' }); + +ok(scalar keys %$cred, 2, "Got 2 host:port-specific keys"); + +ok($cred->{password}, 'tzzknow', "Got correct host:port-specific password"); +ok($cred->{username}, 'tzz', "Got correct host:port-specific username"); + +print "# Testing netrc file that 'host:port kills host' entry\n"; +$cred = run_credential(['-f', $netrc, 'get'], + { host => 'imap2' }); + +ok(scalar keys %$cred, 2, "Got 2 'host:port kills host' keys"); + +ok($cred->{password}, 'bobwillknow', "Got correct 'host:port kills host' password"); +ok($cred->{username}, 'bob', "Got correct 'host:port kills host' username"); + +sub run_credential +{ + my $args = shift @_; + my $data = shift @_; + my $pid = open2(my $chld_out, my $chld_in, + './git-credential-netrc', @global_credential_args, + @$args); + + die "Couldn't open pipe to netrc credential helper: $!" unless $pid; + + if (ref $data eq 'HASH') + { + print $chld_in "$_=$data->{$_}\n" foreach sort keys %$data; + } + else + { + print $chld_in "$data\n"; + } + + close $chld_in; + my %ret; + + while (<$chld_out>) + { + chomp; + next unless m/^([^=]+)=(.+)/; + + $ret{$1} = $2; + } + + return \%ret; +} diff --git a/contrib/credential/osxkeychain/git-credential-osxkeychain.c b/contrib/credential/osxkeychain/git-credential-osxkeychain.c index 6beed123ab..3940202b36 100644 --- a/contrib/credential/osxkeychain/git-credential-osxkeychain.c +++ b/contrib/credential/osxkeychain/git-credential-osxkeychain.c @@ -154,7 +154,7 @@ static void read_credential(void) int main(int argc, const char **argv) { const char *usage = - "Usage: git credential-osxkeychain <get|store|erase>"; + "usage: git credential-osxkeychain <get|store|erase>"; if (!argv[1]) die(usage); diff --git a/contrib/credential/wincred/git-credential-wincred.c b/contrib/credential/wincred/git-credential-wincred.c index cbaec5f24b..a1d38f035b 100644 --- a/contrib/credential/wincred/git-credential-wincred.c +++ b/contrib/credential/wincred/git-credential-wincred.c @@ -9,6 +9,8 @@ /* common helpers */ +#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) + static void die(const char *err, ...) { char msg[4096]; @@ -30,14 +32,6 @@ static void *xmalloc(size_t size) return ret; } -static char *xstrdup(const char *str) -{ - char *ret = strdup(str); - if (!ret) - die("Out of memory"); - return ret; -} - /* MinGW doesn't have wincred.h, so we need to define stuff */ typedef struct _CREDENTIAL_ATTRIBUTEW { @@ -67,20 +61,14 @@ typedef struct _CREDENTIALW { #define CRED_MAX_ATTRIBUTES 64 typedef BOOL (WINAPI *CredWriteWT)(PCREDENTIALW, DWORD); -typedef BOOL (WINAPI *CredUnPackAuthenticationBufferWT)(DWORD, PVOID, DWORD, - LPWSTR, DWORD *, LPWSTR, DWORD *, LPWSTR, DWORD *); typedef BOOL (WINAPI *CredEnumerateWT)(LPCWSTR, DWORD, DWORD *, PCREDENTIALW **); -typedef BOOL (WINAPI *CredPackAuthenticationBufferWT)(DWORD, LPWSTR, LPWSTR, - PBYTE, DWORD *); typedef VOID (WINAPI *CredFreeT)(PVOID); typedef BOOL (WINAPI *CredDeleteWT)(LPCWSTR, DWORD, DWORD); -static HMODULE advapi, credui; +static HMODULE advapi; static CredWriteWT CredWriteW; -static CredUnPackAuthenticationBufferWT CredUnPackAuthenticationBufferW; static CredEnumerateWT CredEnumerateW; -static CredPackAuthenticationBufferWT CredPackAuthenticationBufferW; static CredFreeT CredFree; static CredDeleteWT CredDeleteW; @@ -88,74 +76,84 @@ static void load_cred_funcs(void) { /* load DLLs */ advapi = LoadLibrary("advapi32.dll"); - credui = LoadLibrary("credui.dll"); - if (!advapi || !credui) - die("failed to load DLLs"); + if (!advapi) + die("failed to load advapi32.dll"); /* get function pointers */ CredWriteW = (CredWriteWT)GetProcAddress(advapi, "CredWriteW"); - CredUnPackAuthenticationBufferW = (CredUnPackAuthenticationBufferWT) - GetProcAddress(credui, "CredUnPackAuthenticationBufferW"); CredEnumerateW = (CredEnumerateWT)GetProcAddress(advapi, "CredEnumerateW"); - CredPackAuthenticationBufferW = (CredPackAuthenticationBufferWT) - GetProcAddress(credui, "CredPackAuthenticationBufferW"); CredFree = (CredFreeT)GetProcAddress(advapi, "CredFree"); CredDeleteW = (CredDeleteWT)GetProcAddress(advapi, "CredDeleteW"); - if (!CredWriteW || !CredUnPackAuthenticationBufferW || - !CredEnumerateW || !CredPackAuthenticationBufferW || !CredFree || - !CredDeleteW) + if (!CredWriteW || !CredEnumerateW || !CredFree || !CredDeleteW) die("failed to load functions"); } -static char target_buf[1024]; -static char *protocol, *host, *path, *username; -static WCHAR *wusername, *password, *target; +static WCHAR *wusername, *password, *protocol, *host, *path, target[1024]; -static void write_item(const char *what, WCHAR *wbuf) +static void write_item(const char *what, LPCWSTR wbuf, int wlen) { char *buf; - int len = WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, NULL, 0, NULL, + int len = WideCharToMultiByte(CP_UTF8, 0, wbuf, wlen, NULL, 0, NULL, FALSE); buf = xmalloc(len); - if (!WideCharToMultiByte(CP_UTF8, 0, wbuf, -1, buf, len, NULL, FALSE)) + if (!WideCharToMultiByte(CP_UTF8, 0, wbuf, wlen, buf, len, NULL, FALSE)) die("WideCharToMultiByte failed!"); printf("%s=", what); - fwrite(buf, 1, len - 1, stdout); + fwrite(buf, 1, len, stdout); putchar('\n'); free(buf); } -static int match_attr(const CREDENTIALW *cred, const WCHAR *keyword, - const char *want) +/* + * Match an (optional) expected string and a delimiter in the target string, + * consuming the matched text by updating the target pointer. + */ +static int match_part(LPCWSTR *ptarget, LPCWSTR want, LPCWSTR delim) { - int i; - if (!want) - return 1; - - for (i = 0; i < cred->AttributeCount; ++i) - if (!wcscmp(cred->Attributes[i].Keyword, keyword)) - return !strcmp((const char *)cred->Attributes[i].Value, - want); - - return 0; /* not found */ + LPCWSTR delim_pos, start = *ptarget; + int len; + + /* find start of delimiter (or end-of-string if delim is empty) */ + if (*delim) + delim_pos = wcsstr(start, delim); + else + delim_pos = start + wcslen(start); + + /* + * match text up to delimiter, or end of string (e.g. the '/' after + * host is optional if not followed by a path) + */ + if (delim_pos) + len = delim_pos - start; + else + len = wcslen(start); + + /* update ptarget if we either found a delimiter or need a match */ + if (delim_pos || want) + *ptarget = delim_pos ? delim_pos + wcslen(delim) : start + len; + + return !want || (!wcsncmp(want, start, len) && !want[len]); } static int match_cred(const CREDENTIALW *cred) { - return (!wusername || !wcscmp(wusername, cred->UserName)) && - match_attr(cred, L"git_protocol", protocol) && - match_attr(cred, L"git_host", host) && - match_attr(cred, L"git_path", path); + LPCWSTR target = cred->TargetName; + if (wusername && wcscmp(wusername, cred->UserName)) + return 0; + + return match_part(&target, L"git", L":") && + match_part(&target, protocol, L"://") && + match_part(&target, wusername, L"@") && + match_part(&target, host, L"/") && + match_part(&target, path, L""); } static void get_credential(void) { - WCHAR *user_buf, *pass_buf; - DWORD user_buf_size = 0, pass_buf_size = 0; - CREDENTIALW **creds, *cred = NULL; + CREDENTIALW **creds; DWORD num_creds; int i; @@ -165,90 +163,36 @@ static void get_credential(void) /* search for the first credential that matches username */ for (i = 0; i < num_creds; ++i) if (match_cred(creds[i])) { - cred = creds[i]; + write_item("username", creds[i]->UserName, + wcslen(creds[i]->UserName)); + write_item("password", + (LPCWSTR)creds[i]->CredentialBlob, + creds[i]->CredentialBlobSize / sizeof(WCHAR)); break; } - if (!cred) - return; - - CredUnPackAuthenticationBufferW(0, cred->CredentialBlob, - cred->CredentialBlobSize, NULL, &user_buf_size, NULL, NULL, - NULL, &pass_buf_size); - - user_buf = xmalloc(user_buf_size * sizeof(WCHAR)); - pass_buf = xmalloc(pass_buf_size * sizeof(WCHAR)); - - if (!CredUnPackAuthenticationBufferW(0, cred->CredentialBlob, - cred->CredentialBlobSize, user_buf, &user_buf_size, NULL, NULL, - pass_buf, &pass_buf_size)) - die("CredUnPackAuthenticationBuffer failed"); CredFree(creds); - - /* zero-terminate (sizes include zero-termination) */ - user_buf[user_buf_size - 1] = L'\0'; - pass_buf[pass_buf_size - 1] = L'\0'; - - write_item("username", user_buf); - write_item("password", pass_buf); - - free(user_buf); - free(pass_buf); -} - -static void write_attr(CREDENTIAL_ATTRIBUTEW *attr, const WCHAR *keyword, - const char *value) -{ - attr->Keyword = (LPWSTR)keyword; - attr->Flags = 0; - attr->ValueSize = strlen(value) + 1; /* store zero-termination */ - attr->Value = (LPBYTE)value; } static void store_credential(void) { CREDENTIALW cred; - BYTE *auth_buf; - DWORD auth_buf_size = 0; - CREDENTIAL_ATTRIBUTEW attrs[CRED_MAX_ATTRIBUTES]; if (!wusername || !password) return; - /* query buffer size */ - CredPackAuthenticationBufferW(0, wusername, password, - NULL, &auth_buf_size); - - auth_buf = xmalloc(auth_buf_size); - - if (!CredPackAuthenticationBufferW(0, wusername, password, - auth_buf, &auth_buf_size)) - die("CredPackAuthenticationBuffer failed"); - cred.Flags = 0; cred.Type = CRED_TYPE_GENERIC; cred.TargetName = target; cred.Comment = L"saved by git-credential-wincred"; - cred.CredentialBlobSize = auth_buf_size; - cred.CredentialBlob = auth_buf; + cred.CredentialBlobSize = (wcslen(password)) * sizeof(WCHAR); + cred.CredentialBlob = (LPVOID)password; cred.Persist = CRED_PERSIST_LOCAL_MACHINE; - cred.AttributeCount = 1; - cred.Attributes = attrs; + cred.AttributeCount = 0; + cred.Attributes = NULL; cred.TargetAlias = NULL; cred.UserName = wusername; - write_attr(attrs, L"git_protocol", protocol); - - if (host) { - write_attr(attrs + cred.AttributeCount, L"git_host", host); - cred.AttributeCount++; - } - - if (path) { - write_attr(attrs + cred.AttributeCount, L"git_path", path); - cred.AttributeCount++; - } - if (!CredWriteW(&cred, 0)) die("CredWrite failed"); } @@ -284,10 +228,13 @@ static void read_credential(void) while (fgets(buf, sizeof(buf), stdin)) { char *v; + int len = strlen(buf); + /* strip trailing CR / LF */ + while (len && strchr("\r\n", buf[len - 1])) + buf[--len] = 0; - if (!strcmp(buf, "\n")) + if (!*buf) break; - buf[strlen(buf)-1] = '\0'; v = strchr(buf, '='); if (!v) @@ -295,13 +242,12 @@ static void read_credential(void) *v++ = '\0'; if (!strcmp(buf, "protocol")) - protocol = xstrdup(v); + protocol = utf8_to_utf16_dup(v); else if (!strcmp(buf, "host")) - host = xstrdup(v); + host = utf8_to_utf16_dup(v); else if (!strcmp(buf, "path")) - path = xstrdup(v); + path = utf8_to_utf16_dup(v); else if (!strcmp(buf, "username")) { - username = xstrdup(v); wusername = utf8_to_utf16_dup(v); } else if (!strcmp(buf, "password")) password = utf8_to_utf16_dup(v); @@ -313,7 +259,7 @@ static void read_credential(void) int main(int argc, char *argv[]) { const char *usage = - "Usage: git credential-wincred <get|store|erase>\n"; + "usage: git credential-wincred <get|store|erase>\n"; if (!argv[1]) die(usage); @@ -330,22 +276,20 @@ int main(int argc, char *argv[]) return 0; /* prepare 'target', the unique key for the credential */ - strncat(target_buf, "git:", sizeof(target_buf)); - strncat(target_buf, protocol, sizeof(target_buf)); - strncat(target_buf, "://", sizeof(target_buf)); - if (username) { - strncat(target_buf, username, sizeof(target_buf)); - strncat(target_buf, "@", sizeof(target_buf)); + wcscpy(target, L"git:"); + wcsncat(target, protocol, ARRAY_SIZE(target)); + wcsncat(target, L"://", ARRAY_SIZE(target)); + if (wusername) { + wcsncat(target, wusername, ARRAY_SIZE(target)); + wcsncat(target, L"@", ARRAY_SIZE(target)); } if (host) - strncat(target_buf, host, sizeof(target_buf)); + wcsncat(target, host, ARRAY_SIZE(target)); if (path) { - strncat(target_buf, "/", sizeof(target_buf)); - strncat(target_buf, path, sizeof(target_buf)); + wcsncat(target, L"/", ARRAY_SIZE(target)); + wcsncat(target, path, ARRAY_SIZE(target)); } - target = utf8_to_utf16_dup(target_buf); - if (!strcmp(argv[1], "get")) get_credential(); else if (!strcmp(argv[1], "store")) diff --git a/contrib/examples/git-remote.perl b/contrib/examples/git-remote.perl index b17952a785..d42df7b418 100755 --- a/contrib/examples/git-remote.perl +++ b/contrib/examples/git-remote.perl @@ -347,7 +347,7 @@ sub rm_remote { } sub add_usage { - print STDERR "Usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n"; + print STDERR "usage: git remote add [-f] [-t track]* [-m master] <name> <url>\n"; exit(1); } @@ -380,7 +380,7 @@ elsif ($ARGV[0] eq 'show') { } } if ($i >= @ARGV) { - print STDERR "Usage: git remote show <remote>\n"; + print STDERR "usage: git remote show <remote>\n"; exit(1); } my $status = 0; @@ -410,7 +410,7 @@ elsif ($ARGV[0] eq 'prune') { } } if ($i >= @ARGV) { - print STDERR "Usage: git remote prune <remote>\n"; + print STDERR "usage: git remote prune <remote>\n"; exit(1); } my $status = 0; @@ -458,13 +458,13 @@ elsif ($ARGV[0] eq 'add') { } elsif ($ARGV[0] eq 'rm') { if (@ARGV <= 1) { - print STDERR "Usage: git remote rm <remote>\n"; + print STDERR "usage: git remote rm <remote>\n"; exit(1); } exit(rm_remote($ARGV[1])); } else { - print STDERR "Usage: git remote\n"; + print STDERR "usage: git remote\n"; print STDERR " git remote add <name> <url>\n"; print STDERR " git remote rm <name>\n"; print STDERR " git remote show <name>\n"; diff --git a/contrib/examples/git-svnimport.perl b/contrib/examples/git-svnimport.perl index b09ff8f12f..c414f0d9c7 100755 --- a/contrib/examples/git-svnimport.perl +++ b/contrib/examples/git-svnimport.perl @@ -36,7 +36,7 @@ our($opt_h,$opt_o,$opt_v,$opt_u,$opt_C,$opt_i,$opt_m,$opt_M,$opt_t,$opt_T, sub usage() { print STDERR <<END; -Usage: ${\basename $0} # fetch/update GIT from SVN +usage: ${\basename $0} # fetch/update GIT from SVN [-o branch-for-HEAD] [-h] [-v] [-l max_rev] [-R repack_each_revs] [-C GIT_repository] [-t tagname] [-T trunkname] [-b branchname] [-d|-D] [-i] [-u] [-r] [-I ignorefilename] [-s start_chg] diff --git a/contrib/fast-import/git-import.perl b/contrib/fast-import/git-import.perl index f9fef6db28..0891b9e366 100755 --- a/contrib/fast-import/git-import.perl +++ b/contrib/fast-import/git-import.perl @@ -7,7 +7,7 @@ use strict; use File::Find; -my $USAGE = 'Usage: git-import branch import-message'; +my $USAGE = 'usage: git-import branch import-message'; my $branch = shift or die "$USAGE\n"; my $message = shift or die "$USAGE\n"; diff --git a/contrib/fast-import/git-import.sh b/contrib/fast-import/git-import.sh index 0ca7718d05..f8d803c5e2 100755 --- a/contrib/fast-import/git-import.sh +++ b/contrib/fast-import/git-import.sh @@ -5,7 +5,7 @@ # but is meant to be a simple fast-import example. if [ -z "$1" -o -z "$2" ]; then - echo "Usage: git-import branch import-message" + echo "usage: git-import branch import-message" exit 1 fi diff --git a/contrib/fast-import/import-zips.py b/contrib/fast-import/import-zips.py index 5cec9b0129..d12c296223 100755 --- a/contrib/fast-import/import-zips.py +++ b/contrib/fast-import/import-zips.py @@ -14,13 +14,13 @@ from time import mktime from zipfile import ZipFile if hexversion < 0x01060000: - # The limiter is the zipfile module - sys.stderr.write("import-zips.py: requires Python 1.6.0 or later.\n") - sys.exit(1) + # The limiter is the zipfile module + stderr.write("import-zips.py: requires Python 1.6.0 or later.\n") + exit(1) if len(argv) < 2: - print 'Usage:', argv[0], '<zipfile>...' - exit(1) + print 'usage:', argv[0], '<zipfile>...' + exit(1) branch_ref = 'refs/heads/import-zips' committer_name = 'Z Ip Creator' @@ -28,51 +28,51 @@ committer_email = 'zip@example.com' fast_import = popen('git fast-import --quiet', 'w') def printlines(list): - for str in list: - fast_import.write(str + "\n") + for str in list: + fast_import.write(str + "\n") for zipfile in argv[1:]: - commit_time = 0 - next_mark = 1 - common_prefix = None - mark = dict() - - zip = ZipFile(zipfile, 'r') - for name in zip.namelist(): - if name.endswith('/'): - continue - info = zip.getinfo(name) - - if commit_time < info.date_time: - commit_time = info.date_time - if common_prefix == None: - common_prefix = name[:name.rfind('/') + 1] - else: - while not name.startswith(common_prefix): - last_slash = common_prefix[:-1].rfind('/') + 1 - common_prefix = common_prefix[:last_slash] - - mark[name] = ':' + str(next_mark) - next_mark += 1 - - printlines(('blob', 'mark ' + mark[name], \ - 'data ' + str(info.file_size))) - fast_import.write(zip.read(name) + "\n") - - committer = committer_name + ' <' + committer_email + '> %d +0000' % \ - mktime(commit_time + (0, 0, 0)) - - printlines(('commit ' + branch_ref, 'committer ' + committer, \ - 'data <<EOM', 'Imported from ' + zipfile + '.', 'EOM', \ - '', 'deleteall')) - - for name in mark.keys(): - fast_import.write('M 100644 ' + mark[name] + ' ' + - name[len(common_prefix):] + "\n") - - printlines(('', 'tag ' + path.basename(zipfile), \ - 'from ' + branch_ref, 'tagger ' + committer, \ - 'data <<EOM', 'Package ' + zipfile, 'EOM', '')) + commit_time = 0 + next_mark = 1 + common_prefix = None + mark = dict() + + zip = ZipFile(zipfile, 'r') + for name in zip.namelist(): + if name.endswith('/'): + continue + info = zip.getinfo(name) + + if commit_time < info.date_time: + commit_time = info.date_time + if common_prefix == None: + common_prefix = name[:name.rfind('/') + 1] + else: + while not name.startswith(common_prefix): + last_slash = common_prefix[:-1].rfind('/') + 1 + common_prefix = common_prefix[:last_slash] + + mark[name] = ':' + str(next_mark) + next_mark += 1 + + printlines(('blob', 'mark ' + mark[name], \ + 'data ' + str(info.file_size))) + fast_import.write(zip.read(name) + "\n") + + committer = committer_name + ' <' + committer_email + '> %d +0000' % \ + mktime(commit_time + (0, 0, 0)) + + printlines(('commit ' + branch_ref, 'committer ' + committer, \ + 'data <<EOM', 'Imported from ' + zipfile + '.', 'EOM', \ + '', 'deleteall')) + + for name in mark.keys(): + fast_import.write('M 100644 ' + mark[name] + ' ' + + name[len(common_prefix):] + "\n") + + printlines(('', 'tag ' + path.basename(zipfile), \ + 'from ' + branch_ref, 'tagger ' + committer, \ + 'data <<EOM', 'Package ' + zipfile, 'EOM', '')) if fast_import.close(): - exit(1) + exit(1) diff --git a/contrib/hooks/post-receive-email b/contrib/hooks/post-receive-email index b2171a092e..0e5b72d7f1 100755 --- a/contrib/hooks/post-receive-email +++ b/contrib/hooks/post-receive-email @@ -237,6 +237,7 @@ generate_email_header() X-Git-Reftype: $refname_type X-Git-Oldrev: $oldrev X-Git-Newrev: $newrev + Auto-Submitted: auto-generated This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing diff --git a/contrib/hooks/setgitperms.perl b/contrib/hooks/setgitperms.perl index a577ad095f..2770a1b1d2 100644 --- a/contrib/hooks/setgitperms.perl +++ b/contrib/hooks/setgitperms.perl @@ -24,7 +24,7 @@ use File::Find; use File::Basename; my $usage = -"Usage: setgitperms.perl [OPTION]... <--read|--write> +"usage: setgitperms.perl [OPTION]... <--read|--write> This program uses a file `.gitmeta` to store/restore permissions and uid/gid info for all files/dirs tracked by git in the repository. diff --git a/contrib/mw-to-git/.gitignore b/contrib/mw-to-git/.gitignore new file mode 100644 index 0000000000..b9196555e5 --- /dev/null +++ b/contrib/mw-to-git/.gitignore @@ -0,0 +1 @@ +git-remote-mediawiki diff --git a/contrib/mw-to-git/Makefile b/contrib/mw-to-git/Makefile index 3ed728b0ef..f14971987c 100644 --- a/contrib/mw-to-git/Makefile +++ b/contrib/mw-to-git/Makefile @@ -1,47 +1,17 @@ # -# Copyright (C) 2012 -# Charles Roussel <charles.roussel@ensimag.imag.fr> -# Simon Cathebras <simon.cathebras@ensimag.imag.fr> -# Julien Khayat <julien.khayat@ensimag.imag.fr> -# Guillaume Sasdy <guillaume.sasdy@ensimag.imag.fr> -# Simon Perrat <simon.perrat@ensimag.imag.fr> +# Copyright (C) 2013 +# Matthieu Moy <Matthieu.Moy@imag.fr> # ## Build git-remote-mediawiki --include ../../config.mak.autogen --include ../../config.mak +SCRIPT_PERL=git-remote-mediawiki.perl +GIT_ROOT_DIR=../.. +HERE=contrib/mw-to-git/ -ifndef PERL_PATH - PERL_PATH = /usr/bin/perl -endif -ifndef gitexecdir - gitexecdir = $(shell git --exec-path) -endif +SCRIPT_PERL_FULL=$(patsubst %,$(HERE)/%,$(SCRIPT_PERL)) -PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) -gitexecdir_SQ = $(subst ','\'',$(gitexecdir)) -SCRIPT = git-remote-mediawiki +all: build -.PHONY: install help doc test clean - -help: - @echo 'This is the help target of the Makefile. Current configuration:' - @echo ' gitexecdir = $(gitexecdir_SQ)' - @echo ' PERL_PATH = $(PERL_PATH_SQ)' - @echo 'Run "$(MAKE) install" to install $(SCRIPT) in gitexecdir' - @echo 'Run "$(MAKE) test" to run the testsuite' - -install: - sed -e '1s|#!.*/perl|#!$(PERL_PATH_SQ)|' $(SCRIPT) \ - > '$(gitexecdir_SQ)/$(SCRIPT)' - chmod +x '$(gitexecdir)/$(SCRIPT)' - -doc: - @echo 'Sorry, "make doc" is not implemented yet for $(SCRIPT)' - -test: - $(MAKE) -C t/ test - -clean: - $(RM) '$(gitexecdir)/$(SCRIPT)' - $(MAKE) -C t/ clean +build install clean: + $(MAKE) -C $(GIT_ROOT_DIR) SCRIPT_PERL=$(SCRIPT_PERL_FULL) \ + $@-perl-script diff --git a/contrib/mw-to-git/git-remote-mediawiki b/contrib/mw-to-git/git-remote-mediawiki.perl index 094129de09..094129de09 100755 --- a/contrib/mw-to-git/git-remote-mediawiki +++ b/contrib/mw-to-git/git-remote-mediawiki.perl diff --git a/contrib/mw-to-git/t/install-wiki.sh b/contrib/mw-to-git/t/install-wiki.sh index c6d6fa3aef..70a53f67fd 100755 --- a/contrib/mw-to-git/t/install-wiki.sh +++ b/contrib/mw-to-git/t/install-wiki.sh @@ -15,7 +15,7 @@ fi . "$WIKI_TEST_DIR"/test-gitmw-lib.sh usage () { - echo "Usage: " + echo "usage: " echo " ./install-wiki.sh <install | delete | --help>" echo " install | -i : Install a wiki on your computer." echo " delete | -d : Delete the wiki and all its pages and " diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index c7006000a6..328c2dc76d 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -53,7 +53,7 @@ def gittz(tz): return '%+03d%02d' % (-tz / 3600, -tz % 3600 / 60) def hgmode(mode): - m = { '0100755': 'x', '0120000': 'l' } + m = { '100755': 'x', '120000': 'l' } return m.get(mode, '') def get_config(config): @@ -720,6 +720,14 @@ def do_export(parser): if peer: parser.repo.push(peer, force=False) +def fix_path(alias, repo, orig_url): + repo_url = util.url(repo.url()) + url = util.url(orig_url) + if str(url) == str(repo_url): + return + cmd = ['git', 'config', 'remote.%s.url' % alias, "hg::%s" % repo_url] + subprocess.call(cmd) + def main(args): global prefix, dirname, branches, bmarks global marks, blob_marks, parsed_refs @@ -766,6 +774,9 @@ def main(args): repo = get_repo(url, alias) prefix = 'refs/hg/%s' % alias + if not is_tmp: + fix_path(alias, peer or repo, url) + if not os.path.exists(dirname): os.makedirs(dirname) diff --git a/contrib/remote-helpers/test-hg-hg-git.sh b/contrib/remote-helpers/test-hg-hg-git.sh index 3e76d9fb60..7e3967f5b6 100755 --- a/contrib/remote-helpers/test-hg-hg-git.sh +++ b/contrib/remote-helpers/test-hg-hg-git.sh @@ -109,6 +109,74 @@ setup () { setup +test_expect_success 'executable bit' ' + mkdir -p tmp && cd tmp && + test_when_finished "cd .. && rm -rf tmp" && + + ( + git init -q gitrepo && + cd gitrepo && + echo alpha > alpha && + chmod 0644 alpha && + git add alpha && + git commit -m "add alpha" && + chmod 0755 alpha && + git add alpha && + git commit -m "set executable bit" && + chmod 0644 alpha && + git add alpha && + git commit -m "clear executable bit" + ) && + + for x in hg git; do + ( + hg_clone_$x gitrepo hgrepo-$x && + cd hgrepo-$x && + hg_log . && + hg manifest -r 1 -v && + hg manifest -v + ) > output-$x && + + git_clone_$x hgrepo-$x gitrepo2-$x && + git_log gitrepo2-$x > log-$x + done && + cp -r log-* output-* /tmp/foo/ && + + test_cmp output-hg output-git && + test_cmp log-hg log-git +' + +test_expect_success 'symlink' ' + mkdir -p tmp && cd tmp && + test_when_finished "cd .. && rm -rf tmp" && + + ( + git init -q gitrepo && + cd gitrepo && + echo alpha > alpha && + git add alpha && + git commit -m "add alpha" && + ln -s alpha beta && + git add beta && + git commit -m "add beta" + ) && + + for x in hg git; do + ( + hg_clone_$x gitrepo hgrepo-$x && + cd hgrepo-$x && + hg_log . && + hg manifest -v + ) > output-$x && + + git_clone_$x hgrepo-$x gitrepo2-$x && + git_log gitrepo2-$x > log-$x + done && + + test_cmp output-hg output-git && + test_cmp log-hg log-git +' + test_expect_success 'merge conflict 1' ' mkdir -p tmp && cd tmp && test_when_finished "cd .. && rm -rf tmp" && diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile index 05cdd5c9b2..b50750565f 100644 --- a/contrib/subtree/Makefile +++ b/contrib/subtree/Makefile @@ -30,12 +30,13 @@ $(GIT_SUBTREE): $(GIT_SUBTREE_SH) doc: $(GIT_SUBTREE_DOC) install: $(GIT_SUBTREE) - $(INSTALL) -m 755 $(GIT_SUBTREE) $(libexecdir) + $(INSTALL) -m 755 $(GIT_SUBTREE) $(DESTDIR)$(libexecdir) install-doc: install-man install-man: $(GIT_SUBTREE_DOC) - $(INSTALL) -m 644 $^ $(man1dir) + $(INSTALL) -d -m 755 $(DESTDIR)$(man1dir) + $(INSTALL) -m 644 $^ $(DESTDIR)$(man1dir) $(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML) xmlto -m $(MANPAGE_NORMAL_XSL) man $^ diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh index 920c664bb7..8a23f58ba0 100755 --- a/contrib/subtree/git-subtree.sh +++ b/contrib/subtree/git-subtree.sh @@ -9,6 +9,7 @@ if [ $# -eq 0 ]; then fi OPTS_SPEC="\ git subtree add --prefix=<prefix> <commit> +git subtree add --prefix=<prefix> <repository> <commit> git subtree merge --prefix=<prefix> <commit> git subtree pull --prefix=<prefix> <repository> <refspec...> git subtree push --prefix=<prefix> <repository> <refspec...> @@ -296,7 +297,7 @@ copy_commit() # We're going to set some environment vars here, so # do it in a subshell to get rid of them safely later debug copy_commit "{$1}" "{$2}" "{$3}" - git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%s%n%n%b' "$1" | + git log -1 --pretty=format:'%an%n%ae%n%ad%n%cn%n%ce%n%cd%n%B' "$1" | ( read GIT_AUTHOR_NAME read GIT_AUTHOR_EMAIL @@ -497,12 +498,23 @@ cmd_add() ensure_clean if [ $# -eq 1 ]; then - "cmd_add_commit" "$@" + git rev-parse -q --verify "$1^{commit}" >/dev/null || + die "'$1' does not refer to a commit" + + "cmd_add_commit" "$@" elif [ $# -eq 2 ]; then - "cmd_add_repository" "$@" + # Technically we could accept a refspec here but we're + # just going to turn around and add FETCH_HEAD under the + # specified directory. Allowing a refspec might be + # misleading because we won't do anything with any other + # branches fetched via the refspec. + git rev-parse -q --verify "$2^{commit}" >/dev/null || + die "'$2' does not refer to a commit" + + "cmd_add_repository" "$@" else say "error: parameters were '$@'" - die "Provide either a refspec or a repository and refspec." + die "Provide either a commit or a repository and commit." fi } diff --git a/contrib/subtree/git-subtree.txt b/contrib/subtree/git-subtree.txt index c5bce41ac7..7ba853eeda 100644 --- a/contrib/subtree/git-subtree.txt +++ b/contrib/subtree/git-subtree.txt @@ -9,7 +9,8 @@ git-subtree - Merge subtrees together and split repository into subtrees SYNOPSIS -------- [verse] -'git subtree' add -P <prefix> <commit> +'git subtree' add -P <prefix> <refspec> +'git subtree' add -P <prefix> <repository> <refspec> 'git subtree' pull -P <prefix> <repository> <refspec...> 'git subtree' push -P <prefix> <repository> <refspec...> 'git subtree' merge -P <prefix> <commit> diff --git a/contrib/subtree/t/t7900-subtree.sh b/contrib/subtree/t/t7900-subtree.sh index bc2eeb0944..80d339960b 100755 --- a/contrib/subtree/t/t7900-subtree.sh +++ b/contrib/subtree/t/t7900-subtree.sh @@ -60,7 +60,6 @@ last_commit_message() git log --pretty=format:%s -1 } -# 1 test_expect_success 'init subproj' ' test_create_repo subproj ' @@ -68,7 +67,6 @@ test_expect_success 'init subproj' ' # To the subproject! cd subproj -# 2 test_expect_success 'add sub1' ' create sub1 && git commit -m "sub1" && @@ -76,14 +74,16 @@ test_expect_success 'add sub1' ' git branch -m master subproj ' -# 3 +# Save this hash for testing later. + +subdir_hash=`git rev-parse HEAD` + test_expect_success 'add sub2' ' create sub2 && git commit -m "sub2" && git branch sub2 ' -# 4 test_expect_success 'add sub3' ' create sub3 && git commit -m "sub3" && @@ -93,7 +93,6 @@ test_expect_success 'add sub3' ' # Back to mainline cd .. -# 5 test_expect_success 'add main4' ' create main4 && git commit -m "main4" && @@ -101,101 +100,85 @@ test_expect_success 'add main4' ' git branch subdir ' -# 6 test_expect_success 'fetch subproj history' ' git fetch ./subproj sub1 && git branch sub1 FETCH_HEAD ' -# 7 test_expect_success 'no subtree exists in main tree' ' test_must_fail git subtree merge --prefix=subdir sub1 ' -# 8 test_expect_success 'no pull from non-existant subtree' ' test_must_fail git subtree pull --prefix=subdir ./subproj sub1 ' -# 9 test_expect_success 'check if --message works for add' ' git subtree add --prefix=subdir --message="Added subproject" sub1 && check_equal ''"$(last_commit_message)"'' "Added subproject" && undo ' -# 10 test_expect_success 'check if --message works as -m and --prefix as -P' ' git subtree add -P subdir -m "Added subproject using git subtree" sub1 && check_equal ''"$(last_commit_message)"'' "Added subproject using git subtree" && undo ' -# 11 test_expect_success 'check if --message works with squash too' ' git subtree add -P subdir -m "Added subproject with squash" --squash sub1 && check_equal ''"$(last_commit_message)"'' "Added subproject with squash" && undo ' -# 12 test_expect_success 'add subproj to mainline' ' git subtree add --prefix=subdir/ FETCH_HEAD && check_equal ''"$(last_commit_message)"'' "Add '"'subdir/'"' from commit '"'"'''"$(git rev-parse sub1)"'''"'"'" ' -# 13 # this shouldn't actually do anything, since FETCH_HEAD is already a parent test_expect_success 'merge fetched subproj' ' git merge -m "merge -s -ours" -s ours FETCH_HEAD ' -# 14 test_expect_success 'add main-sub5' ' create subdir/main-sub5 && git commit -m "main-sub5" ' -# 15 test_expect_success 'add main6' ' create main6 && git commit -m "main6 boring" ' -# 16 test_expect_success 'add main-sub7' ' create subdir/main-sub7 && git commit -m "main-sub7" ' -# 17 test_expect_success 'fetch new subproj history' ' git fetch ./subproj sub2 && git branch sub2 FETCH_HEAD ' -# 18 test_expect_success 'check if --message works for merge' ' git subtree merge --prefix=subdir -m "Merged changes from subproject" sub2 && check_equal ''"$(last_commit_message)"'' "Merged changes from subproject" && undo ' -# 19 test_expect_success 'check if --message for merge works with squash too' ' git subtree merge --prefix subdir -m "Merged changes from subproject using squash" --squash sub2 && check_equal ''"$(last_commit_message)"'' "Merged changes from subproject using squash" && undo ' -# 20 test_expect_success 'merge new subproj history into subdir' ' git subtree merge --prefix=subdir FETCH_HEAD && git branch pre-split && check_equal ''"$(last_commit_message)"'' "Merge commit '"'"'"$(git rev-parse sub2)"'"'"' into mainline" ' -# 21 test_expect_success 'Check that prefix argument is required for split' ' echo "You must provide the --prefix option." > expected && test_must_fail git subtree split > actual 2>&1 && @@ -207,7 +190,6 @@ test_expect_success 'Check that prefix argument is required for split' ' rm -f expected actual ' -# 22 test_expect_success 'Check that the <prefix> exists for a split' ' echo "'"'"'non-existent-directory'"'"'" does not exist\; use "'"'"'git subtree add'"'"'" > expected && test_must_fail git subtree split --prefix=non-existent-directory > actual 2>&1 && @@ -219,7 +201,6 @@ test_expect_success 'Check that the <prefix> exists for a split' ' # rm -f expected actual ' -# 23 test_expect_success 'check if --message works for split+rejoin' ' spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' && git branch spl1 "$spl1" && @@ -227,15 +208,24 @@ test_expect_success 'check if --message works for split+rejoin' ' undo ' -# 24 test_expect_success 'check split with --branch' ' - spl1=$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin) && - undo && - git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --branch splitbr1 && - check_equal ''"$(git rev-parse splitbr1)"'' "$spl1" + spl1=$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin) && + undo && + git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --branch splitbr1 && + check_equal ''"$(git rev-parse splitbr1)"'' "$spl1" +' + +test_expect_success 'check hash of split' ' + spl1=$(git subtree split --prefix subdir) && + undo && + git subtree split --prefix subdir --branch splitbr1test && + check_equal ''"$(git rev-parse splitbr1test)"'' "$spl1" + git checkout splitbr1test && + new_hash=$(git rev-parse HEAD~2) && + git checkout mainline && + check_equal ''"$new_hash"'' "$subdir_hash" ' -# 25 test_expect_success 'check split with --branch for an existing branch' ' spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' && undo && @@ -244,13 +234,10 @@ test_expect_success 'check split with --branch for an existing branch' ' check_equal ''"$(git rev-parse splitbr2)"'' "$spl1" ' -# 26 test_expect_success 'check split with --branch for an incompatible branch' ' test_must_fail git subtree split --prefix subdir --onto FETCH_HEAD --branch subdir ' - -# 27 test_expect_success 'check split+rejoin' ' spl1=''"$(git subtree split --annotate='"'*'"' --prefix subdir --onto FETCH_HEAD --message "Split & rejoin" --rejoin)"'' && undo && @@ -258,7 +245,6 @@ test_expect_success 'check split+rejoin' ' check_equal ''"$(last_commit_message)"'' "Split '"'"'subdir/'"'"' into commit '"'"'"$spl1"'"'"'" ' -# 28 test_expect_success 'add main-sub8' ' create subdir/main-sub8 && git commit -m "main-sub8" @@ -267,14 +253,12 @@ test_expect_success 'add main-sub8' ' # To the subproject! cd ./subproj -# 29 test_expect_success 'merge split into subproj' ' git fetch .. spl1 && git branch spl1 FETCH_HEAD && git merge FETCH_HEAD ' -# 30 test_expect_success 'add sub9' ' create sub9 && git commit -m "sub9" @@ -283,19 +267,16 @@ test_expect_success 'add sub9' ' # Back to mainline cd .. -# 31 test_expect_success 'split for sub8' ' split2=''"$(git subtree split --annotate='"'*'"' --prefix subdir/ --rejoin)"'' git branch split2 "$split2" ' -# 32 test_expect_success 'add main-sub10' ' create subdir/main-sub10 && git commit -m "main-sub10" ' -# 33 test_expect_success 'split for sub10' ' spl3=''"$(git subtree split --annotate='"'*'"' --prefix subdir --rejoin)"'' && git branch spl3 "$spl3" @@ -304,7 +285,6 @@ test_expect_success 'split for sub10' ' # To the subproject! cd ./subproj -# 34 test_expect_success 'merge split into subproj' ' git fetch .. spl3 && git branch spl3 FETCH_HEAD && @@ -318,13 +298,11 @@ chkms_sub=$(echo $chkms | multiline | sed 's,^,subdir/,' | fixnl) chks="sub1 sub2 sub3 sub9" chks_sub=$(echo $chks | multiline | sed 's,^,subdir/,' | fixnl) -# 35 test_expect_success 'make sure exactly the right set of files ends up in the subproj' ' subfiles=''"$(git ls-files | fixnl)"'' && check_equal "$subfiles" "$chkms $chks" ' -# 36 test_expect_success 'make sure the subproj history *only* contains commits that affect the subdir' ' allchanges=''"$(git log --name-only --pretty=format:'"''"' | sort | fixnl)"'' && check_equal "$allchanges" "$chkms $chks" @@ -333,20 +311,17 @@ test_expect_success 'make sure the subproj history *only* contains commits that # Back to mainline cd .. -# 37 test_expect_success 'pull from subproj' ' git fetch ./subproj subproj-merge-spl3 && git branch subproj-merge-spl3 FETCH_HEAD && git subtree pull --prefix=subdir ./subproj subproj-merge-spl3 ' -# 38 test_expect_success 'make sure exactly the right set of files ends up in the mainline' ' mainfiles=''"$(git ls-files | fixnl)"'' && check_equal "$mainfiles" "$chkm $chkms_sub $chks_sub" ' -# 39 test_expect_success 'make sure each filename changed exactly once in the entire history' ' # main-sub?? and /subdir/main-sub?? both change, because those are the # changes that were split into their own history. And subdir/sub?? never @@ -355,12 +330,10 @@ test_expect_success 'make sure each filename changed exactly once in the entire check_equal "$allchanges" ''"$(echo $chkms $chkm $chks $chkms_sub | multiline | sort | fixnl)"'' ' -# 40 test_expect_success 'make sure the --rejoin commits never make it into subproj' ' check_equal ''"$(git log --pretty=format:'"'%s'"' HEAD^2 | grep -i split)"'' "" ' -# 41 test_expect_success 'make sure no "git subtree" tagged commits make it into subproj' ' # They are meaningless to subproj since one side of the merge refers to the mainline check_equal ''"$(git log --pretty=format:'"'%s%n%b'"' HEAD^2 | grep "git-subtree.*:")"'' "" @@ -370,14 +343,12 @@ test_expect_success 'make sure no "git subtree" tagged commits make it into subp mkdir test2 cd test2 -# 42 test_expect_success 'init main' ' test_create_repo main ' cd main -# 43 test_expect_success 'add main1' ' create main1 && git commit -m "main1" @@ -385,14 +356,12 @@ test_expect_success 'add main1' ' cd .. -# 44 test_expect_success 'init sub' ' test_create_repo sub ' cd sub -# 45 test_expect_success 'add sub2' ' create sub2 && git commit -m "sub2" @@ -402,7 +371,6 @@ cd ../main # check if split can find proper base without --onto -# 46 test_expect_success 'add sub as subdir in main' ' git fetch ../sub master && git branch sub2 FETCH_HEAD && @@ -411,7 +379,6 @@ test_expect_success 'add sub as subdir in main' ' cd ../sub -# 47 test_expect_success 'add sub3' ' create sub3 && git commit -m "sub3" @@ -419,20 +386,17 @@ test_expect_success 'add sub3' ' cd ../main -# 48 test_expect_success 'merge from sub' ' git fetch ../sub master && git branch sub3 FETCH_HEAD && git subtree merge --prefix subdir sub3 ' -# 49 test_expect_success 'add main-sub4' ' create subdir/main-sub4 && git commit -m "main-sub4" ' -# 50 test_expect_success 'split for main-sub4 without --onto' ' git subtree split --prefix subdir --branch mainsub4 ' @@ -442,19 +406,16 @@ test_expect_success 'split for main-sub4 without --onto' ' # have been sub3, but it was not, because its cache was not set to # itself) -# 51 test_expect_success 'check that the commit parent is sub3' ' check_equal ''"$(git log --pretty=format:%P -1 mainsub4)"'' ''"$(git rev-parse sub3)"'' ' -# 52 test_expect_success 'add main-sub5' ' mkdir subdir2 && create subdir2/main-sub5 && git commit -m "main-sub5" ' -# 53 test_expect_success 'split for main-sub5 without --onto' ' # also test that we still can split out an entirely new subtree # if the parent of the first commit in the tree is not empty, @@ -487,7 +448,6 @@ joincommits() echo "$commit $all" } -# 54 test_expect_success 'verify one file change per commit' ' x= && list=''"$(git log --pretty=format:'"'commit: %H'"' | joincommits)"'' && diff --git a/contrib/svn-fe/svnrdump_sim.py b/contrib/svn-fe/svnrdump_sim.py index 17cf6f961f..4e78a1c3cd 100755 --- a/contrib/svn-fe/svnrdump_sim.py +++ b/contrib/svn-fe/svnrdump_sim.py @@ -14,7 +14,7 @@ if sys.hexversion < 0x02040000: def getrevlimit(): var = 'SVNRMAX' - if os.environ.has_key(var): + if var in os.environ: return os.environ[var] return None @@ -44,7 +44,7 @@ def writedump(url, lower, upper): if __name__ == "__main__": if not (len(sys.argv) in (3, 4, 5)): - print "usage: %s dump URL -rLOWER:UPPER" + print("usage: %s dump URL -rLOWER:UPPER") sys.exit(1) if not sys.argv[1] == 'dump': raise NotImplementedError('only "dump" is suppported.') url = sys.argv[2] diff --git a/contrib/vim/README b/contrib/vim/README index fca1e17251..8f16d06972 100644 --- a/contrib/vim/README +++ b/contrib/vim/README @@ -17,16 +17,6 @@ To install: 1. Copy these files to vim's syntax directory $HOME/.vim/syntax 2. To auto-detect the editing of various git-related filetypes: - $ cat >>$HOME/.vim/filetype.vim <<'EOF' - autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit - autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig - autocmd BufNewFile,BufRead git-rebase-todo setf gitrebase - autocmd BufNewFile,BufRead .msg.[0-9]* - \ if getline(1) =~ '^From.*# This line is ignored.$' | - \ setf gitsendemail | - \ endif - autocmd BufNewFile,BufRead *.git/** - \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' | - \ setf git | - \ endif - EOF + + $ curl http://ftp.vim.org/pub/vim/runtime/filetype.vim | + sed -ne '/^" Git$/, /^$/ p' >>$HOME/.vim/filetype.vim @@ -457,7 +457,7 @@ static struct convert_driver { static int read_convert_config(const char *var, const char *value, void *cb) { - const char *ep, *name; + const char *key, *name; int namelen; struct convert_driver *drv; @@ -465,10 +465,8 @@ static int read_convert_config(const char *var, const char *value, void *cb) * External conversion drivers are configured using * "filter.<name>.variable". */ - if (prefixcmp(var, "filter.") || (ep = strrchr(var, '.')) == var + 6) + if (parse_config_key(var, "filter", &name, &namelen, &key) < 0 || !name) return 0; - name = var + 7; - namelen = ep - name; for (drv = user_convert; drv; drv = drv->next) if (!strncmp(drv->name, name, namelen) && !drv->name[namelen]) break; @@ -479,8 +477,6 @@ static int read_convert_config(const char *var, const char *value, void *cb) user_convert_tail = &(drv->next); } - ep++; - /* * filter.<name>.smudge and filter.<name>.clean specifies * the command line: @@ -490,13 +486,13 @@ static int read_convert_config(const char *var, const char *value, void *cb) * The command-line will not be interpolated in any way. */ - if (!strcmp("smudge", ep)) + if (!strcmp("smudge", key)) return git_config_string(&drv->smudge, var, value); - if (!strcmp("clean", ep)) + if (!strcmp("clean", key)) return git_config_string(&drv->clean, var, value); - if (!strcmp("required", ep)) { + if (!strcmp("required", key)) { drv->required = git_config_bool(var, value); return 0; } @@ -9,10 +9,6 @@ #define HOST_NAME_MAX 256 #endif -#ifndef NI_MAXSERV -#define NI_MAXSERV 32 -#endif - #ifdef NO_INITGROUPS #define initgroups(x, y) (0) /* nothing */ #endif @@ -383,7 +383,7 @@ static int is_date(int year, int month, int day, struct tm *now_tm, time_t now, * sense to specify timestamp way into the future. Make * sure it is not later than ten days from now... */ - if (now + 10*24*3600 < specified) + if ((specified != -1) && (now + 10*24*3600 < specified)) return 0; tm->tm_mon = r->tm_mon; tm->tm_mday = r->tm_mday; @@ -694,8 +694,14 @@ int parse_date_basic(const char *date, unsigned long *timestamp, int *offset) /* mktime uses local timezone */ *timestamp = tm_to_time_t(&tm); - if (*offset == -1) - *offset = ((time_t)*timestamp - mktime(&tm)) / 60; + if (*offset == -1) { + time_t temp_time = mktime(&tm); + if ((time_t)*timestamp > temp_time) { + *offset = ((time_t)*timestamp - temp_time) / 60; + } else { + *offset = -(int)((temp_time - (time_t)*timestamp) / 60); + } + } if (*timestamp == -1) return -1; @@ -36,6 +36,7 @@ static int diff_no_prefix; static int diff_stat_graph_width; static int diff_dirstat_permille_default = 30; static struct diff_options default_diff_options; +static long diff_algorithm; static char diff_colors[][COLOR_MAXLEN] = { GIT_COLOR_RESET, @@ -143,6 +144,21 @@ static int git_config_rename(const char *var, const char *value) return git_config_bool(var,value) ? DIFF_DETECT_RENAME : 0; } +long parse_algorithm_value(const char *value) +{ + if (!value) + return -1; + else if (!strcasecmp(value, "myers") || !strcasecmp(value, "default")) + return 0; + else if (!strcasecmp(value, "minimal")) + return XDF_NEED_MINIMAL; + else if (!strcasecmp(value, "patience")) + return XDF_PATIENCE_DIFF; + else if (!strcasecmp(value, "histogram")) + return XDF_HISTOGRAM_DIFF; + return -1; +} + /* * These are to give UI layer defaults. * The core-level commands such as git-diff-files should @@ -196,6 +212,13 @@ int git_diff_ui_config(const char *var, const char *value, void *cb) return 0; } + if (!strcmp(var, "diff.algorithm")) { + diff_algorithm = parse_algorithm_value(value); + if (diff_algorithm < 0) + return -1; + return 0; + } + if (git_color_config(var, value, cb) < 0) return -1; @@ -402,12 +425,7 @@ static void emit_line_0(struct diff_options *o, const char *set, const char *res int nofirst; FILE *file = o->file; - if (o->output_prefix) { - struct strbuf *msg = NULL; - msg = o->output_prefix(o, o->output_prefix_data); - assert(msg); - fwrite(msg->buf, msg->len, 1, file); - } + fputs(diff_line_prefix(o), file); if (len == 0) { has_trailing_newline = (first == '\n'); @@ -625,13 +643,7 @@ static void emit_rewrite_diff(const char *name_a, char *data_one, *data_two; size_t size_one, size_two; struct emit_callback ecbdata; - char *line_prefix = ""; - struct strbuf *msgbuf; - - if (o && o->output_prefix) { - msgbuf = o->output_prefix(o, o->output_prefix_data); - line_prefix = msgbuf->buf; - } + const char *line_prefix = diff_line_prefix(o); if (diff_mnemonic_prefix && DIFF_OPT_TST(o, REVERSE_DIFF)) { a_prefix = o->b_prefix; @@ -827,18 +839,14 @@ static void fn_out_diff_words_aux(void *priv, char *line, unsigned long len) int minus_first, minus_len, plus_first, plus_len; const char *minus_begin, *minus_end, *plus_begin, *plus_end; struct diff_options *opt = diff_words->opt; - struct strbuf *msgbuf; - char *line_prefix = ""; + const char *line_prefix; if (line[0] != '@' || parse_hunk_header(line, len, &minus_first, &minus_len, &plus_first, &plus_len)) return; assert(opt); - if (opt->output_prefix) { - msgbuf = opt->output_prefix(opt, opt->output_prefix_data); - line_prefix = msgbuf->buf; - } + line_prefix = diff_line_prefix(opt); /* POSIX requires that first be decremented by one if len == 0... */ if (minus_len) { @@ -962,14 +970,10 @@ static void diff_words_show(struct diff_words_data *diff_words) struct diff_words_style *style = diff_words->style; struct diff_options *opt = diff_words->opt; - struct strbuf *msgbuf; - char *line_prefix = ""; + const char *line_prefix; assert(opt); - if (opt->output_prefix) { - msgbuf = opt->output_prefix(opt, opt->output_prefix_data); - line_prefix = msgbuf->buf; - } + line_prefix = diff_line_prefix(opt); /* special case: only removal */ if (!diff_words->plus.text.size) { @@ -1105,6 +1109,16 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix) return ""; } +const char *diff_line_prefix(struct diff_options *opt) +{ + struct strbuf *msgbuf; + if (!opt->output_prefix) + return ""; + + msgbuf = opt->output_prefix(opt, opt->output_prefix_data); + return msgbuf->buf; +} + static unsigned long sane_truncate_line(struct emit_callback *ecb, char *line, unsigned long len) { const char *cp; @@ -1145,13 +1159,7 @@ static void fn_out_consume(void *priv, char *line, unsigned long len) const char *plain = diff_get_color(ecbdata->color_diff, DIFF_PLAIN); const char *reset = diff_get_color(ecbdata->color_diff, DIFF_RESET); struct diff_options *o = ecbdata->opt; - char *line_prefix = ""; - struct strbuf *msgbuf; - - if (o && o->output_prefix) { - msgbuf = o->output_prefix(o, o->output_prefix_data); - line_prefix = msgbuf->buf; - } + const char *line_prefix = diff_line_prefix(o); if (ecbdata->header) { fprintf(ecbdata->opt->file, "%s", ecbdata->header->buf); @@ -1256,6 +1264,7 @@ static char *pprint_rename(const char *a, const char *b) const char *new = b; struct strbuf name = STRBUF_INIT; int pfx_length, sfx_length; + int pfx_adjust_for_slash; int len_a = strlen(a); int len_b = strlen(b); int a_midlen, b_midlen; @@ -1282,7 +1291,18 @@ static char *pprint_rename(const char *a, const char *b) old = a + len_a; new = b + len_b; sfx_length = 0; - while (a <= old && b <= new && *old == *new) { + /* + * If there is a common prefix, it must end in a slash. In + * that case we let this loop run 1 into the prefix to see the + * same slash. + * + * If there is no common prefix, we cannot do this as it would + * underrun the input strings. + */ + pfx_adjust_for_slash = (pfx_length ? 1 : 0); + while (a + pfx_length - pfx_adjust_for_slash <= old && + b + pfx_length - pfx_adjust_for_slash <= new && + *old == *new) { if (*old == '/') sfx_length = len_a - (old - a); old--; @@ -1475,16 +1495,11 @@ static void show_stats(struct diffstat_t *data, struct diff_options *options) const char *reset, *add_c, *del_c; const char *line_prefix = ""; int extra_shown = 0; - struct strbuf *msg = NULL; if (data->nr == 0) return; - if (options->output_prefix) { - msg = options->output_prefix(options, options->output_prefix_data); - line_prefix = msg->buf; - } - + line_prefix = diff_line_prefix(options); count = options->stat_count ? options->stat_count : data->nr; reset = diff_get_color_opt(options, DIFF_RESET); @@ -1736,12 +1751,7 @@ static void show_shortstats(struct diffstat_t *data, struct diff_options *option dels += deleted; } } - if (options->output_prefix) { - struct strbuf *msg = NULL; - msg = options->output_prefix(options, - options->output_prefix_data); - fprintf(options->file, "%s", msg->buf); - } + fprintf(options->file, "%s", diff_line_prefix(options)); print_stat_summary(options->file, total_files, adds, dels); } @@ -1755,12 +1765,7 @@ static void show_numstat(struct diffstat_t *data, struct diff_options *options) for (i = 0; i < data->nr; i++) { struct diffstat_file *file = data->files[i]; - if (options->output_prefix) { - struct strbuf *msg = NULL; - msg = options->output_prefix(options, - options->output_prefix_data); - fprintf(options->file, "%s", msg->buf); - } + fprintf(options->file, "%s", diff_line_prefix(options)); if (file->is_binary) fprintf(options->file, "-\t-\t"); @@ -1802,13 +1807,7 @@ static long gather_dirstat(struct diff_options *opt, struct dirstat_dir *dir, { unsigned long this_dir = 0; unsigned int sources = 0; - const char *line_prefix = ""; - struct strbuf *msg = NULL; - - if (opt->output_prefix) { - msg = opt->output_prefix(opt, opt->output_prefix_data); - line_prefix = msg->buf; - } + const char *line_prefix = diff_line_prefix(opt); while (dir->nr) { struct dirstat_file *f = dir->files; @@ -2058,15 +2057,10 @@ static void checkdiff_consume(void *priv, char *line, unsigned long len) const char *reset = diff_get_color(data->o->use_color, DIFF_RESET); const char *set = diff_get_color(data->o->use_color, DIFF_FILE_NEW); char *err; - char *line_prefix = ""; - struct strbuf *msgbuf; + const char *line_prefix; assert(data->o); - if (data->o->output_prefix) { - msgbuf = data->o->output_prefix(data->o, - data->o->output_prefix_data); - line_prefix = msgbuf->buf; - } + line_prefix = diff_line_prefix(data->o); if (line[0] == '+') { unsigned bad; @@ -2123,7 +2117,8 @@ static unsigned char *deflate_it(char *data, return deflated; } -static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two, char *prefix) +static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two, + const char *prefix) { void *cp; void *delta; @@ -2184,7 +2179,8 @@ static void emit_binary_diff_body(FILE *file, mmfile_t *one, mmfile_t *two, char free(data); } -static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, char *prefix) +static void emit_binary_diff(FILE *file, mmfile_t *one, mmfile_t *two, + const char *prefix) { fprintf(file, "%sGIT binary patch\n", prefix); emit_binary_diff_body(file, one, two, prefix); @@ -2251,13 +2247,7 @@ static void builtin_diff(const char *name_a, struct userdiff_driver *textconv_one = NULL; struct userdiff_driver *textconv_two = NULL; struct strbuf header = STRBUF_INIT; - struct strbuf *msgbuf; - char *line_prefix = ""; - - if (o->output_prefix) { - msgbuf = o->output_prefix(o, o->output_prefix_data); - line_prefix = msgbuf->buf; - } + const char *line_prefix = diff_line_prefix(o); if (DIFF_OPT_TST(o, SUBMODULE_LOG) && (!one->mode || S_ISGITLINK(one->mode)) && @@ -2956,14 +2946,9 @@ static void fill_metainfo(struct strbuf *msg, { const char *set = diff_get_color(use_color, DIFF_METAINFO); const char *reset = diff_get_color(use_color, DIFF_RESET); - struct strbuf *msgbuf; - char *line_prefix = ""; + const char *line_prefix = diff_line_prefix(o); *must_show_header = 1; - if (o->output_prefix) { - msgbuf = o->output_prefix(o, o->output_prefix_data); - line_prefix = msgbuf->buf; - } strbuf_init(msg, PATH_MAX * 2 + 300); switch (p->status) { case DIFF_STATUS_COPIED: @@ -3213,6 +3198,7 @@ void diff_setup(struct diff_options *options) options->add_remove = diff_addremove; options->use_color = diff_use_color_default; options->detect_rename = diff_detect_rename_default; + options->xdl_opts |= diff_algorithm; if (diff_no_prefix) { options->a_prefix = options->b_prefix = ""; @@ -3610,6 +3596,16 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) options->xdl_opts = DIFF_WITH_ALG(options, PATIENCE_DIFF); else if (!strcmp(arg, "--histogram")) options->xdl_opts = DIFF_WITH_ALG(options, HISTOGRAM_DIFF); + else if (!prefixcmp(arg, "--diff-algorithm=")) { + long value = parse_algorithm_value(arg+17); + if (value < 0) + return error("option diff-algorithm accepts \"myers\", " + "\"minimal\", \"patience\" and \"histogram\""); + /* clear out previous settings */ + DIFF_XDL_CLR(options, NEED_MINIMAL); + options->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; + options->xdl_opts |= value; + } /* flags options */ else if (!strcmp(arg, "--binary")) { @@ -3626,6 +3622,8 @@ int diff_opt_parse(struct diff_options *options, const char **av, int ac) DIFF_OPT_SET(options, FIND_COPIES_HARDER); else if (!strcmp(arg, "--follow")) DIFF_OPT_SET(options, FOLLOW_RENAMES); + else if (!strcmp(arg, "--no-follow")) + DIFF_OPT_CLR(options, FOLLOW_RENAMES); else if (!strcmp(arg, "--color")) options->use_color = 1; else if (!prefixcmp(arg, "--color=")) { @@ -3898,12 +3896,8 @@ static void diff_flush_raw(struct diff_filepair *p, struct diff_options *opt) { int line_termination = opt->line_termination; int inter_name_termination = line_termination ? '\t' : '\0'; - if (opt->output_prefix) { - struct strbuf *msg = NULL; - msg = opt->output_prefix(opt, opt->output_prefix_data); - fprintf(opt->file, "%s", msg->buf); - } + fprintf(opt->file, "%s", diff_line_prefix(opt)); if (!(opt->output_format & DIFF_FORMAT_NAME_STATUS)) { fprintf(opt->file, ":%06o %06o %s ", p->one->mode, p->two->mode, diff_unique_abbrev(p->one->sha1, opt->abbrev)); @@ -4173,12 +4167,7 @@ static void show_rename_copy(FILE *file, const char *renamecopy, struct diff_fil static void diff_summary(struct diff_options *opt, struct diff_filepair *p) { FILE *file = opt->file; - char *line_prefix = ""; - - if (opt->output_prefix) { - struct strbuf *buf = opt->output_prefix(opt, opt->output_prefix_data); - line_prefix = buf->buf; - } + const char *line_prefix = diff_line_prefix(opt); switch(p->status) { case DIFF_STATUS_DELETED: @@ -4479,13 +4468,9 @@ void diff_flush(struct diff_options *options) if (output_format & DIFF_FORMAT_PATCH) { if (separator) { - if (options->output_prefix) { - struct strbuf *msg = NULL; - msg = options->output_prefix(options, - options->output_prefix_data); - fwrite(msg->buf, msg->len, 1, stdout); - } - putc(options->line_termination, options->file); + fprintf(options->file, "%s%c", + diff_line_prefix(options), + options->line_termination); if (options->stat_sep) { /* attach patch instead of inline */ fputs(options->stat_sep, options->file); @@ -4689,7 +4674,7 @@ int diff_result_code(struct diff_options *opt, int status) { int result = 0; - diff_warn_rename_limit("diff.renamelimit", + diff_warn_rename_limit("diff.renameLimit", opt->needed_rename_limit, opt->degraded_cc_to_c); if (!DIFF_OPT_TST(opt, EXIT_WITH_STATUS) && @@ -174,6 +174,9 @@ const char *diff_get_color(int diff_use_color, enum color_diff ix); diff_get_color((o)->use_color, ix) +const char *diff_line_prefix(struct diff_options *); + + extern const char mime_boundary_leader[]; extern void diff_tree_setup_paths(const char **paths, struct diff_options *); @@ -333,6 +336,8 @@ extern struct userdiff_driver *get_textconv(struct diff_filespec *one); extern int parse_rename_score(const char **cp_p); +extern long parse_algorithm_value(const char *value); + extern int print_stat_summary(FILE *fp, int files, int insertions, int deletions); extern void setup_diff_pager(struct diff_options *); diff --git a/diffcore-rename.c b/diffcore-rename.c index 512d0ac5fd..6c7a72fbe7 100644 --- a/diffcore-rename.c +++ b/diffcore-rename.c @@ -389,6 +389,7 @@ static int find_exact_renames(struct diff_options *options) struct hash_table file_table; init_hash(&file_table); + preallocate_hash(&file_table, rename_src_nr + rename_dst_nr); for (i = 0; i < rename_src_nr; i++) insert_file_table(&file_table, -1, i, rename_src[i].p->one); @@ -194,12 +194,19 @@ static int match_one(const char *match, const char *name, int namelen) } /* - * Given a name and a list of pathspecs, see if the name matches - * any of the pathspecs. The caller is also interested in seeing - * all pathspec matches some names it calls this function with - * (otherwise the user could have mistyped the unmatched pathspec), - * and a mark is left in seen[] array for pathspec element that - * actually matched anything. + * Given a name and a list of pathspecs, returns the nature of the + * closest (i.e. most specific) match of the name to any of the + * pathspecs. + * + * The caller typically calls this multiple times with the same + * pathspec and seen[] array but with different name/namelen + * (e.g. entries from the index) and is interested in seeing if and + * how each pathspec matches all the names it calls this function + * with. A mark is left in the seen[] array for each pathspec element + * indicating the closest type of match that element achieved, so if + * seen[n] remains zero after multiple invocations, that means the nth + * pathspec did not match any names, which could indicate that the + * user mistyped the nth pathspec. */ int match_pathspec(const char **pathspec, const char *name, int namelen, int prefix, char *seen) @@ -269,12 +276,19 @@ static int match_pathspec_item(const struct pathspec_item *item, int prefix, } /* - * Given a name and a list of pathspecs, see if the name matches - * any of the pathspecs. The caller is also interested in seeing - * all pathspec matches some names it calls this function with - * (otherwise the user could have mistyped the unmatched pathspec), - * and a mark is left in seen[] array for pathspec element that - * actually matched anything. + * Given a name and a list of pathspecs, returns the nature of the + * closest (i.e. most specific) match of the name to any of the + * pathspecs. + * + * The caller typically calls this multiple times with the same + * pathspec and seen[] array but with different name/namelen + * (e.g. entries from the index) and is interested in seeing if and + * how each pathspec matches all the names it calls this function + * with. A mark is left in the seen[] array for each pathspec element + * indicating the closest type of match that element achieved, so if + * seen[n] remains zero after multiple invocations, that means the nth + * pathspec did not match any names, which could indicate that the + * user mistyped the nth pathspec. */ int match_pathspec_depth(const struct pathspec *ps, const char *name, int namelen, @@ -379,7 +393,7 @@ void parse_exclude_pattern(const char **pattern, } void add_exclude(const char *string, const char *base, - int baselen, struct exclude_list *el) + int baselen, struct exclude_list *el, int srcpos) { struct exclude *x; int patternlen; @@ -403,8 +417,10 @@ void add_exclude(const char *string, const char *base, x->base = base; x->baselen = baselen; x->flags = flags; + x->srcpos = srcpos; ALLOC_GROW(el->excludes, el->nr + 1, el->alloc); el->excludes[el->nr++] = x; + x->el = el; } static void *read_skip_worktree_file_from_index(const char *path, size_t *size) @@ -441,20 +457,21 @@ void clear_exclude_list(struct exclude_list *el) for (i = 0; i < el->nr; i++) free(el->excludes[i]); free(el->excludes); + free(el->filebuf); el->nr = 0; el->excludes = NULL; + el->filebuf = NULL; } int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, - char **buf_p, struct exclude_list *el, int check_index) { struct stat st; - int fd, i; + int fd, i, lineno = 1; size_t size = 0; char *buf, *entry; @@ -492,25 +509,43 @@ int add_excludes_from_file_to_list(const char *fname, close(fd); } - if (buf_p) - *buf_p = buf; + el->filebuf = buf; entry = buf; for (i = 0; i < size; i++) { if (buf[i] == '\n') { if (entry != buf + i && entry[0] != '#') { buf[i - (i && buf[i-1] == '\r')] = 0; - add_exclude(entry, base, baselen, el); + add_exclude(entry, base, baselen, el, lineno); } + lineno++; entry = buf + i + 1; } } return 0; } +struct exclude_list *add_exclude_list(struct dir_struct *dir, + int group_type, const char *src) +{ + struct exclude_list *el; + struct exclude_list_group *group; + + group = &dir->exclude_list_group[group_type]; + ALLOC_GROW(group->el, group->nr + 1, group->alloc); + el = &group->el[group->nr++]; + memset(el, 0, sizeof(*el)); + el->src = src; + return el; +} + +/* + * Used to set up core.excludesfile and .git/info/exclude lists. + */ void add_excludes_from_file(struct dir_struct *dir, const char *fname) { - if (add_excludes_from_file_to_list(fname, "", 0, NULL, - &dir->exclude_list[EXC_FILE], 0) < 0) + struct exclude_list *el; + el = add_exclude_list(dir, EXC_FILE, fname); + if (add_excludes_from_file_to_list(fname, "", 0, el, 0) < 0) die("cannot use %s as an exclude file", fname); } @@ -520,6 +555,7 @@ void add_excludes_from_file(struct dir_struct *dir, const char *fname) */ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) { + struct exclude_list_group *group; struct exclude_list *el; struct exclude_stack *stk = NULL; int current; @@ -528,17 +564,21 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) (baselen + strlen(dir->exclude_per_dir) >= PATH_MAX)) return; /* too long a path -- ignore */ - /* Pop the directories that are not the prefix of the path being checked. */ - el = &dir->exclude_list[EXC_DIRS]; + group = &dir->exclude_list_group[EXC_DIRS]; + + /* Pop the exclude lists from the EXCL_DIRS exclude_list_group + * which originate from directories not in the prefix of the + * path being checked. */ while ((stk = dir->exclude_stack) != NULL) { if (stk->baselen <= baselen && !strncmp(dir->basebuf, base, stk->baselen)) break; + el = &group->el[dir->exclude_stack->exclude_ix]; dir->exclude_stack = stk->prev; - while (stk->exclude_ix < el->nr) - free(el->excludes[--el->nr]); - free(stk->filebuf); + free((char *)el->src); /* see strdup() below */ + clear_exclude_list(el); free(stk); + group->nr--; } /* Read from the parent directories and push them down. */ @@ -559,13 +599,22 @@ static void prep_exclude(struct dir_struct *dir, const char *base, int baselen) } stk->prev = dir->exclude_stack; stk->baselen = cp - base; - stk->exclude_ix = el->nr; memcpy(dir->basebuf + current, base + current, stk->baselen - current); strcpy(dir->basebuf + stk->baselen, dir->exclude_per_dir); + /* + * dir->basebuf gets reused by the traversal, but we + * need fname to remain unchanged to ensure the src + * member of each struct exclude correctly + * back-references its source file. Other invocations + * of add_exclude_list provide stable strings, so we + * strdup() and free() here in the caller. + */ + el = add_exclude_list(dir, EXC_DIRS, strdup(dir->basebuf)); + stk->exclude_ix = group->nr - 1; add_excludes_from_file_to_list(dir->basebuf, dir->basebuf, stk->baselen, - &stk->filebuf, el, 1); + el, 1); dir->exclude_stack = stk; current = stk->baselen; } @@ -636,7 +685,8 @@ int match_pathname(const char *pathname, int pathlen, } return wildmatch(pattern, name, - ignore_case ? FNM_CASEFOLD : 0) == 0; + WM_PATHNAME | (ignore_case ? WM_CASEFOLD : 0), + NULL) == 0; } /* @@ -712,18 +762,23 @@ static struct exclude *last_exclude_matching(struct dir_struct *dir, int *dtype_p) { int pathlen = strlen(pathname); - int st; + int i, j; + struct exclude_list_group *group; struct exclude *exclude; const char *basename = strrchr(pathname, '/'); basename = (basename) ? basename+1 : pathname; prep_exclude(dir, pathname, basename-pathname); - for (st = EXC_CMDL; st <= EXC_FILE; st++) { - exclude = last_exclude_matching_from_list( - pathname, pathlen, basename, dtype_p, - &dir->exclude_list[st]); - if (exclude) - return exclude; + + for (i = EXC_CMDL; i <= EXC_FILE; i++) { + group = &dir->exclude_list_group[i]; + for (j = group->nr - 1; j >= 0; j--) { + exclude = last_exclude_matching_from_list( + pathname, pathlen, basename, dtype_p, + &group->el[j]); + if (exclude) + return exclude; + } } return NULL; } @@ -842,7 +897,8 @@ static struct dir_entry *dir_entry_new(const char *pathname, int len) static struct dir_entry *dir_add_name(struct dir_struct *dir, const char *pathname, int len) { - if (cache_name_exists(pathname, len, ignore_case)) + if (!(dir->flags & DIR_SHOW_IGNORED) && + cache_name_exists(pathname, len, ignore_case)) return NULL; ALLOC_GROW(dir->entries, dir->nr+1, dir->alloc); @@ -944,8 +1000,9 @@ static enum exist_status directory_exists_in_index(const char *dirname, int len) * traversal routine. * * Case 1: If we *already* have entries in the index under that - * directory name, we always recurse into the directory to see - * all the files. + * directory name, we recurse into the directory to see all the files, + * unless the directory is excluded and we want to show ignored + * directories * * Case 2: If we *already* have that directory name as a gitlink, * we always continue to see it as a gitlink, regardless of whether @@ -959,6 +1016,9 @@ static enum exist_status directory_exists_in_index(const char *dirname, int len) * just a directory, unless "hide_empty_directories" is * also true and the directory is empty, in which case * we just ignore it entirely. + * if we are looking for ignored directories, look if it + * contains only ignored files to decide if it must be shown as + * ignored or not. * (b) if it looks like a git directory, and we don't have * 'no_gitlinks' set we treat it as a gitlink, and show it * as a directory. @@ -971,12 +1031,15 @@ enum directory_treatment { }; static enum directory_treatment treat_directory(struct dir_struct *dir, - const char *dirname, int len, + const char *dirname, int len, int exclude, const struct path_simplify *simplify) { /* The "len-1" is to strip the final '/' */ switch (directory_exists_in_index(dirname, len-1)) { case index_directory: + if ((dir->flags & DIR_SHOW_OTHER_DIRECTORIES) && exclude) + break; + return recurse_into_directory; case index_gitdir: @@ -996,7 +1059,23 @@ static enum directory_treatment treat_directory(struct dir_struct *dir, } /* This is the "show_other_directories" case */ - if (!(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) + + /* + * We are looking for ignored files and our directory is not ignored, + * check if it contains only ignored files + */ + if ((dir->flags & DIR_SHOW_IGNORED) && !exclude) { + int ignored; + dir->flags &= ~DIR_SHOW_IGNORED; + dir->flags |= DIR_HIDE_EMPTY_DIRECTORIES; + ignored = read_directory_recursive(dir, dirname, len, 1, simplify); + dir->flags &= ~DIR_HIDE_EMPTY_DIRECTORIES; + dir->flags |= DIR_SHOW_IGNORED; + + return ignored ? ignore_directory : show_directory; + } + if (!(dir->flags & DIR_SHOW_IGNORED) && + !(dir->flags & DIR_HIDE_EMPTY_DIRECTORIES)) return show_directory; if (!read_directory_recursive(dir, dirname, len, 1, simplify)) return ignore_directory; @@ -1004,6 +1083,45 @@ static enum directory_treatment treat_directory(struct dir_struct *dir, } /* + * Decide what to do when we find a file while traversing the + * filesystem. Mostly two cases: + * + * 1. We are looking for ignored files + * (a) File is ignored, include it + * (b) File is in ignored path, include it + * (c) File is not ignored, exclude it + * + * 2. Other scenarios, include the file if not excluded + * + * Return 1 for exclude, 0 for include. + */ +static int treat_file(struct dir_struct *dir, struct strbuf *path, int exclude, int *dtype) +{ + struct path_exclude_check check; + int exclude_file = 0; + + if (exclude) + exclude_file = !(dir->flags & DIR_SHOW_IGNORED); + else if (dir->flags & DIR_SHOW_IGNORED) { + /* Always exclude indexed files */ + struct cache_entry *ce = index_name_exists(&the_index, + path->buf, path->len, ignore_case); + + if (ce) + return 1; + + path_exclude_check_init(&check, dir); + + if (!is_path_excluded(&check, path->buf, path->len, dtype)) + exclude_file = 1; + + path_exclude_check_clear(&check); + } + + return exclude_file; +} + +/* * This is an inexact early pruning of any recursive directory * reading - if the path cannot possibly be in the pathspec, * return true, and we'll skip it early. @@ -1141,27 +1259,14 @@ static enum path_treatment treat_one_path(struct dir_struct *dir, if (dtype == DT_UNKNOWN) dtype = get_dtype(de, path->buf, path->len); - /* - * Do we want to see just the ignored files? - * We still need to recurse into directories, - * even if we don't ignore them, since the - * directory may contain files that we do.. - */ - if (!exclude && (dir->flags & DIR_SHOW_IGNORED)) { - if (dtype != DT_DIR) - return path_ignored; - } - switch (dtype) { default: return path_ignored; case DT_DIR: strbuf_addch(path, '/'); - switch (treat_directory(dir, path->buf, path->len, simplify)) { + + switch (treat_directory(dir, path->buf, path->len, exclude, simplify)) { case show_directory: - if (exclude != !!(dir->flags - & DIR_SHOW_IGNORED)) - return path_ignored; break; case recurse_into_directory: return path_recurse; @@ -1171,7 +1276,12 @@ static enum path_treatment treat_one_path(struct dir_struct *dir, break; case DT_REG: case DT_LNK: - break; + switch (treat_file(dir, path, exclude, &dtype)) { + case 1: + return path_ignored; + default: + break; + } } return path_handled; } @@ -1572,3 +1682,33 @@ int limit_pathspec_to_literal(void) flag = git_env_bool(GIT_LITERAL_PATHSPECS_ENVIRONMENT, 0); return flag; } + +/* + * Frees memory within dir which was allocated for exclude lists and + * the exclude_stack. Does not free dir itself. + */ +void clear_directory(struct dir_struct *dir) +{ + int i, j; + struct exclude_list_group *group; + struct exclude_list *el; + struct exclude_stack *stk; + + for (i = EXC_CMDL; i <= EXC_FILE; i++) { + group = &dir->exclude_list_group[i]; + for (j = 0; j < group->nr; j++) { + el = &group->el[j]; + if (i == EXC_DIRS) + free((char *)el->src); + clear_exclude_list(el); + } + free(group->el); + } + + stk = dir->exclude_stack; + while (stk) { + struct exclude_stack *prev = stk->prev; + free(stk); + stk = prev; + } +} @@ -16,21 +16,41 @@ struct dir_entry { #define EXC_FLAG_NEGATIVE 16 /* - * Each .gitignore file will be parsed into patterns which are then - * appended to the relevant exclude_list (either EXC_DIRS or - * EXC_FILE). exclude_lists are also used to represent the list of - * --exclude values passed via CLI args (EXC_CMDL). + * Each excludes file will be parsed into a fresh exclude_list which + * is appended to the relevant exclude_list_group (either EXC_DIRS or + * EXC_FILE). An exclude_list within the EXC_CMDL exclude_list_group + * can also be used to represent the list of --exclude values passed + * via CLI args. */ struct exclude_list { int nr; int alloc; + + /* remember pointer to exclude file contents so we can free() */ + char *filebuf; + + /* origin of list, e.g. path to filename, or descriptive string */ + const char *src; + struct exclude { + /* + * This allows callers of last_exclude_matching() etc. + * to determine the origin of the matching pattern. + */ + struct exclude_list *el; + const char *pattern; int patternlen; int nowildcardlen; const char *base; int baselen; int flags; + + /* + * Counting starts from 1 for line numbers in ignore files, + * and from -1 decrementing for patterns from CLI args. + */ + int srcpos; } **excludes; }; @@ -42,9 +62,13 @@ struct exclude_list { */ struct exclude_stack { struct exclude_stack *prev; /* the struct exclude_stack for the parent directory */ - char *filebuf; /* remember pointer to per-directory exclude file contents so we can free() */ int baselen; - int exclude_ix; + int exclude_ix; /* index of exclude_list within EXC_DIRS exclude_list_group */ +}; + +struct exclude_list_group { + int nr, alloc; + struct exclude_list *el; }; struct dir_struct { @@ -62,16 +86,23 @@ struct dir_struct { /* Exclude info */ const char *exclude_per_dir; - struct exclude_list exclude_list[3]; + /* - * We maintain three exclude pattern lists: + * We maintain three groups of exclude pattern lists: + * * EXC_CMDL lists patterns explicitly given on the command line. * EXC_DIRS lists patterns obtained from per-directory ignore files. - * EXC_FILE lists patterns from fallback ignore files. + * EXC_FILE lists patterns from fallback ignore files, e.g. + * - .git/info/exclude + * - core.excludesfile + * + * Each group contains multiple exclude lists, a single list + * per source. */ #define EXC_CMDL 0 #define EXC_DIRS 1 #define EXC_FILE 2 + struct exclude_list_group exclude_list_group[3]; /* * Temporary variables which are used during loading of the @@ -85,6 +116,12 @@ struct dir_struct { char basebuf[PATH_MAX]; }; +/* + * The ordering of these constants is significant, with + * higher-numbered match types signifying "closer" (i.e. more + * specific) matches which will override lower-numbered match types + * when populating the seen[] array. + */ #define MATCHED_RECURSIVELY 1 #define MATCHED_FNMATCH 2 #define MATCHED_EXACTLY 3 @@ -129,13 +166,16 @@ extern struct exclude *last_exclude_matching_path(struct path_exclude_check *, c extern int is_path_excluded(struct path_exclude_check *, const char *, int namelen, int *dtype); +extern struct exclude_list *add_exclude_list(struct dir_struct *dir, + int group_type, const char *src); extern int add_excludes_from_file_to_list(const char *fname, const char *base, int baselen, - char **buf_p, struct exclude_list *el, int check_index); + struct exclude_list *el, int check_index); extern void add_excludes_from_file(struct dir_struct *, const char *fname); extern void parse_exclude_pattern(const char **string, int *patternlen, int *flags, int *nowildcardlen); extern void add_exclude(const char *string, const char *base, - int baselen, struct exclude_list *el); + int baselen, struct exclude_list *el, int srcpos); extern void clear_exclude_list(struct exclude_list *el); +extern void clear_directory(struct dir_struct *dir); extern int file_exists(const char *); extern int is_inside_dir(const char *dir); diff --git a/environment.c b/environment.c index 85edd7f95a..e2e75c1660 100644 --- a/environment.c +++ b/environment.c @@ -13,6 +13,7 @@ int trust_executable_bit = 1; int trust_ctime = 1; +int check_stat = 1; int has_symlinks = 1; int minimum_abbrev = 4, default_abbrev = 7; int ignore_case; @@ -62,6 +63,12 @@ int precomposed_unicode = -1; /* see probe_utf8_pathname_composition() */ struct startup_info *startup_info; unsigned long pack_size_limit_cfg; +/* + * The character that begins a commented line in user-editable file + * that is subject to stripspace. + */ +char comment_line_char = '#'; + /* Parallel index stat data preload? */ int core_preload_index = 0; @@ -76,20 +83,20 @@ static const char *git_dir; static char *git_object_dir, *git_index_file, *git_graft_file; /* - * Repository-local GIT_* environment variables - * Remember to update local_repo_env_size in cache.h when - * the size of the list changes + * Repository-local GIT_* environment variables; see cache.h for details. */ -const char * const local_repo_env[LOCAL_REPO_ENV_SIZE + 1] = { +const char * const local_repo_env[] = { ALTERNATE_DB_ENVIRONMENT, CONFIG_ENVIRONMENT, CONFIG_DATA_ENVIRONMENT, DB_ENVIRONMENT, GIT_DIR_ENVIRONMENT, GIT_WORK_TREE_ENVIRONMENT, + GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, GRAFT_ENVIRONMENT, INDEX_ENVIRONMENT, NO_REPLACE_OBJECTS_ENVIRONMENT, + GIT_PREFIX_ENVIRONMENT, NULL }; diff --git a/fast-import.c b/fast-import.c index c2a814ec66..a0c2c2ff14 100644 --- a/fast-import.c +++ b/fast-import.c @@ -2265,7 +2265,7 @@ static void file_change_m(struct branch *b) const char *p = command_buf.buf + 2; static struct strbuf uq = STRBUF_INIT; const char *endp; - struct object_entry *oe = oe; + struct object_entry *oe; unsigned char sha1[20]; uint16_t mode, inline_data = 0; @@ -2292,6 +2292,7 @@ static void file_change_m(struct branch *b) hashcpy(sha1, oe->idx.sha1); } else if (!prefixcmp(p, "inline ")) { inline_data = 1; + oe = NULL; /* not used with inline_data, but makes gcc happy */ p += strlen("inline"); /* advance to space */ } else { if (get_sha1_hex(p, sha1)) @@ -2434,7 +2435,7 @@ static void note_change_n(struct branch *b, unsigned char *old_fanout) { const char *p = command_buf.buf + 2; static struct strbuf uq = STRBUF_INIT; - struct object_entry *oe = oe; + struct object_entry *oe; struct branch *s; unsigned char sha1[20], commit_sha1[20]; char path[60]; @@ -2613,7 +2614,7 @@ static int parse_from(struct branch *b) static struct hash_list *parse_merge(unsigned int *count) { - struct hash_list *list = NULL, *n, *e = e; + struct hash_list *list = NULL, **tail = &list, *n; const char *from; struct branch *s; @@ -2641,11 +2642,9 @@ static struct hash_list *parse_merge(unsigned int *count) die("Invalid ref name or SHA1 expression: %s", from); n->next = NULL; - if (list) - e->next = n; - else - list = n; - e = n; + *tail = n; + tail = &n->next; + (*count)++; read_next_command(); } diff --git a/fetch-pack.c b/fetch-pack.c index f0acdf7331..cef8fde61b 100644 --- a/fetch-pack.c +++ b/fetch-pack.c @@ -36,7 +36,7 @@ static int marked; #define MAX_IN_VAIN 256 static struct commit_list *rev_list; -static int non_common_revs, multi_ack, use_sideband; +static int non_common_revs, multi_ack, use_sideband, allow_tip_sha1_in_want; static void rev_list_push(struct commit *commit, int mark) { @@ -520,47 +520,37 @@ static void mark_recent_complete_commits(struct fetch_pack_args *args, } } -static int non_matching_ref(struct string_list_item *item, void *unused) -{ - if (item->util) { - item->util = NULL; - return 0; - } - else - return 1; -} - static void filter_refs(struct fetch_pack_args *args, - struct ref **refs, struct string_list *sought) + struct ref **refs, + struct ref **sought, int nr_sought) { struct ref *newlist = NULL; struct ref **newtail = &newlist; struct ref *ref, *next; - int sought_pos; + int i; - sought_pos = 0; + i = 0; for (ref = *refs; ref; ref = next) { int keep = 0; next = ref->next; + if (!memcmp(ref->name, "refs/", 5) && check_refname_format(ref->name + 5, 0)) ; /* trash */ else { - while (sought_pos < sought->nr) { - int cmp = strcmp(ref->name, sought->items[sought_pos].string); + while (i < nr_sought) { + int cmp = strcmp(ref->name, sought[i]->name); if (cmp < 0) break; /* definitely do not have it */ else if (cmp == 0) { keep = 1; /* definitely have it */ - sought->items[sought_pos++].util = "matched"; - break; + sought[i]->matched = 1; } - else - sought_pos++; /* might have it; keep looking */ + i++; } } - if (! keep && args->fetch_all && + if (!keep && args->fetch_all && (!args->depth || prefixcmp(ref->name, "refs/tags/"))) keep = 1; @@ -573,7 +563,21 @@ static void filter_refs(struct fetch_pack_args *args, } } - filter_string_list(sought, 0, non_matching_ref, NULL); + /* Append unmatched requests to the list */ + if (allow_tip_sha1_in_want) { + for (i = 0; i < nr_sought; i++) { + ref = sought[i]; + if (ref->matched) + continue; + if (get_sha1_hex(ref->name, ref->old_sha1)) + continue; + + ref->matched = 1; + *newtail = ref; + ref->next = NULL; + newtail = &ref->next; + } + } *refs = newlist; } @@ -583,7 +587,8 @@ static void mark_alternate_complete(const struct ref *ref, void *unused) } static int everything_local(struct fetch_pack_args *args, - struct ref **refs, struct string_list *sought) + struct ref **refs, + struct ref **sought, int nr_sought) { struct ref *ref; int retval; @@ -594,6 +599,9 @@ static int everything_local(struct fetch_pack_args *args, for (ref = *refs; ref; ref = ref->next) { struct object *o; + if (!has_sha1_file(ref->old_sha1)) + continue; + o = parse_object(ref->old_sha1); if (!o) continue; @@ -634,7 +642,7 @@ static int everything_local(struct fetch_pack_args *args, } } - filter_refs(args, refs, sought); + filter_refs(args, refs, sought, nr_sought); for (retval = 1, ref = *refs; ref ; ref = ref->next) { const unsigned char *remote = ref->old_sha1; @@ -764,10 +772,17 @@ static int get_pack(struct fetch_pack_args *args, return 0; } +static int cmp_ref_by_name(const void *a_, const void *b_) +{ + const struct ref *a = *((const struct ref **)a_); + const struct ref *b = *((const struct ref **)b_); + return strcmp(a->name, b->name); +} + static struct ref *do_fetch_pack(struct fetch_pack_args *args, int fd[2], const struct ref *orig_ref, - struct string_list *sought, + struct ref **sought, int nr_sought, char **pack_lockfile) { struct ref *ref = copy_ref_list(orig_ref); @@ -776,6 +791,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, int agent_len; sort_ref_list(&ref, ref_compare_name); + qsort(sought, nr_sought, sizeof(*sought), cmp_ref_by_name); if (is_repository_shallow() && !server_supports("shallow")) die("Server does not support shallow clients"); @@ -805,6 +821,11 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, fprintf(stderr, "Server supports side-band\n"); use_sideband = 1; } + if (server_supports("allow-tip-sha1-in-want")) { + if (args->verbose) + fprintf(stderr, "Server supports allow-tip-sha1-in-want\n"); + allow_tip_sha1_in_want = 1; + } if (!server_supports("thin-pack")) args->use_thin_pack = 0; if (!server_supports("no-progress")) @@ -824,7 +845,7 @@ static struct ref *do_fetch_pack(struct fetch_pack_args *args, agent_len, agent_feature); } - if (everything_local(args, &ref, sought)) { + if (everything_local(args, &ref, sought, nr_sought)) { packet_flush(fd[1]); goto all_done; } @@ -887,11 +908,32 @@ static void fetch_pack_setup(void) did_setup = 1; } +static int remove_duplicates_in_refs(struct ref **ref, int nr) +{ + struct string_list names = STRING_LIST_INIT_NODUP; + int src, dst; + + for (src = dst = 0; src < nr; src++) { + struct string_list_item *item; + item = string_list_insert(&names, ref[src]->name); + if (item->util) + continue; /* already have it */ + item->util = ref[src]; + if (src != dst) + ref[dst] = ref[src]; + dst++; + } + for (src = dst; src < nr; src++) + ref[src] = NULL; + string_list_clear(&names, 0); + return dst; +} + struct ref *fetch_pack(struct fetch_pack_args *args, int fd[], struct child_process *conn, const struct ref *ref, const char *dest, - struct string_list *sought, + struct ref **sought, int nr_sought, char **pack_lockfile) { struct stat st; @@ -903,16 +945,14 @@ struct ref *fetch_pack(struct fetch_pack_args *args, st.st_mtime = 0; } - if (sought->nr) { - sort_string_list(sought); - string_list_remove_duplicates(sought, 0); - } + if (nr_sought) + nr_sought = remove_duplicates_in_refs(sought, nr_sought); if (!ref) { packet_flush(fd[1]); die("no matching remote head"); } - ref_cpy = do_fetch_pack(args, fd, ref, sought, pack_lockfile); + ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought, pack_lockfile); if (args->depth > 0) { static struct lock_file lock; diff --git a/fetch-pack.h b/fetch-pack.h index cb148719bf..dc5266c970 100644 --- a/fetch-pack.h +++ b/fetch-pack.h @@ -20,17 +20,16 @@ struct fetch_pack_args { }; /* - * sought contains the full names of remote references that should be - * updated from. On return, the names that were found on the remote - * will have been removed from the list. The util members of the - * string_list_items are used internally; they must be NULL on entry - * (and will be NULL on exit). + * sought represents remote references that should be updated from. + * On return, the names that were found on the remote will have been + * marked as such. */ struct ref *fetch_pack(struct fetch_pack_args *args, int fd[], struct child_process *conn, const struct ref *ref, const char *dest, - struct string_list *sought, + struct ref **sought, + int nr_sought, char **pack_lockfile); #endif @@ -334,7 +334,7 @@ split_patches () { # Since we cannot guarantee that the commit message is in # git-friendly format, we put no Subject: line and just consume # all of the message as the body - perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 } + LANG=C LC_ALL=C perl -M'POSIX qw(strftime)' -ne 'BEGIN { $subject = 0 } if ($subject) { print ; } elsif (/^\# User /) { s/\# User/From:/ ; print ; } elsif (/^\# Date /) { @@ -664,7 +664,7 @@ do sed -e '1,/^$/d' >"$dotest/msg-clean" echo "$commit" >"$dotest/original-commit" get_author_ident_from_commit "$commit" >"$dotest/author-script" - git diff-tree --root --binary "$commit" >"$dotest/patch" + git diff-tree --root --binary --full-index "$commit" >"$dotest/patch" else git mailinfo $keep $no_inbody_headers $scissors $utf8 "$dotest/msg" "$dotest/patch" \ <"$dotest/$msgnum" >"$dotest/info" || diff --git a/git-archimport.perl b/git-archimport.perl index bc32f18d6d..9cb123a07d 100755 --- a/git-archimport.perl +++ b/git-archimport.perl @@ -75,7 +75,7 @@ our($opt_h,$opt_f,$opt_v,$opt_T,$opt_t,$opt_D,$opt_a,$opt_o); sub usage() { print STDERR <<END; -Usage: git archimport # fetch/update GIT from Arch +usage: git archimport # fetch/update GIT from Arch [ -h ] [ -v ] [ -o ] [ -a ] [ -f ] [ -T ] [ -D depth ] [ -t tempdir ] repository/arch-branch [ repository/arch-branch] ... END diff --git a/git-compat-util.h b/git-compat-util.h index e5a4b7450b..90e0372038 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -86,6 +86,9 @@ #define _SGI_SOURCE 1 #ifdef WIN32 /* Both MinGW and MSVC */ +# if defined (_MSC_VER) +# define _WIN32_WINNT 0x0502 +# endif #define WIN32_LEAN_AND_MEAN /* stops windows.h including winsock.h */ #include <winsock2.h> #include <windows.h> @@ -112,7 +115,9 @@ #include <sys/time.h> #include <time.h> #include <signal.h> +#ifndef USE_WILDMATCH #include <fnmatch.h> +#endif #include <assert.h> #include <regex.h> #include <utime.h> @@ -211,6 +216,17 @@ extern char *gitbasename(char *); #include <openssl/err.h> #endif +/* On most systems <netdb.h> would have given us this, but + * not on some systems (e.g. z/OS). + */ +#ifndef NI_MAXHOST +#define NI_MAXHOST 1025 +#endif + +#ifndef NI_MAXSERV +#define NI_MAXSERV 32 +#endif + /* On most systems <limits.h> would have given us this, but * not on some systems (e.g. GNU/Hurd). */ @@ -280,6 +296,17 @@ extern char *gitbasename(char *); #include "compat/bswap.h" +#ifdef USE_WILDMATCH +#include "wildmatch.h" +#define FNM_PATHNAME WM_PATHNAME +#define FNM_CASEFOLD WM_CASEFOLD +#define FNM_NOMATCH WM_NOMATCH +static inline int fnmatch(const char *pattern, const char *string, int flags) +{ + return wildmatch(pattern, string, flags, NULL); +} +#endif + /* General helper functions */ extern void vreportf(const char *prefix, const char *err, va_list params); extern void vwritef(int fd, const char *prefix, const char *err, va_list params); @@ -292,13 +319,13 @@ extern void warning(const char *err, ...) __attribute__((format (printf, 1, 2))) /* * Let callers be aware of the constant return value; this can help - * gcc with -Wuninitialized analysis. We have to restrict this trick to - * gcc, though, because of the variadic macro and the magic ## comma pasting - * behavior. But since we're only trying to help gcc, anyway, it's OK; other - * compilers will fall back to using the function as usual. + * gcc with -Wuninitialized analysis. We restrict this trick to gcc, though, + * because some compilers may not support variadic macros. Since we're only + * trying to help gcc, anyway, it's OK; other compilers will fall back to + * using the function as usual. */ -#ifdef __GNUC__ -#define error(fmt, ...) (error((fmt), ##__VA_ARGS__), -1) +#if defined(__GNUC__) && ! defined(__clang__) +#define error(...) (error(__VA_ARGS__), -1) #endif extern void set_die_routine(NORETURN_PTR void (*routine)(const char *err, va_list params)); @@ -408,11 +435,6 @@ extern uintmax_t gitstrtoumax(const char *, char **, int); extern intmax_t gitstrtoimax(const char *, char **, int); #endif -#ifdef NO_STRTOK_R -#define strtok_r gitstrtok_r -extern char *gitstrtok_r(char *s, const char *delim, char **save_ptr); -#endif - #ifdef NO_HSTRERROR #define hstrerror githstrerror extern const char *githstrerror(int herror); diff --git a/git-cvsexportcommit.perl b/git-cvsexportcommit.perl index e6bf25232c..d13f02da95 100755 --- a/git-cvsexportcommit.perl +++ b/git-cvsexportcommit.perl @@ -420,7 +420,7 @@ sleep(1); sub usage { print STDERR <<END; -Usage: GIT_DIR=/path/to/.git git cvsexportcommit [-h] [-p] [-v] [-c] [-f] [-u] [-k] [-w cvsworkdir] [-m msgprefix] [ parent ] commit +usage: GIT_DIR=/path/to/.git git cvsexportcommit [-h] [-p] [-v] [-c] [-f] [-u] [-k] [-w cvsworkdir] [-m msgprefix] [ parent ] commit END exit(1); } diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 0a31ebd820..73d367cea8 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -26,6 +26,7 @@ use IO::Socket; use IO::Pipe; use POSIX qw(strftime tzset dup2 ENOENT); use IPC::Open2; +use Git qw(get_tz_offset); $SIG{'PIPE'}="IGNORE"; set_timezone('UTC'); @@ -37,7 +38,7 @@ sub usage(;$) { my $msg = shift; print(STDERR "Error: $msg\n") if $msg; print STDERR <<END; -Usage: git cvsimport # fetch/update GIT from CVS +usage: git cvsimport # fetch/update GIT from CVS [-o branch-for-HEAD] [-h] [-v] [-d CVSROOT] [-A author-conv-file] [-p opts-for-cvsps] [-P file] [-C GIT_repository] [-z fuzz] [-i] [-k] [-u] [-s subst] [-a] [-m] [-M regex] [-S regex] [-L commitlimit] @@ -864,7 +865,9 @@ sub commit { } set_timezone($author_tz); - my $commit_date = strftime("%s %z", localtime($date)); + # $date is in the seconds since epoch format + my $tz_offset = get_tz_offset($date); + my $commit_date = "$date $tz_offset"; set_timezone('UTC'); $ENV{GIT_AUTHOR_NAME} = $author_name; $ENV{GIT_AUTHOR_EMAIL} = $author_email; diff --git a/git-cvsserver.perl b/git-cvsserver.perl index c5ebfa0636..f1c3f49a83 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -60,6 +60,7 @@ my $methods = { 'Valid-responses' => \&req_Validresponses, 'valid-requests' => \&req_validrequests, 'Directory' => \&req_Directory, + 'Sticky' => \&req_Sticky, 'Entry' => \&req_Entry, 'Modified' => \&req_Modified, 'Unchanged' => \&req_Unchanged, @@ -106,7 +107,7 @@ my $work = $log->info("--------------- STARTING -----------------"); my $usage = - "Usage: git cvsserver [options] [pserver|server] [<directory> ...]\n". + "usage: git cvsserver [options] [pserver|server] [<directory> ...]\n". " --base-path <path> : Prepend to requested CVSROOT\n". " Can be read from GIT_CVSSERVER_BASE_PATH\n". " --strict-paths : Don't allow recursing into subdirectories\n". @@ -470,11 +471,19 @@ sub req_Directory { $log->info("Setting prepend to '$state->{path}'"); $state->{prependdir} = $state->{path}; + my %entries; foreach my $entry ( keys %{$state->{entries}} ) { - $state->{entries}{$state->{prependdir} . $entry} = $state->{entries}{$entry}; - delete $state->{entries}{$entry}; + $entries{$state->{prependdir} . $entry} = $state->{entries}{$entry}; } + $state->{entries}=\%entries; + + my %dirMap; + foreach my $dir ( keys %{$state->{dirMap}} ) + { + $dirMap{$state->{prependdir} . $dir} = $state->{dirMap}{$dir}; + } + $state->{dirMap}=\%dirMap; } if ( defined ( $state->{prependdir} ) ) @@ -482,9 +491,60 @@ sub req_Directory $log->debug("Prepending '$state->{prependdir}' to state|directory"); $state->{directory} = $state->{prependdir} . $state->{directory} } + + if ( ! defined($state->{dirMap}{$state->{directory}}) ) + { + $state->{dirMap}{$state->{directory}} = + { + 'names' => {} + #'tagspec' => undef + }; + } + $log->debug("req_Directory : localdir=$data repository=$repository path=$state->{path} directory=$state->{directory} module=$state->{module}"); } +# Sticky tagspec \n +# Response expected: no. Tell the server that the directory most +# recently specified with Directory has a sticky tag or date +# tagspec. The first character of tagspec is T for a tag, D for +# a date, or some other character supplied by a Set-sticky +# response from a previous request to the server. The remainder +# of tagspec contains the actual tag or date, again as supplied +# by Set-sticky. +# The server should remember Static-directory and Sticky requests +# for a particular directory; the client need not resend them each +# time it sends a Directory request for a given directory. However, +# the server is not obliged to remember them beyond the context +# of a single command. +sub req_Sticky +{ + my ( $cmd, $tagspec ) = @_; + + my ( $stickyInfo ); + if($tagspec eq "") + { + # nothing + } + elsif($tagspec=~/^T([^ ]+)\s*$/) + { + $stickyInfo = { 'tag' => $1 }; + } + elsif($tagspec=~/^D([0-9.]+)\s*$/) + { + $stickyInfo= { 'date' => $1 }; + } + else + { + die "Unknown tag_or_date format\n"; + } + $state->{dirMap}{$state->{directory}}{stickyInfo}=$stickyInfo; + + $log->debug("req_Sticky : tagspec=$tagspec repository=$state->{repository}" + . " path=$state->{path} directory=$state->{directory}" + . " module=$state->{module}"); +} + # Entry entry-line \n # Response expected: no. Tell the server what version of a file is on the # local machine. The name in entry-line is a name relative to the directory @@ -511,6 +571,8 @@ sub req_Entry tag_or_date => $data[5], }; + $state->{dirMap}{$state->{directory}}{names}{$data[1]} = 'F'; + $log->info("Received entry line '$data' => '" . $state->{directory} . $data[1] . "'"); } @@ -549,7 +611,10 @@ sub req_add { $filename = filecleanup($filename); - my $meta = $updater->getmeta($filename); + # no -r, -A, or -D with add + my $stickyInfo = resolveStickyInfo($filename); + + my $meta = $updater->getmeta($filename,$stickyInfo); my $wrev = revparse($filename); if ($wrev && $meta && ($wrev=~/^-/)) @@ -572,8 +637,10 @@ sub req_add # this is an "entries" line my $kopts = kopts_from_path($filename,"sha1",$meta->{filehash}); - $log->debug("/$filepart/$meta->{revision}//$kopts/"); - print "/$filepart/$meta->{revision}//$kopts/\n"; + my $entryLine = "/$filepart/$meta->{revision}//$kopts/"; + $entryLine .= getStickyTagOrDate($stickyInfo); + $log->debug($entryLine); + print "$entryLine\n"; # permissions $log->debug("SEND : u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}"); print "u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}\n"; @@ -604,7 +671,8 @@ sub req_add print "$filename\n"; my $kopts = kopts_from_path($filename,"file", $state->{entries}{$filename}{modified_filename}); - print "/$filepart/0//$kopts/\n"; + print "/$filepart/0//$kopts/" . + getStickyTagOrDate($stickyInfo) . "\n"; my $requestedKopts = $state->{opt}{k}; if(defined($requestedKopts)) @@ -672,7 +740,10 @@ sub req_remove next; } - my $meta = $updater->getmeta($filename); + # only from entries + my $stickyInfo = resolveStickyInfo($filename); + + my $meta = $updater->getmeta($filename,$stickyInfo); my $wrev = revparse($filename); unless ( defined ( $wrev ) ) @@ -702,7 +773,7 @@ sub req_remove print "Checked-in $dirpart\n"; print "$filename\n"; my $kopts = kopts_from_path($filename,"sha1",$meta->{filehash}); - print "/$filepart/-$wrev//$kopts/\n"; + print "/$filepart/-$wrev//$kopts/" . getStickyTagOrDate($stickyInfo) . "\n"; $rmcount++; } @@ -882,6 +953,9 @@ sub req_co return 1; } + my $stickyInfo = { 'tag' => $state->{opt}{r}, + 'date' => $state->{opt}{D} }; + my $module = $state->{args}[0]; $state->{module} = $module; my $checkout_path = $module; @@ -899,64 +973,32 @@ sub req_co my $updater = GITCVS::updater->new($state->{CVSROOT}, $module, $log); $updater->update(); - $checkout_path =~ s|/$||; # get rid of trailing slashes + my $headHash; + if( defined($stickyInfo) && defined($stickyInfo->{tag}) ) + { + $headHash = $updater->lookupCommitRef($stickyInfo->{tag}); + if( !defined($headHash) ) + { + print "error 1 no such tag `$stickyInfo->{tag}'\n"; + cleanupWorkTree(); + exit; + } + } - # Eclipse seems to need the Clear-sticky command - # to prepare the 'Entries' file for the new directory. - print "Clear-sticky $checkout_path/\n"; - print $state->{CVSROOT} . "/$module/\n"; - print "Clear-static-directory $checkout_path/\n"; - print $state->{CVSROOT} . "/$module/\n"; - print "Clear-sticky $checkout_path/\n"; # yes, twice - print $state->{CVSROOT} . "/$module/\n"; - print "Template $checkout_path/\n"; - print $state->{CVSROOT} . "/$module/\n"; - print "0\n"; - - # instruct the client that we're checking out to $checkout_path - print "E cvs checkout: Updating $checkout_path\n"; + $checkout_path =~ s|/$||; # get rid of trailing slashes my %seendirs = (); my $lastdir =''; - # recursive - sub prepdir { - my ($dir, $repodir, $remotedir, $seendirs) = @_; - my $parent = dirname($dir); - $dir =~ s|/+$||; - $repodir =~ s|/+$||; - $remotedir =~ s|/+$||; - $parent =~ s|/+$||; - $log->debug("announcedir $dir, $repodir, $remotedir" ); - - if ($parent eq '.' || $parent eq './') { - $parent = ''; - } - # recurse to announce unseen parents first - if (length($parent) && !exists($seendirs->{$parent})) { - prepdir($parent, $repodir, $remotedir, $seendirs); - } - # Announce that we are going to modify at the parent level - if ($parent) { - print "E cvs checkout: Updating $remotedir/$parent\n"; - } else { - print "E cvs checkout: Updating $remotedir\n"; - } - print "Clear-sticky $remotedir/$parent/\n"; - print "$repodir/$parent/\n"; - - print "Clear-static-directory $remotedir/$dir/\n"; - print "$repodir/$dir/\n"; - print "Clear-sticky $remotedir/$parent/\n"; # yes, twice - print "$repodir/$parent/\n"; - print "Template $remotedir/$dir/\n"; - print "$repodir/$dir/\n"; - print "0\n"; - - $seendirs->{$dir} = 1; - } - - foreach my $git ( @{$updater->gethead} ) + prepDirForOutput( + ".", + $state->{CVSROOT} . "/$module", + $checkout_path, + \%seendirs, + 'checkout', + $state->{dirArgs} ); + + foreach my $git ( @{$updater->getAnyHead($headHash)} ) { # Don't want to check out deleted files next if ( $git->{filehash} eq "deleted" ); @@ -964,16 +1006,13 @@ sub req_co my $fullName = $git->{name}; ( $git->{name}, $git->{dir} ) = filenamesplit($git->{name}); - if (length($git->{dir}) && $git->{dir} ne './' - && $git->{dir} ne $lastdir ) { - unless (exists($seendirs{$git->{dir}})) { - prepdir($git->{dir}, $state->{CVSROOT} . "/$module/", - $checkout_path, \%seendirs); - $lastdir = $git->{dir}; - $seendirs{$git->{dir}} = 1; - } - print "E cvs checkout: Updating /$checkout_path/$git->{dir}\n"; - } + unless (exists($seendirs{$git->{dir}})) { + prepDirForOutput($git->{dir}, $state->{CVSROOT} . "/$module/", + $checkout_path, \%seendirs, 'checkout', + $state->{dirArgs} ); + $lastdir = $git->{dir}; + $seendirs{$git->{dir}} = 1; + } # modification time of this file print "Mod-time $git->{modified}\n"; @@ -993,7 +1032,8 @@ sub req_co # this is an "entries" line my $kopts = kopts_from_path($fullName,"sha1",$git->{filehash}); - print "/$git->{name}/$git->{revision}//$kopts/\n"; + print "/$git->{name}/$git->{revision}//$kopts/" . + getStickyTagOrDate($stickyInfo) . "\n"; # permissions print "u=$git->{mode},g=$git->{mode},o=$git->{mode}\n"; @@ -1006,6 +1046,119 @@ sub req_co statecleanup(); } +# used by req_co and req_update to set up directories for files +# recursively handles parents +sub prepDirForOutput +{ + my ($dir, $repodir, $remotedir, $seendirs, $request, $dirArgs) = @_; + + my $parent = dirname($dir); + $dir =~ s|/+$||; + $repodir =~ s|/+$||; + $remotedir =~ s|/+$||; + $parent =~ s|/+$||; + + if ($parent eq '.' || $parent eq './') + { + $parent = ''; + } + # recurse to announce unseen parents first + if( length($parent) && + !exists($seendirs->{$parent}) && + ( $request eq "checkout" || + exists($dirArgs->{$parent}) ) ) + { + prepDirForOutput($parent, $repodir, $remotedir, + $seendirs, $request, $dirArgs); + } + # Announce that we are going to modify at the parent level + if ($dir eq '.' || $dir eq './') + { + $dir = ''; + } + if(exists($seendirs->{$dir})) + { + return; + } + $log->debug("announcedir $dir, $repodir, $remotedir" ); + my($thisRemoteDir,$thisRepoDir); + if ($dir ne "") + { + $thisRepoDir="$repodir/$dir"; + if($remotedir eq ".") + { + $thisRemoteDir=$dir; + } + else + { + $thisRemoteDir="$remotedir/$dir"; + } + } + else + { + $thisRepoDir=$repodir; + $thisRemoteDir=$remotedir; + } + unless ( $state->{globaloptions}{-Q} || $state->{globaloptions}{-q} ) + { + print "E cvs $request: Updating $thisRemoteDir\n"; + } + + my ($opt_r)=$state->{opt}{r}; + my $stickyInfo; + if(exists($state->{opt}{A})) + { + # $stickyInfo=undef; + } + elsif( defined($opt_r) && $opt_r ne "" ) + # || ( defined($state->{opt}{D}) && $state->{opt}{D} ne "" ) # TODO + { + $stickyInfo={ 'tag' => (defined($opt_r)?$opt_r:undef) }; + + # TODO: Convert -D value into the form 2011.04.10.04.46.57, + # similar to an entry line's sticky date, without the D prefix. + # It sometimes (always?) arrives as something more like + # '10 Apr 2011 04:46:57 -0000'... + # $stickyInfo={ 'date' => (defined($stickyDate)?$stickyDate:undef) }; + } + else + { + $stickyInfo=getDirStickyInfo($state->{prependdir} . $dir); + } + + my $stickyResponse; + if(defined($stickyInfo)) + { + $stickyResponse = "Set-sticky $thisRemoteDir/\n" . + "$thisRepoDir/\n" . + getStickyTagOrDate($stickyInfo) . "\n"; + } + else + { + $stickyResponse = "Clear-sticky $thisRemoteDir/\n" . + "$thisRepoDir/\n"; + } + + unless ( $state->{globaloptions}{-n} ) + { + print $stickyResponse; + + print "Clear-static-directory $thisRemoteDir/\n"; + print "$thisRepoDir/\n"; + print $stickyResponse; # yes, twice + print "Template $thisRemoteDir/\n"; + print "$thisRepoDir/\n"; + print "0\n"; + } + + $seendirs->{$dir} = 1; + + # FUTURE: This would more accurately emulate CVS by sending + # another copy of sticky after processing the files in that + # directory. Or intermediate: perhaps send all sticky's for + # $seendirs after after processing all files. +} + # update \n # Response expected: yes. Actually do a cvs update command. This uses any # previous Argument, Directory, Entry, or Modified requests, if they have @@ -1049,29 +1202,19 @@ sub req_update #$log->debug("update state : " . Dumper($state)); - my $last_dirname = "///"; + my($repoDir); + $repoDir=$state->{CVSROOT} . "/$state->{module}/$state->{prependdir}"; + + my %seendirs = (); # foreach file specified on the command line ... - foreach my $filename ( @{$state->{args}} ) + foreach my $argsFilename ( @{$state->{args}} ) { - $filename = filecleanup($filename); + my $filename; + $filename = filecleanup($argsFilename); $log->debug("Processing file $filename"); - unless ( $state->{globaloptions}{-Q} || $state->{globaloptions}{-q} ) - { - my $cur_dirname = dirname($filename); - if ( $cur_dirname ne $last_dirname ) - { - $last_dirname = $cur_dirname; - if ( $cur_dirname eq "" ) - { - $cur_dirname = "."; - } - print "E cvs update: Updating $cur_dirname\n"; - } - } - # if we have a -C we should pretend we never saw modified stuff if ( exists ( $state->{opt}{C} ) ) { @@ -1080,13 +1223,11 @@ sub req_update $state->{entries}{$filename}{unchanged} = 1; } - my $meta; - if ( defined($state->{opt}{r}) and $state->{opt}{r} =~ /^(1\.\d+)$/ ) - { - $meta = $updater->getmeta($filename, $1); - } else { - $meta = $updater->getmeta($filename); - } + my $stickyInfo = resolveStickyInfo($filename, + $state->{opt}{r}, + $state->{opt}{D}, + exists($state->{opt}{A})); + my $meta = $updater->getmeta($filename, $stickyInfo); # If -p was given, "print" the contents of the requested revision. if ( exists ( $state->{opt}{p} ) ) { @@ -1099,6 +1240,17 @@ sub req_update next; } + # Directories: + prepDirForOutput( + dirname($argsFilename), + $repoDir, + ".", + \%seendirs, + "update", + $state->{dirArgs} ); + + my $wrev = revparse($filename); + if ( ! defined $meta ) { $meta = { @@ -1106,16 +1258,23 @@ sub req_update revision => '0', filehash => 'added' }; + if($wrev ne "0") + { + $meta->{filehash}='deleted'; + } } my $oldmeta = $meta; - my $wrev = revparse($filename); - # If the working copy is an old revision, lets get that version too for comparison. - if ( defined($wrev) and $wrev ne $meta->{revision} ) + my $oldWrev=$wrev; + if(defined($oldWrev)) { - $oldmeta = $updater->getmeta($filename, $wrev); + $oldWrev=~s/^-//; + if($oldWrev ne $meta->{revision}) + { + $oldmeta = $updater->getmeta($filename, $oldWrev); + } } #$log->debug("Target revision is $meta->{revision}, current working revision is $wrev"); @@ -1133,6 +1292,7 @@ sub req_update if ( defined ( $wrev ) and defined($meta->{revision}) and $wrev eq $meta->{revision} + and $wrev ne "0" and defined($state->{entries}{$filename}{modified_hash}) and not exists ( $state->{opt}{C} ) ) { @@ -1143,7 +1303,7 @@ sub req_update next; } - if ( $meta->{filehash} eq "deleted" ) + if ( $meta->{filehash} eq "deleted" && $wrev ne "0" ) { # TODO: If it has been modified in the sandbox, error out # with the appropriate message, rather than deleting a modified @@ -1205,10 +1365,6 @@ sub req_update $log->debug("Updating existing file 'Update-existing $dirpart'"); } else { # instruct client we're sending a file to put in this path as a new file - print "Clear-static-directory $dirpart\n"; - print $state->{CVSROOT} . "/$state->{module}/$dirpart\n"; - print "Clear-sticky $dirpart\n"; - print $state->{CVSROOT} . "/$state->{module}/$dirpart\n"; $log->debug("Creating new file 'Created $dirpart'"); print "Created $dirpart\n"; @@ -1217,8 +1373,10 @@ sub req_update # this is an "entries" line my $kopts = kopts_from_path($filename,"sha1",$meta->{filehash}); - $log->debug("/$filepart/$meta->{revision}//$kopts/"); - print "/$filepart/$meta->{revision}//$kopts/\n"; + my $entriesLine = "/$filepart/$meta->{revision}//$kopts/"; + $entriesLine .= getStickyTagOrDate($stickyInfo); + $log->debug($entriesLine); + print "$entriesLine\n"; # permissions $log->debug("SEND : u=$meta->{mode},g=$meta->{mode},o=$meta->{mode}"); @@ -1266,7 +1424,9 @@ sub req_update my $kopts = kopts_from_path("$dirpart/$filepart", "file",$mergedFile); $log->debug("/$filepart/$meta->{revision}//$kopts/"); - print "/$filepart/$meta->{revision}//$kopts/\n"; + my $entriesLine="/$filepart/$meta->{revision}//$kopts/"; + $entriesLine .= getStickyTagOrDate($stickyInfo); + print "$entriesLine\n"; } } elsif ( $return == 1 ) @@ -1282,7 +1442,9 @@ sub req_update print $state->{CVSROOT} . "/$state->{module}/$filename\n"; my $kopts = kopts_from_path("$dirpart/$filepart", "file",$mergedFile); - print "/$filepart/$meta->{revision}/+/$kopts/\n"; + my $entriesLine = "/$filepart/$meta->{revision}/+/$kopts/"; + $entriesLine .= getStickyTagOrDate($stickyInfo); + print "$entriesLine\n"; } } else @@ -1310,6 +1472,43 @@ sub req_update } + # prepDirForOutput() any other existing directories unless they already + # have the right sticky tag: + unless ( $state->{globaloptions}{n} ) + { + my $dir; + foreach $dir (keys(%{$state->{dirMap}})) + { + if( ! $seendirs{$dir} && + exists($state->{dirArgs}{$dir}) ) + { + my($oldTag); + $oldTag=$state->{dirMap}{$dir}{tagspec}; + + unless( ( exists($state->{opt}{A}) && + defined($oldTag) ) || + ( defined($state->{opt}{r}) && + ( !defined($oldTag) || + $state->{opt}{r} ne $oldTag ) ) ) + # TODO?: OR sticky dir is different... + { + next; + } + + prepDirForOutput( + $dir, + $repoDir, + ".", + \%seendirs, + 'update', + $state->{dirArgs} ); + } + + # TODO?: Consider sending a final duplicate Sticky response + # to more closely mimic real CVS. + } + } + print "ok\n"; } @@ -1342,23 +1541,11 @@ sub req_ci my $updater = GITCVS::updater->new($state->{CVSROOT}, $state->{module}, $log); $updater->update(); - # Remember where the head was at the beginning. - my $parenthash = `git show-ref -s refs/heads/$state->{module}`; - chomp $parenthash; - if ($parenthash !~ /^[0-9a-f]{40}$/) { - print "error 1 pserver cannot find the current HEAD of module"; - cleanupWorkTree(); - exit; - } - - setupWorkTree($parenthash); - - $log->info("Lockless commit start, basing commit on '$work->{workDir}', index file is '$work->{index}'"); - - $log->info("Created index '$work->{index}' for head $state->{module} - exit status $?"); - my @committedfiles = (); my %oldmeta; + my $stickyInfo; + my $branchRef; + my $parenthash; # foreach file specified on the command line ... foreach my $filename ( @{$state->{args}} ) @@ -1368,7 +1555,67 @@ sub req_ci next unless ( exists $state->{entries}{$filename}{modified_filename} or not $state->{entries}{$filename}{unchanged} ); - my $meta = $updater->getmeta($filename); + ##### + # Figure out which branch and parenthash we are committing + # to, and setup worktree: + + # should always come from entries: + my $fileStickyInfo = resolveStickyInfo($filename); + if( !defined($branchRef) ) + { + $stickyInfo = $fileStickyInfo; + if( defined($stickyInfo) && + ( defined($stickyInfo->{date}) || + !defined($stickyInfo->{tag}) ) ) + { + print "error 1 cannot commit with sticky date for file `$filename'\n"; + cleanupWorkTree(); + exit; + } + + $branchRef = "refs/heads/$state->{module}"; + if ( defined($stickyInfo) && defined($stickyInfo->{tag}) ) + { + $branchRef = "refs/heads/$stickyInfo->{tag}"; + } + + $parenthash = `git show-ref -s $branchRef`; + chomp $parenthash; + if ($parenthash !~ /^[0-9a-f]{40}$/) + { + if ( defined($stickyInfo) && defined($stickyInfo->{tag}) ) + { + print "error 1 sticky tag `$stickyInfo->{tag}' for file `$filename' is not a branch\n"; + } + else + { + print "error 1 pserver cannot find the current HEAD of module"; + } + cleanupWorkTree(); + exit; + } + + setupWorkTree($parenthash); + + $log->info("Lockless commit start, basing commit on '$work->{workDir}', index file is '$work->{index}'"); + + $log->info("Created index '$work->{index}' for head $state->{module} - exit status $?"); + } + elsif( !refHashEqual($stickyInfo,$fileStickyInfo) ) + { + #TODO: We could split the cvs commit into multiple + # git commits by distinct stickyTag values, but that + # is lowish priority. + print "error 1 Committing different files to different" + . " branches is not currently supported\n"; + cleanupWorkTree(); + exit; + } + + ##### + # Process this file: + + my $meta = $updater->getmeta($filename,$stickyInfo); $oldmeta{$filename} = $meta; my $wrev = revparse($filename); @@ -1470,7 +1717,7 @@ sub req_ci } ### Emulate git-receive-pack by running hooks/update - my @hook = ( $ENV{GIT_DIR}.'hooks/update', "refs/heads/$state->{module}", + my @hook = ( $ENV{GIT_DIR}.'hooks/update', $branchRef, $parenthash, $commithash ); if( -x $hook[0] ) { unless( system( @hook ) == 0 ) @@ -1484,7 +1731,7 @@ sub req_ci ### Update the ref if (system(qw(git update-ref -m), "cvsserver ci", - "refs/heads/$state->{module}", $commithash, $parenthash)) { + $branchRef, $commithash, $parenthash)) { $log->warn("update-ref for $state->{module} failed."); print "error 1 Cannot commit -- update first\n"; cleanupWorkTree(); @@ -1498,7 +1745,7 @@ sub req_ci local $SIG{PIPE} = sub { die 'pipe broke' }; - print $pipe "$parenthash $commithash refs/heads/$state->{module}\n"; + print $pipe "$parenthash $commithash $branchRef\n"; close $pipe || die "bad pipe: $! $?"; } @@ -1508,7 +1755,7 @@ sub req_ci ### Then hooks/post-update $hook = $ENV{GIT_DIR}.'hooks/post-update'; if (-x $hook) { - system($hook, "refs/heads/$state->{module}"); + system($hook, $branchRef); } # foreach file specified on the command line ... @@ -1516,7 +1763,7 @@ sub req_ci { $filename = filecleanup($filename); - my $meta = $updater->getmeta($filename); + my $meta = $updater->getmeta($filename,$stickyInfo); unless (defined $meta->{revision}) { $meta->{revision} = "1.1"; } @@ -1540,7 +1787,8 @@ sub req_ci print "Checked-in $dirpart\n"; print "$filename\n"; my $kopts = kopts_from_path($filename,"sha1",$meta->{filehash}); - print "/$filepart/$meta->{revision}//$kopts/\n"; + print "/$filepart/$meta->{revision}//$kopts/" . + getStickyTagOrDate($stickyInfo) . "\n"; } } @@ -1577,16 +1825,19 @@ sub req_status next; } - my $meta = $updater->getmeta($filename); - my $oldmeta = $meta; - my $wrev = revparse($filename); + my $stickyInfo = resolveStickyInfo($filename); + my $meta = $updater->getmeta($filename,$stickyInfo); + my $oldmeta = $meta; + # If the working copy is an old revision, lets get that # version too for comparison. if ( defined($wrev) and $wrev ne $meta->{revision} ) { - $oldmeta = $updater->getmeta($filename, $wrev); + my($rmRev)=$wrev; + $rmRev=~s/^-//; + $oldmeta = $updater->getmeta($filename, $rmRev); } # TODO : All possible statuses aren't yet implemented @@ -1629,6 +1880,7 @@ sub req_status # same revision but there are local changes if ( defined ( $wrev ) and defined($meta->{revision}) and $wrev eq $meta->{revision} and + $wrev ne "0" and $state->{entries}{$filename}{modified_filename} ) { $status ||= "Locally Modified"; @@ -1644,7 +1896,8 @@ sub req_status } if ( defined ( $state->{entries}{$filename}{revision} ) and - not defined ( $meta->{revision} ) ) + ( !defined($meta->{revision}) || + $meta->{revision} eq "0" ) ) { $status ||= "Locally Added"; } @@ -1740,98 +1993,133 @@ sub req_diff # be providing status on ... argsfromdir($updater); + my($foundDiff); + # foreach file specified on the command line ... - foreach my $filename ( @{$state->{args}} ) + foreach my $argFilename ( @{$state->{args}} ) { - $filename = filecleanup($filename); + my($filename) = filecleanup($argFilename); my ( $fh, $file1, $file2, $meta1, $meta2, $filediff ); my $wrev = revparse($filename); - # We need _something_ to diff against - next unless ( defined ( $wrev ) ); + # Priority for revision1: + # 1. First -r (missing file: check -N) + # 2. wrev from client's Entry line + # - missing line/file: check -N + # - "0": added file not committed (empty contents for rev1) + # - Prefixed with dash (to be removed): check -N - # if we have a -r switch, use it if ( defined ( $revision1 ) ) { - ( undef, $file1 ) = tempfile( DIR => $TEMP_DIR, OPEN => 0 ); $meta1 = $updater->getmeta($filename, $revision1); - unless ( defined ( $meta1 ) and $meta1->{filehash} ne "deleted" ) + } + elsif( defined($wrev) && $wrev ne "0" ) + { + my($rmRev)=$wrev; + $rmRev=~s/^-//; + $meta1 = $updater->getmeta($filename, $rmRev); + } + if ( !defined($meta1) || + $meta1->{filehash} eq "deleted" ) + { + if( !exists($state->{opt}{N}) ) { - print "E File $filename at revision $revision1 doesn't exist\n"; + if(!defined($revision1)) + { + print "E File $filename at revision $revision1 doesn't exist\n"; + } next; } - transmitfile($meta1->{filehash}, { targetfile => $file1 }); - } - # otherwise we just use the working copy revision - else - { - ( undef, $file1 ) = tempfile( DIR => $TEMP_DIR, OPEN => 0 ); - $meta1 = $updater->getmeta($filename, $wrev); - transmitfile($meta1->{filehash}, { targetfile => $file1 }); + elsif( !defined($meta1) ) + { + $meta1 = { + name => $filename, + revision => '0', + filehash => 'deleted' + }; + } } + # Priority for revision2: + # 1. Second -r (missing file: check -N) + # 2. Modified file contents from client + # 3. wrev from client's Entry line + # - missing line/file: check -N + # - Prefixed with dash (to be removed): check -N + # if we have a second -r switch, use it too if ( defined ( $revision2 ) ) { - ( undef, $file2 ) = tempfile( DIR => $TEMP_DIR, OPEN => 0 ); $meta2 = $updater->getmeta($filename, $revision2); - - unless ( defined ( $meta2 ) and $meta2->{filehash} ne "deleted" ) - { - print "E File $filename at revision $revision2 doesn't exist\n"; - next; - } - - transmitfile($meta2->{filehash}, { targetfile => $file2 }); } - # otherwise we just use the working copy - else + elsif(defined($state->{entries}{$filename}{modified_filename})) { $file2 = $state->{entries}{$filename}{modified_filename}; + $meta2 = { + name => $filename, + revision => '0', + filehash => 'modified' + }; } - - # if we have been given -r, and we don't have a $file2 yet, lets - # get one - if ( defined ( $revision1 ) and not defined ( $file2 ) ) + elsif( defined($wrev) && ($wrev!~/^-/) ) { - ( undef, $file2 ) = tempfile( DIR => $TEMP_DIR, OPEN => 0 ); + if(!defined($revision1)) # no revision and no modifications: + { + next; + } $meta2 = $updater->getmeta($filename, $wrev); - transmitfile($meta2->{filehash}, { targetfile => $file2 }); + } + if(!defined($file2)) + { + if ( !defined($meta2) || + $meta2->{filehash} eq "deleted" ) + { + if( !exists($state->{opt}{N}) ) + { + if(!defined($revision2)) + { + print "E File $filename at revision $revision2 doesn't exist\n"; + } + next; + } + elsif( !defined($meta2) ) + { + $meta2 = { + name => $filename, + revision => '0', + filehash => 'deleted' + }; + } + } } - # We need to have retrieved something useful - next unless ( defined ( $meta1 ) ); - - # Files to date if the working copy and repo copy have the same - # revision, and the working copy is unmodified - if ( not defined ( $meta2 ) and $wrev eq $meta1->{revision} and - ( ( $state->{entries}{$filename}{unchanged} and - ( not defined ( $state->{entries}{$filename}{conflict} ) or - $state->{entries}{$filename}{conflict} !~ /^\+=/ ) ) or - ( defined($state->{entries}{$filename}{modified_hash}) and - $state->{entries}{$filename}{modified_hash} eq - $meta1->{filehash} ) ) ) + if( $meta1->{filehash} eq $meta2->{filehash} ) { + $log->info("unchanged $filename"); next; } - # Apparently we only show diffs for locally modified files - unless ( defined($meta2) or - defined ( $state->{entries}{$filename}{modified_filename} ) ) + # Retrieve revision contents: + ( undef, $file1 ) = tempfile( DIR => $TEMP_DIR, OPEN => 0 ); + transmitfile($meta1->{filehash}, { targetfile => $file1 }); + + if(!defined($file2)) { - next; + ( undef, $file2 ) = tempfile( DIR => $TEMP_DIR, OPEN => 0 ); + transmitfile($meta2->{filehash}, { targetfile => $file2 }); } - print "M Index: $filename\n"; + # Generate the actual diff: + print "M Index: $argFilename\n"; print "M =======" . ( "=" x 60 ) . "\n"; print "M RCS file: $state->{CVSROOT}/$state->{module}/$filename,v\n"; - if ( defined ( $meta1 ) ) + if ( defined ( $meta1 ) && $meta1->{revision} ne "0" ) { print "M retrieving revision $meta1->{revision}\n" } - if ( defined ( $meta2 ) ) + if ( defined ( $meta2 ) && $meta2->{revision} ne "0" ) { print "M retrieving revision $meta2->{revision}\n" } @@ -1852,33 +2140,73 @@ sub req_diff } } } - print "$filename\n"; + print "$argFilename\n"; $log->info("Diffing $filename -r $meta1->{revision} -r " . ( $meta2->{revision} or "workingcopy" )); - ( $fh, $filediff ) = tempfile ( DIR => $TEMP_DIR ); - - if ( exists $state->{opt}{u} ) + # TODO: Use --label instead of -L because -L is no longer + # documented and may go away someday. Not sure if there there are + # versions that only support -L, which would make this change risky? + # http://osdir.com/ml/bug-gnu-utils-gnu/2010-12/msg00060.html + # ("man diff" should actually document the best migration strategy, + # [current behavior, future changes, old compatibility issues + # or lack thereof, etc], not just stop mentioning the option...) + # TODO: Real CVS seems to include a date in the label, before + # the revision part, without the keyword "revision". The following + # has minimal changes compared to original versions of + # git-cvsserver.perl. (Mostly tab vs space after filename.) + + my (@diffCmd) = ( 'diff' ); + if ( exists($state->{opt}{N}) ) { - system("diff -u -L '$filename revision $meta1->{revision}'" . - " -L '$filename " . - ( defined($meta2->{revision}) ? - "revision $meta2->{revision}" : - "working copy" ) . - "' $file1 $file2 > $filediff" ); - } else { - system("diff $file1 $file2 > $filediff"); + push @diffCmd,"-N"; } + if ( exists $state->{opt}{u} ) + { + push @diffCmd,("-u","-L"); + if( $meta1->{filehash} eq "deleted" ) + { + push @diffCmd,"/dev/null"; + } else { + push @diffCmd,("$argFilename\trevision $meta1->{revision}"); + } - while ( <$fh> ) + if( defined($meta2->{filehash}) ) + { + if( $meta2->{filehash} eq "deleted" ) + { + push @diffCmd,("-L","/dev/null"); + } else { + push @diffCmd,("-L", + "$argFilename\trevision $meta2->{revision}"); + } + } else { + push @diffCmd,("-L","$argFilename\tworking copy"); + } + } + push @diffCmd,($file1,$file2); + if(!open(DIFF,"-|",@diffCmd)) { - print "M $_"; + $log->warn("Unable to run diff: $!"); } - close $fh; + my($diffLine); + while(defined($diffLine=<DIFF>)) + { + print "M $diffLine"; + $foundDiff=1; + } + close(DIFF); } - print "ok\n"; + if($foundDiff) + { + print "error \n"; + } + else + { + print "ok\n"; + } } sub req_log @@ -2098,7 +2426,7 @@ sub argsplit $opt = { A => 0, N => 0, P => 0, R => 0, c => 0, f => 0, l => 0, n => 0, p => 0, s => 0, r => 1, D => 1, d => 1, k => 1, j => 1, } if ( $type eq "co" ); $opt = { v => 0, l => 0, R => 0 } if ( $type eq "status" ); $opt = { A => 0, P => 0, C => 0, d => 0, f => 0, l => 0, R => 0, p => 0, k => 1, r => 1, D => 1, j => 1, I => 1, W => 1 } if ( $type eq "update" ); - $opt = { l => 0, R => 0, k => 1, D => 1, D => 1, r => 2 } if ( $type eq "diff" ); + $opt = { l => 0, R => 0, k => 1, D => 1, D => 1, r => 2, N => 0 } if ( $type eq "diff" ); $opt = { c => 0, R => 0, l => 0, f => 0, F => 1, m => 1, r => 1 } if ( $type eq "ci" ); $opt = { k => 1, m => 1 } if ( $type eq "add" ); $opt = { f => 0, l => 0, R => 0 } if ( $type eq "remove" ); @@ -2164,62 +2492,335 @@ sub argsplit } } -# This method uses $state->{directory} to populate $state->{args} with a list of filenames -sub argsfromdir +# Used by argsfromdir +sub expandArg { - my $updater = shift; + my ($updater,$outNameMap,$outDirMap,$path,$isDir) = @_; - $state->{args} = [] if ( scalar(@{$state->{args}}) == 1 and $state->{args}[0] eq "." ); + my $fullPath = filecleanup($path); - return if ( scalar ( @{$state->{args}} ) > 1 ); + # Is it a directory? + if( defined($state->{dirMap}{$fullPath}) || + defined($state->{dirMap}{"$fullPath/"}) ) + { + # It is a directory in the user's sandbox. + $isDir=1; - my @gethead = @{$updater->gethead}; + if(defined($state->{entries}{$fullPath})) + { + $log->fatal("Inconsistent file/dir type"); + die "Inconsistent file/dir type"; + } + } + elsif(defined($state->{entries}{$fullPath})) + { + # It is a file in the user's sandbox. + $isDir=0; + } + my($revDirMap,$otherRevDirMap); + if(!defined($isDir) || $isDir) + { + # Resolve version tree for sticky tag: + # (for now we only want list of files for the version, not + # particular versions of those files: assume it is a directory + # for the moment; ignore Entry's stick tag) + + # Order of precedence of sticky tags: + # -A [head] + # -r /tag/ + # [file entry sticky tag, but that is only relevant to files] + # [the tag specified in dir req_Sticky] + # [the tag specified in a parent dir req_Sticky] + # [head] + # Also, -r may appear twice (for diff). + # + # FUTURE: When/if -j (merges) are supported, we also + # need to add relevant files from one or two + # versions specified with -j. + + if(exists($state->{opt}{A})) + { + $revDirMap=$updater->getRevisionDirMap(); + } + elsif( defined($state->{opt}{r}) and + ref $state->{opt}{r} eq "ARRAY" ) + { + $revDirMap=$updater->getRevisionDirMap($state->{opt}{r}[0]); + $otherRevDirMap=$updater->getRevisionDirMap($state->{opt}{r}[1]); + } + elsif(defined($state->{opt}{r})) + { + $revDirMap=$updater->getRevisionDirMap($state->{opt}{r}); + } + else + { + my($sticky)=getDirStickyInfo($fullPath); + $revDirMap=$updater->getRevisionDirMap($sticky->{tag}); + } - # push added files - foreach my $file (keys %{$state->{entries}}) { - if ( exists $state->{entries}{$file}{revision} && - $state->{entries}{$file}{revision} eq '0' ) - { - push @gethead, { name => $file, filehash => 'added' }; - } + # Is it a directory? + if( defined($revDirMap->{$fullPath}) || + defined($otherRevDirMap->{$fullPath}) ) + { + $isDir=1; + } } - if ( scalar(@{$state->{args}}) == 1 ) + # What to do with it? + if(!$isDir) + { + $outNameMap->{$fullPath}=1; + } + else { - my $arg = $state->{args}[0]; - $arg .= $state->{prependdir} if ( defined ( $state->{prependdir} ) ); + $outDirMap->{$fullPath}=1; - $log->info("Only one arg specified, checking for directory expansion on '$arg'"); + if(defined($revDirMap->{$fullPath})) + { + addDirMapFiles($updater,$outNameMap,$outDirMap, + $revDirMap->{$fullPath}); + } + if( defined($otherRevDirMap) && + defined($otherRevDirMap->{$fullPath}) ) + { + addDirMapFiles($updater,$outNameMap,$outDirMap, + $otherRevDirMap->{$fullPath}); + } + } +} + +# Used by argsfromdir +# Add entries from dirMap to outNameMap. Also recurse into entries +# that are subdirectories. +sub addDirMapFiles +{ + my($updater,$outNameMap,$outDirMap,$dirMap)=@_; - foreach my $file ( @gethead ) + my($fullName); + foreach $fullName (keys(%$dirMap)) + { + my $cleanName=$fullName; + if(defined($state->{prependdir})) { - next if ( $file->{filehash} eq "deleted" and not defined ( $state->{entries}{$file->{name}} ) ); - next unless ( $file->{name} =~ /^$arg\// or $file->{name} eq $arg ); - push @{$state->{args}}, $file->{name}; + if(!($cleanName=~s/^\Q$state->{prependdir}\E//)) + { + $log->fatal("internal error stripping prependdir"); + die "internal error stripping prependdir"; + } } - shift @{$state->{args}} if ( scalar(@{$state->{args}}) > 1 ); - } else { - $log->info("Only one arg specified, populating file list automatically"); + if($dirMap->{$fullName} eq "F") + { + $outNameMap->{$cleanName}=1; + } + elsif($dirMap->{$fullName} eq "D") + { + if(!$state->{opt}{l}) + { + expandArg($updater,$outNameMap,$outDirMap,$cleanName,1); + } + } + else + { + $log->fatal("internal error in addDirMapFiles"); + die "internal error in addDirMapFiles"; + } + } +} + +# This method replaces $state->{args} with a directory-expanded +# list of all relevant filenames (recursively unless -d), based +# on $state->{entries}, and the "current" list of files in +# each directory. "Current" files as determined by +# either the requested (-r/-A) or "req_Sticky" version of +# that directory. +# Both the input args and the new output args are relative +# to the cvs-client's CWD, although some of the internal +# computations are relative to the top of the project. +sub argsfromdir +{ + my $updater = shift; + + # Notes about requirements for specific callers: + # update # "standard" case (entries; a single -r/-A/default; -l) + # # Special case: -d for create missing directories. + # diff # 0 or 1 -r's: "standard" case. + # # 2 -r's: We could ignore entries (just use the two -r's), + # # but it doesn't really matter. + # annotate # "standard" case + # log # Punting: log -r has a more complex non-"standard" + # # meaning, and we don't currently try to support log'ing + # # branches at all (need a lot of work to + # # support CVS-consistent branch relative version + # # numbering). +#HERE: But we still want to expand directories. Maybe we should +# essentially force "-A". + # status # "standard", except that -r/-A/default are not possible. + # # Mostly only used to expand entries only) + # + # Don't use argsfromdir at all: + # add # Explicit arguments required. Directory args imply add + # # the directory itself, not the files in it. + # co # Obtain list directly. + # remove # HERE: TEST: MAYBE client does the recursion for us, + # # since it only makes sense to remove stuff already in + # # the sandobx? + # ci # HERE: Similar to remove... + # # Don't try to implement the confusing/weird + # # ci -r bug er.."feature". + + if(scalar(@{$state->{args}})==0) + { + $state->{args} = [ "." ]; + } + my %allArgs; + my %allDirs; + for my $file (@{$state->{args}}) + { + expandArg($updater,\%allArgs,\%allDirs,$file); + } + + # Include any entries from sandbox. Generally client won't + # send entries that shouldn't be used. + foreach my $file (keys %{$state->{entries}}) + { + $allArgs{remove_prependdir($file)} = 1; + } - $state->{args} = []; + $state->{dirArgs} = \%allDirs; + $state->{args} = [ + sort { + # Sort priority: by directory depth, then actual file name: + my @piecesA=split('/',$a); + my @piecesB=split('/',$b); - foreach my $file ( @gethead ) + my $count=scalar(@piecesA); + my $tmp=scalar(@piecesB); + return $count<=>$tmp if($count!=$tmp); + + for($tmp=0;$tmp<$count;$tmp++) + { + if($piecesA[$tmp] ne $piecesB[$tmp]) + { + return $piecesA[$tmp] cmp $piecesB[$tmp] + } + } + return 0; + } keys(%allArgs) ]; +} + +## look up directory sticky tag, of either fullPath or a parent: +sub getDirStickyInfo +{ + my($fullPath)=@_; + + $fullPath=~s%/+$%%; + while($fullPath ne "" && !defined($state->{dirMap}{"$fullPath/"})) + { + $fullPath=~s%/?[^/]*$%%; + } + + if( !defined($state->{dirMap}{"$fullPath/"}) && + ( $fullPath eq "" || + $fullPath eq "." ) ) + { + return $state->{dirMap}{""}{stickyInfo}; + } + else + { + return $state->{dirMap}{"$fullPath/"}{stickyInfo}; + } +} + +# Resolve precedence of various ways of specifying which version of +# a file you want. Returns undef (for default head), or a ref to a hash +# that contains "tag" and/or "date" keys. +sub resolveStickyInfo +{ + my($filename,$stickyTag,$stickyDate,$reset) = @_; + + # Order of precedence of sticky tags: + # -A [head] + # -r /tag/ + # [file entry sticky tag] + # [the tag specified in dir req_Sticky] + # [the tag specified in a parent dir req_Sticky] + # [head] + + my $result; + if($reset) + { + # $result=undef; + } + elsif( defined($stickyTag) && $stickyTag ne "" ) + # || ( defined($stickyDate) && $stickyDate ne "" ) # TODO + { + $result={ 'tag' => (defined($stickyTag)?$stickyTag:undef) }; + + # TODO: Convert -D value into the form 2011.04.10.04.46.57, + # similar to an entry line's sticky date, without the D prefix. + # It sometimes (always?) arrives as something more like + # '10 Apr 2011 04:46:57 -0000'... + # $result={ 'date' => (defined($stickyDate)?$stickyDate:undef) }; + } + elsif( defined($state->{entries}{$filename}) && + defined($state->{entries}{$filename}{tag_or_date}) && + $state->{entries}{$filename}{tag_or_date} ne "" ) + { + my($tagOrDate)=$state->{entries}{$filename}{tag_or_date}; + if($tagOrDate=~/^T([^ ]+)\s*$/) { - next if ( $file->{filehash} eq "deleted" and not defined ( $state->{entries}{$file->{name}} ) ); - next unless ( $file->{name} =~ s/^$state->{prependdir}// ); - push @{$state->{args}}, $file->{name}; + $result = { 'tag' => $1 }; + } + elsif($tagOrDate=~/^D([0-9.]+)\s*$/) + { + $result= { 'date' => $1 }; + } + else + { + die "Unknown tag_or_date format\n"; } } + else + { + $result=getDirStickyInfo($filename); + } + + return $result; +} + +# Convert a stickyInfo (ref to a hash) as returned by resolveStickyInfo into +# a form appropriate for the sticky tag field of an Entries +# line (field index 5, 0-based). +sub getStickyTagOrDate +{ + my($stickyInfo)=@_; + + my $result; + if(defined($stickyInfo) && defined($stickyInfo->{tag})) + { + $result="T$stickyInfo->{tag}"; + } + # TODO: When/if we actually pick versions by {date} properly, + # also handle it here: + # "D$stickyInfo->{date}" (example: "D2011.04.13.20.37.07"). + else + { + $result=""; + } + + return $result; } # This method cleans up the $state variable after a command that uses arguments has run sub statecleanup { $state->{files} = []; + $state->{dirArgs} = {}; $state->{args} = []; $state->{arguments} = []; $state->{entries} = {}; + $state->{dirMap} = {}; } # Return working directory CVS revision "1.X" out @@ -2309,6 +2910,9 @@ sub filenamesplit return ( $filepart, $dirpart ); } +# Cleanup various junk in filename (try to canonicalize it), and +# add prependdir to accomodate running CVS client from a +# subdirectory (so the output is relative to top directory of the project). sub filecleanup { my $filename = shift; @@ -2320,11 +2924,36 @@ sub filecleanup return undef; } + if($filename eq ".") + { + $filename=""; + } $filename =~ s/^\.\///g; + $filename =~ s%/+%/%g; $filename = $state->{prependdir} . $filename; + $filename =~ s%/$%%; return $filename; } +# Remove prependdir from the path, so that is is relative to the directory +# the CVS client was started from, rather than the top of the project. +# Essentially the inverse of filecleanup(). +sub remove_prependdir +{ + my($path) = @_; + if(defined($state->{prependdir}) && $state->{prependdir} ne "") + { + my($pre)=$state->{prependdir}; + $pre=~s%/$%%; + if(!($path=~s%^\Q$pre\E/?%%)) + { + $log->fatal("internal error missing prependdir"); + die("internal error missing prependdir"); + } + } + return $path; +} + sub validateGitDir { if( !defined($state->{CVSROOT}) ) @@ -2738,6 +3367,45 @@ sub descramble return $ret; } +# Test if the (deep) values of two references to a hash are the same. +sub refHashEqual +{ + my($v1,$v2) = @_; + + my $out; + if(!defined($v1)) + { + if(!defined($v2)) + { + $out=1; + } + } + elsif( !defined($v2) || + scalar(keys(%{$v1})) != scalar(keys(%{$v2})) ) + { + # $out=undef; + } + else + { + $out=1; + + my $key; + foreach $key (keys(%{$v1})) + { + if( !exists($v2->{$key}) || + defined($v1->{$key}) ne defined($v2->{$key}) || + ( defined($v1->{$key}) && + $v1->{$key} ne $v2->{$key} ) ) + { + $out=undef; + last; + } + } + } + + return $out; +} + package GITCVS::log; @@ -2958,6 +3626,9 @@ sub new die "Git repo '$self->{git_path}' doesn't exist" unless ( -d $self->{git_path} ); + # Stores full sha1's for various branch/tag names, abbreviations, etc: + $self->{commitRefCache} = {}; + $self->{dbdriver} = $cfg->{gitcvs}{$state->{method}}{dbdriver} || $cfg->{gitcvs}{dbdriver} || "SQLite"; $self->{dbname} = $cfg->{gitcvs}{$state->{method}}{dbname} || @@ -3140,6 +3811,8 @@ sub update my $lastcommit = $self->_get_prop("last_commit"); if (defined $lastcommit && $lastcommit eq $commitsha1) { # up-to-date + # invalidate the gethead cache + $self->clearCommitRefCaches(); return 1; } @@ -3157,45 +3830,10 @@ sub update push @git_log_params, $self->{module}; } # git-rev-list is the backend / plumbing version of git-log - open(GITLOG, '-|', 'git', 'rev-list', @git_log_params) or die "Cannot call git-rev-list: $!"; - - my @commits; - - my %commit = (); - - while ( <GITLOG> ) - { - chomp; - if (m/^commit\s+(.*)$/) { - # on ^commit lines put the just seen commit in the stack - # and prime things for the next one - if (keys %commit) { - my %copy = %commit; - unshift @commits, \%copy; - %commit = (); - } - my @parents = split(m/\s+/, $1); - $commit{hash} = shift @parents; - $commit{parents} = \@parents; - } elsif (m/^(\w+?):\s+(.*)$/ && !exists($commit{message})) { - # on rfc822-like lines seen before we see any message, - # lowercase the entry and put it in the hash as key-value - $commit{lc($1)} = $2; - } else { - # message lines - skip initial empty line - # and trim whitespace - if (!exists($commit{message}) && m/^\s*$/) { - # define it to mark the end of headers - $commit{message} = ''; - next; - } - s/^\s+//; s/\s+$//; # trim ws - $commit{message} .= $_ . "\n"; - } - } - close GITLOG; - - unshift @commits, \%commit if ( keys %commit ); + open(my $gitLogPipe, '-|', 'git', 'rev-list', @git_log_params) + or die "Cannot call git-rev-list: $!"; + my @commits=readCommits($gitLogPipe); + close $gitLogPipe; # Now all the commits are in the @commits bucket # ordered by time DESC. for each commit that needs processing, @@ -3294,7 +3932,7 @@ sub update } # convert the date to CVS-happy format - $commit->{date} = "$2 $1 $4 $3 $5" if ( $commit->{date} =~ /^\w+\s+(\w+)\s+(\d+)\s+(\d+:\d+:\d+)\s+(\d+)\s+([+-]\d+)$/ ); + my $cvsDate = convertToCvsDate($commit->{date}); if ( defined ( $lastpicked ) ) { @@ -3303,7 +3941,7 @@ sub update while ( <FILELIST> ) { chomp; - unless ( /^:\d{6}\s+\d{3}(\d)\d{2}\s+[a-zA-Z0-9]{40}\s+([a-zA-Z0-9]{40})\s+(\w)$/o ) + unless ( /^:\d{6}\s+([0-7]{6})\s+[a-f0-9]{40}\s+([a-f0-9]{40})\s+(\w)$/o ) { die("Couldn't process git-diff-tree line : $_"); } @@ -3313,11 +3951,7 @@ sub update # $log->debug("File mode=$mode, hash=$hash, change=$change, name=$name"); - my $git_perms = ""; - $git_perms .= "r" if ( $mode & 4 ); - $git_perms .= "w" if ( $mode & 2 ); - $git_perms .= "x" if ( $mode & 1 ); - $git_perms = "rw" if ( $git_perms eq "" ); + my $dbMode = convertToDbMode($mode); if ( $change eq "D" ) { @@ -3327,11 +3961,11 @@ sub update revision => $head->{$name}{revision} + 1, filehash => "deleted", commithash => $commit->{hash}, - modified => $commit->{date}, + modified => $cvsDate, author => $commit->{author}, - mode => $git_perms, + mode => $dbMode, }; - $self->insert_rev($name, $head->{$name}{revision}, $hash, $commit->{hash}, $commit->{date}, $commit->{author}, $git_perms); + $self->insert_rev($name, $head->{$name}{revision}, $hash, $commit->{hash}, $cvsDate, $commit->{author}, $dbMode); } elsif ( $change eq "M" || $change eq "T" ) { @@ -3341,11 +3975,11 @@ sub update revision => $head->{$name}{revision} + 1, filehash => $hash, commithash => $commit->{hash}, - modified => $commit->{date}, + modified => $cvsDate, author => $commit->{author}, - mode => $git_perms, + mode => $dbMode, }; - $self->insert_rev($name, $head->{$name}{revision}, $hash, $commit->{hash}, $commit->{date}, $commit->{author}, $git_perms); + $self->insert_rev($name, $head->{$name}{revision}, $hash, $commit->{hash}, $cvsDate, $commit->{author}, $dbMode); } elsif ( $change eq "A" ) { @@ -3355,11 +3989,11 @@ sub update revision => $head->{$name}{revision} ? $head->{$name}{revision}+1 : 1, filehash => $hash, commithash => $commit->{hash}, - modified => $commit->{date}, + modified => $cvsDate, author => $commit->{author}, - mode => $git_perms, + mode => $dbMode, }; - $self->insert_rev($name, $head->{$name}{revision}, $hash, $commit->{hash}, $commit->{date}, $commit->{author}, $git_perms); + $self->insert_rev($name, $head->{$name}{revision}, $hash, $commit->{hash}, $cvsDate, $commit->{author}, $dbMode); } else { @@ -3382,7 +4016,7 @@ sub update die("Couldn't process git-ls-tree line : $_"); } - my ( $git_perms, $git_type, $git_hash, $git_filename ) = ( $1, $2, $3, $4 ); + my ( $mode, $git_type, $git_hash, $git_filename ) = ( $1, $2, $3, $4 ); $seen_files->{$git_filename} = 1; @@ -3392,18 +4026,10 @@ sub update $head->{$git_filename}{mode} ); - if ( $git_perms =~ /^\d\d\d(\d)\d\d/o ) - { - $git_perms = ""; - $git_perms .= "r" if ( $1 & 4 ); - $git_perms .= "w" if ( $1 & 2 ); - $git_perms .= "x" if ( $1 & 1 ); - } else { - $git_perms = "rw"; - } + my $dbMode = convertToDbMode($mode); # unless the file exists with the same hash, we need to update it ... - unless ( defined($oldhash) and $oldhash eq $git_hash and defined($oldmode) and $oldmode eq $git_perms ) + unless ( defined($oldhash) and $oldhash eq $git_hash and defined($oldmode) and $oldmode eq $dbMode ) { my $newrevision = ( $oldrevision or 0 ) + 1; @@ -3412,13 +4038,13 @@ sub update revision => $newrevision, filehash => $git_hash, commithash => $commit->{hash}, - modified => $commit->{date}, + modified => $cvsDate, author => $commit->{author}, - mode => $git_perms, + mode => $dbMode, }; - $self->insert_rev($git_filename, $newrevision, $git_hash, $commit->{hash}, $commit->{date}, $commit->{author}, $git_perms); + $self->insert_rev($git_filename, $newrevision, $git_hash, $commit->{hash}, $cvsDate, $commit->{author}, $dbMode); } } close FILELIST; @@ -3431,10 +4057,10 @@ sub update $head->{$file}{revision}++; $head->{$file}{filehash} = "deleted"; $head->{$file}{commithash} = $commit->{hash}; - $head->{$file}{modified} = $commit->{date}; + $head->{$file}{modified} = $cvsDate; $head->{$file}{author} = $commit->{author}; - $self->insert_rev($file, $head->{$file}{revision}, $head->{$file}{filehash}, $commit->{hash}, $commit->{date}, $commit->{author}, $head->{$file}{mode}); + $self->insert_rev($file, $head->{$file}{revision}, $head->{$file}{filehash}, $commit->{hash}, $cvsDate, $commit->{author}, $head->{$file}{mode}); } } # END : "Detect deleted files" @@ -3465,13 +4091,94 @@ sub update ); } # invalidate the gethead cache - $self->{gethead_cache} = undef; + $self->clearCommitRefCaches(); # Ending exclusive lock here $self->{dbh}->commit() or die "Failed to commit changes to SQLite"; } +sub readCommits +{ + my $pipeHandle = shift; + my @commits; + + my %commit = (); + + while ( <$pipeHandle> ) + { + chomp; + if (m/^commit\s+(.*)$/) { + # on ^commit lines put the just seen commit in the stack + # and prime things for the next one + if (keys %commit) { + my %copy = %commit; + unshift @commits, \%copy; + %commit = (); + } + my @parents = split(m/\s+/, $1); + $commit{hash} = shift @parents; + $commit{parents} = \@parents; + } elsif (m/^(\w+?):\s+(.*)$/ && !exists($commit{message})) { + # on rfc822-like lines seen before we see any message, + # lowercase the entry and put it in the hash as key-value + $commit{lc($1)} = $2; + } else { + # message lines - skip initial empty line + # and trim whitespace + if (!exists($commit{message}) && m/^\s*$/) { + # define it to mark the end of headers + $commit{message} = ''; + next; + } + s/^\s+//; s/\s+$//; # trim ws + $commit{message} .= $_ . "\n"; + } + } + + unshift @commits, \%commit if ( keys %commit ); + + return @commits; +} + +sub convertToCvsDate +{ + my $date = shift; + # Convert from: "git rev-list --pretty" formatted date + # Convert to: "the format specified by RFC822 as modified by RFC1123." + # Example: 26 May 1997 13:01:40 -0400 + if( $date =~ /^\w+\s+(\w+)\s+(\d+)\s+(\d+:\d+:\d+)\s+(\d+)\s+([+-]\d+)$/ ) + { + $date = "$2 $1 $4 $3 $5"; + } + + return $date; +} + +sub convertToDbMode +{ + my $mode = shift; + + # NOTE: The CVS protocol uses a string similar "u=rw,g=rw,o=rw", + # but the database "mode" column historically (and currently) + # only stores the "rw" (for user) part of the string. + # FUTURE: It might make more sense to persist the raw + # octal mode (or perhaps the final full CVS form) instead of + # this half-converted form, but it isn't currently worth the + # backwards compatibility headaches. + + $mode=~/^\d\d(\d)\d{3}$/; + my $userBits=$1; + + my $dbMode = ""; + $dbMode .= "r" if ( $userBits & 4 ); + $dbMode .= "w" if ( $userBits & 2 ); + $dbMode .= "x" if ( $userBits & 1 ); + $dbMode = "rw" if ( $dbMode eq "" ); + + return $dbMode; +} + sub insert_rev { my $self = shift; @@ -3586,6 +4293,169 @@ sub gethead return $tree; } +=head2 getAnyHead + +Returns a reference to an array of getmeta structures, one +per file in the specified tree hash. + +=cut + +sub getAnyHead +{ + my ($self,$hash) = @_; + + if(!defined($hash)) + { + return $self->gethead(); + } + + my @files; + { + open(my $filePipe, '-|', 'git', 'ls-tree', '-z', '-r', $hash) + or die("Cannot call git-ls-tree : $!"); + local $/ = "\0"; + @files=<$filePipe>; + close $filePipe; + } + + my $tree=[]; + my($line); + foreach $line (@files) + { + $line=~s/\0$//; + unless ( $line=~/^(\d+)\s+(\w+)\s+([a-zA-Z0-9]+)\t(.*)$/o ) + { + die("Couldn't process git-ls-tree line : $_"); + } + + my($mode, $git_type, $git_hash, $git_filename) = ($1, $2, $3, $4); + push @$tree, $self->getMetaFromCommithash($git_filename,$hash); + } + + return $tree; +} + +=head2 getRevisionDirMap + +A "revision dir map" contains all the plain-file filenames associated +with a particular revision (treeish), organized by directory: + + $type = $out->{$dir}{$fullName} + +The type of each is "F" (for ordinary file) or "D" (for directory, +for which the map $out->{$fullName} will also exist). + +=cut + +sub getRevisionDirMap +{ + my ($self,$ver)=@_; + + if(!defined($self->{revisionDirMapCache})) + { + $self->{revisionDirMapCache}={}; + } + + # Get file list (previously cached results are dependent on HEAD, + # but are early in each case): + my $cacheKey; + my (@fileList); + if( !defined($ver) || $ver eq "" ) + { + $cacheKey=""; + if( defined($self->{revisionDirMapCache}{$cacheKey}) ) + { + return $self->{revisionDirMapCache}{$cacheKey}; + } + + my @head = @{$self->gethead()}; + foreach my $file ( @head ) + { + next if ( $file->{filehash} eq "deleted" ); + + push @fileList,$file->{name}; + } + } + else + { + my ($hash)=$self->lookupCommitRef($ver); + if( !defined($hash) ) + { + return undef; + } + + $cacheKey=$hash; + if( defined($self->{revisionDirMapCache}{$cacheKey}) ) + { + return $self->{revisionDirMapCache}{$cacheKey}; + } + + open(my $filePipe, '-|', 'git', 'ls-tree', '-z', '-r', $hash) + or die("Cannot call git-ls-tree : $!"); + local $/ = "\0"; + while ( <$filePipe> ) + { + chomp; + unless ( /^(\d+)\s+(\w+)\s+([a-zA-Z0-9]+)\t(.*)$/o ) + { + die("Couldn't process git-ls-tree line : $_"); + } + + my($mode, $git_type, $git_hash, $git_filename) = ($1, $2, $3, $4); + + push @fileList, $git_filename; + } + close $filePipe; + } + + # Convert to normalized form: + my %revMap; + my $file; + foreach $file (@fileList) + { + my($dir) = ($file=~m%^(?:(.*)/)?([^/]*)$%); + $dir='' if(!defined($dir)); + + # parent directories: + # ... create empty dir maps for parent dirs: + my($td)=$dir; + while(!defined($revMap{$td})) + { + $revMap{$td}={}; + + my($tp)=($td=~m%^(?:(.*)/)?([^/]*)$%); + $tp='' if(!defined($tp)); + $td=$tp; + } + # ... add children to parent maps (now that they exist): + $td=$dir; + while($td ne "") + { + my($tp)=($td=~m%^(?:(.*)/)?([^/]*)$%); + $tp='' if(!defined($tp)); + + if(defined($revMap{$tp}{$td})) + { + if($revMap{$tp}{$td} ne 'D') + { + die "Weird file/directory inconsistency in $cacheKey"; + } + last; # loop exit + } + $revMap{$tp}{$td}='D'; + + $td=$tp; + } + + # file + $revMap{$dir}{$file}='F'; + } + + # Save in cache: + $self->{revisionDirMapCache}{$cacheKey}=\%revMap; + return $self->{revisionDirMapCache}{$cacheKey}; +} + =head2 getlog See also gethistorydense(). @@ -3646,6 +4516,19 @@ sub getlog This function takes a filename (with path) argument and returns a hashref of metadata for that file. +There are several ways $revision can be specified: + + - A reference to hash that contains a "tag" that is the + actual revision (one of the below). TODO: Also allow it to + specify a "date" in the hash. + - undef, to refer to the latest version on the main branch. + - Full CVS client revision number (mapped to integer in DB, without the + "1." prefix), + - Complex CVS-compatible "special" revision number for + non-linear history (see comment below) + - git commit sha1 hash + - branch or tag name + =cut sub getmeta @@ -3656,23 +4539,144 @@ sub getmeta my $tablename_rev = $self->tablename("revision"); my $tablename_head = $self->tablename("head"); - my $db_query; - if ( defined($revision) and $revision =~ /^1\.(\d+)$/ ) + if ( ref($revision) eq "HASH" ) { - my ($intRev) = $1; - $db_query = $self->{dbh}->prepare_cached("SELECT * FROM $tablename_rev WHERE name=? AND revision=?",{},1); - $db_query->execute($filename, $intRev); + $revision = $revision->{tag}; } - elsif ( defined($revision) and $revision =~ /^[a-zA-Z0-9]{40}$/ ) + + # Overview of CVS revision numbers: + # + # General CVS numbering scheme: + # - Basic mainline branch numbers: "1.1", "1.2", "1.3", etc. + # - Result of "cvs checkin -r" (possible, but not really + # recommended): "2.1", "2.2", etc + # - Branch tag: "1.2.0.n", where "1.2" is revision it was branched + # from, "0" is a magic placeholder that identifies it as a + # branch tag instead of a version tag, and n is 2 times the + # branch number off of "1.2", starting with "2". + # - Version on a branch: "1.2.n.x", where "1.2" is branch-from, "n" + # is branch number off of "1.2" (like n above), and "x" is + # the version number on the branch. + # - Branches can branch off of branches: "1.3.2.7.4.1" (even number + # of components). + # - Odd "n"s are used by "vendor branches" that result + # from "cvs import". Vendor branches have additional + # strangeness in the sense that the main rcs "head" of the main + # branch will (temporarily until first normal commit) point + # to the version on the vendor branch, rather than the actual + # main branch. (FUTURE: This may provide an opportunity + # to use "strange" revision numbers for fast-forward-merged + # branch tip when CVS client is asking for the main branch.) + # + # git-cvsserver CVS-compatible special numbering schemes: + # - Currently git-cvsserver only tries to be identical to CVS for + # simple "1.x" numbers on the "main" branch (as identified + # by the module name that was originally cvs checkout'ed). + # - The database only stores the "x" part, for historical reasons. + # But most of the rest of the cvsserver preserves + # and thinks using the full revision number. + # - To handle non-linear history, it uses a version of the form + # "2.1.1.2000.b.b.b."..., where the 2.1.1.2000 is to help uniquely + # identify this as a special revision number, and there are + # 20 b's that together encode the sha1 git commit from which + # this version of this file originated. Each b is + # the numerical value of the corresponding byte plus + # 100. + # - "plus 100" avoids "0"s, and also reduces the + # likelyhood of a collision in the case that someone someday + # writes an import tool that tries to preserve original + # CVS revision numbers, and the original CVS data had done + # lots of branches off of branches and other strangeness to + # end up with a real version number that just happens to look + # like this special revision number form. Also, if needed + # there are several ways to extend/identify alternative encodings + # within the "2.1.1.2000" part if necessary. + # - Unlike real CVS revisions, you can't really reconstruct what + # relation a revision of this form has to other revisions. + # - FUTURE: TODO: Rework database somehow to make up and remember + # fully-CVS-compatible branches and branch version numbers. + + my $meta; + if ( defined($revision) ) { - $db_query = $self->{dbh}->prepare_cached("SELECT * FROM $tablename_rev WHERE name=? AND commithash=?",{},1); - $db_query->execute($filename, $revision); - } else { - $db_query = $self->{dbh}->prepare_cached("SELECT * FROM $tablename_head WHERE name=?",{},1); + if ( $revision =~ /^1\.(\d+)$/ ) + { + my ($intRev) = $1; + my $db_query; + $db_query = $self->{dbh}->prepare_cached( + "SELECT * FROM $tablename_rev WHERE name=? AND revision=?", + {},1); + $db_query->execute($filename, $intRev); + $meta = $db_query->fetchrow_hashref; + } + elsif ( $revision =~ /^2\.1\.1\.2000(\.[1-3][0-9][0-9]){20}$/ ) + { + my ($commitHash)=($revision=~/^2\.1\.1\.2000(.*)$/); + $commitHash=~s/\.([0-9]+)/sprintf("%02x",$1-100)/eg; + if($commitHash=~/^[0-9a-f]{40}$/) + { + return $self->getMetaFromCommithash($filename,$commitHash); + } + + # error recovery: fall back on head version below + print "E Failed to find $filename version=$revision or commit=$commitHash\n"; + $log->warning("failed get $revision with commithash=$commitHash"); + undef $revision; + } + elsif ( $revision =~ /^[0-9a-f]{40}$/ ) + { + # Try DB first. This is mostly only useful for req_annotate(), + # which only calls this for stuff that should already be in + # the DB. It is fairly likely to be a waste of time + # in most other cases [unless the file happened to be + # modified in $revision specifically], but + # it is probably in the noise compared to how long + # getMetaFromCommithash() will take. + my $db_query; + $db_query = $self->{dbh}->prepare_cached( + "SELECT * FROM $tablename_rev WHERE name=? AND commithash=?", + {},1); + $db_query->execute($filename, $revision); + $meta = $db_query->fetchrow_hashref; + + if(! $meta) + { + my($revCommit)=$self->lookupCommitRef($revision); + if($revCommit=~/^[0-9a-f]{40}$/) + { + return $self->getMetaFromCommithash($filename,$revCommit); + } + + # error recovery: nothing found: + print "E Failed to find $filename version=$revision\n"; + $log->warning("failed get $revision"); + return $meta; + } + } + else + { + my($revCommit)=$self->lookupCommitRef($revision); + if($revCommit=~/^[0-9a-f]{40}$/) + { + return $self->getMetaFromCommithash($filename,$revCommit); + } + + # error recovery: fall back on head version below + print "E Failed to find $filename version=$revision\n"; + $log->warning("failed get $revision"); + undef $revision; # Allow fallback + } + } + + if(!defined($revision)) + { + my $db_query; + $db_query = $self->{dbh}->prepare_cached( + "SELECT * FROM $tablename_head WHERE name=?",{},1); $db_query->execute($filename); + $meta = $db_query->fetchrow_hashref; } - my $meta = $db_query->fetchrow_hashref; if($meta) { $meta->{revision} = "1.$meta->{revision}"; @@ -3680,6 +4684,204 @@ sub getmeta return $meta; } +sub getMetaFromCommithash +{ + my $self = shift; + my $filename = shift; + my $revCommit = shift; + + # NOTE: This function doesn't scale well (lots of forks), especially + # if you have many files that have not been modified for many commits + # (each git-rev-parse redoes a lot of work for each file + # that theoretically could be done in parallel by smarter + # graph traversal). + # + # TODO: Possible optimization strategies: + # - Solve the issue of assigning and remembering "real" CVS + # revision numbers for branches, and ensure the + # data structure can do this efficiently. Perhaps something + # similar to "git notes", and carefully structured to take + # advantage same-sha1-is-same-contents, to roll the same + # unmodified subdirectory data onto multiple commits? + # - Write and use a C tool that is like git-blame, but + # operates on multiple files with file granularity, instead + # of one file with line granularity. Cache + # most-recently-modified in $self->{commitRefCache}{$revCommit}. + # Try to be intelligent about how many files we do with + # one fork (perhaps one directory at a time, without recursion, + # and/or include directory as one line item, recurse from here + # instead of in C tool?). + # - Perhaps we could ask the DB for (filename,fileHash), + # and just guess that it is correct (that the file hadn't + # changed between $revCommit and the found commit, then + # changed back, confusing anything trying to interpret + # history). Probably need to add another index to revisions + # DB table for this. + # - NOTE: Trying to store all (commit,file) keys in DB [to + # find "lastModfiedCommit] (instead of + # just files that changed in each commit as we do now) is + # probably not practical from a disk space perspective. + + # Does the file exist in $revCommit? + # TODO: Include file hash in dirmap cache. + my($dirMap)=$self->getRevisionDirMap($revCommit); + my($dir,$file)=($filename=~m%^(?:(.*)/)?([^/]*$)%); + if(!defined($dir)) + { + $dir=""; + } + if( !defined($dirMap->{$dir}) || + !defined($dirMap->{$dir}{$filename}) ) + { + my($fileHash)="deleted"; + + my($retVal)={}; + $retVal->{name}=$filename; + $retVal->{filehash}=$fileHash; + + # not needed and difficult to compute: + $retVal->{revision}="0"; # $revision; + $retVal->{commithash}=$revCommit; + #$retVal->{author}=$commit->{author}; + #$retVal->{modified}=convertToCvsDate($commit->{date}); + #$retVal->{mode}=convertToDbMode($mode); + + return $retVal; + } + + my($fileHash)=safe_pipe_capture("git","rev-parse","$revCommit:$filename"); + chomp $fileHash; + if(!($fileHash=~/^[0-9a-f]{40}$/)) + { + die "Invalid fileHash '$fileHash' looking up" + ." '$revCommit:$filename'\n"; + } + + # information about most recent commit to modify $filename: + open(my $gitLogPipe, '-|', 'git', 'rev-list', + '--max-count=1', '--pretty', '--parents', + $revCommit, '--', $filename) + or die "Cannot call git-rev-list: $!"; + my @commits=readCommits($gitLogPipe); + close $gitLogPipe; + if(scalar(@commits)!=1) + { + die "Can't find most recent commit changing $filename\n"; + } + my($commit)=$commits[0]; + if( !defined($commit) || !defined($commit->{hash}) ) + { + return undef; + } + + # does this (commit,file) have a real assigned CVS revision number? + my $tablename_rev = $self->tablename("revision"); + my $db_query; + $db_query = $self->{dbh}->prepare_cached( + "SELECT * FROM $tablename_rev WHERE name=? AND commithash=?", + {},1); + $db_query->execute($filename, $commit->{hash}); + my($meta)=$db_query->fetchrow_hashref; + if($meta) + { + $meta->{revision} = "1.$meta->{revision}"; + return $meta; + } + + # fall back on special revision number + my($revision)=$commit->{hash}; + $revision=~s/(..)/'.' . (hex($1)+100)/eg; + $revision="2.1.1.2000$revision"; + + # meta data about $filename: + open(my $filePipe, '-|', 'git', 'ls-tree', '-z', + $commit->{hash}, '--', $filename) + or die("Cannot call git-ls-tree : $!"); + local $/ = "\0"; + my $line; + $line=<$filePipe>; + if(defined(<$filePipe>)) + { + die "Expected only a single file for git-ls-tree $filename\n"; + } + close $filePipe; + + chomp $line; + unless ( $line=~m/^(\d+)\s+(\w+)\s+([a-zA-Z0-9]+)\t(.*)$/o ) + { + die("Couldn't process git-ls-tree line : $line\n"); + } + my ( $mode, $git_type, $git_hash, $git_filename ) = ( $1, $2, $3, $4 ); + + # save result: + my($retVal)={}; + $retVal->{name}=$filename; + $retVal->{revision}=$revision; + $retVal->{filehash}=$fileHash; + $retVal->{commithash}=$revCommit; + $retVal->{author}=$commit->{author}; + $retVal->{modified}=convertToCvsDate($commit->{date}); + $retVal->{mode}=convertToDbMode($mode); + + return $retVal; +} + +=head2 lookupCommitRef + +Convert tag/branch/abbreviation/etc into a commit sha1 hash. Caches +the result so looking it up again is fast. + +=cut + +sub lookupCommitRef +{ + my $self = shift; + my $ref = shift; + + my $commitHash = $self->{commitRefCache}{$ref}; + if(defined($commitHash)) + { + return $commitHash; + } + + $commitHash=safe_pipe_capture("git","rev-parse","--verify","--quiet", + $self->unescapeRefName($ref)); + $commitHash=~s/\s*$//; + if(!($commitHash=~/^[0-9a-f]{40}$/)) + { + $commitHash=undef; + } + + if( defined($commitHash) ) + { + my $type=safe_pipe_capture("git","cat-file","-t",$commitHash); + if( ! ($type=~/^commit\s*$/ ) ) + { + $commitHash=undef; + } + } + if(defined($commitHash)) + { + $self->{commitRefCache}{$ref}=$commitHash; + } + return $commitHash; +} + +=head2 clearCommitRefCaches + +Clears cached commit cache (sha1's for various tags/abbeviations/etc), +and related caches. + +=cut + +sub clearCommitRefCaches +{ + my $self = shift; + $self->{commitRefCache} = {}; + $self->{revisionDirMapCache} = undef; + $self->{gethead_cache} = undef; +} + =head2 commitmessage this function takes a commithash and returns the commit message for that commit @@ -3745,6 +4947,97 @@ sub gethistorydense return $result; } +=head2 escapeRefName + +Apply an escape mechanism to compensate for characters that +git ref names can have that CVS tags can not. + +=cut +sub escapeRefName +{ + my($self,$refName)=@_; + + # CVS officially only allows [-_A-Za-z0-9] in tag names (or in + # many contexts it can also be a CVS revision number). + # + # Git tags commonly use '/' and '.' as well, but also handle + # anything else just in case: + # + # = "_-s-" For '/'. + # = "_-p-" For '.'. + # = "_-u-" For underscore, in case someone wants a literal "_-" in + # a tag name. + # = "_-xx-" Where "xx" is the hexadecimal representation of the + # desired ASCII character byte. (for anything else) + + if(! $refName=~/^[1-9][0-9]*(\.[1-9][0-9]*)*$/) + { + $refName=~s/_-/_-u--/g; + $refName=~s/\./_-p-/g; + $refName=~s%/%_-s-%g; + $refName=~s/[^-_a-zA-Z0-9]/sprintf("_-%02x-",$1)/eg; + } +} + +=head2 unescapeRefName + +Undo an escape mechanism to compensate for characters that +git ref names can have that CVS tags can not. + +=cut +sub unescapeRefName +{ + my($self,$refName)=@_; + + # see escapeRefName() for description of escape mechanism. + + $refName=~s/_-([spu]|[0-9a-f][0-9a-f])-/unescapeRefNameChar($1)/eg; + + # allowed tag names + # TODO: Perhaps use git check-ref-format, with an in-process cache of + # validated names? + if( !( $refName=~m%^[^-][-a-zA-Z0-9_/.]*$% ) || + ( $refName=~m%[/.]$% ) || + ( $refName=~/\.lock$/ ) || + ( $refName=~m%\.\.|/\.|[[\\:?*~]|\@\{% ) ) # matching } + { + # Error: + $log->warn("illegal refName: $refName"); + $refName=undef; + } + return $refName; +} + +sub unescapeRefNameChar +{ + my($char)=@_; + + if($char eq "s") + { + $char="/"; + } + elsif($char eq "p") + { + $char="."; + } + elsif($char eq "u") + { + $char="_"; + } + elsif($char=~/^[0-9a-f][0-9a-f]$/) + { + $char=chr(hex($char)); + } + else + { + # Error case: Maybe it has come straight from user, and + # wasn't supposed to be escaped? Restore it the way we got it: + $char="_-$char-"; + } + + return $char; +} + =head2 in_array() from Array::PAT - mimics the in_array() function diff --git a/git-difftool--helper.sh b/git-difftool--helper.sh index 3d0fe0cd93..b00ed95dba 100755 --- a/git-difftool--helper.sh +++ b/git-difftool--helper.sh @@ -40,7 +40,7 @@ launch_merge_tool () { # the user with the real $MERGED name before launching $merge_tool. if should_prompt then - printf "\nViewing: '$MERGED'\n" + printf "\nViewing: '%s'\n" "$MERGED" if use_ext_cmd then printf "Launch '%s' [Y/n]: " \ diff --git a/git-difftool.perl b/git-difftool.perl index edd0493a08..12231fbc67 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -59,57 +59,16 @@ sub find_worktree return $worktree; } -sub filter_tool_scripts -{ - my ($tools) = @_; - if (-d $_) { - if ($_ ne ".") { - # Ignore files in subdirectories - $File::Find::prune = 1; - } - } else { - if ((-f $_) && ($_ ne "defaults")) { - push(@$tools, $_); - } - } -} - sub print_tool_help { - my ($cmd, @found, @notfound, @tools); - my $gitpath = Git::exec_path(); - - find(sub { filter_tool_scripts(\@tools) }, "$gitpath/mergetools"); - - foreach my $tool (@tools) { - $cmd = "TOOL_MODE=diff"; - $cmd .= ' && . "$(git --exec-path)/git-mergetool--lib"'; - $cmd .= " && get_merge_tool_path $tool >/dev/null 2>&1"; - $cmd .= " && can_diff >/dev/null 2>&1"; - if (system('sh', '-c', $cmd) == 0) { - push(@found, $tool); - } else { - push(@notfound, $tool); - } - } - - print << 'EOF'; -'git difftool --tool=<tool>' may be set to one of the following: -EOF - print "\t$_\n" for (sort(@found)); + my $cmd = 'TOOL_MODE=diff'; + $cmd .= ' && . "$(git --exec-path)/git-mergetool--lib"'; + $cmd .= ' && show_tool_help'; - print << 'EOF'; - -The following tools are valid, but not currently available: -EOF - print "\t$_\n" for (sort(@notfound)); - - print << 'EOF'; - -NOTE: Some of the tools listed above only work in a windowed -environment. If run in a terminal-only session, they will fail. -EOF - exit(0); + # See the comment at the bottom of file_diff() for the reason behind + # using system() followed by exit() instead of exec(). + my $rc = system('sh', '-c', $cmd); + exit($rc | ($rc >> 8)); } sub exit_cleanup @@ -377,7 +336,7 @@ sub main } if ($opts{gui}) { my $guitool = Git::config('diff.guitool'); - if (length($guitool) > 0) { + if (defined($guitool) && length($guitool) > 0) { $ENV{GIT_DIFF_TOOL} = $guitool; } } diff --git a/git-merge-one-file.sh b/git-merge-one-file.sh index f612cb847a..07dfeb8df4 100755 --- a/git-merge-one-file.sh +++ b/git-merge-one-file.sh @@ -18,7 +18,7 @@ USAGE='<orig blob> <our blob> <their blob> <path>' USAGE="$USAGE <orig mode> <our mode> <their mode>" -LONG_USAGE="Usage: git merge-one-file $USAGE +LONG_USAGE="usage: git merge-one-file $USAGE Blob ids and modes should be empty for missing files." @@ -27,7 +27,7 @@ SUBDIRECTORY_OK=Yes cd_to_toplevel require_work_tree -if ! test "$#" -eq 7 +if test $# != 7 then echo "$LONG_USAGE" exit 1 @@ -38,7 +38,8 @@ case "${1:-.}${2:-.}${3:-.}" in # Deleted in both or deleted in one and unchanged in the other # "$1.." | "$1.$1" | "$1$1.") - if [ "$2" ]; then + if test -n "$2" + then echo "Removing $4" else # read-tree checked that index matches HEAD already, @@ -48,7 +49,8 @@ case "${1:-.}${2:-.}${3:-.}" in # we do not have it in the index, though. exec git update-index --remove -- "$4" fi - if test -f "$4"; then + if test -f "$4" + then rm -f -- "$4" && rmdir -p "$(expr "z$4" : 'z\(.*\)/')" 2>/dev/null || : fi && @@ -67,7 +69,7 @@ case "${1:-.}${2:-.}${3:-.}" in echo "Adding $4" if test -f "$4" then - echo "ERROR: untracked $4 is overwritten by the merge." + echo "ERROR: untracked $4 is overwritten by the merge." >&2 exit 1 fi git update-index --add --cacheinfo "$7" "$3" "$4" && @@ -78,9 +80,10 @@ case "${1:-.}${2:-.}${3:-.}" in # Added in both, identically (check for same permissions). # ".$3$2") - if [ "$6" != "$7" ]; then - echo "ERROR: File $4 added identically in both branches," - echo "ERROR: but permissions conflict $6->$7." + if test "$6" != "$7" + then + echo "ERROR: File $4 added identically in both branches," >&2 + echo "ERROR: but permissions conflict $6->$7." >&2 exit 1 fi echo "Adding $4" @@ -95,44 +98,36 @@ case "${1:-.}${2:-.}${3:-.}" in case ",$6,$7," in *,120000,*) - echo "ERROR: $4: Not merging symbolic link changes." + echo "ERROR: $4: Not merging symbolic link changes." >&2 exit 1 ;; *,160000,*) - echo "ERROR: $4: Not merging conflicting submodule changes." + echo "ERROR: $4: Not merging conflicting submodule changes." >&2 exit 1 ;; esac - src2=`git-unpack-file $3` + src1=$(git-unpack-file $2) + src2=$(git-unpack-file $3) case "$1" in '') echo "Added $4 in both, but differently." - # This extracts OUR file in $orig, and uses git apply to - # remove lines that are unique to ours. - orig=`git-unpack-file $2` - sz0=`wc -c <"$orig"` - @@DIFF@@ -u -La/$orig -Lb/$orig $orig $src2 | git apply --no-add - sz1=`wc -c <"$orig"` - - # If we do not have enough common material, it is not - # worth trying two-file merge using common subsections. - expr $sz0 \< $sz1 \* 2 >/dev/null || : >$orig + orig=$(git-unpack-file $2) + create_virtual_base "$orig" "$src2" ;; *) echo "Auto-merging $4" - orig=`git-unpack-file $1` + orig=$(git-unpack-file $1) ;; esac - # Be careful for funny filename such as "-L" in "$4", which - # would confuse "merge" greatly. - src1=`git-unpack-file $2` git merge-file "$src1" "$orig" "$src2" ret=$? msg= - if [ $ret -ne 0 ]; then + if test $ret != 0 || test -z "$1" + then msg='content conflict' + ret=1 fi # Create the working tree file, using "our tree" version from the @@ -140,26 +135,26 @@ case "${1:-.}${2:-.}${3:-.}" in git checkout-index -f --stage=2 -- "$4" && cat "$src1" >"$4" || exit 1 rm -f -- "$orig" "$src1" "$src2" - if [ "$6" != "$7" ]; then - if [ -n "$msg" ]; then + if test "$6" != "$7" + then + if test -n "$msg" + then msg="$msg, " fi msg="${msg}permissions conflict: $5->$6,$7" ret=1 fi - if [ "$1" = '' ]; then - ret=1 - fi - if [ $ret -ne 0 ]; then - echo "ERROR: $msg in $4" + if test $ret != 0 + then + echo "ERROR: $msg in $4" >&2 exit 1 fi exec git update-index -- "$4" ;; *) - echo "ERROR: $4: Not handling case $1 -> $2 -> $3" + echo "ERROR: $4: Not handling case $1 -> $2 -> $3" >&2 ;; esac exit 1 diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh index f013a03506..e338be5e57 100644 --- a/git-mergetool--lib.sh +++ b/git-mergetool--lib.sh @@ -1,5 +1,83 @@ #!/bin/sh # git-mergetool--lib is a library for common merge tool functions + +: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools} + +mode_ok () { + if diff_mode + then + can_diff + elif merge_mode + then + can_merge + else + false + fi +} + +is_available () { + merge_tool_path=$(translate_merge_tool_path "$1") && + type "$merge_tool_path" >/dev/null 2>&1 +} + +list_config_tools () { + section=$1 + line_prefix=${2:-} + + git config --get-regexp $section'\..*\.cmd' | + while read -r key value + do + toolname=${key#$section.} + toolname=${toolname%.cmd} + + printf "%s%s\n" "$line_prefix" "$toolname" + done +} + +show_tool_names () { + condition=${1:-true} per_line_prefix=${2:-} preamble=${3:-} + not_found_msg=${4:-} + extra_content=${5:-} + + shown_any= + ( cd "$MERGE_TOOLS_DIR" && ls ) | { + while read toolname + do + if setup_tool "$toolname" 2>/dev/null && + (eval "$condition" "$toolname") + then + if test -n "$preamble" + then + printf "%s\n" "$preamble" + preamble= + fi + shown_any=yes + printf "%s%s\n" "$per_line_prefix" "$toolname" + fi + done + + if test -n "$extra_content" + then + if test -n "$preamble" + then + # Note: no '\n' here since we don't want a + # blank line if there is no initial content. + printf "%s" "$preamble" + preamble= + fi + shown_any=yes + printf "\n%s\n" "$extra_content" + fi + + if test -n "$preamble" && test -n "$not_found_msg" + then + printf "%s\n" "$not_found_msg" + fi + + test -n "$shown_any" + } +} + diff_mode() { test "$TOOL_MODE" = diff } @@ -30,61 +108,70 @@ check_unchanged () { fi } -valid_tool_config () { - if test -n "$(get_merge_tool_cmd "$1")" - then - return 0 - else - return 1 - fi -} - valid_tool () { - setup_tool "$1" || valid_tool_config "$1" + setup_tool "$1" && return 0 + cmd=$(get_merge_tool_cmd "$1") + test -n "$cmd" } setup_tool () { - case "$1" in - vim*|gvim*) - tool=vim - ;; - *) - tool="$1" - ;; - esac - mergetools="$(git --exec-path)/mergetools" + tool="$1" + + # Fallback definitions, to be overriden by tools. + can_merge () { + return 0 + } + + can_diff () { + return 0 + } + + diff_cmd () { + status=1 + return $status + } - # Load the default definitions - . "$mergetools/defaults" - if ! test -f "$mergetools/$tool" + merge_cmd () { + status=1 + return $status + } + + translate_merge_tool_path () { + echo "$1" + } + + if ! test -f "$MERGE_TOOLS_DIR/$tool" then - return 1 + # Use a special return code for this case since we want to + # source "defaults" even when an explicit tool path is + # configured since the user can use that to override the + # default path in the scriptlet. + return 2 fi # Load the redefined functions - . "$mergetools/$tool" + . "$MERGE_TOOLS_DIR/$tool" if merge_mode && ! can_merge then echo "error: '$tool' can not be used to resolve merges" >&2 - exit 1 + return 1 elif diff_mode && ! can_diff then echo "error: '$tool' can only be used to resolve merges" >&2 - exit 1 + return 1 fi return 0 } get_merge_tool_cmd () { - # Prints the custom command for a merge tool merge_tool="$1" if diff_mode then - echo "$(git config difftool.$merge_tool.cmd || - git config mergetool.$merge_tool.cmd)" + git config "difftool.$merge_tool.cmd" || + git config "mergetool.$merge_tool.cmd" else - echo "$(git config mergetool.$merge_tool.cmd)" + git config "mergetool.$merge_tool.cmd" fi } @@ -95,12 +182,25 @@ run_merge_tool () { GIT_PREFIX=${GIT_PREFIX:-.} export GIT_PREFIX - merge_tool_path="$(get_merge_tool_path "$1")" || exit + merge_tool_path=$(get_merge_tool_path "$1") || exit base_present="$2" status=0 # Bring tool-specific functions into scope setup_tool "$1" + exitcode=$? + case $exitcode in + 0) + : + ;; + 2) + # The configured tool is not a built-in tool. + test -n "$merge_tool_path" || return 1 + ;; + *) + return $exitcode + ;; + esac if merge_mode then @@ -113,7 +213,7 @@ run_merge_tool () { # Run a either a configured or built-in diff tool run_diff_cmd () { - merge_tool_cmd="$(get_merge_tool_cmd "$1")" + merge_tool_cmd=$(get_merge_tool_cmd "$1") if test -n "$merge_tool_cmd" then ( eval $merge_tool_cmd ) @@ -126,11 +226,11 @@ run_diff_cmd () { # Run a either a configured or built-in merge tool run_merge_cmd () { - merge_tool_cmd="$(get_merge_tool_cmd "$1")" + merge_tool_cmd=$(get_merge_tool_cmd "$1") if test -n "$merge_tool_cmd" then - trust_exit_code="$(git config --bool \ - mergetool."$1".trustExitCode || echo false)" + trust_exit_code=$(git config --bool \ + "mergetool.$1.trustExitCode" || echo false) if test "$trust_exit_code" = "false" then touch "$BACKUP" @@ -174,22 +274,61 @@ list_merge_tool_candidates () { esac } +show_tool_help () { + tool_opt="'git ${TOOL_MODE}tool --tool-<tool>'" + + tab=' ' + LF=' +' + any_shown=no + + cmd_name=${TOOL_MODE}tool + config_tools=$({ + diff_mode && list_config_tools difftool "$tab$tab" + list_config_tools mergetool "$tab$tab" + } | sort) + extra_content= + if test -n "$config_tools" + then + extra_content="${tab}user-defined:${LF}$config_tools" + fi + + show_tool_names 'mode_ok && is_available' "$tab$tab" \ + "$tool_opt may be set to one of the following:" \ + "No suitable tool for 'git $cmd_name --tool=<tool>' found." \ + "$extra_content" && + any_shown=yes + + show_tool_names 'mode_ok && ! is_available' "$tab$tab" \ + "${LF}The following tools are valid, but not currently available:" && + any_shown=yes + + if test "$any_shown" = yes + then + echo + echo "Some of the tools listed above only work in a windowed" + echo "environment. If run in a terminal-only session, they will fail." + fi + exit 0 +} + guess_merge_tool () { list_merge_tool_candidates - echo >&2 "merge tool candidates: $tools" + cat >&2 <<-EOF + + This message is displayed because '$TOOL_MODE.tool' is not configured. + See 'git ${TOOL_MODE}tool --tool-help' or 'git help config' for more details. + 'git ${TOOL_MODE}tool' will now attempt to use one of the following tools: + $tools + EOF # Loop over each candidate and stop when a valid merge tool is found. - for i in $tools + for tool in $tools do - merge_tool_path="$(translate_merge_tool_path "$i")" - if type "$merge_tool_path" >/dev/null 2>&1 - then - echo "$i" - return 0 - fi + is_available "$tool" && echo "$tool" && return 0 done - echo >&2 "No known merge resolution program available." + echo >&2 "No known ${TOOL_MODE} tool is available." return 1 } @@ -228,7 +367,7 @@ get_merge_tool_path () { fi if test -z "$merge_tool_path" then - merge_tool_path="$(translate_merge_tool_path "$merge_tool")" + merge_tool_path=$(translate_merge_tool_path "$merge_tool") fi if test -z "$(get_merge_tool_cmd "$merge_tool")" && ! type "$merge_tool_path" >/dev/null 2>&1 @@ -242,11 +381,11 @@ get_merge_tool_path () { get_merge_tool () { # Check if a merge tool has been configured - merge_tool="$(get_configured_merge_tool)" + merge_tool=$(get_configured_merge_tool) # Try to guess an appropriate merge tool if no tool has been set. if test -z "$merge_tool" then - merge_tool="$(guess_merge_tool)" || exit + merge_tool=$(guess_merge_tool) || exit fi echo "$merge_tool" } diff --git a/git-mergetool.sh b/git-mergetool.sh index c50e18a899..332528ff45 100755 --- a/git-mergetool.sh +++ b/git-mergetool.sh @@ -315,43 +315,6 @@ merge_file () { return 0 } -show_tool_help () { - TOOL_MODE=merge - list_merge_tool_candidates - unavailable= available= LF=' -' - for i in $tools - do - merge_tool_path=$(translate_merge_tool_path "$i") - if type "$merge_tool_path" >/dev/null 2>&1 - then - available="$available$i$LF" - else - unavailable="$unavailable$i$LF" - fi - done - if test -n "$available" - then - echo "'git mergetool --tool=<tool>' may be set to one of the following:" - echo "$available" | sort | sed -e 's/^/ /' - else - echo "No suitable tool for 'git mergetool --tool=<tool>' found." - fi - if test -n "$unavailable" - then - echo - echo 'The following tools are valid, but not currently available:' - echo "$unavailable" | sort | sed -e 's/^/ /' - fi - if test -n "$unavailable$available" - then - echo - echo "Some of the tools listed above only work in a windowed" - echo "environment. If run in a terminal-only session, they will fail." - fi - exit 0 -} - prompt=$(git config --bool mergetool.prompt || echo true) while test $# != 0 @@ -440,7 +403,7 @@ then fi printf "Merging:\n" -printf "$files\n" +printf "%s\n" "$files" IFS=' ' @@ -7,16 +7,36 @@ # 2007 Trolltech ASA # License: MIT <http://www.opensource.org/licenses/mit-license.php> # - import sys if sys.hexversion < 0x02040000: # The limiter is the subprocess module sys.stderr.write("git-p4: requires Python 2.4 or later.\n") sys.exit(1) - -import optparse, os, marshal, subprocess, shelve -import tempfile, getopt, os.path, time, platform -import re, shutil +import os +import optparse +import marshal +import subprocess +import tempfile +import time +import platform +import re +import shutil +import stat + +try: + from subprocess import CalledProcessError +except ImportError: + # from python2.7:subprocess.py + # Exception classes used by this module. + class CalledProcessError(Exception): + """This exception is raised when a process run by check_call() returns + a non-zero exit status. The exit status will be stored in the + returncode attribute.""" + def __init__(self, returncode, cmd): + self.returncode = returncode + self.cmd = cmd + def __str__(self): + return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) verbose = False @@ -59,12 +79,27 @@ def p4_build_cmd(cmd): real_cmd += cmd return real_cmd -def chdir(dir): - # P4 uses the PWD environment variable rather than getcwd(). Since we're - # not using the shell, we have to set it ourselves. This path could - # be relative, so go there first, then figure out where we ended up. - os.chdir(dir) - os.environ['PWD'] = os.getcwd() +def chdir(path, is_client_path=False): + """Do chdir to the given path, and set the PWD environment + variable for use by P4. It does not look at getcwd() output. + Since we're not using the shell, it is necessary to set the + PWD environment variable explicitly. + + Normally, expand the path to force it to be absolute. This + addresses the use of relative path names inside P4 settings, + e.g. P4CONFIG=.p4config. P4 does not simply open the filename + as given; it looks for .p4config using PWD. + + If is_client_path, the path was handed to us directly by p4, + and may be a symbolic link. Do not call os.getcwd() in this + case, because it will cause p4 to think that PWD is not inside + the client path. + """ + + os.chdir(path) + if not is_client_path: + path = os.getcwd() + os.environ['PWD'] = path def die(msg): if verbose: @@ -158,13 +193,33 @@ def system(cmd): expand = isinstance(cmd,basestring) if verbose: sys.stderr.write("executing %s\n" % str(cmd)) - subprocess.check_call(cmd, shell=expand) + retcode = subprocess.call(cmd, shell=expand) + if retcode: + raise CalledProcessError(retcode, cmd) def p4_system(cmd): """Specifically invoke p4 as the system command. """ real_cmd = p4_build_cmd(cmd) expand = isinstance(real_cmd, basestring) - subprocess.check_call(real_cmd, shell=expand) + retcode = subprocess.call(real_cmd, shell=expand) + if retcode: + raise CalledProcessError(retcode, real_cmd) + +_p4_version_string = None +def p4_version_string(): + """Read the version string, showing just the last line, which + hopefully is the interesting version bit. + + $ p4 -V + Perforce - The Fast Software Configuration Management System. + Copyright 1995-2011 Perforce Software. All rights reserved. + Rev. P4/NTX86/2011.1/393975 (2011/12/16). + """ + global _p4_version_string + if not _p4_version_string: + a = p4_read_pipe_lines(["-V"]) + _p4_version_string = a[-1].rstrip() + return _p4_version_string def p4_integrate(src, dest): p4_system(["integrate", "-Dt", wildcard_encode(src), wildcard_encode(dest)]) @@ -539,43 +594,75 @@ def gitBranchExists(branch): return proc.wait() == 0; _gitConfig = {} -def gitConfig(key, args = None): # set args to "--bool", for instance + +def gitConfig(key): + if not _gitConfig.has_key(key): + cmd = [ "git", "config", key ] + s = read_pipe(cmd, ignore_error=True) + _gitConfig[key] = s.strip() + return _gitConfig[key] + +def gitConfigBool(key): + """Return a bool, using git config --bool. It is True only if the + variable is set to true, and False if set to false or not present + in the config.""" + if not _gitConfig.has_key(key): - argsFilter = "" - if args != None: - argsFilter = "%s " % args - cmd = "git config %s%s" % (argsFilter, key) - _gitConfig[key] = read_pipe(cmd, ignore_error=True).strip() + cmd = [ "git", "config", "--bool", key ] + s = read_pipe(cmd, ignore_error=True) + v = s.strip() + _gitConfig[key] = v == "true" return _gitConfig[key] def gitConfigList(key): if not _gitConfig.has_key(key): - _gitConfig[key] = read_pipe("git config --get-all %s" % key, ignore_error=True).strip().split(os.linesep) + s = read_pipe(["git", "config", "--get-all", key], ignore_error=True) + _gitConfig[key] = s.strip().split(os.linesep) return _gitConfig[key] -def p4BranchesInGit(branchesAreInRemotes = True): +def p4BranchesInGit(branchesAreInRemotes=True): + """Find all the branches whose names start with "p4/", looking + in remotes or heads as specified by the argument. Return + a dictionary of { branch: revision } for each one found. + The branch names are the short names, without any + "p4/" prefix.""" + branches = {} cmdline = "git rev-parse --symbolic " if branchesAreInRemotes: - cmdline += " --remotes" + cmdline += "--remotes" else: - cmdline += " --branches" + cmdline += "--branches" for line in read_pipe_lines(cmdline): line = line.strip() - ## only import to p4/ - if not line.startswith('p4/') or line == "p4/HEAD": + # only import to p4/ + if not line.startswith('p4/'): + continue + # special symbolic ref to p4/master + if line == "p4/HEAD": continue - branch = line - # strip off p4 - branch = re.sub ("^p4/", "", line) + # strip off p4/ prefix + branch = line[len("p4/"):] branches[branch] = parseRevision(line) + return branches +def branch_exists(branch): + """Make sure that the given ref name really exists.""" + + cmd = [ "git", "rev-parse", "--symbolic", "--verify", branch ] + p = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + out, _ = p.communicate() + if p.returncode: + return False + # expect exactly one line of output: the branch name + return out.rstrip() == branch + def findUpstreamBranchPoint(head = "HEAD"): branches = p4BranchesInGit() # map from depot-path to branch name @@ -677,8 +764,7 @@ def p4PathStartsWith(path, prefix): # # we may or may not have a problem. If you have core.ignorecase=true, # we treat DirA and dira as the same directory - ignorecase = gitConfig("core.ignorecase", "--bool") == "true" - if ignorecase: + if gitConfigBool("core.ignorecase"): return path.lower().startswith(prefix.lower()) return path.startswith(prefix) @@ -748,7 +834,8 @@ def wildcard_encode(path): return path def wildcard_present(path): - return path.translate(None, "*#@%") != path + m = re.search("[*#@%]", path) + return m is not None class Command: def __init__(self): @@ -907,19 +994,21 @@ class P4Submit(Command, P4UserMap): optparse.make_option("--dry-run", "-n", dest="dry_run", action="store_true"), optparse.make_option("--prepare-p4-only", dest="prepare_p4_only", action="store_true"), optparse.make_option("--conflict", dest="conflict_behavior", - choices=self.conflict_behavior_choices) + choices=self.conflict_behavior_choices), + optparse.make_option("--branch", dest="branch"), ] self.description = "Submit changes from git to the perforce depot." self.usage += " [name of git branch to submit into perforce depot]" self.origin = "" self.detectRenames = False - self.preserveUser = gitConfig("git-p4.preserveUser").lower() == "true" + self.preserveUser = gitConfigBool("git-p4.preserveUser") self.dry_run = False self.prepare_p4_only = False self.conflict_behavior = None self.isWindows = (platform.system() == "Windows") self.exportLabels = False self.p4HasMoveCommand = p4_has_move_command() + self.branch = None def check(self): if len(p4CmdList("opened ...")) > 0: @@ -1007,7 +1096,8 @@ class P4Submit(Command, P4UserMap): def p4UserForCommit(self,id): # Return the tuple (perforce user,git email) for a given git commit id self.getUserMapFromPerforceServer() - gitEmail = read_pipe("git log --max-count=1 --format='%%ae' %s" % id) + gitEmail = read_pipe(["git", "log", "--max-count=1", + "--format=%ae", id]) gitEmail = gitEmail.strip() if not self.emails.has_key(gitEmail): return (None,gitEmail) @@ -1020,7 +1110,7 @@ class P4Submit(Command, P4UserMap): (user,email) = self.p4UserForCommit(id) if not user: msg = "Cannot find p4 user for email %s in commit %s." % (email, id) - if gitConfig('git-p4.allowMissingP4Users').lower() == "true": + if gitConfigBool("git-p4.allowMissingP4Users"): print "%s" % msg else: die("Error: %s\nSet git-p4.allowMissingP4Users to true to allow this." % msg) @@ -1115,7 +1205,7 @@ class P4Submit(Command, P4UserMap): message. Return true if okay to continue with the submit.""" # if configured to skip the editing part, just submit - if gitConfig("git-p4.skipSubmitEdit") == "true": + if gitConfigBool("git-p4.skipSubmitEdit"): return True # look at the modification time, to check later if the user saved @@ -1131,7 +1221,7 @@ class P4Submit(Command, P4UserMap): # If the file was not saved, prompt to see if this patch should # be skipped. But skip this verification step if configured so. - if gitConfig("git-p4.skipSubmitEditCheck") == "true": + if gitConfigBool("git-p4.skipSubmitEditCheck"): return True # modification time updated means user saved the file @@ -1189,6 +1279,9 @@ class P4Submit(Command, P4UserMap): p4_edit(dest) pureRenameCopy.discard(dest) filesToChangeExecBit[dest] = diff['dst_mode'] + if self.isWindows: + # turn off read-only attribute + os.chmod(dest, stat.S_IWRITE) os.unlink(dest) editedFiles.add(dest) elif modifier == "R": @@ -1207,6 +1300,8 @@ class P4Submit(Command, P4UserMap): p4_edit(dest) # with move: already open, writable filesToChangeExecBit[dest] = diff['dst_mode'] if not self.p4HasMoveCommand: + if self.isWindows: + os.chmod(dest, stat.S_IWRITE) os.unlink(dest) filesToDelete.add(src) editedFiles.add(dest) @@ -1226,7 +1321,7 @@ class P4Submit(Command, P4UserMap): # Patch failed, maybe it's just RCS keyword woes. Look through # the patch to see if that's possible. - if gitConfig("git-p4.attemptRCSCleanup","--bool") == "true": + if gitConfigBool("git-p4.attemptRCSCleanup"): file = None pattern = None kwfiles = {} @@ -1247,6 +1342,10 @@ class P4Submit(Command, P4UserMap): for file in kwfiles: if verbose: print "zapping %s with %s" % (line,pattern) + # File is being deleted, so not open in p4. Must + # disable the read-only bit on windows. + if self.isWindows and file not in editedFiles: + os.chmod(file, stat.S_IWRITE) self.patchRCSKeywords(file, kwfiles[file]) fixed_rcs_keywords = True @@ -1517,7 +1616,7 @@ class P4Submit(Command, P4UserMap): sys.exit(128) self.useClientSpec = False - if gitConfig("git-p4.useclientspec", "--bool") == "true": + if gitConfigBool("git-p4.useclientspec"): self.useClientSpec = True if self.useClientSpec: self.clientSpecDirs = getClientSpec() @@ -1540,7 +1639,7 @@ class P4Submit(Command, P4UserMap): new_client_dir = True os.makedirs(self.clientPath) - chdir(self.clientPath) + chdir(self.clientPath, is_client_path=True) if self.dry_run: print "Would synchronize p4 checkout in %s" % self.clientPath else: @@ -1553,11 +1652,11 @@ class P4Submit(Command, P4UserMap): self.check() commits = [] - for line in read_pipe_lines("git rev-list --no-merges %s..%s" % (self.origin, self.master)): + for line in read_pipe_lines(["git", "rev-list", "--no-merges", "%s..%s" % (self.origin, self.master)]): commits.append(line.strip()) commits.reverse() - if self.preserveUser or (gitConfig("git-p4.skipUserNameCheck") == "true"): + if self.preserveUser or gitConfigBool("git-p4.skipUserNameCheck"): self.checkAuthorship = False else: self.checkAuthorship = True @@ -1593,7 +1692,7 @@ class P4Submit(Command, P4UserMap): else: self.diffOpts += " -C%s" % detectCopies - if gitConfig("git-p4.detectCopiesHarder", "--bool") == "true": + if gitConfigBool("git-p4.detectCopiesHarder"): self.diffOpts += " --find-copies-harder" # @@ -1656,6 +1755,8 @@ class P4Submit(Command, P4UserMap): print "All commits applied!" sync = P4Sync() + if self.branch: + sync.branch = self.branch sync.run([]) rebase = P4Rebase() @@ -1675,7 +1776,7 @@ class P4Submit(Command, P4UserMap): "--format=format:%h %s", c]) print "You will have to do 'git p4 sync' and rebase." - if gitConfig("git-p4.exportLabels", "--bool") == "true": + if gitConfigBool("git-p4.exportLabels"): self.exportLabels = True if self.exportLabels: @@ -1945,7 +2046,6 @@ class P4Sync(Command, P4UserMap): self.syncWithOrigin = True self.importIntoRemotes = True self.maxChanges = "" - self.isWindows = (platform.system() == "Windows") self.keepRepoPath = False self.depotPaths = None self.p4BranchesInGit = [] @@ -2090,7 +2190,14 @@ class P4Sync(Command, P4UserMap): # operations. utf16 is converted to ascii or utf8, perhaps. # But ascii text saved as -t utf16 is completely mangled. # Invoke print -o to get the real contents. + # + # On windows, the newlines will always be mangled by print, so put + # them back too. This is not needed to the cygwin windows version, + # just the native "NT" type. + # text = p4_read_pipe(['print', '-q', '-o', '-', file['depotFile']]) + if p4_version_string().find("/NT") >= 0: + text = text.replace("\r\n", "\n") contents = [ text ] if type_base == "apple": @@ -2106,15 +2213,6 @@ class P4Sync(Command, P4UserMap): print "\nIgnoring apple filetype file %s" % file['depotFile'] return - # Perhaps windows wants unicode, utf16 newlines translated too; - # but this is not doing it. - if self.isWindows and type_base == "text": - mangled = [] - for data in contents: - data = data.replace("\r\n", "\n") - mangled.append(data) - contents = mangled - # Note that we do not try to de-mangle keywords on utf16 files, # even though in theory somebody may want that. pattern = p4_keywords_regexp_for_type(type_base, type_mods) @@ -2509,13 +2607,6 @@ class P4Sync(Command, P4UserMap): branch = branch[len(self.projectName):] self.knownBranches[branch] = branch - def listExistingP4GitBranches(self): - # branches holds mapping from name to commit - branches = p4BranchesInGit(self.importIntoRemotes) - self.p4BranchesInGit = branches.keys() - for branch in branches.keys(): - self.initialParents[self.refPrefix + branch] = branches[branch] - def updateOptionDict(self, d): option_keys = {} if self.keepRepoPath: @@ -2599,7 +2690,8 @@ class P4Sync(Command, P4UserMap): def searchParent(self, parent, branch, target): parentFound = False - for blob in read_pipe_lines(["git", "rev-list", "--reverse", "--no-merges", parent]): + for blob in read_pipe_lines(["git", "rev-list", "--reverse", + "--no-merges", parent]): blob = blob.strip() if len(read_pipe(["git", "diff-tree", blob, target])) == 0: parentFound = True @@ -2670,7 +2762,7 @@ class P4Sync(Command, P4UserMap): blob = None if len(parent) > 0: - tempBranch = os.path.join(self.tempBranchLocation, "%d" % (change)) + tempBranch = "%s/%d" % (self.tempBranchLocation, change) if self.verbose: print "Creating temporary branch: " + tempBranch self.commit(description, filesForCommit, tempBranch) @@ -2687,6 +2779,7 @@ class P4Sync(Command, P4UserMap): files = self.extractFilesFromCommit(description) self.commit(description, files, self.branch, self.initialParent) + # only needed once, to connect to the previous commit self.initialParent = "" except IOError: print self.gitError.read() @@ -2752,41 +2845,38 @@ class P4Sync(Command, P4UserMap): def run(self, args): self.depotPaths = [] self.changeRange = "" - self.initialParent = "" self.previousDepotPaths = [] + self.hasOrigin = False # map from branch depot path to parent branch self.knownBranches = {} self.initialParents = {} - self.hasOrigin = originP4BranchesExist() - if not self.syncWithOrigin: - self.hasOrigin = False if self.importIntoRemotes: self.refPrefix = "refs/remotes/p4/" else: self.refPrefix = "refs/heads/p4/" - if self.syncWithOrigin and self.hasOrigin: - if not self.silent: - print "Syncing with origin first by calling git fetch origin" - system("git fetch origin") + if self.syncWithOrigin: + self.hasOrigin = originP4BranchesExist() + if self.hasOrigin: + if not self.silent: + print 'Syncing with origin first, using "git fetch origin"' + system("git fetch origin") + branch_arg_given = bool(self.branch) if len(self.branch) == 0: self.branch = self.refPrefix + "master" if gitBranchExists("refs/heads/p4") and self.importIntoRemotes: system("git update-ref %s refs/heads/p4" % self.branch) - system("git branch -D p4"); - # create it /after/ importing, when master exists - if not gitBranchExists(self.refPrefix + "HEAD") and self.importIntoRemotes and gitBranchExists(self.branch): - system("git symbolic-ref %sHEAD %s" % (self.refPrefix, self.branch)) + system("git branch -D p4") # accept either the command-line option, or the configuration variable if self.useClientSpec: # will use this after clone to set the variable self.useClientSpec_from_options = True else: - if gitConfig("git-p4.useclientspec", "--bool") == "true": + if gitConfigBool("git-p4.useclientspec"): self.useClientSpec = True if self.useClientSpec: self.clientSpecDirs = getClientSpec() @@ -2796,12 +2886,25 @@ class P4Sync(Command, P4UserMap): if args == []: if self.hasOrigin: createOrUpdateBranchesFromOrigin(self.refPrefix, self.silent) - self.listExistingP4GitBranches() + + # branches holds mapping from branch name to sha1 + branches = p4BranchesInGit(self.importIntoRemotes) + + # restrict to just this one, disabling detect-branches + if branch_arg_given: + short = self.branch.split("/")[-1] + if short in branches: + self.p4BranchesInGit = [ short ] + else: + self.p4BranchesInGit = branches.keys() if len(self.p4BranchesInGit) > 1: if not self.silent: print "Importing from/into multiple branches" self.detectBranches = True + for branch in branches.keys(): + self.initialParents[self.refPrefix + branch] = \ + branches[branch] if self.verbose: print "branches: %s" % self.p4BranchesInGit @@ -2838,13 +2941,21 @@ class P4Sync(Command, P4UserMap): if p4Change > 0: self.depotPaths = sorted(self.previousDepotPaths) self.changeRange = "@%s,#head" % p4Change - if not self.detectBranches: - self.initialParent = parseRevision(self.branch) if not self.silent and not self.detectBranches: print "Performing incremental import into %s git branch" % self.branch + # accept multiple ref name abbreviations: + # refs/foo/bar/branch -> use it exactly + # p4/branch -> prepend refs/remotes/ or refs/heads/ + # branch -> prepend refs/remotes/p4/ or refs/heads/p4/ if not self.branch.startswith("refs/"): - self.branch = "refs/heads/" + self.branch + if self.importIntoRemotes: + prepend = "refs/remotes/" + else: + prepend = "refs/heads/" + if not self.branch.startswith("p4/"): + prepend += "p4/" + self.branch = prepend + self.branch if len(args) == 0 and self.depotPaths: if not self.silent: @@ -2955,8 +3066,21 @@ class P4Sync(Command, P4UserMap): else: # catch "git p4 sync" with no new branches, in a repo that # does not have any existing p4 branches - if len(args) == 0 and not self.p4BranchesInGit: - die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here."); + if len(args) == 0: + if not self.p4BranchesInGit: + die("No remote p4 branches. Perhaps you never did \"git p4 clone\" in here.") + + # The default branch is master, unless --branch is used to + # specify something else. Make sure it exists, or complain + # nicely about how to use --branch. + if not self.detectBranches: + if not branch_exists(self.branch): + if branch_arg_given: + die("Error: branch %s does not exist." % self.branch) + else: + die("Error: no branch %s; perhaps specify one with --branch." % + self.branch) + if self.verbose: print "Getting p4 changes for %s...%s" % (', '.join(self.depotPaths), self.changeRange) @@ -2974,6 +3098,14 @@ class P4Sync(Command, P4UserMap): self.updatedBranches = set() + if not self.detectBranches: + if args: + # start a new branch + self.initialParent = "" + else: + # build on a previous revision + self.initialParent = parseRevision(self.branch) + self.importChanges(changes) if not self.silent: @@ -2984,7 +3116,7 @@ class P4Sync(Command, P4UserMap): sys.stdout.write("%s " % b) sys.stdout.write("\n") - if gitConfig("git-p4.importLabels", "--bool") == "true": + if gitConfigBool("git-p4.importLabels"): self.importLabels = True if self.importLabels: @@ -3006,6 +3138,13 @@ class P4Sync(Command, P4UserMap): read_pipe("git update-ref -d %s" % branch) os.rmdir(os.path.join(os.environ.get("GIT_DIR", ".git"), self.tempBranchLocation)) + # Create a symbolic ref p4/HEAD pointing to p4/<branch> to allow + # a convenient shortcut refname "p4". + if self.importIntoRemotes: + head_ref = self.refPrefix + "HEAD" + if not gitBranchExists(head_ref) and gitBranchExists(self.branch): + system(["git", "symbolic-ref", head_ref, self.branch]) + return True class P4Rebase(Command): @@ -3095,6 +3234,7 @@ class P4Clone(P4Sync): self.cloneExclude = ["/"+p for p in self.cloneExclude] for p in depotPaths: if not p.startswith("//"): + sys.stderr.write('Depot paths must start with "//": %s\n' % p) return False if not self.cloneDestination: @@ -3109,21 +3249,21 @@ class P4Clone(P4Sync): init_cmd = [ "git", "init" ] if self.cloneBare: init_cmd.append("--bare") - subprocess.check_call(init_cmd) + retcode = subprocess.call(init_cmd) + if retcode: + raise CalledProcessError(retcode, init_cmd) if not P4Sync.run(self, depotPaths): return False - if self.branch != "master": - if self.importIntoRemotes: - masterbranch = "refs/remotes/p4/master" - else: - masterbranch = "refs/heads/p4/master" - if gitBranchExists(masterbranch): - system("git branch master %s" % masterbranch) - if not self.cloneBare: - system("git checkout -f") - else: - print "Could not detect main branch. No checkout/master branch created." + + # create a master branch and check out a work tree + if gitBranchExists(self.branch): + system([ "git", "branch", "master", self.branch ]) + if not self.cloneBare: + system([ "git", "checkout", "-f" ]) + else: + print 'Not checking out any branch, use ' \ + '"git checkout -q -b master <branch>"' # auto-set this variable if invoked with --use-client-spec if self.useClientSpec_from_options: diff --git a/git-pull.sh b/git-pull.sh index 266e682f6c..5d97e97bd9 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -279,7 +279,7 @@ fi merge_name=$(git fmt-merge-msg $log_arg <"$GIT_DIR/FETCH_HEAD") || exit case "$rebase" in true) - eval="git-rebase $diffstat $strategy_args $merge_args" + eval="git-rebase $diffstat $strategy_args $merge_args $verbosity" eval="$eval --onto $merge_head ${oldremoteref:-$merge_head}" ;; *) diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 44901d53c4..048a140a6f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -80,6 +80,9 @@ rewritten_pending="$state_dir"/rewritten-pending GIT_CHERRY_PICK_HELP="$resolvemsg" export GIT_CHERRY_PICK_HELP +comment_char=$(git config --get core.commentchar 2>/dev/null | cut -c1) +: ${comment_char:=#} + warn () { printf '%s\n' "$*" >&2 } @@ -105,8 +108,8 @@ mark_action_done () { sed -e 1q < "$todo" >> "$done" sed -e 1d < "$todo" >> "$todo".new mv -f "$todo".new "$todo" - new_count=$(sane_grep -c '^[^#]' < "$done") - total=$(($new_count+$(sane_grep -c '^[^#]' < "$todo"))) + new_count=$(git stripspace --strip-comments <"$done" | wc -l) + total=$(($new_count + $(git stripspace --strip-comments <"$todo" | wc -l))) if test "$last_count" != "$new_count" then last_count=$new_count @@ -116,19 +119,19 @@ mark_action_done () { } append_todo_help () { - cat >> "$todo" << EOF -# -# Commands: -# p, pick = use commit -# r, reword = use commit, but edit the commit message -# e, edit = use commit, but stop for amending -# s, squash = use commit, but meld into previous commit -# f, fixup = like "squash", but discard this commit's log message -# x, exec = run command (the rest of the line) using shell -# -# These lines can be re-ordered; they are executed from top to bottom. -# -# If you remove a line here THAT COMMIT WILL BE LOST. + git stripspace --comment-lines >>"$todo" <<\EOF + +Commands: + p, pick = use commit + r, reword = use commit, but edit the commit message + e, edit = use commit, but stop for amending + s, squash = use commit, but meld into previous commit + f, fixup = like "squash", but discard this commit's log message + x, exec = run command (the rest of the line) using shell + +These lines can be re-ordered; they are executed from top to bottom. + +If you remove a line here THAT COMMIT WILL BE LOST. EOF } @@ -179,7 +182,7 @@ die_abort () { } has_action () { - sane_grep '^[^#]' "$1" >/dev/null + test -n "$(git stripspace --strip-comments <"$1")" } is_empty_commit() { @@ -190,6 +193,11 @@ is_empty_commit() { test "$tree" = "$ptree" } +is_merge_commit() +{ + git rev-parse --verify --quiet "$1"^2 >/dev/null 2>&1 +} + # Run command with GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and # GIT_AUTHOR_DATE exported from the current environment. do_with_author () { @@ -358,10 +366,10 @@ update_squash_messages () { if test -f "$squash_msg"; then mv "$squash_msg" "$squash_msg".bak || exit count=$(($(sed -n \ - -e "1s/^# This is a combination of \(.*\) commits\./\1/p" \ + -e "1s/^. This is a combination of \(.*\) commits\./\1/p" \ -e "q" < "$squash_msg".bak)+1)) { - echo "# This is a combination of $count commits." + printf '%s\n' "$comment_char This is a combination of $count commits." sed -e 1d -e '2,/^./{ /^$/d }' <"$squash_msg".bak @@ -370,8 +378,8 @@ update_squash_messages () { commit_message HEAD > "$fixup_msg" || die "Cannot write $fixup_msg" count=2 { - echo "# This is a combination of 2 commits." - echo "# The first commit's message is:" + printf '%s\n' "$comment_char This is a combination of 2 commits." + printf '%s\n' "$comment_char The first commit's message is:" echo cat "$fixup_msg" } >"$squash_msg" @@ -380,21 +388,22 @@ update_squash_messages () { squash) rm -f "$fixup_msg" echo - echo "# This is the $(nth_string $count) commit message:" + printf '%s\n' "$comment_char This is the $(nth_string $count) commit message:" echo commit_message $2 ;; fixup) echo - echo "# The $(nth_string $count) commit message will be skipped:" + printf '%s\n' "$comment_char The $(nth_string $count) commit message will be skipped:" echo - commit_message $2 | sed -e 's/^/# /' + # Change the space after the comment character to TAB: + commit_message $2 | git stripspace --comment-lines | sed -e 's/ / /' ;; esac >>"$squash_msg" } peek_next_command () { - sed -n -e "/^#/d" -e '/^$/d' -e "s/ .*//p" -e "q" < "$todo" + git stripspace --strip-comments <"$todo" | sed -n -e 's/ .*//p' -e q } # A squash/fixup has failed. Prepare the long version of the squash @@ -459,7 +468,7 @@ do_next () { rm -f "$msg" "$author_script" "$amend" || exit read -r command sha1 rest < "$todo" case "$command" in - '#'*|''|noop) + "$comment_char"*|''|noop) mark_action_done ;; pick|p) @@ -798,15 +807,15 @@ skip) do_rest ;; edit-todo) - sed -e '/^#/d' < "$todo" > "$todo".new + git stripspace --strip-comments <"$todo" >"$todo".new mv -f "$todo".new "$todo" append_todo_help - cat >> "$todo" << EOF -# -# You are editing the todo file of an ongoing interactive rebase. -# To continue rebase after editing, run: -# git rebase --continue -# + git stripspace --comment-lines >>"$todo" <<\EOF + +You are editing the todo file of an ongoing interactive rebase. +To continue rebase after editing, run: + git rebase --continue + EOF git_sequence_editor "$todo" || @@ -874,9 +883,9 @@ git rev-list $merges_option --pretty=oneline --abbrev-commit \ while read -r shortsha1 rest do - if test -z "$keep_empty" && is_empty_commit $shortsha1 + if test -z "$keep_empty" && is_empty_commit $shortsha1 && ! is_merge_commit $shortsha1 then - comment_out="# " + comment_out="$comment_char " else comment_out= fi @@ -937,20 +946,20 @@ test -s "$todo" || echo noop >> "$todo" test -n "$autosquash" && rearrange_squash "$todo" test -n "$cmd" && add_exec_commands "$todo" -cat >> "$todo" << EOF +cat >>"$todo" <<EOF -# Rebase $shortrevisions onto $shortonto +$comment_char Rebase $shortrevisions onto $shortonto EOF append_todo_help -cat >> "$todo" << EOF -# -# However, if you remove everything, the rebase will be aborted. -# +git stripspace --comment-lines >>"$todo" <<\EOF + +However, if you remove everything, the rebase will be aborted. + EOF if test -z "$keep_empty" then - echo "# Note that empty commits are commented out" >>"$todo" + printf '%s\n' "$comment_char Note that empty commits are commented out" >>"$todo" fi diff --git a/git-relink.perl b/git-relink.perl index f29285c411..236a3521a1 100755 --- a/git-relink.perl +++ b/git-relink.perl @@ -163,7 +163,7 @@ sub link_two_files($$) { sub usage() { - print("Usage: git relink [--safe] <dir>... <master_dir> \n"); + print("usage: git relink [--safe] <dir>... <master_dir> \n"); print("All directories should contain a .git/objects/ subdirectory.\n"); print("Options\n"); print("\t--safe\t" . diff --git a/git-remote-testpy.py b/git-remote-testpy.py index e4533b187d..ca6789996a 100644 --- a/git-remote-testpy.py +++ b/git-remote-testpy.py @@ -31,11 +31,27 @@ from git_remote_helpers.git.exporter import GitExporter from git_remote_helpers.git.importer import GitImporter from git_remote_helpers.git.non_local import NonLocalGit -if sys.hexversion < 0x01050200: - # os.makedirs() is the limiter - sys.stderr.write("git-remote-testgit: requires Python 1.5.2 or later.\n") +if sys.hexversion < 0x02000000: + # string.encode() is the limiter + sys.stderr.write("git-remote-testgit: requires Python 2.0 or later.\n") sys.exit(1) + +def encode_filepath(path): + """Encodes a Unicode file path to a byte string. + + On Python 2 this is a no-op; on Python 3 we encode the string as + suggested by [1] which allows an exact round-trip from the command line + to the filesystem. + + [1] http://docs.python.org/3/c-api/unicode.html#file-system-encoding + + """ + if sys.hexversion < 0x03000000: + return path + return path.encode(sys.getfilesystemencoding(), 'surrogateescape') + + def get_repo(alias, url): """Returns a git repository object initialized for usage. """ @@ -45,7 +61,7 @@ def get_repo(alias, url): repo.get_head() hasher = _digest() - hasher.update(repo.path) + hasher.update(encode_filepath(repo.path)) repo.hash = hasher.hexdigest() repo.get_base_path = lambda base: os.path.join( @@ -87,9 +103,9 @@ def do_capabilities(repo, args): """Prints the supported capabilities. """ - print "import" - print "export" - print "refspec refs/heads/*:%s*" % repo.prefix + print("import") + print("export") + print("refspec refs/heads/*:%s*" % repo.prefix) dirname = repo.get_base_path(repo.gitdir) @@ -98,11 +114,11 @@ def do_capabilities(repo, args): path = os.path.join(dirname, 'git.marks') - print "*export-marks %s" % path + print("*export-marks %s" % path) if os.path.exists(path): - print "*import-marks %s" % path + print("*import-marks %s" % path) - print # end capabilities + print('') # end capabilities def do_list(repo, args): @@ -115,16 +131,16 @@ def do_list(repo, args): for ref in repo.revs: debug("? refs/heads/%s", ref) - print "? refs/heads/%s" % ref + print("? refs/heads/%s" % ref) if repo.head: debug("@refs/heads/%s HEAD" % repo.head) - print "@refs/heads/%s HEAD" % repo.head + print("@refs/heads/%s HEAD" % repo.head) else: debug("@refs/heads/master HEAD") - print "@refs/heads/master HEAD" + print("@refs/heads/master HEAD") - print # end list + print('') # end list def update_local_repo(repo): @@ -154,7 +170,7 @@ def do_import(repo, args): refs = [ref] while True: - line = sys.stdin.readline() + line = sys.stdin.readline().decode() if line == '\n': break if not line.startswith('import '): @@ -164,10 +180,15 @@ def do_import(repo, args): ref = line[7:].strip() refs.append(ref) + print("feature done") + + if os.environ.get("GIT_REMOTE_TESTGIT_FAILURE"): + die('Told to fail') + repo = update_local_repo(repo) repo.exporter.export_repo(repo.gitdir, refs) - print "done" + print("done") def do_export(repo, args): @@ -177,6 +198,9 @@ def do_export(repo, args): if not repo.gitdir: die("Need gitdir to export") + if os.environ.get("GIT_REMOTE_TESTGIT_FAILURE"): + die('Told to fail') + update_local_repo(repo) changed = repo.importer.do_import(repo.gitdir) @@ -184,8 +208,8 @@ def do_export(repo, args): repo.non_local.push(repo.gitdir) for ref in changed: - print "ok %s" % ref - print + print("ok %s" % ref) + print('') COMMANDS = { @@ -217,7 +241,7 @@ def read_one_line(repo): line = sys.stdin.readline() - cmdline = line + cmdline = line.decode() if not cmdline: warn("Unexpected EOF") @@ -269,7 +293,11 @@ def main(args): more = True - sys.stdin = os.fdopen(sys.stdin.fileno(), 'r', 0) + # Use binary mode since Python 3 does not permit unbuffered I/O in text + # mode. Unbuffered I/O is required to avoid data that should be going + # to git-fast-import after an "export" command getting caught in our + # stdin buffer instead. + sys.stdin = os.fdopen(sys.stdin.fileno(), 'rb', 0) while (more): more = read_one_line(repo) diff --git a/git-send-email.perl b/git-send-email.perl index 94c7f76a15..c3501d987e 100755 --- a/git-send-email.perl +++ b/git-send-email.perl @@ -1045,6 +1045,47 @@ sub maildomain { return maildomain_net() || maildomain_mta() || 'localhost.localdomain'; } +sub smtp_host_string { + if (defined $smtp_server_port) { + return "$smtp_server:$smtp_server_port"; + } else { + return $smtp_server; + } +} + +# Returns 1 if authentication succeeded or was not necessary +# (smtp_user was not specified), and 0 otherwise. + +sub smtp_auth_maybe { + if (!defined $smtp_authuser || $auth) { + return 1; + } + + # Workaround AUTH PLAIN/LOGIN interaction defect + # with Authen::SASL::Cyrus + eval { + require Authen::SASL; + Authen::SASL->import(qw(Perl)); + }; + + # TODO: Authentication may fail not because credentials were + # invalid but due to other reasons, in which we should not + # reject credentials. + $auth = Git::credential({ + 'protocol' => 'smtp', + 'host' => smtp_host_string(), + 'username' => $smtp_authuser, + # if there's no password, "git credential fill" will + # give us one, otherwise it'll just pass this one. + 'password' => $smtp_authpass + }, sub { + my $cred = shift; + return !!$smtp->auth($cred->{'username'}, $cred->{'password'}); + }); + + return $auth; +} + # Returns 1 if the message was sent, and 0 otherwise. # In actuality, the whole program dies when there # is an error sending a message. @@ -1155,9 +1196,7 @@ X-Mailer: git-send-email $gitversion else { require Net::SMTP; $smtp_domain ||= maildomain(); - $smtp ||= Net::SMTP->new((defined $smtp_server_port) - ? "$smtp_server:$smtp_server_port" - : $smtp_server, + $smtp ||= Net::SMTP->new(smtp_host_string(), Hello => $smtp_domain, Debug => $debug_net_smtp); if ($smtp_encryption eq 'tls' && $smtp) { @@ -1185,31 +1224,7 @@ X-Mailer: git-send-email $gitversion defined $smtp_server_port ? " port=$smtp_server_port" : ""; } - if (defined $smtp_authuser) { - # Workaround AUTH PLAIN/LOGIN interaction defect - # with Authen::SASL::Cyrus - eval { - require Authen::SASL; - Authen::SASL->import(qw(Perl)); - }; - - if (!defined $smtp_authpass) { - - system "stty -echo"; - - do { - print "Password: "; - $_ = <STDIN>; - print "\n"; - } while (!defined $_); - - chomp($smtp_authpass = $_); - - system "stty echo"; - } - - $auth ||= $smtp->auth( $smtp_authuser, $smtp_authpass ) or die $smtp->message; - } + smtp_auth_maybe or die $smtp->message; $smtp->mail( $raw_from ) or die $smtp->message; $smtp->to( @recipients ) or die $smtp->message; @@ -1285,10 +1300,10 @@ foreach my $t (@files) { } if (defined $input_format && $input_format eq 'mbox') { - if (/^Subject:\s+(.*)$/) { + if (/^Subject:\s+(.*)$/i) { $subject = $1; } - elsif (/^From:\s+(.*)$/) { + elsif (/^From:\s+(.*)$/i) { ($author, $author_encoding) = unquote_rfc2047($1); next if $suppress_cc{'author'}; next if $suppress_cc{'self'} and $author eq $sender; @@ -1296,14 +1311,14 @@ foreach my $t (@files) { $1, $_) unless $quiet; push @cc, $1; } - elsif (/^To:\s+(.*)$/) { + elsif (/^To:\s+(.*)$/i) { foreach my $addr (parse_address_line($1)) { printf("(mbox) Adding to: %s from line '%s'\n", $addr, $_) unless $quiet; push @to, $addr; } } - elsif (/^Cc:\s+(.*)$/) { + elsif (/^Cc:\s+(.*)$/i) { foreach my $addr (parse_address_line($1)) { if (unquote_rfc2047($addr) eq $sender) { next if ($suppress_cc{'self'}); @@ -1325,7 +1340,7 @@ foreach my $t (@files) { elsif (/^Message-Id: (.*)/i) { $message_id = $1; } - elsif (!/^Date:\s/ && /^[-A-Za-z]+:\s+\S/) { + elsif (!/^Date:\s/i && /^[-A-Za-z]+:\s+\S/) { push @xh, $_; } diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 795edd2852..2f7835941e 100644 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -84,14 +84,14 @@ if test -n "$OPTIONS_SPEC"; then else dashless=$(basename "$0" | sed -e 's/-/ /') usage() { - die "Usage: $dashless $USAGE" + die "usage: $dashless $USAGE" } if [ -z "$LONG_USAGE" ] then - LONG_USAGE="Usage: $dashless $USAGE" + LONG_USAGE="usage: $dashless $USAGE" else - LONG_USAGE="Usage: $dashless $USAGE + LONG_USAGE="usage: $dashless $USAGE $LONG_USAGE" fi @@ -249,6 +249,18 @@ clear_local_git_env() { unset $(git rev-parse --local-env-vars) } +# Generate a virtual base file for a two-file merge. Uses git apply to +# remove lines from $1 that are not in $2, leaving only common lines. +create_virtual_base() { + sz0=$(wc -c <"$1") + @@DIFF@@ -u -La/"$1" -Lb/"$1" "$1" "$2" | git apply --no-add + sz1=$(wc -c <"$1") + + # If we do not have enough common material, it is not + # worth trying two-file merge using common subsections. + expr $sz0 \< $sz1 \* 2 >/dev/null || : >"$1" +} + # Platform specific tweaks to work around some commands case $(uname -s) in diff --git a/git-submodule.sh b/git-submodule.sh index 22ec5b63b4..204bc78a9f 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -8,6 +8,7 @@ dashless=$(basename "$0" | sed -e 's/-/ /') USAGE="[--quiet] add [-b <branch>] [-f|--force] [--name <name>] [--reference <repository>] [--] <repository> [<path>] or: $dashless [--quiet] status [--cached] [--recursive] [--] [<path>...] or: $dashless [--quiet] init [--] [<path>...] + or: $dashless [--quiet] deinit [-f|--force] [--] <path>... or: $dashless [--quiet] update [--init] [--remote] [-N|--no-fetch] [-f|--force] [--rebase] [--reference <repository>] [--merge] [--recursive] [--] [<path>...] or: $dashless [--quiet] summary [--cached|--files] [--summary-limit <n>] [commit] [--] [<path>...] or: $dashless [--quiet] foreach [--recursive] <command> @@ -547,6 +548,80 @@ cmd_init() } # +# Unregister submodules from .git/config and remove their work tree +# +# $@ = requested paths (use '.' to deinit all submodules) +# +cmd_deinit() +{ + # parse $args after "submodule ... deinit". + while test $# -ne 0 + do + case "$1" in + -f|--force) + force=$1 + ;; + -q|--quiet) + GIT_QUIET=1 + ;; + --) + shift + break + ;; + -*) + usage + ;; + *) + break + ;; + esac + shift + done + + if test $# = 0 + then + die "$(eval_gettext "Use '.' if you really want to deinitialize all submodules")" + fi + + module_list "$@" | + while read mode sha1 stage sm_path + do + die_if_unmatched "$mode" + name=$(module_name "$sm_path") || exit + + # Remove the submodule work tree (unless the user already did it) + if test -d "$sm_path" + then + # Protect submodules containing a .git directory + if test -d "$sm_path/.git" + then + echo >&2 "$(eval_gettext "Submodule work tree '\$sm_path' contains a .git directory")" + die "$(eval_gettext "(use 'rm -rf' if you really want to remove it including all of its history)")" + fi + + if test -z "$force" + then + git rm -n "$sm_path" || + die "$(eval_gettext "Submodule work tree '\$sm_path' contains local modifications; use '-f' to discard them")" + fi + rm -rf "$sm_path" || say "$(eval_gettext "Could not remove submodule work tree '\$sm_path'")" + fi + + mkdir "$sm_path" || say "$(eval_gettext "Could not create empty submodule directory '\$sm_path'")" + + # Remove the .git/config entries (unless the user already did it) + if test -n "$(git config --get-regexp submodule."$name\.")" + then + # Remove the whole section so we have a clean state when + # the user later decides to init this submodule again + url=$(git config submodule."$name".url) + git config --remove-section submodule."$name" 2>/dev/null && + say "$(eval_gettext "Submodule '\$name' (\$url) unregistered for path '\$sm_path'")" + fi + done +} + +# # Update each submodule path to correct revision, using clone and checkout as needed # # $@ = requested paths (default to all) @@ -622,7 +697,7 @@ cmd_update() die_if_unmatched "$mode" if test "$stage" = U then - echo >&2 "Skipping unmerged submodule $sm_path" + echo >&2 "Skipping unmerged submodule $prefix$sm_path" continue fi name=$(module_name "$sm_path") || exit @@ -637,7 +712,7 @@ cmd_update() if test "$update_module" = "none" then - echo "Skipping submodule '$sm_path'" + echo "Skipping submodule '$prefix$sm_path'" continue fi @@ -646,7 +721,7 @@ cmd_update() # Only mention uninitialized submodules when its # path have been specified test "$#" != "0" && - say "$(eval_gettext "Submodule path '\$sm_path' not initialized + say "$(eval_gettext "Submodule path '\$prefix\$sm_path' not initialized Maybe you want to use 'update --init'?")" continue fi @@ -659,7 +734,7 @@ Maybe you want to use 'update --init'?")" else subsha1=$(clear_local_git_env; cd "$sm_path" && git rev-parse --verify HEAD) || - die "$(eval_gettext "Unable to find current revision in submodule path '\$sm_path'")" + die "$(eval_gettext "Unable to find current revision in submodule path '\$prefix\$sm_path'")" fi if test -n "$remote" @@ -692,7 +767,7 @@ Maybe you want to use 'update --init'?")" (clear_local_git_env; cd "$sm_path" && ( (rev=$(git rev-list -n 1 $sha1 --not --all 2>/dev/null) && test -z "$rev") || git-fetch)) || - die "$(eval_gettext "Unable to fetch in submodule path '\$sm_path'")" + die "$(eval_gettext "Unable to fetch in submodule path '\$prefix\$sm_path'")" fi # Is this something we just cloned? @@ -706,20 +781,20 @@ Maybe you want to use 'update --init'?")" case "$update_module" in rebase) command="git rebase" - die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$sm_path'")" - say_msg="$(eval_gettext "Submodule path '\$sm_path': rebased into '\$sha1'")" + die_msg="$(eval_gettext "Unable to rebase '\$sha1' in submodule path '\$prefix\$sm_path'")" + say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': rebased into '\$sha1'")" must_die_on_failure=yes ;; merge) command="git merge" - die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$sm_path'")" - say_msg="$(eval_gettext "Submodule path '\$sm_path': merged in '\$sha1'")" + die_msg="$(eval_gettext "Unable to merge '\$sha1' in submodule path '\$prefix\$sm_path'")" + say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': merged in '\$sha1'")" must_die_on_failure=yes ;; *) command="git checkout $subforce -q" - die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$sm_path'")" - say_msg="$(eval_gettext "Submodule path '\$sm_path': checked out '\$sha1'")" + die_msg="$(eval_gettext "Unable to checkout '\$sha1' in submodule path '\$prefix\$sm_path'")" + say_msg="$(eval_gettext "Submodule path '\$prefix\$sm_path': checked out '\$sha1'")" ;; esac @@ -737,11 +812,16 @@ Maybe you want to use 'update --init'?")" if test -n "$recursive" then - (clear_local_git_env; cd "$sm_path" && eval cmd_update "$orig_flags") + ( + prefix="$prefix$sm_path/" + clear_local_git_env + cd "$sm_path" && + eval cmd_update "$orig_flags" + ) res=$? if test $res -gt 0 then - die_msg="$(eval_gettext "Failed to recurse into submodule path '\$sm_path'")" + die_msg="$(eval_gettext "Failed to recurse into submodule path '\$prefix\$sm_path'")" if test $res -eq 1 then err="${err};$die_msg" @@ -976,12 +1056,12 @@ cmd_summary() { done | if test -n "$for_status"; then if [ -n "$files" ]; then - gettextln "# Submodules changed but not updated:" + gettextln "Submodules changed but not updated:" | git stripspace -c else - gettextln "# Submodule changes to be committed:" + gettextln "Submodule changes to be committed:" | git stripspace -c fi - echo "#" - sed -e 's|^|# |' -e 's|^# $|#|' + printf "\n" | git stripspace -c + git stripspace -c else cat fi @@ -1157,7 +1237,7 @@ cmd_sync() while test $# != 0 && test -z "$command" do case "$1" in - add | foreach | init | update | status | summary | sync) + add | foreach | init | deinit | update | status | summary | sync) command=$1 ;; -q|--quiet) diff --git a/git-svn.perl b/git-svn.perl index bd5266c86b..6c7bd95032 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -61,8 +61,6 @@ my $cmd_dir_prefix = eval { command_oneline([qw/rev-parse --show-prefix/], STDERR => 0) } || ''; -my $git_dir_user_set = 1 if defined $ENV{GIT_DIR}; -$ENV{GIT_DIR} ||= '.git'; $Git::SVN::Ra::_log_window_size = 100; if (! exists $ENV{SVN_SSH} && exists $ENV{GIT_SSH}) { @@ -114,6 +112,7 @@ my ($_stdin, $_help, $_edit, $_message, $_file, $_branch_dest, $_template, $_shared, $_version, $_fetch_all, $_no_rebase, $_fetch_parent, + $_before, $_after, $_merge, $_strategy, $_preserve_merges, $_dry_run, $_local, $_prefix, $_no_checkout, $_url, $_verbose, $_commit_url, $_tag, $_merge_info, $_interactive); @@ -258,7 +257,8 @@ my %cmd = ( } ], 'find-rev' => [ \&cmd_find_rev, "Translate between SVN revision numbers and tree-ish", - {} ], + { 'before' => \$_before, + 'after' => \$_after } ], 'rebase' => [ \&cmd_rebase, "Fetch and rebase your working directory", { 'merge|m|M' => \$_merge, 'verbose|v' => \$_verbose, @@ -325,27 +325,20 @@ for (my $i = 0; $i < @ARGV; $i++) { }; # make sure we're always running at the top-level working directory -unless ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { - unless (-d $ENV{GIT_DIR}) { - if ($git_dir_user_set) { - die "GIT_DIR=$ENV{GIT_DIR} explicitly set, ", - "but it is not a directory\n"; - } - my $git_dir = delete $ENV{GIT_DIR}; - my $cdup = undef; - git_cmd_try { - $cdup = command_oneline(qw/rev-parse --show-cdup/); - $git_dir = '.' unless ($cdup); - chomp $cdup if ($cdup); - $cdup = "." unless ($cdup && length $cdup); - } "Already at toplevel, but $git_dir not found\n"; - chdir $cdup or die "Unable to chdir up to '$cdup'\n"; - unless (-d $git_dir) { - die "$git_dir still not found after going to ", - "'$cdup'\n"; - } - $ENV{GIT_DIR} = $git_dir; - } +if ($cmd && $cmd =~ /(?:clone|init|multi-init)$/) { + $ENV{GIT_DIR} ||= ".git"; +} else { + my ($git_dir, $cdup); + git_cmd_try { + $git_dir = command_oneline([qw/rev-parse --git-dir/]); + } "Unable to find .git directory\n"; + git_cmd_try { + $cdup = command_oneline(qw/rev-parse --show-cdup/); + chomp $cdup if ($cdup); + $cdup = "." unless ($cdup && length $cdup); + } "Already at toplevel, but $git_dir not found\n"; + $ENV{GIT_DIR} = $git_dir; + chdir $cdup or die "Unable to chdir up to '$cdup'\n"; $_repository = Git->repository(Repository => $ENV{GIT_DIR}); } @@ -389,7 +382,7 @@ sub usage { my $fd = $exit ? \*STDERR : \*STDOUT; print $fd <<""; git-svn - bidirectional operations between a single Subversion tree and git -Usage: git svn <command> [options] [arguments]\n +usage: git svn <command> [options] [arguments]\n print $fd "Available commands:\n" unless $cmd; @@ -541,7 +534,7 @@ sub cmd_fetch { } my ($remote) = @_; if (@_ > 1) { - die "Usage: $0 fetch [--all] [--parent] [svn-remote]\n"; + die "usage: $0 fetch [--all] [--parent] [svn-remote]\n"; } $Git::SVN::no_reuse_existing = undef; if ($_fetch_parent) { @@ -1191,7 +1184,13 @@ sub cmd_find_rev { "$head history\n"; } my $desired_revision = substr($revision_or_hash, 1); - $result = $gs->rev_map_get($desired_revision, $uuid); + if ($_before) { + $result = $gs->find_rev_before($desired_revision, 1); + } elsif ($_after) { + $result = $gs->find_rev_after($desired_revision, 1); + } else { + $result = $gs->rev_map_get($desired_revision, $uuid); + } } else { my (undef, $rev, undef) = cmt_metadata($revision_or_hash); $result = $rev; @@ -1405,7 +1404,7 @@ sub cmd_multi_fetch { # this command is special because it requires no metadata sub cmd_commit_diff { my ($ta, $tb, $url) = @_; - my $usage = "Usage: $0 commit-diff -r<revision> ". + my $usage = "usage: $0 commit-diff -r<revision> ". "<tree-ish> <tree-ish> [<URL>]"; fatal($usage) if (!defined $ta || !defined $tb); my $svn_path = ''; @@ -6,10 +6,10 @@ #include "run-command.h" const char git_usage_string[] = - "git [--version] [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" + "git [--version] [--help] [-c name=value]\n" + " [--exec-path[=<path>]] [--html-path] [--man-path] [--info-path]\n" " [-p|--paginate|--no-pager] [--no-replace-objects] [--bare]\n" " [--git-dir=<path>] [--work-tree=<path>] [--namespace=<name>]\n" - " [-c name=value] [--help]\n" " <command> [<args>]"; const char git_more_info_string[] = @@ -125,6 +125,7 @@ static int handle_options(const char ***argv, int *argc, int *envchanged) static char git_dir[PATH_MAX+1]; is_bare_repository_cfg = 1; setenv(GIT_DIR_ENVIRONMENT, getcwd(git_dir, sizeof(git_dir)), 0); + setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1); if (envchanged) *envchanged = 1; } else if (!strcmp(cmd, "-c")) { @@ -313,6 +314,7 @@ static void handle_internal_command(int argc, const char **argv) { "bundle", cmd_bundle, RUN_SETUP_GENTLY }, { "cat-file", cmd_cat_file, RUN_SETUP }, { "check-attr", cmd_check_attr, RUN_SETUP }, + { "check-ignore", cmd_check_ignore, RUN_SETUP | NEED_WORK_TREE }, { "check-ref-format", cmd_check_ref_format }, { "checkout", cmd_checkout, RUN_SETUP | NEED_WORK_TREE }, { "checkout-index", cmd_checkout_index, @@ -544,7 +546,7 @@ int main(int argc, const char **argv) commit_pager_choice(); printf("usage: %s\n\n", git_usage_string); list_common_cmds_help(); - printf("\n%s\n", git_more_info_string); + printf("\n%s\n", _(git_more_info_string)); exit(1); } cmd = argv[0]; diff --git a/git_remote_helpers/.gitignore b/git_remote_helpers/.gitignore index 2247d5f95a..cf040af3f5 100644 --- a/git_remote_helpers/.gitignore +++ b/git_remote_helpers/.gitignore @@ -1,2 +1,3 @@ +/GIT-PYTHON-VERSION /build /dist diff --git a/git_remote_helpers/Makefile b/git_remote_helpers/Makefile index 74b05dc91e..3d122328c8 100644 --- a/git_remote_helpers/Makefile +++ b/git_remote_helpers/Makefile @@ -23,10 +23,16 @@ endif PYLIBDIR=$(shell $(PYTHON_PATH) -c \ "import sys; \ - print 'lib/python%i.%i/site-packages' % sys.version_info[:2]") + print('lib/python%i.%i/site-packages' % sys.version_info[:2])") + +py_version=$(shell $(PYTHON_PATH) -c \ + 'import sys; print("%i.%i" % sys.version_info[:2])') all: $(pysetupfile) - $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build + $(QUIET)test "$$(cat GIT-PYTHON-VERSION 2>/dev/null)" = "$(py_version)" || \ + flags=--force; \ + $(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) build $$flags + $(QUIET)echo "$(py_version)" >GIT-PYTHON-VERSION install: $(pysetupfile) $(PYTHON_PATH) $(pysetupfile) install --prefix $(DESTDIR_SQ)$(prefix) @@ -36,4 +42,4 @@ instlibdir: $(pysetupfile) clean: $(QUIET)$(PYTHON_PATH) $(pysetupfile) $(QUIETSETUP) clean -a - $(RM) *.pyo *.pyc + $(RM) *.pyo *.pyc GIT-PYTHON-VERSION diff --git a/git_remote_helpers/git/importer.py b/git_remote_helpers/git/importer.py index e28cc8f986..d3f90e1024 100644 --- a/git_remote_helpers/git/importer.py +++ b/git_remote_helpers/git/importer.py @@ -18,13 +18,16 @@ class GitImporter(object): def get_refs(self, gitdir): """Returns a dictionary with refs. + + Note that the keys in the returned dictionary are byte strings as + read from git. """ args = ["git", "--git-dir=" + gitdir, "for-each-ref", "refs/heads"] - lines = check_output(args).strip().split('\n') + lines = check_output(args).strip().split('\n'.encode('ascii')) refs = {} for line in lines: - value, name = line.split(' ') - name = name.strip('commit\t') + value, name = line.split(' '.encode('ascii')) + name = name.strip('commit\t'.encode('ascii')) refs[name] = value return refs diff --git a/git_remote_helpers/setup.py b/git_remote_helpers/setup.py index 4d434b65cb..6de41deb44 100644 --- a/git_remote_helpers/setup.py +++ b/git_remote_helpers/setup.py @@ -4,6 +4,15 @@ from distutils.core import setup +# If building under Python3 we need to run 2to3 on the code, do this by +# trying to import distutils' 2to3 builder, which is only available in +# Python3. +try: + from distutils.command.build_py import build_py_2to3 as build_py +except ImportError: + # 2.x + from distutils.command.build_py import build_py + setup( name = 'git_remote_helpers', version = '0.1.0', @@ -14,4 +23,5 @@ setup( url = 'http://www.git-scm.com/', package_dir = {'git_remote_helpers': ''}, packages = ['git_remote_helpers', 'git_remote_helpers.git'], + cmdclass = {'build_py': build_py}, ) diff --git a/gitk-git/.gitignore b/gitk-git/.gitignore new file mode 100644 index 0000000000..d7ebcaf366 --- /dev/null +++ b/gitk-git/.gitignore @@ -0,0 +1,2 @@ +/GIT-TCLTK-VARS +/gitk-wish diff --git a/gitk-git/Makefile b/gitk-git/Makefile index e1b6045605..5acdc900ab 100644 --- a/gitk-git/Makefile +++ b/gitk-git/Makefile @@ -17,6 +17,16 @@ DESTDIR_SQ = $(subst ','\'',$(DESTDIR)) bindir_SQ = $(subst ','\'',$(bindir)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) +### Detect Tck/Tk interpreter path changes +TRACK_TCLTK = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)') + +GIT-TCLTK-VARS: FORCE + @VARS='$(TRACK_TCLTK)'; \ + if test x"$$VARS" != x"`cat $@ 2>/dev/null`" ; then \ + echo 1>&2 " * new Tcl/Tk interpreter location"; \ + echo "$$VARS" >$@; \ + fi + ## po-file creation rules XGETTEXT ?= xgettext ifdef NO_MSGFMT @@ -49,9 +59,9 @@ uninstall:: $(RM) '$(DESTDIR_SQ)$(bindir_SQ)'/gitk clean:: - $(RM) gitk-wish po/*.msg + $(RM) gitk-wish po/*.msg GIT-TCLTK-VARS -gitk-wish: gitk +gitk-wish: gitk GIT-TCLTK-VARS $(QUIET_GEN)$(RM) $@ $@+ && \ sed -e '1,3s|^exec .* "$$0"|exec $(subst |,'\|',$(TCLTK_PATH_SQ)) "$$0"|' <gitk >$@+ && \ chmod +x $@+ && \ @@ -65,3 +75,5 @@ $(ALL_MSGFILES): %.msg : %.po @echo Generating catalog $@ $(MSGFMT) --statistics --tcl $< -l $(basename $(notdir $<)) -d $(dir $@) +.PHONY: all install uninstall clean update-po +.PHONY: FORCE diff --git a/gitk-git/gitk b/gitk-git/gitk index d93bd990a9..b3706fc9b9 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2161,7 +2161,7 @@ proc makewindow {} { trace add variable sha1string write sha1change pack $sha1entry -side left -pady 2 - image create bitmap bm-left -data { + set bm_left_data { #define left_width 16 #define left_height 16 static unsigned char left_bits[] = { @@ -2169,7 +2169,7 @@ proc makewindow {} { 0x0e, 0x00, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x0e, 0x00, 0x1c, 0x00, 0x38, 0x00, 0x70, 0x00, 0xe0, 0x00, 0xc0, 0x01}; } - image create bitmap bm-right -data { + set bm_right_data { #define right_width 16 #define right_height 16 static unsigned char right_bits[] = { @@ -2177,11 +2177,24 @@ proc makewindow {} { 0x00, 0x38, 0xff, 0x7f, 0xff, 0x7f, 0xff, 0x7f, 0x00, 0x38, 0x00, 0x1c, 0x00, 0x0e, 0x00, 0x07, 0x80, 0x03, 0xc0, 0x01}; } - ${NS}::button .tf.bar.leftbut -image bm-left -command goback \ - -state disabled -width 26 + image create bitmap bm-left -data $bm_left_data + image create bitmap bm-left-gray -data $bm_left_data -foreground "#999" + image create bitmap bm-right -data $bm_right_data + image create bitmap bm-right-gray -data $bm_right_data -foreground "#999" + + ${NS}::button .tf.bar.leftbut -command goback -state disabled -width 26 + if {$use_ttk} { + .tf.bar.leftbut configure -image [list bm-left disabled bm-left-gray] + } else { + .tf.bar.leftbut configure -image bm-left + } pack .tf.bar.leftbut -side left -fill y - ${NS}::button .tf.bar.rightbut -image bm-right -command goforw \ - -state disabled -width 26 + ${NS}::button .tf.bar.rightbut -command goforw -state disabled -width 26 + if {$use_ttk} { + .tf.bar.rightbut configure -image [list bm-right disabled bm-right-gray] + } else { + .tf.bar.rightbut configure -image bm-right + } pack .tf.bar.rightbut -side left -fill y ${NS}::label .tf.bar.rowlabel -text [mc "Row"] @@ -2361,6 +2374,8 @@ proc makewindow {} { $ctext tag conf mresult -font textfontbold $ctext tag conf msep -font textfontbold $ctext tag conf found -back yellow + $ctext tag conf currentsearchhit -back orange + $ctext tag conf wwrap -wrap word .pwbottom add .bleft if {!$use_ttk} { @@ -2495,10 +2510,9 @@ proc makewindow {} { bindkey ? {dofind -1 1} bindkey f nextfile bind . <F5> updatecommits - bind . <Shift-F5> reloadcommits + bindmodfunctionkey Shift 5 reloadcommits bind . <F2> showrefs - bind . <Shift-F4> {newview 0} - catch { bind . <Shift-Key-XF86_Switch_VT_4> {newview 0} } + bindmodfunctionkey Shift 4 {newview 0} bind . <F4> edit_or_newview bind . <$M1B-q> doquit bind . <$M1B-f> {dofind 1 1} @@ -2523,6 +2537,7 @@ proc makewindow {} { bind $cflist $ctxbut {pop_flist_menu %W %X %Y %x %y} bind $ctext $ctxbut {pop_diff_menu %W %X %Y %x %y} bind $ctext <Button-1> {focus %W} + bind $ctext <<Selection>> rehighlight_search_results set maincursor [. cget -cursor] set textcursor [$ctext cget -cursor] @@ -2646,6 +2661,11 @@ proc bindkey {ev script} { } } +proc bindmodfunctionkey {mod n script} { + bind . <$mod-F$n> $script + catch { bind . <$mod-XF86_Switch_VT_$n> $script } +} + # set the focus back to the toplevel for any click outside # the entry widgets proc click {w} { @@ -2702,7 +2722,7 @@ proc savestuff {w} { global cmitmode wrapcomment datetimeformat limitdiffs global colors uicolor bgcolor fgcolor diffcolors diffcontext selectbgcolor global autoselect autosellen extdifftool perfile_attrs markbgcolor use_ttk - global hideremotes want_ttk + global hideremotes want_ttk maxrefs if {$stuffsaved} return if {![winfo viewable .]} return @@ -2724,6 +2744,7 @@ proc savestuff {w} { puts $f [list set autoselect $autoselect] puts $f [list set autosellen $autosellen] puts $f [list set showneartags $showneartags] + puts $f [list set maxrefs $maxrefs] puts $f [list set hideremotes $hideremotes] puts $f [list set showlocalchanges $showlocalchanges] puts $f [list set datetimeformat $datetimeformat] @@ -3309,6 +3330,7 @@ proc sel_flist {w x y} { } else { catch {$ctext yview [lindex $difffilestart [expr {$l - 2}]]} } + suppress_highlighting_file_for_current_scrollpos } proc pop_flist_menu {w X Y x y} { @@ -6857,7 +6879,7 @@ proc viewnextline {dir} { # add a list of tag or branch names at position pos # returns the number of names inserted proc appendrefs {pos ids var} { - global ctext linknum curview $var maxrefs + global ctext linknum curview $var maxrefs mainheadid if {[catch {$ctext index $pos}]} { return 0 @@ -6870,24 +6892,54 @@ proc appendrefs {pos ids var} { lappend tags [list $tag $id] } } + + set sep {} + set tags [lsort -index 0 -decreasing $tags] + set nutags 0 + if {[llength $tags] > $maxrefs} { - $ctext insert $pos "[mc "many"] ([llength $tags])" - } else { - set tags [lsort -index 0 -decreasing $tags] - set sep {} - foreach ti $tags { - set id [lindex $ti 1] - set lk link$linknum - incr linknum - $ctext tag delete $lk - $ctext insert $pos $sep - $ctext insert $pos [lindex $ti 0] $lk - setlink $id $lk - set sep ", " + # If we are displaying heads, and there are too many, + # see if there are some important heads to display. + # Currently this means "master" and the current head. + set itags {} + if {$var eq "idheads"} { + set utags {} + foreach ti $tags { + set hname [lindex $ti 0] + set id [lindex $ti 1] + if {($hname eq "master" || $id eq $mainheadid) && + [llength $itags] < $maxrefs} { + lappend itags $ti + } else { + lappend utags $ti + } + } + set tags $utags + } + if {$itags ne {}} { + set str [mc "and many more"] + set sep " " + } else { + set str [mc "many"] } + $ctext insert $pos "$str ([llength $tags])" + set nutags [llength $tags] + set tags $itags + } + + foreach ti $tags { + set id [lindex $ti 1] + set lk link$linknum + incr linknum + $ctext tag delete $lk + $ctext insert $pos $sep + $ctext insert $pos [lindex $ti 0] $lk + setlink $id $lk + set sep ", " } + $ctext tag add wwrap "$pos linestart" "$pos lineend" $ctext conf -state disabled - return [llength $tags] + return [expr {[llength $tags] + $nutags}] } # called when we have finished computing the nearby tags @@ -7947,32 +7999,45 @@ proc changediffdisp {} { $ctext tag conf dresult -elide [lindex $diffelide 1] } -proc highlightfile {loc cline} { - global ctext cflist cflist_top +proc highlightfile {cline} { + global cflist cflist_top + + if {![info exists cflist_top]} return - $ctext yview $loc $cflist tag remove highlight $cflist_top.0 "$cflist_top.0 lineend" $cflist tag add highlight $cline.0 "$cline.0 lineend" $cflist see $cline.0 set cflist_top $cline } +proc highlightfile_for_scrollpos {topidx} { + global cmitmode difffilestart + + if {$cmitmode eq "tree"} return + if {![info exists difffilestart]} return + + set top [lindex [split $topidx .] 0] + if {$difffilestart eq {} || $top < [lindex $difffilestart 0]} { + highlightfile 0 + } else { + highlightfile [expr {[bsearch $difffilestart $top] + 2}] + } +} + proc prevfile {} { global difffilestart ctext cmitmode if {$cmitmode eq "tree"} return set prev 0.0 - set prevline 1 set here [$ctext index @0,0] foreach loc $difffilestart { if {[$ctext compare $loc >= $here]} { - highlightfile $prev $prevline + $ctext yview $prev return } set prev $loc - incr prevline } - highlightfile $prev $prevline + $ctext yview $prev } proc nextfile {} { @@ -7980,11 +8045,9 @@ proc nextfile {} { if {$cmitmode eq "tree"} return set here [$ctext index @0,0] - set line 1 foreach loc $difffilestart { - incr line if {[$ctext compare $loc > $here]} { - highlightfile $loc $line + $ctext yview $loc return } } @@ -8030,7 +8093,6 @@ proc settabs {{firstab {}}} { proc incrsearch {name ix op} { global ctext searchstring searchdirn - $ctext tag remove found 1.0 end if {[catch {$ctext index anchor}]} { # no anchor set, use start of selection, or of visible area set sel [$ctext tag ranges sel] @@ -8043,12 +8105,17 @@ proc incrsearch {name ix op} { } } if {$searchstring ne {}} { - set here [$ctext search $searchdirn -- $searchstring anchor] + set here [$ctext search -count mlen $searchdirn -- $searchstring anchor] if {$here ne {}} { $ctext see $here + set mend "$here + $mlen c" + $ctext tag remove sel 1.0 end + $ctext tag add sel $here $mend + suppress_highlighting_file_for_current_scrollpos + highlightfile_for_scrollpos $here } - searchmarkvisible 1 } + rehighlight_search_results } proc dosearch {} { @@ -8071,9 +8138,12 @@ proc dosearch {} { return } $ctext see $match + suppress_highlighting_file_for_current_scrollpos + highlightfile_for_scrollpos $match set mend "$match + $mlen c" $ctext tag add sel $match $mend $ctext mark unset anchor + rehighlight_search_results } } @@ -8097,21 +8167,41 @@ proc dosearchback {} { return } $ctext see $match + suppress_highlighting_file_for_current_scrollpos + highlightfile_for_scrollpos $match set mend "$match + $ml c" $ctext tag add sel $match $mend $ctext mark unset anchor + rehighlight_search_results + } +} + +proc rehighlight_search_results {} { + global ctext searchstring + + $ctext tag remove found 1.0 end + $ctext tag remove currentsearchhit 1.0 end + + if {$searchstring ne {}} { + searchmarkvisible 1 } } proc searchmark {first last} { global ctext searchstring + set sel [$ctext tag ranges sel] + set mend $first.0 while {1} { set match [$ctext search -count mlen -- $searchstring $mend $last.end] if {$match eq {}} break set mend "$match + $mlen c" - $ctext tag add found $match $mend + if {$sel ne {} && [$ctext compare $match == [lindex $sel 0]]} { + $ctext tag add currentsearchhit $match $mend + } else { + $ctext tag add found $match $mend + } } } @@ -8137,8 +8227,23 @@ proc searchmarkvisible {doall} { } } +proc suppress_highlighting_file_for_current_scrollpos {} { + global ctext suppress_highlighting_file_for_this_scrollpos + + set suppress_highlighting_file_for_this_scrollpos [$ctext index @0,0] +} + proc scrolltext {f0 f1} { - global searchstring + global searchstring cmitmode ctext + global suppress_highlighting_file_for_this_scrollpos + + set topidx [$ctext index @0,0] + if {![info exists suppress_highlighting_file_for_this_scrollpos] + || $topidx ne $suppress_highlighting_file_for_this_scrollpos} { + highlightfile_for_scrollpos $topidx + } + + catch {unset suppress_highlighting_file_for_this_scrollpos} .bleft.bottom.sb set $f0 $f1 if {$searchstring ne {}} { @@ -10509,13 +10614,13 @@ proc anctags {id} { # including id itself if it has a head. proc descheads {id} { global arcnos arcstart arcids archeads idheads cached_dheads - global allparents + global allparents arcout if {![info exists allparents($id)]} { return {} } set aret {} - if {[llength $arcnos($id)] == 1 && [llength $allparents($id)] == 1} { + if {![info exists arcout($id)]} { # part-way along an arc; check it first set a [lindex $arcnos($id) 0] if {$archeads($a) ne {}} { @@ -10864,7 +10969,7 @@ proc create_prefs_page {w} { proc prefspage_general {notebook} { global NS maxwidth maxgraphpct showneartags showlocalchanges global tabstop limitdiffs autoselect autosellen extdifftool perfile_attrs - global hideremotes want_ttk have_ttk + global hideremotes want_ttk have_ttk maxrefs set page [create_prefs_page $notebook.general] @@ -10893,9 +10998,12 @@ proc prefspage_general {notebook} { ${NS}::label $page.tabstopl -text [mc "Tab spacing"] spinbox $page.tabstop -from 1 -to 20 -width 4 -textvariable tabstop grid x $page.tabstopl $page.tabstop -sticky w - ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags"] \ + ${NS}::checkbutton $page.ntag -text [mc "Display nearby tags/heads"] \ -variable showneartags grid x $page.ntag -sticky w + ${NS}::label $page.maxrefsl -text [mc "Maximum # tags/heads to show"] + spinbox $page.maxrefs -from 1 -to 1000 -width 4 -textvariable maxrefs + grid x $page.maxrefsl $page.maxrefs -sticky w ${NS}::checkbutton $page.ldiff -text [mc "Limit diffs to listed paths"] \ -variable limitdiffs grid x $page.ldiff -sticky w diff --git a/gitk-git/po/sv.po b/gitk-git/po/sv.po index 2f07a2e2d9..8cc98dc079 100644 --- a/gitk-git/po/sv.po +++ b/gitk-git/po/sv.po @@ -1,40 +1,50 @@ # Swedish translation for gitk -# Copyright (C) 2005-2010 Paul Mackerras +# Copyright (C) 2005-2012 Paul Mackerras # This file is distributed under the same license as the gitk package. # -# Peter Krefting <peter@softwolves.pp.se>, 2008-2010. # Mikael Magnusson <mikachu@gmail.com>, 2008. +# Peter Krefting <peter@softwolves.pp.se>, 2008, 2009, 2010, 2012. +# msgid "" msgstr "" "Project-Id-Version: sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-12 21:14+0100\n" -"PO-Revision-Date: 2010-09-12 21:16+0100\n" +"POT-Creation-Date: 2012-10-03 08:09+0100\n" +"PO-Revision-Date: 2012-10-03 08:13+0100\n" "Last-Translator: Peter Krefting <peter@softwolves.pp.se>\n" "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n" +"Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit" +"Content-Transfer-Encoding: 8bit\n" -#: gitk:115 +#: gitk:140 msgid "Couldn't get list of unmerged files:" msgstr "Kunde inte hämta lista över ej sammanslagna filer:" -#: gitk:274 +#: gitk:210 gitk:2317 +msgid "Color words" +msgstr "Färga ord" + +#: gitk:215 gitk:2317 gitk:7888 gitk:7921 +msgid "Markup words" +msgstr "Märk upp ord" + +#: gitk:312 msgid "Error parsing revisions:" msgstr "Fel vid tolkning av revisioner:" -#: gitk:330 +#: gitk:368 msgid "Error executing --argscmd command:" msgstr "Fel vid körning av --argscmd-kommando:" -#: gitk:343 +#: gitk:381 msgid "No files selected: --merge specified but no files are unmerged." msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer som inte har " "slagits samman." -#: gitk:346 +#: gitk:384 msgid "" "No files selected: --merge specified but no unmerged files are within file " "limit." @@ -42,605 +52,617 @@ msgstr "" "Inga filer valdes: --merge angavs men det finns inga filer inom " "filbegränsningen." -#: gitk:368 gitk:516 +#: gitk:406 gitk:554 msgid "Error executing git log:" msgstr "Fel vid körning av git log:" -#: gitk:386 gitk:532 +#: gitk:424 gitk:570 msgid "Reading" msgstr "Läser" -#: gitk:446 gitk:4271 +#: gitk:484 gitk:4353 msgid "Reading commits..." msgstr "Läser incheckningar..." -#: gitk:449 gitk:1580 gitk:4274 +#: gitk:487 gitk:1625 gitk:4356 msgid "No commits selected" msgstr "Inga incheckningar markerade" -#: gitk:1456 +#: gitk:1499 msgid "Can't parse git log output:" msgstr "Kan inte tolka utdata från git log:" -#: gitk:1676 +#: gitk:1719 msgid "No commit information available" msgstr "Ingen incheckningsinformation är tillgänglig" -#: gitk:1818 +#: gitk:1876 msgid "mc" msgstr "mc" -#: gitk:1853 gitk:4064 gitk:9067 gitk:10607 gitk:10817 +#: gitk:1911 gitk:4146 gitk:9282 gitk:10824 gitk:11100 msgid "OK" msgstr "OK" -#: gitk:1855 gitk:4066 gitk:8657 gitk:8736 gitk:8851 gitk:8900 gitk:9069 -#: gitk:10608 gitk:10818 +#: gitk:1913 gitk:4148 gitk:8871 gitk:8950 gitk:9065 gitk:9114 gitk:9284 +#: gitk:10825 gitk:11101 msgid "Cancel" msgstr "Avbryt" -#: gitk:1980 +#: gitk:2040 msgid "Update" msgstr "Uppdatera" -#: gitk:1981 +#: gitk:2041 msgid "Reload" msgstr "Ladda om" -#: gitk:1982 +#: gitk:2042 msgid "Reread references" msgstr "Läs om referenser" -#: gitk:1983 +#: gitk:2043 msgid "List references" msgstr "Visa referenser" -#: gitk:1985 +#: gitk:2045 msgid "Start git gui" msgstr "Starta git gui" -#: gitk:1987 +#: gitk:2047 msgid "Quit" msgstr "Avsluta" -#: gitk:1979 +#: gitk:2039 msgid "File" msgstr "Arkiv" -#: gitk:1991 +#: gitk:2051 msgid "Preferences" msgstr "Inställningar" -#: gitk:1990 +#: gitk:2050 msgid "Edit" msgstr "Redigera" -#: gitk:1995 +#: gitk:2055 msgid "New view..." msgstr "Ny vy..." -#: gitk:1996 +#: gitk:2056 msgid "Edit view..." msgstr "Ändra vy..." -#: gitk:1997 +#: gitk:2057 msgid "Delete view" msgstr "Ta bort vy" -#: gitk:1999 +#: gitk:2059 msgid "All files" msgstr "Alla filer" -#: gitk:1994 gitk:3817 +#: gitk:2054 gitk:3899 msgid "View" msgstr "Visa" -#: gitk:2004 gitk:2014 gitk:2787 +#: gitk:2064 gitk:2074 gitk:2869 msgid "About gitk" msgstr "Om gitk" -#: gitk:2005 gitk:2019 +#: gitk:2065 gitk:2079 msgid "Key bindings" msgstr "Tangentbordsbindningar" -#: gitk:2003 gitk:2018 +#: gitk:2063 gitk:2078 msgid "Help" msgstr "Hjälp" -#: gitk:2096 gitk:8132 +#: gitk:2156 gitk:8330 msgid "SHA1 ID:" msgstr "SHA1-id:" -#: gitk:2127 +#: gitk:2192 msgid "Row" msgstr "Rad" -#: gitk:2165 +#: gitk:2230 msgid "Find" msgstr "Sök" -#: gitk:2166 +#: gitk:2231 msgid "next" msgstr "nästa" -#: gitk:2167 +#: gitk:2232 msgid "prev" msgstr "föreg" -#: gitk:2168 +#: gitk:2233 msgid "commit" msgstr "incheckning" -#: gitk:2171 gitk:2173 gitk:4432 gitk:4455 gitk:4479 gitk:6420 gitk:6492 -#: gitk:6576 +#: gitk:2236 gitk:2238 gitk:4514 gitk:4537 gitk:4561 gitk:6528 gitk:6600 +#: gitk:6685 msgid "containing:" msgstr "som innehåller:" -#: gitk:2174 gitk:3298 gitk:3303 gitk:4507 +#: gitk:2239 gitk:3381 gitk:3386 gitk:4590 msgid "touching paths:" msgstr "som rör sökväg:" -#: gitk:2175 gitk:4512 +#: gitk:2240 gitk:4604 msgid "adding/removing string:" msgstr "som lägger/till tar bort sträng:" -#: gitk:2184 gitk:2186 +#: gitk:2249 gitk:2251 gitk:4593 msgid "Exact" msgstr "Exakt" -#: gitk:2186 gitk:4587 gitk:6388 +#: gitk:2251 gitk:4679 gitk:6496 msgid "IgnCase" msgstr "IgnVersaler" -#: gitk:2186 gitk:4481 gitk:4585 gitk:6384 +#: gitk:2251 gitk:4563 gitk:4677 gitk:6492 msgid "Regexp" msgstr "Reg.uttr." -#: gitk:2188 gitk:2189 gitk:4606 gitk:4636 gitk:4643 gitk:6512 gitk:6580 +#: gitk:2253 gitk:2254 gitk:4699 gitk:4729 gitk:4736 gitk:6621 gitk:6689 msgid "All fields" msgstr "Alla fält" -#: gitk:2189 gitk:4604 gitk:4636 gitk:6451 +#: gitk:2254 gitk:4696 gitk:4729 gitk:6559 msgid "Headline" msgstr "Rubrik" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6580 gitk:7013 +#: gitk:2255 gitk:4696 gitk:6559 gitk:6689 gitk:7126 msgid "Comments" msgstr "Kommentarer" -#: gitk:2190 gitk:4604 gitk:4608 gitk:4643 gitk:6451 gitk:6948 gitk:8307 -#: gitk:8322 +#: gitk:2255 gitk:4696 gitk:4701 gitk:4736 gitk:6559 gitk:7061 gitk:8505 +#: gitk:8520 msgid "Author" msgstr "Författare" -#: gitk:2190 gitk:4604 gitk:6451 gitk:6950 +#: gitk:2255 gitk:4696 gitk:6559 gitk:7063 msgid "Committer" msgstr "Incheckare" -#: gitk:2221 +#: gitk:2286 msgid "Search" msgstr "Sök" -#: gitk:2229 +#: gitk:2294 msgid "Diff" msgstr "Diff" -#: gitk:2231 +#: gitk:2296 msgid "Old version" msgstr "Gammal version" -#: gitk:2233 +#: gitk:2298 msgid "New version" msgstr "Ny version" -#: gitk:2235 +#: gitk:2300 msgid "Lines of context" msgstr "Rader sammanhang" -#: gitk:2245 +#: gitk:2310 msgid "Ignore space change" msgstr "Ignorera ändringar i blanksteg" -#: gitk:2304 +#: gitk:2314 gitk:2316 gitk:7646 gitk:7874 +msgid "Line diff" +msgstr "Rad-diff" + +#: gitk:2379 msgid "Patch" msgstr "Patch" -#: gitk:2306 +#: gitk:2381 msgid "Tree" msgstr "Träd" -#: gitk:2463 gitk:2480 +#: gitk:2540 gitk:2559 msgid "Diff this -> selected" msgstr "Diff denna -> markerad" -#: gitk:2464 gitk:2481 +#: gitk:2541 gitk:2560 msgid "Diff selected -> this" msgstr "Diff markerad -> denna" -#: gitk:2465 gitk:2482 +#: gitk:2542 gitk:2561 msgid "Make patch" msgstr "Skapa patch" -#: gitk:2466 gitk:8715 +#: gitk:2543 gitk:8929 msgid "Create tag" msgstr "Skapa tagg" -#: gitk:2467 gitk:8831 +#: gitk:2544 gitk:9045 msgid "Write commit to file" msgstr "Skriv incheckning till fil" -#: gitk:2468 gitk:8888 +#: gitk:2545 gitk:9102 msgid "Create new branch" msgstr "Skapa ny gren" -#: gitk:2469 +#: gitk:2546 msgid "Cherry-pick this commit" msgstr "Plocka denna incheckning" -#: gitk:2470 +#: gitk:2547 msgid "Reset HEAD branch to here" msgstr "Återställ HEAD-grenen hit" -#: gitk:2471 +#: gitk:2548 msgid "Mark this commit" msgstr "Markera denna incheckning" -#: gitk:2472 +#: gitk:2549 msgid "Return to mark" msgstr "Återgå till markering" -#: gitk:2473 +#: gitk:2550 msgid "Find descendant of this and mark" msgstr "Hitta efterföljare till denna och markera" -#: gitk:2474 +#: gitk:2551 msgid "Compare with marked commit" msgstr "Jämför med markerad incheckning" -#: gitk:2488 +#: gitk:2552 gitk:2562 +msgid "Diff this -> marked commit" +msgstr "Diff denna -> markerad incheckning" + +#: gitk:2553 gitk:2563 +msgid "Diff marked commit -> this" +msgstr "Diff markerad incheckning -> denna" + +#: gitk:2569 msgid "Check out this branch" msgstr "Checka ut denna gren" -#: gitk:2489 +#: gitk:2570 msgid "Remove this branch" msgstr "Ta bort denna gren" -#: gitk:2496 +#: gitk:2577 msgid "Highlight this too" msgstr "Markera även detta" -#: gitk:2497 +#: gitk:2578 msgid "Highlight this only" msgstr "Markera bara detta" -#: gitk:2498 +#: gitk:2579 msgid "External diff" msgstr "Extern diff" -#: gitk:2499 +#: gitk:2580 msgid "Blame parent commit" msgstr "Klandra föräldraincheckning" -#: gitk:2506 +#: gitk:2587 msgid "Show origin of this line" msgstr "Visa ursprunget för den här raden" -#: gitk:2507 +#: gitk:2588 msgid "Run git gui blame on this line" msgstr "Kör git gui blame på den här raden" -#: gitk:2789 +#: gitk:2871 msgid "" "\n" "Gitk - a commit viewer for git\n" "\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" +"Copyright ©9 2005-2011 Paul Mackerras\n" "\n" "Use and redistribute under the terms of the GNU General Public License" msgstr "" "\n" "Gitk - en incheckningsvisare för git\n" "\n" -"Copyright ©9 2005-2010 Paul Mackerras\n" +"Copyright ©9 2005-2011 Paul Mackerras\n" "\n" "Använd och vidareförmedla enligt villkoren i GNU General Public License" -#: gitk:2797 gitk:2862 gitk:9253 +#: gitk:2879 gitk:2944 gitk:9468 msgid "Close" msgstr "Stäng" -#: gitk:2818 +#: gitk:2900 msgid "Gitk key bindings" msgstr "Tangentbordsbindningar för Gitk" -#: gitk:2821 +#: gitk:2903 msgid "Gitk key bindings:" msgstr "Tangentbordsbindningar för Gitk:" -#: gitk:2823 +#: gitk:2905 #, tcl-format msgid "<%s-Q>\t\tQuit" msgstr "<%s-Q>\t\tAvsluta" -#: gitk:2824 +#: gitk:2906 #, tcl-format msgid "<%s-W>\t\tClose window" msgstr "<%s-W>\t\tStäng fönster" -#: gitk:2825 +#: gitk:2907 msgid "<Home>\t\tMove to first commit" msgstr "<Home>\t\tGå till första incheckning" -#: gitk:2826 +#: gitk:2908 msgid "<End>\t\tMove to last commit" msgstr "<End>\t\tGå till sista incheckning" -#: gitk:2827 -msgid "<Up>, p, i\tMove up one commit" -msgstr "<Upp>, p, i\tGå en incheckning upp" +#: gitk:2909 +msgid "<Up>, p, k\tMove up one commit" +msgstr "<Upp>, p, k\tGå en incheckning upp" -#: gitk:2828 -msgid "<Down>, n, k\tMove down one commit" -msgstr "<Ned>, n, k\tGå en incheckning ned" +#: gitk:2910 +msgid "<Down>, n, j\tMove down one commit" +msgstr "<Ned>, n, j\tGå en incheckning ned" -#: gitk:2829 -msgid "<Left>, z, j\tGo back in history list" -msgstr "<Vänster>, z, j\tGå bakåt i historiken" +#: gitk:2911 +msgid "<Left>, z, h\tGo back in history list" +msgstr "<Vänster>, z, h\tGå bakåt i historiken" -#: gitk:2830 +#: gitk:2912 msgid "<Right>, x, l\tGo forward in history list" msgstr "<Höger>, x, l\tGå framåt i historiken" -#: gitk:2831 +#: gitk:2913 msgid "<PageUp>\tMove up one page in commit list" msgstr "<PageUp>\tGå upp en sida i incheckningslistan" -#: gitk:2832 +#: gitk:2914 msgid "<PageDown>\tMove down one page in commit list" msgstr "<PageDown>\tGå ned en sida i incheckningslistan" -#: gitk:2833 +#: gitk:2915 #, tcl-format msgid "<%s-Home>\tScroll to top of commit list" msgstr "<%s-Home>\tRulla till början av incheckningslistan" -#: gitk:2834 +#: gitk:2916 #, tcl-format msgid "<%s-End>\tScroll to bottom of commit list" msgstr "<%s-End>\tRulla till slutet av incheckningslistan" -#: gitk:2835 +#: gitk:2917 #, tcl-format msgid "<%s-Up>\tScroll commit list up one line" msgstr "<%s-Upp>\tRulla incheckningslistan upp ett steg" -#: gitk:2836 +#: gitk:2918 #, tcl-format msgid "<%s-Down>\tScroll commit list down one line" msgstr "<%s-Ned>\tRulla incheckningslistan ned ett steg" -#: gitk:2837 +#: gitk:2919 #, tcl-format msgid "<%s-PageUp>\tScroll commit list up one page" msgstr "<%s-PageUp>\tRulla incheckningslistan upp en sida" -#: gitk:2838 +#: gitk:2920 #, tcl-format msgid "<%s-PageDown>\tScroll commit list down one page" msgstr "<%s-PageDown>\tRulla incheckningslistan ned en sida" -#: gitk:2839 +#: gitk:2921 msgid "<Shift-Up>\tFind backwards (upwards, later commits)" msgstr "<Skift-Upp>\tSök bakåt (uppåt, senare incheckningar)" -#: gitk:2840 +#: gitk:2922 msgid "<Shift-Down>\tFind forwards (downwards, earlier commits)" msgstr "<Skift-Ned>\tSök framåt (nedåt, tidigare incheckningar)" -#: gitk:2841 +#: gitk:2923 msgid "<Delete>, b\tScroll diff view up one page" msgstr "<Delete>, b\tRulla diffvisningen upp en sida" -#: gitk:2842 +#: gitk:2924 msgid "<Backspace>\tScroll diff view up one page" msgstr "<Baksteg>\tRulla diffvisningen upp en sida" -#: gitk:2843 +#: gitk:2925 msgid "<Space>\t\tScroll diff view down one page" msgstr "<Blanksteg>\tRulla diffvisningen ned en sida" -#: gitk:2844 +#: gitk:2926 msgid "u\t\tScroll diff view up 18 lines" msgstr "u\t\tRulla diffvisningen upp 18 rader" -#: gitk:2845 +#: gitk:2927 msgid "d\t\tScroll diff view down 18 lines" msgstr "d\t\tRulla diffvisningen ned 18 rader" -#: gitk:2846 +#: gitk:2928 #, tcl-format msgid "<%s-F>\t\tFind" msgstr "<%s-F>\t\tSök" -#: gitk:2847 +#: gitk:2929 #, tcl-format msgid "<%s-G>\t\tMove to next find hit" msgstr "<%s-G>\t\tGå till nästa sökträff" -#: gitk:2848 +#: gitk:2930 msgid "<Return>\tMove to next find hit" msgstr "<Return>\t\tGå till nästa sökträff" -#: gitk:2849 +#: gitk:2931 msgid "/\t\tFocus the search box" msgstr "/\t\tFokusera sökrutan" -#: gitk:2850 +#: gitk:2932 msgid "?\t\tMove to previous find hit" msgstr "?\t\tGå till föregående sökträff" -#: gitk:2851 +#: gitk:2933 msgid "f\t\tScroll diff view to next file" msgstr "f\t\tRulla diffvisningen till nästa fil" -#: gitk:2852 +#: gitk:2934 #, tcl-format msgid "<%s-S>\t\tSearch for next hit in diff view" msgstr "<%s-S>\t\tGå till nästa sökträff i diffvisningen" -#: gitk:2853 +#: gitk:2935 #, tcl-format msgid "<%s-R>\t\tSearch for previous hit in diff view" msgstr "<%s-R>\t\tGå till föregående sökträff i diffvisningen" -#: gitk:2854 +#: gitk:2936 #, tcl-format msgid "<%s-KP+>\tIncrease font size" msgstr "<%s-Num+>\tÖka teckenstorlek" -#: gitk:2855 +#: gitk:2937 #, tcl-format msgid "<%s-plus>\tIncrease font size" msgstr "<%s-plus>\tÖka teckenstorlek" -#: gitk:2856 +#: gitk:2938 #, tcl-format msgid "<%s-KP->\tDecrease font size" msgstr "<%s-Num->\tMinska teckenstorlek" -#: gitk:2857 +#: gitk:2939 #, tcl-format msgid "<%s-minus>\tDecrease font size" msgstr "<%s-minus>\tMinska teckenstorlek" -#: gitk:2858 +#: gitk:2940 msgid "<F5>\t\tUpdate" msgstr "<F5>\t\tUppdatera" -#: gitk:3313 gitk:3322 +#: gitk:3395 gitk:3404 #, tcl-format msgid "Error creating temporary directory %s:" msgstr "Fel vid skapande av temporär katalog %s:" -#: gitk:3335 +#: gitk:3417 #, tcl-format msgid "Error getting \"%s\" from %s:" msgstr "Fel vid hämtning av \"%s\" från %s:" -#: gitk:3398 +#: gitk:3480 msgid "command failed:" msgstr "kommando misslyckades:" -#: gitk:3547 +#: gitk:3629 msgid "No such commit" msgstr "Incheckning saknas" -#: gitk:3561 +#: gitk:3643 msgid "git gui blame: command failed:" msgstr "git gui blame: kommando misslyckades:" -#: gitk:3592 +#: gitk:3674 #, tcl-format msgid "Couldn't read merge head: %s" msgstr "Kunde inte läsa sammanslagningshuvud: %s" -#: gitk:3600 +#: gitk:3682 #, tcl-format msgid "Error reading index: %s" msgstr "Fel vid läsning av index: %s" -#: gitk:3625 +#: gitk:3707 #, tcl-format msgid "Couldn't start git blame: %s" msgstr "Kunde inte starta git blame: %s" -#: gitk:3628 gitk:6419 +#: gitk:3710 gitk:6527 msgid "Searching" msgstr "Söker" -#: gitk:3660 +#: gitk:3742 #, tcl-format msgid "Error running git blame: %s" msgstr "Fel vid körning av git blame: %s" -#: gitk:3688 +#: gitk:3770 #, tcl-format msgid "That line comes from commit %s, which is not in this view" msgstr "Raden kommer från incheckningen %s, som inte finns i denna vy" -#: gitk:3702 +#: gitk:3784 msgid "External diff viewer failed:" msgstr "Externt diff-verktyg misslyckades:" -#: gitk:3820 +#: gitk:3902 msgid "Gitk view definition" msgstr "Definition av Gitk-vy" -#: gitk:3824 +#: gitk:3906 msgid "Remember this view" msgstr "Spara denna vy" -#: gitk:3825 +#: gitk:3907 msgid "References (space separated list):" msgstr "Referenser (blankstegsavdelad lista):" -#: gitk:3826 +#: gitk:3908 msgid "Branches & tags:" msgstr "Grenar & taggar:" -#: gitk:3827 +#: gitk:3909 msgid "All refs" msgstr "Alla referenser" -#: gitk:3828 +#: gitk:3910 msgid "All (local) branches" msgstr "Alla (lokala) grenar" -#: gitk:3829 +#: gitk:3911 msgid "All tags" msgstr "Alla taggar" -#: gitk:3830 +#: gitk:3912 msgid "All remote-tracking branches" msgstr "Alla fjärrspårande grenar" -#: gitk:3831 +#: gitk:3913 msgid "Commit Info (regular expressions):" msgstr "Incheckningsinfo (reguljära uttryck):" -#: gitk:3832 +#: gitk:3914 msgid "Author:" msgstr "Författare:" -#: gitk:3833 +#: gitk:3915 msgid "Committer:" msgstr "Incheckare:" -#: gitk:3834 +#: gitk:3916 msgid "Commit Message:" msgstr "Incheckningsmeddelande:" -#: gitk:3835 +#: gitk:3917 msgid "Matches all Commit Info criteria" msgstr "Motsvarar alla kriterier för incheckningsinfo" -#: gitk:3836 +#: gitk:3918 msgid "Changes to Files:" msgstr "Ändringar av filer:" -#: gitk:3837 +#: gitk:3919 msgid "Fixed String" msgstr "Fast sträng" -#: gitk:3838 +#: gitk:3920 msgid "Regular Expression" msgstr "Reguljärt uttryck" -#: gitk:3839 +#: gitk:3921 msgid "Search string:" msgstr "Söksträng:" -#: gitk:3840 +#: gitk:3922 msgid "" "Commit Dates (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" @@ -648,201 +670,197 @@ msgstr "" "Incheckingsdatum (\"2 weeks ago\", \"2009-03-17 15:27:38\", \"March 17, 2009 " "15:27:38\"):" -#: gitk:3841 +#: gitk:3923 msgid "Since:" msgstr "Från:" -#: gitk:3842 +#: gitk:3924 msgid "Until:" msgstr "Till:" -#: gitk:3843 +#: gitk:3925 msgid "Limit and/or skip a number of revisions (positive integer):" msgstr "Begränsa och/eller hoppa över ett antal revisioner (positivt heltal):" -#: gitk:3844 +#: gitk:3926 msgid "Number to show:" msgstr "Antal att visa:" -#: gitk:3845 +#: gitk:3927 msgid "Number to skip:" msgstr "Antal att hoppa över:" -#: gitk:3846 +#: gitk:3928 msgid "Miscellaneous options:" msgstr "Diverse alternativ:" -#: gitk:3847 +#: gitk:3929 msgid "Strictly sort by date" msgstr "Strikt datumsortering" -#: gitk:3848 +#: gitk:3930 msgid "Mark branch sides" msgstr "Markera sidogrenar" -#: gitk:3849 +#: gitk:3931 msgid "Limit to first parent" msgstr "Begränsa till första förälder" -#: gitk:3850 +#: gitk:3932 msgid "Simple history" msgstr "Enkel historik" -#: gitk:3851 +#: gitk:3933 msgid "Additional arguments to git log:" msgstr "Ytterligare argument till git log:" -#: gitk:3852 +#: gitk:3934 msgid "Enter files and directories to include, one per line:" msgstr "Ange filer och kataloger att ta med, en per rad:" -#: gitk:3853 +#: gitk:3935 msgid "Command to generate more commits to include:" msgstr "Kommando för att generera fler incheckningar att ta med:" -#: gitk:3977 +#: gitk:4059 msgid "Gitk: edit view" msgstr "Gitk: redigera vy" -#: gitk:3985 +#: gitk:4067 msgid "-- criteria for selecting revisions" msgstr " - kriterier för val av revisioner" -#: gitk:3990 +#: gitk:4072 msgid "View Name" msgstr "Namn på vy" -#: gitk:4065 +#: gitk:4147 msgid "Apply (F5)" msgstr "Använd (F5)" -#: gitk:4103 +#: gitk:4185 msgid "Error in commit selection arguments:" msgstr "Fel i argument för val av incheckningar:" -#: gitk:4156 gitk:4208 gitk:4656 gitk:4670 gitk:5931 gitk:11551 gitk:11552 +#: gitk:4238 gitk:4290 gitk:4749 gitk:4763 gitk:6027 gitk:11849 gitk:11850 msgid "None" msgstr "Inget" -#: gitk:4604 gitk:6451 gitk:8309 gitk:8324 -msgid "Date" -msgstr "Datum" - -#: gitk:4604 gitk:6451 -msgid "CDate" -msgstr "Skapat datum" - -#: gitk:4753 gitk:4758 +#: gitk:4846 gitk:4851 msgid "Descendant" msgstr "Avkomling" -#: gitk:4754 +#: gitk:4847 msgid "Not descendant" msgstr "Inte avkomling" -#: gitk:4761 gitk:4766 +#: gitk:4854 gitk:4859 msgid "Ancestor" msgstr "Förfader" -#: gitk:4762 +#: gitk:4855 msgid "Not ancestor" msgstr "Inte förfader" -#: gitk:5052 +#: gitk:5145 msgid "Local changes checked in to index but not committed" msgstr "Lokala ändringar sparade i indexet men inte incheckade" -#: gitk:5088 +#: gitk:5181 msgid "Local uncommitted changes, not checked in to index" msgstr "Lokala ändringar, ej sparade i indexet" -#: gitk:6769 +#: gitk:6882 msgid "many" msgstr "många" -#: gitk:6952 +#: gitk:7065 msgid "Tags:" msgstr "Taggar:" -#: gitk:6969 gitk:6975 gitk:8302 +#: gitk:7082 gitk:7088 gitk:8500 msgid "Parent" msgstr "Förälder" -#: gitk:6980 +#: gitk:7093 msgid "Child" msgstr "Barn" -#: gitk:6989 +#: gitk:7102 msgid "Branch" msgstr "Gren" -#: gitk:6992 +#: gitk:7105 msgid "Follows" msgstr "Följer" -#: gitk:6995 +#: gitk:7108 msgid "Precedes" msgstr "Föregår" -#: gitk:7532 +#: gitk:7653 #, tcl-format msgid "Error getting diffs: %s" msgstr "Fel vid hämtning av diff: %s" -#: gitk:8130 +#: gitk:8328 msgid "Goto:" msgstr "Gå till:" -#: gitk:8151 +#: gitk:8349 #, tcl-format msgid "Short SHA1 id %s is ambiguous" msgstr "Förkortat SHA1-id %s är tvetydigt" -#: gitk:8158 +#: gitk:8356 #, tcl-format msgid "Revision %s is not known" msgstr "Revisionen %s är inte känd" -#: gitk:8168 +#: gitk:8366 #, tcl-format msgid "SHA1 id %s is not known" msgstr "SHA-id:t %s är inte känt" -#: gitk:8170 +#: gitk:8368 #, tcl-format msgid "Revision %s is not in the current view" msgstr "Revisionen %s finns inte i den nuvarande vyn" -#: gitk:8312 +#: gitk:8507 gitk:8522 +msgid "Date" +msgstr "Datum" + +#: gitk:8510 msgid "Children" msgstr "Barn" -#: gitk:8370 +#: gitk:8573 #, tcl-format msgid "Reset %s branch to here" msgstr "Återställ grenen %s hit" -#: gitk:8372 +#: gitk:8575 msgid "Detached head: can't reset" msgstr "Frånkopplad head: kan inte återställa" -#: gitk:8481 gitk:8487 +#: gitk:8680 gitk:8686 msgid "Skipping merge commit " msgstr "Hoppar över sammanslagningsincheckning " -#: gitk:8496 gitk:8501 +#: gitk:8695 gitk:8700 msgid "Error getting patch ID for " msgstr "Fel vid hämtning av patch-id för " -#: gitk:8497 gitk:8502 +#: gitk:8696 gitk:8701 msgid " - stopping\n" msgstr " - stannar\n" -#: gitk:8507 gitk:8510 gitk:8518 gitk:8532 gitk:8541 +#: gitk:8706 gitk:8709 gitk:8717 gitk:8731 gitk:8740 msgid "Commit " msgstr "Incheckning " -#: gitk:8511 +#: gitk:8710 msgid "" " is the same patch as\n" " " @@ -850,7 +868,7 @@ msgstr "" " är samma patch som\n" " " -#: gitk:8519 +#: gitk:8718 msgid "" " differs from\n" " " @@ -858,7 +876,7 @@ msgstr "" " skiljer sig från\n" " " -#: gitk:8521 +#: gitk:8720 msgid "" "Diff of commits:\n" "\n" @@ -866,131 +884,131 @@ msgstr "" "Skillnad mellan incheckningar:\n" "\n" -#: gitk:8533 gitk:8542 +#: gitk:8732 gitk:8741 #, tcl-format msgid " has %s children - stopping\n" msgstr " har %s barn - stannar\n" -#: gitk:8561 +#: gitk:8760 #, tcl-format msgid "Error writing commit to file: %s" msgstr "Fel vid skrivning av incheckning till fil: %s" -#: gitk:8567 +#: gitk:8766 #, tcl-format msgid "Error diffing commits: %s" msgstr "Fel vid jämförelse av incheckningar: %s" -#: gitk:8598 +#: gitk:8812 msgid "Top" msgstr "Topp" -#: gitk:8599 +#: gitk:8813 msgid "From" msgstr "Från" -#: gitk:8604 +#: gitk:8818 msgid "To" msgstr "Till" -#: gitk:8628 +#: gitk:8842 msgid "Generate patch" msgstr "Generera patch" -#: gitk:8630 +#: gitk:8844 msgid "From:" msgstr "Från:" -#: gitk:8639 +#: gitk:8853 msgid "To:" msgstr "Till:" -#: gitk:8648 +#: gitk:8862 msgid "Reverse" msgstr "Vänd" -#: gitk:8650 gitk:8845 +#: gitk:8864 gitk:9059 msgid "Output file:" msgstr "Utdatafil:" -#: gitk:8656 +#: gitk:8870 msgid "Generate" msgstr "Generera" -#: gitk:8694 +#: gitk:8908 msgid "Error creating patch:" msgstr "Fel vid generering av patch:" -#: gitk:8717 gitk:8833 gitk:8890 +#: gitk:8931 gitk:9047 gitk:9104 msgid "ID:" msgstr "Id:" -#: gitk:8726 +#: gitk:8940 msgid "Tag name:" msgstr "Taggnamn:" -#: gitk:8729 +#: gitk:8943 msgid "Tag message is optional" msgstr "Taggmeddelandet är valfritt" -#: gitk:8731 +#: gitk:8945 msgid "Tag message:" msgstr "Taggmeddelande:" -#: gitk:8735 gitk:8899 +#: gitk:8949 gitk:9113 msgid "Create" msgstr "Skapa" -#: gitk:8753 +#: gitk:8967 msgid "No tag name specified" msgstr "Inget taggnamn angavs" -#: gitk:8757 +#: gitk:8971 #, tcl-format msgid "Tag \"%s\" already exists" msgstr "Taggen \"%s\" finns redan" -#: gitk:8767 +#: gitk:8981 msgid "Error creating tag:" msgstr "Fel vid skapande av tagg:" -#: gitk:8842 +#: gitk:9056 msgid "Command:" msgstr "Kommando:" -#: gitk:8850 +#: gitk:9064 msgid "Write" msgstr "Skriv" -#: gitk:8868 +#: gitk:9082 msgid "Error writing commit:" msgstr "Fel vid skrivning av incheckning:" -#: gitk:8895 +#: gitk:9109 msgid "Name:" msgstr "Namn:" -#: gitk:8918 +#: gitk:9132 msgid "Please specify a name for the new branch" msgstr "Ange ett namn för den nya grenen" -#: gitk:8923 +#: gitk:9137 #, tcl-format msgid "Branch '%s' already exists. Overwrite?" msgstr "Grenen \"%s\" finns redan. Skriva över?" -#: gitk:8989 +#: gitk:9204 #, tcl-format msgid "Commit %s is already included in branch %s -- really re-apply it?" msgstr "" "Incheckningen %s finns redan på grenen %s -- skall den verkligen appliceras " "på nytt?" -#: gitk:8994 +#: gitk:9209 msgid "Cherry-picking" msgstr "Plockar" -#: gitk:9003 +#: gitk:9218 #, tcl-format msgid "" "Cherry-pick failed because of local changes to file '%s'.\n" @@ -1000,7 +1018,7 @@ msgstr "" "Checka in, återställ eller spara undan (stash) dina ändringar och försök " "igen." -#: gitk:9009 +#: gitk:9224 msgid "" "Cherry-pick failed because of merge conflict.\n" "Do you wish to run git citool to resolve it?" @@ -1008,32 +1026,32 @@ msgstr "" "Cherry-pick misslyckades på grund av en sammanslagningskonflikt.\n" "Vill du köra git citool för att lösa den?" -#: gitk:9025 +#: gitk:9240 msgid "No changes committed" msgstr "Inga ändringar incheckade" -#: gitk:9051 +#: gitk:9266 msgid "Confirm reset" msgstr "Bekräfta återställning" -#: gitk:9053 +#: gitk:9268 #, tcl-format msgid "Reset branch %s to %s?" msgstr "Återställa grenen %s till %s?" -#: gitk:9055 +#: gitk:9270 msgid "Reset type:" msgstr "Typ av återställning:" -#: gitk:9058 +#: gitk:9273 msgid "Soft: Leave working tree and index untouched" msgstr "Mjuk: Rör inte utcheckning och index" -#: gitk:9061 +#: gitk:9276 msgid "Mixed: Leave working tree untouched, reset index" msgstr "Blandad: Rör inte utcheckning, återställ index" -#: gitk:9064 +#: gitk:9279 msgid "" "Hard: Reset working tree and index\n" "(discard ALL local changes)" @@ -1041,19 +1059,19 @@ msgstr "" "Hård: Återställ utcheckning och index\n" "(förkastar ALLA lokala ändringar)" -#: gitk:9081 +#: gitk:9296 msgid "Resetting" msgstr "Återställer" -#: gitk:9141 +#: gitk:9356 msgid "Checking out" msgstr "Checkar ut" -#: gitk:9194 +#: gitk:9409 msgid "Cannot delete the currently checked-out branch" msgstr "Kan inte ta bort den just nu utcheckade grenen" -#: gitk:9200 +#: gitk:9415 #, tcl-format msgid "" "The commits on branch %s aren't on any other branch.\n" @@ -1062,16 +1080,16 @@ msgstr "" "Incheckningarna på grenen %s existerar inte på någon annan gren.\n" "Vill du verkligen ta bort grenen %s?" -#: gitk:9231 +#: gitk:9446 #, tcl-format msgid "Tags and heads: %s" msgstr "Taggar och huvuden: %s" -#: gitk:9246 +#: gitk:9461 msgid "Filter" msgstr "Filter" -#: gitk:9541 +#: gitk:9757 msgid "" "Error reading commit topology information; branch and preceding/following " "tag information will be incomplete." @@ -1079,206 +1097,219 @@ msgstr "" "Fel vid läsning av information om incheckningstopologi; information om " "grenar och föregående/senare taggar kommer inte vara komplett." -#: gitk:10527 +#: gitk:10744 msgid "Tag" msgstr "Tagg" -#: gitk:10527 +#: gitk:10744 msgid "Id" msgstr "Id" -#: gitk:10576 +#: gitk:10793 msgid "Gitk font chooser" msgstr "Teckensnittsväljare för Gitk" -#: gitk:10593 +#: gitk:10810 msgid "B" msgstr "F" -#: gitk:10596 +#: gitk:10813 msgid "I" msgstr "K" -#: gitk:10714 -msgid "Gitk preferences" -msgstr "Inställningar för Gitk" - -#: gitk:10716 +#: gitk:10931 msgid "Commit list display options" msgstr "Alternativ för incheckningslistvy" -#: gitk:10719 +#: gitk:10934 msgid "Maximum graph width (lines)" msgstr "Maximal grafbredd (rader)" -#: gitk:10722 +#: gitk:10937 #, tcl-format msgid "Maximum graph width (% of pane)" msgstr "Maximal grafbredd (% av ruta)" -#: gitk:10725 +#: gitk:10940 msgid "Show local changes" msgstr "Visa lokala ändringar" -#: gitk:10728 -msgid "Auto-select SHA1" -msgstr "Välj SHA1 automatiskt" +#: gitk:10943 +msgid "Auto-select SHA1 (length)" +msgstr "Välj SHA1 (längd) automatiskt" -#: gitk:10731 +#: gitk:10947 msgid "Hide remote refs" msgstr "Dölj fjärr-referenser" -#: gitk:10735 +#: gitk:10951 msgid "Diff display options" msgstr "Alternativ för diffvy" -#: gitk:10737 +#: gitk:10953 msgid "Tab spacing" msgstr "Blanksteg för tabulatortecken" -#: gitk:10740 +#: gitk:10956 msgid "Display nearby tags" msgstr "Visa närliggande taggar" -#: gitk:10743 +#: gitk:10959 msgid "Limit diffs to listed paths" msgstr "Begränsa diff till listade sökvägar" -#: gitk:10746 +#: gitk:10962 msgid "Support per-file encodings" msgstr "Stöd för filspecifika teckenkodningar" -#: gitk:10752 gitk:10832 +#: gitk:10968 gitk:11115 msgid "External diff tool" msgstr "Externt diff-verktyg" -#: gitk:10753 +#: gitk:10969 msgid "Choose..." msgstr "Välj..." -#: gitk:10758 +#: gitk:10974 msgid "General options" msgstr "Allmänna inställningar" -#: gitk:10761 +#: gitk:10977 msgid "Use themed widgets" msgstr "Använd tema på fönsterelement" -#: gitk:10763 +#: gitk:10979 msgid "(change requires restart)" msgstr "(ändringen kräver omstart)" -#: gitk:10765 +#: gitk:10981 msgid "(currently unavailable)" msgstr "(för närvarande inte tillgängligt)" -#: gitk:10769 +#: gitk:10992 msgid "Colors: press to choose" msgstr "Färger: tryck för att välja" -#: gitk:10772 +#: gitk:10995 msgid "Interface" msgstr "Gränssnitt" -#: gitk:10773 +#: gitk:10996 msgid "interface" msgstr "gränssnitt" -#: gitk:10776 +#: gitk:10999 msgid "Background" msgstr "Bakgrund" -#: gitk:10777 gitk:10807 +#: gitk:11000 gitk:11030 msgid "background" msgstr "bakgrund" -#: gitk:10780 +#: gitk:11003 msgid "Foreground" msgstr "Förgrund" -#: gitk:10781 +#: gitk:11004 msgid "foreground" msgstr "förgrund" -#: gitk:10784 +#: gitk:11007 msgid "Diff: old lines" msgstr "Diff: gamla rader" -#: gitk:10785 +#: gitk:11008 msgid "diff old lines" msgstr "diff gamla rader" -#: gitk:10789 +#: gitk:11012 msgid "Diff: new lines" msgstr "Diff: nya rader" -#: gitk:10790 +#: gitk:11013 msgid "diff new lines" msgstr "diff nya rader" -#: gitk:10794 +#: gitk:11017 msgid "Diff: hunk header" msgstr "Diff: delhuvud" -#: gitk:10796 +#: gitk:11019 msgid "diff hunk header" msgstr "diff delhuvud" -#: gitk:10800 +#: gitk:11023 msgid "Marked line bg" msgstr "Markerad rad bakgrund" -#: gitk:10802 +#: gitk:11025 msgid "marked line background" msgstr "markerad rad bakgrund" -#: gitk:10806 +#: gitk:11029 msgid "Select bg" msgstr "Markerad bakgrund" -#: gitk:10810 +#: gitk:11038 msgid "Fonts: press to choose" msgstr "Teckensnitt: tryck för att välja" -#: gitk:10812 +#: gitk:11040 msgid "Main font" msgstr "Huvudteckensnitt" -#: gitk:10813 +#: gitk:11041 msgid "Diff display font" msgstr "Teckensnitt för diffvisning" -#: gitk:10814 +#: gitk:11042 msgid "User interface font" msgstr "Teckensnitt för användargränssnitt" -#: gitk:10842 +#: gitk:11064 +msgid "Gitk preferences" +msgstr "Inställningar för Gitk" + +#: gitk:11073 +msgid "General" +msgstr "Allmänt" + +#: gitk:11074 +msgid "Colors" +msgstr "Färger" + +#: gitk:11075 +msgid "Fonts" +msgstr "Teckensnitt" + +#: gitk:11125 #, tcl-format msgid "Gitk: choose color for %s" msgstr "Gitk: välj färg för %s" -#: gitk:11445 +#: gitk:11745 msgid "Cannot find a git repository here." msgstr "Hittar inget git-arkiv här." -#: gitk:11449 -#, tcl-format -msgid "Cannot find the git directory \"%s\"." -msgstr "Hittar inte git-katalogen \"%s\"." - -#: gitk:11496 +#: gitk:11792 #, tcl-format msgid "Ambiguous argument '%s': both revision and filename" msgstr "Tvetydigt argument \"%s\": både revision och filnamn" -#: gitk:11508 +#: gitk:11804 msgid "Bad arguments to gitk:" msgstr "Felaktiga argument till gitk:" -#: gitk:11604 +#: gitk:11907 msgid "Command line" msgstr "Kommandorad" +#~ msgid "CDate" +#~ msgstr "Skapat datum" + +#~ msgid "Cannot find the git directory \"%s\"." +#~ msgstr "Hittar inte git-katalogen \"%s\"." + #~ msgid "SHA1 ID: " #~ msgstr "SHA1-id: " diff --git a/gitweb/README b/gitweb/README index 6da4778b73..471dcfb691 100644 --- a/gitweb/README +++ b/gitweb/README @@ -1,9 +1,6 @@ GIT web Interface ================= -The one working on: - http://git.kernel.org/ - From the git version 1.4.0 gitweb is bundled with git. diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c6bafe6ead..1309196d27 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2068,7 +2068,7 @@ sub picon_url { if (!$avatar_cache{$email}) { my ($user, $domain) = split('@', $email); $avatar_cache{$email} = - "http://www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/" . + "//www.cs.indiana.edu/cgi-pub/kinzler/piconsearch.cgi/" . "$domain/$user/" . "users+domains+unknown/up/single"; } @@ -2083,7 +2083,7 @@ sub gravatar_url { my $email = lc shift; my $size = shift; $avatar_cache{$email} ||= - "http://www.gravatar.com/avatar/" . + "//www.gravatar.com/avatar/" . Digest::MD5::md5_hex($email) . "?s="; return $avatar_cache{$email} . $size; } diff --git a/gpg-interface.c b/gpg-interface.c index 0863c61800..8b0e87436b 100644 --- a/gpg-interface.c +++ b/gpg-interface.c @@ -96,45 +96,59 @@ int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *sig /* * Run "gpg" to see if the payload matches the detached signature. * gpg_output, when set, receives the diagnostic output from GPG. + * gpg_status, when set, receives the status output from GPG. */ int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, - struct strbuf *gpg_output) + struct strbuf *gpg_output, struct strbuf *gpg_status) { struct child_process gpg; - const char *args_gpg[] = {NULL, "--verify", "FILE", "-", NULL}; + const char *args_gpg[] = {NULL, "--status-fd=1", "--verify", "FILE", "-", NULL}; char path[PATH_MAX]; int fd, ret; + struct strbuf buf = STRBUF_INIT; + struct strbuf *pbuf = &buf; args_gpg[0] = gpg_program; fd = git_mkstemp(path, PATH_MAX, ".git_vtag_tmpXXXXXX"); if (fd < 0) - return error("could not create temporary file '%s': %s", + return error(_("could not create temporary file '%s': %s"), path, strerror(errno)); if (write_in_full(fd, signature, signature_size) < 0) - return error("failed writing detached signature to '%s': %s", + return error(_("failed writing detached signature to '%s': %s"), path, strerror(errno)); close(fd); memset(&gpg, 0, sizeof(gpg)); gpg.argv = args_gpg; gpg.in = -1; + gpg.out = -1; if (gpg_output) gpg.err = -1; - args_gpg[2] = path; + args_gpg[3] = path; if (start_command(&gpg)) { unlink(path); - return error("could not run gpg."); + return error(_("could not run gpg.")); } write_in_full(gpg.in, payload, payload_size); close(gpg.in); - if (gpg_output) + if (gpg_output) { strbuf_read(gpg_output, gpg.err, 0); + close(gpg.err); + } + if (gpg_status) + pbuf = gpg_status; + strbuf_read(pbuf, gpg.out, 0); + close(gpg.out); + ret = finish_command(&gpg); unlink_or_warn(path); + ret |= !strstr(pbuf->buf, "\n[GNUPG:] GOODSIG "); + strbuf_release(&buf); /* no matter it was used or not */ + return ret; } diff --git a/gpg-interface.h b/gpg-interface.h index b9c36088ce..cf99021842 100644 --- a/gpg-interface.h +++ b/gpg-interface.h @@ -2,7 +2,7 @@ #define GPG_INTERFACE_H extern int sign_buffer(struct strbuf *buffer, struct strbuf *signature, const char *signing_key); -extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output); +extern int verify_signed_buffer(const char *payload, size_t payload_size, const char *signature, size_t signature_size, struct strbuf *gpg_output, struct strbuf *gpg_status); extern int git_gpg_config(const char *, const char *, void *); extern void set_signing_key(const char *); extern const char *get_signing_key(void); @@ -8,34 +8,6 @@ /* Internal API */ /* - * Output the next line for a graph. - * This formats the next graph line into the specified strbuf. It is not - * terminated with a newline. - * - * Returns 1 if the line includes the current commit, and 0 otherwise. - * graph_next_line() will return 1 exactly once for each time - * graph_update() is called. - */ -static int graph_next_line(struct git_graph *graph, struct strbuf *sb); - -/* - * Set up a custom scheme for column colors. - * - * The default column color scheme inserts ANSI color escapes to colorize - * the graph. The various color escapes are stored in an array of strings - * where each entry corresponds to a color, except for the last entry, - * which denotes the escape for resetting the color back to the default. - * When generating the graph, strings from this array are inserted before - * and after the various column characters. - * - * This function allows you to enable a custom array of color escapes. - * The 'colors_max' argument is the index of the last "reset" entry. - * - * This functions must be called BEFORE graph_init() is called. - */ -static void graph_set_column_colors(const char **colors, unsigned short colors_max); - -/* * Output a padding line in the graph. * This is similar to graph_next_line(). However, it is guaranteed to * never print the current commit line. Instead, if the commit line is @@ -90,7 +62,7 @@ enum graph_state { static const char **column_colors; static unsigned short column_colors_max; -static void graph_set_column_colors(const char **colors, unsigned short colors_max) +void graph_set_column_colors(const char **colors, unsigned short colors_max) { column_colors = colors; column_colors_max = colors_max; @@ -1144,7 +1116,7 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct strbuf graph_update_state(graph, GRAPH_PADDING); } -static int graph_next_line(struct git_graph *graph, struct strbuf *sb) +int graph_next_line(struct git_graph *graph, struct strbuf *sb) { switch (graph->state) { case GRAPH_PADDING: @@ -1227,6 +1199,16 @@ void graph_show_commit(struct git_graph *graph) if (!graph) return; + /* + * When showing a diff of a merge against each of its parents, we + * are called once for each parent without graph_update having been + * called. In this case, simply output a single padding line. + */ + if (graph_is_commit_finished(graph)) { + graph_show_padding(graph); + shown_commit_line = 1; + } + while (!shown_commit_line && !graph_is_commit_finished(graph)) { shown_commit_line = graph_next_line(graph, &msgbuf); fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout); @@ -4,6 +4,25 @@ /* A graph is a pointer to this opaque structure */ struct git_graph; +/* + * Set up a custom scheme for column colors. + * + * The default column color scheme inserts ANSI color escapes to colorize + * the graph. The various color escapes are stored in an array of strings + * where each entry corresponds to a color, except for the last entry, + * which denotes the escape for resetting the color back to the default. + * When generating the graph, strings from this array are inserted before + * and after the various column characters. + * + * This function allows you to enable a custom array of color escapes. + * The 'colors_max' argument is the index of the last "reset" entry. + * + * This functions must be called BEFORE graph_init() is called. + * + * NOTE: This function isn't used in Git outside graph.c but it is used + * by CGit (http://git.zx2c4.com/cgit/) to use HTML for colors. + */ +void graph_set_column_colors(const char **colors, unsigned short colors_max); /* * Create a new struct git_graph. @@ -33,6 +52,20 @@ void graph_update(struct git_graph *graph, struct commit *commit); */ int graph_is_commit_finished(struct git_graph const *graph); +/* + * Output the next line for a graph. + * This formats the next graph line into the specified strbuf. It is not + * terminated with a newline. + * + * Returns 1 if the line includes the current commit, and 0 otherwise. + * graph_next_line() will return 1 exactly once for each time + * graph_update() is called. + * + * NOTE: This function isn't used in Git outside graph.c but it is used + * by CGit (http://git.zx2c4.com/cgit/) to wrap HTML around graph lines. + */ +int graph_next_line(struct git_graph *graph, struct strbuf *sb); + /* * graph_show_*: helper functions for printing to stdout @@ -625,7 +625,8 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt) for (p = opt->header_list; p; p = p->next) { if (p->token != GREP_PATTERN_HEAD) die("bug: a non-header pattern in grep header list."); - if (p->field < 0 || GREP_HEADER_FIELD_MAX <= p->field) + if (p->field < GREP_HEADER_FIELD_MIN || + GREP_HEADER_FIELD_MAX <= p->field) die("bug: unknown header field %d", p->field); compile_regexp(p, opt); } @@ -28,7 +28,8 @@ enum grep_context { }; enum grep_header_field { - GREP_HEADER_AUTHOR = 0, + GREP_HEADER_FIELD_MIN = 0, + GREP_HEADER_AUTHOR = GREP_HEADER_FIELD_MIN, GREP_HEADER_COMMITTER, GREP_HEADER_REFLOG, @@ -40,4 +40,11 @@ static inline void init_hash(struct hash_table *table) table->array = NULL; } +static inline void preallocate_hash(struct hash_table *table, unsigned int elts) +{ + assert(table->size == 0 && table->nr == 0 && table->array == NULL); + table->size = elts * 2; + table->array = xcalloc(sizeof(struct hash_table_entry), table->size); +} + #endif @@ -223,6 +223,23 @@ void list_commands(unsigned int colopts, } } +void list_common_cmds_help(void) +{ + int i, longest = 0; + + for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { + if (longest < strlen(common_cmds[i].name)) + longest = strlen(common_cmds[i].name); + } + + puts(_("The most commonly used git commands are:")); + for (i = 0; i < ARRAY_SIZE(common_cmds); i++) { + printf(" %s ", common_cmds[i].name); + mput_char(' ', longest - strlen(common_cmds[i].name)); + puts(_(common_cmds[i].help)); + } +} + int is_in_cmdlist(struct cmdnames *c, const char *s) { int i; diff --git a/http-push.c b/http-push.c index 9923441a4e..bd66f6ab6e 100644 --- a/http-push.c +++ b/http-push.c @@ -11,7 +11,11 @@ #include "list-objects.h" #include "sigchain.h" +#ifdef EXPAT_NEEDS_XMLPARSE_H +#include <xmlparse.h> +#else #include <expat.h> +#endif static const char http_push_usage[] = "git http-push [--all] [--dry-run] [--force] [--verbose] <remote> [<head>...]\n"; @@ -1539,7 +1543,7 @@ static int remote_exists(const char *path) sprintf(url, "%s%s", repo->url, path); - switch (http_get_strbuf(url, NULL, 0)) { + switch (http_get_strbuf(url, NULL, NULL, 0)) { case HTTP_OK: ret = 1; break; @@ -1563,7 +1567,7 @@ static void fetch_symref(const char *path, char **symref, unsigned char *sha1) url = xmalloc(strlen(repo->url) + strlen(path) + 1); sprintf(url, "%s%s", repo->url, path); - if (http_get_strbuf(url, &buffer, 0) != HTTP_OK) + if (http_get_strbuf(url, NULL, &buffer, 0) != HTTP_OK) die("Couldn't get %s for remote symref\n%s", url, curl_errorstr); free(url); @@ -788,7 +788,8 @@ int handle_curl_result(struct slot_results *results) #define HTTP_REQUEST_STRBUF 0 #define HTTP_REQUEST_FILE 1 -static int http_request(const char *url, void *result, int target, int options) +static int http_request(const char *url, struct strbuf *type, + void *result, int target, int options) { struct active_request_slot *slot; struct slot_results results; @@ -838,24 +839,37 @@ static int http_request(const char *url, void *result, int target, int options) ret = HTTP_START_FAILED; } + if (type) { + char *t; + strbuf_reset(type); + curl_easy_getinfo(slot->curl, CURLINFO_CONTENT_TYPE, &t); + if (t) + strbuf_addstr(type, t); + } + curl_slist_free_all(headers); strbuf_release(&buf); return ret; } -static int http_request_reauth(const char *url, void *result, int target, +static int http_request_reauth(const char *url, + struct strbuf *type, + void *result, int target, int options) { - int ret = http_request(url, result, target, options); + int ret = http_request(url, type, result, target, options); if (ret != HTTP_REAUTH) return ret; - return http_request(url, result, target, options); + return http_request(url, type, result, target, options); } -int http_get_strbuf(const char *url, struct strbuf *result, int options) +int http_get_strbuf(const char *url, + struct strbuf *type, + struct strbuf *result, int options) { - return http_request_reauth(url, result, HTTP_REQUEST_STRBUF, options); + return http_request_reauth(url, type, result, + HTTP_REQUEST_STRBUF, options); } /* @@ -878,7 +892,7 @@ static int http_get_file(const char *url, const char *filename, int options) goto cleanup; } - ret = http_request_reauth(url, result, HTTP_REQUEST_FILE, options); + ret = http_request_reauth(url, NULL, result, HTTP_REQUEST_FILE, options); fclose(result); if ((ret == HTTP_OK) && move_temp_to_file(tmpfile.buf, filename)) @@ -904,7 +918,7 @@ int http_fetch_ref(const char *base, struct ref *ref) int ret = -1; url = quote_ref_url(base, ref->name); - if (http_get_strbuf(url, &buffer, HTTP_NO_CACHE) == HTTP_OK) { + if (http_get_strbuf(url, NULL, &buffer, HTTP_NO_CACHE) == HTTP_OK) { strbuf_rtrim(&buffer); if (buffer.len == 40) ret = get_sha1_hex(buffer.buf, ref->old_sha1); @@ -997,7 +1011,7 @@ int http_get_info_packs(const char *base_url, struct packed_git **packs_head) strbuf_addstr(&buf, "objects/info/packs"); url = strbuf_detach(&buf, NULL); - ret = http_get_strbuf(url, &buf, HTTP_NO_CACHE); + ret = http_get_strbuf(url, NULL, &buf, HTTP_NO_CACHE); if (ret != HTTP_OK) goto cleanup; @@ -132,7 +132,7 @@ extern char *get_remote_object_url(const char *url, const char *hex, * * If the result pointer is NULL, a HTTP HEAD request is made instead of GET. */ -int http_get_strbuf(const char *url, struct strbuf *result, int options); +int http_get_strbuf(const char *url, struct strbuf *content_type, struct strbuf *result, int options); /* * Prints an error message using error() containing url and curl_errorstr, @@ -46,6 +46,7 @@ static void copy_gecos(const struct passwd *w, struct strbuf *name) static int add_mailname_host(struct strbuf *buf) { FILE *mailname; + struct strbuf mailnamebuf = STRBUF_INIT; mailname = fopen("/etc/mailname", "r"); if (!mailname) { @@ -54,14 +55,17 @@ static int add_mailname_host(struct strbuf *buf) strerror(errno)); return -1; } - if (strbuf_getline(buf, mailname, '\n') == EOF) { + if (strbuf_getline(&mailnamebuf, mailname, '\n') == EOF) { if (ferror(mailname)) warning("cannot read /etc/mailname: %s", strerror(errno)); + strbuf_release(&mailnamebuf); fclose(mailname); return -1; } /* success! */ + strbuf_addbuf(buf, &mailnamebuf); + strbuf_release(&mailnamebuf); fclose(mailname); return 0; } diff --git a/imap-send.c b/imap-send.c index e521e2fd22..d9bcfb44dc 100644 --- a/imap-send.c +++ b/imap-send.c @@ -31,48 +31,9 @@ typedef void *SSL; #else #include <openssl/evp.h> #include <openssl/hmac.h> +#include <openssl/x509v3.h> #endif -struct store_conf { - char *name; - const char *path; /* should this be here? its interpretation is driver-specific */ - char *map_inbox; - char *trash; - unsigned max_size; /* off_t is overkill */ - unsigned trash_remote_new:1, trash_only_new:1; -}; - -/* For message->status */ -#define M_RECENT (1<<0) /* unsyncable flag; maildir_* depend on this being 1<<0 */ -#define M_DEAD (1<<1) /* expunged */ -#define M_FLAGS (1<<2) /* flags fetched */ - -struct message { - struct message *next; - size_t size; /* zero implies "not fetched" */ - int uid; - unsigned char flags, status; -}; - -struct store { - struct store_conf *conf; /* foreign */ - - /* currently open mailbox */ - const char *name; /* foreign! maybe preset? */ - char *path; /* own */ - struct message *msgs; /* own */ - int uidvalidity; - unsigned char opts; /* maybe preset? */ - /* note that the following do _not_ reflect stats from msgs, but mailbox totals */ - int count; /* # of messages */ - int recent; /* # of recent messages - don't trust this beyond the initial read */ -}; - -struct msg_data { - struct strbuf data; - unsigned char flags; -}; - static const char imap_send_usage[] = "git imap-send < <mbox>"; #undef DRV_OK @@ -90,8 +51,6 @@ static void imap_warn(const char *, ...); static char *next_arg(char **); -static void free_generic_messages(struct message *); - __attribute__((format (printf, 3, 4))) static int nfsnprintf(char *buf, int blen, const char *fmt, ...); @@ -135,20 +94,6 @@ static struct imap_server_conf server = { NULL, /* auth_method */ }; -struct imap_store_conf { - struct store_conf gen; - struct imap_server_conf *server; -}; - -#define NIL (void *)0x1 -#define LIST (void *)0x2 - -struct imap_list { - struct imap_list *next, *child; - char *val; - int len; -}; - struct imap_socket { int fd[2]; SSL *ssl; @@ -165,7 +110,6 @@ struct imap_cmd; struct imap { int uidnext; /* from SELECT responses */ - struct imap_list *ns_personal, *ns_other, *ns_shared; /* NAMESPACE info */ unsigned caps, rcaps; /* CAPABILITY results */ /* command queue */ int nexttag, num_in_progress, literal_pending; @@ -174,11 +118,11 @@ struct imap { }; struct imap_store { - struct store gen; + /* currently open mailbox */ + const char *name; /* foreign! maybe preset? */ int uidvalidity; struct imap *imap; const char *prefix; - unsigned /*currentnc:1,*/ trashnc:1; }; struct imap_cmd_cb { @@ -225,14 +169,6 @@ static const char *cap_list[] = { static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd); -static const char *Flags[] = { - "Draft", - "Flagged", - "Answered", - "Seen", - "Deleted", -}; - #ifndef NO_OPENSSL static void ssl_socket_perror(const char *func) { @@ -265,12 +201,64 @@ static void socket_perror(const char *func, struct imap_socket *sock, int ret) } } +#ifdef NO_OPENSSL static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify) { -#ifdef NO_OPENSSL fprintf(stderr, "SSL requested but SSL support not compiled in\n"); return -1; +} + #else + +static int host_matches(const char *host, const char *pattern) +{ + if (pattern[0] == '*' && pattern[1] == '.') { + pattern += 2; + if (!(host = strchr(host, '.'))) + return 0; + host++; + } + + return *host && *pattern && !strcasecmp(host, pattern); +} + +static int verify_hostname(X509 *cert, const char *hostname) +{ + int len; + X509_NAME *subj; + char cname[1000]; + int i, found; + STACK_OF(GENERAL_NAME) *subj_alt_names; + + /* try the DNS subjectAltNames */ + found = 0; + if ((subj_alt_names = X509_get_ext_d2i(cert, NID_subject_alt_name, NULL, NULL))) { + int num_subj_alt_names = sk_GENERAL_NAME_num(subj_alt_names); + for (i = 0; !found && i < num_subj_alt_names; i++) { + GENERAL_NAME *subj_alt_name = sk_GENERAL_NAME_value(subj_alt_names, i); + if (subj_alt_name->type == GEN_DNS && + strlen((const char *)subj_alt_name->d.ia5->data) == (size_t)subj_alt_name->d.ia5->length && + host_matches(hostname, (const char *)(subj_alt_name->d.ia5->data))) + found = 1; + } + sk_GENERAL_NAME_pop_free(subj_alt_names, GENERAL_NAME_free); + } + if (found) + return 0; + + /* try the common name */ + if (!(subj = X509_get_subject_name(cert))) + return error("cannot get certificate subject"); + if ((len = X509_NAME_get_text_by_NID(subj, NID_commonName, cname, sizeof(cname))) < 0) + return error("cannot get certificate common name"); + if (strlen(cname) == (size_t)len && host_matches(hostname, cname)) + return 0; + return error("certificate owner '%s' does not match hostname '%s'", + cname, hostname); +} + +static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int verify) +{ #if (OPENSSL_VERSION_NUMBER >= 0x10000000L) const SSL_METHOD *meth; #else @@ -278,6 +266,7 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve #endif SSL_CTX *ctx; int ret; + X509 *cert; SSL_library_init(); SSL_load_error_strings(); @@ -315,15 +304,35 @@ static int ssl_socket_connect(struct imap_socket *sock, int use_tls_only, int ve return -1; } +#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME + /* + * SNI (RFC4366) + * OpenSSL does not document this function, but the implementation + * returns 1 on success, 0 on failure after calling SSLerr(). + */ + ret = SSL_set_tlsext_host_name(sock->ssl, server.host); + if (ret != 1) + warning("SSL_set_tlsext_host_name(%s) failed.", server.host); +#endif + ret = SSL_connect(sock->ssl); if (ret <= 0) { socket_perror("SSL_connect", sock, ret); return -1; } + if (verify) { + /* make sure the hostname matches that of the certificate */ + cert = SSL_get_peer_certificate(sock->ssl); + if (!cert) + return error("unable to get peer certificate."); + if (verify_hostname(cert, server.host) < 0) + return -1; + } + return 0; -#endif } +#endif static int socket_read(struct imap_socket *sock, char *buf, int len) { @@ -476,16 +485,6 @@ static char *next_arg(char **s) return ret; } -static void free_generic_messages(struct message *msgs) -{ - struct message *tmsg; - - for (; msgs; msgs = tmsg) { - tmsg = msgs->next; - free(msgs); - } -} - static int nfsnprintf(char *buf, int blen, const char *fmt, ...) { int ret; @@ -613,35 +612,9 @@ static int imap_exec_m(struct imap_store *ctx, struct imap_cmd_cb *cb, } } -static int is_atom(struct imap_list *list) -{ - return list && list->val && list->val != NIL && list->val != LIST; -} - -static int is_list(struct imap_list *list) -{ - return list && list->val == LIST; -} - -static void free_list(struct imap_list *list) -{ - struct imap_list *tmp; - - for (; list; list = tmp) { - tmp = list->next; - if (is_list(list)) - free_list(list->child); - else if (is_atom(list)) - free(list->val); - free(list); - } -} - -static int parse_imap_list_l(struct imap *imap, char **sp, struct imap_list **curp, int level) +static int skip_imap_list_l(char **sp, int level) { - struct imap_list *cur; - char *s = *sp, *p; - int n, bytes; + char *s = *sp; for (;;) { while (isspace((unsigned char)*s)) @@ -650,68 +623,23 @@ static int parse_imap_list_l(struct imap *imap, char **sp, struct imap_list **cu s++; break; } - *curp = cur = xmalloc(sizeof(*cur)); - curp = &cur->next; - cur->val = NULL; /* for clean bail */ if (*s == '(') { /* sublist */ s++; - cur->val = LIST; - if (parse_imap_list_l(imap, &s, &cur->child, level + 1)) - goto bail; - } else if (imap && *s == '{') { - /* literal */ - bytes = cur->len = strtol(s + 1, &s, 10); - if (*s != '}') - goto bail; - - s = cur->val = xmalloc(cur->len); - - /* dump whats left over in the input buffer */ - n = imap->buf.bytes - imap->buf.offset; - - if (n > bytes) - /* the entire message fit in the buffer */ - n = bytes; - - memcpy(s, imap->buf.buf + imap->buf.offset, n); - s += n; - bytes -= n; - - /* mark that we used part of the buffer */ - imap->buf.offset += n; - - /* now read the rest of the message */ - while (bytes > 0) { - if ((n = socket_read(&imap->buf.sock, s, bytes)) <= 0) - goto bail; - s += n; - bytes -= n; - } - - if (buffer_gets(&imap->buf, &s)) + if (skip_imap_list_l(&s, level + 1)) goto bail; } else if (*s == '"') { /* quoted string */ s++; - p = s; for (; *s != '"'; s++) if (!*s) goto bail; - cur->len = s - p; s++; - cur->val = xmemdupz(p, cur->len); } else { /* atom */ - p = s; for (; *s && !isspace((unsigned char)*s); s++) if (level && *s == ')') break; - cur->len = s - p; - if (cur->len == 3 && !memcmp("NIL", p, 3)) - cur->val = NIL; - else - cur->val = xmemdupz(p, cur->len); } if (!level) @@ -720,27 +648,15 @@ static int parse_imap_list_l(struct imap *imap, char **sp, struct imap_list **cu goto bail; } *sp = s; - *curp = NULL; return 0; bail: - *curp = NULL; return -1; } -static struct imap_list *parse_imap_list(struct imap *imap, char **sp) +static void skip_list(char **sp) { - struct imap_list *head; - - if (!parse_imap_list_l(imap, sp, &head, 0)) - return head; - free_list(head); - return NULL; -} - -static struct imap_list *parse_list(char **sp) -{ - return parse_imap_list(NULL, sp); + skip_imap_list_l(sp, 0); } static void parse_capability(struct imap *imap, char *cmd) @@ -772,7 +688,7 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb, *p++ = 0; arg = next_arg(&s); if (!strcmp("UIDVALIDITY", arg)) { - if (!(arg = next_arg(&s)) || !(ctx->gen.uidvalidity = atoi(arg))) { + if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg))) { fprintf(stderr, "IMAP error: malformed UIDVALIDITY status\n"); return RESP_BAD; } @@ -790,7 +706,7 @@ static int parse_response_code(struct imap_store *ctx, struct imap_cmd_cb *cb, for (; isspace((unsigned char)*p); p++); fprintf(stderr, "*** IMAP ALERT *** %s\n", p); } else if (cb && cb->ctx && !strcmp("APPENDUID", arg)) { - if (!(arg = next_arg(&s)) || !(ctx->gen.uidvalidity = atoi(arg)) || + if (!(arg = next_arg(&s)) || !(ctx->uidvalidity = atoi(arg)) || !(arg = next_arg(&s)) || !(*(int *)cb->ctx = atoi(arg))) { fprintf(stderr, "IMAP error: malformed APPENDUID status\n"); return RESP_BAD; @@ -819,20 +735,28 @@ static int get_cmd_result(struct imap_store *ctx, struct imap_cmd *tcmd) } if (!strcmp("NAMESPACE", arg)) { - imap->ns_personal = parse_list(&cmd); - imap->ns_other = parse_list(&cmd); - imap->ns_shared = parse_list(&cmd); + /* rfc2342 NAMESPACE response. */ + skip_list(&cmd); /* Personal mailboxes */ + skip_list(&cmd); /* Others' mailboxes */ + skip_list(&cmd); /* Shared mailboxes */ } else if (!strcmp("OK", arg) || !strcmp("BAD", arg) || !strcmp("NO", arg) || !strcmp("BYE", arg)) { if ((resp = parse_response_code(ctx, NULL, cmd)) != RESP_OK) return resp; - } else if (!strcmp("CAPABILITY", arg)) + } else if (!strcmp("CAPABILITY", arg)) { parse_capability(imap, cmd); - else if ((arg1 = next_arg(&cmd))) { - if (!strcmp("EXISTS", arg1)) - ctx->gen.count = atoi(arg); - else if (!strcmp("RECENT", arg1)) - ctx->gen.recent = atoi(arg); + } else if ((arg1 = next_arg(&cmd))) { + ; /* + * Unhandled response-data with at least two words. + * Ignore it. + * + * NEEDSWORK: Previously this case handled '<num> EXISTS' + * and '<num> RECENT' but as a probably-unintended side + * effect it ignores other unrecognized two-word + * responses. imap-send doesn't ever try to read + * messages or mailboxes these days, so consider + * eliminating this case. + */ } else { fprintf(stderr, "IMAP error: unable to parse untagged response\n"); return RESP_BAD; @@ -934,16 +858,12 @@ static void imap_close_server(struct imap_store *ictx) imap_exec(ictx, NULL, "LOGOUT"); socket_shutdown(&imap->buf.sock); } - free_list(imap->ns_personal); - free_list(imap->ns_other); - free_list(imap->ns_shared); free(imap); } -static void imap_close_store(struct store *ctx) +static void imap_close_store(struct imap_store *ctx) { - imap_close_server((struct imap_store *)ctx); - free_generic_messages(ctx->msgs); + imap_close_server(ctx); free(ctx); } @@ -1028,7 +948,7 @@ static int auth_cram_md5(struct imap_store *ctx, struct imap_cmd *cmd, const cha return 0; } -static struct store *imap_open_store(struct imap_server_conf *srvc) +static struct imap_store *imap_open_store(struct imap_server_conf *srvc) { struct imap_store *ctx; struct imap *imap; @@ -1238,103 +1158,69 @@ static struct store *imap_open_store(struct imap_server_conf *srvc) } /* !preauth */ ctx->prefix = ""; - ctx->trashnc = 1; - return (struct store *)ctx; + return ctx; bail: - imap_close_store(&ctx->gen); + imap_close_store(ctx); return NULL; } -static int imap_make_flags(int flags, char *buf) -{ - const char *s; - unsigned i, d; - - for (i = d = 0; i < ARRAY_SIZE(Flags); i++) - if (flags & (1 << i)) { - buf[d++] = ' '; - buf[d++] = '\\'; - for (s = Flags[i]; *s; s++) - buf[d++] = *s; - } - buf[0] = '('; - buf[d++] = ')'; - return d; -} - +/* + * Insert CR characters as necessary in *msg to ensure that every LF + * character in *msg is preceded by a CR. + */ static void lf_to_crlf(struct strbuf *msg) { - size_t new_len; char *new; - int i, j, lfnum = 0; - - if (msg->buf[0] == '\n') - lfnum++; - for (i = 1; i < msg->len; i++) { - if (msg->buf[i - 1] != '\r' && msg->buf[i] == '\n') - lfnum++; + size_t i, j; + char lastc; + + /* First pass: tally, in j, the size of the new string: */ + for (i = j = 0, lastc = '\0'; i < msg->len; i++) { + if (msg->buf[i] == '\n' && lastc != '\r') + j++; /* a CR will need to be added here */ + lastc = msg->buf[i]; + j++; } - new_len = msg->len + lfnum; - new = xmalloc(new_len + 1); - if (msg->buf[0] == '\n') { - new[0] = '\r'; - new[1] = '\n'; - i = 1; - j = 2; - } else { - new[0] = msg->buf[0]; - i = 1; - j = 1; - } - for ( ; i < msg->len; i++) { - if (msg->buf[i] != '\n') { - new[j++] = msg->buf[i]; - continue; - } - if (msg->buf[i - 1] != '\r') + new = xmalloc(j + 1); + + /* + * Second pass: write the new string. Note that this loop is + * otherwise identical to the first pass. + */ + for (i = j = 0, lastc = '\0'; i < msg->len; i++) { + if (msg->buf[i] == '\n' && lastc != '\r') new[j++] = '\r'; - /* otherwise it already had CR before */ - new[j++] = '\n'; + lastc = new[j++] = msg->buf[i]; } - strbuf_attach(msg, new, new_len, new_len + 1); + strbuf_attach(msg, new, j, j + 1); } /* * Store msg to IMAP. Also detach and free the data from msg->data, * leaving msg->data empty. */ -static int imap_store_msg(struct store *gctx, struct msg_data *msg) +static int imap_store_msg(struct imap_store *ctx, struct strbuf *msg) { - struct imap_store *ctx = (struct imap_store *)gctx; struct imap *imap = ctx->imap; struct imap_cmd_cb cb; const char *prefix, *box; - int ret, d; - char flagstr[128]; + int ret; - lf_to_crlf(&msg->data); + lf_to_crlf(msg); memset(&cb, 0, sizeof(cb)); - cb.dlen = msg->data.len; - cb.data = strbuf_detach(&msg->data, NULL); - - d = 0; - if (msg->flags) { - d = imap_make_flags(msg->flags, flagstr); - flagstr[d++] = ' '; - } - flagstr[d] = 0; + cb.dlen = msg->len; + cb.data = strbuf_detach(msg, NULL); - box = gctx->name; + box = ctx->name; prefix = !strcmp(box, "INBOX") ? "" : ctx->prefix; cb.create = 0; - ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" %s", prefix, box, flagstr); + ret = imap_exec_m(ctx, &cb, "APPEND \"%s%s\" ", prefix, box); imap->caps = imap->rcaps; if (ret != DRV_OK) return ret; - gctx->count++; return DRV_OK; } @@ -1483,8 +1369,8 @@ static int git_imap_config(const char *key, const char *val, void *cb) int main(int argc, char **argv) { struct strbuf all_msgs = STRBUF_INIT; - struct msg_data msg = {STRBUF_INIT, 0}; - struct store *ctx = NULL; + struct strbuf msg = STRBUF_INIT; + struct imap_store *ctx = NULL; int ofs = 0; int r; int total, n = 0; @@ -1545,10 +1431,10 @@ int main(int argc, char **argv) unsigned percent = n * 100 / total; fprintf(stderr, "%4u%% (%d/%d) done\r", percent, n, total); - if (!split_msg(&all_msgs, &msg.data, &ofs)) + if (!split_msg(&all_msgs, &msg, &ofs)) break; if (server.use_html) - wrap_in_html(&msg.data); + wrap_in_html(&msg); r = imap_store_msg(ctx, &msg); if (r != DRV_OK) break; diff --git a/ll-merge.c b/ll-merge.c index acea33bf1b..fb61ea66a1 100644 --- a/ll-merge.c +++ b/ll-merge.c @@ -222,7 +222,7 @@ static const char *default_ll_merge; static int read_merge_config(const char *var, const char *value, void *cb) { struct ll_merge_driver *fn; - const char *ep, *name; + const char *key, *name; int namelen; if (!strcmp(var, "merge.default")) { @@ -236,15 +236,13 @@ static int read_merge_config(const char *var, const char *value, void *cb) * especially, we do not want to look at variables such as * "merge.summary", "merge.tool", and "merge.verbosity". */ - if (prefixcmp(var, "merge.") || (ep = strrchr(var, '.')) == var + 5) + if (parse_config_key(var, "merge", &name, &namelen, &key) < 0 || !name) return 0; /* * Find existing one as we might be processing merge.<name>.var2 * after seeing merge.<name>.var1. */ - name = var + 6; - namelen = ep - name; for (fn = ll_user_merge; fn; fn = fn->next) if (!strncmp(fn->name, name, namelen) && !fn->name[namelen]) break; @@ -256,16 +254,14 @@ static int read_merge_config(const char *var, const char *value, void *cb) ll_user_merge_tail = &(fn->next); } - ep++; - - if (!strcmp("name", ep)) { + if (!strcmp("name", key)) { if (!value) return error("%s: lacks value", var); fn->description = xstrdup(value); return 0; } - if (!strcmp("driver", ep)) { + if (!strcmp("driver", key)) { if (!value) return error("%s: lacks value", var); /* @@ -289,7 +285,7 @@ static int read_merge_config(const char *var, const char *value, void *cb) return 0; } - if (!strcmp("recursive", ep)) { + if (!strcmp("recursive", key)) { if (!value) return error("%s: lacks value", var); fn->recursive = xstrdup(value); diff --git a/log-tree.c b/log-tree.c index f8487f8a8a..3d88823871 100644 --- a/log-tree.c +++ b/log-tree.c @@ -444,7 +444,7 @@ static void show_signature(struct rev_info *opt, struct commit *commit) status = verify_signed_buffer(payload.buf, payload.len, signature.buf, signature.len, - &gpg_output); + &gpg_output, NULL); if (status && !gpg_output.len) strbuf_addstr(&gpg_output, "No signature\n"); @@ -508,20 +508,17 @@ static void show_one_mergetag(struct rev_info *opt, gpg_message_offset = verify_message.len; payload_size = parse_signature(extra->value, extra->len); - if ((extra->len <= payload_size) || - (verify_signed_buffer(extra->value, payload_size, - extra->value + payload_size, - extra->len - payload_size, - &verify_message) && - verify_message.len <= gpg_message_offset)) { - strbuf_addstr(&verify_message, "No signature\n"); - status = -1; - } - else if (strstr(verify_message.buf + gpg_message_offset, - ": Good signature from ")) - status = 0; - else - status = -1; + status = -1; + if (extra->len > payload_size) + if (verify_signed_buffer(extra->value, payload_size, + extra->value + payload_size, + extra->len - payload_size, + &verify_message, NULL)) { + if (verify_message.len <= gpg_message_offset) + strbuf_addstr(&verify_message, "No signature\n"); + else + status = 0; + } show_sig_lines(opt, status, verify_message.buf); strbuf_release(&verify_message); @@ -681,6 +678,7 @@ void show_log(struct rev_info *opt) ctx.preserve_subject = opt->preserve_subject; ctx.reflog_info = opt->reflog_info; ctx.fmt = opt->commit_format; + ctx.mailmap = opt->mailmap; ctx.color = opt->diffopt.use_color; pretty_print_commit(&ctx, commit, &msgbuf); @@ -235,6 +235,7 @@ int read_mailmap(struct string_list *map, char **repo_abbrev) int err = 0; map->strdup_strings = 1; + map->cmp = strcasecmp; if (!git_mailmap_blob && is_bare_repository()) git_mailmap_blob = "HEAD:.mailmap"; @@ -253,60 +254,95 @@ void clear_mailmap(struct string_list *map) debug_mm("mailmap: cleared\n"); } +/* + * Look for an entry in map that match string[0:len]; string[len] + * does not have to be NUL (but it could be). + */ +static struct string_list_item *lookup_prefix(struct string_list *map, + const char *string, size_t len) +{ + int i = string_list_find_insert_index(map, string, 1); + if (i < 0) { + /* exact match */ + i = -1 - i; + if (!string[len]) + return &map->items[i]; + /* + * that map entry matches exactly to the string, including + * the cruft at the end beyond "len". That is not a match + * with string[0:len] that we are looking for. + */ + } else if (!string[len]) { + /* + * asked with the whole string, and got nothing. No + * matching entry can exist in the map. + */ + return NULL; + } + + /* + * i is at the exact match to an overlong key, or location the + * overlong key would be inserted, which must come after the + * real location of the key if one exists. + */ + while (0 <= --i && i < map->nr) { + int cmp = strncasecmp(map->items[i].string, string, len); + if (cmp < 0) + /* + * "i" points at a key definitely below the prefix; + * the map does not have string[0:len] in it. + */ + break; + else if (!cmp && !map->items[i].string[len]) + /* found it */ + return &map->items[i]; + /* + * otherwise, the string at "i" may be string[0:len] + * followed by a string that sorts later than string[len:]; + * keep trying. + */ + } + return NULL; +} + int map_user(struct string_list *map, - char *email, int maxlen_email, char *name, int maxlen_name) + const char **email, size_t *emaillen, + const char **name, size_t *namelen) { - char *end_of_email; struct string_list_item *item; struct mailmap_entry *me; - char buf[1024], *mailbuf; - int i; - - /* figure out space requirement for email */ - end_of_email = strchr(email, '>'); - if (!end_of_email) { - /* email passed in might not be wrapped in <>, but end with a \0 */ - end_of_email = memchr(email, '\0', maxlen_email); - if (!end_of_email) - return 0; - } - if (end_of_email - email + 1 < sizeof(buf)) - mailbuf = buf; - else - mailbuf = xmalloc(end_of_email - email + 1); - - /* downcase the email address */ - for (i = 0; i < end_of_email - email; i++) - mailbuf[i] = tolower(email[i]); - mailbuf[i] = 0; - - debug_mm("map_user: map '%s' <%s>\n", name, mailbuf); - item = string_list_lookup(map, mailbuf); + + debug_mm("map_user: map '%.*s' <%.*s>\n", + *name, *namelen, *emaillen, *email); + + item = lookup_prefix(map, *email, *emaillen); if (item != NULL) { me = (struct mailmap_entry *)item->util; if (me->namemap.nr) { /* The item has multiple items, so we'll look up on name too */ /* If the name is not found, we choose the simple entry */ - struct string_list_item *subitem = string_list_lookup(&me->namemap, name); + struct string_list_item *subitem; + subitem = lookup_prefix(&me->namemap, *name, *namelen); if (subitem) item = subitem; } } - if (mailbuf != buf) - free(mailbuf); if (item != NULL) { struct mailmap_info *mi = (struct mailmap_info *)item->util; - if (mi->name == NULL && (mi->email == NULL || maxlen_email == 0)) { + if (mi->name == NULL && mi->email == NULL) { debug_mm("map_user: -- (no simple mapping)\n"); return 0; } - if (maxlen_email && mi->email) - strlcpy(email, mi->email, maxlen_email); - else - *end_of_email = '\0'; - if (maxlen_name && mi->name) - strlcpy(name, mi->name, maxlen_name); - debug_mm("map_user: to '%s' <%s>\n", name, mi->email ? mi->email : ""); + if (mi->email) { + *email = mi->email; + *emaillen = strlen(*email); + } + if (mi->name) { + *name = mi->name; + *namelen = strlen(*name); + } + debug_mm("map_user: to '%.*s' <.*%s>\n", *namelen, *name, + *emaillen, *email); return 1; } debug_mm("map_user: --\n"); @@ -4,7 +4,7 @@ int read_mailmap(struct string_list *map, char **repo_abbrev); void clear_mailmap(struct string_list *map); -int map_user(struct string_list *mailmap, - char *email, int maxlen_email, char *name, int maxlen_name); +int map_user(struct string_list *map, + const char **email, size_t *emaillen, const char **name, size_t *namelen); #endif diff --git a/merge-recursive.c b/merge-recursive.c index 33ba5dc07c..ea9dbd307c 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -2068,6 +2068,15 @@ int parse_merge_opt(struct merge_options *o, const char *s) o->xdl_opts = DIFF_WITH_ALG(o, PATIENCE_DIFF); else if (!strcmp(s, "histogram")) o->xdl_opts = DIFF_WITH_ALG(o, HISTOGRAM_DIFF); + else if (!strcmp(s, "diff-algorithm=")) { + long value = parse_algorithm_value(s+15); + if (value < 0) + return -1; + /* clear out previous settings */ + DIFF_XDL_CLR(o, NEED_MINIMAL); + o->xdl_opts &= ~XDF_DIFF_ALGORITHM_MASK; + o->xdl_opts |= value; + } else if (!strcmp(s, "ignore-space-change")) o->xdl_opts |= XDF_IGNORE_WHITESPACE_CHANGE; else if (!strcmp(s, "ignore-all-space")) diff --git a/mergetools/defaults b/mergetools/defaults deleted file mode 100644 index 21e63ecc3e..0000000000 --- a/mergetools/defaults +++ /dev/null @@ -1,22 +0,0 @@ -# Redefined by builtin tools -can_merge () { - return 0 -} - -can_diff () { - return 0 -} - -diff_cmd () { - status=1 - return $status -} - -merge_cmd () { - status=1 - return $status -} - -translate_merge_tool_path () { - echo "$1" -} diff --git a/mergetools/gvimdiff b/mergetools/gvimdiff new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/gvimdiff @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/mergetools/gvimdiff2 b/mergetools/gvimdiff2 new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/gvimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/mergetools/p4merge b/mergetools/p4merge index 52f7c8f705..5a608abf9c 100644 --- a/mergetools/p4merge +++ b/mergetools/p4merge @@ -21,8 +21,12 @@ diff_cmd () { merge_cmd () { touch "$BACKUP" - $base_present || >"$BASE" - "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" + if ! $base_present + then + cp -- "$LOCAL" "$BASE" + create_virtual_base "$BASE" "$REMOTE" + fi + "$merge_tool_path" "$BASE" "$REMOTE" "$LOCAL" "$MERGED" check_unchanged } @@ -30,5 +34,5 @@ create_empty_file () { empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$" >"$empty_file" - printf "$empty_file" + printf "%s" "$empty_file" } diff --git a/mergetools/tortoisemerge b/mergetools/tortoisemerge index ed7db495ed..3b89f1c82d 100644 --- a/mergetools/tortoisemerge +++ b/mergetools/tortoisemerge @@ -6,12 +6,29 @@ merge_cmd () { if $base_present then touch "$BACKUP" - "$merge_tool_path" \ - -base:"$BASE" -mine:"$LOCAL" \ - -theirs:"$REMOTE" -merged:"$MERGED" + basename="$(basename "$merge_tool_path" .exe)" + if test "$basename" = "tortoisegitmerge" + then + "$merge_tool_path" \ + -base "$BASE" -mine "$LOCAL" \ + -theirs "$REMOTE" -merged "$MERGED" + else + "$merge_tool_path" \ + -base:"$BASE" -mine:"$LOCAL" \ + -theirs:"$REMOTE" -merged:"$MERGED" + fi check_unchanged else - echo "TortoiseMerge cannot be used without a base" 1>&2 + echo "$merge_tool_path cannot be used without a base" 1>&2 return 1 fi } + +translate_merge_tool_path() { + if type tortoisegitmerge >/dev/null 2>/dev/null + then + echo tortoisegitmerge + else + echo tortoisemerge + fi +} diff --git a/mergetools/vim b/mergetools/vimdiff index 619594ae4b..39d032771b 100644 --- a/mergetools/vim +++ b/mergetools/vimdiff @@ -1,14 +1,6 @@ diff_cmd () { - case "$1" in - gvimdiff|vimdiff) - "$merge_tool_path" -R -f -d \ - -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" - ;; - gvimdiff2|vimdiff2) - "$merge_tool_path" -R -f -d \ - -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" - ;; - esac + "$merge_tool_path" -R -f -d \ + -c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE" } merge_cmd () { diff --git a/mergetools/vimdiff2 b/mergetools/vimdiff2 new file mode 100644 index 0000000000..04a5bb0ea8 --- /dev/null +++ b/mergetools/vimdiff2 @@ -0,0 +1 @@ +. "$MERGE_TOOLS_DIR/vimdiff" diff --git a/name-hash.c b/name-hash.c index d8d25c23e9..9bac31a6ab 100644 --- a/name-hash.c +++ b/name-hash.c @@ -24,11 +24,11 @@ static unsigned int hash_name(const char *name, int namelen) { unsigned int hash = 0x123; - do { + while (namelen--) { unsigned char c = *name++; c = icase_hash(c); hash = hash*101 + c; - } while (--namelen); + } return hash; } @@ -92,6 +92,8 @@ static void lazy_init_name_hash(struct index_state *istate) if (istate->name_hash_initialized) return; + if (istate->cache_nr) + preallocate_hash(&istate->name_hash, istate->cache_nr); for (nr = 0; nr < istate->cache_nr; nr++) hash_index_entry(istate, istate->cache[nr]); istate->name_hash_initialized = 1; @@ -185,6 +185,16 @@ struct object *parse_object_buffer(const unsigned char *sha1, enum object_type t return obj; } +struct object *parse_object_or_die(const unsigned char *sha1, + const char *name) +{ + struct object *o = parse_object(sha1); + if (o) + return o; + + die(_("unable to parse object: %s"), name ? name : sha1_to_hex(sha1)); +} + struct object *parse_object(const unsigned char *sha1) { unsigned long size; @@ -54,9 +54,20 @@ struct object *lookup_object(const unsigned char *sha1); extern void *create_object(const unsigned char *sha1, int type, void *obj); -/** Returns the object, having parsed it to find out what it is. **/ +/* + * Returns the object, having parsed it to find out what it is. + * + * Returns NULL if the object is missing or corrupt. + */ struct object *parse_object(const unsigned char *sha1); +/* + * Like parse_object, but will die() instead of returning NULL. If the + * "name" parameter is not NULL, it is included in the error message + * (otherwise, the sha1 hex is given). + */ +struct object *parse_object_or_die(const unsigned char *sha1, const char *name); + /* Given the result of read_sha1_file(), returns the object after * parsing it. eaten_p indicates if the object has a borrowed copy * of buffer and the caller should not free() it. diff --git a/pack-refs.c b/pack-refs.c index f09a054228..4461f71a37 100644 --- a/pack-refs.c +++ b/pack-refs.c @@ -27,6 +27,7 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, int flags, void *cb_data) { struct pack_refs_cb_data *cb = cb_data; + struct object *o; int is_tag_ref; /* Do not pack the symbolic refs */ @@ -39,14 +40,13 @@ static int handle_one_ref(const char *path, const unsigned char *sha1, return 0; fprintf(cb->refs_file, "%s %s\n", sha1_to_hex(sha1), path); - if (is_tag_ref) { - struct object *o = parse_object(sha1); - if (o->type == OBJ_TAG) { - o = deref_tag(o, path, 0); - if (o) - fprintf(cb->refs_file, "^%s\n", - sha1_to_hex(o->sha1)); - } + + o = parse_object_or_die(sha1, path); + if (o->type == OBJ_TAG) { + o = deref_tag(o, path, 0); + if (o) + fprintf(cb->refs_file, "^%s\n", + sha1_to_hex(o->sha1)); } if ((cb->flags & PACK_REFS_PRUNE) && !do_not_prune(flags)) { @@ -128,7 +128,7 @@ int pack_refs(unsigned int flags) die_errno("unable to create ref-pack file structure"); /* perhaps other traits later as well */ - fprintf(cbdata.refs_file, "# pack-refs with: peeled \n"); + fprintf(cbdata.refs_file, "# pack-refs with: peeled fully-peeled \n"); for_each_ref(handle_one_ref, &cbdata); if (ferror(cbdata.refs_file)) diff --git a/parse-options.c b/parse-options.c index 67e98a6323..c2cbca25cc 100644 --- a/parse-options.c +++ b/parse-options.c @@ -3,6 +3,7 @@ #include "cache.h" #include "commit.h" #include "color.h" +#include "utf8.h" static int parse_options_usage(struct parse_opt_ctx_t *ctx, const char * const *usagestr, @@ -461,8 +462,11 @@ int parse_options(int argc, const char **argv, const char *prefix, default: /* PARSE_OPT_UNKNOWN */ if (ctx.argv[0][1] == '-') { error("unknown option `%s'", ctx.argv[0] + 2); - } else { + } else if (isascii(*ctx.opt)) { error("unknown switch `%c'", *ctx.opt); + } else { + error("unknown non-ascii option in string: `%s'", + ctx.argv[0]); } usage_with_options(usagestr, options); } @@ -482,7 +486,7 @@ static int usage_argh(const struct option *opts, FILE *outfile) s = literal ? "[%s]" : "[<%s>]"; else s = literal ? " %s" : " <%s>"; - return fprintf(outfile, s, opts->argh ? _(opts->argh) : _("...")); + return utf8_fprintf(outfile, s, opts->argh ? _(opts->argh) : _("...")); } #define USAGE_OPTS_WIDTH 24 @@ -541,7 +545,7 @@ static int usage_with_options_internal(struct parse_opt_ctx_t *ctx, if (opts->long_name) pos += fprintf(outfile, "--%s", opts->long_name); if (opts->type == OPTION_NUMBER) - pos += fprintf(outfile, "-NUM"); + pos += utf8_fprintf(outfile, _("-NUM")); if ((opts->flags & PARSE_OPT_LITERAL_ARGHELP) || !(opts->flags & PARSE_OPT_NOARG)) diff --git a/parse-options.h b/parse-options.h index e703853749..1c8bd8d5a0 100644 --- a/parse-options.h +++ b/parse-options.h @@ -177,7 +177,7 @@ extern NORETURN void usage_msg_opt(const char *msg, extern int optbug(const struct option *opt, const char *reason); extern int opterror(const struct option *opt, const char *reason, int flags); -#ifdef __GNUC__ +#if defined(__GNUC__) && ! defined(clang) #define opterror(o,r,f) (opterror((o),(r),(f)), -1) #endif diff --git a/pathspec.c b/pathspec.c new file mode 100644 index 0000000000..284f3970a3 --- /dev/null +++ b/pathspec.c @@ -0,0 +1,101 @@ +#include "cache.h" +#include "dir.h" +#include "pathspec.h" + +/* + * Finds which of the given pathspecs match items in the index. + * + * For each pathspec, sets the corresponding entry in the seen[] array + * (which should be specs items long, i.e. the same size as pathspec) + * to the nature of the "closest" (i.e. most specific) match found for + * that pathspec in the index, if it was a closer type of match than + * the existing entry. As an optimization, matching is skipped + * altogether if seen[] already only contains non-zero entries. + * + * If seen[] has not already been written to, it may make sense + * to use find_pathspecs_matching_against_index() instead. + */ +void add_pathspec_matches_against_index(const char **pathspec, + char *seen, int specs) +{ + int num_unmatched = 0, i; + + /* + * Since we are walking the index as if we were walking the directory, + * we have to mark the matched pathspec as seen; otherwise we will + * mistakenly think that the user gave a pathspec that did not match + * anything. + */ + for (i = 0; i < specs; i++) + if (!seen[i]) + num_unmatched++; + if (!num_unmatched) + return; + for (i = 0; i < active_nr; i++) { + struct cache_entry *ce = active_cache[i]; + match_pathspec(pathspec, ce->name, ce_namelen(ce), 0, seen); + } +} + +/* + * Finds which of the given pathspecs match items in the index. + * + * This is a one-shot wrapper around add_pathspec_matches_against_index() + * which allocates, populates, and returns a seen[] array indicating the + * nature of the "closest" (i.e. most specific) matches which each of the + * given pathspecs achieves against all items in the index. + */ +char *find_pathspecs_matching_against_index(const char **pathspec) +{ + char *seen; + int i; + + for (i = 0; pathspec[i]; i++) + ; /* just counting */ + seen = xcalloc(i, 1); + add_pathspec_matches_against_index(pathspec, seen, i); + return seen; +} + +/* + * Check the index to see whether path refers to a submodule, or + * something inside a submodule. If the former, returns the path with + * any trailing slash stripped. If the latter, dies with an error + * message. + */ +const char *check_path_for_gitlink(const char *path) +{ + int i, path_len = strlen(path); + for (i = 0; i < active_nr; i++) { + struct cache_entry *ce = active_cache[i]; + if (S_ISGITLINK(ce->ce_mode)) { + int ce_len = ce_namelen(ce); + if (path_len <= ce_len || path[ce_len] != '/' || + memcmp(ce->name, path, ce_len)) + /* path does not refer to this + * submodule or anything inside it */ + continue; + if (path_len == ce_len + 1) { + /* path refers to submodule; + * strip trailing slash */ + return xstrndup(ce->name, ce_len); + } else { + die (_("Path '%s' is in submodule '%.*s'"), + path, ce_len, ce->name); + } + } + } + return path; +} + +/* + * Dies if the given path refers to a file inside a symlinked + * directory in the index. + */ +void die_if_path_beyond_symlink(const char *path, const char *prefix) +{ + if (has_symlink_leading_path(path, strlen(path))) { + int len = prefix ? strlen(prefix) : 0; + die(_("'%s' is beyond a symbolic link"), path + len); + } +} diff --git a/pathspec.h b/pathspec.h new file mode 100644 index 0000000000..db0184a1ac --- /dev/null +++ b/pathspec.h @@ -0,0 +1,9 @@ +#ifndef PATHSPEC_H +#define PATHSPEC_H + +extern char *find_pathspecs_matching_against_index(const char **pathspec); +extern void add_pathspec_matches_against_index(const char **pathspec, char *seen, int specs); +extern const char *check_path_for_gitlink(const char *path); +extern void die_if_path_beyond_symlink(const char *path, const char *prefix); + +#endif /* PATHSPEC_H */ diff --git a/perl/Git.pm b/perl/Git.pm index 931047c51d..96cac39a4c 100644 --- a/perl/Git.pm +++ b/perl/Git.pm @@ -59,6 +59,8 @@ require Exporter; command_bidi_pipe command_close_bidi_pipe version exec_path html_path hash_object git_cmd_try remote_refs prompt + get_tz_offset + credential credential_read credential_write temp_acquire temp_release temp_reset temp_path); @@ -102,6 +104,7 @@ use Error qw(:try); use Cwd qw(abs_path cwd); use IPC::Open2 qw(open2); use Fcntl qw(SEEK_SET SEEK_CUR); +use Time::Local qw(timegm); } @@ -267,13 +270,13 @@ sub command { if (not defined wantarray) { # Nothing to pepper the possible exception with. - _cmd_close($fh, $ctx); + _cmd_close($ctx, $fh); } elsif (not wantarray) { local $/; my $text = <$fh>; try { - _cmd_close($fh, $ctx); + _cmd_close($ctx, $fh); } catch Git::Error::Command with { # Pepper with the output: my $E = shift; @@ -286,7 +289,7 @@ sub command { my @lines = <$fh>; defined and chomp for @lines; try { - _cmd_close($fh, $ctx); + _cmd_close($ctx, $fh); } catch Git::Error::Command with { my $E = shift; $E->{'-outputref'} = \@lines; @@ -313,7 +316,7 @@ sub command_oneline { my $line = <$fh>; defined $line and chomp $line; try { - _cmd_close($fh, $ctx); + _cmd_close($ctx, $fh); } catch Git::Error::Command with { # Pepper with the output: my $E = shift; @@ -381,7 +384,7 @@ have more complicated structure. sub command_close_pipe { my ($self, $fh, $ctx) = _maybe_self(@_); $ctx ||= '<unknown>'; - _cmd_close($fh, $ctx); + _cmd_close($ctx, $fh); } =item command_bidi_pipe ( COMMAND [, ARGUMENTS... ] ) @@ -418,7 +421,7 @@ and it is the fourth value returned by C<command_bidi_pipe()>. The call idiom is: my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check'); - print "000000000\n" $out; + print $out "000000000\n"; while (<$in>) { ... } $r->command_close_bidi_pipe($pid, $in, $out, $ctx); @@ -426,23 +429,26 @@ Note that you should not rely on whatever actually is in C<CTX>; currently it is simply the command name but in future the context might have more complicated structure. +C<PIPE_IN> and C<PIPE_OUT> may be C<undef> if they have been closed prior to +calling this function. This may be useful in a query-response type of +commands where caller first writes a query and later reads response, eg: + + my ($pid, $in, $out, $ctx) = $r->command_bidi_pipe('cat-file --batch-check'); + print $out "000000000\n"; + close $out; + while (<$in>) { ... } + $r->command_close_bidi_pipe($pid, $in, undef, $ctx); + +This idiom may prevent potential dead locks caused by data sent to the output +pipe not being flushed and thus not reaching the executed command. + =cut sub command_close_bidi_pipe { local $?; - my ($pid, $in, $out, $ctx) = @_; - foreach my $fh ($in, $out) { - unless (close $fh) { - if ($!) { - carp "error closing pipe: $!"; - } elsif ($? >> 8) { - throw Git::Error::Command($ctx, $? >>8); - } - } - } - + my ($self, $pid, $in, $out, $ctx) = _maybe_self(@_); + _cmd_close($ctx, (grep { defined } ($in, $out))); waitpid $pid, 0; - if ($? >> 8) { throw Git::Error::Command($ctx, $? >>8); } @@ -511,6 +517,27 @@ C<git --html-path>). Useful mostly only internally. sub html_path { command_oneline('--html-path') } + +=item get_tz_offset ( TIME ) + +Return the time zone offset from GMT in the form +/-HHMM where HH is +the number of hours from GMT and MM is the number of minutes. This is +the equivalent of what strftime("%z", ...) would provide on a GNU +platform. + +If TIME is not supplied, the current local time is used. + +=cut + +sub get_tz_offset { + # some systmes don't handle or mishandle %z, so be creative. + my $t = shift || time; + my $gm = timegm(localtime($t)); + my $sign = qw( + + - )[ $gm <=> $t ]; + return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]); +} + + =item prompt ( PROMPT , ISPASSWORD ) Query user C<PROMPT> and return answer from user. @@ -942,20 +969,22 @@ sub cat_blob { my $size = $1; my $blob; - my $bytesRead = 0; + my $bytesLeft = $size; while (1) { - my $bytesLeft = $size - $bytesRead; last unless $bytesLeft; my $bytesToRead = $bytesLeft < 1024 ? $bytesLeft : 1024; - my $read = read($in, $blob, $bytesToRead, $bytesRead); + my $read = read($in, $blob, $bytesToRead); unless (defined($read)) { $self->_close_cat_blob(); throw Error::Simple("in pipe went bad"); } - - $bytesRead += $read; + unless (print $fh $blob) { + $self->_close_cat_blob(); + throw Error::Simple("couldn't write to passed in filehandle"); + } + $bytesLeft -= $read; } # Skip past the trailing newline. @@ -970,11 +999,6 @@ sub cat_blob { throw Error::Simple("didn't find newline after blob"); } - unless (print $fh $blob) { - $self->_close_cat_blob(); - throw Error::Simple("couldn't write to passed in filehandle"); - } - return $size; } @@ -1000,6 +1024,156 @@ sub _close_cat_blob { } +=item credential_read( FILEHANDLE ) + +Reads credential key-value pairs from C<FILEHANDLE>. Reading stops at EOF or +when an empty line is encountered. Each line must be of the form C<key=value> +with a non-empty key. Function returns hash with all read values. Any white +space (other than new-line character) is preserved. + +=cut + +sub credential_read { + my ($self, $reader) = _maybe_self(@_); + my %credential; + while (<$reader>) { + chomp; + if ($_ eq '') { + last; + } elsif (!/^([^=]+)=(.*)$/) { + throw Error::Simple("unable to parse git credential data:\n$_"); + } + $credential{$1} = $2; + } + return %credential; +} + +=item credential_write( FILEHANDLE, CREDENTIAL_HASHREF ) + +Writes credential key-value pairs from hash referenced by +C<CREDENTIAL_HASHREF> to C<FILEHANDLE>. Keys and values cannot contain +new-lines or NUL bytes characters, and key cannot contain equal signs nor be +empty (if they do Error::Simple is thrown). Any white space is preserved. If +value for a key is C<undef>, it will be skipped. + +If C<'url'> key exists it will be written first. (All the other key-value +pairs are written in sorted order but you should not depend on that). Once +all lines are written, an empty line is printed. + +=cut + +sub credential_write { + my ($self, $writer, $credential) = _maybe_self(@_); + my ($key, $value); + + # Check if $credential is valid prior to writing anything + while (($key, $value) = each %$credential) { + if (!defined $key || !length $key) { + throw Error::Simple("credential key empty or undefined"); + } elsif ($key =~ /[=\n\0]/) { + throw Error::Simple("credential key contains invalid characters: $key"); + } elsif (defined $value && $value =~ /[\n\0]/) { + throw Error::Simple("credential value for key=$key contains invalid characters: $value"); + } + } + + for $key (sort { + # url overwrites other fields, so it must come first + return -1 if $a eq 'url'; + return 1 if $b eq 'url'; + return $a cmp $b; + } keys %$credential) { + if (defined $credential->{$key}) { + print $writer $key, '=', $credential->{$key}, "\n"; + } + } + print $writer "\n"; +} + +sub _credential_run { + my ($self, $credential, $op) = _maybe_self(@_); + my ($pid, $reader, $writer, $ctx) = command_bidi_pipe('credential', $op); + + credential_write $writer, $credential; + close $writer; + + if ($op eq "fill") { + %$credential = credential_read $reader; + } + if (<$reader>) { + throw Error::Simple("unexpected output from git credential $op response:\n$_\n"); + } + + command_close_bidi_pipe($pid, $reader, undef, $ctx); +} + +=item credential( CREDENTIAL_HASHREF [, OPERATION ] ) + +=item credential( CREDENTIAL_HASHREF, CODE ) + +Executes C<git credential> for a given set of credentials and specified +operation. In both forms C<CREDENTIAL_HASHREF> needs to be a reference to +a hash which stores credentials. Under certain conditions the hash can +change. + +In the first form, C<OPERATION> can be C<'fill'>, C<'approve'> or C<'reject'>, +and function will execute corresponding C<git credential> sub-command. If +it's omitted C<'fill'> is assumed. In case of C<'fill'> the values stored in +C<CREDENTIAL_HASHREF> will be changed to the ones returned by the C<git +credential fill> command. The usual usage would look something like: + + my %cred = ( + 'protocol' => 'https', + 'host' => 'example.com', + 'username' => 'bob' + ); + Git::credential \%cred; + if (try_to_authenticate($cred{'username'}, $cred{'password'})) { + Git::credential \%cred, 'approve'; + ... do more stuff ... + } else { + Git::credential \%cred, 'reject'; + } + +In the second form, C<CODE> needs to be a reference to a subroutine. The +function will execute C<git credential fill> to fill the provided credential +hash, then call C<CODE> with C<CREDENTIAL_HASHREF> as the sole argument. If +C<CODE>'s return value is defined, the function will execute C<git credential +approve> (if return value yields true) or C<git credential reject> (if return +value is false). If the return value is undef, nothing at all is executed; +this is useful, for example, if the credential could neither be verified nor +rejected due to an unrelated network error. The return value is the same as +what C<CODE> returns. With this form, the usage might look as follows: + + if (Git::credential { + 'protocol' => 'https', + 'host' => 'example.com', + 'username' => 'bob' + }, sub { + my $cred = shift; + return !!try_to_authenticate($cred->{'username'}, + $cred->{'password'}); + }) { + ... do more stuff ... + } + +=cut + +sub credential { + my ($self, $credential, $op_or_code) = (_maybe_self(@_), 'fill'); + + if ('CODE' eq ref $op_or_code) { + _credential_run $credential, 'fill'; + my $ret = $op_or_code->($credential); + if (defined $ret) { + _credential_run $credential, $ret ? 'approve' : 'reject'; + } + return $ret; + } else { + _credential_run $credential, $op_or_code; + } +} + { # %TEMP_* Lexical Context my (%TEMP_FILEMAP, %TEMP_FILES); @@ -1355,9 +1529,11 @@ sub _execv_git_cmd { exec('git', @_); } # Close pipe to a subprocess. sub _cmd_close { - my ($fh, $ctx) = @_; - if (not close $fh) { - if ($!) { + my $ctx = shift @_; + foreach my $fh (@_) { + if (close $fh) { + # nop + } elsif ($!) { # It's just close, no point in fatalities carp "error closing pipe: $!"; } elsif ($? >> 8) { diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 59215fa86e..5273ee8867 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -11,7 +11,6 @@ use Carp qw/croak/; use File::Path qw/mkpath/; use File::Copy qw/copy/; use IPC::Open3; -use Time::Local; use Memoize; # core since 5.8.0, Jul 2002 use Memoize::Storable; use POSIX qw(:signal_h); @@ -22,6 +21,7 @@ use Git qw( command_noisy command_output_pipe command_close_pipe + get_tz_offset ); use Git::SVN::Utils qw( fatal @@ -490,7 +490,7 @@ sub refname { # # Additionally, % must be escaped because it is used for escaping # and we want our escaped refname to be reversible - $refname =~ s{([ \%~\^:\?\*\[\t])}{uc sprintf('%%%02x',ord($1))}eg; + $refname =~ s{([ \%~\^:\?\*\[\t])}{sprintf('%%%02X',ord($1))}eg; # no slash-separated component can begin with a dot . # /.* becomes /%2E* @@ -1311,14 +1311,6 @@ sub get_untracked { \@out; } -sub get_tz { - # some systmes don't handle or mishandle %z, so be creative. - my $t = shift || time; - my $gm = timelocal(gmtime($t)); - my $sign = qw( + + - )[ $t <=> $gm ]; - return sprintf("%s%02d%02d", $sign, (gmtime(abs($t - $gm)))[2,1]); -} - # parse_svn_date(DATE) # -------------------- # Given a date (in UTC) from Subversion, return a string in the format @@ -1351,7 +1343,7 @@ sub parse_svn_date { delete $ENV{TZ}; } - my $our_TZ = get_tz(); + my $our_TZ = get_tz_offset(); # This converts $epoch_in_UTC into our local timezone. my ($sec, $min, $hour, $mday, $mon, $year, @@ -1501,13 +1493,18 @@ sub lookup_svn_merge { my @merged_commit_ranges; # find the tip for my $range ( @ranges ) { + if ($range =~ /[*]$/) { + warn "W: Ignoring partial merge in svn:mergeinfo " + ."dirprop: $source:$range\n"; + next; + } my ($bottom, $top) = split "-", $range; $top ||= $bottom; my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top ); my $top_commit = $gs->find_rev_before( $top, 1, $bottom ); unless ($top_commit and $bottom_commit) { - warn "W:unknown path/rev in svn:mergeinfo " + warn "W: unknown path/rev in svn:mergeinfo " ."dirprop: $source:$range\n"; next; } @@ -2377,7 +2374,7 @@ sub map_path { sub uri_encode { my ($f) = @_; - $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#uc sprintf("%%%02x",ord($1))#eg; + $f =~ s#([^a-zA-Z0-9\*!\:_\./\-])#sprintf("%%%02X",ord($1))#eg; $f } diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm index 3bbc20a054..fa0d3c6cdd 100644 --- a/perl/Git/SVN/Editor.pm +++ b/perl/Git/SVN/Editor.pm @@ -145,7 +145,8 @@ sub repo_path { sub url_path { my ($self, $path) = @_; if ($self->{url} =~ m#^https?://#) { - $path =~ s!([^~a-zA-Z0-9_./-])!uc sprintf("%%%02x",ord($1))!eg; + # characters are taken from subversion/libsvn_subr/path.c + $path =~ s#([^~a-zA-Z0-9_./!$&'()*+,-])#sprintf("%%%02X",ord($1))#eg; } $self->{url} . '/' . $self->repo_path($path); } @@ -358,12 +359,12 @@ sub T { mode_a => $m->{mode_a}, mode_b => '000000', sha1_a => $m->{sha1_a}, sha1_b => '0' x 40, chg => 'D', file_b => $m->{file_b} - }); + }, $deletions); $self->A({ mode_a => '000000', mode_b => $m->{mode_b}, sha1_a => '0' x 40, sha1_b => $m->{sha1_b}, chg => 'A', file_b => $m->{file_b} - }); + }, $deletions); return; } diff --git a/perl/Git/SVN/Log.pm b/perl/Git/SVN/Log.pm index 3cc1c6f081..3f8350a57d 100644 --- a/perl/Git/SVN/Log.pm +++ b/perl/Git/SVN/Log.pm @@ -2,7 +2,11 @@ package Git::SVN::Log; use strict; use warnings; use Git::SVN::Utils qw(fatal); -use Git qw(command command_oneline command_output_pipe command_close_pipe); +use Git qw(command + command_oneline + command_output_pipe + command_close_pipe + get_tz_offset); use POSIX qw/strftime/; use constant commit_log_separator => ('-' x 72) . "\n"; use vars qw/$TZ $limit $color $pager $non_recursive $verbose $oneline @@ -119,7 +123,7 @@ sub run_pager { sub format_svn_date { my $t = shift || time; require Git::SVN; - my $gmoff = Git::SVN::get_tz($t); + my $gmoff = get_tz_offset($t); return strftime("%Y-%m-%d %H:%M:%S $gmoff (%a, %d %b %Y)", localtime($t)); } diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm index 8b8cf3755c..3d1a0933a2 100644 --- a/perl/Git/SVN/Utils.pm +++ b/perl/Git/SVN/Utils.pm @@ -155,7 +155,7 @@ sub _canonicalize_url_path { my @parts; foreach my $part (split m{/+}, $uri_path) { - $part =~ s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; + $part =~ s/([^!\$%&'()*+,.\/\w:=\@_`~-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg; push @parts, $part; } @@ -46,3 +46,4 @@ Members: Riku <lu.riku AT gmail.com> Yichao Yu <yyc1992 AT gmail.com> ws3389 <willsmith3389 AT gmail.com> Thynson <lanxingcan AT gmail.com> + Wang Sheng <wangsheng2008love@163.com> @@ -5,9 +5,9 @@ # msgid "" msgstr "" -"Project-Id-Version: git 1.8.1\n" +"Project-Id-Version: git 1.8.2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-11-30 12:40+0800\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" "PO-Revision-Date: 2012-10-02 19:35+0200\n" "Last-Translator: Ralf Thielow <ralf.thielow@gmail.com>\n" "Language-Team: German <>\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n!=1);\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "Hinweis: %.*s\n" @@ -26,7 +26,7 @@ msgstr "Hinweis: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -57,80 +57,80 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <Projektarchiv> [--exec <Programm>] --list" -#: archive.c:322 +#: archive.c:323 msgid "fmt" msgstr "Format" -#: archive.c:322 +#: archive.c:323 msgid "archive format" msgstr "Ausgabeformat" -#: archive.c:323 builtin/log.c:1084 +#: archive.c:324 builtin/log.c:1115 msgid "prefix" msgstr "Prefix" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "stellt einen Präfix vor jeden Pfadnamen in der Ausgabe" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390 -#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 -#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "Datei" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:92 msgid "write the archive to this file" msgstr "schreibt die Ausgabe in diese Datei" -#: archive.c:328 +#: archive.c:329 msgid "read .gitattributes in working directory" msgstr "liest .gitattributes aus dem Arbeitsverzeichnis" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" msgstr "gibt archivierte Dateien in der Standard-Fehlerausgabe aus" -#: archive.c:330 +#: archive.c:331 msgid "store only" msgstr "nur speichern" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" msgstr "schneller komprimieren" -#: archive.c:339 +#: archive.c:340 msgid "compress better" msgstr "besser komprimieren" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" msgstr "listet unterstützte Ausgabeformate auf" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" msgstr "Projektarchiv" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" msgstr "ruft das Archiv von externem Projektarchiv <Projektarchiv> ab" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 msgid "command" msgstr "Programm" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" msgstr "Pfad zum externen \"git-upload-archive\"-Programm" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Verneinende Muster sind in Git-Attributen verboten.\n" +"Verneinende Muster werden in Git-Attributen ignoriert.\n" "Benutzen Sie '\\!' für führende Ausrufezeichen." #: bundle.c:36 @@ -152,9 +152,9 @@ msgstr "Konnte '%s' nicht öffnen" msgid "Repository lacks these prerequisite commits:" msgstr "Dem Projektarchiv fehlen folgende vorausgesetzte Versionen:" -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 -#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "Einrichtung des Revisionsgangs fehlgeschlagen" @@ -180,7 +180,7 @@ msgstr[1] "Das Paket benötigt diese %d Referenzen" msgid "rev-list died" msgstr "\"rev-list\" abgebrochen" -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "nicht erkanntes Argument: %s" @@ -306,24 +306,23 @@ msgid_plural "%lu years ago" msgstr[0] "vor %lu Jahr" msgstr[1] "vor %lu Jahren" -#: diff.c:111 +#: diff.c:112 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" " Fehler beim Parsen des abgeschnittenen \"dirstat\" Prozentsatzes '%s'\n" -#: diff.c:116 +#: diff.c:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Unbekannter \"dirstat\" Parameter '%s'\n" -#: diff.c:194 +#: diff.c:210 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "" -"Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" +msgstr "Unbekannter Wert in Konfigurationsvariable 'diff.dirstat': '%s'" -#: diff.c:237 +#: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -332,7 +331,7 @@ msgstr "" "Fehler in 'diff.dirstat' Konfigurationsvariable gefunden:\n" "%s" -#: diff.c:3494 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -341,13 +340,12 @@ msgstr "" "Fehler beim Parsen des --dirstat/-X Optionsparameters:\n" "%s" -#: diff.c:3508 -#, c-format +#: diff.c:3482 +#, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "" -"Fehler beim Parsen des --submodule Optionsparameters: '%s'" +msgstr "Fehler beim Parsen des --submodule Optionsparameters: '%s'" -#: gpg-interface.c:59 +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "konnte gpg nicht ausführen" @@ -359,6 +357,16 @@ msgstr "gpg hat die Daten nicht akzeptiert" msgid "gpg failed to sign the data" msgstr "gpg beim Signieren der Daten fehlgeschlagen" +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "konnte temporäre Datei '%s' nicht erstellen: %s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "Fehler beim Schreiben der Signatur nach '%s': %s" + #: grep.c:1622 #, c-format msgid "'%s': unable to read %s" @@ -383,7 +391,11 @@ msgstr "Vorhandene Git-Kommandos in '%s'" msgid "git commands available from elsewhere on your $PATH" msgstr "Vorhandene Git-Kommandos irgendwo in Ihrem $PATH" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "Die allgemein verwendeten Git-Kommandos sind:" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -392,11 +404,11 @@ msgstr "" "'%s' scheint ein git-Kommando zu sein, konnte aber\n" "nicht ausgeführt werden. Vielleicht ist git-%s fehlerhaft?" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Uh oh. Keine Git-Kommandos auf Ihrem System vorhanden." -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -405,17 +417,17 @@ msgstr "" "Warnung: Sie haben das nicht existierende Git-Kommando '%s' ausgeführt.\n" "Setze fort unter der Annahme, dass Sie '%s' gemeint haben" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatisch in %0.1f Sekunden..." -#: help.c:366 +#: help.c:383 #, 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:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -620,7 +632,7 @@ msgstr "%s ausgelassen (Ergebnis der Zusammenführung existiert bereits)" msgid "Auto-merging %s" msgstr "automatische Zusammenführung von %s" -#: merge-recursive.c:1633 git-submodule.sh:893 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "Unterprojekt" @@ -696,39 +708,53 @@ msgstr "Konnte Objekt '%s' nicht parsen." msgid "Unable to write index." msgstr "Konnte Bereitstellung nicht schreiben." -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "Verwendung: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " oder: %s" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-NUM" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Pfad '%s' befindet sich in Unterprojekt '%.*s'" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' ist über einem symbolischen Link" + +#: remote.c:1653 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Ihr Zweig ist vor '%s' um %d Version.\n" msgstr[1] "Ihr Zweig ist vor '%s' um %d Versionen.\n" -#: remote.c:1637 +#: remote.c:1659 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (benutzen Sie \"git push\" um lokalen Versionen herauszubringen)\n" -#: remote.c:1640 +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -739,12 +765,12 @@ msgstr[1] "" "Ihr Zweig ist zu '%s' um %d Versionen hinterher, und kann vorgespult " "werden.\n" -#: remote.c:1647 +#: remote.c:1670 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" " (benutzen Sie \"git pull\" um Ihren lokalen Zweig zu aktualisieren)\n" -#: remote.c:1650 +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -759,10 +785,11 @@ msgstr[1] "" "Ihr Zweig und '%s' sind divergiert,\n" "und haben jeweils %d und %d unterschiedliche Versionen.\n" -#: remote.c:1659 +#: remote.c:1683 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" -" (benutzen Sie \"git pull\" um Ihren Zweig mit dem externen zusammenzuführen)\n" +" (benutzen Sie \"git pull\" um Ihren Zweig mit dem externen " +"zusammenzuführen)\n" #: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 #: builtin/merge.c:994 @@ -794,7 +821,7 @@ msgstr "" "mit 'git add <Pfade>' oder 'git rm <Pfade>'und tragen Sie das Ergebnis mit\n" "'git commit' ein" -#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "Konnte nicht nach %s schreiben" @@ -815,53 +842,50 @@ msgstr "Ihre lokalen Änderungen würden von \"revert\" überschrieben werden." #: sequencer.c:185 msgid "Commit your changes or stash them to proceed." -msgstr "Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\" um fortzufahren." +msgstr "" +"Tragen Sie Ihre Änderungen ein oder benutzen Sie \"stash\" um fortzufahren." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:235 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Konnte neue Bereitstellungsdatei nicht schreiben" -#: sequencer.c:266 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "Konnte Version der Zweigspitze (HEAD) nicht auflösen\n" -#: sequencer.c:287 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "Konnte zwischengespeicherten Baum nicht aktualisieren\n" -#: sequencer.c:332 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "Konnte Version %s nicht parsen\n" -#: sequencer.c:337 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Konnte Elternversion %s nicht parsen\n" -#: sequencer.c:403 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "Ihre Bereitstellungsdatei ist nicht zusammengeführt." -#: sequencer.c:406 -msgid "You do not have a valid HEAD" -msgstr "Sie haben keine gültige Zweigspitze (HEAD)" - -#: sequencer.c:421 +#: sequencer.c:423 #, 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:429 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "Version %s hat keinen Elternteil %d" -#: sequencer.c:433 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -869,145 +893,145 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:444 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kann Elternversion %s nicht parsen" -#: sequencer.c:448 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "Kann keine Versionsbeschreibung für %s bekommen" -#: sequencer.c:532 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "Konnte %s nicht zurücksetzen... %s" -#: sequencer.c:533 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "Konnte %s nicht anwenden... %s" -#: sequencer.c:565 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "leere Menge von Versionen übergeben" -#: sequencer.c:573 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: Fehler beim Lesen der Bereitstellung" -#: sequencer.c:578 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: Fehler beim Aktualisieren der Bereitstellung" -#: sequencer.c:636 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "Kann %s nicht während eines %s durchführen" -#: sequencer.c:658 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "Konnte Zeile %d nicht parsen." -#: sequencer.c:663 +#: sequencer.c:667 msgid "No commits parsed." msgstr "Keine Versionen geparst." -#: sequencer.c:676 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "Konnte %s nicht öffnen" -#: sequencer.c:680 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "Konnte %s nicht lesen." -#: sequencer.c:687 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Unbenutzbares Instruktionsblatt: %s" -#: sequencer.c:715 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "Ungültiger Schlüssel: %s" -#: sequencer.c:718 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "Ungültiger Wert für %s: %s" -#: sequencer.c:730 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "Fehlerhaftes Optionsblatt: %s" -#: sequencer.c:751 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "\"cherry-pick\" oder \"revert\" ist bereits im Gang" -#: sequencer.c:752 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "versuchen Sie \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:756 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "Konnte \"sequencer\"-Verzeichnis %s nicht erstellen" -#: sequencer.c:772 sequencer.c:857 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "Fehler beim Einpacken von %s." -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "kein \"cherry-pick\" oder \"revert\" im Gang" -#: sequencer.c:793 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "kann Zweigspitze (HEAD) nicht auflösen" -#: sequencer.c:795 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "kann nicht abbrechen: bin auf einem Zweig, der noch geboren wird" -#: sequencer.c:817 builtin/apply.c:4005 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "Kann %s nicht öffnen: %s" -#: sequencer.c:820 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "Kann %s nicht lesen: %s" -#: sequencer.c:821 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "Unerwartetes Dateiende" -#: sequencer.c:827 +#: sequencer.c:831 #, 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:850 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "Konnte %s nicht formatieren." -#: sequencer.c:1012 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "Kann nicht zu initialer Version zurücksetzen." -#: sequencer.c:1013 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "Kann \"cherry-pick\" nicht in einem leerem Kopf ausführen." @@ -1036,12 +1060,17 @@ msgstr "" msgid "unable to access '%s': %s" msgstr "konnte nicht auf '%s' zugreifen: %s" -#: wrapper.c:426 +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "konnte nicht auf '%s' zugreifen" + +#: wrapper.c:434 #, 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:427 +#: wrapper.c:435 msgid "no such user" msgstr "kein solcher Benutzer" @@ -1064,7 +1093,8 @@ msgstr "" #: wt-status.c:173 msgid " (use \"git add <file>...\" to mark resolution)" -msgstr " (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" +msgstr "" +" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" #: wt-status.c:175 wt-status.c:179 msgid " (use \"git add/rm <file>...\" as appropriate to mark resolution)" @@ -1074,7 +1104,8 @@ msgstr "" #: wt-status.c:177 msgid " (use \"git rm <file>...\" to mark resolution)" -msgstr " (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" +msgstr "" +" (benutzen Sie \"git add/rm <Datei>...\" um die Auflösung zu markieren)" #: wt-status.c:188 msgid "Changes to be committed:" @@ -1102,8 +1133,8 @@ msgstr "" #: wt-status.c:215 msgid " (commit or discard the untracked or modified content in submodules)" msgstr "" -" (tragen Sie ein oder verwerfen Sie den unbeobachteten oder geänderten Inhalt in den " -"Unterprojekten)" +" (tragen Sie ein oder verwerfen Sie den unbeobachteten oder geänderten " +"Inhalt in den Unterprojekten)" #: wt-status.c:227 #, c-format @@ -1199,154 +1230,185 @@ msgstr "nicht zusammengeführt: %s" msgid "bug: unhandled diff status %c" msgstr "Fehler: unbehandelter Differenz-Status %c" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "Sie haben nicht zusammengeführte Pfade." -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " (beheben Sie die Konflikte und führen Sie \"git commit\" aus)" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "" "Alle Konflikte sind behoben, aber Sie sind immer noch beim Zusammenführen." -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " (benutzen Sie \"git commit\" um die Zusammenführung abzuschließen)" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "Eine \"am\"-Sitzung ist im Gange." -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "Der aktuelle Patch ist leer." -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" -msgstr " (beheben Sie die Konflikte und führen Sie dann \"git am --resolved\" aus)" +msgstr "" +" (beheben Sie die Konflikte und führen Sie dann \"git am --resolved\" aus)" -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (benutzen Sie \"git am --skip\" um diesen Patch auszulassen)" -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -" (benutzen Sie \"git am --abort\" um den ursprünglichen Zweig wiederherzustellen)" +" (benutzen Sie \"git am --abort\" um den ursprünglichen Zweig " +"wiederherzustellen)" + +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Sie sind gerade beim Neuaufbau von Zweig '%s' auf '%s'." -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "Sie sind gerade beim Neuaufbau." -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" -msgstr " (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" aus)" +msgstr "" +" (beheben Sie die Konflikte und führen Sie dann \"git rebase --continue\" " +"aus)" -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (benutzen Sie \"git rebase --skip\" um diesen Patch auszulassen)" -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -" (benutzen Sie \"git rebase --abort\" um den ursprünglichen Zweig auszuchecken)" +" (benutzen Sie \"git rebase --abort\" um den ursprünglichen Zweig " +"auszuchecken)" -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alle Konflikte behoben: führen Sie \"git rebase --continue\" aus)" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Sie teilen gerade eine Version auf, während ein Neuaufbau von Zweig '%s' auf " +"'%s' im Gange ist." + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "Sie teilen gerade eine Version während eines Neuaufbaus auf." -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -" (Sobald Ihr Arbeitsverzeichnis sauber ist, führen Sie \"git rebase --continue" -"\" aus)" +" (Sobald Ihr Arbeitsverzeichnis sauber ist, führen Sie \"git rebase --" +"continue\" aus)" + +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Sie editieren gerade eine Version während eines Neuaufbaus von Zweig '%s' " +"auf '%s'." -#: wt-status.c:893 +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "Sie editieren gerade eine Version während eines Neuaufbaus." -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (benutzen Sie \"git commit --amend\" um die aktuelle Version nachzubessern)" -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen abgeschlossen " -"sind)" +" (benutzen Sie \"git rebase --continue\" sobald Ihre Änderungen " +"abgeschlossen sind)" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "Sie führen gerade \"cherry-pick\" aus." -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (alle Konflikte behoben: führen Sie \"git commit\" aus)" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "Sie sind gerade bei einer binären Suche in Zweig '%s'." + +#: wt-status.c:962 msgid "You are currently bisecting." -msgstr "Sie sind gerade beim Halbieren." +msgstr "Sie sind gerade bei einer binären Suche." -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -" (benutzen Sie \"git bisect reset\" um zum ursprünglichen Zweig zurückzukehren)" +" (benutzen Sie \"git bisect reset\" um zum ursprünglichen Zweig " +"zurückzukehren)" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "Auf Zweig " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "Im Moment auf keinem Zweig." -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "Initiale Version" -#: wt-status.c:1011 +#: wt-status.c:1097 msgid "Untracked files" msgstr "Unbeobachtete Dateien" -#: wt-status.c:1013 +#: wt-status.c:1099 msgid "Ignored files" msgstr "Ignorierte Dateien" -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "Unbeobachtete Dateien nicht aufgelistet%s" -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr " (benutzen Sie die Option -u um unbeobachteten Dateien anzuzeigen)" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "Keine Änderungen" -#: wt-status.c:1028 +#: wt-status.c:1114 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -"keine Änderungen zum Eintragen hinzugefügt (benutzen Sie \"git add\" und/oder " -"\"git commit -a\")\n" +"keine Änderungen zum Eintragen hinzugefügt (benutzen Sie \"git add\" und/" +"oder \"git commit -a\")\n" -#: wt-status.c:1031 +#: wt-status.c:1117 #, c-format msgid "no changes added to commit\n" msgstr "keine Änderungen zum Eintragen hinzugefügt\n" -#: wt-status.c:1034 +#: wt-status.c:1120 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1355,207 +1417,242 @@ msgstr "" "nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien " "(benutzen Sie \"git add\" zum Beobachten)\n" -#: wt-status.c:1037 +#: wt-status.c:1123 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "nichts zum Eintragen hinzugefügt, aber es gibt unbeobachtete Dateien\n" -#: wt-status.c:1040 +#: wt-status.c:1126 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -"nichts einzutragen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git add\" " -"zum Beobachten)\n" +"nichts einzutragen (Erstellen/Kopieren Sie Dateien und benutzen Sie \"git add" +"\" zum Beobachten)\n" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1129 wt-status.c:1134 #, c-format msgid "nothing to commit\n" msgstr "nichts einzutragen\n" -#: wt-status.c:1046 +#: wt-status.c:1132 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "nichts einzutragen (benutzen Sie die Option -u, um unbeobachtete Dateien " "anzuzeigen)\n" -#: wt-status.c:1050 +#: wt-status.c:1136 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "nichts einzutragen, Arbeitsverzeichnis sauber\n" -#: wt-status.c:1158 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD (kein Zweig)" -#: wt-status.c:1164 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "Initiale Version auf " -#: wt-status.c:1179 +#: wt-status.c:1265 msgid "behind " msgstr "hinterher " -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "voraus " -#: wt-status.c:1187 +#: wt-status.c:1273 msgid ", behind " msgstr ", hinterher " #: compat/precompose_utf8.c:58 builtin/clone.c:341 #, c-format msgid "failed to unlink '%s'" -msgstr "Konnte '%s' nicht entfernen" +msgstr "Konnte '%s' nicht entfernen." -#: builtin/add.c:19 -msgid "git add [options] [--] <filepattern>..." -msgstr "git add [Optionen] [--] [<Dateimuster>...]" +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [Optionen] [--] [<Pfadspezifikation>...]" -#: builtin/add.c:62 +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "unerwarteter Differenz-Status %c" -#: builtin/add.c:67 builtin/commit.c:231 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "Aktualisierung der Dateien fehlgeschlagen" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "lösche '%s'\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "Pfad '%s' befindet sich in Unterprojekt '%.*s'" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "" "Nicht bereitgestellte Änderungen nach Aktualisierung der Bereitstellung:" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "Pfadspezifikation '%s' stimmt mit keinen Dateien überein" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' ist über einem symbolischen Link" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "Konnte die Bereitstellung nicht lesen" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Konnte '%s' nicht zum Schreiben öffnen." -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Konnte Patch nicht schreiben" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "Konnte Verzeichnis '%s' nicht lesen" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "Leerer Patch. Abgebrochen." -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Konnte '%s' nicht anwenden." -#: builtin/add.c:313 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Die folgenden Pfade werden durch eine Ihrer \".gitignore\" Dateien " "ignoriert:\n" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "Probelauf" -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483 -#: builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "erweiterte Ausgaben" -#: builtin/add.c:322 +#: builtin/add.c:280 msgid "interactive picking" msgstr "interaktives Auswählen" -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 msgid "select hunks interactively" msgstr "interaktiv Bereiche auswählen" -#: builtin/add.c:324 +#: builtin/add.c:282 msgid "edit current diff and apply" msgstr "aktuelle Unterschiede editieren und anwenden" -#: builtin/add.c:325 +#: builtin/add.c:283 msgid "allow adding otherwise ignored files" msgstr "erlaubt das Hinzufügen andernfalls ignorierter Dateien" -#: builtin/add.c:326 +#: builtin/add.c:284 msgid "update tracked files" msgstr "aktualisiert beobachtete Dateien" -#: builtin/add.c:327 +#: builtin/add.c:285 msgid "record only the fact that the path will be added later" msgstr "speichert nur, dass der Pfad später hinzugefügt werden soll" -#: builtin/add.c:328 +#: builtin/add.c:286 msgid "add changes from all tracked and untracked files" msgstr "" "fügt Änderungen von allen beobachteten und unbeobachteten Dateien hinzu" -#: builtin/add.c:329 +#: builtin/add.c:287 msgid "don't add, only refresh the index" msgstr "fügt nichts hinzu, aktualisiert nur die Bereitstellung" -#: builtin/add.c:330 +#: builtin/add.c:288 msgid "just skip files which cannot be added because of errors" msgstr "" "überspringt Dateien, die aufgrund von Fehlern nicht hinzugefügt werden " "konnten" -#: builtin/add.c:331 +#: builtin/add.c:289 msgid "check if - even missing - files are ignored in dry run" msgstr "prüft ob - auch fehlende - Dateien im Probelauf ignoriert werden" -#: builtin/add.c:353 +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Verwenden Sie -f wenn Sie diese wirklich hinzufügen möchten.\n" -#: builtin/add.c:354 +#: builtin/add.c:312 msgid "no files added" msgstr "keine Dateien hinzugefügt" -#: builtin/add.c:360 +#: builtin/add.c:318 msgid "adding files failed" msgstr "Hinzufügen von Dateien fehlgeschlagen" -#: builtin/add.c:392 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"Das Verhalten von 'git add %s (oder %s)' ohne ein Pfad-Argument von\n" +"einem Unterverzeichnis aus wird in Git 2.0 geändert und sollte nicht\n" +"mehr verwendet werden.\n" +"Um Dateien des gesamten Projektverzeichnisses hinzuzufügen, führen Sie aus:\n" +"\n" +" git add %s :/\n" +" (oder git add %s :/)\n" +"\n" +"Zur Einschränkung auf das aktuelle Verzeichnis führen Sie aus:\n" +"\n" +" git add %s .\n" +" (oder git add %s .)\n" +"\n" +"Mit der aktuellen Version von Git ist das Kommando auf das aktuelle\n" +"Verzeichnis beschränkt." + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" -msgstr "-A und -u sind zueinander inkompatibel" +msgstr "Die Optionen -A und -u sind zueinander inkompatibel." -#: builtin/add.c:394 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" -"Die Option --ignore-missing kann nur zusammen mit --dry-run benutzt werden." +"Die Option --ignore-missing kann nur zusammen mit --dry-run verwendet werden." #: builtin/add.c:414 #, c-format @@ -1567,12 +1664,12 @@ msgstr "Nichts spezifiziert, nichts hinzugefügt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Wollten Sie vielleicht 'git add .' sagen?\n" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82 -#: builtin/rm.c:235 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "Bereitstellungsdatei beschädigt" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." @@ -1629,17 +1726,17 @@ msgstr "" 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:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: unerwartete Zeile: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "Patch-Fragment ohne Kopfbereich bei Zeile %d: %.*s" -#: builtin/apply.c:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1654,70 +1751,66 @@ msgstr[1] "" "Dem Kopfbereich von \"git diff\" fehlen Informationen zum Dateinamen, wenn " "%d vorangestellte Teile des Pfades entfernt werden (Zeile %d)" -#: builtin/apply.c:1654 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "neue Datei hängt von alten Inhalten ab" -#: builtin/apply.c:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "entfernte Datei hat noch Inhalte" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "fehlerhafter Patch bei Zeile %d" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "neue Datei %s hängt von alten Inhalten ab" -#: builtin/apply.c:1720 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "entfernte Datei %s hat noch Inhalte" -#: builtin/apply.c:1723 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** Warnung: Datei %s wird leer, aber nicht entfernt." -#: builtin/apply.c:1869 +#: builtin/apply.c:1871 #, 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:1898 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "nicht erkannter Binär-Patch bei Zeile %d" -#: builtin/apply.c:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "Patch mit nutzlosen Informationen bei Zeile %d" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "konnte symbolische Verknüpfung %s nicht lesen" -#: builtin/apply.c:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "konnte %s nicht öffnen oder lesen" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "Ups" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "Ungültiger Zeilenanfang: '%c'" -#: builtin/apply.c:2789 +#: builtin/apply.c:2802 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." @@ -1725,12 +1818,12 @@ 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:2801 +#: builtin/apply.c:2814 #, 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:2807 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1739,335 +1832,340 @@ msgstr "" "bei der Suche nach:\n" "%.*s" -#: builtin/apply.c:2826 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "keine Daten in Binär-Patch für '%s'" -#: builtin/apply.c:2929 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "Konnte Binär-Patch nicht auf '%s' anwenden" -#: builtin/apply.c:2935 +#: builtin/apply.c:2948 #, 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:2956 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "Anwendung des Patches fehlgeschlagen: %s:%ld" -#: builtin/apply.c:3078 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "kann %s nicht auschecken" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "Konnte %s nicht lesen" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "Pfad %s wurde umbenannt/gelöscht" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "%s ist nicht bereitgestellt" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s entspricht nicht der Bereitstellung" -#: builtin/apply.c:3348 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "Lösch-Patch hinterlässt Dateiinhalte" -#: builtin/apply.c:3417 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s: falscher Typ" -#: builtin/apply.c:3419 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "%s ist vom Typ %o, erwartete %o" -#: builtin/apply.c:3520 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s ist bereits bereitgestellt" -#: builtin/apply.c:3523 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "%s existiert bereits im Arbeitsverzeichnis" -#: builtin/apply.c:3543 +#: builtin/apply.c:3556 #, 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:3548 +#: builtin/apply.c:3561 #, 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:3556 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s: Patch konnte nicht angewendet werden" -#: builtin/apply.c:3569 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "Prüfe Patch %s..." -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry für Pfad '%s' fehlgeschlagen" -#: builtin/apply.c:3767 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "konnte %s nicht aus der Bereitstellung entfernen" -#: builtin/apply.c:3795 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "fehlerhafter Patch für Unterprojekt %s" -#: builtin/apply.c:3799 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "konnte neu erstellte Datei '%s' nicht lesen" -#: builtin/apply.c:3804 +#: builtin/apply.c:3855 #, 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:3807 builtin/apply.c:3915 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, 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:3840 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "schließe Datei '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "konnte Datei '%s' mit Modus %o nicht schreiben" -#: builtin/apply.c:3976 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "Patch %s sauber angewendet" -#: builtin/apply.c:3984 +#: builtin/apply.c:4035 msgid "internal error" msgstr "interner Fehler" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4038 #, 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:3997 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "Verkürze Name von .rej Datei zu %.*s.rej" -#: builtin/apply.c:4018 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Patch-Bereich #%d sauber angewendet." -#: builtin/apply.c:4021 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "Patch-Bereich #%d zurückgewiesen." -#: builtin/apply.c:4171 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "nicht erkannte Eingabe" -#: builtin/apply.c:4182 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "Konnte Bereitstellungsdatei nicht lesen" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "Pfad" -#: builtin/apply.c:4302 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "wendet keine Änderungen im angegebenen Pfad an" -#: builtin/apply.c:4305 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "wendet Änderungen nur im angegebenen Pfad an" -#: builtin/apply.c:4307 +#: builtin/apply.c:4358 msgid "num" msgstr "Anzahl" -#: builtin/apply.c:4308 +#: builtin/apply.c:4359 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" "entfernt <Anzahl> vorangestellte Schrägstriche von herkömmlichen " "Differenzpfaden" -#: builtin/apply.c:4311 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "ignoriert hinzugefügte Zeilen des Patches" -#: builtin/apply.c:4313 +#: builtin/apply.c:4364 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:4317 +#: builtin/apply.c:4368 msgid "show number of added and deleted lines in decimal notation" msgstr "" "zeigt die Anzahl von hinzugefügten/entfernten Zeilen in Dezimalnotation" -#: builtin/apply.c:4319 +#: builtin/apply.c:4370 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:4321 +#: builtin/apply.c:4372 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:4323 +#: builtin/apply.c:4374 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:4325 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "wendet einen Patch an, ohne Änderungen im Arbeitszweig vorzunehmen" -#: builtin/apply.c:4327 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "wendet den Patch an (Benutzung mit --stat/--summary/--check)" -#: builtin/apply.c:4329 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "" "versucht 3-Wege-Zusammenführung, wenn der Patch nicht angewendet werden " "konnte" -#: builtin/apply.c:4331 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "" "erstellt eine temporäre Bereitstellung basierend auf den integrierten " "Bereitstellungsinformationen" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "Pfade sind getrennt durch NUL Zeichen" -#: builtin/apply.c:4336 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "stellt sicher, dass mindestens <n> Zeilen des Kontextes übereinstimmen" -#: builtin/apply.c:4337 +#: builtin/apply.c:4388 msgid "action" msgstr "Aktion" -#: builtin/apply.c:4338 +#: builtin/apply.c:4389 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:4341 builtin/apply.c:4344 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "ignoriert Änderungen in Leerzeichen bei der Suche des Kontextes" -#: builtin/apply.c:4347 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "wendet den Patch in umgekehrter Reihenfolge an" -#: builtin/apply.c:4349 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "erwartet keinen Kontext" -#: builtin/apply.c:4351 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" "hinterlässt zurückgewiesene Patch-Bereiche in den entsprechenden *.rej " "Dateien" -#: builtin/apply.c:4353 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "erlaubt sich überlappende Patch-Bereiche" -#: builtin/apply.c:4356 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "toleriert fehlerhaft erkannten fehlenden Zeilenumbruch am Dateiende" -#: builtin/apply.c:4359 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "vertraut nicht den Zeilennummern im Kopf des Patch-Bereiches" -#: builtin/apply.c:4361 +#: builtin/apply.c:4412 msgid "root" msgstr "Wurzelverzeichnis" -#: builtin/apply.c:4362 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "stellt <Wurzelverzeichnis> vor alle Dateinamen" -#: builtin/apply.c:4384 +#: builtin/apply.c:4435 msgid "--3way outside a repository" -msgstr "--3way außerhalb eines Projektarchivs" +msgstr "" +"Die Option --3way kann nicht außerhalb eines Projektarchivs verwendet werden." -#: builtin/apply.c:4392 +#: builtin/apply.c:4443 msgid "--index outside a repository" -msgstr "--index außerhalb eines Projektarchivs" +msgstr "" +"Die Option --index kann nicht außerhalb eines Projektarchivs verwendet " +"werden." -#: builtin/apply.c:4395 +#: builtin/apply.c:4446 msgid "--cached outside a repository" -msgstr "--cached außerhalb eines Projektarchivs" +msgstr "" +"Die Option --cached kann nicht außerhalb eines Projektarchivs verwendet " +"werden." -#: builtin/apply.c:4411 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "kann Patch '%s' nicht öffnen" -#: builtin/apply.c:4425 +#: builtin/apply.c:4476 #, 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:4431 builtin/apply.c:4441 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2129,96 +2227,96 @@ msgstr "git blame [Optionen] [rev-opts] [rev] [--] Datei" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-opts] sind dokumentiert in git-rev-list(1)" -#: builtin/blame.c:2374 +#: builtin/blame.c:2350 msgid "Show blame entries as we find them, incrementally" msgstr "Zeigt \"blame\"-Einträge schrittweise, während wir sie generieren" -#: builtin/blame.c:2375 +#: builtin/blame.c:2351 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Zeigt leere SHA-1 für Grenzversionen (Standard: aus)" -#: builtin/blame.c:2376 +#: builtin/blame.c:2352 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandelt Ursprungsversionen nicht als Grenzen (Standard: aus)" -#: builtin/blame.c:2377 +#: builtin/blame.c:2353 msgid "Show work cost statistics" msgstr "Zeigt Statistiken zum Arbeitsaufwand" -#: builtin/blame.c:2378 +#: builtin/blame.c:2354 msgid "Show output score for blame entries" msgstr "Zeigt Ausgabebewertung für \"blame\"-Einträge" -#: builtin/blame.c:2379 +#: builtin/blame.c:2355 msgid "Show original filename (Default: auto)" msgstr "Zeigt ursprünglichen Dateinamen (Standard: auto)" -#: builtin/blame.c:2380 +#: builtin/blame.c:2356 msgid "Show original linenumber (Default: off)" msgstr "Zeigt ursprüngliche Zeilennummer (Standard: aus)" -#: builtin/blame.c:2381 +#: builtin/blame.c:2357 msgid "Show in a format designed for machine consumption" msgstr "Anzeige in einem Format für maschinelle Auswertung" -#: builtin/blame.c:2382 +#: builtin/blame.c:2358 msgid "Show porcelain format with per-line commit information" msgstr "" "Anzeige in Format für Fremdprogramme mit Versionsinformationen pro Zeile" -#: builtin/blame.c:2383 +#: builtin/blame.c:2359 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Benutzt den gleichen Ausgabemodus wie \"git-annotate\" (Standard: aus)" -#: builtin/blame.c:2384 +#: builtin/blame.c:2360 msgid "Show raw timestamp (Default: off)" msgstr "Zeigt unbearbeiteten Zeitstempel (Standard: aus)" -#: builtin/blame.c:2385 +#: builtin/blame.c:2361 msgid "Show long commit SHA1 (Default: off)" msgstr "Zeigt langen Versions-SHA1 (Standard: aus)" -#: builtin/blame.c:2386 +#: builtin/blame.c:2362 msgid "Suppress author name and timestamp (Default: off)" msgstr "Unterdrückt den Namen des Autors und den Zeitstempel (Standard: aus)" -#: builtin/blame.c:2387 +#: builtin/blame.c:2363 msgid "Show author email instead of name (Default: off)" msgstr "Zeigt anstatt des Namens die Email-Adresse des Autors (Standard: aus)" -#: builtin/blame.c:2388 +#: builtin/blame.c:2364 msgid "Ignore whitespace differences" msgstr "Ignoriert Unterschiede in Leerzeichen" -#: builtin/blame.c:2389 +#: builtin/blame.c:2365 msgid "Spend extra cycles to find better match" msgstr "arbeite länger, um bessere Übereinstimmungen zu finden" -#: builtin/blame.c:2390 +#: builtin/blame.c:2366 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Benutzt Revisionen von <Datei> anstatt \"git-rev-list\" aufzurufen" -#: builtin/blame.c:2391 +#: builtin/blame.c:2367 msgid "Use <file>'s contents as the final image" msgstr "Benutzt Inhalte der <Datei>en als entgültiges Abbild" -#: builtin/blame.c:2392 builtin/blame.c:2393 +#: builtin/blame.c:2368 builtin/blame.c:2369 msgid "score" msgstr "Bewertung" -#: builtin/blame.c:2392 +#: builtin/blame.c:2368 msgid "Find line copies within and across files" msgstr "Findet kopierte Zeilen innerhalb oder zwischen Dateien" -#: builtin/blame.c:2393 +#: builtin/blame.c:2369 msgid "Find line movements within and across files" msgstr "Findet verschobene Zeilen innerhalb oder zwischen Dateien" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "Process only line range n,m, counting from 1" msgstr "Verarbeitet nur Zeilen im Bereich n,m, gezählt von 1" @@ -2269,7 +2367,8 @@ msgid "" "If you are sure you want to delete it, run 'git branch -D %s'." msgstr "" "Der Zweig '%s' ist nicht vollständig zusammengeführt.\n" -"Wenn Sie sicher sind diesen Zweig zu entfernen, führen Sie 'git branch -D %s' aus." +"Wenn Sie sicher sind diesen Zweig zu entfernen, führen Sie 'git branch -D " +"%s' aus." #: builtin/branch.c:180 msgid "Update of config-file failed" @@ -2354,10 +2453,19 @@ msgstr "[%s: %d voraus, %d hinterher]" msgid "[ahead %d, behind %d]" msgstr "[%d voraus, %d hinterher]" +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** ungültige Referenz ****" + #: builtin/branch.c:560 msgid "(no branch)" msgstr "(kein Zweig)" +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "Objekt '%s' zeigt auf keine Version" + #: builtin/branch.c:625 msgid "some refs could not be read" msgstr "Konnte einige Referenzen nicht lesen" @@ -2431,8 +2539,8 @@ msgid "act on remote-tracking branches" msgstr "wirkt auf externe Übernahmezweige" #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 -#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377 -#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 msgid "commit" msgstr "Version" @@ -2501,36 +2609,63 @@ msgstr "Konnte Zweigspitze (HEAD) nicht als gültige Referenz auflösen." msgid "HEAD not found below refs/heads!" msgstr "Zweigspitze (HEAD) wurde nicht unter \"refs/heads\" gefunden!" -#: builtin/branch.c:836 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" -msgstr "--column und --verbose sind inkompatibel" +msgstr "Die Optionen --column und --verbose sind inkompatibel." + +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "Zweigname erforderlich" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "" +"zu losgelöster Zweigspitze (HEAD) kann keine Beschreibung hinterlegt werden" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "Beschreibung von mehr als einem Zweig kann nicht bearbeitet werden" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Noch keine Version in Zweig '%s'." + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "Zweig '%s' nicht vorhanden." -#: builtin/branch.c:887 +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "zu viele Zweige für eine Umbenennen-Operation angegeben" + +#: builtin/branch.c:893 #, c-format msgid "branch '%s' does not exist" msgstr "Zweig '%s' existiert nicht" -#: builtin/branch.c:899 +#: builtin/branch.c:905 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Zweig '%s' hat keinen externen Übernahmezweig gesetzt" -#: builtin/branch.c:914 +#: builtin/branch.c:920 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 " -"Sinn." +"Die Optionen -a und -r bei 'git branch' können nicht gemeimsam mit einem " +"Zweignamen verwendet werden." -#: builtin/branch.c:917 +#: builtin/branch.c:923 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie " -"--track oder --set-upstream-to\n" +"Die --set-upstream Option ist veraltet und wird entfernt. Benutzen Sie --" +"track oder --set-upstream-to\n" -#: builtin/branch.c:934 +#: builtin/branch.c:940 #, c-format msgid "" "\n" @@ -2541,12 +2676,12 @@ msgstr "" "Wenn Sie wollten, dass '%s' den Zweig '%s' als externen Übernahmezweig hat, " "führen Sie aus:\n" -#: builtin/branch.c:935 +#: builtin/branch.c:941 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:936 +#: builtin/branch.c:942 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -2613,7 +2748,8 @@ msgstr "git check-attr [-a | --all | Attribut...] [--] Pfadname..." #: builtin/check-attr.c:12 msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" -msgstr "git check-attr --stdin [-z] [-a | --all | Attribut...] < <Liste-von-Pfaden>" +msgstr "" +"git check-attr --stdin [-z] [-a | --all | Attribut...] < <Liste-von-Pfaden>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" @@ -2623,14 +2759,39 @@ msgstr "gibt alle Attribute einer Datei aus" msgid "use .gitattributes only from the index" msgstr "verwendet .gitattributes nur von der Bereitstellung" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "liest Dateinamen von der Standard-Eingabe" -#: builtin/check-attr.c:23 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "Eingabepfade sind durch ein NUL Zeichen abgeschlossen" +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "unterdrückt Fortschrittsanzeige" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "Angabe von Pfadnamen kann nicht gemeinsam mit --stdin verwendet werden" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "Die Option -z kann nur mit --stdin verwendet werden." + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "kein Pfad angegeben" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "Die Option --quiet ist nur mit einem einzelnen Pfadnamen gültig." + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "" +"Die Optionen --quiet und --verbose können nicht gemeinsam verwendet werden." + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [Optionen] [--] [<Datei>...]" @@ -2720,12 +2881,12 @@ msgstr "Konnte Ergebnis der Zusammenführung von '%s' nicht hinzufügen." #: builtin/checkout.c:245 #, c-format msgid "'%s' cannot be used with updating paths" -msgstr "'%s' kann nicht mit Pfaden benutzt werden" +msgstr "'%s' kann nicht mit Pfaden verwendet werden" #: builtin/checkout.c:248 builtin/checkout.c:251 #, c-format msgid "'%s' cannot be used with %s" -msgstr "'%s' kann nicht mit '%s' benutzt werden" +msgstr "'%s' kann nicht mit '%s' verwendet werden" #: builtin/checkout.c:254 #, c-format @@ -2757,7 +2918,7 @@ msgstr "Zweigspitze (HEAD) ist jetzt bei" #: builtin/checkout.c:609 #, c-format msgid "Reset branch '%s'\n" -msgstr "Setze Zweig '%s' zurück\n" +msgstr "Setze Zweig '%s' neu\n" #: builtin/checkout.c:612 #, c-format @@ -2767,7 +2928,7 @@ msgstr "Bereits auf '%s'\n" #: builtin/checkout.c:616 #, c-format msgid "Switched to and reset branch '%s'\n" -msgstr "Gewechselt zu zurückgesetztem Zweig '%s'\n" +msgstr "Gewechselt zu neu gesetztem Zweig '%s'\n" #: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format @@ -2849,28 +3010,24 @@ msgstr "Referenz ist kein Baum: %s" #: builtin/checkout.c:964 msgid "paths cannot be used with switching branches" -msgstr "Pfade können nicht mit dem Wechseln von Zweigen benutzt werden" +msgstr "Pfade können nicht beim Wechseln von Zweigen verwendet werden" #: builtin/checkout.c:967 builtin/checkout.c:971 #, c-format msgid "'%s' cannot be used with switching branches" -msgstr "'%s' kann nicht mit dem Wechseln von Zweigen benutzt werden" +msgstr "'%s' kann nicht beim Wechseln von Zweigen verwendet werden" #: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 #: builtin/checkout.c:986 #, c-format msgid "'%s' cannot be used with '%s'" -msgstr "'%s' kann nicht mit '%s' benutzt werden" +msgstr "'%s' kann nicht mit '%s' verwendet werden" #: builtin/checkout.c:991 #, c-format msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kann Zweig nicht zu Nicht-Version '%s' wechseln" -#: builtin/checkout.c:1012 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "unterdrückt Fortschrittsanzeige" - #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" @@ -2924,7 +3081,7 @@ msgstr "führt eine 3-Wege-Zusammenführung mit dem neuen Zweig aus" msgid "update ignored files (default)" msgstr "aktualisiert ignorierte Dateien (Standard)" -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 msgid "style" msgstr "Stil" @@ -2938,11 +3095,11 @@ msgstr "second guess 'git checkout no-such-branch'" #: builtin/checkout.c:1057 msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-b, -B und --orphan schliessen sich gegenseitig aus" +msgstr "Die Optionen -b, -B und --orphan schließen sich gegenseitig aus." #: builtin/checkout.c:1074 msgid "--track needs a branch name" -msgstr "--track benötigt einen Zweignamen" +msgstr "Bei der Option --track muss ein Zweigname angegeben werden." #: builtin/checkout.c:1081 msgid "Missing branch name; try -b" @@ -2959,8 +3116,8 @@ msgid "" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" "Kann nicht gleichzeitig Pfade aktualisieren und zu Zweig '%s' wechseln.\n" -"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Version aufgelöst " -"werden kann?" +"Haben Sie beabsichtigt '%s' auszuchecken, welcher nicht als Version " +"aufgelöst werden kann?" #: builtin/checkout.c:1128 #, c-format @@ -2975,51 +3132,76 @@ msgstr "" "git checkout: --ours/--theirs, --force und --merge sind inkompatibel wenn\n" "Sie aus der Bereitstellung auschecken." -#: builtin/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "git clean [-d] [-f] [-n] [-q] [-e <Muster>] [-x | -X] [--] <Pfade>..." -#: builtin/clean.c:51 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Lösche %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Würde %s löschen\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Überspringe Projektarchiv %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Würde Projektarchiv %s überspringen\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "Fehler beim Löschen von %s" + +#: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "gibt keine Namen von gelöschten Dateien aus" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" msgstr "erzwingt Aktion" -#: builtin/clean.c:55 +#: builtin/clean.c:164 msgid "remove whole directories" msgstr "löscht ganze Verzeichnisse" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "Muster" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "fügt <Muster> zu den Regeln für ignorierte Pfade hinzu" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "löscht auch ignorierte Dateien" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" msgstr "löscht nur ignorierte Dateien" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" -msgstr "-x und -X können nicht zusammen benutzt werden" +msgstr "Die Optionen -x und -X können nicht gemeinsam verwendet werden." -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce auf \"true\" gesetzt und weder -n noch -f gegeben; " "Säuberung verweigert" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -3027,37 +3209,12 @@ msgstr "" "clean.requireForce standardmäßig auf \"true\" gesetzt und weder -n noch -f " "gegeben; Säuberung verweigert" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "Würde %s löschen\n" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "Lösche %s\n" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "Fehler beim Löschen von %s" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "Würde '%s' nicht löschen\n" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "Entferne nicht %s\n" - #: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [Optionen] [--] <Projektarchiv> [<Verzeichnis>]" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/push.c:436 msgid "force progress reporting" msgstr "erzwingt Fortschrittsanzeige" @@ -3079,7 +3236,7 @@ msgstr "um von einem lokalen Projektarchiv zu klonen" #: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" -msgstr "benutzt lokal keine harten Links, immer Kopien" +msgstr "verwendet lokal keine harten Links, immer Kopien" #: builtin/clone.c:78 msgid "setup as shared repository" @@ -3107,7 +3264,7 @@ msgstr "Name" #: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" -msgstr "benutzt <Name> statt 'origin' für externes Projektarchiv" +msgstr "verwendet <Name> statt 'origin' für externes Projektarchiv" #: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" @@ -3208,58 +3365,64 @@ msgstr "Sie müssen ein Projektarchiv zum Klonen angeben." #: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." -msgstr "--bare und --origin %s Optionen sind inkompatibel." +msgstr "Die Optionen --bare und --origin %s sind inkompatibel." + +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "Die Optionen --bare und --separate-git-dir sind inkompatibel." -#: builtin/clone.c:719 +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "Projektarchiv '%s' existiert nicht." -#: builtin/clone.c:724 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." -msgstr "--depth wird in lokalen Klonen ignoriert; benutzen Sie stattdessen file://." +msgstr "" +"Die Option --depth wird in lokalen Klonen ignoriert; benutzen Sie " +"stattdessen file://" -#: builtin/clone.c:734 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "Zielpfad '%s' existiert bereits und ist kein leeres Verzeichnis." -#: builtin/clone.c:744 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "Arbeitsbaum '%s' existiert bereits." -#: builtin/clone.c:757 builtin/clone.c:771 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "Konnte führende Verzeichnisse von '%s' nicht erstellen." -#: builtin/clone.c:760 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "Konnte Arbeitsverzeichnis '%s' nicht erstellen." -#: builtin/clone.c:779 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klone in bloßes Projektarchiv '%s'...\n" -#: builtin/clone.c:781 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klone nach '%s'...\n" -#: builtin/clone.c:823 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "Weiß nicht wie %s zu klonen ist." -#: builtin/clone.c:872 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "externer Zweig %s nicht im anderen Projektarchiv %s gefunden" -#: builtin/clone.c:879 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "Sie scheinen ein leeres Projektarchiv geklont zu haben." @@ -3293,15 +3456,15 @@ msgstr "Abstand zwischen Spalten" #: builtin/column.c:51 msgid "--command must be the first argument" -msgstr "Option --command muss zuerst angegeben werden" +msgstr "Die Option --command muss an erster Stelle stehen." #: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." -msgstr "git commit [Optionen] [--] <Dateimuster>..." +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [Optionen] [--] <Pfadspezifikation>..." #: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." -msgstr "git status [Optionen] [--] <Dateimuster>..." +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [Optionen] [--] <Pfadspezifikation>..." #: builtin/commit.c:44 msgid "" @@ -3411,7 +3574,7 @@ msgstr "Fehlerhafte Identifikations-String: '%s'" msgid "could not lookup commit %s" msgstr "Konnte Version %s nicht nachschlagen" -#: builtin/commit.c:610 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "(lese Log-Nachricht von Standard-Eingabe)\n" @@ -3477,22 +3640,26 @@ msgstr "" "und versuchen Sie es erneut.\n" #: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "Bitte geben Sie eine Versionsbeschreibung für Ihre Änderungen ein. Zeilen,\n" -"die mit '#' beginnen, werden ignoriert, und eine leere Versionsbeschreibung\n" +"die mit '%c' beginnen, werden ignoriert, und eine leere " +"Versionsbeschreibung\n" "bricht die Eintragung ab.\n" #: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"Bitte geben Sie eine Versionsbeschreibung für Ihre Änderungen ein. Zeilen, die\n" -"mit '#' beginnen, werden beibehalten; wenn Sie möchten, können Sie diese " +"Bitte geben Sie eine Versionsbeschreibung für Ihre Änderungen ein. Zeilen, " +"die\n" +"mit '%c' beginnen, werden beibehalten; wenn Sie möchten, können Sie diese " "entfernen.\n" "Eine leere Versionsbeschreibung bricht die Eintragung ab.\n" @@ -3514,7 +3681,7 @@ msgstr "Kann Bereitstellung nicht lesen" msgid "Error building trees" msgstr "Fehler beim Erzeugen der Zweige" -#: builtin/commit.c:832 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Bitte liefere eine Beschreibung entweder mit der Option -m oder -F.\n" @@ -3524,118 +3691,123 @@ msgstr "Bitte liefere eine Beschreibung entweder mit der Option -m oder -F.\n" msgid "No existing author found with '%s'" msgstr "Kein existierender Autor mit '%s' gefunden." -#: builtin/commit.c:944 builtin/commit.c:1148 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ungültiger Modus '%s' für unbeobachtete Dateien" -#: builtin/commit.c:984 +#: builtin/commit.c:974 msgid "Using both --reset-author and --author does not make sense" -msgstr "Verwendung von --reset-author und --author macht keinen Sinn." +msgstr "" +"Die Optionen --reset-author und --author können nicht gemeinsam verwendet " +"werden." -#: builtin/commit.c:995 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "Sie haben nichts zum nachbessern." -#: builtin/commit.c:998 +#: builtin/commit.c:988 msgid "You are in the middle of a merge -- cannot amend." msgstr "Eine Zusammenführung ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1000 +#: builtin/commit.c:990 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "\"cherry-pick\" ist im Gange -- kann nicht nachbessern." -#: builtin/commit.c:1003 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "" -"Die Optionen --squash und --fixup können nicht gemeinsam benutzt werden." +"Die Optionen --squash und --fixup können nicht gemeinsam verwendet werden." -#: builtin/commit.c:1013 +#: builtin/commit.c:1003 msgid "Only one of -c/-C/-F/--fixup can be used." -msgstr "Nur eines von -c/-C/-F/--fixup kann benutzt werden." +msgstr "Es kann nur eine Option von -c/-C/-F/--fixup verwendet werden." -#: builtin/commit.c:1015 +#: builtin/commit.c:1005 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." -msgstr "Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden" +msgstr "Die Option -m kann nicht mit -c/-C/-F/--fixup kombiniert werden." -#: builtin/commit.c:1023 +#: builtin/commit.c:1013 msgid "--reset-author can be used only with -C, -c or --amend." -msgstr "--reset--author kann nur mit -C, -c oder --amend benutzt werden" +msgstr "" +"Die Option --reset--author kann nur mit -C, -c oder --amend verwendet werden." -#: builtin/commit.c:1040 +#: builtin/commit.c:1030 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -"Nur eines von --include/--only/--all/--interactive/--patch kann benutzt " -"werden." +"Es kann nur eine Option von --include/--only/--all/--interactive/--patch " +"verwendet werden." -#: builtin/commit.c:1042 +#: builtin/commit.c:1032 msgid "No paths with --include/--only does not make sense." -msgstr "--include/--only machen ohne Pfade keinen Sinn." +msgstr "" +"Die Optionen --include und --only können nur mit der Angabe von Pfaden " +"verwendet werden." -#: builtin/commit.c:1044 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "" "Klug... die letzte Version mit einer unsauberen Bereitstellung nachbessern." -#: builtin/commit.c:1046 +#: builtin/commit.c:1036 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:1056 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Ungültiger \"cleanup\" Modus %s" -#: builtin/commit.c:1061 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." -msgstr "Pfade mit -a machen keinen Sinn." +msgstr "Die Option -a kann nur mit der Angabe von Pfaden verwendet werden." -#: builtin/commit.c:1067 builtin/commit.c:1202 +#: builtin/commit.c:1057 builtin/commit.c:1192 msgid "--long and -z are incompatible" -msgstr "--long und -z sind inkompatibel" +msgstr "Die Optionen --long und -z sind inkompatibel." -#: builtin/commit.c:1162 builtin/commit.c:1398 +#: builtin/commit.c:1152 builtin/commit.c:1388 msgid "show status concisely" msgstr "zeigt Status im Kurzformat" -#: builtin/commit.c:1164 builtin/commit.c:1400 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show branch information" msgstr "zeigt Zweiginformationen" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 msgid "machine-readable output" msgstr "maschinenlesbare Ausgabe" -#: builtin/commit.c:1169 builtin/commit.c:1404 +#: builtin/commit.c:1159 builtin/commit.c:1394 msgid "show status in long format (default)" msgstr "zeigt Status im Langformat (Standard)" -#: builtin/commit.c:1172 builtin/commit.c:1407 +#: builtin/commit.c:1162 builtin/commit.c:1397 msgid "terminate entries with NUL" msgstr "schließt Einträge mit NUL-Zeichen ab" -#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 msgid "mode" msgstr "Modus" -#: builtin/commit.c:1175 builtin/commit.c:1410 +#: builtin/commit.c:1165 builtin/commit.c:1400 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "zeigt nicht beobachtete Dateien, optionale Modi: all, normal, no. (Standard: " "all)" -#: builtin/commit.c:1178 +#: builtin/commit.c:1168 msgid "show ignored files" msgstr "zeigt ignorierte Dateien" -#: builtin/commit.c:1179 parse-options.h:151 +#: builtin/commit.c:1169 parse-options.h:151 msgid "when" msgstr "wann" -#: builtin/commit.c:1180 +#: builtin/commit.c:1170 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -3643,219 +3815,219 @@ msgstr "" "ignoriert Änderungen in Unterprojekten, optional wenn: all, dirty, " "untracked. (Standard: all)" -#: builtin/commit.c:1182 +#: builtin/commit.c:1172 msgid "list untracked files in columns" msgstr "listet unbeobachtete Dateien in Spalten auf" -#: builtin/commit.c:1256 +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "Konnte neu erstellte Version nicht nachschlagen." -#: builtin/commit.c:1258 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "Konnte neulich erstellte Version nicht analysieren." -#: builtin/commit.c:1299 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "losgelöste Zweigspitze (HEAD)" -#: builtin/commit.c:1301 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr " (Basis-Version)" -#: builtin/commit.c:1368 +#: builtin/commit.c:1358 msgid "suppress summary after successful commit" msgstr "unterdrückt Zusammenfassung nach erfolgreicher Eintragung" -#: builtin/commit.c:1369 +#: builtin/commit.c:1359 msgid "show diff in commit message template" msgstr "zeigt Unterschiede in Versionsbeschreibungsvorlage an" -#: builtin/commit.c:1371 +#: builtin/commit.c:1361 msgid "Commit message options" msgstr "Optionen für Versionsbeschreibung" -#: builtin/commit.c:1372 builtin/tag.c:459 +#: builtin/commit.c:1362 builtin/tag.c:457 msgid "read message from file" msgstr "liest Beschreibung von Datei" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "author" msgstr "Autor" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "override author for commit" msgstr "überschreibt Autor von Version" -#: builtin/commit.c:1374 builtin/gc.c:178 +#: builtin/commit.c:1364 builtin/gc.c:178 msgid "date" msgstr "Datum" -#: builtin/commit.c:1374 +#: builtin/commit.c:1364 msgid "override date for commit" msgstr "überschreibt Datum von Version" -#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/tag.c:457 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "Beschreibung" -#: builtin/commit.c:1375 +#: builtin/commit.c:1365 msgid "commit message" msgstr "Versionsbeschreibung" -#: builtin/commit.c:1376 +#: builtin/commit.c:1366 msgid "reuse and edit message from specified commit" msgstr "verwendet wieder und editiert Beschreibung von der angegebenen Version" -#: builtin/commit.c:1377 +#: builtin/commit.c:1367 msgid "reuse message from specified commit" msgstr "verwendet Beschreibung der angegebenen Version wieder" -#: builtin/commit.c:1378 +#: builtin/commit.c:1368 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -"benutzt eine automatisch zusammengesetzte Beschreibung zum Nachbessern der " +"verwendet eine automatisch zusammengesetzte Beschreibung zum Nachbessern der " "angegebenen Version" -#: builtin/commit.c:1379 +#: builtin/commit.c:1369 msgid "use autosquash formatted message to squash specified commit" msgstr "" -"benutzt eine automatisch zusammengesetzte Beschreibung zum Zusammenführen " +"verwendet eine automatisch zusammengesetzte Beschreibung zum Zusammenführen " "der angegebenen Version" -#: builtin/commit.c:1380 +#: builtin/commit.c:1370 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "Setzt Sie als Autor der Version (benutzt mit -C/-c/--amend)" +msgstr "Setzt Sie als Autor der Version (verwendet mit -C/-c/--amend)" -#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "fügt 'Signed-off-by:'-Zeile hinzu" -#: builtin/commit.c:1382 +#: builtin/commit.c:1372 msgid "use specified template file" -msgstr "benutzt angegebene Vorlagendatei" +msgstr "verwendet angegebene Vorlagendatei" -#: builtin/commit.c:1383 +#: builtin/commit.c:1373 msgid "force edit of commit" msgstr "erzwingt Bearbeitung der Version" -#: builtin/commit.c:1384 +#: builtin/commit.c:1374 msgid "default" msgstr "Standard" -#: builtin/commit.c:1384 builtin/tag.c:462 +#: builtin/commit.c:1374 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" "wie Leerzeichen und #Kommentare von der Beschreibung getrennt werden sollen" -#: builtin/commit.c:1385 +#: builtin/commit.c:1375 msgid "include status in commit message template" msgstr "fügt Status in die Versionsbeschreibungsvorlage ein" -#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 msgid "key id" msgstr "Schlüssel-ID" -#: builtin/commit.c:1387 builtin/merge.c:214 +#: builtin/commit.c:1377 builtin/merge.c:214 msgid "GPG sign commit" msgstr "signiert Version mit GPG" #. end commit message options -#: builtin/commit.c:1390 +#: builtin/commit.c:1380 msgid "Commit contents options" msgstr "Optionen für Versionsinhalt" -#: builtin/commit.c:1391 +#: builtin/commit.c:1381 msgid "commit all changed files" msgstr "trägt alle geänderten Dateien ein" -#: builtin/commit.c:1392 +#: builtin/commit.c:1382 msgid "add specified files to index for commit" msgstr "trägt die angegebenen Dateien zusätzlich zur Bereitstellung ein" -#: builtin/commit.c:1393 +#: builtin/commit.c:1383 msgid "interactively add files" msgstr "interaktives Hinzufügen von Dateien" -#: builtin/commit.c:1394 +#: builtin/commit.c:1384 msgid "interactively add changes" msgstr "interaktives Hinzufügen von Änderungen" -#: builtin/commit.c:1395 +#: builtin/commit.c:1385 msgid "commit only specified files" msgstr "trägt nur die angegebenen Dateien ein" -#: builtin/commit.c:1396 +#: builtin/commit.c:1386 msgid "bypass pre-commit hook" msgstr "umgeht \"pre-commit hook\"" -#: builtin/commit.c:1397 +#: builtin/commit.c:1387 msgid "show what would be committed" msgstr "zeigt an, was eingetragen werden würde" -#: builtin/commit.c:1408 +#: builtin/commit.c:1398 msgid "amend previous commit" msgstr "ändert vorherige Version" -#: builtin/commit.c:1409 +#: builtin/commit.c:1399 msgid "bypass post-rewrite hook" msgstr "umgeht \"post-rewrite hook\"" -#: builtin/commit.c:1414 +#: builtin/commit.c:1404 msgid "ok to record an empty change" msgstr "erlaubt Aufzeichnung einer leeren Änderung" -#: builtin/commit.c:1417 +#: builtin/commit.c:1407 msgid "ok to record a change with an empty message" msgstr "erlaubt Aufzeichnung einer Änderung mit einer leeren Beschreibung" -#: builtin/commit.c:1449 +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "Konnte Version der Zweigspitze (HEAD) nicht analysieren." -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "Konnte '%s' nicht zum Lesen öffnen." -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Beschädigte MERGE_HEAD-Datei (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "Konnte MERGE_MODE nicht lesen" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "Konnte Versionsbeschreibung nicht lesen: %s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Eintragung abgebrochen; Sie haben die Beschreibung nicht editiert.\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1529 #, 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:832 builtin/merge.c:857 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "Fehler beim Schreiben des Versionsobjektes." -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht sperren." -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "Kann Referenz der Zweigspitze (HEAD) nicht aktualisieren." -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -3876,19 +4048,19 @@ msgstr "Ort der Konfigurationsdatei" #: builtin/config.c:52 msgid "use global config file" -msgstr "benutzt globale Konfigurationsdatei" +msgstr "verwendet globale Konfigurationsdatei" #: builtin/config.c:53 msgid "use system config file" -msgstr "benutzt systemweite Konfigurationsdatei" +msgstr "verwendet systemweite Konfigurationsdatei" #: builtin/config.c:54 msgid "use repository config file" -msgstr "benutzt Konfigurationsdatei des Projektarchivs" +msgstr "verwendet Konfigurationsdatei des Projektarchivs" #: builtin/config.c:55 msgid "use given config file" -msgstr "benutzt die angegebene Konfigurationsdatei" +msgstr "verwendet die angegebene Konfigurationsdatei" #: builtin/config.c:56 msgid "Action" @@ -4076,15 +4248,15 @@ msgstr "protokolliert die Suchstrategie in der Standard-Fehlerausgabe" #: builtin/describe.c:405 msgid "use any ref in .git/refs" -msgstr "benutzt jede Referenz in .git/refs" +msgstr "verwendet alle Referenzen in .git/refs" #: builtin/describe.c:406 msgid "use any tag in .git/refs/tags" -msgstr "benutzt alle Markierungen in .git/refs/tags" +msgstr "verwendet alle Markierungen in .git/refs/tags" #: builtin/describe.c:407 msgid "always use long format" -msgstr "benutzt immer langes Format" +msgstr "verwendet immer langes Format" #: builtin/describe.c:410 msgid "only output exact matches" @@ -4113,7 +4285,7 @@ msgstr "" #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" -msgstr "--long ist inkompatibel mit --abbrev=0" +msgstr "Die Optionen --long und --abbrev=0 sind inkompatibel." #: builtin/describe.c:462 msgid "No names found, cannot describe anything." @@ -4121,7 +4293,7 @@ msgstr "Keine Namen gefunden, kann nichts beschreiben." #: builtin/describe.c:482 msgid "--dirty is incompatible with committishes" -msgstr "--dirty ist inkompatibel mit Versionen" +msgstr "Die Option --dirty kann nicht mit Versionen verwendet werden." #: builtin/diff.c:79 #, c-format @@ -4161,40 +4333,40 @@ msgstr "unbehandeltes Objekt '%s' angegeben" msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:646 msgid "show progress after <n> objects" msgstr "zeigt Fortschritt nach <n> Objekten an" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:648 msgid "select handling of signed tags" msgstr "wählt Behandlung von signierten Markierungen" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:651 msgid "select handling of tags that tag filtered objects" msgstr "wählt Behandlung von Markierungen, die gefilterte Objekte markieren" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:654 msgid "Dump marks to this file" msgstr "Schreibt Kennzeichen in diese Datei" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:656 msgid "Import marks from this file" msgstr "Importiert Kennzeichen von dieser Datei" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:658 msgid "Fake a tagger when tags lack one" msgstr "" "erzeugt künstlich einen Markierungsersteller, wenn die Markierung keinen hat" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:660 msgid "Output full tree for each commit" msgstr "gibt für jede Version den gesamten Baum aus" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:662 msgid "Use the done feature to terminate the stream" msgstr "Benutzt die \"done\"-Funktion um den Strom abzuschließen" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:663 msgid "Skip output of blob data" msgstr "Überspringt Ausgabe von Blob-Daten" @@ -4267,88 +4439,92 @@ msgstr "erlaubt Aktualisierung der \"HEAD\"-Referenz" msgid "deepen history of shallow clone" msgstr "vertieft die Historie eines flachen Klon" -#: builtin/fetch.c:85 builtin/log.c:1088 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "konvertiert zu einem vollständigen Projektarchiv" + +#: builtin/fetch.c:88 builtin/log.c:1119 msgid "dir" msgstr "Verzeichnis" -#: builtin/fetch.c:86 +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "stellt dies an die Ausgabe der Unterprojekt-Pfade voran" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "Standard-Modus für Rekursion" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "Konnte externe Referenz der Zweigspitze (HEAD) nicht finden." -#: builtin/fetch.c:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "Objekt %s nicht gefunden" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[aktuell]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (kann nicht im aktuellen Zweig anfordern)" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[zurückgewiesen]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[Markierungsaktualisierung]" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " (kann lokale Referenz nicht aktualisieren)" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[neue Markierung]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[neuer Zweig]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[neue Referenz]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "kann lokale Referenz nicht aktualisieren" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "Aktualisierung erzwungen" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(kein Vorspulen)" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "kann %s nicht öffnen: %s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s hat nicht alle erforderlichen Objekte gesendet\n" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "Von %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4357,116 +4533,127 @@ msgstr "" "Einige lokale Referenzen konnten nicht aktualisiert werden; versuchen Sie\n" "'git remote prune %s' um jeden älteren, widersprüchlichen Zweig zu löschen." -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s wird unreferenziert)" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s wurde unreferenziert)" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[gelöscht]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "(nichts)" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, 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." -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "Weiß nicht wie von %s angefordert wird." -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "Option \"%s\" Wert \"%s\" ist nicht gültig für %s" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Option \"%s\" wird ignoriert für %s\n" -#: builtin/fetch.c:891 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "Fordere an von %s\n" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Konnte nicht von %s anfordern" -#: builtin/fetch.c:912 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" "Kein externes Projektarchiv angegeben. Bitte geben Sie entweder eine URL\n" "oder den Namen des externen Archivs an, von welchem neue\n" -"Versionen angefordert werden sollen." +"Revisionen angefordert werden sollen." -#: builtin/fetch.c:932 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "Sie müssen den Namen der Markierung angeben." -#: builtin/fetch.c:984 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "" +"Die Optionen --depth und --unshallow können nicht gemeinsam verwendet werden." + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "" +"Die Option --unshallow kann nicht in einem vollständigen Projektarchiv " +"verwendet werden." + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all akzeptiert kein Projektarchiv als Argument" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" -msgstr "fetch --all macht keinen Sinn mit Referenzspezifikationen" +msgstr "fetch --all kann nicht mit Referenzspezifikationen verwendet werden." -#: builtin/fetch.c:997 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "Kein externes Archiv (einzeln oder Gruppe): %s" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" -"Abholen einer Gruppe mit Angabe von Referenzspezifikationen macht keinen " -"Sinn." +"Das Abholen einer Gruppe von externen Archiven kann nicht mit der Angabe\n" +"von Referenzspezifikationen verwendet werden." #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <Beschreibung>] [--log[=<n>]|--no-log] [--file <Datei>]" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "Anzahl" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:660 msgid "populate log with at most <n> entries from shortlog" msgstr "fügt Historie mit höchstens <n> Einträgen von \"shortlog\" hinzu" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:663 msgid "alias for --log (deprecated)" msgstr "Alias für --log (veraltet)" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:666 msgid "text" msgstr "Text" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:667 msgid "use <text> as start of message" -msgstr "benutzt <Text> als Beschreibungsanfang" +msgstr "verwendet <Text> als Beschreibungsanfang" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:668 msgid "file to read from" msgstr "Datei zum Einlesen" @@ -4599,7 +4786,7 @@ msgstr "" #: builtin/grep.c:22 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "git grep [Optionen] [-e] <Muster> [<Version>...] [[--] <Pfad>...]" +msgstr "git grep [Optionen] [-e] <Muster> [<Revision>...] [[--] <Pfad>...]" #: builtin/grep.c:217 #, c-format @@ -4673,11 +4860,11 @@ msgstr "durchläuft höchstens <Tiefe> Ebenen" #: builtin/grep.c:667 msgid "use extended POSIX regular expressions" -msgstr "benutzt erweiterte reguläre Ausdrücke aus POSIX" +msgstr "verwendet erweiterte reguläre Ausdrücke aus POSIX" #: builtin/grep.c:670 msgid "use basic POSIX regular expressions (default)" -msgstr "benutzt grundlegende reguläre Ausdrücke aus POSIX (Standard)" +msgstr "verwendet grundlegende reguläre Ausdrücke aus POSIX (Standard)" #: builtin/grep.c:673 msgid "interpret patterns as fixed strings" @@ -4685,7 +4872,7 @@ msgstr "interpretiert Muster als feste Zeichenketten" #: builtin/grep.c:676 msgid "use Perl-compatible regular expressions" -msgstr "benutzt Perl-kompatible reguläre Ausdrücke" +msgstr "verwendet Perl-kompatible reguläre Ausdrücke" #: builtin/grep.c:679 msgid "show line numbers" @@ -4811,26 +4998,33 @@ msgstr "keine Muster angegeben" msgid "bad object %s" msgstr "ungültiges Objekt %s" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" -msgstr "--open-files-in-pager arbeitet nur innerhalb des Arbeitsbaums" +msgstr "" +"Die Option --open-files-in-pager kann nur innerhalb des Arbeitsbaums " +"verwendet werden." -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." -msgstr "--cached oder --untracked kann nicht mit --no-index benutzt werden" +msgstr "" +"Die Optionen --cached und --untracked können nicht mit --no-index verwendet " +"werden." -#: builtin/grep.c:894 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." -msgstr "--no-index oder --untracked kann nicht mit Versionen benutzt werden" +msgstr "" +"Die Optionen --no-index und --untracked können nicht mit Versionen verwendet " +"werden." -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -"--[no-]exlude-standard kann nicht mit beobachteten Inhalten benutzt werden" +"Die Option --[no-]exclude-standard kann nicht mit beobachteten Inhalten " +"verwendet werden." -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "both --cached and trees are given." -msgstr "sowohl --cached als auch Zweige gegeben" +msgstr "Die Option --cached kann nicht mit Zweigen verwendet werden." #: builtin/hash-object.c:60 msgid "" @@ -4868,50 +5062,50 @@ msgstr "speichert Datei wie sie ist, ohne Filter" msgid "process file as it were from this path" msgstr "verarbeitet Datei, als ob sie von diesem Pfad wäre" -#: builtin/help.c:43 +#: builtin/help.c:42 msgid "print all available commands" msgstr "Anzeige aller vorhandenen Kommandos" -#: builtin/help.c:44 +#: builtin/help.c:43 msgid "show man page" msgstr "zeigt Handbuch" -#: builtin/help.c:45 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "zeigt Handbuch in einem Webbrowser" -#: builtin/help.c:47 +#: builtin/help.c:46 msgid "show info page" msgstr "zeigt Info-Seite" -#: builtin/help.c:53 +#: builtin/help.c:52 msgid "git help [--all] [--man|--web|--info] [command]" msgstr "git help [--all] [--man|--web|--info] [Kommando]" -#: builtin/help.c:65 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "nicht erkanntes Hilfeformat: %s" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "Konnte emacsclient nicht starten." -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "Konnte Version des emacsclient nicht parsen." -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "Version des emacsclient '%d' ist zu alt (< 22)." -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "Fehler beim Ausführen von '%s': %s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -4920,7 +5114,7 @@ msgstr "" "'%s': Pfad für nicht unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.cmd' benutzen." -#: builtin/help.c:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -4929,29 +5123,25 @@ msgstr "" "'%s': Kommando für unterstützten Handbuchbetrachter.\n" "Sie könnten stattdessen 'man.<Werkzeug>.path' benutzen." -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "Die allgemein verwendeten Git-Kommandos sind:" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s': unbekannter Handbuch-Betrachter." -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "kein Handbuch-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "kein Informations-Betrachter konnte mit dieser Anfrage umgehen" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "Verwendung: %s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "für `git %s' wurde der Alias `%s' angelegt" @@ -5223,7 +5413,7 @@ msgstr "%s ist ungültig" #: builtin/index-pack.c:1559 msgid "--fix-thin cannot be used without --stdin" -msgstr "--fix-thin kann nicht ohne --stdin benutzt werden" +msgstr "Die Option --fix-thin kann nicht ohne --stdin verwendet werden." #: builtin/index-pack.c:1563 builtin/index-pack.c:1573 #, c-format @@ -5232,7 +5422,7 @@ msgstr "Name der Paketdatei '%s' endet nicht mit '.pack'" #: builtin/index-pack.c:1582 msgid "--verify with no packfile name given" -msgstr "--verify ohne Name der Paketdatei angegeben" +msgstr "Die Option --verify wurde ohne Namen der Paketdatei angegeben." #: builtin/init-db.c:35 #, c-format @@ -5399,239 +5589,247 @@ msgstr "Kann nicht auf aktuelles Arbeitsverzeichnis zugreifen." msgid "Cannot access work tree '%s'" msgstr "Kann nicht auf Arbeitsbaum '%s' zugreifen." -#: builtin/log.c:37 +#: builtin/log.c:39 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" msgstr "git log [<Optionen>] [<seit>..<bis>] [[--] <Pfad>...]\n" -#: builtin/log.c:38 +#: builtin/log.c:40 msgid " or: git show [options] <object>..." msgstr " oder: git show [Optionen] <Objekt>..." -#: builtin/log.c:100 +#: builtin/log.c:102 msgid "suppress diff output" msgstr "unterdrückt Ausgabe der Unterschiede" -#: builtin/log.c:101 +#: builtin/log.c:103 msgid "show source" msgstr "zeigt Quelle" -#: builtin/log.c:102 +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "verwendet \"mailmap\"-Datei" + +#: builtin/log.c:105 msgid "decorate options" msgstr "decorate-Optionen" -#: builtin/log.c:189 +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "letzte Ausgabe: %d %s\n" -#: builtin/log.c:405 builtin/log.c:497 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "Kann Objekt %s nicht lesen." -#: builtin/log.c:521 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "Unbekannter Typ: %d" -#: builtin/log.c:613 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers ohne Wert" -#: builtin/log.c:687 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "Name des Ausgabeverzeichnisses ist zu lang." -#: builtin/log.c:698 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "Kann Patch-Datei %s nicht öffnen" -#: builtin/log.c:712 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "Brauche genau einen Versionsbereich." -#: builtin/log.c:720 +#: builtin/log.c:739 msgid "Not a range." msgstr "Kein Versionsbereich." -#: builtin/log.c:794 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "Anschreiben benötigt E-Mail-Format" -#: builtin/log.c:867 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "ungültiges in-reply-to: %s" -#: builtin/log.c:895 +#: builtin/log.c:913 msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "git format-patch [Optionen] [<seit> | <Versionsbereich>]" +msgstr "git format-patch [Optionen] [<seit> | <Revisionsbereich>]" -#: builtin/log.c:940 +#: builtin/log.c:958 msgid "Two output directories?" msgstr "Zwei Ausgabeverzeichnisse?" -#: builtin/log.c:1068 +#: builtin/log.c:1097 msgid "use [PATCH n/m] even with a single patch" -msgstr "benutzt [PATCH n/m] auch mit einzelnem Patch" +msgstr "verwendet [PATCH n/m] auch mit einzelnem Patch" -#: builtin/log.c:1071 +#: builtin/log.c:1100 msgid "use [PATCH] even with multiple patches" -msgstr "benutzt [PATCH] auch mit mehreren Patches" +msgstr "verwendet [PATCH] auch mit mehreren Patches" -#: builtin/log.c:1075 +#: builtin/log.c:1104 msgid "print patches to standard out" msgstr "Ausgabe der Patches in Standard-Ausgabe" -#: builtin/log.c:1077 +#: builtin/log.c:1106 msgid "generate a cover letter" msgstr "erzeugt ein Deckblatt" -#: builtin/log.c:1079 +#: builtin/log.c:1108 msgid "use simple number sequence for output file names" -msgstr "benutzt einfache Nummernfolge für die Namen der Ausgabedateien" +msgstr "verwendet einfache Nummernfolge für die Namen der Ausgabedateien" -#: builtin/log.c:1080 +#: builtin/log.c:1109 msgid "sfx" msgstr "Dateiendung" -#: builtin/log.c:1081 +#: builtin/log.c:1110 msgid "use <sfx> instead of '.patch'" msgstr "verwendet <Dateiendung> anstatt '.patch'" -#: builtin/log.c:1083 +#: builtin/log.c:1112 msgid "start numbering patches at <n> instead of 1" msgstr "beginnt die Nummerierung der Patches bei <n> anstatt bei 1" -#: builtin/log.c:1085 +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "kennzeichnet die Serie als n-te Fassung" + +#: builtin/log.c:1116 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "benutzt [<Prefix>] anstatt [PATCH]" +msgstr "verwendet [<Prefix>] anstatt [PATCH]" -#: builtin/log.c:1088 +#: builtin/log.c:1119 msgid "store resulting files in <dir>" msgstr "speichert erzeugte Dateien in <Verzeichnis>" -#: builtin/log.c:1091 +#: builtin/log.c:1122 msgid "don't strip/add [PATCH]" msgstr "[PATCH] wird nicht entfernt/hinzugefügt" -#: builtin/log.c:1094 +#: builtin/log.c:1125 msgid "don't output binary diffs" msgstr "gibt keine binären Unterschiede aus" -#: builtin/log.c:1096 +#: builtin/log.c:1127 msgid "don't include a patch matching a commit upstream" msgstr "" "schließt keine Patches ein, die einer Version im Übernahmezweig entsprechen" -#: builtin/log.c:1098 +#: builtin/log.c:1129 msgid "show patch format instead of default (patch + stat)" msgstr "zeigt Patchformat anstatt des Standards (Patch + Zusammenfassung)" -#: builtin/log.c:1100 +#: builtin/log.c:1131 msgid "Messaging" msgstr "Email-Einstellungen" -#: builtin/log.c:1101 +#: builtin/log.c:1132 msgid "header" msgstr "Header" -#: builtin/log.c:1102 +#: builtin/log.c:1133 msgid "add email header" msgstr "fügt Email-Header hinzu" -#: builtin/log.c:1103 builtin/log.c:1105 +#: builtin/log.c:1134 builtin/log.c:1136 msgid "email" msgstr "Email" -#: builtin/log.c:1103 +#: builtin/log.c:1134 msgid "add To: header" msgstr "fügt \"To:\"-Header hinzu" -#: builtin/log.c:1105 +#: builtin/log.c:1136 msgid "add Cc: header" msgstr "fügt \"Cc:\"-Header hinzu" -#: builtin/log.c:1107 +#: builtin/log.c:1138 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1108 +#: builtin/log.c:1139 msgid "make first mail a reply to <message-id>" msgstr "macht aus erster Email eine Antwort zu <message-id>" -#: builtin/log.c:1109 builtin/log.c:1112 +#: builtin/log.c:1140 builtin/log.c:1143 msgid "boundary" msgstr "Grenze" -#: builtin/log.c:1110 +#: builtin/log.c:1141 msgid "attach the patch" msgstr "hängt einen Patch an" -#: builtin/log.c:1113 +#: builtin/log.c:1144 msgid "inline the patch" msgstr "fügt den Patch direkt in die Nachricht ein" -#: builtin/log.c:1117 +#: builtin/log.c:1148 msgid "enable message threading, styles: shallow, deep" msgstr "aktiviert Nachrichtenverkettung, Stile: shallow, deep" -#: builtin/log.c:1119 +#: builtin/log.c:1150 msgid "signature" msgstr "Signatur" -#: builtin/log.c:1120 +#: builtin/log.c:1151 msgid "add a signature" msgstr "fügt eine Signatur hinzu" -#: builtin/log.c:1122 +#: builtin/log.c:1153 msgid "don't print the patch filenames" msgstr "zeigt keine Dateinamen der Patches" -#: builtin/log.c:1163 +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "unechte Einreicher-Informationen %s" -#: builtin/log.c:1208 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." -msgstr "-n und -k schließen sich gegenseitig aus" +msgstr "Die Optionen -n und -k schließen sich gegenseitig aus." -#: builtin/log.c:1210 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." -msgstr "--subject-prefix und -k schließen sich gegenseitig aus" +msgstr "Die Optionen --subject-prefix und -k schließen sich gegenseitig aus." -#: builtin/log.c:1218 +#: builtin/log.c:1257 msgid "--name-only does not make sense" -msgstr "--name-only macht keinen Sinn" +msgstr "Die Option --name-only kann nicht verwendet werden." -#: builtin/log.c:1220 +#: builtin/log.c:1259 msgid "--name-status does not make sense" -msgstr "--name-status macht keinen Sinn" +msgstr "Die Option --name-status kann nicht verwendet werden." -#: builtin/log.c:1222 +#: builtin/log.c:1261 msgid "--check does not make sense" -msgstr "--check macht keinen Sinn" +msgstr "Die Option --check kann nicht verwendet werden." -#: builtin/log.c:1245 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "Standard-Ausgabe oder Verzeichnis, welches von beidem?" -#: builtin/log.c:1247 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "Konnte Verzeichnis '%s' nicht erstellen." -#: builtin/log.c:1400 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "Fehler beim Erstellen der Ausgabedateien." -#: builtin/log.c:1449 +#: builtin/log.c:1488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<Übernahmezweig> [<Arbeitszweig> [<Limit>]]]" -#: builtin/log.c:1504 +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -5639,104 +5837,105 @@ msgstr "" "Konnte gefolgten, externen Zweig nicht finden, bitte geben Sie <upstream> " "manuell an.\n" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "Unbekannte Version %s" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:409 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [Optionen] [<Datei>...]" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "identify the file status with tags" msgstr "zeigt den Dateistatus mit Markierungen" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "benutzt Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung" +msgstr "" +"verwendet Kleinbuchstaben für Dateien mit 'assume unchanged' Markierung" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show cached files in the output (default)" msgstr "zeigt zwischengespeicherten Dateien in der Ausgabe an (Standard)" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:472 msgid "show deleted files in the output" msgstr "zeigt entfernte Dateien in der Ausgabe an" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:474 msgid "show modified files in the output" msgstr "zeigt geänderte Dateien in der Ausgabe an" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:476 msgid "show other files in the output" msgstr "zeigt sonstige Dateien in der Ausgabe an" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:478 msgid "show ignored files in the output" msgstr "zeigt ignorierte Dateien in der Ausgabe an" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:481 msgid "show staged contents' object name in the output" msgstr "zeigt Objektnamen von Inhalten in der Bereitstellung in der Ausgabe an" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show files on the filesystem that need to be removed" msgstr "zeigt Dateien im Dateisystem, die gelöscht werden müssen, an" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show 'other' directories' name only" msgstr "zeigt nur Namen von 'sonstigen' Verzeichnissen an" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:488 msgid "don't show empty directories" msgstr "zeigt keine leeren Verzeichnisse an" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:491 msgid "show unmerged files in the output" msgstr "zeigt nicht zusammengeführte Dateien in der Ausgabe an" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "show resolve-undo information" msgstr "zeigt 'resolve-undo' Informationen an" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:495 msgid "skip files matching pattern" msgstr "lässt Dateien aus, die einem Muster entsprechen" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "exclude patterns are read from <file>" msgstr "schließt Muster, gelesen von <Datei>, aus" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "read additional per-directory exclude patterns in <file>" msgstr "liest zusätzliche pro-Verzeichnis Auschlussmuster aus <Datei>" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "add the standard git exclusions" msgstr "fügt die standardmäßigen Git-Ausschlüsse hinzu" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:506 msgid "make the output relative to the project top directory" msgstr "Ausgabe relativ zum Projektverzeichnis" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:509 msgid "if any <file> is not in the index, treat this as an error" msgstr "" "behandle es als Fehler, wenn sich eine <Datei> nicht in der Bereitstellung " "befindet" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:510 msgid "tree-ish" msgstr "Versionsreferenz" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:511 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "gibt vor, dass Pfade, die seit <Versionsreferenz> gelöscht wurden, immer " "noch vorhanden sind" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:513 msgid "show debugging data" msgstr "zeigt Ausgaben zur Fehlersuche an" @@ -5770,7 +5969,7 @@ msgstr "listet nur Dateinamen auf" #: builtin/ls-tree.c:140 msgid "use full path names" -msgstr "benutzt vollständige Pfadnamen" +msgstr "verwendet vollständige Pfadnamen" #: builtin/ls-tree.c:142 msgid "list entire tree; not just current directory (implies --full-name)" @@ -5852,7 +6051,7 @@ msgstr "erlaubt Vorspulen (Standard)" msgid "abort if fast-forward is not possible" msgstr "bricht ab, wenn kein Vorspulen möglich ist" -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "Strategie" @@ -5960,11 +6159,12 @@ msgstr "" "Zusammenführung abzuschließen.\n" #: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Bitte geben Sie eine Versionsbeschreibung ein um zu erklären, warum diese " @@ -5972,7 +6172,7 @@ msgstr "" "insbesondere wenn es einen aktualisierten, externen Zweig mit einem Thema-" "Zweig zusammenführt.\n" "\n" -"Zeilen beginnend mit '#' werden ignoriert, und eine leere Beschreibung " +"Zeilen beginnend mit '%c' werden ignoriert, und eine leere Beschreibung " "bricht die Eintragung ab.\n" #: builtin/merge.c:812 @@ -5988,8 +6188,8 @@ msgstr "Wunderbar.\n" #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "" -"Automatische Zusammenführung fehlgeschlagen; beheben Sie die Konflikte und tragen " -"Sie dann das Ergebnis ein.\n" +"Automatische Zusammenführung fehlgeschlagen; beheben Sie die Konflikte und " +"tragen Sie dann das Ergebnis ein.\n" #: builtin/merge.c:905 #, c-format @@ -6072,53 +6272,55 @@ msgstr "Bin auf einem Zweig, der noch geboren wird; kann nicht quetschen." #: builtin/merge.c:1194 msgid "Non-fast-forward commit does not make sense into an empty head" -msgstr "nicht vorzuspulende Version macht in einem leeren Zweig keinen Sinn" +msgstr "" +"Nicht vorzuspulende Version kann nicht in einem leeren Zweig verwendet " +"werden." -#: builtin/merge.c:1309 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "Aktualisiere %s..%s\n" -#: builtin/merge.c:1348 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Probiere wirklich triviale \"in-index\"-Zusammenführung...\n" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "Nein.\n" -#: builtin/merge.c:1387 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "Vorspulen nicht möglich, breche ab." -#: builtin/merge.c:1410 builtin/merge.c:1489 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Rücklauf des Zweiges bis zum Ursprung...\n" -#: builtin/merge.c:1414 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Probiere Zusammenführungsstrategie %s...\n" -#: builtin/merge.c:1480 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Keine Zusammenführungsstrategie behandelt diese Zusammenführung.\n" -#: builtin/merge.c:1482 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Zusammenführung mit Strategie %s fehlgeschlagen.\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "Benutzen Sie \"%s\" um die Auflösung per Hand vorzubereiten.\n" -#: builtin/merge.c:1503 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6151,7 +6353,7 @@ msgstr "findet Vorfahren für eine einzelne n-Wege-Zusammenführung" #: builtin/merge-base.c:100 msgid "list revs not reachable from others" -msgstr "listet Revisionen auf, die nicht durch Andere erreichbar sind" +msgstr "listet Versionen auf, die nicht durch Andere erreichbar sind" #: builtin/merge-base.c:102 msgid "is the first one ancestor of the other?" @@ -6171,7 +6373,7 @@ msgstr "sendet Ergebnisse zur Standard-Ausgabe" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "benutzt eine diff3 basierte Zusammenführung" +msgstr "verwendet eine diff3 basierte Zusammenführung" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" @@ -6305,11 +6507,11 @@ msgstr "zeigt nur Namen an (keine SHA-1)" #: builtin/name-rev.c:230 msgid "only use tags to name the commits" -msgstr "benutzt nur Markierungen um die Versionen zu benennen" +msgstr "verwendet nur Markierungen um die Versionen zu benennen" #: builtin/name-rev.c:232 msgid "only use refs matching <pattern>" -msgstr "benutzt nur Referenzen die <Muster> entsprechen" +msgstr "verwendet nur Referenzen die <Muster> entsprechen" #: builtin/name-rev.c:234 msgid "list all commits reachable from all refs" @@ -6435,81 +6637,77 @@ msgstr "git notes prune [<Optionen>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:142 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht starten" -#: builtin/notes.c:148 -msgid "can't fdopen 'show' output fd" -msgstr "konnte Datei-Deskriptor für Ausgabe von 'show' nicht öffnen" - -#: builtin/notes.c:158 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen." +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "Konnte Ausgabe von 'show' nicht lesen." -#: builtin/notes.c:161 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "konnte 'show' für Objekt '%s' nicht abschließen" -#: builtin/notes.c:178 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "konnte Datei '%s' nicht erstellen" -#: builtin/notes.c:192 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" -msgstr "Bitte liefern Sie den Notiz-Inhalt unter Verwendung der Option -m oder -F." +msgstr "" +"Bitte liefern Sie den Notiz-Inhalt unter Verwendung der Option -m oder -F." -#: builtin/notes.c:213 builtin/notes.c:976 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "Entferne Notiz für Objekt %s\n" -#: builtin/notes.c:218 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "Konnte Notiz-Objekt nicht schreiben" -#: builtin/notes.c:220 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "Die Notiz-Inhalte wurden in %s belassen" -#: builtin/notes.c:254 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "kann '%s' nicht lesen" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "konnte '%s' nicht öffnen oder lesen" -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Konnte '%s' nicht als gültige Referenz auflösen." -#: builtin/notes.c:278 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "Fehler beim Lesen des Objektes '%s'." -#: builtin/notes.c:302 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kann uninitialisierten/unreferenzierten Notiz-Baum nicht eintragen." -#: builtin/notes.c:343 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Ungültiger notes.rewriteMode Wert: '%s'" -#: builtin/notes.c:353 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" @@ -6517,58 +6715,58 @@ msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:380 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "Ungültiger %s Wert: '%s'" -#: builtin/notes.c:444 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "Fehlerhafte Eingabezeile: '%s'." -#: builtin/notes.c:459 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Fehler beim Kopieren der Notizen von '%s' nach '%s'" -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 -#: builtin/notes.c:1036 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "zu viele Parameter" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "Kein Notiz für Objekt %s gefunden." -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "Notizinhalte als Zeichenkette" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "Notizinhalte in einer Datei" -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 -#: builtin/notes.c:703 builtin/tag.c:476 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "Objekt" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "Wiederverwendung und Bearbeitung des angegebenen Notiz-Objektes" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "Wiederverwendung des angegebenen Notiz-Objektes" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "ersetzt existierende Notizen" -#: builtin/notes.c:583 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6577,26 +6775,26 @@ msgstr "" "Konnte Notizen nicht hinzufügen. Existierende Notizen für Objekt %s " "gefunden. Verwenden Sie '-f' um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:588 builtin/notes.c:665 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Überschreibe existierende Notizen für Objekt %s\n" -#: builtin/notes.c:618 +#: builtin/notes.c:614 msgid "read objects from stdin" msgstr "liest Objekte von der Standard-Eingabe" -#: builtin/notes.c:620 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" "lädt Konfiguration für <Kommando> beim Umschreiben von Versionen (impliziert " "--stdin)" -#: builtin/notes.c:638 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "zu wenig Parameter" -#: builtin/notes.c:659 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6605,12 +6803,12 @@ msgstr "" "Kann Notizen nicht kopieren. Existierende Notizen für Objekt %s gefunden. " "Verwenden Sie '-f' um die existierenden Notizen zu überschreiben." -#: builtin/notes.c:671 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Keine Notizen für Quell-Objekt %s. Kopie nicht möglich." -#: builtin/notes.c:720 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6619,15 +6817,15 @@ msgstr "" "Die Optionen -m/-F/-c/-C sind für das Unterkommando 'edit' veraltet.\n" "Bitte benutzen Sie stattdessen 'git notes add -f -m/-F/-c/-C'.\n" -#: builtin/notes.c:867 +#: builtin/notes.c:863 msgid "General options" msgstr "Allgemeine Optionen" -#: builtin/notes.c:869 +#: builtin/notes.c:865 msgid "Merge options" msgstr "Optionen für Zusammenführung" -#: builtin/notes.c:871 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -6635,46 +6833,46 @@ msgstr "" "löst Konflikte bei Notizen mit der angegebenen Strategie auf (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:873 +#: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "trägt nicht zusammengeführte Notizen ein" -#: builtin/notes.c:875 +#: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "" "schließt Zusammenführung von Notizen ab, in dem nicht zusammengeführte " "Notizen eingetragen werden" -#: builtin/notes.c:877 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "bricht Konfliktauflösung bei Zusammenführung von Notizen ab" -#: builtin/notes.c:879 +#: builtin/notes.c:875 msgid "abort notes merge" msgstr "bricht Zusammenführung von Notizen ab" -#: builtin/notes.c:974 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "Objekt %s hat keine Notiz\n" -#: builtin/notes.c:986 +#: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "der Versuch, eine nicht existierende Notiz zu löschen, ist kein Fehler" -#: builtin/notes.c:989 +#: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "liest Objektnamen von der Standard-Eingabe" -#: builtin/notes.c:1070 +#: builtin/notes.c:1066 msgid "notes_ref" msgstr "Notiz-Referenz" -#: builtin/notes.c:1071 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" -msgstr "benutzt Notizen von <Notiz-Referenz>" +msgstr "verwendet Notizen von <Notiz-Referenz>" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Unbekanntes Unterkommando: %s" @@ -6774,12 +6972,12 @@ msgstr "verwendet existierende Objekte wieder" #: builtin/pack-objects.c:2475 msgid "use OFS_DELTA objects" -msgstr "benutzt OFS_DELTA Objekte" +msgstr "verwendet OFS_DELTA Objekte" #: builtin/pack-objects.c:2477 msgid "use threads when searching for best delta matches" msgstr "" -"benutzt Threads bei der Suche nach den besten Übereinstimmungen bei " +"verwendet Threads bei der Suche nach den besten Übereinstimmungen bei " "Unterschieden" #: builtin/pack-objects.c:2479 @@ -6883,7 +7081,7 @@ msgstr "Kurzschrift für Markierung ohne <Markierung>" #: builtin/push.c:64 msgid "--delete only accepts plain target ref names" -msgstr "--delete akzeptiert nur reine Referenz-Namen als Ziel" +msgstr "Die Option --delete akzeptiert nur reine Referenznamen als Ziel." #: builtin/push.c:99 msgid "" @@ -6988,16 +7186,16 @@ msgstr "" "beizubehalten, benutzen Sie:\n" " git config --global push.default matching\n" "\n" -"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu " -"übernehmen, benutzen Sie:\n" +"Um diese Meldung zu unterdrücken und das neue Verhalten jetzt zu übernehmen, " +"benutzen Sie:\n" "\n" " git config --global push.default simple\n" "\n" "Führen Sie 'git help config' aus und suchen Sie nach 'push.default' für " "weitere Informationen.\n" "(Der Modus 'simple' wurde in Git 1.7.11 eingeführt. Benutze den ähnlichen " -"Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen von " -"Git benutzen.)" +"Modus 'current' anstatt 'simple', falls Sie gelegentlich ältere Versionen " +"von Git benutzen.)" #: builtin/push.c:199 msgid "" @@ -7028,7 +7226,8 @@ msgid "" "to 'simple', 'current' or 'upstream' to push only the current branch." msgstr "" "Aktualisierungen wurden zurückgewiesen, weil die Spitze eines versendeten\n" -"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie nicht\n" +"Zweiges hinter seinem externen Gegenstück zurückgefallen ist. Wenn Sie " +"nicht\n" "beabsichtigt haben, diesen Zweig zu versenden, können Sie auch den zu " "versendenden\n" "Zweig spezifizieren oder die Konfigurationsvariable 'push.default' zu " @@ -7049,22 +7248,58 @@ msgstr "" "Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" "für weitere Details." -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Aktualisierungen wurden zurückgewiesen, weil das Fernarchiv Versionen " +"enthält,\n" +"die lokal nicht vorhanden sind. Das wird üblicherweise durch das Versenden " +"von\n" +"Versionen auf dieselbe Referenz von einem anderen Projektarchiv aus " +"verursacht.\n" +"Vielleicht müssen Sie die externen Änderungen zusammenzuführen (z.B. 'git " +"pull')\n" +"bevor Sie erneut versenden.\n" +"Siehe auch die Sektion 'Note about fast-forwards' in 'git push --help'\n" +"für weitere Details." + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" +"Aktualisierungen wurden zurückgewiesen, weil die Markierung bereits\n" +"im Fernarchiv existiert." + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Sie können keine externe Referenz aktualisieren, die auf ein Objekt zeigt,\n" +"das keine Version ist, oder es auf ein solches Objekt zeigen lassen, ohne\n" +"die Option '--force' zu verwenden.\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "Versende nach %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "Fehler beim Versenden einiger Referenzen nach '%s'" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "ungültiges Projektarchiv '%s'" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7086,82 +7321,88 @@ msgstr "" "\n" " git push <Name>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" -msgstr "--all und --tags sind inkompatibel" +msgstr "Die Optionen --all und --tags sind inkompatibel." -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" -msgstr "--all kann nicht mit Referenzspezifikationen kombiniert werden" +msgstr "" +"Die Option --all kann nicht mit Referenzspezifikationen kombiniert werden." -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" -msgstr "--mirror und --tags sind inkompatibel" +msgstr "Die Optionen --mirror und --tags sind inkompatibel." -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" -msgstr "--mirror kann nicht mit Referenzspezifikationen kombiniert werden" +msgstr "" +"Die Option --mirror kann nicht mit Referenzspezifikationen kombiniert werden." -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" -msgstr "--all und --mirror sind inkompatibel" +msgstr "Die Optionen --all und --mirror sind inkompatibel." -#: builtin/push.c:382 +#: builtin/push.c:419 msgid "repository" msgstr "Projektarchiv" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" msgstr "versendet alle Referenzen" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" msgstr "spiegelt alle Referenzen" -#: builtin/push.c:386 +#: builtin/push.c:423 msgid "delete refs" msgstr "löscht Referenzen" -#: builtin/push.c:387 +#: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -"versendet Markierungen (kann nicht mit --all oder --mirror benutzt werden)" +"versendet Markierungen (kann nicht mit --all oder --mirror verwendet werden)" -#: builtin/push.c:390 +#: builtin/push.c:427 msgid "force updates" msgstr "erzwingt Aktualisierung" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" msgstr "" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "steuert rekursives Versenden von Unterprojekten" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" -msgstr "benutzt kleinere Pakete" +msgstr "verwendet kleinere Pakete" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "'receive pack' Programm" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "setzt externes Projektarchiv für \"git pull/status\"" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" msgstr "entfernt lokal gelöschte Referenzen" -#: builtin/push.c:410 +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "umgeht \"pre-push hook\"" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" -msgstr "--delete ist inkompatibel mit --all, --mirror und --tags" +msgstr "Die Option --delete ist inkompatibel mit --all, --mirror und --tags." -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" -msgstr "--delete macht ohne irgendeine Referenz keinen Sinn" +msgstr "Die Option --delete kann nur mit Referenzen verwendet werden." #: builtin/read-tree.c:36 msgid "" @@ -7369,13 +7610,15 @@ msgstr "" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" -msgstr "Angabe eines Hauptzweiges macht mit --mirror keinen Sinn" +msgstr "" +"Die Option --mirror kann nicht mit der Angabe eines Hauptzweiges verwendet " +"werden." #: 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 Anfordern von " -"Spiegelarchiven Sinn" +"Die Angabe von zu folgenden Zweigen kann nur mit dem Anfordern von " +"Spiegelarchiven verwendet werden." #: builtin/remote.c:195 builtin/remote.c:646 #, c-format @@ -7726,7 +7969,8 @@ msgstr "löscht URLs" #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" -msgstr "--add --delete macht keinen Sinn" +msgstr "" +"Die Optionen --add und --delete können nicht gemeinsam verwendet werden." #: builtin/remote.c:1487 #, c-format @@ -7785,12 +8029,12 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<Version>]" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." -msgstr "git reset [-q] <Version> [--] <Pfade>..." +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <Versionsreferenz> [--] <Pfade>..." #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" -msgstr "git reset --patch [<Version>] [--] [<Pfade>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<Versionsreferenz>] [--] [<Pfade>...]" #: builtin/reset.c:33 msgid "mixed" @@ -7812,92 +8056,98 @@ msgstr "zusammenführen" msgid "keep" msgstr "keep" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "Sie haben keine gültige Zweigspitze (HEAD)." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Fehler beim Finden des Baumes der Zweigspitze (HEAD)." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "Fehler beim Finden des Baumes von %s." -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "Zweigspitze (HEAD) ist jetzt bei %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "Konnte Bereitstellung nicht lesen" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" "Kann keine '%s' Zurücksetzung durchführen, während eine Zusammenführung im " "Gange ist." -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "weniger Ausgaben, meldet nur Fehler" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" -msgstr "setzt Zweigspitze (HEAD) und Bereitstellung zurück" +msgstr "setzt Zweigspitze (HEAD) und Bereitstellung neu" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" -msgstr "setzt nur Zweigspitze (HEAD) zurück" +msgstr "setzt nur Zweigspitze (HEAD) neu" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" -msgstr "setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum zurück" +msgstr "setzt Zweigspitze (HEAD), Bereitstellung und Arbeitsbaum neu" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" -msgstr "setzt Zweigspitze (HEAD) zurück, behält aber lokale Änderungen" +msgstr "setzt Zweigspitze (HEAD) neu, behält aber lokale Änderungen" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Konnte '%s' nicht als gültige Revision auflösen." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "Konnte Objekt '%s' nicht parsen." -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Konnte '%s' nicht als gültigen Baum auflösen." + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch ist inkompatibel mit --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen " -"'git reset -- <Pfade>'." +"--mixed mit Pfaden ist veraltet; benutzen Sie stattdessen 'git reset -- " +"<Pfade>'." -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "Eine '%s' Zurücksetzung mit Pfaden ist nicht möglich." -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "'%s' Zurücksetzung ist in einem bloßen Projektarchiv nicht erlaubt" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." -msgstr "Konnte Bereitstellungsdatei nicht zu Version '%s' zurücksetzen." +msgstr "Konnte Bereitstellungsdatei nicht zu Revision '%s' setzen." + +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Nicht bereitgestellte Änderungen nach Zurücksetzung:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Konnte neue Bereitstellungsdatei nicht schreiben." #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" @@ -7923,8 +8173,8 @@ msgstr "" " oder: git rev-parse --sq-quote [<Argumente>...]\n" " oder: git rev-parse [Optionen] [<Argumente>...]\n" "\n" -"Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei erster " -"Verwendung aus." +"Führen Sie \"git rev-parse --parseopt -h\" für weitere Informationen bei " +"erster Verwendung aus." #: builtin/revert.c:22 msgid "git revert [options] <commit-ish>" @@ -7945,7 +8195,7 @@ msgstr "git cherry-pick <Unterkommando>" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format msgid "%s: %s cannot be used with %s" -msgstr "%s: %s kann nicht mit %s benutzt werden" +msgstr "%s: %s kann nicht mit %s verwendet werden" #: builtin/revert.c:103 msgid "end revert or cherry-pick sequence" @@ -8026,7 +8276,8 @@ msgid "" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" "Unterprojekt '%s' (oder ein geschachteltes Unterprojekt hiervon) verwendet\n" -"ein .git-Verzeichnis (benutzen Sie 'rm -rf' wenn Sie dieses wirklich mitsamt\n" +"ein .git-Verzeichnis (benutzen Sie 'rm -rf' wenn Sie dieses wirklich " +"mitsamt\n" "seiner Historie löschen möchten)" #: builtin/rm.c:174 @@ -8045,8 +8296,8 @@ msgid "" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' hat Änderungen in der Bereitstellung\n" -"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung zu " -"erzwingen)" +"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung " +"zu erzwingen)" #: builtin/rm.c:191 #, c-format @@ -8055,8 +8306,8 @@ msgid "" "(use --cached to keep the file, or -f to force removal)" msgstr "" "'%s' hat lokale Modifikationen\n" -"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung zu " -"erzwingen)" +"(benutzen Sie --cached um die Datei zu behalten, oder -f um die Entfernung " +"zu erzwingen)" #: builtin/rm.c:207 msgid "do not list removed files" @@ -8094,28 +8345,28 @@ msgstr "" "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] " "[<Versionsidentifikation>... ]" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "fehlender Autor: %s" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:229 msgid "sort output according to the number of commits per author" msgstr "sortiert die Ausgabe entsprechend der Anzahl von Versionen pro Autor" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:231 msgid "Suppress commit descriptions, only provides commit count" msgstr "Unterdrückt Versionsbeschreibungen, liefert nur Anzahl der Versionen" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:233 msgid "Show the email address of each author" msgstr "Zeigt die Email-Adresse von jedem Autor" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:234 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:235 msgid "Linewrap output" msgstr "Ausgabe mit Zeilenumbrüchen" @@ -8326,170 +8577,164 @@ msgid "could not verify the tag '%s'" msgstr "Konnte Markierung '%s' nicht verifizieren" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# Geben Sie eine Markierungsbeschreibung ein.\n" -"# Zeilen, die mit '#' beginnen, werden ignoriert.\n" -"#\n" +"Geben Sie eine Markierungsbeschreibung ein.\n" +"Zeilen, die mit '%c' beginnen, werden ignoriert.\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# Geben Sie eine Markierungsbeschreibung ein.\n" -"# Zeilen, die mit '#' beginnen, werden behalten; Sie dürfen diese\n" -"# selbst entfernen wenn Sie möchten.\n" -"#\n" +"Geben Sie eine Markierungsbeschreibung ein.\n" +"Zeilen, die mit '%c' beginnen, werden behalten; Sie dürfen diese\n" +"selbst entfernen wenn Sie möchten.\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "konnte Markierung nicht signieren" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "konnte Markierungsdatei nicht schreiben" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "ungültiger Objekt-Typ" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "Markierungskopf zu groß." -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "keine Markierungsbeschreibung?" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "Die Markierungsbeschreibung wurde gelassen in %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "Option 'points-at' erfordert ein Objekt" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "fehlerhafter Objekt-Name '%s'" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" msgstr "listet Markierungsnamen auf" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "zeigt <n> Zeilen jeder Markierungsbeschreibung" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "delete tags" msgstr "löscht Markierungen" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" msgstr "überprüft Markierungen" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "Optionen für Erstellung von Markierungen" -#: builtin/tag.c:456 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "annotierte Markierung, benötigt eine Beschreibung" -#: builtin/tag.c:458 +#: builtin/tag.c:456 msgid "tag message" msgstr "Markierungsbeschreibung" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "annotierte und GPG-signierte Markierung" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "use another key to sign the tag" -msgstr "benutzt einen anderen Schlüssel um die Markierung zu signieren" +msgstr "verwendet einen anderen Schlüssel um die Markierung zu signieren" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "ersetzt die Markierung, wenn sie existiert" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" msgstr "zeigt Liste der Markierungen in Spalten" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "Optionen für Auflistung der Markierungen" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "gibt nur Markierungen aus, die diese Version beinhalten" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" msgstr "gibt nur Markierungen von dem Objekt aus" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column und -n sind inkompatibel" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "-n Option ist nur erlaubt mit -l." -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "--contains Option ist nur erlaubt mit -l." -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "--points-at Option ist nur erlaubt mit -l." -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "nur eine -F oder -m Option ist erlaubt." -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "zu viele Parameter" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' ist kein gültiger Markierungsname." -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "Markierung '%s' existiert bereits" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kann Referenz nicht sperren" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kann Referenz nicht aktualisieren" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Aktualisierte Markierung '%s' (war %s)\n" @@ -8684,15 +8929,15 @@ msgstr "" msgid "no-op (backward compatibility)" msgstr "Kein Effekt (Rückwärtskompatibilität)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "erweiterte Ausgaben" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "weniger Ausgaben" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "benutze <n> Ziffern zur Anzeige von SHA-1s" @@ -8734,7 +8979,7 @@ 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" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" "Erstellt ein leeres Git-Projektarchiv oder initialisiert ein bestehendes neu" @@ -8768,8 +9013,7 @@ 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" +msgstr "Setzt die aktuelle Zweigspitze (HEAD) zu einem spezifizierten Zustand" #: common-cmds.h:25 msgid "Remove files from the working tree and from the index" @@ -8989,7 +9233,7 @@ msgstr "nicht erkannte Option: '$arg'" #: git-bisect.sh:99 #, sh-format msgid "'$arg' does not appear to be a valid revision" -msgstr "'$arg' scheint keine gültige Version zu sein" +msgstr "'$arg' scheint keine gültige Revision zu sein" #: git-bisect.sh:117 msgid "Bad HEAD - I need a HEAD" @@ -9005,7 +9249,7 @@ msgstr "" #: git-bisect.sh:140 msgid "won't bisect on seeked tree" -msgstr "\"bisect\" auf gesuchtem Zweig nicht möglich" +msgstr "binäre Suche auf gesuchtem Zweig nicht möglich" #: git-bisect.sh:144 msgid "Bad HEAD - strange symbolic ref" @@ -9038,7 +9282,7 @@ msgstr "'git bisect bad' kann nur ein Argument entgegennehmen." #. this is less optimum. #: git-bisect.sh:273 msgid "Warning: bisecting only with a bad commit." -msgstr "Warnung: halbiere nur mit einer fehlerhaften Version" +msgstr "Warnung: binäre Suche nur mit einer fehlerhaften Version" #. TRANSLATORS: Make sure to include [Y] and [n] in your #. translation. The program will only accept English input @@ -9052,7 +9296,7 @@ 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 "" -"Sie müssen mindestens eine korrekte und eine fehlerhafte Version angeben.\n" +"Sie müssen mindestens eine korrekte und eine fehlerhafte Revision angeben.\n" "(Sie können dafür \"git bisect bad\" und \"git bisect good\" benutzen.)" #: git-bisect.sh:292 @@ -9062,13 +9306,13 @@ msgid "" "(You can use \"git bisect bad\" and \"git bisect good\" for that.)" msgstr "" "Sie müssen mit \"git bisect start\" beginnen.\n" -"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Version " +"Danach müssen Sie mindestens eine korrekte und eine fehlerhafte Revision " "angeben.\n" "(Sie können 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." +msgstr "keine binäre Suche im Gange" #: git-bisect.sh:354 #, sh-format @@ -9108,12 +9352,12 @@ msgid "" "bisect run failed:\n" "exit code $res from '$command' is < 0 or >= 128" msgstr "" -"Ausführung der Halbierung fehlgeschlagen:\n" +"'bisect run' 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" +msgstr "'bisect run' kann nicht mehr fortgesetzt werden" #: git-bisect.sh:459 #, sh-format @@ -9121,12 +9365,12 @@ msgid "" "bisect run failed:\n" "'bisect_state $state' exited with error code $res" msgstr "" -"Ausführung der Halbierung fehlgeschlagen:\n" +"'bisect run' fehlgeschlagen:\n" "'bisect_state $state' wurde mit Fehlerwert $res beendet" #: git-bisect.sh:466 msgid "bisect run success" -msgstr "Halbierung erfolgreich ausgeführt" +msgstr "'bisect run' erfolgreich ausgeführt" #: git-pull.sh:21 msgid "" @@ -9135,8 +9379,10 @@ msgid "" "as appropriate to mark resolution, or use 'git commit -a'." msgstr "" "\"pull\" ist nicht möglich, weil Sie nicht zusammengeführte Dateien haben.\n" -"Bitte korrigieren Sie dies im Arbeitsbaum und benutzen Sie dann 'git add/rm <Datei>'\n" -"um die Auflösung entsprechend zu markieren, oder benutzen Sie 'git commit -a'." +"Bitte korrigieren Sie dies im Arbeitsbaum und benutzen Sie dann 'git add/rm " +"<Datei>'\n" +"um die Auflösung entsprechend zu markieren, oder benutzen Sie 'git commit -" +"a'." #: git-pull.sh:25 msgid "Pull is not possible because you have unmerged files." @@ -9178,9 +9424,10 @@ msgid "" "To check out the original branch and stop rebasing, run \"git rebase --abort" "\"." msgstr "" -"Wenn Sie das Problem aufgelöst haben, führen Sie \"git rebase --continue\" aus.\n" -"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"git rebase --" -"skip\" aus.\n" +"Wenn Sie das Problem aufgelöst haben, führen Sie \"git rebase --continue\" " +"aus.\n" +"Falls Sie diesen Patch auslassen möchten, führen Sie stattdessen \"git " +"rebase --skip\" aus.\n" "Um den ursprünglichen Zweig wiederherzustellen und den Neuaufbau " "abzubrechen,\n" "führen Sie \"git rebase --abort\" aus." @@ -9195,7 +9442,7 @@ msgstr "\"git-am\" scheint im Gange zu sein. Kann nicht neu aufbauen." #: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" -msgstr "Die --exec Option muss mit der --interactive Option benutzt werden" +msgstr "Die Option --exec muss mit --interactive verwendet werden." #: git-rebase.sh:301 msgid "No rebase in progress?" @@ -9203,8 +9450,9 @@ msgstr "Kein Neuaufbau im Gange?" #: git-rebase.sh:312 msgid "The --edit-todo action can only be used during interactive rebase." -msgstr "Die --edit-todo Aktion kann nur während eines interaktiven " -"Neuaufbaus benutzt werden." +msgstr "" +"Die --edit-todo Aktion kann nur während eines interaktiven Neuaufbaus " +"verwendet werden." #: git-rebase.sh:319 msgid "Cannot read HEAD" @@ -9432,39 +9680,39 @@ msgstr "Kein Zweigname spezifiziert" msgid "(To restore them type \"git stash apply\")" msgstr "(Zur Wiederherstellung geben Sie \"git stash apply\" ein)" -#: git-submodule.sh:89 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "Kann eine Komponente von URL '$remoteurl' nicht extrahieren" -#: git-submodule.sh:168 +#: git-submodule.sh:195 #, 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" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "Klonen von '$url' in Unterprojekt-Pfad '$sm_path' fehlgeschlagen" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format 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:316 +#: git-submodule.sh:343 #, 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:333 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' existiert bereits in der Bereitstellung" -#: git-submodule.sh:337 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9475,24 +9723,25 @@ msgstr "" "$sm_path\n" "Benutzen Sie -f wenn Sie diesen wirklich hinzufügen möchten." -#: git-submodule.sh:355 +#: git-submodule.sh:382 #, 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:357 +#: git-submodule.sh:384 #, 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:365 +#: git-submodule.sh:392 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" -msgstr "Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den " -"Fernarchiv(en):" +msgstr "" +"Ein Git-Verzeichnis für '$sm_name' wurde lokal gefunden mit den Fernarchiv" +"(en):" -#: git-submodule.sh:367 +#: git-submodule.sh:394 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -9500,7 +9749,7 @@ msgstr "" "Wenn Sie dieses lokale Git-Verzeichnis wiederverwenden möchtest, anstatt " "erneut zu klonen" -#: git-submodule.sh:369 +#: git-submodule.sh:396 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" @@ -9508,68 +9757,68 @@ msgstr "" "benutzen Sie die Option '--force'. Wenn das lokale Git-Verzeichnis nicht das " "korrekte Projektarchiv ist" -#: git-submodule.sh:370 +#: git-submodule.sh:397 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen Namen" -"mit der Option '--name'." +"oder Sie sich unsicher sind, was das bedeutet, wählen Sie einen anderen " +"Namenmit der Option '--name'." -#: git-submodule.sh:372 +#: git-submodule.sh:399 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Reaktiviere lokales Git-Verzeichnis für Unterprojekt '$sm_name'." -#: git-submodule.sh:384 +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Unfähig Unterprojekt '$sm_path' auszuchecken" -#: git-submodule.sh:389 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Hinzufügen von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:394 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Registierung von Unterprojekt '$sm_path' fehlgeschlagen" -#: git-submodule.sh:437 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Betrete '$prefix$sm_path'" -#: git-submodule.sh:451 +#: git-submodule.sh:482 #, 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:495 +#: git-submodule.sh:526 #, 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:504 +#: git-submodule.sh:535 #, 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:506 +#: git-submodule.sh:537 #, 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:514 +#: git-submodule.sh:545 #, 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:614 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -9578,95 +9827,118 @@ msgstr "" "Unterprojekt-Pfad '$sm_path' ist nicht initialisiert\n" "Vielleicht möchten Sie 'update --init' benutzen?" -#: git-submodule.sh:627 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" -msgstr "Konnte aktuelle Version in Unterprojekt-Pfad '$sm_path' nicht finden" +msgstr "Konnte aktuelle Revision in Unterprojekt-Pfad '$sm_path' nicht finden" -#: git-submodule.sh:646 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Konnte in Unterprojekt-Pfad '$sm_path' nicht anfordern" -#: git-submodule.sh:660 +#: git-submodule.sh:709 #, 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:661 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': neu aufgebaut in '$sha1'" -#: git-submodule.sh:666 +#: git-submodule.sh:715 #, 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:667 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Unterprojekt-Pfad '$sm_path': zusammengeführt in '$sha1'" -#: git-submodule.sh:672 +#: git-submodule.sh:721 #, 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:673 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Unterprojekt-Pfad: '$sm_path': '$sha1' ausgecheckt" -#: git-submodule.sh:695 git-submodule.sh:1017 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Fehler bei Rekursion in Unterprojekt-Pfad '$sm_path'" -#: git-submodule.sh:803 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" -msgstr "Die --cached Option kann nicht mit der --files Option benutzt werden" +msgstr "" +"Die Optionen --cached und --files können nicht gemeinsam verwendet werden." #. unexpected type -#: git-submodule.sh:843 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "unerwarteter Modus $mod_dst" -#: git-submodule.sh:861 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Warnung: $name beinhaltet nicht Version $sha1_src" -#: git-submodule.sh:864 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Warnung: $name beinhaltet nicht Version $sha1_dst" -#: git-submodule.sh:867 +#: git-submodule.sh:916 #, 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:892 +#: git-submodule.sh:941 msgid "blob" msgstr "Blob" -#: git-submodule.sh:930 -msgid "# Submodules changed but not updated:" -msgstr "# Unterprojekte geändert, aber nicht aktualisiert:" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" +msgstr "Unterprojekte geändert, aber nicht aktualisiert:" -#: git-submodule.sh:932 -msgid "# Submodule changes to be committed:" -msgstr "# Änderungen in Unterprojekt zum Eintragen:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" +msgstr "Änderungen in Unterprojekt zum Eintragen:" -#: git-submodule.sh:1080 +#: git-submodule.sh:1129 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "Synchronisiere Unterprojekt-URL für '$prefix$sm_path'" +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "konnte Datei-Deskriptor für Ausgabe von 'show' nicht öffnen" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "" +#~ "Schließen der Verbindung zu 'show' ist für Objekt '%s' fehlgeschlagen." + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Sie haben keine gültige Zweigspitze (HEAD)" + +#~ msgid "oops" +#~ msgstr "Ups" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Würde '%s' nicht löschen\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Entferne nicht %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Konnte Bereitstellung nicht lesen" + #~ msgid " 0 files changed" #~ msgstr " 0 Dateien geändert" diff --git a/po/git.pot b/po/git.pot index 430d033aad..a826dcbf9f 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-11-30 12:40+0800\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -18,7 +18,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "" @@ -27,7 +27,7 @@ msgstr "" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -52,77 +52,77 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "" -#: archive.c:322 +#: archive.c:323 msgid "fmt" msgstr "" -#: archive.c:322 +#: archive.c:323 msgid "archive format" msgstr "" -#: archive.c:323 builtin/log.c:1084 +#: archive.c:324 builtin/log.c:1115 msgid "prefix" msgstr "" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390 -#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 -#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:92 msgid "write the archive to this file" msgstr "" -#: archive.c:328 +#: archive.c:329 msgid "read .gitattributes in working directory" msgstr "" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" msgstr "" -#: archive.c:330 +#: archive.c:331 msgid "store only" msgstr "" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" msgstr "" -#: archive.c:339 +#: archive.c:340 msgid "compress better" msgstr "" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" msgstr "" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" msgstr "" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" msgstr "" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 msgid "command" msgstr "" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" msgstr "" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" @@ -145,9 +145,9 @@ msgstr "" msgid "Repository lacks these prerequisite commits:" msgstr "" -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 -#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "" @@ -173,7 +173,7 @@ msgstr[1] "" msgid "rev-list died" msgstr "" -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "" @@ -299,41 +299,41 @@ msgid_plural "%lu years ago" msgstr[0] "" msgstr[1] "" -#: diff.c:111 +#: diff.c:112 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr "" -#: diff.c:116 +#: diff.c:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr "" -#: diff.c:194 +#: diff.c:210 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "" -#: diff.c:237 +#: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" msgstr "" -#: diff.c:3494 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" "%s" msgstr "" -#: diff.c:3508 +#: diff.c:3482 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "" -#: gpg-interface.c:59 +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "" @@ -345,6 +345,16 @@ msgstr "" msgid "gpg failed to sign the data" msgstr "" +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "" + #: grep.c:1622 #, c-format msgid "'%s': unable to read %s" @@ -369,35 +379,39 @@ msgstr "" msgid "git commands available from elsewhere on your $PATH" msgstr "" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" "able to execute it. Maybe git-%s is broken?" msgstr "" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "" -#: help.c:354 +#: help.c:371 #, 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:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "" -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "" -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -588,7 +602,7 @@ msgstr "" msgid "Auto-merging %s" msgstr "" -#: merge-recursive.c:1633 git-submodule.sh:893 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "" @@ -662,39 +676,53 @@ msgstr "" msgid "Unable to write index." msgstr "" -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "" -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr "" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr "" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "" + +#: remote.c:1653 #, 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:1637 +#: remote.c:1659 msgid " (use \"git push\" to publish your local commits)\n" msgstr "" -#: remote.c:1640 +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -702,11 +730,11 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1647 +#: remote.c:1670 msgid " (use \"git pull\" to update your local branch)\n" msgstr "" -#: remote.c:1650 +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -717,7 +745,7 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: remote.c:1659 +#: remote.c:1683 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" @@ -746,7 +774,7 @@ msgid "" "and commit the result with 'git commit'" msgstr "" -#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "" @@ -769,191 +797,187 @@ msgid "Commit your changes or stash them to proceed." msgstr "" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:235 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "" -#: sequencer.c:266 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "" -#: sequencer.c:287 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "" -#: sequencer.c:332 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "" -#: sequencer.c:337 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "" -#: sequencer.c:403 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "" -#: sequencer.c:406 -msgid "You do not have a valid HEAD" -msgstr "" - -#: sequencer.c:421 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "" -#: sequencer.c:429 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "" -#: sequencer.c:433 +#: sequencer.c:435 #, 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:444 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "" -#: sequencer.c:448 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "" -#: sequencer.c:532 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "" -#: sequencer.c:533 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "" -#: sequencer.c:565 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "" -#: sequencer.c:573 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "" -#: sequencer.c:578 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "" -#: sequencer.c:636 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "" -#: sequencer.c:658 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "" -#: sequencer.c:663 +#: sequencer.c:667 msgid "No commits parsed." msgstr "" -#: sequencer.c:676 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "" -#: sequencer.c:680 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "" -#: sequencer.c:687 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "" -#: sequencer.c:715 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "" -#: sequencer.c:718 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "" -#: sequencer.c:730 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "" -#: sequencer.c:751 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "" -#: sequencer.c:752 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "" -#: sequencer.c:756 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "" -#: sequencer.c:772 sequencer.c:857 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "" -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "" -#: sequencer.c:793 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "" -#: sequencer.c:795 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "" -#: sequencer.c:817 builtin/apply.c:4005 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "" -#: sequencer.c:820 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "" -#: sequencer.c:821 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "" -#: sequencer.c:827 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "" -#: sequencer.c:850 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "" -#: sequencer.c:1012 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "" -#: sequencer.c:1013 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "" @@ -981,12 +1005,17 @@ msgstr "" msgid "unable to access '%s': %s" msgstr "" -#: wrapper.c:426 +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "" -#: wrapper.c:427 +#: wrapper.c:435 msgid "no such user" msgstr "" @@ -1134,191 +1163,212 @@ msgstr "" msgid "bug: unhandled diff status %c" msgstr "" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "" -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr "" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "" -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr "" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "" -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "" -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr "" -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" msgstr "" -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr "" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "" -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr "" -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr "" -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr "" -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "" -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" -#: wt-status.c:893 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" + +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "" -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "" -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr "" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "" + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "" -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "" -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "" -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "" -#: wt-status.c:1011 +#: wt-status.c:1097 msgid "Untracked files" msgstr "" -#: wt-status.c:1013 +#: wt-status.c:1099 msgid "Ignored files" msgstr "" -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "" -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr "" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "" -#: wt-status.c:1028 +#: wt-status.c:1114 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" -#: wt-status.c:1031 +#: wt-status.c:1117 #, c-format msgid "no changes added to commit\n" msgstr "" -#: wt-status.c:1034 +#: wt-status.c:1120 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" msgstr "" -#: wt-status.c:1037 +#: wt-status.c:1123 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" -#: wt-status.c:1040 +#: wt-status.c:1126 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1129 wt-status.c:1134 #, c-format msgid "nothing to commit\n" msgstr "" -#: wt-status.c:1046 +#: wt-status.c:1132 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" -#: wt-status.c:1050 +#: wt-status.c:1136 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "" -#: wt-status.c:1158 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "" -#: wt-status.c:1164 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "" -#: wt-status.c:1179 +#: wt-status.c:1265 msgid "behind " msgstr "" -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "" -#: wt-status.c:1187 +#: wt-status.c:1273 msgid ", behind " msgstr "" @@ -1327,144 +1377,164 @@ msgstr "" msgid "failed to unlink '%s'" msgstr "" -#: builtin/add.c:19 -msgid "git add [options] [--] <filepattern>..." +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." msgstr "" -#: builtin/add.c:62 +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "" -#: builtin/add.c:67 builtin/commit.c:231 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, 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 "" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "" -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "" -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "" -#: builtin/add.c:313 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "" -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483 -#: builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "" -#: builtin/add.c:322 +#: builtin/add.c:280 msgid "interactive picking" msgstr "" -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 msgid "select hunks interactively" msgstr "" -#: builtin/add.c:324 +#: builtin/add.c:282 msgid "edit current diff and apply" msgstr "" -#: builtin/add.c:325 +#: builtin/add.c:283 msgid "allow adding otherwise ignored files" msgstr "" -#: builtin/add.c:326 +#: builtin/add.c:284 msgid "update tracked files" msgstr "" -#: builtin/add.c:327 +#: builtin/add.c:285 msgid "record only the fact that the path will be added later" msgstr "" -#: builtin/add.c:328 +#: builtin/add.c:286 msgid "add changes from all tracked and untracked files" msgstr "" -#: builtin/add.c:329 +#: builtin/add.c:287 msgid "don't add, only refresh the index" msgstr "" -#: builtin/add.c:330 +#: builtin/add.c:288 msgid "just skip files which cannot be added because of errors" msgstr "" -#: builtin/add.c:331 +#: builtin/add.c:289 msgid "check if - even missing - files are ignored in dry run" msgstr "" -#: builtin/add.c:353 +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "" -#: builtin/add.c:354 +#: builtin/add.c:312 msgid "no files added" msgstr "" -#: builtin/add.c:360 +#: builtin/add.c:318 msgid "adding files failed" msgstr "" -#: builtin/add.c:392 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "" -#: builtin/add.c:394 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "" @@ -1478,12 +1548,12 @@ msgstr "" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82 -#: builtin/rm.c:235 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "" @@ -1536,17 +1606,17 @@ msgstr "" msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "" -#: builtin/apply.c:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "" -#: builtin/apply.c:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1557,400 +1627,396 @@ msgid_plural "" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:1654 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "" -#: builtin/apply.c:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "" -#: builtin/apply.c:1720 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "" -#: builtin/apply.c:1723 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "" -#: builtin/apply.c:1869 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1898 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "" -#: builtin/apply.c:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "" -#: builtin/apply.c:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "" -#: builtin/apply.c:2789 +#: builtin/apply.c:2802 #, 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:2801 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "" -#: builtin/apply.c:2807 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" "%.*s" msgstr "" -#: builtin/apply.c:2826 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "" -#: builtin/apply.c:2929 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "" -#: builtin/apply.c:2935 +#: builtin/apply.c:2948 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" -#: builtin/apply.c:2956 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "" -#: builtin/apply.c:3078 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "" -#: builtin/apply.c:3348 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "" -#: builtin/apply.c:3417 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "" -#: builtin/apply.c:3419 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "" -#: builtin/apply.c:3520 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "" -#: builtin/apply.c:3523 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "" -#: builtin/apply.c:3543 +#: builtin/apply.c:3556 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "" -#: builtin/apply.c:3548 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "" -#: builtin/apply.c:3556 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "" -#: builtin/apply.c:3569 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "" -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "" -#: builtin/apply.c:3767 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "" -#: builtin/apply.c:3795 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "" -#: builtin/apply.c:3799 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "" -#: builtin/apply.c:3804 +#: builtin/apply.c:3855 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "" -#: builtin/apply.c:3807 builtin/apply.c:3915 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, c-format msgid "unable to add cache entry for %s" msgstr "" -#: builtin/apply.c:3840 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "" -#: builtin/apply.c:3889 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "" -#: builtin/apply.c:3976 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "" -#: builtin/apply.c:3984 +#: builtin/apply.c:4035 msgid "internal error" msgstr "" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4038 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:3997 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "" -#: builtin/apply.c:4018 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "" -#: builtin/apply.c:4021 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "" -#: builtin/apply.c:4171 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "" -#: builtin/apply.c:4182 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "" -#: builtin/apply.c:4302 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "" -#: builtin/apply.c:4305 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "" -#: builtin/apply.c:4307 +#: builtin/apply.c:4358 msgid "num" msgstr "" -#: builtin/apply.c:4308 +#: builtin/apply.c:4359 msgid "remove <num> leading slashes from traditional diff paths" msgstr "" -#: builtin/apply.c:4311 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "" -#: builtin/apply.c:4313 +#: builtin/apply.c:4364 msgid "instead of applying the patch, output diffstat for the input" msgstr "" -#: builtin/apply.c:4317 +#: builtin/apply.c:4368 msgid "show number of added and deleted lines in decimal notation" msgstr "" -#: builtin/apply.c:4319 +#: builtin/apply.c:4370 msgid "instead of applying the patch, output a summary for the input" msgstr "" -#: builtin/apply.c:4321 +#: builtin/apply.c:4372 msgid "instead of applying the patch, see if the patch is applicable" msgstr "" -#: builtin/apply.c:4323 +#: builtin/apply.c:4374 msgid "make sure the patch is applicable to the current index" msgstr "" -#: builtin/apply.c:4325 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "" -#: builtin/apply.c:4327 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" -#: builtin/apply.c:4329 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "" -#: builtin/apply.c:4331 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "" -#: builtin/apply.c:4336 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "" -#: builtin/apply.c:4337 +#: builtin/apply.c:4388 msgid "action" msgstr "" -#: builtin/apply.c:4338 +#: builtin/apply.c:4389 msgid "detect new or modified lines that have whitespace errors" msgstr "" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "" -#: builtin/apply.c:4347 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "" -#: builtin/apply.c:4349 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "" -#: builtin/apply.c:4351 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "" -#: builtin/apply.c:4353 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "" -#: builtin/apply.c:4356 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" -#: builtin/apply.c:4359 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "" -#: builtin/apply.c:4361 +#: builtin/apply.c:4412 msgid "root" msgstr "" -#: builtin/apply.c:4362 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "" -#: builtin/apply.c:4384 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "" -#: builtin/apply.c:4392 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "" -#: builtin/apply.c:4395 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "" -#: builtin/apply.c:4411 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "" -#: builtin/apply.c:4425 +#: builtin/apply.c:4476 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "" msgstr[1] "" -#: builtin/apply.c:4431 builtin/apply.c:4441 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2012,95 +2078,95 @@ msgstr "" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "" -#: builtin/blame.c:2374 +#: builtin/blame.c:2350 msgid "Show blame entries as we find them, incrementally" msgstr "" -#: builtin/blame.c:2375 +#: builtin/blame.c:2351 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" -#: builtin/blame.c:2376 +#: builtin/blame.c:2352 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "" -#: builtin/blame.c:2377 +#: builtin/blame.c:2353 msgid "Show work cost statistics" msgstr "" -#: builtin/blame.c:2378 +#: builtin/blame.c:2354 msgid "Show output score for blame entries" msgstr "" -#: builtin/blame.c:2379 +#: builtin/blame.c:2355 msgid "Show original filename (Default: auto)" msgstr "" -#: builtin/blame.c:2380 +#: builtin/blame.c:2356 msgid "Show original linenumber (Default: off)" msgstr "" -#: builtin/blame.c:2381 +#: builtin/blame.c:2357 msgid "Show in a format designed for machine consumption" msgstr "" -#: builtin/blame.c:2382 +#: builtin/blame.c:2358 msgid "Show porcelain format with per-line commit information" msgstr "" -#: builtin/blame.c:2383 +#: builtin/blame.c:2359 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "" -#: builtin/blame.c:2384 +#: builtin/blame.c:2360 msgid "Show raw timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2385 +#: builtin/blame.c:2361 msgid "Show long commit SHA1 (Default: off)" msgstr "" -#: builtin/blame.c:2386 +#: builtin/blame.c:2362 msgid "Suppress author name and timestamp (Default: off)" msgstr "" -#: builtin/blame.c:2387 +#: builtin/blame.c:2363 msgid "Show author email instead of name (Default: off)" msgstr "" -#: builtin/blame.c:2388 +#: builtin/blame.c:2364 msgid "Ignore whitespace differences" msgstr "" -#: builtin/blame.c:2389 +#: builtin/blame.c:2365 msgid "Spend extra cycles to find better match" msgstr "" -#: builtin/blame.c:2390 +#: builtin/blame.c:2366 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" -#: builtin/blame.c:2391 +#: builtin/blame.c:2367 msgid "Use <file>'s contents as the final image" msgstr "" -#: builtin/blame.c:2392 builtin/blame.c:2393 +#: builtin/blame.c:2368 builtin/blame.c:2369 msgid "score" msgstr "" -#: builtin/blame.c:2392 +#: builtin/blame.c:2368 msgid "Find line copies within and across files" msgstr "" -#: builtin/blame.c:2393 +#: builtin/blame.c:2369 msgid "Find line movements within and across files" msgstr "" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "n,m" msgstr "" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "Process only line range n,m, counting from 1" msgstr "" @@ -2228,10 +2294,19 @@ msgstr "" msgid "[ahead %d, behind %d]" msgstr "" +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr "" + #: builtin/branch.c:560 msgid "(no branch)" msgstr "" +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "" + #: builtin/branch.c:625 msgid "some refs could not be read" msgstr "" @@ -2302,8 +2377,8 @@ msgid "act on remote-tracking branches" msgstr "" #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 -#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377 -#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 msgid "commit" msgstr "" @@ -2371,32 +2446,58 @@ msgstr "" msgid "HEAD not found below refs/heads!" msgstr "" -#: builtin/branch.c:836 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "" -#: builtin/branch.c:887 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "" + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "" + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "" + +#: builtin/branch.c:893 #, c-format msgid "branch '%s' does not exist" msgstr "" -#: builtin/branch.c:899 +#: builtin/branch.c:905 #, c-format msgid "Branch '%s' has no upstream information" msgstr "" -#: builtin/branch.c:914 +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" -#: builtin/branch.c:917 +#: builtin/branch.c:923 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" -#: builtin/branch.c:934 +#: builtin/branch.c:940 #, c-format msgid "" "\n" @@ -2404,12 +2505,12 @@ msgid "" "\n" msgstr "" -#: builtin/branch.c:935 +#: builtin/branch.c:941 #, c-format msgid " git branch -d %s\n" msgstr "" -#: builtin/branch.c:936 +#: builtin/branch.c:942 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr "" @@ -2483,14 +2584,38 @@ msgstr "" msgid "use .gitattributes only from the index" msgstr "" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "" -#: builtin/check-attr.c:23 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "" +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "" @@ -2711,10 +2836,6 @@ msgstr "" msgid "Cannot switch branch to a non-commit '%s'" msgstr "" -#: builtin/checkout.c:1012 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "" - #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" @@ -2768,7 +2889,7 @@ msgstr "" msgid "update ignored files (default)" msgstr "" -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 msgid "style" msgstr "" @@ -2814,85 +2935,85 @@ msgid "" "checking out of the index." msgstr "" -#: builtin/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" -#: builtin/clean.c:51 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "" + +#: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" msgstr "" -#: builtin/clean.c:55 +#: builtin/clean.c:164 msgid "remove whole directories" msgstr "" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" msgstr "" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" -#: 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 "" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "" - -#: 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:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/push.c:436 msgid "force progress reporting" msgstr "" @@ -3042,56 +3163,60 @@ msgstr "" msgid "--bare and --origin %s options are incompatible." msgstr "" -#: builtin/clone.c:719 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "" + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "" -#: builtin/clone.c:724 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "" -#: builtin/clone.c:734 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "" -#: builtin/clone.c:744 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "" -#: builtin/clone.c:757 builtin/clone.c:771 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "" -#: builtin/clone.c:760 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "" -#: builtin/clone.c:779 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "" -#: builtin/clone.c:781 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "" -#: builtin/clone.c:823 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "" -#: builtin/clone.c:872 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "" -#: builtin/clone.c:879 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "" @@ -3128,11 +3253,11 @@ msgid "--command must be the first argument" msgstr "" #: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." +msgid "git commit [options] [--] <pathspec>..." msgstr "" #: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." +msgid "git status [options] [--] <pathspec>..." msgstr "" #: builtin/commit.c:44 @@ -3217,7 +3342,7 @@ msgstr "" msgid "could not lookup commit %s" msgstr "" -#: builtin/commit.c:610 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "" @@ -3273,15 +3398,17 @@ msgid "" msgstr "" #: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" #: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" @@ -3303,7 +3430,7 @@ msgstr "" msgid "Error building trees" msgstr "" -#: builtin/commit.c:832 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "" @@ -3313,323 +3440,323 @@ msgstr "" msgid "No existing author found with '%s'" msgstr "" -#: builtin/commit.c:944 builtin/commit.c:1148 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "" -#: builtin/commit.c:984 +#: builtin/commit.c:974 msgid "Using both --reset-author and --author does not make sense" msgstr "" -#: builtin/commit.c:995 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "" -#: builtin/commit.c:998 +#: builtin/commit.c:988 msgid "You are in the middle of a merge -- cannot amend." msgstr "" -#: builtin/commit.c:1000 +#: builtin/commit.c:990 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "" -#: builtin/commit.c:1003 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "" -#: builtin/commit.c:1013 +#: builtin/commit.c:1003 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "" -#: builtin/commit.c:1015 +#: builtin/commit.c:1005 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "" -#: builtin/commit.c:1023 +#: builtin/commit.c:1013 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "" -#: builtin/commit.c:1040 +#: builtin/commit.c:1030 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "" -#: builtin/commit.c:1042 +#: builtin/commit.c:1032 msgid "No paths with --include/--only does not make sense." msgstr "" -#: builtin/commit.c:1044 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "" -#: builtin/commit.c:1046 +#: builtin/commit.c:1036 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "" -#: builtin/commit.c:1056 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "" -#: builtin/commit.c:1061 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." msgstr "" -#: builtin/commit.c:1067 builtin/commit.c:1202 +#: builtin/commit.c:1057 builtin/commit.c:1192 msgid "--long and -z are incompatible" msgstr "" -#: builtin/commit.c:1162 builtin/commit.c:1398 +#: builtin/commit.c:1152 builtin/commit.c:1388 msgid "show status concisely" msgstr "" -#: builtin/commit.c:1164 builtin/commit.c:1400 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show branch information" msgstr "" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 msgid "machine-readable output" msgstr "" -#: builtin/commit.c:1169 builtin/commit.c:1404 +#: builtin/commit.c:1159 builtin/commit.c:1394 msgid "show status in long format (default)" msgstr "" -#: builtin/commit.c:1172 builtin/commit.c:1407 +#: builtin/commit.c:1162 builtin/commit.c:1397 msgid "terminate entries with NUL" msgstr "" -#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 msgid "mode" msgstr "" -#: builtin/commit.c:1175 builtin/commit.c:1410 +#: builtin/commit.c:1165 builtin/commit.c:1400 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" -#: builtin/commit.c:1178 +#: builtin/commit.c:1168 msgid "show ignored files" msgstr "" -#: builtin/commit.c:1179 parse-options.h:151 +#: builtin/commit.c:1169 parse-options.h:151 msgid "when" msgstr "" -#: builtin/commit.c:1180 +#: builtin/commit.c:1170 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" -#: builtin/commit.c:1182 +#: builtin/commit.c:1172 msgid "list untracked files in columns" msgstr "" -#: builtin/commit.c:1256 +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "" -#: builtin/commit.c:1258 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "" -#: builtin/commit.c:1299 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "" -#: builtin/commit.c:1301 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr "" -#: builtin/commit.c:1368 +#: builtin/commit.c:1358 msgid "suppress summary after successful commit" msgstr "" -#: builtin/commit.c:1369 +#: builtin/commit.c:1359 msgid "show diff in commit message template" msgstr "" -#: builtin/commit.c:1371 +#: builtin/commit.c:1361 msgid "Commit message options" msgstr "" -#: builtin/commit.c:1372 builtin/tag.c:459 +#: builtin/commit.c:1362 builtin/tag.c:457 msgid "read message from file" msgstr "" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "author" msgstr "" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "override author for commit" msgstr "" -#: builtin/commit.c:1374 builtin/gc.c:178 +#: builtin/commit.c:1364 builtin/gc.c:178 msgid "date" msgstr "" -#: builtin/commit.c:1374 +#: builtin/commit.c:1364 msgid "override date for commit" msgstr "" -#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/tag.c:457 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "" -#: builtin/commit.c:1375 +#: builtin/commit.c:1365 msgid "commit message" msgstr "" -#: builtin/commit.c:1376 +#: builtin/commit.c:1366 msgid "reuse and edit message from specified commit" msgstr "" -#: builtin/commit.c:1377 +#: builtin/commit.c:1367 msgid "reuse message from specified commit" msgstr "" -#: builtin/commit.c:1378 +#: builtin/commit.c:1368 msgid "use autosquash formatted message to fixup specified commit" msgstr "" -#: builtin/commit.c:1379 +#: builtin/commit.c:1369 msgid "use autosquash formatted message to squash specified commit" msgstr "" -#: builtin/commit.c:1380 +#: builtin/commit.c:1370 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" -#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "" -#: builtin/commit.c:1382 +#: builtin/commit.c:1372 msgid "use specified template file" msgstr "" -#: builtin/commit.c:1383 +#: builtin/commit.c:1373 msgid "force edit of commit" msgstr "" -#: builtin/commit.c:1384 +#: builtin/commit.c:1374 msgid "default" msgstr "" -#: builtin/commit.c:1384 builtin/tag.c:462 +#: builtin/commit.c:1374 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "" -#: builtin/commit.c:1385 +#: builtin/commit.c:1375 msgid "include status in commit message template" msgstr "" -#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 msgid "key id" msgstr "" -#: builtin/commit.c:1387 builtin/merge.c:214 +#: builtin/commit.c:1377 builtin/merge.c:214 msgid "GPG sign commit" msgstr "" #. end commit message options -#: builtin/commit.c:1390 +#: builtin/commit.c:1380 msgid "Commit contents options" msgstr "" -#: builtin/commit.c:1391 +#: builtin/commit.c:1381 msgid "commit all changed files" msgstr "" -#: builtin/commit.c:1392 +#: builtin/commit.c:1382 msgid "add specified files to index for commit" msgstr "" -#: builtin/commit.c:1393 +#: builtin/commit.c:1383 msgid "interactively add files" msgstr "" -#: builtin/commit.c:1394 +#: builtin/commit.c:1384 msgid "interactively add changes" msgstr "" -#: builtin/commit.c:1395 +#: builtin/commit.c:1385 msgid "commit only specified files" msgstr "" -#: builtin/commit.c:1396 +#: builtin/commit.c:1386 msgid "bypass pre-commit hook" msgstr "" -#: builtin/commit.c:1397 +#: builtin/commit.c:1387 msgid "show what would be committed" msgstr "" -#: builtin/commit.c:1408 +#: builtin/commit.c:1398 msgid "amend previous commit" msgstr "" -#: builtin/commit.c:1409 +#: builtin/commit.c:1399 msgid "bypass post-rewrite hook" msgstr "" -#: builtin/commit.c:1414 +#: builtin/commit.c:1404 msgid "ok to record an empty change" msgstr "" -#: builtin/commit.c:1417 +#: builtin/commit.c:1407 msgid "ok to record a change with an empty message" msgstr "" -#: builtin/commit.c:1449 +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "" -#: builtin/commit.c:1534 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "" -#: builtin/commit.c:1539 +#: builtin/commit.c:1529 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "" -#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -3924,39 +4051,39 @@ msgstr "" msgid "git fast-export [rev-list-opts]" msgstr "" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:646 msgid "show progress after <n> objects" msgstr "" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:648 msgid "select handling of signed tags" msgstr "" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:651 msgid "select handling of tags that tag filtered objects" msgstr "" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:654 msgid "Dump marks to this file" msgstr "" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:656 msgid "Import marks from this file" msgstr "" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:658 msgid "Fake a tagger when tags lack one" msgstr "" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:660 msgid "Output full tree for each commit" msgstr "" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:662 msgid "Use the done feature to terminate the stream" msgstr "" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:663 msgid "Skip output of blob data" msgstr "" @@ -4028,166 +4155,178 @@ msgstr "" msgid "deepen history of shallow clone" msgstr "" -#: builtin/fetch.c:85 builtin/log.c:1088 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "" + +#: builtin/fetch.c:88 builtin/log.c:1119 msgid "dir" msgstr "" -#: builtin/fetch.c:86 +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "" -#: builtin/fetch.c:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr "" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "" -#: builtin/fetch.c:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" " 'git remote prune %s' to remove any old, conflicting branches" msgstr "" -#: builtin/fetch.c:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr "" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr "" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "" -#: builtin/fetch.c:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "" -#: builtin/fetch.c:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "" -#: builtin/fetch.c:891 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "" -#: builtin/fetch.c:912 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "" -#: builtin/fetch.c:932 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "" -#: builtin/fetch.c:984 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "" @@ -4195,29 +4334,29 @@ msgstr "" msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:660 msgid "populate log with at most <n> entries from shortlog" msgstr "" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:663 msgid "alias for --log (deprecated)" msgstr "" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:666 msgid "text" msgstr "" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:667 msgid "use <text> as start of message" msgstr "" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:668 msgid "file to read from" msgstr "" @@ -4554,23 +4693,23 @@ msgstr "" msgid "bad object %s" msgstr "" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "" -#: builtin/grep.c:894 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "" -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "" -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "" @@ -4608,86 +4747,82 @@ msgstr "" msgid "process file as it were from this path" msgstr "" -#: builtin/help.c:43 +#: builtin/help.c:42 msgid "print all available commands" msgstr "" -#: builtin/help.c:44 +#: builtin/help.c:43 msgid "show man page" msgstr "" -#: builtin/help.c:45 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "" -#: builtin/help.c:47 +#: builtin/help.c:46 msgid "show info page" msgstr "" -#: builtin/help.c:53 +#: builtin/help.c:52 msgid "git help [--all] [--man|--web|--info] [command]" msgstr "" -#: builtin/help.c:65 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "" -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "" -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" "Please consider using 'man.<tool>.cmd' instead." msgstr "" -#: builtin/help.c:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" "Please consider using 'man.<tool>.path' instead." msgstr "" -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "" -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "" @@ -5087,8 +5222,8 @@ msgstr "" #: builtin/init-db.c:467 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" msgstr "" #: builtin/init-db.c:490 @@ -5129,337 +5264,345 @@ msgstr "" msgid "Cannot access work tree '%s'" msgstr "" -#: builtin/log.c:37 +#: builtin/log.c:39 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" msgstr "" -#: builtin/log.c:38 +#: builtin/log.c:40 msgid " or: git show [options] <object>..." msgstr "" -#: builtin/log.c:100 +#: builtin/log.c:102 msgid "suppress diff output" msgstr "" -#: builtin/log.c:101 +#: builtin/log.c:103 msgid "show source" msgstr "" -#: builtin/log.c:102 +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "" + +#: builtin/log.c:105 msgid "decorate options" msgstr "" -#: builtin/log.c:189 +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "" -#: builtin/log.c:405 builtin/log.c:497 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "" -#: builtin/log.c:521 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "" -#: builtin/log.c:613 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "" -#: builtin/log.c:687 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "" -#: builtin/log.c:698 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "" -#: builtin/log.c:712 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "" -#: builtin/log.c:720 +#: builtin/log.c:739 msgid "Not a range." msgstr "" -#: builtin/log.c:794 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "" -#: builtin/log.c:867 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "" -#: builtin/log.c:895 +#: builtin/log.c:913 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "" -#: builtin/log.c:940 +#: builtin/log.c:958 msgid "Two output directories?" msgstr "" -#: builtin/log.c:1068 +#: builtin/log.c:1097 msgid "use [PATCH n/m] even with a single patch" msgstr "" -#: builtin/log.c:1071 +#: builtin/log.c:1100 msgid "use [PATCH] even with multiple patches" msgstr "" -#: builtin/log.c:1075 +#: builtin/log.c:1104 msgid "print patches to standard out" msgstr "" -#: builtin/log.c:1077 +#: builtin/log.c:1106 msgid "generate a cover letter" msgstr "" -#: builtin/log.c:1079 +#: builtin/log.c:1108 msgid "use simple number sequence for output file names" msgstr "" -#: builtin/log.c:1080 +#: builtin/log.c:1109 msgid "sfx" msgstr "" -#: builtin/log.c:1081 +#: builtin/log.c:1110 msgid "use <sfx> instead of '.patch'" msgstr "" -#: builtin/log.c:1083 +#: builtin/log.c:1112 msgid "start numbering patches at <n> instead of 1" msgstr "" -#: builtin/log.c:1085 +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "" + +#: builtin/log.c:1116 msgid "Use [<prefix>] instead of [PATCH]" msgstr "" -#: builtin/log.c:1088 +#: builtin/log.c:1119 msgid "store resulting files in <dir>" msgstr "" -#: builtin/log.c:1091 +#: builtin/log.c:1122 msgid "don't strip/add [PATCH]" msgstr "" -#: builtin/log.c:1094 +#: builtin/log.c:1125 msgid "don't output binary diffs" msgstr "" -#: builtin/log.c:1096 +#: builtin/log.c:1127 msgid "don't include a patch matching a commit upstream" msgstr "" -#: builtin/log.c:1098 +#: builtin/log.c:1129 msgid "show patch format instead of default (patch + stat)" msgstr "" -#: builtin/log.c:1100 +#: builtin/log.c:1131 msgid "Messaging" msgstr "" -#: builtin/log.c:1101 +#: builtin/log.c:1132 msgid "header" msgstr "" -#: builtin/log.c:1102 +#: builtin/log.c:1133 msgid "add email header" msgstr "" -#: builtin/log.c:1103 builtin/log.c:1105 +#: builtin/log.c:1134 builtin/log.c:1136 msgid "email" msgstr "" -#: builtin/log.c:1103 +#: builtin/log.c:1134 msgid "add To: header" msgstr "" -#: builtin/log.c:1105 +#: builtin/log.c:1136 msgid "add Cc: header" msgstr "" -#: builtin/log.c:1107 +#: builtin/log.c:1138 msgid "message-id" msgstr "" -#: builtin/log.c:1108 +#: builtin/log.c:1139 msgid "make first mail a reply to <message-id>" msgstr "" -#: builtin/log.c:1109 builtin/log.c:1112 +#: builtin/log.c:1140 builtin/log.c:1143 msgid "boundary" msgstr "" -#: builtin/log.c:1110 +#: builtin/log.c:1141 msgid "attach the patch" msgstr "" -#: builtin/log.c:1113 +#: builtin/log.c:1144 msgid "inline the patch" msgstr "" -#: builtin/log.c:1117 +#: builtin/log.c:1148 msgid "enable message threading, styles: shallow, deep" msgstr "" -#: builtin/log.c:1119 +#: builtin/log.c:1150 msgid "signature" msgstr "" -#: builtin/log.c:1120 +#: builtin/log.c:1151 msgid "add a signature" msgstr "" -#: builtin/log.c:1122 +#: builtin/log.c:1153 msgid "don't print the patch filenames" msgstr "" -#: builtin/log.c:1163 +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "" -#: builtin/log.c:1208 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1210 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "" -#: builtin/log.c:1218 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "" -#: builtin/log.c:1220 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "" -#: builtin/log.c:1222 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "" -#: builtin/log.c:1245 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "" -#: builtin/log.c:1247 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "" -#: builtin/log.c:1400 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "" -#: builtin/log.c:1449 +#: builtin/log.c:1488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "" -#: builtin/log.c:1504 +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:409 msgid "git ls-files [options] [<file>...]" msgstr "" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "identify the file status with tags" msgstr "" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show cached files in the output (default)" msgstr "" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:472 msgid "show deleted files in the output" msgstr "" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:474 msgid "show modified files in the output" msgstr "" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:476 msgid "show other files in the output" msgstr "" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:478 msgid "show ignored files in the output" msgstr "" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:481 msgid "show staged contents' object name in the output" msgstr "" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show files on the filesystem that need to be removed" msgstr "" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show 'other' directories' name only" msgstr "" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:488 msgid "don't show empty directories" msgstr "" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:491 msgid "show unmerged files in the output" msgstr "" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "show resolve-undo information" msgstr "" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:495 msgid "skip files matching pattern" msgstr "" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "exclude patterns are read from <file>" msgstr "" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "read additional per-directory exclude patterns in <file>" msgstr "" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "add the standard git exclusions" msgstr "" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:506 msgid "make the output relative to the project top directory" msgstr "" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:509 msgid "if any <file> is not in the index, treat this as an error" msgstr "" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:510 msgid "tree-ish" msgstr "" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:511 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:513 msgid "show debugging data" msgstr "" @@ -5566,7 +5709,7 @@ msgstr "" msgid "abort if fast-forward is not possible" msgstr "" -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "" @@ -5668,11 +5811,12 @@ msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "" #: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" @@ -5765,51 +5909,51 @@ msgstr "" msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "" -#: builtin/merge.c:1309 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "" -#: builtin/merge.c:1348 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "" -#: builtin/merge.c:1387 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "" -#: builtin/merge.c:1410 builtin/merge.c:1489 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "" -#: builtin/merge.c:1414 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "" -#: builtin/merge.c:1480 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "" -#: builtin/merge.c:1482 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "" -#: builtin/merge.c:1491 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "" -#: builtin/merge.c:1503 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6115,233 +6259,228 @@ msgstr "" msgid "git notes get-ref" msgstr "" -#: builtin/notes.c:142 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "" -#: builtin/notes.c:148 -msgid "can't fdopen 'show' output fd" -msgstr "" - -#: builtin/notes.c:158 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" +#: builtin/notes.c:143 +msgid "could not read 'show' output" msgstr "" -#: builtin/notes.c:161 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "" -#: builtin/notes.c:178 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "" -#: builtin/notes.c:192 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "" -#: builtin/notes.c:213 builtin/notes.c:976 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "" -#: builtin/notes.c:218 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "" -#: builtin/notes.c:220 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "" -#: builtin/notes.c:254 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "" -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "" -#: builtin/notes.c:278 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "" -#: builtin/notes.c:302 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "" -#: builtin/notes.c:343 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "" -#: builtin/notes.c:353 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:380 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "" -#: builtin/notes.c:444 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "" -#: builtin/notes.c:459 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "" -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 -#: builtin/notes.c:1036 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "" -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "" -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 -#: builtin/notes.c:703 builtin/tag.c:476 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "" -#: builtin/notes.c:583 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:588 builtin/notes.c:665 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "" -#: builtin/notes.c:618 +#: builtin/notes.c:614 msgid "read objects from stdin" msgstr "" -#: builtin/notes.c:620 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "" -#: builtin/notes.c:638 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "" -#: builtin/notes.c:659 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "" -#: builtin/notes.c:671 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "" -#: builtin/notes.c:720 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" "Please use 'git notes add -f -m/-F/-c/-C' instead.\n" msgstr "" -#: builtin/notes.c:867 +#: builtin/notes.c:863 msgid "General options" msgstr "" -#: builtin/notes.c:869 +#: builtin/notes.c:865 msgid "Merge options" msgstr "" -#: builtin/notes.c:871 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" msgstr "" -#: builtin/notes.c:873 +#: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "" -#: builtin/notes.c:875 +#: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "" -#: builtin/notes.c:877 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "" -#: builtin/notes.c:879 +#: builtin/notes.c:875 msgid "abort notes merge" msgstr "" -#: builtin/notes.c:974 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "" -#: builtin/notes.c:986 +#: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "" -#: builtin/notes.c:989 +#: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "" -#: builtin/notes.c:1070 +#: builtin/notes.c:1066 msgid "notes_ref" msgstr "" -#: builtin/notes.c:1071 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" msgstr "" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "" @@ -6643,22 +6782,42 @@ msgid "" "See the 'Note about fast-forwards' in 'git push --help' for details." msgstr "" -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "" + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -6671,79 +6830,83 @@ msgid "" " git push <name>\n" msgstr "" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "" -#: builtin/push.c:382 +#: builtin/push.c:419 msgid "repository" msgstr "" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" msgstr "" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" msgstr "" -#: builtin/push.c:386 +#: builtin/push.c:423 msgid "delete refs" msgstr "" -#: builtin/push.c:387 +#: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" msgstr "" -#: builtin/push.c:390 +#: builtin/push.c:427 msgid "force updates" msgstr "" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" msgstr "" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" msgstr "" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" msgstr "" -#: builtin/push.c:410 +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "" @@ -7338,11 +7501,11 @@ msgid "" msgstr "" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." +msgid "git reset [-q] <tree-ish> [--] <paths>..." msgstr "" #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" msgstr "" #: builtin/reset.c:33 @@ -7365,89 +7528,95 @@ msgstr "" msgid "keep" msgstr "" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "" - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "" -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" msgstr "" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" msgstr "" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" msgstr "" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" msgstr "" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "" + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "" -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "" + #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "" @@ -7624,28 +7793,28 @@ msgstr "" msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" msgstr "" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:229 msgid "sort output according to the number of commits per author" msgstr "" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:231 msgid "Suppress commit descriptions, only provides commit count" msgstr "" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:233 msgid "Show the email address of each author" msgstr "" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:234 msgid "w[,i1[,i2]]" msgstr "" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:235 msgid "Linewrap output" msgstr "" @@ -7727,8 +7896,8 @@ msgstr "" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" #: builtin/show-ref.c:11 @@ -7840,159 +8009,157 @@ msgid "could not verify the tag '%s'" msgstr "" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "" -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" msgstr "" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "delete tags" msgstr "" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" msgstr "" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "" -#: builtin/tag.c:456 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "" -#: builtin/tag.c:458 +#: builtin/tag.c:456 msgid "tag message" msgstr "" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" msgstr "" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" msgstr "" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "" -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "" -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "" -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "" -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "" @@ -8177,15 +8344,15 @@ msgstr "" msgid "no-op (backward compatibility)" msgstr "" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "" @@ -8226,7 +8393,7 @@ msgid "Print lines matching a pattern" msgstr "" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" +msgid "Create an empty Git repository or reinitialize an existing one" msgstr "" #: common-cmds.h:18 @@ -8835,37 +9002,37 @@ msgstr "" msgid "(To restore them type \"git stash apply\")" msgstr "" -#: git-submodule.sh:89 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "" -#: git-submodule.sh:168 +#: git-submodule.sh:195 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" msgstr "" -#: git-submodule.sh:316 +#: git-submodule.sh:343 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "" -#: git-submodule.sh:333 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "" -#: git-submodule.sh:337 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -8873,180 +9040,180 @@ msgid "" "Use -f if you really want to add it." msgstr "" -#: git-submodule.sh:355 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "" -#: git-submodule.sh:357 +#: git-submodule.sh:384 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "" -#: git-submodule.sh:365 +#: git-submodule.sh:392 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -#: git-submodule.sh:367 +#: git-submodule.sh:394 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "" -#: git-submodule.sh:369 +#: git-submodule.sh:396 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -#: git-submodule.sh:370 +#: git-submodule.sh:397 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -#: git-submodule.sh:372 +#: git-submodule.sh:399 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -#: git-submodule.sh:384 +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "" -#: git-submodule.sh:389 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "" -#: git-submodule.sh:394 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "" -#: git-submodule.sh:437 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "" -#: git-submodule.sh:451 +#: git-submodule.sh:482 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" -#: git-submodule.sh:495 +#: git-submodule.sh:526 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "" -#: git-submodule.sh:504 +#: git-submodule.sh:535 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:506 +#: git-submodule.sh:537 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "" -#: git-submodule.sh:514 +#: git-submodule.sh:545 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:614 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" "Maybe you want to use 'update --init'?" msgstr "" -#: git-submodule.sh:627 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:646 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:660 +#: git-submodule.sh:709 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:661 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "" -#: git-submodule.sh:666 +#: git-submodule.sh:715 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:667 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "" -#: git-submodule.sh:672 +#: git-submodule.sh:721 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:673 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "" -#: git-submodule.sh:695 git-submodule.sh:1017 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "" -#: git-submodule.sh:803 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "" #. unexpected type -#: git-submodule.sh:843 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "" -#: git-submodule.sh:861 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr "" -#: git-submodule.sh:864 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr "" -#: git-submodule.sh:867 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr "" -#: git-submodule.sh:892 +#: git-submodule.sh:941 msgid "blob" msgstr "" -#: git-submodule.sh:930 -msgid "# Submodules changed but not updated:" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" msgstr "" -#: git-submodule.sh:932 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" msgstr "" -#: git-submodule.sh:1080 +#: git-submodule.sh:1129 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "" @@ -1,14 +1,14 @@ # Swedish translations for Git. -# Copyright (C) 2010-2012 Peter krefting <peter@softwolves.pp.se> +# Copyright (C) 2010-2013 Peter krefting <peter@softwolves.pp.se> # This file is distributed under the same license as the Git package. -# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012. +# Peter Krefting <peter@softwolves.pp.se>, 2010, 2011, 2012, 2013. # msgid "" msgstr "" -"Project-Id-Version: git 1.8.1\n" +"Project-Id-Version: git 1.8.2\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-11-30 12:40+0800\n" -"PO-Revision-Date: 2012-11-30 10:49+0100\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"PO-Revision-Date: 2013-03-05 09:17+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:40 +#: advice.c:49 #, 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:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -57,80 +57,80 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <arkiv> [--exec <kmd>] --list" -#: archive.c:322 +#: archive.c:323 msgid "fmt" msgstr "fmt" -#: archive.c:322 +#: archive.c:323 msgid "archive format" msgstr "arkivformat" -#: archive.c:323 builtin/log.c:1084 +#: archive.c:324 builtin/log.c:1115 msgid "prefix" msgstr "prefix" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "lägg till prefix till varje sökväg i arkivet" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390 -#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 -#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "fil" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:92 msgid "write the archive to this file" msgstr "skriv arkivet till filen" -#: archive.c:328 +#: archive.c:329 msgid "read .gitattributes in working directory" msgstr "läs .gitattributes i arbetskatalogen" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" msgstr "rapportera arkiverade filer på standard fel" -#: archive.c:330 +#: archive.c:331 msgid "store only" msgstr "endast spara" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" msgstr "komprimera snabbare" -#: archive.c:339 +#: archive.c:340 msgid "compress better" msgstr "komprimera bättre" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" msgstr "visa understödda arkivformat" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" msgstr "arkiv" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" msgstr "hämta arkivet från fjärrarkivet <arkiv>" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 msgid "command" msgstr "kommando" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" msgstr "sökväg till kommandot git-upload-archive på fjärren" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Negativa mönster är förbjudna i git-attribut\n" +"Negativa mönster ignoreras i git-attribut\n" "Använd '\\!' för att inleda med ett utropstecken." #: bundle.c:36 @@ -152,9 +152,9 @@ msgstr "kunde inte öppna \"%s\"" msgid "Repository lacks these prerequisite commits:" msgstr "Arkivet saknar dessa nödvändiga incheckningar:" -#: bundle.c:164 sequencer.c:562 sequencer.c:994 builtin/log.c:290 -#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "misslyckades skapa revisionstraversering" @@ -180,7 +180,7 @@ msgstr[1] "Paketet (bundlen) kräver dessa %d referenser" msgid "rev-list died" msgstr "rev-list dog" -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "okänt argument: %s" @@ -306,22 +306,22 @@ msgid_plural "%lu years ago" msgstr[0] "%lu år sedan" msgstr[1] "%lu år sedan" -#: diff.c:111 +#: diff.c:112 #, c-format msgid " Failed to parse dirstat cut-off percentage '%s'\n" msgstr " Misslyckades tolka dirstat-avskärningsprocentandel \"%s\"\n" -#: diff.c:116 +#: diff.c:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" msgstr " Okänd dirstat-parameter \"%s\"\n" -#: diff.c:194 +#: diff.c:210 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" msgstr "Okänt värde för konfigurationsvariabeln \"diff.submodule\": \"%s\"" -#: diff.c:237 +#: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -330,7 +330,7 @@ msgstr "" "Hittade fel i konfigurationsvariabeln \"diff.dirstat\":\n" "%s" -#: diff.c:3494 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -339,12 +339,12 @@ msgstr "" "Misslyckades tolka argument till flaggan --dirstat/-X;\n" "%s" -#: diff.c:3508 +#: diff.c:3482 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" msgstr "Misslyckades tolka argument till flaggan --submodule: \"%s\"" -#: gpg-interface.c:59 +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "kunde inte köra gpg." @@ -356,6 +356,16 @@ msgstr "gpg godtog inte data" msgid "gpg failed to sign the data" msgstr "gpg misslyckades signera data" +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "kunde inte skapa temporära filen \"%s\": %s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "misslyckades skriva fristående signatur till \"%s\": %s" + #: grep.c:1622 #, c-format msgid "'%s': unable to read %s" @@ -380,7 +390,11 @@ msgstr "git-kommandon tillgängliga i \"%s\"" msgid "git commands available from elsewhere on your $PATH" msgstr "git-kommandon från andra platser i din $PATH" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "De mest använda git-kommandona är:" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -389,11 +403,11 @@ msgstr "" "\"%s\" verkar vara ett git-kommando, men vi kan inte\n" "köra det. Kanske git-%s är trasigt?" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "Oj då. Ditt system rapporterar inga Git-kommandon alls." -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -402,17 +416,17 @@ msgstr "" "VARNING: Du anropade ett Git-kommando vid namn \"%s\", som inte finns.\n" "Fortsätter under förutsättningen att du menade \"%s\"" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "automatiskt om %0.1f sekunder..." -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: \"%s\" är inte ett git-kommando. Se \"git --help\"." -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -614,7 +628,7 @@ msgstr "Hoppade över %s (sammanslagen samma som befintlig)" msgid "Auto-merging %s" msgstr "Slår ihop %s automatiskt" -#: merge-recursive.c:1633 git-submodule.sh:893 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "undermodul" @@ -689,39 +703,53 @@ msgstr "Kunde inte tolka objektet \"%s\"" msgid "Unable to write index." msgstr "Kunde inte skriva indexet." -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "användning: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " eller: %s" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-TAL" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "\"%s\" är på andra sidan av en symbolisk länk" + +#: remote.c:1653 #, c-format msgid "Your branch is ahead of '%s' by %d commit.\n" msgid_plural "Your branch is ahead of '%s' by %d commits.\n" msgstr[0] "Din gren ligger före \"%s\" med %d incheckning.\n" msgstr[1] "Din gren ligger före \"%s\" med %d incheckningar.\n" -#: remote.c:1637 +#: remote.c:1659 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (använd \"git push\" för att publicera dina lokala incheckningar)\n" -#: remote.c:1640 +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -731,11 +759,11 @@ msgstr[0] "" msgstr[1] "" "Din gren ligger efter \"%s\" med %d incheckningar, och kan snabbspolas.\n" -#: remote.c:1647 +#: remote.c:1670 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (använd \"git pull\" för att uppdatera din lokala gren)\n" -#: remote.c:1650 +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -750,7 +778,7 @@ msgstr[1] "" "Din gren och \"%s\" har divergerat,\n" "och har %d respektive %d olika incheckningar.\n" -#: remote.c:1659 +#: remote.c:1683 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr " (använd \"git pull\" för att slå ihop fjärrgrenen med din egen)\n" @@ -784,7 +812,7 @@ msgstr "" "med \"git add <sökvägar>\" eller \"git rm <sökvägar>\"\n" "och checka in resultatet med \"git commit\"" -#: sequencer.c:162 sequencer.c:770 sequencer.c:853 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "Kunde inte skriva till %s" @@ -807,191 +835,187 @@ msgid "Commit your changes or stash them to proceed." msgstr "Checka in dina ändringar eller använd \"stash\" för att fortsätta." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:235 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s: Kunde inte skriva ny indexfil" -#: sequencer.c:266 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "Kunde inte bestämma HEAD:s incheckning\n" -#: sequencer.c:287 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "Kan inte uppdatera cacheträd\n" -#: sequencer.c:332 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "Kunde inte tolka incheckningen %s\n" -#: sequencer.c:337 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "Kunde inte tolka föräldraincheckningen %s\n" -#: sequencer.c:403 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "Din indexfil har inte slagits ihop." -#: sequencer.c:406 -msgid "You do not have a valid HEAD" -msgstr "Du har ingen giltig HEAD" - -#: sequencer.c:421 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "Incheckning %s är en sammanslagning, men flaggan -m angavs inte." -#: sequencer.c:429 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "Incheckning %s har inte förälder %d" -#: sequencer.c:433 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "Huvudlinje angavs, men incheckningen %s är inte en sammanslagning" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:444 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s: kan inte tolka föräldraincheckningen %s" -#: sequencer.c:448 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "Kan inte hämta incheckningsmeddelande för %s" -#: sequencer.c:532 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "kunde inte ångra %s... %s" -#: sequencer.c:533 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "kunde inte tillämpa %s... %s" -#: sequencer.c:565 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "den angivna uppsättningen incheckningar är tom" -#: sequencer.c:573 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s: misslyckades läsa indexet" -#: sequencer.c:578 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s: misslyckades uppdatera indexet" -#: sequencer.c:636 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "kan inte %s under en %s" -#: sequencer.c:658 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "Kan inte tolka rad %d." -#: sequencer.c:663 +#: sequencer.c:667 msgid "No commits parsed." msgstr "Inga incheckningar lästes." -#: sequencer.c:676 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "Kunde inte öppna %s" -#: sequencer.c:680 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "kunde inte läsa %s." -#: sequencer.c:687 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Oanvändbart manus: %s" -#: sequencer.c:715 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "Felaktig nyckel: %s" -#: sequencer.c:718 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "Felaktigt värde för %s: %s" -#: sequencer.c:730 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "Trasigt manus: %s" -#: sequencer.c:751 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "en \"cherry-pick\" eller \"revert\" pågår redan" -#: sequencer.c:752 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "testa \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:756 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "Kunde inte skapa \"sequencer\"-katalogen \"%s\"" -#: sequencer.c:772 sequencer.c:857 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "Fel vid ombrytning av %s." -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "ingen \"cherry-pick\" eller \"revert\" pågår" -#: sequencer.c:793 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "kan inte bestämma HEAD" -#: sequencer.c:795 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "kan inte avbryta från en gren som ännu inte är född" -#: sequencer.c:817 builtin/apply.c:4005 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "kan inte öppna %s: %s" -#: sequencer.c:820 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "kan inte läsa %s: %s" -#: sequencer.c:821 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "oväntat filslut" -#: sequencer.c:827 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "sparad HEAD-fil från före \"cherry-pick\", \"%s\", är trasig" -#: sequencer.c:850 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "Kunde inte formatera %s." -#: sequencer.c:1012 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "Kan inte ångra som första incheckning" -#: sequencer.c:1013 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "Kan inte göra \"cherry-pick\" i ett tomt huvud" @@ -1019,12 +1043,17 @@ msgstr "Uppströmsgrenen \"%s\" är inte lagrad som en fjärrspårande gren" msgid "unable to access '%s': %s" msgstr "kan inte komma åt \"%s\": %s" -#: wrapper.c:426 +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "kan inte komma åt \"%s\"" + +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" msgstr "kan inte slå upp aktuell användare i passwd-filen: %s" -#: wrapper.c:427 +#: wrapper.c:435 msgid "no such user" msgstr "okänd användare" @@ -1178,148 +1207,173 @@ msgstr "osammansl.: %s" msgid "bug: unhandled diff status %c" msgstr "programfel: diff-status %c ej hanterad" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "Du har ej sammanslagna sökvägar." -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " (rätta konflikter och kör \"git commit\")" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "Alla konflikter har rättats men du är fortfarande i en sammanslagning." -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " (använd \"git commit\" för att slutföra sammanslagningen)" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "Du är i mitten av en körning av \"git am\"." -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "Aktuell patch är tom." -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (rätta konflikter och kör sedan \"git am --resolved\")" -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" msgstr " (använd \"git am --skip\" för att hoppa över patchen)" -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (använd \"git am --abort\" för att återställa ursprungsgrenen)" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Du håller på att ombasera grenen \"%s\" ovanpå \"%s\"." + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "Du håller på med en ombasering." -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (rätta konflikter och kör sedan \"git rebase --continue\")" -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (använd \"git rebase --skip\" för att hoppa över patchen)" -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (använd \"git rebase --abort\" för att checka ut ursprungsgrenen)" -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " (alla konflikter rättade: kör \"git rebase --continue\")" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Du håller på att dela upp en incheckning medan du ombaserar grenen \"%s\" " +"ovanpå \"%s\"." + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "Du håller på att dela upp en incheckning i en ombasering." -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " (Så fort din arbetskatalog är ren, kör \"git rebase --continue\")" -#: wt-status.c:893 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Du håller på att redigera en incheckning medan du ombaserar grenen \"%s\" " +"ovanpå \"%s\"." + +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "Du håller på att redigera en incheckning under en ombasering." -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (använd \"git commit --amend\" för att lägga till på aktuell incheckning)" -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " (använd \"git rebase --continue\" när du är nöjd med dina ändringar)" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "Du håller på med en \"cherry-pick\"." -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (alla konflikter har rättats: kör \"git commit\")" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "Du håller på med en \"bisect\" på grenen \"%s\"." + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "Du håller på med en \"bisect\"." -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr "" " (använd \"git bisect reset\" för att komma tillbaka till ursprungsgrenen)" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "På grenen " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "Inte på någon gren för närvarande." -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "Första incheckning" -#: wt-status.c:1011 +#: wt-status.c:1097 msgid "Untracked files" msgstr "Ospårade filer" -#: wt-status.c:1013 +#: wt-status.c:1099 msgid "Ignored files" msgstr "Ignorerade filer" # %s är nästa sträng eller tom. -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "Ospårade filer visas ej%s" -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr " (använd flaggan -u för att visa ospårade filer)" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "Inga ändringar" -#: wt-status.c:1028 +#: wt-status.c:1114 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "inga ändringar att checka in (använd \"git add\" och/eller \"git commit -a" "\")\n" -#: wt-status.c:1031 +#: wt-status.c:1117 #, c-format msgid "no changes added to commit\n" msgstr "inga ändringar att checka in\n" -#: wt-status.c:1034 +#: wt-status.c:1120 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1328,48 +1382,48 @@ msgstr "" "inget köat för incheckning, men ospårade filer finns (spåra med \"git add" "\")\n" -#: wt-status.c:1037 +#: wt-status.c:1123 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "inget köat för incheckning, men ospårade filer finns\n" -#: wt-status.c:1040 +#: wt-status.c:1126 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "inget att checka in (skapa/kopiera filer och spåra med \"git add\")\n" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1129 wt-status.c:1134 #, c-format msgid "nothing to commit\n" msgstr "inget att checka in\n" -#: wt-status.c:1046 +#: wt-status.c:1132 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "inget att checka in (använd -u för att visa ospårade filer)\n" -#: wt-status.c:1050 +#: wt-status.c:1136 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "inget att checka in, arbetskatalogen ren\n" -#: wt-status.c:1158 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD (ingen gren)" -#: wt-status.c:1164 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "Första incheckning på " -#: wt-status.c:1179 +#: wt-status.c:1265 msgid "behind " msgstr "efter " -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "före " -#: wt-status.c:1187 +#: wt-status.c:1273 msgid ", behind " msgstr ", efter " @@ -1378,144 +1432,178 @@ msgstr ", efter " msgid "failed to unlink '%s'" msgstr "misslyckades ta bort länken \"%s\"" -#: builtin/add.c:19 -msgid "git add [options] [--] <filepattern>..." -msgstr "git add [flaggor] [--] <filmönster>..." +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [flaggor] [--] <sökväg>..." -#: builtin/add.c:62 +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "diff-status %c förväntades inte" -#: builtin/add.c:67 builtin/commit.c:231 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "misslyckades uppdatera filer" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "ta bort \"%s\"\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "Sökvägen \"%s\" är i undermodulen \"%.*s\"" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "Ospårade ändringar efter att ha uppdaterat indexet:" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:275 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "sökvägsangivelsen \"%s\" motsvarade inte några filer" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "\"%s\" är på andra sidan av en symbolisk länk" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "Kunde inte läsa indexet" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "Kunde inte öppna \"%s\" för skrivning" -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Kunde inte skriva patch" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "Kunde inte ta status på \"%s\"" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "Tom patch. Avbryter." -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Kunde inte tillämpa \"%s\"" -#: builtin/add.c:313 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "Följande sökvägar ignoreras av en av dina .gitignore-filer:\n" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "testkörning" -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483 -#: builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "var pratsam" -#: builtin/add.c:322 +#: builtin/add.c:280 msgid "interactive picking" msgstr "plocka interaktivt" -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 msgid "select hunks interactively" msgstr "välj stycken interaktivt" -#: builtin/add.c:324 +#: builtin/add.c:282 msgid "edit current diff and apply" msgstr "redigera aktuell diff och applicera" -#: builtin/add.c:325 +#: builtin/add.c:283 msgid "allow adding otherwise ignored files" msgstr "tillåt lägga till annars ignorerade filer" -#: builtin/add.c:326 +#: builtin/add.c:284 msgid "update tracked files" msgstr "uppdatera spårade filer" -#: builtin/add.c:327 +#: builtin/add.c:285 msgid "record only the fact that the path will be added later" msgstr "registrera endast att sökvägen kommer läggas till senare" -#: builtin/add.c:328 +#: builtin/add.c:286 msgid "add changes from all tracked and untracked files" msgstr "lägg till ändringar från alla spårade och ospårade filer" -#: builtin/add.c:329 +#: builtin/add.c:287 msgid "don't add, only refresh the index" msgstr "lägg inte till, uppdatera endast indexet" -#: builtin/add.c:330 +#: builtin/add.c:288 msgid "just skip files which cannot be added because of errors" msgstr "hoppa bara över filer som inte kan läggas till på grund av fel" -#: builtin/add.c:331 +#: builtin/add.c:289 msgid "check if - even missing - files are ignored in dry run" msgstr "se om - även saknade - filer ignoreras i testkörning" -#: builtin/add.c:353 +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "Använd -f om du verkligen vill lägga till dem.\n" -#: builtin/add.c:354 +#: builtin/add.c:312 msgid "no files added" msgstr "inga filer har lagts till" -#: builtin/add.c:360 +#: builtin/add.c:318 msgid "adding files failed" msgstr "misslyckades lägga till filer" -#: builtin/add.c:392 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"Beteendet för \"git add %s (eller %s)\" utan sökvägsargument från en\n" +"underkatalog i ett träd kommer ändras i Git 2.0 och bör inte längre " +"användas.\n" +"För att lägga till innehållet för hela trädet, använd:\n" +"\n" +" git add %s :/\n" +" (eller git add %s :/)\n" +"\n" +"För att begränsa kommandot till aktuell katalog, använd:\n" +"\n" +" git add %s .\n" +" (eller git add %s .)\n" +"\n" +"I nuvarande version av Git begränsas kommandot till aktuell katalog." + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "-A och -u är ömsesidigt inkompatibla" -#: builtin/add.c:394 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Flaggan --ignore-missing kan endast användas tillsammans med --dry-run" @@ -1529,12 +1617,12 @@ msgstr "Inget angivet, inget tillagt.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Kanske menade du att skriva \"git add .\"?\n" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82 -#: builtin/rm.c:235 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "indexfilen trasig" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "Kunde inte skriva ny indexfil" @@ -1587,17 +1675,17 @@ msgstr "git apply: dålig git-diff - motsägande gammalt filnamn på rad %d" msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply: dålig git-diff - förväntade /dev/null på rad %d" -#: builtin/apply.c:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount: förväntade rad: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "patch-fragment utan huvud på rad %d: %.*s" -#: builtin/apply.c:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1613,82 +1701,78 @@ msgstr[1] "" "sökvägskomponenter\n" "tas bort (rad %d)" -#: builtin/apply.c:1654 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "ny fil beror på gammalt innehåll" -#: builtin/apply.c:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "borttagen fil har fortfarande innehåll" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "trasig patch på rad %d" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "nya filen %s beror på gammalt innehåll" -#: builtin/apply.c:1720 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "borttagna filen %s har fortfarande innehåll" -#: builtin/apply.c:1723 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** varning: filen %s blir tom men har inte tagits bort" -#: builtin/apply.c:1869 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "trasig binärpatch på rad %d: %.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1898 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "binärpatchen på rad %d känns inte igen" -#: builtin/apply.c:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "patch med bara skräp på rad %d" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "kunde inte läsa symboliska länken %s" -#: builtin/apply.c:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "kunde inte öppna eller läsa %s" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "hoppsan" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "felaktig inledning på rad: \"%c\"" -#: builtin/apply.c:2789 +#: builtin/apply.c:2802 #, c-format msgid "Hunk #%d succeeded at %d (offset %d line)." msgid_plural "Hunk #%d succeeded at %d (offset %d lines)." msgstr[0] "Stycke %d lyckades på %d (offset %d rad)." msgstr[1] "Stycke %d lyckades på %d (offset %d rader)." -#: builtin/apply.c:2801 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Sammanhang reducerat till (%ld/%ld) för att tillämpa fragment vid %d" -#: builtin/apply.c:2807 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1697,318 +1781,318 @@ msgstr "" "vid sökning efter:\n" "%.*s" -#: builtin/apply.c:2826 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "saknar binära patchdata för \"%s\"" -#: builtin/apply.c:2929 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "binärpatchen kan inte tillämpas på \"%s\"" -#: builtin/apply.c:2935 +#: builtin/apply.c:2948 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "binärpatchen på \"%s\" ger felaktigt resultat (förväntade %s, fick %s)" -#: builtin/apply.c:2956 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "patch misslyckades: %s:%ld" -#: builtin/apply.c:3078 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "kan inte checka ut %s" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "misslyckades läsa %s" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "sökvägen %s har ändrat namn/tagits bort" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "%s: finns inte i indexet" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s: motsvarar inte indexet" -#: builtin/apply.c:3348 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "patch för borttagning lämnar kvar filinnehåll" -#: builtin/apply.c:3417 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s: fel typ" -#: builtin/apply.c:3419 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "%s har typen %o, förväntade %o" -#: builtin/apply.c:3520 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s: finns redan i indexet" -#: builtin/apply.c:3523 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "%s: finns redan i arbetskatalogen" -#: builtin/apply.c:3543 +#: builtin/apply.c:3556 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o)" -#: builtin/apply.c:3548 +#: builtin/apply.c:3561 #, c-format msgid "new mode (%o) of %s does not match old mode (%o) of %s" msgstr "nytt läge (%o) för %s motsvarar inte gammalt läge (%o) för %s" -#: builtin/apply.c:3556 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s: patchen kan inte tillämpas" -#: builtin/apply.c:3569 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "Kontrollerar patchen %s..." -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "make_cache_entry misslyckades för sökvägen \"%s\"" -#: builtin/apply.c:3767 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "kan inte ta bort %s från indexet" -#: builtin/apply.c:3795 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "trasig patch för underprojektet %s" -#: builtin/apply.c:3799 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "kan inte ta status på nyligen skapade filen \"%s\"" -#: builtin/apply.c:3804 +#: builtin/apply.c:3855 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "kan inte skapa säkerhetsminne för nyligen skapade filen %s" -#: builtin/apply.c:3807 builtin/apply.c:3915 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, c-format msgid "unable to add cache entry for %s" msgstr "kan inte lägga till cachepost för %s" -#: builtin/apply.c:3840 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "stänger filen \"%s\"" -#: builtin/apply.c:3889 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "kan inte skriva filen \"%s\" läge %o" -#: builtin/apply.c:3976 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "Tillämpade patchen %s rent." -#: builtin/apply.c:3984 +#: builtin/apply.c:4035 msgid "internal error" msgstr "internt fel" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4038 #, c-format msgid "Applying patch %%s with %d reject..." msgid_plural "Applying patch %%s with %d rejects..." msgstr[0] "Tillämpade patchen %%s med %d refuserad..." msgstr[1] "Tillämpade patchen %%s med %d refuserade..." -#: builtin/apply.c:3997 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "trunkerar .rej-filnamnet till %.*s.rej" -#: builtin/apply.c:4018 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Stycke %d tillämpades rent." -#: builtin/apply.c:4021 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "Refuserar stycke %d." -#: builtin/apply.c:4171 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "indata känns inte igen" -#: builtin/apply.c:4182 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "kan inte läsa indexfilen" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "sökväg" -#: builtin/apply.c:4302 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "tillämpa inte ändringar som motsvarar given sökväg" -#: builtin/apply.c:4305 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "tillämpa ändringar som motsvarar given sökväg" -#: builtin/apply.c:4307 +#: builtin/apply.c:4358 msgid "num" msgstr "antal" -#: builtin/apply.c:4308 +#: builtin/apply.c:4359 msgid "remove <num> leading slashes from traditional diff paths" msgstr "ta bort <antal> inledande snedstreck från traditionella diff-sökvägar" -#: builtin/apply.c:4311 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "ignorera tillägg gjorda av patchen" -#: builtin/apply.c:4313 +#: builtin/apply.c:4364 msgid "instead of applying the patch, output diffstat for the input" msgstr "istället för att tillämpa patchen, skriv ut diffstat för indata" -#: builtin/apply.c:4317 +#: builtin/apply.c:4368 msgid "show number of added and deleted lines in decimal notation" msgstr "visa antal tillagda och borttagna rader decimalt" -#: builtin/apply.c:4319 +#: builtin/apply.c:4370 msgid "instead of applying the patch, output a summary for the input" msgstr "istället för att tillämpa patchen, skriv ut en summering av indata" -#: builtin/apply.c:4321 +#: builtin/apply.c:4372 msgid "instead of applying the patch, see if the patch is applicable" msgstr "istället för att tillämpa patchen, se om patchen kan tillämpas" -#: builtin/apply.c:4323 +#: builtin/apply.c:4374 msgid "make sure the patch is applicable to the current index" msgstr "se till att patchen kan tillämpas på aktuellt index" -#: builtin/apply.c:4325 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "tillämpa en patch utan att röra arbetskatalogen" -#: builtin/apply.c:4327 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "tillämpa också patchen (använd med --stat/--summary/--check)" -#: builtin/apply.c:4329 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "försök en trevägssammanslagning om patchen inte kan tillämpas" -#: builtin/apply.c:4331 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "bygg ett temporärt index baserat på inbyggd indexinformation" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "sökvägar avdelas med NUL-tecken" -#: builtin/apply.c:4336 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "se till att åtminstone <n> rader sammanhang är lika" -#: builtin/apply.c:4337 +#: builtin/apply.c:4388 msgid "action" msgstr "åtgärd" -#: builtin/apply.c:4338 +#: builtin/apply.c:4389 msgid "detect new or modified lines that have whitespace errors" msgstr "detektera nya eller ändrade rader som har fel i blanktecken" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "ignorera ändringar i blanktecken för sammanhang" -#: builtin/apply.c:4347 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "tillämpa patchen baklänges" -#: builtin/apply.c:4349 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "förvänta inte minst en rad sammanhang" -#: builtin/apply.c:4351 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "lämna refuserade stycken i motsvarande *.rej-filer" -#: builtin/apply.c:4353 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "tillåt överlappande stycken" -#: builtin/apply.c:4356 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "tolerera felaktigt detekterade saknade nyradstecken vid filslut" -#: builtin/apply.c:4359 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "lite inte på antalet linjer i styckehuvuden" -#: builtin/apply.c:4361 +#: builtin/apply.c:4412 msgid "root" msgstr "rot" -#: builtin/apply.c:4362 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "lägg till <rot> i alla filnamn" -#: builtin/apply.c:4384 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "--3way utanför arkiv" -#: builtin/apply.c:4392 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "--index utanför arkiv" -#: builtin/apply.c:4395 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "--cached utanför arkiv" -#: builtin/apply.c:4411 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "kan inte öppna patchen \"%s\"" -#: builtin/apply.c:4425 +#: builtin/apply.c:4476 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "undertryckte %d fel i blanksteg" msgstr[1] "undertryckte %d fel i blanksteg" -#: builtin/apply.c:4431 builtin/apply.c:4441 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2070,95 +2154,95 @@ msgstr "git blame [flaggor] [rev-flaggor] [rev] [--] fil" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-flaggor] dokumenteras i git-rev-list(1)" -#: builtin/blame.c:2374 +#: builtin/blame.c:2350 msgid "Show blame entries as we find them, incrementally" msgstr "Visa klandringsposter när vi hittar dem, interaktivt" -#: builtin/blame.c:2375 +#: builtin/blame.c:2351 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "Visa blank SHA-1 för gränsincheckningar (Standard: av)" -#: builtin/blame.c:2376 +#: builtin/blame.c:2352 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Behandla inte rotincheckningar som gränser (Standard: av)" -#: builtin/blame.c:2377 +#: builtin/blame.c:2353 msgid "Show work cost statistics" msgstr "Visa statistik över arbetskostnad" -#: builtin/blame.c:2378 +#: builtin/blame.c:2354 msgid "Show output score for blame entries" msgstr "Visa utdatapoäng för klandringsposter" -#: builtin/blame.c:2379 +#: builtin/blame.c:2355 msgid "Show original filename (Default: auto)" msgstr "Visa originalfilnamn (Standard: auto)" -#: builtin/blame.c:2380 +#: builtin/blame.c:2356 msgid "Show original linenumber (Default: off)" msgstr "Visa ursprungligt radnummer (Standard: av)" -#: builtin/blame.c:2381 +#: builtin/blame.c:2357 msgid "Show in a format designed for machine consumption" msgstr "Visa i ett format avsett för maskinkonsumtion" -#: builtin/blame.c:2382 +#: builtin/blame.c:2358 msgid "Show porcelain format with per-line commit information" msgstr "Visa porslinsformat med per-rad-incheckningsinformation" -#: builtin/blame.c:2383 +#: builtin/blame.c:2359 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Använd samma utdataläge som git-annotate (Standard: av)" -#: builtin/blame.c:2384 +#: builtin/blame.c:2360 msgid "Show raw timestamp (Default: off)" msgstr "Visa rå tidsstämpel (Standard: av)" -#: builtin/blame.c:2385 +#: builtin/blame.c:2361 msgid "Show long commit SHA1 (Default: off)" msgstr "Visa lång inchecknings-SHA1 (Standard: av)" -#: builtin/blame.c:2386 +#: builtin/blame.c:2362 msgid "Suppress author name and timestamp (Default: off)" msgstr "Undertryck författarnamn och tidsstämpel (Standard: av)" -#: builtin/blame.c:2387 +#: builtin/blame.c:2363 msgid "Show author email instead of name (Default: off)" msgstr "Visa författarens e-post istället för namn (Standard: av)" -#: builtin/blame.c:2388 +#: builtin/blame.c:2364 msgid "Ignore whitespace differences" msgstr "Ignorera ändringar i blanksteg" -#: builtin/blame.c:2389 +#: builtin/blame.c:2365 msgid "Spend extra cycles to find better match" msgstr "Slösa extra cykler med att hitta bättre träff" -#: builtin/blame.c:2390 +#: builtin/blame.c:2366 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "Använd revisioner från <fil> istället för att anropa git-rev-list" -#: builtin/blame.c:2391 +#: builtin/blame.c:2367 msgid "Use <file>'s contents as the final image" msgstr "Använd <fil>s innehåll som slutgiltig bild" -#: builtin/blame.c:2392 builtin/blame.c:2393 +#: builtin/blame.c:2368 builtin/blame.c:2369 msgid "score" msgstr "poäng" -#: builtin/blame.c:2392 +#: builtin/blame.c:2368 msgid "Find line copies within and across files" msgstr "Hitta kopierade rader inuti och mellan filer" -#: builtin/blame.c:2393 +#: builtin/blame.c:2369 msgid "Find line movements within and across files" msgstr "Hitta flyttade rader inuti och mellan filer" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "Process only line range n,m, counting from 1" msgstr "Behandla endast radintervallet n,m, med början på 1" @@ -2292,10 +2376,19 @@ msgstr "[%s: före %d, bakom %d] " msgid "[ahead %d, behind %d]" msgstr "[före %d, bakom %d] " +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** ogiltig ref ****" + #: builtin/branch.c:560 msgid "(no branch)" msgstr "(ingen gren)" +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "objektet \"%s\" pekar på en incheckning" + #: builtin/branch.c:625 msgid "some refs could not be read" msgstr "vissa referenser kunde inte läsas" @@ -2367,8 +2460,8 @@ msgid "act on remote-tracking branches" msgstr "arbeta på fjärrspårande grenar" #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 -#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377 -#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 msgid "commit" msgstr "incheckning" @@ -2436,27 +2529,53 @@ msgstr "Misslyckades slå upp HEAD som giltig referens" msgid "HEAD not found below refs/heads!" msgstr "HEAD hittades inte under refs/heads!" -#: builtin/branch.c:836 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "--column och --verbose är inkompatibla" -#: builtin/branch.c:887 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "grennamn krävs" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "Kan inte beskriva frånkopplad HEAD" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "kan inte redigera beskrivning för mer än en gren" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Inga incheckningar på grenen \"%s\" ännu" + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "Ingen gren vid namnet \"%s\"." + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "för många grenar för namnbyte" + +#: builtin/branch.c:893 #, c-format msgid "branch '%s' does not exist" msgstr "grenen \"%s\" finns inte" -#: builtin/branch.c:899 +#: builtin/branch.c:905 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Grenen \"%s\" har ingen uppströmsinformation" -#: builtin/branch.c:914 +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "flaggorna -a och -r på \"git branch\" kan inte anges tillsammans med ett " "grennamn" -#: builtin/branch.c:917 +#: builtin/branch.c:923 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -2465,7 +2584,7 @@ msgstr "" "Flaggan --set-upstream rekommenderas ej och kommer tas bort. Använd --track " "eller --set-upstream-to\n" -#: builtin/branch.c:934 +#: builtin/branch.c:940 #, c-format msgid "" "\n" @@ -2476,12 +2595,12 @@ msgstr "" "Om du vill göra så att \"%s\" spårar \"%s\" gör du så här:\n" "\n" -#: builtin/branch.c:935 +#: builtin/branch.c:941 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:936 +#: builtin/branch.c:942 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -2555,14 +2674,38 @@ msgstr "visa alla attribut som satts på filen" msgid "use .gitattributes only from the index" msgstr "använd .gitattributes endast från indexet" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "läs filnamn från standard in" -#: builtin/check-attr.c:23 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "sökvägar avdelas med null-tecken" +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "undertryck förloppsrapportering" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "kan inte ange sökvägsnamn med --stdin" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "-z kan endast användas tillsammans med --stdin" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "ingen sökväg angavs" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "--quiet kan endast användas med ett enkelt sökvägsnamn" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "kan inte använda både --quiet och --verbose" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [flaggor] [--] [<fil>...]" @@ -2796,10 +2939,6 @@ msgstr "\"%s\" kan inte användas med \"%s\"" msgid "Cannot switch branch to a non-commit '%s'" msgstr "Kan inte växla gren till icke-incheckningen \"%s\"" -#: builtin/checkout.c:1012 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "undertryck förloppsrapportering" - #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" @@ -2853,7 +2992,7 @@ msgstr "utför en 3-vägssammanslagning för den nya grenen" msgid "update ignored files (default)" msgstr "uppdatera ignorerade filer (standard)" -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 msgid "style" msgstr "stil" @@ -2903,52 +3042,77 @@ msgstr "" "git checkout: --ours/--theirs, --force och --merge är inkompatibla när\n" "du checkar ut från indexet." -#: builtin/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "" "git clean [-d] [-f] [-n] [-q] [-e <mönster>] [-x | -X] [--] <sökvägar>..." -#: builtin/clean.c:51 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Tar bort %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Skulle ta bort %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Hoppar över arkivet %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Skulle hoppa över arkivet %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "misslyckades ta bort %s" + +#: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "skriv inte ut namn på borttagna filer" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" msgstr "tvinga" -#: builtin/clean.c:55 +#: builtin/clean.c:164 msgid "remove whole directories" msgstr "ta bort hela kataloger" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "mönster" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "lägg till <mönster> till ignoreringsregler" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "ta även bort ignorerade filer" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" msgstr "ta endast bort ignorerade filer" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x och -X kan inte användas samtidigt" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce satt till true, men varken -n eller -f angavs; vägrar " "städa" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -2956,37 +3120,12 @@ msgstr "" "clean.requireForce har standardvärdet true, men varken -n eller -f angavs; " "vägrar städa" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "Skulle ta bort %s\n" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "Tar bort %s\n" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "misslyckades ta bort %s" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "Skulle inte ta bort %s\n" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "Tar inte bort %s\n" - #: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [flaggor] [--] <arkiv> [<kat>]" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/push.c:436 msgid "force progress reporting" msgstr "tvinga förloppsrapportering" @@ -3137,56 +3276,60 @@ msgstr "Du måste ange ett arkiv att klona." msgid "--bare and --origin %s options are incompatible." msgstr "flaggorna --bare och --origin %s är inkompatibla." -#: builtin/clone.c:719 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "flaggorna --bare och --separate-git-dir är inkompatibla." + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "arkivet \"%s\" finns inte" -#: builtin/clone.c:724 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth ignoreras i lokala kloningar; använd file:// istället" -#: builtin/clone.c:734 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "destinationssökvägen \"%s\" finns redan och är inte en tom katalog." -#: builtin/clone.c:744 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "arbetsträdet \"%s\" finns redan." -#: builtin/clone.c:757 builtin/clone.c:771 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "kunde inte skapa inledande kataloger för \"%s\"" -#: builtin/clone.c:760 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "kunde inte skapa arbetskatalogen \"%s\"" -#: builtin/clone.c:779 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "Klonar till ett naket arkiv \"%s\"...\n" -#: builtin/clone.c:781 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "Klonar till \"%s\"...\n" -#: builtin/clone.c:823 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "Vet inte hur man klonar %s" -#: builtin/clone.c:872 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Fjärrgrenen %s hittades inte i uppströmsarkivet %s" -#: builtin/clone.c:879 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "Du verkar ha klonat ett tomt arkiv." @@ -3223,12 +3366,12 @@ msgid "--command must be the first argument" msgstr "--command måste vara första argument" #: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." -msgstr "git commit [flaggor] [--] <filmöster>..." +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [flaggor] [--] <sökväg>..." #: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." -msgstr "git status [flaggor] [--] <filmönster>..." +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [flaggor] [--] <sökväg>..." #: builtin/commit.c:44 msgid "" @@ -3332,7 +3475,7 @@ msgstr "Felaktig indragningssträng: \"%s\"" msgid "could not lookup commit %s" msgstr "kunde inte slå upp incheckningen %s" -#: builtin/commit.c:610 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "(läser loggmeddelande från standard in)\n" @@ -3398,21 +3541,24 @@ msgstr "" "och försöker igen.\n" #: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"#\" kommer ignoreras, och ett tomt meddelande avbryter incheckningen.\n" +"med \"%c\" kommer ignoreras, och ett tomt meddelande avbryter " +"incheckningen.\n" #: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" "Ange incheckningsmeddelandet för dina ändringar. Rader som inleds\n" -"med \"#\" kommer behållas; du kan själv ta bort dem om du vill.\n" +"med \"%c\" kommer behållas; du kan själv ta bort dem om du vill.\n" "Ett tomt meddelande avbryter incheckningen.\n" #: builtin/commit.c:753 @@ -3433,7 +3579,7 @@ msgstr "Kan inte läsa indexet" msgid "Error building trees" msgstr "Fel vid byggande av träd" -#: builtin/commit.c:832 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" @@ -3443,111 +3589,111 @@ msgstr "Ange meddelandet en av flaggorna -m eller -F.\n" msgid "No existing author found with '%s'" msgstr "Hittade ingen befintlig författare med \"%s\"" -#: builtin/commit.c:944 builtin/commit.c:1148 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "Ogiltigt läge för ospårade filer: \"%s\"" -#: builtin/commit.c:984 +#: builtin/commit.c:974 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:995 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "Du har inget att utöka." -#: builtin/commit.c:998 +#: builtin/commit.c:988 msgid "You are in the middle of a merge -- cannot amend." msgstr "Du är i mitten av en sammanslagning -- kan inte utöka." -#: builtin/commit.c:1000 +#: builtin/commit.c:990 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "Du är i mitten av en cherry-pick -- kan inte utöka." -#: builtin/commit.c:1003 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "Flaggorna --squash och --fixup kan inte användas samtidigt" -#: builtin/commit.c:1013 +#: builtin/commit.c:1003 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:1015 +#: builtin/commit.c:1005 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:1023 +#: builtin/commit.c:1013 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:1040 +#: builtin/commit.c:1030 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:1042 +#: builtin/commit.c:1032 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:1044 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "Smart... utöka den senaste med smutsigt index." -#: builtin/commit.c:1046 +#: builtin/commit.c:1036 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:1056 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Felaktigt städningsläge %s" -#: builtin/commit.c:1061 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." msgstr "Kan inte ange sökvägar med -a." -#: builtin/commit.c:1067 builtin/commit.c:1202 +#: builtin/commit.c:1057 builtin/commit.c:1192 msgid "--long and -z are incompatible" msgstr "--long och -z är inkompatibla" -#: builtin/commit.c:1162 builtin/commit.c:1398 +#: builtin/commit.c:1152 builtin/commit.c:1388 msgid "show status concisely" msgstr "vis koncis status" -#: builtin/commit.c:1164 builtin/commit.c:1400 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show branch information" msgstr "visa information om gren" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 msgid "machine-readable output" msgstr "maskinläsbar utdata" -#: builtin/commit.c:1169 builtin/commit.c:1404 +#: builtin/commit.c:1159 builtin/commit.c:1394 msgid "show status in long format (default)" msgstr "visa status i långt format (standard)" -#: builtin/commit.c:1172 builtin/commit.c:1407 +#: builtin/commit.c:1162 builtin/commit.c:1397 msgid "terminate entries with NUL" msgstr "terminera poster med NUL" -#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 msgid "mode" msgstr "läge" -#: builtin/commit.c:1175 builtin/commit.c:1410 +#: builtin/commit.c:1165 builtin/commit.c:1400 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "visa ospårade filer, valfria lägen: alla, normal, no. (Standard: all)" -#: builtin/commit.c:1178 +#: builtin/commit.c:1168 msgid "show ignored files" msgstr "visa ignorerade filer" -#: builtin/commit.c:1179 parse-options.h:151 +#: builtin/commit.c:1169 parse-options.h:151 msgid "when" msgstr "när" -#: builtin/commit.c:1180 +#: builtin/commit.c:1170 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -3555,217 +3701,217 @@ msgstr "" "ignorera ändringar i undermoduler, valfritt när: all, dirty, untracked. " "(Default: all)" -#: builtin/commit.c:1182 +#: builtin/commit.c:1172 msgid "list untracked files in columns" msgstr "visa ospårade filer i spalter" -#: builtin/commit.c:1256 +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "kunde inte slå upp en precis skapad incheckning" -#: builtin/commit.c:1258 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "kunde inte tolka en precis skapad incheckning" -#: builtin/commit.c:1299 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "frånkopplad HEAD" -#: builtin/commit.c:1301 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr " (rotincheckning)" -#: builtin/commit.c:1368 +#: builtin/commit.c:1358 msgid "suppress summary after successful commit" msgstr "undertryck sammanfattning efter framgångsrik incheckning" -#: builtin/commit.c:1369 +#: builtin/commit.c:1359 msgid "show diff in commit message template" msgstr "visa diff i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1371 +#: builtin/commit.c:1361 msgid "Commit message options" msgstr "Alternativ för incheckningsmeddelande" -#: builtin/commit.c:1372 builtin/tag.c:459 +#: builtin/commit.c:1362 builtin/tag.c:457 msgid "read message from file" msgstr "läs meddelande från fil" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "author" msgstr "författare" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "override author for commit" msgstr "överstyr författare för incheckningen" -#: builtin/commit.c:1374 builtin/gc.c:178 +#: builtin/commit.c:1364 builtin/gc.c:178 msgid "date" msgstr "datum" -#: builtin/commit.c:1374 +#: builtin/commit.c:1364 msgid "override date for commit" msgstr "överstyr datum för inchecknignen" -#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/tag.c:457 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "meddelande" -#: builtin/commit.c:1375 +#: builtin/commit.c:1365 msgid "commit message" msgstr "incheckningsmeddelande" -#: builtin/commit.c:1376 +#: builtin/commit.c:1366 msgid "reuse and edit message from specified commit" msgstr "återanvänd och redigera meddelande från angiven incheckning" -#: builtin/commit.c:1377 +#: builtin/commit.c:1367 msgid "reuse message from specified commit" msgstr "återanvänd meddelande från angiven incheckning" -#: builtin/commit.c:1378 +#: builtin/commit.c:1368 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "använd autosquash-formaterat meddelande för att fixa angiven incheckning" -#: builtin/commit.c:1379 +#: builtin/commit.c:1369 msgid "use autosquash formatted message to squash specified commit" msgstr "" "använd autosquash-formaterat meddelande för att slå ihop med angiven " "incheckning" -#: builtin/commit.c:1380 +#: builtin/commit.c:1370 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "jag är nu författare av incheckningen (används med -C/-c/--amend)" -#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "lägg till Signed-off-by:" -#: builtin/commit.c:1382 +#: builtin/commit.c:1372 msgid "use specified template file" msgstr "använd angiven mallfil" -#: builtin/commit.c:1383 +#: builtin/commit.c:1373 msgid "force edit of commit" msgstr "tvinga redigering av incheckning" -#: builtin/commit.c:1384 +#: builtin/commit.c:1374 msgid "default" msgstr "standard" -#: builtin/commit.c:1384 builtin/tag.c:462 +#: builtin/commit.c:1374 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "hur blanksteg och #kommentarer skall tas bort från meddelande" -#: builtin/commit.c:1385 +#: builtin/commit.c:1375 msgid "include status in commit message template" msgstr "inkludera status i mallen för incheckningsmeddelandet" -#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 msgid "key id" msgstr "nyckel-id" -#: builtin/commit.c:1387 builtin/merge.c:214 +#: builtin/commit.c:1377 builtin/merge.c:214 msgid "GPG sign commit" msgstr "GPG-signera incheckning" #. end commit message options -#: builtin/commit.c:1390 +#: builtin/commit.c:1380 msgid "Commit contents options" msgstr "Alternativ för incheckningens innehåll" -#: builtin/commit.c:1391 +#: builtin/commit.c:1381 msgid "commit all changed files" msgstr "checka in alla ändrade filer" -#: builtin/commit.c:1392 +#: builtin/commit.c:1382 msgid "add specified files to index for commit" msgstr "lägg till angivna filer till indexet för incheckning" -#: builtin/commit.c:1393 +#: builtin/commit.c:1383 msgid "interactively add files" msgstr "lägg till filer interaktivt" -#: builtin/commit.c:1394 +#: builtin/commit.c:1384 msgid "interactively add changes" msgstr "lägg till ändringar interaktivt" -#: builtin/commit.c:1395 +#: builtin/commit.c:1385 msgid "commit only specified files" msgstr "checka endast in angivna filer" -#: builtin/commit.c:1396 +#: builtin/commit.c:1386 msgid "bypass pre-commit hook" msgstr "förbigå pre-commit-krok" -#: builtin/commit.c:1397 +#: builtin/commit.c:1387 msgid "show what would be committed" msgstr "visa vad som skulle checkas in" -#: builtin/commit.c:1408 +#: builtin/commit.c:1398 msgid "amend previous commit" msgstr "lägg till föregående incheckning" -#: builtin/commit.c:1409 +#: builtin/commit.c:1399 msgid "bypass post-rewrite hook" msgstr "förbigå post-rewrite-krok" -#: builtin/commit.c:1414 +#: builtin/commit.c:1404 msgid "ok to record an empty change" msgstr "ok att registrera en tom ändring" -#: builtin/commit.c:1417 +#: builtin/commit.c:1407 msgid "ok to record a change with an empty message" msgstr "ok att registrera en ändring med tomt meddelande" -#: builtin/commit.c:1449 +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "kunde inte tolka HEAD:s incheckning" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "kunde inte öppna \"%s\" för läsning" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Trasig MERGE_HEAD-fil (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "kunde inte läsa MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "kunde inte läsa incheckningsmeddelande: %s" -#: builtin/commit.c:1534 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "Avbryter incheckning; meddelandet inte redigerat.\n" -#: builtin/commit.c:1539 +#: builtin/commit.c:1529 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "Avbryter på grund av tomt incheckningsmeddelande.\n" -#: builtin/commit.c:1554 builtin/merge.c:832 builtin/merge.c:857 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "kunde inte skriva incheckningsobjekt" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "kunde inte låsa HEAD-referens" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "kunde inte uppdatera HEAD-referens" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4070,39 +4216,39 @@ msgstr "ej hanterat objekt \"%s\" angavs." msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-flaggor]" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:646 msgid "show progress after <n> objects" msgstr "visa förlopp efter <n> objekt" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:648 msgid "select handling of signed tags" msgstr "välj hantering av signerade taggar" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:651 msgid "select handling of tags that tag filtered objects" msgstr "välj hantering av taggar som har taggfiltrerade objekt" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:654 msgid "Dump marks to this file" msgstr "Dump märken till filen" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:656 msgid "Import marks from this file" msgstr "Importera märken från filen" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:658 msgid "Fake a tagger when tags lack one" msgstr "Fejka taggare när taggen saknar en" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:660 msgid "Output full tree for each commit" msgstr "Skriv ut hela trädet för varje incheckning" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:662 msgid "Use the done feature to terminate the stream" msgstr "Använd done-funktionen för att avsluta strömmen" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:663 msgid "Skip output of blob data" msgstr "Hoppa över skrivning av blob-data" @@ -4174,88 +4320,92 @@ msgstr "tillåt uppdatering av HEAD-referens" msgid "deepen history of shallow clone" msgstr "fördjupa historik för grund klon" -#: builtin/fetch.c:85 builtin/log.c:1088 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "konvertera till komplett arkiv" + +#: builtin/fetch.c:88 builtin/log.c:1119 msgid "dir" msgstr "kat" -#: builtin/fetch.c:86 +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "lägg till i början av undermodulens sökvägsutdata" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "standardläge för rekursion" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "Kunde inte hitta fjärr-referensen HEAD" -#: builtin/fetch.c:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "objektet %s hittades inte" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[àjour]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, 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:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[refuserad]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[uppdaterad tagg]" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " (kunde inte uppdatera lokal ref)" -#: builtin/fetch.c:305 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[ny tagg]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[ny gren]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[ny ref]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "kunde inte uppdatera lokal ref" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 msgid "forced update" msgstr "tvingad uppdatering" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(ej snabbspolad)" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "kan inte öppna %s: %s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, 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:488 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "Från %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4264,55 +4414,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:549 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s kommer bli dinglande)" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s har blivit dinglande)" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[borttagen]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "(ingen)" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, 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:709 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "Vet inte hur man hämtar från %s" -#: builtin/fetch.c:786 +#: builtin/fetch.c:789 #, 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:789 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "Flaggan \"%s\" ignoreras för %s\n" -#: builtin/fetch.c:891 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "Hämtar %s\n" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "Kunde inte hämta %s" -#: builtin/fetch.c:912 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -4320,24 +4470,32 @@ 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:932 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "Du måste ange namnet på en tagg." -#: builtin/fetch.c:984 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth och --unshallow kan inte användas samtidigt" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow kan inte användas på ett komplett arkiv" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all tar inte namnet på ett arkiv som argument" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all kan inte anges med referensspecifikationer" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "Fjärren eller fjärrgruppen finns inte: %s" -#: builtin/fetch.c:1005 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "Kan inte hämta från grupp och ange referensspecifikationer" @@ -4346,29 +4504,29 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <meddelande>] [--log[=<n>]|--no-log] [--file <fil>]" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:660 msgid "populate log with at most <n> entries from shortlog" msgstr "fyll i loggen med som mest <n> poster från shortlog" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:663 msgid "alias for --log (deprecated)" msgstr "alias för --log (avråds)" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:666 msgid "text" msgstr "text" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:667 msgid "use <text> as start of message" msgstr "inled meddelande med <text>" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:668 msgid "file to read from" msgstr "fil att läsa från" @@ -4709,23 +4867,23 @@ msgstr "inget mönster angavs." msgid "bad object %s" msgstr "felaktigt objekt %s" -#: builtin/grep.c:866 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager fungerar endast i arbetskatalogen" -#: builtin/grep.c:889 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached och --untracked kan inte användas med --no-index." -#: builtin/grep.c:894 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index och --untracked kan inte användas med revisioner." -#: builtin/grep.c:897 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard kan inte användas för spårat innehåll." -#: builtin/grep.c:905 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "både --cached och träd angavs." @@ -4765,50 +4923,50 @@ msgstr "spara filen som den är utan filer" msgid "process file as it were from this path" msgstr "hantera filen som om den kom från sökvägen" -#: builtin/help.c:43 +#: builtin/help.c:42 msgid "print all available commands" msgstr "visa alla tillgängliga kommandon" -#: builtin/help.c:44 +#: builtin/help.c:43 msgid "show man page" msgstr "visa manualsida" -#: builtin/help.c:45 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "visa manual i webbläsare" -#: builtin/help.c:47 +#: builtin/help.c:46 msgid "show info page" msgstr "visa info-sida" -#: builtin/help.c:53 +#: builtin/help.c:52 msgid "git help [--all] [--man|--web|--info] [command]" msgstr "git help [--all] [--man|--web|--info] [kommando]" -#: builtin/help.c:65 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "okänt hjälpformat: %s" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "Misslyckades starta emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "Kunde inte tolka emacsclient-version." -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "emacsclient version \"%d\" för gammal (< 22)." -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "exec misslyckades för \"%s\": %s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -4817,7 +4975,7 @@ msgstr "" "\"%s\": sökväg för man-visare som ej stöds.\n" "Använd \"man.<verktyg>.cmd\" istället." -#: builtin/help.c:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -4826,29 +4984,25 @@ msgstr "" "\"%s\": kommando för man-visare som stöds.\n" "Använd \"man.<verktyg>.path\" istället." -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "De mest använda git-kommandona är:" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "\"%s\": okänd man-visare." -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "ingen man-visare hanterade förfrågan" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "ingen info-visare hanterade förfrågan" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "användning: %s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "\"git %s\" är ett alias för \"%s\"" @@ -5294,337 +5448,345 @@ msgstr "Kan inte komma åt aktuell arbetskatalog" msgid "Cannot access work tree '%s'" msgstr "Kan inte komma åt arbetskatalogen \"%s\"" -#: builtin/log.c:37 +#: builtin/log.c:39 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" msgstr "git log [<flaggor>] [<sedan>..<till>] [[--] <sökväg>...]\n" -#: builtin/log.c:38 +#: builtin/log.c:40 msgid " or: git show [options] <object>..." msgstr " eller: git show [flaggor] <objekt>..." -#: builtin/log.c:100 +#: builtin/log.c:102 msgid "suppress diff output" msgstr "undertryck diff-utdata" -#: builtin/log.c:101 +#: builtin/log.c:103 msgid "show source" msgstr "visa källkod" -#: builtin/log.c:102 +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "Använd e-postmappningsfil" + +#: builtin/log.c:105 msgid "decorate options" msgstr "dekoreringsflaggor" -#: builtin/log.c:189 +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "Slututdata: %d %s\n" -#: builtin/log.c:405 builtin/log.c:497 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "Kunde inte läsa objektet %s" -#: builtin/log.c:521 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "Okänd typ: %d" -#: builtin/log.c:613 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers utan värde" -#: builtin/log.c:687 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "namnet på utdatakatalogen är för långt" -#: builtin/log.c:698 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "Kan inte öppna patchfilen %s" -#: builtin/log.c:712 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "Behöver precis ett intervall." -#: builtin/log.c:720 +#: builtin/log.c:739 msgid "Not a range." msgstr "Inte ett intervall." -#: builtin/log.c:794 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "Omslagsbrevet behöver e-postformat" -#: builtin/log.c:867 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "tokigt in-reply-to: %s" -#: builtin/log.c:895 +#: builtin/log.c:913 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [flaggor] [<sedan> | <revisionsintervall>]" -#: builtin/log.c:940 +#: builtin/log.c:958 msgid "Two output directories?" msgstr "Två utdatakataloger?" -#: builtin/log.c:1068 +#: builtin/log.c:1097 msgid "use [PATCH n/m] even with a single patch" msgstr "använd [PATCH n/m] även för en ensam patch" -#: builtin/log.c:1071 +#: builtin/log.c:1100 msgid "use [PATCH] even with multiple patches" msgstr "använd [PATCH] även för flera patchar" -#: builtin/log.c:1075 +#: builtin/log.c:1104 msgid "print patches to standard out" msgstr "skriv patcharna på stnadard ut" -#: builtin/log.c:1077 +#: builtin/log.c:1106 msgid "generate a cover letter" msgstr "generera ett följebrev" -#: builtin/log.c:1079 +#: builtin/log.c:1108 msgid "use simple number sequence for output file names" msgstr "använd enkel nummersekvens för utdatafilnamn" -#: builtin/log.c:1080 +#: builtin/log.c:1109 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1081 +#: builtin/log.c:1110 msgid "use <sfx> instead of '.patch'" msgstr "använd <sfx> istället för \".patch\"" -#: builtin/log.c:1083 +#: builtin/log.c:1112 msgid "start numbering patches at <n> instead of 1" msgstr "börja numrera patchar på <n> istället för 1" -#: builtin/log.c:1085 +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "markera serien som N:te försök" + +#: builtin/log.c:1116 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Använd [<prefix>] istället för [PATCH]" -#: builtin/log.c:1088 +#: builtin/log.c:1119 msgid "store resulting files in <dir>" msgstr "spara filerna i <katalog>" -#: builtin/log.c:1091 +#: builtin/log.c:1122 msgid "don't strip/add [PATCH]" msgstr "ta inte bort eller lägg till [PATCH]" -#: builtin/log.c:1094 +#: builtin/log.c:1125 msgid "don't output binary diffs" msgstr "skriv inte binära diffar" -#: builtin/log.c:1096 +#: builtin/log.c:1127 msgid "don't include a patch matching a commit upstream" msgstr "ta inte med patchar som motsvarar en uppströmsincheckning" -#: builtin/log.c:1098 +#: builtin/log.c:1129 msgid "show patch format instead of default (patch + stat)" msgstr "visa patchformat istället för standard (patch + stat)" -#: builtin/log.c:1100 +#: builtin/log.c:1131 msgid "Messaging" msgstr "E-post" -#: builtin/log.c:1101 +#: builtin/log.c:1132 msgid "header" msgstr "huvud" -#: builtin/log.c:1102 +#: builtin/log.c:1133 msgid "add email header" msgstr "lägg till e-posthuvud" -#: builtin/log.c:1103 builtin/log.c:1105 +#: builtin/log.c:1134 builtin/log.c:1136 msgid "email" msgstr "epost" -#: builtin/log.c:1103 +#: builtin/log.c:1134 msgid "add To: header" msgstr "Lägg till mottagarhuvud (\"To:\")" -#: builtin/log.c:1105 +#: builtin/log.c:1136 msgid "add Cc: header" msgstr "Lägg till kopiehuvud (\"Cc:\")" -#: builtin/log.c:1107 +#: builtin/log.c:1138 msgid "message-id" msgstr "meddelande-id" -#: builtin/log.c:1108 +#: builtin/log.c:1139 msgid "make first mail a reply to <message-id>" msgstr "Gör det första brevet ett svar till <meddelande-id>" -#: builtin/log.c:1109 builtin/log.c:1112 +#: builtin/log.c:1140 builtin/log.c:1143 msgid "boundary" msgstr "gräns" -#: builtin/log.c:1110 +#: builtin/log.c:1141 msgid "attach the patch" msgstr "bifoga patchen" -#: builtin/log.c:1113 +#: builtin/log.c:1144 msgid "inline the patch" msgstr "gör patchen ett inline-objekt" -#: builtin/log.c:1117 +#: builtin/log.c:1148 msgid "enable message threading, styles: shallow, deep" msgstr "aktivera brevtrådning, typer: shallow, deep" -#: builtin/log.c:1119 +#: builtin/log.c:1150 msgid "signature" msgstr "signatur" -#: builtin/log.c:1120 +#: builtin/log.c:1151 msgid "add a signature" msgstr "lägg till signatur" -#: builtin/log.c:1122 +#: builtin/log.c:1153 msgid "don't print the patch filenames" msgstr "visa inte filnamn för patchar" -#: builtin/log.c:1163 +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "felaktig incheckarinformation %s" -#: builtin/log.c:1208 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n och -k kan inte användas samtidigt." -#: builtin/log.c:1210 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix och -k kan inte användas samtidigt." -#: builtin/log.c:1218 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "kan inte använda --name-only" -#: builtin/log.c:1220 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "kan inte använda --name-status" -#: builtin/log.c:1222 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "kan inte använda --check" -#: builtin/log.c:1245 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "standard ut, eller katalog, vilken skall det vara?" -#: builtin/log.c:1247 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "Kunde inte skapa katalogen \"%s\"" -#: builtin/log.c:1400 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "Misslyckades skapa utdatafiler" -#: builtin/log.c:1449 +#: builtin/log.c:1488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<uppström> [<huvud> [<gräns>]]]" -#: builtin/log.c:1504 +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "Kunde inte hitta en spårad fjärrgren, ange <uppström> manuellt.\n" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "Okänd incheckning %s" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:409 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [flaggor] [<fil>...]" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "identify the file status with tags" msgstr "identifiera filstatus med taggar" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "use lowercase letters for 'assume unchanged' files" msgstr "använd små bokstäver för \"anta oförändrade\"-filer" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show cached files in the output (default)" msgstr "visa cachade filer i utdata (standard)" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:472 msgid "show deleted files in the output" msgstr "visa borttagna filer i utdata" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:474 msgid "show modified files in the output" msgstr "visa modifierade filer i utdata" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:476 msgid "show other files in the output" msgstr "visa andra filer i utdata" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:478 msgid "show ignored files in the output" msgstr "visa ignorerade filer i utdata" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:481 msgid "show staged contents' object name in the output" msgstr "visa köat innehålls objektnamn i utdata" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show files on the filesystem that need to be removed" msgstr "visa filer i filsystemet som behöver tas bort" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show 'other' directories' name only" msgstr "visa endast namn för \"andra\" kataloger" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:488 msgid "don't show empty directories" msgstr "visa inte tomma kataloger" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:491 msgid "show unmerged files in the output" msgstr "visa ej sammanslagna filer i utdata" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "show resolve-undo information" msgstr "visa \"resolve-undo\"-information" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:495 msgid "skip files matching pattern" msgstr "hoppa över filer som motsvarar mönster" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "exclude patterns are read from <file>" msgstr "exkludera mönster som läses från <fil>" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "read additional per-directory exclude patterns in <file>" msgstr "läs ytterligare per-katalog-exkluderingsmönster från <fil>" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "add the standard git exclusions" msgstr "lägg till git:s standardexkluderingar" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:506 msgid "make the output relative to the project top directory" msgstr "gör utdata relativ till projektets toppkatalog" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:509 msgid "if any <file> is not in the index, treat this as an error" msgstr "om en <fil> inte är indexet, betrakta det som ett fel" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:510 msgid "tree-ish" msgstr "träd-igt" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:511 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "låtsas att sökvägar borttagna sedan <träd-igt> fortfarande finns" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:513 msgid "show debugging data" msgstr "visa felsökningsutdata" @@ -5732,7 +5894,7 @@ msgstr "tillåt snabbspolning (standard)" msgid "abort if fast-forward is not possible" msgstr "avbryt om snabbspolning inte är möjlig" -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "strategi" @@ -5836,18 +5998,19 @@ msgstr "" "den.\n" #: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "Ange ett incheckningsmeddelande för att förklara varför sammanslagningen\n" "är nödvändig, speciellt om den slår in en uppdaterad uppström i en\n" "temagren.\n" "\n" -"Rader som inleds med \"#\" kommer ignoreras, och ett tomt meddelande\n" +"Rader som inleds med \"%c\" kommer ignoreras, och ett tomt meddelande\n" "avbryter incheckningen.\n" #: builtin/merge.c:812 @@ -5944,51 +6107,51 @@ msgstr "Stöder inte en tillplattningsincheckning på ett tomt huvud ännu" 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:1309 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "Uppdaterar %s..%s\n" -#: builtin/merge.c:1348 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "Försöker riktigt enkel sammanslagning i indexet...\n" -#: builtin/merge.c:1355 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "Nej.\n" -#: builtin/merge.c:1387 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "Kan inte snabbspola, avbryter." -#: builtin/merge.c:1410 builtin/merge.c:1489 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "Återspolar trädet till orört...\n" -#: builtin/merge.c:1414 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Försöker sammanslagninsstrategin %s...\n" -#: builtin/merge.c:1480 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "Ingen sammanslagningsstrategi hanterade sammanslagningen.\n" -#: builtin/merge.c:1482 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "Sammanslagning med strategin %s misslyckades.\n" -#: builtin/merge.c:1491 +#: builtin/merge.c:1492 #, 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:1503 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6303,139 +6466,134 @@ msgstr "git notes prune [<flaggor>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:142 +#: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "kunde inte starta \"show\" för objektet \"%s\"" -#: builtin/notes.c:148 -msgid "can't fdopen 'show' output fd" -msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "kunde inte läsa utdata från \"show\"" -#: builtin/notes.c:158 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" - -#: builtin/notes.c:161 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "kunde inte avsluta \"show\" för objektet \"%s\"" -#: builtin/notes.c:178 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "kunde inte skapa filen \"%s\"" -#: builtin/notes.c:192 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "Ange innehåll för anteckningen med antingen -m eller -F" -#: builtin/notes.c:213 builtin/notes.c:976 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "Tar bort anteckning för objektet %s\n" -#: builtin/notes.c:218 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "kunde inte skriva anteckningsobjekt" -#: builtin/notes.c:220 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "Anteckningens innehåll har lämnats kvar i %s" -#: builtin/notes.c:254 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "kunde inte läsa \"%s\"" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" msgstr "kunde inte öppna eller läsa \"%s\"" -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "Kunde inte slå upp \"%s\" som en giltig referens." -#: builtin/notes.c:278 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "Kunde inte läsa objektet \"%s\"." -#: builtin/notes.c:302 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "Kan inte checka in oinitierat/orefererat anteckningsträd" -#: builtin/notes.c:343 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Felaktigt värde för notes.rewriteMode: '%s'" -#: builtin/notes.c:353 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "Vägrar skriva över anteckningar i %s (utanför refs/notes/)" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:380 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "Felaktigt värde på %s: \"%s\"" -#: builtin/notes.c:444 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "Felaktig indatarad: \"%s\"." -#: builtin/notes.c:459 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "Misslyckades kopiera anteckningar från \"%s\" till \"%s\"" -#: builtin/notes.c:503 builtin/notes.c:557 builtin/notes.c:630 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 -#: builtin/notes.c:1036 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "för många parametrar" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "Inga anteckningar hittades för objektet %s." -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "anteckningsinnehåll som sträng" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "anteckningsinnehåll i en fil" -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 -#: builtin/notes.c:703 builtin/tag.c:476 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "objekt" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "återanvänd och redigera angivet anteckningsobjekt" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "återanvänd angivet anteckningsobjekt" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "ersätt befintliga anteckningar" -#: builtin/notes.c:583 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6444,24 +6602,24 @@ msgstr "" "Kan inte lägga till anteckningar. Hittade befintliga anteckningar för " "objektet %s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:588 builtin/notes.c:665 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "Skriver över befintliga anteckningar för objektet %s\n" -#: builtin/notes.c:618 +#: builtin/notes.c:614 msgid "read objects from stdin" msgstr "läs objekt från standard in" -#: builtin/notes.c:620 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "läs omskrivningsinställning för <kommando> (implicerar --stdin)" -#: builtin/notes.c:638 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "för få parametrar" -#: builtin/notes.c:659 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6470,12 +6628,12 @@ msgstr "" "Kan inte kopiera anteckningar. Hittade befintliga anteckningar för objektet " "%s. Använd \"-f\" för att skriva över befintliga anteckningar" -#: builtin/notes.c:671 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "Anteckningar på källobjektet %s saknas. Kan inte kopiera." -#: builtin/notes.c:720 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6484,15 +6642,15 @@ msgstr "" "Flaggorna -m/-F/-c/-C rekommenderas inte för underkommandot \"edit\".\n" "Använd \"git notes add -f -m/-F/-c/-C\" istället.\n" -#: builtin/notes.c:867 +#: builtin/notes.c:863 msgid "General options" msgstr "Allmänna flaggor" -#: builtin/notes.c:869 +#: builtin/notes.c:865 msgid "Merge options" msgstr "Flaggor för sammanslagning" -#: builtin/notes.c:871 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -6500,46 +6658,46 @@ msgstr "" "läs konflikter i anteckningar med angiven strategi (manual/ours/theirs/union/" "cat_sort_uniq)" -#: builtin/notes.c:873 +#: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "Checkar in ej sammanslagna anteckningar" -#: builtin/notes.c:875 +#: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "" "färdigställ sammanslagning av anteckningar genom att checka in ej " "sammanslagna anteckningar" -#: builtin/notes.c:877 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "Avbryt lösning av sammanslagning av anteckningar" -#: builtin/notes.c:879 +#: builtin/notes.c:875 msgid "abort notes merge" msgstr "avbryt sammanslagning av anteckningar" -#: builtin/notes.c:974 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "Objektet %s har ingen anteckning\n" -#: builtin/notes.c:986 +#: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "försök att ta bort icke-existerande anteckningar är inte ett fel" -#: builtin/notes.c:989 +#: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "läs objektnamn från standard in" -#: builtin/notes.c:1070 +#: builtin/notes.c:1066 msgid "notes_ref" msgstr "anteckningar-ref" -#: builtin/notes.c:1071 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" msgstr "använd anteckningar från <anteckningsref>" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Okänt underkommando: %s" @@ -6898,22 +7056,51 @@ msgstr "" "\"git pull\") innan du sänder igen.\n" "Se avsnittet \"Note about fast-forward\" i \"git push --help\" för detaljer." -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Uppdateringar avvisades då fjärren innehåller ändringar som du inte\n" +"har lokalt. Det beror oftast på att ett annat arkiv har sänt in samma\n" +"referenser. Det kan vara en idé att först slå ihop fjärrändringarna\n" +"(t.ex. \"git pull\") innan du sänder igen.\n" +"Se avsnittet \"Note about fast-forwards\" i \"git push --help\" för detaljer." + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "Uppdateringarna avvisades eftersom taggen redan finns på fjärren." + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Du kan inte uppdatera en fjärr-referens som pekar på ett objekt som\n" +"inte är en incheckning, eller uppdatera en fjärr-referens så att den\n" +"pekar på något som inte är en incheckning, utan att använda flaggan\n" +"\"--force\".\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "Sänder till %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "misslyckades sända vissa referenser till \"%s\"" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "felaktigt arkiv \"%s\"" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -6934,79 +7121,83 @@ msgstr "" "\n" " git push <namn>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all och --tags är inkompatibla" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all kan inte kombineras med referensspecifikationer" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror och --tags är inkompatibla" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror kan inte kombineras med referensspecifikationer" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all och --mirror är inkompatibla" -#: builtin/push.c:382 +#: builtin/push.c:419 msgid "repository" msgstr "arkiv" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" msgstr "sänd alla referenser" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" msgstr "spegla alla referenser" -#: builtin/push.c:386 +#: builtin/push.c:423 msgid "delete refs" msgstr "ta bort referenser" -#: builtin/push.c:387 +#: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" msgstr "sänd taggar (kan inte användas med --all eller --mirror)" -#: builtin/push.c:390 +#: builtin/push.c:427 msgid "force updates" msgstr "tvinga uppdateringar" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" msgstr "kontrollera" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "styr rekursiv insändning av undermoduler" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" msgstr "använd tunna paket" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "program för att ta emot paket" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "ställ in uppström för git pull/status" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" msgstr "ta bort lokalt borttagna referenser" -#: builtin/push.c:410 +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "förbigå pre-push-krok" + +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete är imkompatibel med --all, --mirror och --tags" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "--delete kan inte användas utan referenser" @@ -7617,12 +7808,12 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<incheckning>]" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." -msgstr "git reset [-q] <incheckning> [--] <sökvägar>..." +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <träd-igt> [--] <sökvägar>..." #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" -msgstr "git reset --patch [<incheckning>] [--] [<sökvägar>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<träd-igt>] [--] [<sökvägar>...]" #: builtin/reset.c:33 msgid "mixed" @@ -7644,90 +7835,96 @@ msgstr "sammanslagning" msgid "keep" msgstr "behåll" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "Du har inte en giltig HEAD." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Kunde inte hitta träder för HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "Kunde inte hitta träder för %s." -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "Kunde inte skriva ny indexfil." - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD är nu på %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "Kunde inte läsa indexet" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "Oköade ändringar efter återställning:" - -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "Kan inte utföra en %s återställning mitt i en sammanslagning." -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "var tyst, rapportera endast fel" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" msgstr "återställ HEAD och index" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" msgstr "återställ endast HEAD" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" msgstr "återställ HEAD, index och arbetskatalog" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" msgstr "återställ HEAD men behåll lokala ändringar" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Kunde inte slå upp \"%s\" som en giltig revision." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "Kan inte tolka objektet \"%s\"" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Kunde inte slå upp \"%s\" som ett giltigt träd." + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch är inkompatibel med --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "" "--mixed rekommenderas inte med sökvägar; använd \"git reset -- <sökvägar>\"." -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "Kan inte göra %s återställning med sökvägar." -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "%s återställning tillåts inte i ett naket arkiv" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "Kunde inte återställa indexfilen till versionen \"%s\"." +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Oköade ändringar efter återställning:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Kunde inte skriva ny indexfil." + #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [options] -- [<argument>...]" @@ -7920,28 +8117,28 @@ msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" msgstr "" "git shortlog [-n] [-s] [-e] [-w] [rev-flaggor] [--] [<incheckning-id>... ]" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "Författare saknas: %s" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:229 msgid "sort output according to the number of commits per author" msgstr "sortera utdata enligt antal incheckningar per författare" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:231 msgid "Suppress commit descriptions, only provides commit count" msgstr "Undertryck beskrivningar, visa bara antal incheckningar" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:233 msgid "Show the email address of each author" msgstr "Visa e-postadress för varje författare" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:234 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:235 msgid "Linewrap output" msgstr "Radbryt utdata" @@ -8146,170 +8343,164 @@ msgid "could not verify the tag '%s'" msgstr "kunde inte bekräfta taggen \"%s\"" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# Skriv ett taggmeddelande\n" -"# Rader som inleds med \"#\" ignoreras.\n" -"#\n" +"Skriv ett taggmeddelande\n" +"Rader som inleds med \"%c\" ignoreras.\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# Skriv ett taggmeddelande\n" -"# Rader som inleds med \"#\" kommer behållas; du kan själv ta bort dem om\n" -"# du vill.\n" -"#\n" +"Skriv ett taggmeddelande\n" +"Rader som inleds med \"%c\" kommer behållas; du kan själv ta bort dem om\n" +"du vill.\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "kunde inte signera taggen" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "kunde inte skriva tagg-filen" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "felaktig objekttyp" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "tagghuvud för stort." -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "inget taggmeddelande?" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "Taggmeddelandet har lämnats i %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "flaggan \"points-at\" behöver ett object" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "felformat objektnamn \"%s\"" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" msgstr "lista taggnamn" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "visa <n> rader från varje taggmeddelande" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "delete tags" msgstr "ta bort taggar" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" msgstr "verifiera taggar" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "Alternativ för att skapa taggar" -#: builtin/tag.c:456 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "annoterad tagg, behöver meddelande" -#: builtin/tag.c:458 +#: builtin/tag.c:456 msgid "tag message" msgstr "taggmeddelande" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "annoterad och GPG-signerad tagg" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "använd annan nyckel för att signera taggen" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "ersätt taggen om den finns" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" msgstr "lista taggar i spalter" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "Alternativ för listning av taggar" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "visa endast taggar som innehåller incheckningen" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" msgstr "visa endast taggar för objektet" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column och -n är inkompatibla" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "Flaggan -n är endast tillåten tillsammans med -l." -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "Flaggan --contains är endast tillåten tillsammans med -l" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "Flaggan --points-at är endast tillåten tillsammans med -l." -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "endast en av flaggorna -F eller -m tillåts." -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "för många parametrar" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "\"%s\" är inte ett giltigt taggnamn." -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "taggen \"%s\" finns redan" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: kan inte låsa referensen" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s: kan inte uppdatera referensen" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Uppdaterad tagg \"%s\" (var %s)\n" @@ -8495,15 +8686,15 @@ msgstr "" msgid "no-op (backward compatibility)" msgstr "ingen funktion (bakåtkompatibilitet)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "var mer pratsam" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "var mer tyst" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "använd <n> siffror för att visa SHA-1:or" @@ -8544,8 +8735,8 @@ msgid "Print lines matching a pattern" msgstr "Visa rader som motsvarar mönster" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" -msgstr "Skapa tomt git-arkiv eller ominitiera ett befintligt" +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "Skapa tomt Git-arkiv eller ominitiera ett befintligt" #: common-cmds.h:18 msgid "Show commit logs" @@ -9212,38 +9403,38 @@ msgstr "Inget grennamn angavs" msgid "(To restore them type \"git stash apply\")" msgstr "(För att återställa dem, skriv \"git stash apply\")" -#: git-submodule.sh:89 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "kan inte ta bort en komponent från url:en \"$remoteurl\"" -#: git-submodule.sh:168 +#: git-submodule.sh:195 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "" "Hittade ingen undermodulmappning i .gitmodules för sökvägen \"$sm_path\"" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "Misslyckades klona \"$url\" till undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format 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:316 +#: git-submodule.sh:343 #, 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:333 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "\"$sm_path\" finns redan i indexet" -#: git-submodule.sh:337 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9254,22 +9445,22 @@ msgstr "" "$sm_path\n" "Använd -f om du verkligen vill lägga till den" -#: git-submodule.sh:355 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "Lägger till befintligt arkiv i \"$sm_path\" i indexet" -#: git-submodule.sh:357 +#: git-submodule.sh:384 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "\"$sm_path\" finns redan och är inte ett giltigt git-arkiv" -#: git-submodule.sh:365 +#: git-submodule.sh:392 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "En git-katalog för \"$sm_name\" hittades lokalt med fjärr(ar):" -#: git-submodule.sh:367 +#: git-submodule.sh:394 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" @@ -9277,14 +9468,14 @@ msgstr "" "För att återanvända den lokala git-katalogen istället för att på nytt klona " "från" -#: git-submodule.sh:369 +#: git-submodule.sh:396 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" "använd flaggan \"--force\". Om den lokala git-katalogen inte är riktigt arkiv" -#: git-submodule.sh:370 +#: git-submodule.sh:397 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " @@ -9293,59 +9484,59 @@ msgstr "" "eller om du är osäker på vad det innebär, välj nytt namn med flaggan \"--name" "\"." -#: git-submodule.sh:372 +#: git-submodule.sh:399 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "Aktiverar lokal git-katalog för undermodulen \"$sm_name\" på nytt." -#: git-submodule.sh:384 +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Kan inte checka ut undermodulen \"$sm_path\"" -#: git-submodule.sh:389 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "Misslyckades lägga till undermodulen \"$sm_path\"" -#: git-submodule.sh:394 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "Misslyckades registrera undermodulen \"$sm_path\"" -#: git-submodule.sh:437 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Går in i \"$prefix$sm_path\"" -#: git-submodule.sh:451 +#: git-submodule.sh:482 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "" "Stoppar på \"$sm_path\"; skriptet returnerade en status skild från noll." -#: git-submodule.sh:495 +#: git-submodule.sh:526 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "Hittade ingen url för undermodulsökvägen \"$sm_path\" i .gitmodules" -#: git-submodule.sh:504 +#: git-submodule.sh:535 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "Misslyckades registrera url för underkatalogsökväg \"$sm_path\"" -#: git-submodule.sh:506 +#: git-submodule.sh:537 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "Undermodulen \"$name\" ($url) registrerad för sökvägen \"$sm_path\"" -#: git-submodule.sh:514 +#: git-submodule.sh:545 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "" "Misslyckades registrera uppdateringsläge för undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:614 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -9354,93 +9545,114 @@ msgstr "" "Undermodulen \"$sm_path\" har inte initierats\n" "Kanske du vill köra \"update --init\"?" -#: git-submodule.sh:627 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "Kan inte hitta aktuell revision i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:646 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "Kan inte hämta i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:660 +#: git-submodule.sh:709 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "Kan inte ombasera \"$sha1\" i undermodulsökväg \"$sm_path\"" -#: git-submodule.sh:661 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": ombaserade in i \"$sha1\"" -#: git-submodule.sh:666 +#: git-submodule.sh:715 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "Kan inte slå ihop \"$sha1\" i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:667 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": sammanslagen i \"$sha1\"" -#: git-submodule.sh:672 +#: git-submodule.sh:721 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "Kan inte checka ut \"$sha1\" i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:673 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "Undermodulsökvägen \"$sm_path\": checkade ut \"$sha1\"" -#: git-submodule.sh:695 git-submodule.sh:1017 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "Misslyckades rekursera in i undermodulsökvägen \"$sm_path\"" -#: git-submodule.sh:803 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "Flaggan --cached kan inte användas med flaggan --files" #. unexpected type -#: git-submodule.sh:843 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "oväntat läge $mod_dst" -#: git-submodule.sh:861 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " Varning: $name innehåller inte incheckning $sha1_src" -#: git-submodule.sh:864 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " Varning: $name innehåller inte incheckning $sha1_dst" -#: git-submodule.sh:867 +#: git-submodule.sh:916 #, 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:892 +#: git-submodule.sh:941 msgid "blob" msgstr "blob" -#: git-submodule.sh:930 -msgid "# Submodules changed but not updated:" -msgstr "# Undermoduler ändrade men inte uppdaterade:" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" +msgstr "Undermoduler ändrade men inte uppdaterade:" -#: git-submodule.sh:932 -msgid "# Submodule changes to be committed:" -msgstr "# Undermodulers ändringar att checka in:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" +msgstr "Undermodulers ändringar att checka in:" -#: git-submodule.sh:1080 +#: git-submodule.sh:1129 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" msgstr "Synkroniserar undermodul-url för \"$prefix$sm_path\"" +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "kunde inte öppna (fdopen) \"show\"-utdata-filhandtag" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "kunde inte stänga röret till \"show\" för objektet \"%s\"" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Du har ingen giltig HEAD" + +#~ msgid "oops" +#~ msgstr "hoppsan" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Skulle inte ta bort %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Tar inte bort %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Kunde inte läsa indexet" + #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <namn> (-a | -d | <gren>])" @@ -1,26 +1,27 @@ # Vietnamese translation for GIT-CORE. -# Copyright (C) 2012, Trần Ngọc Quân. +# Copyright (C) 2012-2013 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. +# First translated by Trần Ngọc Quân <vnwildman@gmail.com>, 2012-2013. # Nguyễn Thái Ngọc Duy <pclouds@gmail.com>, 2012. # msgid "" msgstr "" -"Project-Id-Version: git-v1.8.0.1-347-gf94c3\n" +"Project-Id-Version: git-v1.8.2-rc2-4-g77995\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-11-30 12:40+0800\n" -"PO-Revision-Date: 2012-11-30 13:40+0700\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"PO-Revision-Date: 2013-03-06 13:55+0700\n" "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n" "Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n" "Language: vi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Team-Website: <http://translationproject.org/team/vi.html>\n" "Plural-Forms: nplurals=2; plural=1;\n" "X-Poedit-SourceCharset: UTF-8\n" "X-Poedit-Basepath: ../\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "gợi ý: %.*s\n" @@ -29,7 +30,7 @@ msgstr "gợi ý: %.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -60,81 +61,81 @@ msgstr "" msgid "git archive --remote <repo> [--exec <cmd>] --list" msgstr "git archive --remote <kho> [--exec <lệnh>] --list" -#: archive.c:322 +#: archive.c:323 msgid "fmt" msgstr "fmt" -#: archive.c:322 +#: archive.c:323 msgid "archive format" msgstr "định dạng lưu trữ" -#: archive.c:323 builtin/log.c:1084 +#: archive.c:324 builtin/log.c:1115 msgid "prefix" msgstr "tiền tố" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" msgstr "nối thêm tiền tố vào từng đường dẫn tập tin trong kho lưu" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2390 -#: builtin/blame.c:2391 builtin/config.c:55 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:715 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:540 -#: builtin/notes.c:697 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "tập-tin" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:92 msgid "write the archive to this file" msgstr "ghi kho lưu vào tập tin này" -#: archive.c:328 +#: archive.c:329 msgid "read .gitattributes in working directory" msgstr "đọc .gitattributes trong thư mục làm việc" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" msgstr "liệt kê các tập tin được lưu trữ vào stderr (đầu ra lỗi chuẩn)" -#: archive.c:330 +#: archive.c:331 msgid "store only" msgstr "chỉ lưu (không nén)" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" msgstr "nén nhanh hơn" -#: archive.c:339 +#: archive.c:340 msgid "compress better" msgstr "nén nhỏ hơn" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" msgstr "liệt kê các kiểu nén được hỗ trợ" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" msgstr "kho" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" msgstr "nhận kho lưu từ kho chứa <kho> trên máy chủ" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:619 +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 msgid "command" msgstr "lệnh" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" msgstr "đường dẫn đến lệnh git-upload-pack trên máy chủ" #: attr.c:259 msgid "" -"Negative patterns are forbidden in git attributes\n" +"Negative patterns are ignored in git attributes\n" "Use '\\!' for literal leading exclamation." msgstr "" -"Mấu dạng phủ định bị cấm chỉ dùng trong các thuộc tính của git\n" -"Dùng '\\!' cho các chuỗi văn bản có dấu chấm than." +"Các mẫu dạng phủ định bị cấm dùng cho các thuộc tính của git\n" +"Dùng “\\!” cho các chuỗi văn bản có dấu chấm than dẫn đầu." #: bundle.c:36 #, c-format @@ -153,11 +154,11 @@ 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:" +msgstr "Kho 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:562 sequencer.c:994 builtin/log.c:290 -#: builtin/log.c:732 builtin/log.c:1319 builtin/log.c:1535 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 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" @@ -183,7 +184,7 @@ msgstr[1] "Lệnh bundle yêu cầu %d tham chiếu (refs) này" msgid "rev-list died" msgstr "rev-list đã chết" -#: bundle.c:300 builtin/log.c:1215 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "đối số không được thừa nhận: %s" @@ -309,22 +310,22 @@ msgid_plural "%lu years ago" msgstr[0] "%lu năm trước" msgstr[1] "%lu năm trước" -#: diff.c:111 +#: diff.c:112 #, 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" +msgstr " Gặp lỗi khi phân tích dirstat cắt bỏ phần trăm “%s”\n" -#: diff.c:116 +#: diff.c:117 #, c-format msgid " Unknown dirstat parameter '%s'\n" -msgstr " Không hiểu đối số dirstat '%s'\n" +msgstr " Không hiểu đối số dirstat “%s”\n" -#: diff.c:194 +#: diff.c:210 #, c-format msgid "Unknown value for 'diff.submodule' config variable: '%s'" -msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: `%s'" +msgstr "Không hiểu giá trị cho biến cấu hình “diff.submodule”: “%s”" -#: diff.c:237 +#: diff.c:260 #, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" @@ -333,7 +334,7 @@ msgstr "" "Tìm thấy các lỗi trong biến cấu hình “diff.dirstat”:\n" "%s" -#: diff.c:3494 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -342,23 +343,33 @@ msgstr "" "Gặp lỗi khi phân tích đối số tùy chọn --dirstat/-X:\n" "%s" -#: diff.c:3508 +#: diff.c:3482 #, c-format msgid "Failed to parse --submodule option parameter: '%s'" -msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: `%s'" +msgstr "Gặp lỗi khi phân tích đối số tùy chọn --submodule: “%s”" -#: gpg-interface.c:59 +#: gpg-interface.c:59 gpg-interface.c:127 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" +msgstr "gpg đã không chấp nhận 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" +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "không thể tạo tập tin tạm thời “%s”: %s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "gặp lỗi khi ghi chữ ký đính kèm vào “%s”: %s" + #: grep.c:1622 #, c-format msgid "'%s': unable to read %s" @@ -383,7 +394,11 @@ msgstr "các lệnh git sẵn sàng để dùng trong “%s”" 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:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "Những lệnh git hay được sử dụng nhất là:" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -392,11 +407,11 @@ 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:332 +#: help.c:349 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:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -405,17 +420,17 @@ msgstr "" "CẢNH BÁO: Bạn đã gọi lệnh Git có tên “%s”, mà nó lại không có sẵn.\n" "Giả định rằng ý bạn là “%s”" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "trong %0.1f giây một cách tự động..." -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git: “%s” không phải là một lệnh của git. Xem “git --help”." -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -618,7 +633,7 @@ msgstr "Đã bỏ qua %s (đã có sẵn lần hòa trộn này)" msgid "Auto-merging %s" msgstr "Tự-động-hòa-trộn %s" -#: merge-recursive.c:1633 git-submodule.sh:893 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "mô-đun-con" @@ -694,39 +709,53 @@ msgstr "Không thể phân tích đối tượng “%s”" msgid "Unable to write index." msgstr "Không thể ghi bảng mục lục" -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "cách dùng: %s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " hoặc: %s" -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-SỐ" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "Đường dẫn “%s” thì ở trong mô-đun-con “%.*s”" + +#: pathspec.c:99 +#, 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" + +#: remote.c:1653 #, 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:1637 +#: remote.c:1659 msgid " (use \"git push\" to publish your local commits)\n" msgstr " (dùng \"git push\" để xuất bản các lần chuyển giao nội bộ của bạn)\n" -#: remote.c:1640 +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -738,11 +767,11 @@ 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:1647 +#: remote.c:1670 msgid " (use \"git pull\" to update your local branch)\n" msgstr " (dùng \"git pull\" để cập nhật nhánh nội bộ của bạn)\n" -#: remote.c:1650 +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -758,7 +787,7 @@ msgstr[1] "" "Your branch and “%s” have diverged,\n" "and have %d and %d different commit each, respectively.\n" -#: remote.c:1659 +#: remote.c:1683 msgid " (use \"git pull\" to merge the remote branch into yours)\n" msgstr "" " (dùng \"git pull\" để hòa trộn nhánh trên máy chủ vào trong nhánh của " @@ -794,7 +823,7 @@ msgstr "" "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:162 sequencer.c:770 sequencer.c:853 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "Không thể ghi vào %s" @@ -817,50 +846,46 @@ msgid "Commit your changes or stash them to proceed." msgstr "Chuyển giao (commit) các thay đổi của bạn hay stash chúng để xử lý." #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:235 +#: sequencer.c:236 #, 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:266 +#: sequencer.c:267 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:287 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "Không thể cập nhật cây bộ nhớ đệm\n" -#: sequencer.c:332 +#: sequencer.c:333 #, 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:337 +#: sequencer.c:338 #, 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:403 +#: sequencer.c:404 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:406 -msgid "You do not have a valid HEAD" -msgstr "Bạn không có HEAD nào hợp lệ" - -#: sequencer.c:421 +#: sequencer.c:423 #, 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:429 +#: sequencer.c:431 #, 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:433 +#: sequencer.c:435 #, c-format msgid "Mainline was specified but commit %s is not a merge." msgstr "" @@ -869,143 +894,143 @@ msgstr "" #. TRANSLATORS: The first %s will be "revert" or #. "cherry-pick", the second %s a SHA1 -#: sequencer.c:444 +#: sequencer.c:448 #, 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:448 +#: sequencer.c:452 #, 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:532 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "không thể revert %s... %s" -#: sequencer.c:533 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "không thể apply (áp dụng miếng vá) %s... %s" -#: sequencer.c:565 +#: sequencer.c:569 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:573 +#: sequencer.c:577 #, 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:578 +#: sequencer.c:582 #, 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:636 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "Không thể %s trong khi %s" -#: sequencer.c:658 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "Không phân tích được dòng %d." -#: sequencer.c:663 +#: sequencer.c:667 msgid "No commits parsed." msgstr "Không có lần chuyển giao (commit) nào được phân tích." -#: sequencer.c:676 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "Không thể mở %s" -#: sequencer.c:680 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "Không thể đọc %s." -#: sequencer.c:687 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "Bảng chỉ thị không thể dùng được: %s" -#: sequencer.c:715 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "Khóa không đúng: %s" -#: sequencer.c:718 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "Giá trị không hợp lệ %s: %s" -#: sequencer.c:730 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "Bảng tùy chọn dị hình: %s" -#: sequencer.c:751 +#: sequencer.c:755 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:752 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "hãy thử \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:756 +#: sequencer.c:760 #, 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:772 sequencer.c:857 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "Lỗi bao bọc %s." -#: sequencer.c:791 sequencer.c:925 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "không cherry-pick hay revert trong tiến trình" -#: sequencer.c:793 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "không thể phân giải HEAD" -#: sequencer.c:795 +#: sequencer.c:799 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:817 builtin/apply.c:4005 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "không thể mở %s: %s" -#: sequencer.c:820 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "không thể đọc %s: %s" -#: sequencer.c:821 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "kết thúc tập tin đột xuất" -#: sequencer.c:827 +#: sequencer.c:831 #, 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:850 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "Không thể định dạng %s." -#: sequencer.c:1012 +#: sequencer.c:1016 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:1013 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "Không thể cherry-pick vào một đầu (head) trống rỗng" @@ -1035,12 +1060,17 @@ msgstr "" msgid "unable to access '%s': %s" msgstr "không thể truy cập “%s”: %s" -#: wrapper.c:426 +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "không thể truy cập “%s”" + +#: wrapper.c:434 #, 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:427 +#: wrapper.c:435 msgid "no such user" msgstr "không có người dùng như vậy" @@ -1121,7 +1151,7 @@ msgstr "bị xóa bởi cả hai:" #: wt-status.c:250 msgid "added by us:" -msgstr "được thêm vào bởi chúng tôi:" +msgstr "được thêm vào bởi chúng ta:" #: wt-status.c:251 msgid "deleted by them:" @@ -1133,7 +1163,7 @@ msgstr "được thêm vào bởi họ:" #: wt-status.c:253 msgid "deleted by us:" -msgstr "bị xóa bởi chúng tôi:" +msgstr "bị xóa bởi chúng ta:" #: wt-status.c:254 msgid "both added:" @@ -1149,7 +1179,7 @@ msgstr "lần chuyển giao (commit) mới, " #: wt-status.c:287 msgid "modified content, " -msgstr "nội dung được sửa đổi, " +msgstr "nội dung bị sửa đổi, " #: wt-status.c:289 msgid "untracked content, " @@ -1200,153 +1230,180 @@ msgstr "chưa hòa trộn: %s" 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:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "Bạn có những đường dẫn chưa được hòa trộn." -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " (sửa các xung đột sau đó chạy \"git commit\")" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "Tất cả các xung đột đã được giải quyết nhưng bạn vẫn đang hòa trộn." -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " (dùng \"git commit\" để hoàn tất việc hòa trộn)" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "Bạn đang ở giữa của một phiên “am”." -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "Miếng vá hiện tại bị trống rỗng." -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git am --resolved\")" -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" -msgstr " (dùng \"git am --skip\" để bỏ qua lần vá này)" +msgstr " (dùng \"git am --skip\" để bỏ qua miếng vá này)" -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " (dùng \"git am --abort\" để phục hồi lại nhánh nguyên thủy)" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "Bạn hiện nay đang thực hiện việc rebase nhánh “%s” trên “%s”." + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "Bạn hiện nay đang thực hiện việc rebase (tái cấu trúc)." -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " (sửa các xung đột và sau đó chạy lệnh \"git rebase --continue\")" -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " (dùng \"git rebase --skip\" để bỏ qua lần vá này)" -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " (dùng \"git rebase --abort\" để check-out nhánh nguyên thủy)" -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr "" " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git rebase --continue\")" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Bạn hiện nay đang thực hiện việc chia tách một lần chuyển giao (commit) " +"trong khi đang rebase nhánh “%s” trên “%s”." + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "" "Bạn hiện tại đang cắt đôi một lần chuyển giao trong khi đang thực hiện việc " "rebase." -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr "" " (Một khi thư mục làm việc của bạn đã gọn gàng, chạy \"git rebase --continue" "\")" -#: wt-status.c:893 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "" +"Bạn hiện nay đang thực hiện việc sửa chữa một lần chuyển giao (commit) trong " +"khi đang rebase nhánh “%s” trên “%s”." + +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "Bạn hiện đang sửa một lần chuyển giao trong khi bạn thực hiện rebase." -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr "" " (dùng \"git commit --amend\" để tu bổ lần chuyển giao (commit) hiện tại)" -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr "" " (dùng \"git rebase --continue\" một khi bạn cảm thấy hài lòng về những " "thay đổi của mình)" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "Bạn hiện nay đang thực hiện việc cherry-pick." -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr " (khi tất cả các xung đột đã sửa xong: chạy lệnh \"git commit\")" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "" +"Bạn hiện nay đang thực hiện thao tác di chuyển nửa bước (bisect) trên nhánh " +"“%s”." + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "Bạn hiện tại đang thực hiện việc bisect (chia đôi)." -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " (dùng \"git bisect reset\" để quay trở lại nhánh nguyên thủy)" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "Trên nhánh " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "Hiện tại chẳng ở nhánh nào cả." -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "Lần chuyển giao (commit) khởi đầu" -#: wt-status.c:1011 +#: wt-status.c:1097 msgid "Untracked files" msgstr "Những tập tin chưa được theo dõi" -#: wt-status.c:1013 +#: wt-status.c:1099 msgid "Ignored files" msgstr "Những tập tin bị lờ đi" -#: wt-status.c:1015 +#: wt-status.c:1101 #, 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:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr " (dùng tùy chọn -u để hiển thị các tập tin chưa được theo dõi)" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "Không có thay đổi nào" -#: wt-status.c:1028 +#: wt-status.c:1114 #, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" msgstr "" "không có thay đổi nào được thêm vào commit (dùng \"git add\" và/hoặc \"git " "commit -a\")\n" -#: wt-status.c:1031 +#: wt-status.c:1117 #, c-format msgid "no changes added to commit\n" msgstr "không có thay đổi nào được thêm vào lần chuyển giao (commit)\n" -#: wt-status.c:1034 +#: wt-status.c:1120 #, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " @@ -1355,54 +1412,54 @@ 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 (dùng \"git add\" để đưa vào theo dõi)\n" -#: wt-status.c:1037 +#: wt-status.c:1123 #, c-format msgid "nothing added to commit but untracked files present\n" msgstr "" "không có gì được thêm vào lần chuyển giao (commit) nhưng có những tập tin " "không được theo dấu vết hiện diện\n" -#: wt-status.c:1040 +#: wt-status.c:1126 #, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" msgstr "" " không có gì để commit (tạo/sao-chép các tập tin và dùng \"git add\" để theo " "dõi dấu vết)\n" -#: wt-status.c:1043 wt-status.c:1048 +#: wt-status.c:1129 wt-status.c:1134 #, c-format msgid "nothing to commit\n" msgstr "không có gì để chuyển giao (commit)\n" -#: wt-status.c:1046 +#: wt-status.c:1132 #, c-format msgid "nothing to commit (use -u to show untracked files)\n" msgstr "" "không có gì để chuyển giao (commit) (dùng -u để bỏ các tập tin cần theo dấu " "vết)\n" -#: wt-status.c:1050 +#: wt-status.c:1136 #, c-format msgid "nothing to commit, working directory clean\n" msgstr "không có gì để chuyển giao (commit), thư mục làm việc sạch sẽ\n" -#: wt-status.c:1158 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD (không nhánh)" -#: wt-status.c:1164 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "Lần chuyển giao (commit) khởi tạo trên " -#: wt-status.c:1179 +#: wt-status.c:1265 msgid "behind " msgstr "đằng sau " -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "phía trước " -#: wt-status.c:1187 +#: wt-status.c:1273 msgid ", behind " msgstr ", đằng sau " @@ -1411,150 +1468,185 @@ msgstr ", đằng sau " msgid "failed to unlink '%s'" msgstr "bỏ liên kết (unlink) %s không thành công" -#: builtin/add.c:19 -msgid "git add [options] [--] <filepattern>..." -msgstr "git add [các-tùy-chọn] [--] <mẫu-tập-tin>..." +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [các-tùy-chọn] [--] <pathspec>..." -#: builtin/add.c:62 +#: builtin/add.c:63 #, 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:231 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "Cập nhật tập tin gặp lỗi" -#: builtin/add.c:77 +#: builtin/add.c:78 #, 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 +#: builtin/add.c:148 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:460 builtin/rm.c:275 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, 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 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "Không thể đọc bảng mục lục" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." -msgstr "Không thể mở “%s” để ghi" +msgstr "Không thể mở “%s” để ghi." -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "Không thể ghi ra miếng vá" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "không thể lấy trạng thái về “%s”" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "Miếng vá trống rỗng. Đã bỏ qua." -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "Không thể apply (áp dụng miếng vá) “%s”" -#: builtin/add.c:313 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "" "Các đường dẫn theo sau đây sẽ bị lờ đi bởi một trong các tập tin .gitignore " "của bạn:\n" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 #: builtin/rm.c:206 msgid "dry run" msgstr "chạy thử" -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1160 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1483 -#: builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "chi tiết" -#: builtin/add.c:322 +#: builtin/add.c:280 msgid "interactive picking" msgstr "sửa bằng cách tương tác" -#: builtin/add.c:323 builtin/checkout.c:1031 builtin/reset.c:248 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 msgid "select hunks interactively" msgstr "chọn “hunks” một cách tương tác" -#: builtin/add.c:324 +#: builtin/add.c:282 msgid "edit current diff and apply" msgstr "sửa diff hiện nay và áp dụng nó" -#: builtin/add.c:325 +#: builtin/add.c:283 msgid "allow adding otherwise ignored files" msgstr "cho phép thêm các tập tin bị bỏ qua khác" -#: builtin/add.c:326 +#: builtin/add.c:284 msgid "update tracked files" msgstr "cập nhật các tập tin được theo vết" -#: builtin/add.c:327 +#: builtin/add.c:285 msgid "record only the fact that the path will be added later" msgstr "chỉ ghi lại sự việc mà đường dẫn sẽ được thêm vào sau" -#: builtin/add.c:328 +#: builtin/add.c:286 msgid "add changes from all tracked and untracked files" msgstr "" "thêm các thay đổi từ tất cả các tập tin có cũng như không được theo dõi dấu " "vết" -#: builtin/add.c:329 +#: builtin/add.c:287 msgid "don't add, only refresh the index" msgstr "không thêm, chỉ làm tươi mới bảng mục lục" -#: builtin/add.c:330 +#: builtin/add.c:288 msgid "just skip files which cannot be added because of errors" msgstr "chie bỏ qua những tập tin mà nó không thể được thêm vào bởi vì gặp lỗi" -#: builtin/add.c:331 +#: builtin/add.c:289 msgid "check if - even missing - files are ignored in dry run" msgstr "" "kiểm tra xem - thậm chí thiếu - tập tin bị bỏ qua trong quá trình chạy thử" -#: builtin/add.c:353 +#: builtin/add.c:311 #, 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:354 +#: builtin/add.c:312 msgid "no files added" msgstr "chưa có tập tin nào được thêm vào" -#: builtin/add.c:360 +#: builtin/add.c:318 msgid "adding files failed" msgstr "thêm tập tin gặp lỗi" -#: builtin/add.c:392 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"Cách ứng xử của lệnh “git add %s (hay %s)” khi không có tham số đường dẫn " +"từ\n" +"thư-mục con của cây sẽ thay đổi kể từ Git 2.0 và không thể sử dụng như thế " +"nữa.\n" +"Để thêm nội dung cho toàn bộ cây, chạy:\n" +"\n" +" git add %s :/\n" +" (hay git add %s :/)\n" +"\n" +"Để hạn chế lệnh cho thư-mục hiện tại, chạy:\n" +"\n" +" git add %s .\n" +" (hay git add %s .)\n" +"\n" +"Với phiên bản hiện tại của Git, lệnh bị hạn chế cho thư-mục hiện tại." + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "-A và -u xung khắc nhau" -#: builtin/add.c:394 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "Tùy chọn --ignore-missing chỉ có thể được dùng cùng với --dry-run" @@ -1568,12 +1660,12 @@ msgstr "Không có gì được chỉ ra, không có gì được thêm vào.\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "Có lẽ bạn muốn là “git add .” phải không?\n" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:291 builtin/mv.c:82 -#: builtin/rm.c:235 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "tập tin ghi bảng mục lục bị hỏng" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:370 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 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" @@ -1626,19 +1718,19 @@ msgstr "git apply: git-diff sai - tên tập tin cũ mâu thuấn trên dòng %d #: builtin/apply.c:957 #, 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" +msgstr "git apply: git-diff sai - cần /dev/null trên dòng %d" -#: builtin/apply.c:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" -msgstr "chi tiết: dòng không được mong đợi: %.*s" +msgstr "chi tiết: dòng không cần: %.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, 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:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1653,82 +1745,78 @@ 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:1654 +#: builtin/apply.c:1656 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:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "tập tin đã xóa vẫn còn nội dung" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "miếng vá hỏng tại dòng %d" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, 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:1720 +#: builtin/apply.c:1722 #, 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:1723 +#: builtin/apply.c:1725 #, 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:1869 +#: builtin/apply.c:1871 #, 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:1898 +#: builtin/apply.c:1900 #, 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:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "vá chỉ với “garbage” tại dòng %d" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, 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:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" -msgstr "không thể mở để đọc hay ghi %s" +msgstr "không thể mở hay đọc %s" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "ôi?" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "sai khởi đầu dòng: “%c”" -#: builtin/apply.c:2789 +#: builtin/apply.c:2802 #, 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:2801 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "Nội dung bị giảm xuống (%ld/%ld) để áp dụng mảnh dữ liệu tại %d" -#: builtin/apply.c:2807 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1737,325 +1825,325 @@ msgstr "" "Trong khi đang tìm kiếm cho:\n" "%.*s" -#: builtin/apply.c:2826 +#: builtin/apply.c:2839 #, 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:2929 +#: builtin/apply.c:2942 #, 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:2935 +#: builtin/apply.c:2948 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "" "vá nhị phân cho “%s” tạo ra kết quả không chính xác (mong chờ %s, lại nhận " "%s)" -#: builtin/apply.c:2956 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "vá gặp lỗi: %s:%ld" -#: builtin/apply.c:3078 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "không thể \"checkout\" %s" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "đọc %s gặp lỗi" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "đường dẫn %s đã bị xóa/đổi tên" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, 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:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s: %s" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s: không khớp trong mục lục" -#: builtin/apply.c:3348 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "loại bỏ miếng vá để lại nội dung tập tin" -#: builtin/apply.c:3417 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s: sai kiểu" -#: builtin/apply.c:3419 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "%s có kiểu %o, mong chờ %o" -#: builtin/apply.c:3520 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s: đã có từ trước trong bảng mục lục" -#: builtin/apply.c:3523 +#: builtin/apply.c:3536 #, 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:3543 +#: builtin/apply.c:3556 #, 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:3548 +#: builtin/apply.c:3561 #, 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:3556 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s: miếng vá không được áp dụng" -#: builtin/apply.c:3569 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "Đang kiểm tra miếng vá %s..." -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, 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:3767 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "không thể gỡ bỏ %s từ mục lục" -#: builtin/apply.c:3795 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "miếng vá sai hỏng cho dự án con (subproject) %s" -#: builtin/apply.c:3799 +#: builtin/apply.c:3850 #, 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:3804 +#: builtin/apply.c:3855 #, 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:3807 builtin/apply.c:3915 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, 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:3840 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "đang đóng tập tin “%s”" -#: builtin/apply.c:3889 +#: builtin/apply.c:3940 #, 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:3976 +#: builtin/apply.c:4027 #, 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:3984 +#: builtin/apply.c:4035 msgid "internal error" msgstr "lỗi nội bộ" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4038 #, 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:3997 +#: builtin/apply.c:4048 #, 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:4018 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "Khối nhớ #%d được áp dụng gọn gàng." -#: builtin/apply.c:4021 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "hunk #%d bị từ chối." -#: builtin/apply.c:4171 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "không thừa nhận đầu vào" -#: builtin/apply.c:4182 +#: builtin/apply.c:4233 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:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "đường-dẫn" -#: builtin/apply.c:4302 +#: builtin/apply.c:4353 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:4305 +#: builtin/apply.c:4356 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:4307 +#: builtin/apply.c:4358 msgid "num" msgstr "số" -#: builtin/apply.c:4308 +#: builtin/apply.c:4359 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:4311 +#: builtin/apply.c:4362 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:4313 +#: builtin/apply.c:4364 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:4317 +#: builtin/apply.c:4368 msgid "show number of added and deleted lines in decimal notation" msgstr "" "hiển thị số lượng các dòng được thêm vào và xóa đi theo ký hiệu thập phân" -#: builtin/apply.c:4319 +#: builtin/apply.c:4370 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:4321 +#: builtin/apply.c:4372 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:4323 +#: builtin/apply.c:4374 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:4325 +#: builtin/apply.c:4376 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:4327 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "" "đồng thời áp dụng miếng vá (dùng với tùy chọn --stat/--summary/--check)" -#: builtin/apply.c:4329 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "thử hòa trộn kiểu three-way nếu việc vá không thể thực hiện được" -#: builtin/apply.c:4331 +#: builtin/apply.c:4382 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:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 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:4336 +#: builtin/apply.c:4387 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:4337 +#: builtin/apply.c:4388 msgid "action" msgstr "hành động" -#: builtin/apply.c:4338 +#: builtin/apply.c:4389 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:4341 builtin/apply.c:4344 +#: builtin/apply.c:4392 builtin/apply.c:4395 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:4347 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "áp dụng miếng vá theo chiều ngược" -#: builtin/apply.c:4349 +#: builtin/apply.c:4400 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:4351 +#: builtin/apply.c:4402 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:4353 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "cho phép chồng khối nhớ" -#: builtin/apply.c:4356 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "" "đã dò tìm thấy dung sai không chính xác thiếu dòng mới tại cuối tập tin" -#: builtin/apply.c:4359 +#: builtin/apply.c:4410 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:4361 +#: builtin/apply.c:4412 msgid "root" msgstr "root" -#: builtin/apply.c:4362 +#: builtin/apply.c:4413 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:4384 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "--3way ở ngoài một kho chứa" -#: builtin/apply.c:4392 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "--index ở ngoài một kho chứa" -#: builtin/apply.c:4395 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "--cached ở ngoài một kho chứa" -#: builtin/apply.c:4411 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "không thể mở miếng vá “%s”" -#: builtin/apply.c:4425 +#: builtin/apply.c:4476 #, 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:4431 builtin/apply.c:4441 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2119,97 +2207,97 @@ msgstr "git blame [các-tùy-chọn] [rev-opts] [rev] [--] tập-tin" msgid "[rev-opts] are documented in git-rev-list(1)" msgstr "[rev-opts] được mô tả trong git-rev-list(1)" -#: builtin/blame.c:2374 +#: builtin/blame.c:2350 msgid "Show blame entries as we find them, incrementally" msgstr "Hiển thị các mục “blame” như là chúng ta thấy chúng, tăng dần" -#: builtin/blame.c:2375 +#: builtin/blame.c:2351 msgid "Show blank SHA-1 for boundary commits (Default: off)" msgstr "" "Hiển thị SHA-1 trắng cho những lần chuyển giao biên giới (Mặc định: off)" -#: builtin/blame.c:2376 +#: builtin/blame.c:2352 msgid "Do not treat root commits as boundaries (Default: off)" msgstr "Không coi các lần chuyển giao gốc là giới hạn (Mặc định: off)" -#: builtin/blame.c:2377 +#: builtin/blame.c:2353 msgid "Show work cost statistics" msgstr "Hiển thị thống kê công sức làm việc" -#: builtin/blame.c:2378 +#: builtin/blame.c:2354 msgid "Show output score for blame entries" msgstr "Hiển thị kết xuất điểm số có các mục tin “blame”" -#: builtin/blame.c:2379 +#: builtin/blame.c:2355 msgid "Show original filename (Default: auto)" msgstr "Hiển thị tên tập tin gốc (Mặc định: auto)" -#: builtin/blame.c:2380 +#: builtin/blame.c:2356 msgid "Show original linenumber (Default: off)" msgstr "Hiển thị số dòng gốc (Mặc định: off)" -#: builtin/blame.c:2381 +#: builtin/blame.c:2357 msgid "Show in a format designed for machine consumption" msgstr "Hiển thị ở định dạng đã thiết kế cho sự tiêu dùng bằng máy" -#: builtin/blame.c:2382 +#: builtin/blame.c:2358 msgid "Show porcelain format with per-line commit information" msgstr "Hiển thị định dạng “porcelain” với thông tin chuyển giao mỗi dòng" -#: builtin/blame.c:2383 +#: builtin/blame.c:2359 msgid "Use the same output mode as git-annotate (Default: off)" msgstr "Dùng cùng chế độ xuất ra vóigit-annotate (Mặc định: off)" -#: builtin/blame.c:2384 +#: builtin/blame.c:2360 msgid "Show raw timestamp (Default: off)" msgstr "Hiển thị dấu vết thời gian dạng thô (Mặc định: off)" -#: builtin/blame.c:2385 +#: builtin/blame.c:2361 msgid "Show long commit SHA1 (Default: off)" msgstr "Hiển thị SHA1 của lần chuyển giao (commit) dạng dài (Mặc định: off)" -#: builtin/blame.c:2386 +#: builtin/blame.c:2362 msgid "Suppress author name and timestamp (Default: off)" msgstr "Không hiển thị tên tác giả và dấu vết thời gian (Mặc định: off)" -#: builtin/blame.c:2387 +#: builtin/blame.c:2363 msgid "Show author email instead of name (Default: off)" msgstr "Hiển thị thư điện tử của tác giả thay vì tên (Mặc định: off)" -#: builtin/blame.c:2388 +#: builtin/blame.c:2364 msgid "Ignore whitespace differences" msgstr "Bỏ qua các khác biệt do khoảng trắng gây ra" -#: builtin/blame.c:2389 +#: builtin/blame.c:2365 msgid "Spend extra cycles to find better match" msgstr "Tiêu thụ thêm năng tài nguyên máy móc để tìm kiếm tốt hơn nữa" -#: builtin/blame.c:2390 +#: builtin/blame.c:2366 msgid "Use revisions from <file> instead of calling git-rev-list" msgstr "" "Sử dụng điểm xét duyệt (revision) từ <tập tin> thay vì gọi “git-rev-list”" -#: builtin/blame.c:2391 +#: builtin/blame.c:2367 msgid "Use <file>'s contents as the final image" msgstr "Sử dụng nội dung của <tập tin> như là ảnh cuối cùng" -#: builtin/blame.c:2392 builtin/blame.c:2393 +#: builtin/blame.c:2368 builtin/blame.c:2369 msgid "score" msgstr "điểm số" -#: builtin/blame.c:2392 +#: builtin/blame.c:2368 msgid "Find line copies within and across files" msgstr "Tìm các bản sao chép dòng trong và ngang qua tập tin" -#: builtin/blame.c:2393 +#: builtin/blame.c:2369 msgid "Find line movements within and across files" msgstr "Tìm các di chuyển dòng trong và ngang qua tập tin" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "n,m" msgstr "n,m" -#: builtin/blame.c:2394 +#: builtin/blame.c:2370 msgid "Process only line range n,m, counting from 1" msgstr "Xử lý chỉ dòng vùng n,m, tính từ 1" @@ -2291,7 +2379,7 @@ msgstr "không tìm thấy nhánh “%s”." #: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" -msgstr "Gặp lỗi khi đang xóa nhánh máy chủ “%s”" +msgstr "Gặp lỗi khi đang xóa nhánh trên máy chủ “%s”" #: builtin/branch.c:251 #, c-format @@ -2301,7 +2389,7 @@ msgstr "Lỗi khi xoá bỏ nhánh “%s”" #: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" -msgstr "Nhánh máy chủ \"%s\" đã bị xóa (từng là %s).\n" +msgstr "Nhánh trên máy chủ \"%s\" đã bị xóa (từng là %s).\n" #: builtin/branch.c:259 #, c-format @@ -2343,10 +2431,19 @@ msgstr "[%s: trước %d, sau %d]" msgid "[ahead %d, behind %d]" msgstr "[trước %d, sau %d]" +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** tham chiếu sai ****" + #: builtin/branch.c:560 msgid "(no branch)" msgstr "(không nhánh)" +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "đối tượng “%s” không chỉ đến một lần chuyển giao (commit) nào cả" + #: builtin/branch.c:625 msgid "some refs could not be read" msgstr "một số tham chiếu đã không thể đọc được" @@ -2417,8 +2514,8 @@ msgid "act on remote-tracking branches" msgstr "thao tác trên nhánh “remote-tracking”" #: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 -#: builtin/branch.c:794 builtin/commit.c:1376 builtin/commit.c:1377 -#: builtin/commit.c:1378 builtin/commit.c:1379 builtin/tag.c:470 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 msgid "commit" msgstr "commit" @@ -2480,33 +2577,59 @@ msgstr "liệt kê các nhánh trong các cột" #: builtin/branch.c:811 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ệ." +msgstr "Gặp lỗi khi phân giải HEAD như là một tham chiếu (ref) hợp lệ." #: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "không tìm thấy HEAD ở dưới refs/heads!" -#: builtin/branch.c:836 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "--column và --verbose xung khắc nhau" -#: builtin/branch.c:887 +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "cần tên nhánh" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "Không thể đưa ra mô tả HEAD đã tách rời" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "không thể sửa mô tả cho nhiều hơn một nhánh" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "Vẫn chưa chuyển giao trên nhánh “%s”." + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "Không có nhánh nào có tên “%s”." + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "quá nhiều nhánh dành cho thao tác đổi tên" + +#: builtin/branch.c:893 #, c-format msgid "branch '%s' does not exist" msgstr "nhánh “%s” chưa sẵn có" -#: builtin/branch.c:899 +#: builtin/branch.c:905 #, c-format msgid "Branch '%s' has no upstream information" msgstr "Nhánh “%s” không có thông tin thượng nguồn (upstream)" -#: builtin/branch.c:914 +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "" "hai tùy chọn -a và -r áp dụng cho lệnh “git branch” không hợp lý đối với tên " "nhánh" -#: builtin/branch.c:917 +#: builtin/branch.c:923 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" @@ -2515,7 +2638,7 @@ msgstr "" "Cờ --set-upstream bị phản đối và sẽ bị xóa bỏ. Nên dùng --track hoặc --set-" "upstream-to\n" -#: builtin/branch.c:934 +#: builtin/branch.c:940 #, c-format msgid "" "\n" @@ -2526,12 +2649,12 @@ msgstr "" "Nếu bạn muốn “%s” theo dõi “%s”, thực hiện lệnh sau:\n" "\n" -#: builtin/branch.c:935 +#: builtin/branch.c:941 #, c-format msgid " git branch -d %s\n" msgstr " git branch -d %s\n" -#: builtin/branch.c:936 +#: builtin/branch.c:942 #, c-format msgid " git branch --set-upstream-to %s\n" msgstr " git branch --set-upstream-to %s\n" @@ -2607,14 +2730,38 @@ msgstr "báo cáo tất cả các thuộc tính đặt trên tập tin" msgid "use .gitattributes only from the index" msgstr "chỉ sử dụng .gitattributes từ bảng mục lục" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" msgstr "đọc tên tập tin từ đầu vào tiêu chuẩn" -#: builtin/check-attr.c:23 +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" msgstr "các đường dẫn được ngăn cách bởi ký tự null" +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "chặn các báo cáo tiến trình hoạt động" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "không thể chỉ định các tên đường dẫn với --stdin" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "-z chỉ hợp lý với --stdin" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "chưa ghi rõ đường dẫn" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "--quiet chỉ hợp lệ với tên đường dẫn đơn" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "không thể dùng cả hai tùy chọn --quiet và --verbose" + #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" msgstr "git checkout-index [các-tùy-chọn] [--] [<tập-tin>...]" @@ -2726,7 +2873,7 @@ msgstr "đường dẫn “%s” không được hòa trộn" #: builtin/checkout.c:448 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 đã!" +msgstr "bạn cần phải phân giải bảng mục lục hiện tại của bạn trước đã" #: builtin/checkout.c:569 #, c-format @@ -2853,10 +3000,6 @@ msgstr "“%s” không thể được sử dụng với “%s”" msgid "Cannot switch branch to a non-commit '%s'" msgstr "Không thể chuyển nhánh đến một non-commit “%s”" -#: builtin/checkout.c:1012 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "chặn các báo cáo tiến trình hoạt động" - #: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 msgid "branch" @@ -2912,7 +3055,7 @@ msgstr "thực hiện hòa trộn kiểu 3-way với nhánh mới" msgid "update ignored files (default)" msgstr "cập nhật các tập tin bị bỏ qua (mặc định)" -#: builtin/checkout.c:1029 builtin/log.c:1116 parse-options.h:241 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 msgid "style" msgstr "kiểu" @@ -2963,51 +3106,76 @@ msgstr "" "git checkout: --ours/--theirs, --force và --merge là xung khắc với nhau khi\n" "checkout bảng mục lục (index)." -#: builtin/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." msgstr "git clean [-d] [-f] [-n] [-q] [-e <mẫu>] [-x | -X] [--] <đường-dẫn>..." -#: builtin/clean.c:51 +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "Đang gỡ bỏ %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "Có thể gỡ bỏ %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "Đang bỏ qua kho chứa %s\n" + +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "Nên bỏ qua kho chứa %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "gặp lỗi khi gỡ bỏ %s" + +#: builtin/clean.c:160 msgid "do not print names of files removed" msgstr "không hiển thị tên của các tập tin đã gỡ bỏ" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" msgstr "ép buộc" -#: builtin/clean.c:55 +#: builtin/clean.c:164 msgid "remove whole directories" msgstr "gỡ bỏ toàn bộ thư mục" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:717 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:182 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" msgstr "mẫu" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" msgstr "thêm <mẫu> vào trong qui tắc bỏ qua" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" msgstr "đồng thời gỡ bỏ cả các tập tin bị bỏ qua" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" msgstr "chỉ gỡ bỏ những tập tin bị bỏ qua" -#: builtin/clean.c:78 +#: builtin/clean.c:187 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 +#: builtin/clean.c:191 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 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" @@ -3015,37 +3183,12 @@ 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:36 msgid "git clone [options] [--] <repo> [<dir>]" msgstr "git clone [các-tùy-chọn] [--] <kho> [<t.mục>]" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/push.c:436 msgid "force progress reporting" msgstr "ép buộc báo cáo tiến trình" @@ -3195,56 +3338,60 @@ msgstr "Bạn phải chỉ định một kho để mà nhân bản (clone)." msgid "--bare and --origin %s options are incompatible." msgstr "tùy chọn --bare và --origin %s xung khắc nhau." -#: builtin/clone.c:719 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "tùy chọn --bare và --separate-git-dir xung khắc nhau." + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "kho chứa “%s” chưa tồn tại" -#: builtin/clone.c:724 +#: builtin/clone.c:726 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:734 +#: builtin/clone.c:736 #, 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:744 +#: builtin/clone.c:746 #, 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:757 builtin/clone.c:771 +#: builtin/clone.c:759 builtin/clone.c:771 #, 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:760 +#: builtin/clone.c:762 #, 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:779 +#: builtin/clone.c:781 #, 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:781 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "Đang nhân bản thành “%s”...\n" -#: builtin/clone.c:823 +#: builtin/clone.c:818 #, 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:872 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "Nhánh máy chủ %s không tìm thấy trong thượng nguồn (upstream) %s" -#: builtin/clone.c:879 +#: builtin/clone.c:874 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." @@ -3281,12 +3428,12 @@ msgid "--command must be the first argument" msgstr "--command phải là đối số đầu tiên" #: builtin/commit.c:34 -msgid "git commit [options] [--] <filepattern>..." -msgstr "git commit [các-tùy-chọn] [--] <mẫu-tập-tin>..." +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [các-tùy-chọn] [--] <pathspec>..." #: builtin/commit.c:39 -msgid "git status [options] [--] <filepattern>..." -msgstr "git status [các-tùy-chọn] [--] <mẫu-tập-tin>..." +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [các-tùy-chọn] [--] <pathspec>..." #: builtin/commit.c:44 msgid "" @@ -3401,7 +3548,7 @@ msgstr "Chuỗi thụt lề đầu dòng dị hình: “%s”" msgid "could not lookup commit %s" msgstr "không thể tìm kiếm commit (lần chuyển giao) %s" -#: builtin/commit.c:610 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, 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" @@ -3467,25 +3614,27 @@ msgstr "" "và thử lại.\n" #: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' 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" +"bắt đầu bằng “%c” sẽ được bỏ qua, nếu phần chú thích rỗng sẽ hủy bỏ lần " +"chuyển giao (commit).\n" #: builtin/commit.c:740 +#, c-format 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" +"with '%c' 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 " +"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" +"bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi nếu muốn thế.\n" +"Phần chú thích này nếu trống rỗng sẽ hủy bỏ lần chuyển giao (commit).\n" #: builtin/commit.c:753 #, c-format @@ -3505,7 +3654,7 @@ msgstr "không đọc được bảng mục lục" msgid "Error building trees" msgstr "Gặp lỗi khi xây dựng cây" -#: builtin/commit.c:832 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, 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" @@ -3515,120 +3664,120 @@ msgstr "Xin hãy áp dụng thông điệp sử dụng hoặc là tùy chọn -m msgid "No existing author found with '%s'" msgstr "Không tìm thấy tác giả có sẵn với “%s”" -#: builtin/commit.c:944 builtin/commit.c:1148 +#: builtin/commit.c:944 builtin/commit.c:1138 #, 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:984 +#: builtin/commit.c:974 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:995 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "Không có gì để amend (tu bổ) cả." -#: builtin/commit.c:998 +#: builtin/commit.c:988 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:1000 +#: builtin/commit.c:990 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:1003 +#: builtin/commit.c:993 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:1013 +#: builtin/commit.c:1003 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:1015 +#: builtin/commit.c:1005 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:1023 +#: builtin/commit.c:1013 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:1040 +#: builtin/commit.c:1030 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:1042 +#: builtin/commit.c:1032 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:1044 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "Giỏi... tu bổ cái cuối với bảng mục lục phi nghĩa." -#: builtin/commit.c:1046 +#: builtin/commit.c:1036 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:1056 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "Chế độ dọn dẹp không hợp lệ %s" -#: builtin/commit.c:1061 +#: builtin/commit.c:1051 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:1067 builtin/commit.c:1202 +#: builtin/commit.c:1057 builtin/commit.c:1192 msgid "--long and -z are incompatible" msgstr "hai tùy chọn -long và -z không tương thích với nhau" -#: builtin/commit.c:1162 builtin/commit.c:1398 +#: builtin/commit.c:1152 builtin/commit.c:1388 msgid "show status concisely" msgstr "hiển thị trạng thái ở dạng súc tích" -#: builtin/commit.c:1164 builtin/commit.c:1400 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show branch information" msgstr "hiển thị thông tin nhánh" -#: builtin/commit.c:1166 builtin/commit.c:1402 builtin/push.c:389 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 msgid "machine-readable output" msgstr "kết xuất dạng máy-có-thể-đọc" -#: builtin/commit.c:1169 builtin/commit.c:1404 +#: builtin/commit.c:1159 builtin/commit.c:1394 msgid "show status in long format (default)" msgstr "hiển thị trạng thái ở định dạng dài (mặc định)" -#: builtin/commit.c:1172 builtin/commit.c:1407 +#: builtin/commit.c:1162 builtin/commit.c:1397 msgid "terminate entries with NUL" msgstr "chấm dứt các mục bằng NUL" -#: builtin/commit.c:1174 builtin/commit.c:1410 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 msgid "mode" msgstr "chế độ" -#: builtin/commit.c:1175 builtin/commit.c:1410 +#: builtin/commit.c:1165 builtin/commit.c:1400 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" msgstr "" "hiển thị các tập tin chưa được theo dõi dấu vết, các chế độ tùy chọn: all, " "normal, no. (Mặc định: all)" -#: builtin/commit.c:1178 +#: builtin/commit.c:1168 msgid "show ignored files" msgstr "hiển thị các tập tin ẩn" -#: builtin/commit.c:1179 parse-options.h:151 +#: builtin/commit.c:1169 parse-options.h:151 msgid "when" msgstr "khi" -#: builtin/commit.c:1180 +#: builtin/commit.c:1170 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" @@ -3636,223 +3785,223 @@ msgstr "" "bỏ qua các thay đổi trong mô-đun con, tùy chọn khi: all, dirty, untracked. " "(Mặc định: all)" -#: builtin/commit.c:1182 +#: builtin/commit.c:1172 msgid "list untracked files in columns" msgstr "hiển thị danh sách các tập-tin chưa được theo dõi trong các cột" -#: builtin/commit.c:1256 +#: builtin/commit.c:1246 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:1258 +#: builtin/commit.c:1248 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:1299 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "đã rời khỏi HEAD" -#: builtin/commit.c:1301 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr " (root-commit)" -#: builtin/commit.c:1368 +#: builtin/commit.c:1358 msgid "suppress summary after successful commit" msgstr "không hiển thị tổng kết sau khi chuyển giao thành công" -#: builtin/commit.c:1369 +#: builtin/commit.c:1359 msgid "show diff in commit message template" msgstr "hiển thị sự khác biệt trong mẫu tin nhắn chuyển giao" -#: builtin/commit.c:1371 +#: builtin/commit.c:1361 msgid "Commit message options" msgstr "Các tùy chọn ghi chú commit" -#: builtin/commit.c:1372 builtin/tag.c:459 +#: builtin/commit.c:1362 builtin/tag.c:457 msgid "read message from file" msgstr "đọc chú thích từ tập tin" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "author" msgstr "tác giả" -#: builtin/commit.c:1373 +#: builtin/commit.c:1363 msgid "override author for commit" msgstr "ghi đè tác giả cho commit" -#: builtin/commit.c:1374 builtin/gc.c:178 +#: builtin/commit.c:1364 builtin/gc.c:178 msgid "date" msgstr "ngày tháng" -#: builtin/commit.c:1374 +#: builtin/commit.c:1364 msgid "override date for commit" msgstr "ghi đè ngày tháng cho commit" -#: builtin/commit.c:1375 builtin/merge.c:206 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/tag.c:457 +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 msgid "message" msgstr "thông điệp" -#: builtin/commit.c:1375 +#: builtin/commit.c:1365 msgid "commit message" msgstr "chú thích của lần commit" -#: builtin/commit.c:1376 +#: builtin/commit.c:1366 msgid "reuse and edit message from specified commit" msgstr "" "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho nhưng có cho sửa chữa" -#: builtin/commit.c:1377 +#: builtin/commit.c:1367 msgid "reuse message from specified commit" msgstr "dùng lại các ghi chú từ lần chuyển giao (commit) đã cho" -#: builtin/commit.c:1378 +#: builtin/commit.c:1368 msgid "use autosquash formatted message to fixup specified commit" msgstr "" "dùng ghi chú có định dạng autosquash để sửa chữa lần chuyển giao đã chỉ ra" -#: builtin/commit.c:1379 +#: builtin/commit.c:1369 msgid "use autosquash formatted message to squash specified commit" msgstr "" "dùng lời nhắn có định dạng tự động nén để nén lại các lần chuyển giao đã chỉ " "ra" -#: builtin/commit.c:1380 +#: builtin/commit.c:1370 msgid "the commit is authored by me now (used with -C/-c/--amend)" msgstr "" "lần chuyển giao nhận tôi là tác giả (được dùng với tùy chọn -C/-c/--amend)" -#: builtin/commit.c:1381 builtin/log.c:1073 builtin/revert.c:109 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 msgid "add Signed-off-by:" msgstr "thêm dòng Signed-off-by:" -#: builtin/commit.c:1382 +#: builtin/commit.c:1372 msgid "use specified template file" msgstr "sử dụng tập tin mẫu đã cho" -#: builtin/commit.c:1383 +#: builtin/commit.c:1373 msgid "force edit of commit" msgstr "ép buộc sửa lần commit" -#: builtin/commit.c:1384 +#: builtin/commit.c:1374 msgid "default" msgstr "mặc định" -#: builtin/commit.c:1384 builtin/tag.c:462 +#: builtin/commit.c:1374 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" msgstr "làm thế nào để cắt bỏ khoảng trắng và #ghichú từ mẩu tin nhắn" -#: builtin/commit.c:1385 +#: builtin/commit.c:1375 msgid "include status in commit message template" msgstr "bao gồm các trạng thái ghi mẫu ghi chú chuyển giao (commit)" -#: builtin/commit.c:1386 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 msgid "key id" msgstr "id khóa" -#: builtin/commit.c:1387 builtin/merge.c:214 +#: builtin/commit.c:1377 builtin/merge.c:214 msgid "GPG sign commit" msgstr "ký lần commit dùng GPG" #. end commit message options -#: builtin/commit.c:1390 +#: builtin/commit.c:1380 msgid "Commit contents options" msgstr "Các tùy nội dung ghi chú commit" -#: builtin/commit.c:1391 +#: builtin/commit.c:1381 msgid "commit all changed files" msgstr "chuyển giao tất cả các tập tin có thay đổi" -#: builtin/commit.c:1392 +#: builtin/commit.c:1382 msgid "add specified files to index for commit" msgstr "thêm các tập tin đã chỉ ra vào bảng mục lục để chuyển giao (commit)" -#: builtin/commit.c:1393 +#: builtin/commit.c:1383 msgid "interactively add files" msgstr "thêm các tập-tin bằng tương tác" -#: builtin/commit.c:1394 +#: builtin/commit.c:1384 msgid "interactively add changes" msgstr "thêm các thay đổi bằng tương tác" -#: builtin/commit.c:1395 +#: builtin/commit.c:1385 msgid "commit only specified files" msgstr "chỉ chuyển giao các tập tin đã chỉ ra" -#: builtin/commit.c:1396 +#: builtin/commit.c:1386 msgid "bypass pre-commit hook" msgstr "vòng qua móc (hook) pre-commit" -#: builtin/commit.c:1397 +#: builtin/commit.c:1387 msgid "show what would be committed" msgstr "hiển thị xem cái gì có thể được chuyển giao" -#: builtin/commit.c:1408 +#: builtin/commit.c:1398 msgid "amend previous commit" msgstr "tu bổ (amend) lần commit trước" -#: builtin/commit.c:1409 +#: builtin/commit.c:1399 msgid "bypass post-rewrite hook" msgstr "vòng qua móc (hook) post-rewrite" -#: builtin/commit.c:1414 +#: builtin/commit.c:1404 msgid "ok to record an empty change" msgstr "ok để ghi lại một thay đổi trống rỗng" -#: builtin/commit.c:1417 +#: builtin/commit.c:1407 msgid "ok to record a change with an empty message" msgstr "ok để ghi các thay đổi với lời nhắn trống rỗng" -#: builtin/commit.c:1449 +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "không thể phân tích commit (lần chuyển giao) HEAD" -#: builtin/commit.c:1487 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "không thể mở “%s” để đọc" -#: builtin/commit.c:1494 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "Tập tin MERGE_HEAD sai hỏng (%s)" -#: builtin/commit.c:1501 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "không thể đọc MERGE_MODE" -#: builtin/commit.c:1520 +#: builtin/commit.c:1510 #, 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:1534 +#: builtin/commit.c:1524 #, 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:1539 +#: builtin/commit.c:1529 #, 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:1554 builtin/merge.c:832 builtin/merge.c:857 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "gặp lỗi khi ghi đối tượng chuyển giao (commit)" -#: builtin/commit.c:1575 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "không thể khóa HEAD ref (tham chiếu)" -#: builtin/commit.c:1579 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "không thể cập nhật ref (tham chiếu) HEAD" -#: builtin/commit.c:1590 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -4157,39 +4306,39 @@ msgstr "đã cho đối tượng không thể nắm giữ “%s”." msgid "git fast-export [rev-list-opts]" msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:635 +#: builtin/fast-export.c:646 msgid "show progress after <n> objects" msgstr "hiển thị tiến triển sau <n> đối tượng" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:648 msgid "select handling of signed tags" msgstr "chọn điều khiển của thẻ đã ký" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:651 msgid "select handling of tags that tag filtered objects" msgstr "chọn sự xử lý của các thẻ, cái mà đánh thẻ các đối tượng được lọc ra" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:654 msgid "Dump marks to this file" msgstr "Đổ các đánh dấu này vào tập-tin" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:656 msgid "Import marks from this file" msgstr "nhập vào đánh dấu từ tập tin này" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:658 msgid "Fake a tagger when tags lack one" msgstr "Làm giả một cái thẻ khi thẻ bị thiếu một cái" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:660 msgid "Output full tree for each commit" msgstr "Xuất ra toàn bộ cây cho mỗi lần chuyển giao" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:662 msgid "Use the done feature to terminate the stream" msgstr "Sử dụng tính năng done để chấm dứt luồng dữ liệu" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:663 msgid "Skip output of blob data" msgstr "Bỏ qua kết xuất của dữ liệu blob" @@ -4263,88 +4412,92 @@ msgstr "cho phép cập nhật ref (tham chiếu) HEAD" msgid "deepen history of shallow clone" msgstr "làm sâu hơn lịch sử của bản sao" -#: builtin/fetch.c:85 builtin/log.c:1088 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "chuyển đổi hoàn toàn sang kho git" + +#: builtin/fetch.c:88 builtin/log.c:1119 msgid "dir" msgstr "tmục" -#: builtin/fetch.c:86 +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" msgstr "soạn sẵn cái này cho kết xuất đường dẫn mô-đun-con" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" msgstr "chế độ mặc định cho đệ qui" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 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:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "Không tìm thấy đối tượng %s" -#: builtin/fetch.c:259 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[đã cập nhật]" -#: builtin/fetch.c:273 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s (không thể fetch (lấy) về nhánh hiện hành)" -#: builtin/fetch.c:274 builtin/fetch.c:360 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[Bị từ chối]" -#: builtin/fetch.c:285 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[cập nhật thẻ]" -#: builtin/fetch.c:287 builtin/fetch.c:322 builtin/fetch.c:340 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 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 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[thẻ mới]" -#: builtin/fetch.c:308 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[nhánh mới]" -#: builtin/fetch.c:311 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[ref (tham chiếu) mới]" -#: builtin/fetch.c:356 +#: builtin/fetch.c:359 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 +#: builtin/fetch.c:359 msgid "forced update" msgstr "cưỡng bức cập nhật" -#: builtin/fetch.c:362 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "(non-fast-forward)" -#: builtin/fetch.c:393 builtin/fetch.c:685 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "không thể mở %s: %s\n" -#: builtin/fetch.c:402 +#: builtin/fetch.c:405 #, 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 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "Từ %.*s\n" -#: builtin/fetch.c:499 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4353,57 +4506,57 @@ 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 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" msgstr " (%s sẽ trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:550 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" msgstr " (%s đã trở thành không đầu (không được quản lý))" -#: builtin/fetch.c:557 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[đã xóa]" -#: builtin/fetch.c:558 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "(không)" -#: builtin/fetch.c:675 +#: builtin/fetch.c:678 #, 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 +#: builtin/fetch.c:712 #, 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 +#: builtin/fetch.c:789 #, 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 +#: builtin/fetch.c:792 #, 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:891 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "Đang lấy (fetch) %s\n" -#: builtin/fetch.c:893 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "không thể fetch (lấy) %s" -#: builtin/fetch.c:912 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." @@ -4411,24 +4564,32 @@ 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:932 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "Bạn phải định rõ tên thẻ." -#: builtin/fetch.c:984 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "tùy chọn --depth và --unshallow không thể sử dụng cùng với nhau" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "--unshallow trên kho hoàn chỉnh là không hợp lý" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "lệnh lấy về \"fetch --all\" không lấy đối số kho chứa" -#: builtin/fetch.c:986 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "lệnh lấy về \"fetch --all\" không hợp lý với refspecs" -#: builtin/fetch.c:997 +#: builtin/fetch.c:1015 #, 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:1005 +#: builtin/fetch.c:1023 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ý" @@ -4437,29 +4598,29 @@ msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" "git fmt-merge-msg [-m <thông điệp>] [--log[=<n>]|--no-log] [--file <tập-tin>]" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:701 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 #: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" msgstr "n" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:660 msgid "populate log with at most <n> entries from shortlog" msgstr "gắn nhật ký với ít nhất <n> mục từ lệnh “shortlog”" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:663 msgid "alias for --log (deprecated)" msgstr "bí danh cho --log (không được dùng)" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:666 msgid "text" msgstr "văn bản" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:667 msgid "use <text> as start of message" msgstr "dùng <văn bản thường> để bắt đầu ghi chú" -#: builtin/fmt-merge-msg.c:662 +#: builtin/fmt-merge-msg.c:668 msgid "file to read from" msgstr "tập tin để đọc dữ liệu từ đó" @@ -4617,7 +4778,7 @@ msgstr "không thể thực hiện lệnh grep (lọc tìm) từ đối tượng #: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" -msgstr "chuyển đến `%c' cần một giá trị bằng số" +msgstr "chuyển đến “%c” cần một giá trị bằng số" #: builtin/grep.c:568 #, c-format @@ -4802,25 +4963,25 @@ msgstr "chưa chỉ ra mẫu." msgid "bad object %s" msgstr "đối tượng sai %s" -#: builtin/grep.c:866 +#: builtin/grep.c:868 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:889 +#: builtin/grep.c:891 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:894 +#: builtin/grep.c:896 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:897 +#: builtin/grep.c:899 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:905 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "cả hai --cached và các cây phải được chỉ ra." @@ -4860,50 +5021,50 @@ msgstr "lưu các tập tin mà nó không có các bộ lọc" msgid "process file as it were from this path" msgstr "xử lý tập tin như là nó đang ở thư mục này" -#: builtin/help.c:43 +#: builtin/help.c:42 msgid "print all available commands" msgstr "hiển thị danh sách các câu lệnh người dùng có thể sử dụng" -#: builtin/help.c:44 +#: builtin/help.c:43 msgid "show man page" msgstr "hiển thị trang man" -#: builtin/help.c:45 +#: builtin/help.c:44 msgid "show manual in web browser" msgstr "hiển thị hướng dẫn sử dụng trong trình duyệt web" -#: builtin/help.c:47 +#: builtin/help.c:46 msgid "show info page" msgstr "hiện trang info" -#: builtin/help.c:53 +#: builtin/help.c:52 msgid "git help [--all] [--man|--web|--info] [command]" msgstr "git help [--all] [--man|--web|--info] [lệnh]" -#: builtin/help.c:65 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "không nhận ra định dạng trợ giúp “%s”" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "Lỗi khởi chạy emacsclient." -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "Gặp lỗi khi phân tích phiên bản emacsclient." -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." msgstr "phiên bản của emacsclient “%d” quá cũ (< 22)." -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "gặp lỗi khi thực thi “%s”: %s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -4912,7 +5073,7 @@ 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:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -4921,32 +5082,28 @@ 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:299 -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:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "“%s”: không rõ chương trình xem man." -#: builtin/help.c:384 +#: builtin/help.c:366 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:392 +#: builtin/help.c:374 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:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "cách sử dụng: %s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" -msgstr "`git %s' được đặt bí danh thành `%s'" +msgstr "“git %s” được đặt bí danh thành “%s”" #: builtin/index-pack.c:170 #, c-format @@ -5389,238 +5546,246 @@ msgstr "Không thể truy cập thư mục làm việc hiện hành" msgid "Cannot access work tree '%s'" msgstr "không thể truy cập cây (tree) làm việc “%s”" -#: builtin/log.c:37 +#: builtin/log.c:39 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" msgstr "git log [<các-tùy-chọn>] [<kể-từ>..<cho-đến>] [[--] <đường-dẫn>...]\n" -#: builtin/log.c:38 +#: builtin/log.c:40 msgid " or: git show [options] <object>..." msgstr " or: git show [các-tùy-chọn] <đối-tượng>..." -#: builtin/log.c:100 +#: builtin/log.c:102 msgid "suppress diff output" msgstr "chặn mọi kết xuất từ diff" -#: builtin/log.c:101 +#: builtin/log.c:103 msgid "show source" msgstr "hiển thị mã nguồn" -#: builtin/log.c:102 +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "Sử dụng tập tin ánh xạ thư" + +#: builtin/log.c:105 msgid "decorate options" msgstr "các tùy chọn trang trí" -#: builtin/log.c:189 +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "Kết xuất cuối cùng: %d %s\n" -#: builtin/log.c:405 builtin/log.c:497 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "Không thể đọc đối tượng %s" -#: builtin/log.c:521 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "Không nhận ra kiểu: %d" -#: builtin/log.c:613 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers không có giá trị cụ thể" -#: builtin/log.c:687 +#: builtin/log.c:701 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:698 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "Không thể mở tập tin miếng vá: %s" -#: builtin/log.c:712 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "Cần chính xác một vùng." -#: builtin/log.c:720 +#: builtin/log.c:739 msgid "Not a range." msgstr "Không phải là một vùng." -#: builtin/log.c:794 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "”Cover letter” cần cho định dạng thư" -#: builtin/log.c:867 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "in-reply-to điên rồ: %s" -#: builtin/log.c:895 +#: builtin/log.c:913 msgid "git format-patch [options] [<since> | <revision range>]" msgstr "git format-patch [các-tùy-chọn] [<kể-từ> | <vùng-xem-xét>]" -#: builtin/log.c:940 +#: builtin/log.c:958 msgid "Two output directories?" msgstr "Hai thư mục kết xuất?" -#: builtin/log.c:1068 +#: builtin/log.c:1097 msgid "use [PATCH n/m] even with a single patch" msgstr "dùng [PATCH n/m] ngay cả với miếng vá đơn" -#: builtin/log.c:1071 +#: builtin/log.c:1100 msgid "use [PATCH] even with multiple patches" msgstr "dùng [VÁ] ngay cả với các miếng vá phức tạp" -#: builtin/log.c:1075 +#: builtin/log.c:1104 msgid "print patches to standard out" msgstr "hiển thị miếng vá ra đầu ra chuẩn" -#: builtin/log.c:1077 +#: builtin/log.c:1106 msgid "generate a cover letter" msgstr "tạo bì thư" -#: builtin/log.c:1079 +#: builtin/log.c:1108 msgid "use simple number sequence for output file names" msgstr "sử dụng chỗi dãy số dạng đơn giản cho tên tập-tin xuất ra" -#: builtin/log.c:1080 +#: builtin/log.c:1109 msgid "sfx" msgstr "sfx" -#: builtin/log.c:1081 +#: builtin/log.c:1110 msgid "use <sfx> instead of '.patch'" msgstr "sử dụng <sfx> thay cho “.patch”" -#: builtin/log.c:1083 +#: builtin/log.c:1112 msgid "start numbering patches at <n> instead of 1" msgstr "bắt đầu đánh số miếng vá từ <n> thay vì 1" -#: builtin/log.c:1085 +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "đánh dấu chuỗi nối tiếp dạng thứ-N re-roll" + +#: builtin/log.c:1116 msgid "Use [<prefix>] instead of [PATCH]" msgstr "Dùng [<tiền-tố>] thay cho [VÁ]" -#: builtin/log.c:1088 +#: builtin/log.c:1119 msgid "store resulting files in <dir>" msgstr "lưu các tập tin kết quả trong <t.mục>" -#: builtin/log.c:1091 +#: builtin/log.c:1122 msgid "don't strip/add [PATCH]" msgstr "không strip/add [VÁ]" -#: builtin/log.c:1094 +#: builtin/log.c:1125 msgid "don't output binary diffs" msgstr "không kết xuất diff (những khác biệt) nhị phân" -#: builtin/log.c:1096 +#: builtin/log.c:1127 msgid "don't include a patch matching a commit upstream" msgstr "không bao gồm miếng vá khớp với một lần chuyển giao thượng nguồn" -#: builtin/log.c:1098 +#: builtin/log.c:1129 msgid "show patch format instead of default (patch + stat)" msgstr "hiển thị định dạng miếng vá thay vì mặc định (miếng vá + thống kê)" -#: builtin/log.c:1100 +#: builtin/log.c:1131 msgid "Messaging" msgstr "Lời nhắn" -#: builtin/log.c:1101 +#: builtin/log.c:1132 msgid "header" msgstr "đầu đề thư" -#: builtin/log.c:1102 +#: builtin/log.c:1133 msgid "add email header" msgstr "thêm đầu đề thư" -#: builtin/log.c:1103 builtin/log.c:1105 +#: builtin/log.c:1134 builtin/log.c:1136 msgid "email" msgstr "thư điện tử" -#: builtin/log.c:1103 +#: builtin/log.c:1134 msgid "add To: header" msgstr "thêm To: đầu đề thư" -#: builtin/log.c:1105 +#: builtin/log.c:1136 msgid "add Cc: header" msgstr "thêm Cc: đầu đề thư" -#: builtin/log.c:1107 +#: builtin/log.c:1138 msgid "message-id" msgstr "message-id" -#: builtin/log.c:1108 +#: builtin/log.c:1139 msgid "make first mail a reply to <message-id>" msgstr "dùng thư đầu tiên để trả lời <message-id>" -#: builtin/log.c:1109 builtin/log.c:1112 +#: builtin/log.c:1140 builtin/log.c:1143 msgid "boundary" msgstr "ranh giới" -#: builtin/log.c:1110 +#: builtin/log.c:1141 msgid "attach the patch" msgstr "đính kèm miếng vá" -#: builtin/log.c:1113 +#: builtin/log.c:1144 msgid "inline the patch" msgstr "dùng miếng vá làm nội dung" -#: builtin/log.c:1117 +#: builtin/log.c:1148 msgid "enable message threading, styles: shallow, deep" msgstr "cho phép luồng lời nhắn, kiểu: “shallow”, “deep”" -#: builtin/log.c:1119 +#: builtin/log.c:1150 msgid "signature" msgstr "chữ ký" -#: builtin/log.c:1120 +#: builtin/log.c:1151 msgid "add a signature" msgstr "thêm chữ ký" -#: builtin/log.c:1122 +#: builtin/log.c:1153 msgid "don't print the patch filenames" msgstr "không hiển thị các tên tập tin của miếng vá" -#: builtin/log.c:1163 +#: builtin/log.c:1202 #, 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:1208 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n và -k loại từ lẫn nhau." -#: builtin/log.c:1210 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix và -k xung khắc nhau." -#: builtin/log.c:1218 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "--name-only không hợp lý" -#: builtin/log.c:1220 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "--name-status không hợp lý" -#: builtin/log.c:1222 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "--check không hợp lý" -#: builtin/log.c:1245 +#: builtin/log.c:1284 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:1247 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "Không thể tạo thư mục “%s”" -#: builtin/log.c:1400 +#: builtin/log.c:1439 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:1449 +#: builtin/log.c:1488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" msgstr "git cherry [-v] [<thượng-nguồn> [<head> [<giới-hạn>]]]" -#: builtin/log.c:1504 +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" @@ -5628,103 +5793,103 @@ msgstr "" "Không tìm thấy nhánh mạng bị theo vết, hãy chỉ định <thượng-nguồn> một cách " "thủ công.\n" -#: builtin/log.c:1517 builtin/log.c:1519 builtin/log.c:1531 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "Không hiểu lần chuyển giao (commit) %s" -#: builtin/ls-files.c:408 +#: builtin/ls-files.c:409 msgid "git ls-files [options] [<file>...]" msgstr "git ls-files [các-tùy-chọn] [<tập-tin>...]" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "identify the file status with tags" msgstr "nhận dạng các trạng thái tập tin với thẻ" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "use lowercase letters for 'assume unchanged' files" msgstr "" "dùng chữ cái viết thường cho các tập tin “assume unchanged” (giả định không " "thay đổi)" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show cached files in the output (default)" msgstr "hiển thị các tập tin được nhớ tạm vào đầu ra (mặc định)" -#: builtin/ls-files.c:469 +#: builtin/ls-files.c:472 msgid "show deleted files in the output" msgstr "hiển thị các tập tin đã xóa trong kết xuất" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:474 msgid "show modified files in the output" msgstr "hiển thị các tập tin đã bị sửa đổi ra kết xuất" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:476 msgid "show other files in the output" msgstr "hiển thị các tập tin khác trong kết xuất" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:478 msgid "show ignored files in the output" msgstr "hiển thị các tập tin bị bỏ qua trong kết xuất" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:481 msgid "show staged contents' object name in the output" msgstr "hiển thị tên đối tượng của nội dung được lưu trạng thái ở kết xuất" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show files on the filesystem that need to be removed" msgstr "hiển thị các tập tin trên hệ thống tập tin mà nó cần được gỡ bỏ" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show 'other' directories' name only" msgstr "chỉ hiển thị tên của các thư mục “khác”" -#: builtin/ls-files.c:485 +#: builtin/ls-files.c:488 msgid "don't show empty directories" msgstr "không hiển thị thư mục rỗng" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:491 msgid "show unmerged files in the output" msgstr "hiển thị các tập tin chưa hòa trộn trong kết xuất" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "show resolve-undo information" msgstr "hiển thị thông tin resolve-undo" -#: builtin/ls-files.c:492 +#: builtin/ls-files.c:495 msgid "skip files matching pattern" msgstr "bỏ qua những tập tin khớp với một mẫu" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "exclude patterns are read from <file>" msgstr "mẫu loại trừ được đọc từ <tập tin>" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "read additional per-directory exclude patterns in <file>" msgstr "đọc thêm các mẫu ngoại trừ mỗi thư mục trong <tập tin>" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "add the standard git exclusions" msgstr "thêm loại trừ tiêu chuẩn kiểu git" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:506 msgid "make the output relative to the project top directory" msgstr "làm cho kết xuất liên quan đến thư mục ở mức cao nhất (gốc) của dự án" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:509 msgid "if any <file> is not in the index, treat this as an error" msgstr "nếu <tập tin> bất kỳ không ở trong bảng mục lục, xử lý nó như một lỗi" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:510 msgid "tree-ish" msgstr "tree-ish" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:511 msgid "pretend that paths removed since <tree-ish> are still present" msgstr "" "giả định rằng các đường dẫn đã bị gỡ bỏ kể từ <tree-ish> nay vẫn hiện diện" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:513 msgid "show debugging data" msgstr "hiển thị dữ liệu gỡ lỗi" @@ -5778,7 +5943,7 @@ msgstr "git merge --abort" #: builtin/merge.c:90 msgid "switch `m' requires a value" -msgstr "switch `m' yêu cầu một giá trị" +msgstr "switch “m” yêu cầu một giá trị" #: builtin/merge.c:127 #, c-format @@ -5831,7 +5996,7 @@ msgstr "cho phép fast-forward (mặc định)" msgid "abort if fast-forward is not possible" msgstr "bỏ qua nếu fast-forward không thể được" -#: builtin/merge.c:202 builtin/notes.c:870 builtin/revert.c:112 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" msgstr "chiến lược" @@ -5936,21 +6101,22 @@ msgstr "" "hoàn tất việc hòa trộn.\n" #: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' 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 thượng nguồn đã cập nhật vào trong một nhánh " +"đặc biệt là khi nó hòa trộn ngược dòng đã 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 " +"Những dòng được bắt đầu bằng “%c” 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" +"sẽ hủy bỏ lần chuyển giao (commit).\n" #: builtin/merge.c:812 msgid "Empty commit message." @@ -6054,51 +6220,51 @@ 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:1309 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "Đang cập nhật %s..%s\n" -#: builtin/merge.c:1348 +#: builtin/merge.c:1349 #, 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:1355 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "Không.\n" -#: builtin/merge.c:1387 +#: builtin/merge.c:1388 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:1410 builtin/merge.c:1489 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, 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:1414 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "Đang thử chiến lược hòa trộn %s...\n" -#: builtin/merge.c:1480 +#: builtin/merge.c:1481 #, 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:1482 +#: builtin/merge.c:1483 #, 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:1491 +#: builtin/merge.c:1492 #, 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:1503 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "" @@ -6302,7 +6468,7 @@ msgstr "đọc từ đầu vào tiêu chuẩn" #: builtin/name-rev.c:236 msgid "allow to print `undefined` names" -msgstr "cho phép hiển thị các tên `chưa định nghĩa`" +msgstr "cho phép hiển thị các tên “chưa định nghĩa“" #: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] [list [<object>]]" @@ -6414,142 +6580,137 @@ msgstr "git notes prune [<các-tùy-chọn>]" msgid "git notes get-ref" msgstr "git notes get-ref" -#: builtin/notes.c:142 +#: 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:148 -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:158 -#, 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:143 +msgid "could not read 'show' output" +msgstr "không thể đọc kết xuất “show”" -#: builtin/notes.c:161 +#: builtin/notes.c:151 #, 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:178 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "không thể tạo tập tin “%s”" -#: builtin/notes.c:192 +#: builtin/notes.c:188 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:213 builtin/notes.c:976 +#: builtin/notes.c:209 builtin/notes.c:972 #, 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:218 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "không thể ghi đối tượng ghi chú (note)" -#: builtin/notes.c:220 +#: builtin/notes.c:216 #, 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:254 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "không thể đọc “%s”" -#: builtin/notes.c:256 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" -msgstr "không thể mở để đọc hay ghi “%s”" +msgstr "không thể mở hay đọc “%s”" -#: builtin/notes.c:275 builtin/notes.c:448 builtin/notes.c:450 -#: builtin/notes.c:510 builtin/notes.c:564 builtin/notes.c:647 -#: builtin/notes.c:652 builtin/notes.c:727 builtin/notes.c:769 -#: builtin/notes.c:971 builtin/reset.c:293 builtin/tag.c:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, 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ệ." +msgstr "Gặp lỗi khi phân giải “%s” như là một tham chiếu (ref) hợp lệ." -#: builtin/notes.c:278 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "Gặp lỗi khi đọc đối tượng “%s”." -#: builtin/notes.c:302 +#: builtin/notes.c:298 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:343 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "Giá trị notes.rewriteMode sai: “%s”" -#: builtin/notes.c:353 +#: builtin/notes.c:349 #, 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:380 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "Giá trị %s sai: “%s”" -#: builtin/notes.c:444 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "Dòng nhập vào dị hình: “%s”." -#: builtin/notes.c:459 +#: builtin/notes.c:455 #, 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:503 builtin/notes.c:557 builtin/notes.c:630 -#: builtin/notes.c:642 builtin/notes.c:715 builtin/notes.c:762 -#: builtin/notes.c:1036 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "quá nhiều đối số" -#: builtin/notes.c:516 builtin/notes.c:775 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "không tìm thấy ghi chú cho đối tượng %s." -#: builtin/notes.c:538 builtin/notes.c:695 +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" msgstr "nội dung ghi chú (note) nằm trong một chuỗi" -#: builtin/notes.c:541 builtin/notes.c:698 +#: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" msgstr "nội dung ghi chú (note) nằm trong một tập tin" -#: builtin/notes.c:543 builtin/notes.c:546 builtin/notes.c:700 -#: builtin/notes.c:703 builtin/tag.c:476 +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" msgstr "đối tượng" -#: builtin/notes.c:544 builtin/notes.c:701 +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" msgstr "dùng lại nhưng có sửa chữa đối tượng note đã chỉ ra" -#: builtin/notes.c:547 builtin/notes.c:704 +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" msgstr "dùng lại đối tượng ghi chú (note) đã chỉ ra" -#: builtin/notes.c:549 builtin/notes.c:617 +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" msgstr "thay thế ghi chú trước" -#: builtin/notes.c:583 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6558,24 +6719,24 @@ msgstr "" "Không thể thêm các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối tượng " "%s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:588 builtin/notes.c:665 +#: builtin/notes.c:584 builtin/notes.c:661 #, 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:618 +#: builtin/notes.c:614 msgid "read objects from stdin" msgstr "đọc các đối tượng từ đầu vào tiêu chuẩn" -#: builtin/notes.c:620 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" msgstr "tải cấu hình chép lại cho <lệnh> (ngầm định là --stdin)" -#: builtin/notes.c:638 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "quá ít đối số" -#: builtin/notes.c:659 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " @@ -6584,12 +6745,12 @@ msgstr "" "Không thể sao chép các ghi chú. Đã tìm thấy các ghi chú đã có sẵn cho đối " "tượng %s. Sử dụng tùy chọn “-f” để ghi đè lên các ghi chú cũ" -#: builtin/notes.c:671 +#: builtin/notes.c:667 #, 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:720 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6598,15 +6759,15 @@ 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:867 +#: builtin/notes.c:863 msgid "General options" msgstr "Tùy chọn chung" -#: builtin/notes.c:869 +#: builtin/notes.c:865 msgid "Merge options" msgstr "Tùy chọn về hòa trộn" -#: builtin/notes.c:871 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" @@ -6614,46 +6775,46 @@ msgstr "" "phân giải các xung đột “notes” sử dụng chiến lược đã đưa ra (manual/ours/" "theirs/union/cat_sort_uniq)" -#: builtin/notes.c:873 +#: builtin/notes.c:869 msgid "Committing unmerged notes" msgstr "Chuyển giao các note chưa được hòa trộn" -#: builtin/notes.c:875 +#: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" msgstr "" "các note cuối cùng được hòa trộn bởi các note chưa hòa trộn của lần chuyển " "giao" -#: builtin/notes.c:877 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" msgstr "Hủy bỏ phân giải ghi chú (note) hòa trộn" -#: builtin/notes.c:879 +#: builtin/notes.c:875 msgid "abort notes merge" msgstr "bỏ qua hòa trộn các ghi chú (note)" -#: builtin/notes.c:974 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "Đối tượng %s không có ghi chú (note)\n" -#: builtin/notes.c:986 +#: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" msgstr "cố gắng gỡ bỏ một note chưa từng tồn tại không phải là một lỗi" -#: builtin/notes.c:989 +#: builtin/notes.c:985 msgid "read object names from the standard input" msgstr "đọc tên đối tượng từ thiết bị nhập chuẩn" -#: builtin/notes.c:1070 +#: builtin/notes.c:1066 msgid "notes_ref" msgstr "notes_ref" -#: builtin/notes.c:1071 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" msgstr "dùng “notes” từ <notes_ref>" -#: builtin/notes.c:1106 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "Không hiểu câu lệnh con: %s" @@ -7023,22 +7184,54 @@ msgstr "" "Xem trong phần “Note about fast-forwards” từ lệnh “git push --help” để có " "thông tin chi tiết." -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"Việc cập nhật bị từ chối bởi vì máy chủ có chứa công việc mà bạn không\n" +"có ở máy nội bộ của mình. Lỗi này thường có nguyên nhân bởi kho khác đẩy dữ " +"liệu lên\n" +"cùng một tham chiếu. Bạn có lẽ muốn 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” từ lệnh “git push --help” để có " +"thông tin chi tiết." + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "Việc cập nhật bị từ chối bởi vì thẻ đã sẵn có từ trước trên máy chủ." + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"Không thể cập nhật một tham chiếu trên máy chủ mà nó chỉ đến đối tượng " +"không\n" +"phải chuyển giao, hoặc cập nhật một tham chiếu máy chủ để nó chỉ đến đối " +"tượng\n" +"không phải chuyển giao, mà không sử dụng tùy chọn “--force”.\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "Đang push (đẩy) lên %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, 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:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "repository (kho) sai “%s”" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7059,80 +7252,84 @@ msgstr "" "\n" " git push <tên>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all và --tags xung khắc nhau" -#: builtin/push.c:311 +#: builtin/push.c:348 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:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror và --tags xung khắc nhau" -#: builtin/push.c:317 +#: builtin/push.c:354 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:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all và --mirror xung khắc nhau" -#: builtin/push.c:382 +#: builtin/push.c:419 msgid "repository" msgstr "kho" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" msgstr "push tất cả refs" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" msgstr "mirror tất cả refs" -#: builtin/push.c:386 +#: builtin/push.c:423 msgid "delete refs" msgstr "xóa refs" -#: builtin/push.c:387 +#: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" msgstr "" "các thẻ push (không thể sử dụng cùng với các tùy chọn --all hay --mirror)" -#: builtin/push.c:390 +#: builtin/push.c:427 msgid "force updates" msgstr "ép buộc cập nhật" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" msgstr "kiểm tra" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" msgstr "điều khiển việc đẩy lên (push) đệ qui của mô-đun-con" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" msgstr "tạo gói nhẹ" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" msgstr "nhận về chương trình pack" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" msgstr "đặt thượng nguồn (upstream) cho git pull/status" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" msgstr "prune (cắt cụt) những tham chiếu (refs) bị gỡ bỏ" -#: builtin/push.c:410 +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "vòng qua “pre-push hook”" + +#: builtin/push.c:448 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:412 +#: builtin/push.c:450 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" @@ -7372,11 +7569,11 @@ 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)" +msgstr "(khớp)" #: builtin/remote.c:452 msgid "(delete)" -msgstr "(xoá)" +msgstr "(xóa)" #: builtin/remote.c:595 builtin/remote.c:601 builtin/remote.c:607 #, c-format @@ -7747,12 +7944,12 @@ msgstr "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." -msgstr "git reset [-q] <commit> [--] <các-đường-dẫn>..." +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <tree-ish> [--] <đường-dẫn>..." #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" -msgstr "git reset --patch [<commit>] [--] [<các-đường-dẫn>...]" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<tree-ish>] [--] [<các-đường-dẫn>...]" #: builtin/reset.c:33 msgid "mixed" @@ -7774,98 +7971,104 @@ msgstr "hòa trộn" msgid "keep" msgstr "giữ lại" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "Bạn không có HEAD nào hợp lệ." -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "Gặp lỗi khi tìm cây của HEAD." -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, 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 +#: builtin/reset.c:98 #, 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 +#: builtin/reset.c:169 #, 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:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" msgstr "làm việc ở chế độ im lặng, chỉ hiển thị khi có lỗi" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" msgstr "đặt lại (reset) HEAD và bảng mục lục" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" msgstr "chỉ đặt lại (reset) HEAD" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" msgstr "đặt lại HEAD, bảng mục lục và cây làm việc" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" msgstr "đặt lại HEAD nhưng giữ lại các thay đổi nội bộ" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "Gặp lỗi khi phân giải “%s” như là điểm xét duyệt hợp lệ." + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "không thể phân tích đối tượng “%s”." -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "Gặp lỗi khi phân giải “%s” như là một cây (tree) hợp lệ." + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" msgstr "--patch xung khắc với --{hard,mixed,soft}" -#: builtin/reset.c:317 +#: builtin/reset.c:301 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:319 +#: builtin/reset.c:303 #, 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:331 +#: builtin/reset.c:313 #, 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:347 +#: builtin/reset.c:333 #, 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/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "Những thay đổi bị bỏ trạng thái (stage) sau khi reset:" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "Không thể ghi tập tin lưu bảng mục lục mới." + #: builtin/rev-parse.c:339 msgid "git rev-parse --parseopt [options] -- [<args>...]" msgstr "git rev-parse --parseopt [các-tùy-chọn] -- [<th.số>...]" #: builtin/rev-parse.c:344 msgid "keep the `--` passed as an arg" -msgstr "giữ `--` chuyển qua làm tham số" +msgstr "giữ “--“ chuyển qua làm tham số" #: builtin/rev-parse.c:346 msgid "stop parsing after the first non-option argument" @@ -7984,8 +8187,8 @@ msgid "" "submodule '%s' (or one of its nested submodules) uses a .git directory\n" "(use 'rm -rf' if you really want to remove it including all of its history)" msgstr "" -"mô-đun-con '%s' (hoặc cái nằm trong các mô-đun-con) dùng thư mục .git\n" -"(dùng 'rm -rf' nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " +"mô-đun-con “%s” (hoặc cái nằm trong các mô-đun-con) dùng thư mục .git\n" +"(dùng “rm -rf” nếu bạn thực sự muốn gỡ bỏ nó cùng với tất cả lịch sử của " "chúng)" #: builtin/rm.c:174 @@ -8049,28 +8252,28 @@ msgstr "git rm: không thể gỡ bỏ %s" msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" msgstr "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "Thiếu tên tác giả: %s" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:229 msgid "sort output according to the number of commits per author" msgstr "sắp xếp kết xuất tuân theo số lượng chuyển giao trên mỗi tác giả" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:231 msgid "Suppress commit descriptions, only provides commit count" msgstr "Chặn mọi mô tả lần chuyển giao, chỉ đưa ra số lượng lần chuyển giao" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:233 msgid "Show the email address of each author" msgstr "Hiển thị thư điện tử cho từng tác giả" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:234 msgid "w[,i1[,i2]]" msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:235 msgid "Linewrap output" msgstr "Ngắt dòng khi quá dài" @@ -8280,170 +8483,164 @@ msgid "could not verify the tag '%s'" msgstr "không thể thẩm tra thẻ “%s”" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\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" +"Viết các ghi chú cho (thẻ) tag\n" +"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua.\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' 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 " +"Viết các ghi chú cho (thẻ) tag\n" +"Những dòng được bắt đầu bằng “%c” sẽ được bỏ qua; bạn có thể xóa chúng đi " "nếu muốn.\n" -"#\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "không thể ký thẻ" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "không thể ghi vào tập tin lưu thẻ" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "kiểu đối tượng sai." -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "đầu thẻ (tag) quá lớn." -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "không có thông điệp (message) cho thẻ (tag)?" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, 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 +#: builtin/tag.c:423 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 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "tên đối tượng dị hình “%s”" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" msgstr "chỉ liệt kê tên các thẻ" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" msgstr "hiển thị <n> dòng cho mỗi ghi chú" -#: builtin/tag.c:451 +#: builtin/tag.c:449 msgid "delete tags" msgstr "xóa thẻ" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" msgstr "thẩm tra thẻ" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" msgstr "Tùy chọn tạo tag" -#: builtin/tag.c:456 +#: builtin/tag.c:454 msgid "annotated tag, needs a message" msgstr "để chú giải cho thẻ, cần một lời ghi chú" -#: builtin/tag.c:458 +#: builtin/tag.c:456 msgid "tag message" msgstr "tin nhắn cho thẻ (tag)" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" msgstr "thẻ chú giải và ký kiểu GPG" -#: builtin/tag.c:464 +#: builtin/tag.c:462 msgid "use another key to sign the tag" msgstr "dùng kháo khác để ký thẻ" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" msgstr "thay thế nếu tag đó đã có trước" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" msgstr "hiển thị danh sách thẻ trong các cột" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" msgstr "Các tùy chọn liệt kê thẻ" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" msgstr "chỉ hiển thị những nhánh mà nó chứa lần chuyển giao" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" msgstr "chỉ hiển thị các thẻ của đối tượng" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column và -n xung khắc nhau" -#: builtin/tag.c:523 +#: builtin/tag.c:521 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 +#: builtin/tag.c:523 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 +#: builtin/tag.c:525 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 +#: builtin/tag.c:533 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 +#: builtin/tag.c:553 msgid "too many params" msgstr "quá nhiều đối số" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "“%s” không phải thẻ hợp lệ." -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "Thẻ “%s” đã tồn tại rồi" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s: không thể khóa ref (tham chiếu)" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, 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 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "Đã cập nhật thẻ “%s” (trước là %s)\n" @@ -8633,15 +8830,15 @@ msgstr "" msgid "no-op (backward compatibility)" msgstr "no-op (tương thích ngược)" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "chi tiết hơn nữa" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "im lặng hơn nữa" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "sử dụng <n> chữ số để hiển thị SHA-1s" @@ -8684,7 +8881,7 @@ 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" +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" @@ -8824,8 +9021,7 @@ msgstr "Xin hãy rõ ràng. --skip hay --abort?" #: git-am.sh:509 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." +msgstr "Thao tác phân giải không được tiến hành, chúng ta không phục hồi lại." #: git-am.sh:575 #, sh-format @@ -9379,41 +9575,41 @@ msgstr "Chưa chỉ ra tên của nhánh" 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:89 +#: git-submodule.sh:90 #, 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 “$remoteurl” url" -#: git-submodule.sh:168 +#: git-submodule.sh:195 #, 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:211 +#: git-submodule.sh:238 #, 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:223 +#: git-submodule.sh:250 #, 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:316 +#: git-submodule.sh:343 #, 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:333 +#: git-submodule.sh:360 #, 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:337 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9425,98 +9621,98 @@ msgstr "" "$sm_path\n" "Sử dụng -f nếu bạn thực sự muốn thêm nó vào." -#: git-submodule.sh:355 +#: git-submodule.sh:382 #, 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:357 +#: git-submodule.sh:384 #, 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:365 +#: git-submodule.sh:392 #, sh-format msgid "A git directory for '$sm_name' is found locally with remote(s):" msgstr "" -"Thư mục git cho '$sm_name' được tìm thấy một cách cục bộ với các máy chủ:" +"Thư mục git cho “$sm_name” được tìm thấy một cách cục bộ với các máy chủ:" -#: git-submodule.sh:367 +#: git-submodule.sh:394 #, sh-format msgid "" "If you want to reuse this local git directory instead of cloning again from" msgstr "Nếu bạn muốn dùng lại thư mục git nội bộ này thay vì nhân bản từ nó" -#: git-submodule.sh:369 +#: git-submodule.sh:396 #, sh-format msgid "" "use the '--force' option. If the local git directory is not the correct repo" msgstr "" -"dùng tùy chọn '--force'. Nếu thư mục git nội bộ không phải là repo (kho) đúng" +"dùng tùy chọn “--force”. Nếu thư mục git nội bộ không phải là repo (kho) đúng" -#: git-submodule.sh:370 +#: git-submodule.sh:397 #, sh-format msgid "" "or you are unsure what this means choose another name with the '--name' " "option." msgstr "" -"hay bạn không chắc chắn điều đó có nghĩa gì chọn tên khác với tùy chọn '--" -"name'." +"hay bạn không chắc chắn điều đó có nghĩa gì chọn tên khác với tùy chọn “--" +"name”." -#: git-submodule.sh:372 +#: git-submodule.sh:399 #, sh-format msgid "Reactivating local git directory for submodule '$sm_name'." msgstr "" -"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con '$sm_name'." +"Phục hồi sự hoạt động của thư mục git nội bộ cho mô-đun-con “$sm_name”." -#: git-submodule.sh:384 +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "Không thể checkout mô-đun con “$sm_path”" -#: git-submodule.sh:389 +#: git-submodule.sh:416 #, 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:394 +#: git-submodule.sh:425 #, 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:437 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "Đang nhập “$prefix$sm_path”" -#: git-submodule.sh:451 +#: git-submodule.sh:482 #, 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:495 +#: git-submodule.sh:526 #, 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:504 +#: git-submodule.sh:535 #, 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:506 +#: git-submodule.sh:537 #, 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:514 +#: git-submodule.sh:545 #, 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:614 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -9525,96 +9721,117 @@ 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:627 +#: git-submodule.sh:662 #, 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:646 +#: git-submodule.sh:671 git-submodule.sh:695 #, 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:660 +#: git-submodule.sh:709 #, 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:661 +#: git-submodule.sh:710 #, 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:666 +#: git-submodule.sh:715 #, 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:667 +#: git-submodule.sh:716 #, 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:672 +#: git-submodule.sh:721 #, 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:673 +#: git-submodule.sh:722 #, 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:695 git-submodule.sh:1017 +#: git-submodule.sh:744 git-submodule.sh:1066 #, 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:803 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "Tùy chọn --cached không thể dùng cùng với tùy chọn --files" #. unexpected type -#: git-submodule.sh:843 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "chế độ không như mong chờ $mod_dst" -#: git-submodule.sh:861 +#: git-submodule.sh:910 #, 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:864 +#: git-submodule.sh:913 #, 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:867 +#: git-submodule.sh:916 #, 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:892 +#: git-submodule.sh:941 msgid "blob" msgstr "blob" -#: git-submodule.sh:930 -msgid "# Submodules changed but not updated:" -msgstr "# Các mô-đun-con đã bị thay đổi nhưng chưa được cập nhật:" +#: git-submodule.sh:979 +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:932 -msgid "# Submodule changes to be committed:" -msgstr "# Những thay đổi mô-đun-con được chuyển giao (commit):" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" +msgstr "Những mô-đun-con thay đổi đã được chuyển giao (commit):" -#: git-submodule.sh:1080 +#: git-submodule.sh:1129 #, sh-format msgid "Synchronizing submodule url for '$prefix$sm_path'" -msgstr "Url Mô-đun-con đồng bộ hóa cho '$prefix$sm_path'" +msgstr "Url Mô-đun-con đồng bộ hóa cho “$prefix$sm_path”" + +#~ 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" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "gặp lỗi khi đóng đường ống cho lệnh “show” cho đối tượng “%s”" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "Bạn không có HEAD nào hợp lệ" + +#~ msgid "oops" +#~ msgstr "ôi?" + +#~ msgid "Would not remove %s\n" +#~ msgstr "Không thể gỡ bỏ %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "Không xóa %s\n" + +#~ msgid "Could not read index" +#~ msgstr "Không thể đọc bảng mục lục" #~ msgid "git remote set-head <name> (-a | -d | <branch>])" #~ msgstr "git remote set-head <tên> (-a | -d | <nhánh>])" diff --git a/po/zh_CN.po b/po/zh_CN.po index 46d158ffd1..c48ae10d78 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1,6 +1,6 @@ # Chinese translations for Git package # Git 软件包的简体中文翻译. -# Copyright (C) 2012 Jiang Xin <worldhello.net AT gmail.com> +# Copyright (C) 2012,2013 Jiang Xin <worldhello.net AT gmail.com> # This file is distributed under the same license as the Git package. # Contributers: # - Jiang Xin <worldhello.net AT gmail.com> @@ -12,8 +12,8 @@ msgid "" msgstr "" "Project-Id-Version: Git\n" "Report-Msgid-Bugs-To: Git Mailing List <git@vger.kernel.org>\n" -"POT-Creation-Date: 2012-09-15 10:21+0800\n" -"PO-Revision-Date: 2012-09-07 17:56+0800\n" +"POT-Creation-Date: 2013-03-05 12:36+0800\n" +"PO-Revision-Date: 2013-03-05 13:07+0800\n" "Last-Translator: Jiang Xin <worldhello.net@gmail.com>\n" "Language-Team: GitHub <https://github.com/gotgit/git/>\n" "Language: zh_CN\n" @@ -22,7 +22,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: advice.c:40 +#: advice.c:49 #, c-format msgid "hint: %.*s\n" msgstr "提示：%.*s\n" @@ -31,7 +31,7 @@ msgstr "提示：%.*s\n" #. * Message used both when 'git commit' fails and when #. * other commands doing a merge do. #. -#: advice.c:70 +#: advice.c:79 msgid "" "Fix them up in the work tree,\n" "and then use 'git add/rm <file>' as\n" @@ -43,93 +43,98 @@ msgstr "" "或使用 'git commit -a'。" #: archive.c:10 -#, fuzzy msgid "git archive [options] <tree-ish> [<path>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git archive [选项] <树或提交> [<路径>...]" #: archive.c:11 -#, fuzzy msgid "git archive --list" -msgstr "git archive：NACK %s" +msgstr "git archive --list" #: archive.c:12 msgid "" "git archive --remote <repo> [--exec <cmd>] [options] <tree-ish> [<path>...]" msgstr "" +"git archive --remote <版本库> [--exec <命令>] [选项] <树或提交> [<路径>...]" #: archive.c:13 msgid "git archive --remote <repo> [--exec <cmd>] --list" -msgstr "" +msgstr "git archive --remote <版本库> [--exec <命令>] --list" -#: archive.c:322 +#: archive.c:323 msgid "fmt" -msgstr "" +msgstr "格式" -#: archive.c:322 +#: archive.c:323 msgid "archive format" -msgstr "" +msgstr "归档格式" -#: archive.c:323 builtin/log.c:1079 +#: archive.c:324 builtin/log.c:1115 msgid "prefix" -msgstr "" +msgstr "前缀" -#: archive.c:324 +#: archive.c:325 msgid "prepend prefix to each pathname in the archive" -msgstr "" +msgstr "为归档中每个路径名加上前缀" -#: archive.c:325 builtin/archive.c:91 builtin/blame.c:2332 -#: builtin/blame.c:2333 builtin/config.c:56 builtin/fast-export.c:642 -#: builtin/fast-export.c:644 builtin/grep.c:800 builtin/hash-object.c:77 -#: builtin/ls-files.c:494 builtin/ls-files.c:497 builtin/notes.c:537 -#: builtin/notes.c:694 builtin/read-tree.c:107 parse-options.h:149 +#: archive.c:326 builtin/archive.c:91 builtin/blame.c:2366 +#: builtin/blame.c:2367 builtin/config.c:55 builtin/fast-export.c:653 +#: builtin/fast-export.c:655 builtin/grep.c:715 builtin/hash-object.c:77 +#: builtin/ls-files.c:497 builtin/ls-files.c:500 builtin/notes.c:536 +#: builtin/notes.c:693 builtin/read-tree.c:107 parse-options.h:149 msgid "file" msgstr "文件" -#: archive.c:326 builtin/archive.c:92 +#: archive.c:327 builtin/archive.c:92 msgid "write the archive to this file" -msgstr "" +msgstr "归档写入此文件" -#: archive.c:328 -#, fuzzy +#: archive.c:329 msgid "read .gitattributes in working directory" -msgstr "%s：已经存在于工作区中" +msgstr "读取工作区中的 .gitattributes" -#: archive.c:329 +#: archive.c:330 msgid "report archived files on stderr" -msgstr "" +msgstr "在标准错误上报告归档文件" -#: archive.c:330 +#: archive.c:331 msgid "store only" -msgstr "" +msgstr "只存储" -#: archive.c:331 +#: archive.c:332 msgid "compress faster" -msgstr "" +msgstr "压缩速度更快" -#: archive.c:339 +#: archive.c:340 msgid "compress better" -msgstr "" +msgstr "压缩效果更好" -#: archive.c:342 +#: archive.c:343 msgid "list supported archive formats" -msgstr "" +msgstr "列出支持的归档格式" -#: archive.c:344 builtin/archive.c:93 builtin/clone.c:85 +#: archive.c:345 builtin/archive.c:93 builtin/clone.c:85 msgid "repo" -msgstr "" +msgstr "版本库" -#: archive.c:345 builtin/archive.c:94 +#: archive.c:346 builtin/archive.c:94 msgid "retrieve the archive from remote repository <repo>" -msgstr "" +msgstr "从远程版本库（<版本库>）提取归档文件" -#: archive.c:346 builtin/archive.c:95 builtin/notes.c:616 -#, fuzzy +#: archive.c:347 builtin/archive.c:95 builtin/notes.c:615 msgid "command" -msgstr "运行 $command" +msgstr "命令" -#: archive.c:347 builtin/archive.c:96 +#: archive.c:348 builtin/archive.c:96 msgid "path to the remote git-upload-archive command" +msgstr "远程 git-upload-archive 命令的路径" + +#: attr.c:259 +msgid "" +"Negative patterns are ignored in git attributes\n" +"Use '\\!' for literal leading exclamation." msgstr "" +"负值模版在 git attributes 中被忽略\n" +"当字符串确实要以感叹号开始时，使用 '\\!'。" #: bundle.c:36 #, c-format @@ -141,7 +146,7 @@ msgstr "'%s' 不像是一个 v2 版本的包文件" msgid "unrecognized header: %s%s (%d)" msgstr "未能识别的包头：%s%s (%d)" -#: bundle.c:89 builtin/commit.c:714 +#: bundle.c:89 builtin/commit.c:674 #, c-format msgid "could not open '%s'" msgstr "不能打开 '%s'" @@ -150,9 +155,9 @@ msgstr "不能打开 '%s'" msgid "Repository lacks these prerequisite commits:" msgstr "版本库缺少这些必备的提交：" -#: bundle.c:164 sequencer.c:557 sequencer.c:989 builtin/log.c:290 -#: builtin/log.c:727 builtin/log.c:1313 builtin/log.c:1529 builtin/merge.c:347 -#: builtin/shortlog.c:181 +#: bundle.c:164 sequencer.c:566 sequencer.c:998 builtin/log.c:299 +#: builtin/log.c:751 builtin/log.c:1358 builtin/log.c:1574 builtin/merge.c:347 +#: builtin/shortlog.c:157 msgid "revision walk setup failed" msgstr "版本遍历设置失败" @@ -178,7 +183,7 @@ msgstr[1] "这个包需要 %d 个这些引用" msgid "rev-list died" msgstr "rev-list 终止" -#: bundle.c:300 builtin/log.c:1209 builtin/shortlog.c:284 +#: bundle.c:300 builtin/log.c:1254 builtin/shortlog.c:260 #, c-format msgid "unrecognized argument: %s" msgstr "未能识别的参数：%s" @@ -209,12 +214,12 @@ msgstr "不能创建 '%s'" msgid "index-pack died" msgstr "index-pack 终止" -#: commit.c:48 +#: commit.c:50 #, c-format msgid "could not parse %s" msgstr "不能解析 %s" -#: commit.c:50 +#: commit.c:52 #, c-format msgid "%s %s is not a commit!" msgstr "%s %s 不是一个提交!" @@ -305,19 +310,24 @@ msgstr[0] "%lu 年前" msgstr[1] "%lu 年前" # 译者：注意保持前导空格 -#: diff.c:105 +#: diff.c:112 #, c-format -msgid " Failed to parse dirstat cut-off percentage '%.*s'\n" -msgstr " 无法解析 dirstat 阈值 '%.*s'\n" +msgid " Failed to parse dirstat cut-off percentage '%s'\n" +msgstr " 无法解析 dirstat 截止（cut-off）百分比 '%s'\n" # 译者：注意保持前导空格 -#: diff.c:110 +#: diff.c:117 #, c-format -msgid " Unknown dirstat parameter '%.*s'\n" -msgstr " 未知 dirstat 参数 '%.*s'\n" +msgid " Unknown dirstat parameter '%s'\n" +msgstr " 未知的 dirstat 参数 '%s'\n" #: diff.c:210 #, c-format +msgid "Unknown value for 'diff.submodule' config variable: '%s'" +msgstr "配置变量 'diff.submodule' 未知的取值：'%s'" + +#: diff.c:260 +#, c-format msgid "" "Found errors in 'diff.dirstat' config variable:\n" "%s" @@ -325,32 +335,7 @@ msgstr "" "发现配置变量 'diff.dirstat' 中的错误：\n" "%s" -#: diff.c:1401 -msgid " 0 files changed" -msgstr " 0 个文件被修改" - -#: diff.c:1405 -#, c-format -msgid " %d file changed" -msgid_plural " %d files changed" -msgstr[0] " %d 个文件被修改" -msgstr[1] " %d 个文件被修改" - -#: diff.c:1422 -#, c-format -msgid ", %d insertion(+)" -msgid_plural ", %d insertions(+)" -msgstr[0] "，插入 %d 行(+)" -msgstr[1] "，插入 %d 行(+)" - -#: diff.c:1433 -#, c-format -msgid ", %d deletion(-)" -msgid_plural ", %d deletions(-)" -msgstr[0] "，删除 %d 行(-)" -msgstr[1] "，删除 %d 行(-)" - -#: diff.c:3460 +#: diff.c:3468 #, c-format msgid "" "Failed to parse --dirstat/-X option parameter:\n" @@ -359,7 +344,12 @@ msgstr "" "无法解析 --dirstat/-X 选项的参数：\n" "%s" -#: gpg-interface.c:59 +#: diff.c:3482 +#, c-format +msgid "Failed to parse --submodule option parameter: '%s'" +msgstr "无法解析 --submodule 选项的参数：'%s'" + +#: gpg-interface.c:59 gpg-interface.c:127 msgid "could not run gpg." msgstr "不能执行 gpg。" @@ -371,17 +361,27 @@ msgstr "gpg 没有接受数据" msgid "gpg failed to sign the data" msgstr "gpg 无法为数据签名" -#: grep.c:1320 +#: gpg-interface.c:112 +#, c-format +msgid "could not create temporary file '%s': %s" +msgstr "不能创建临时文件 '%s'：%s" + +#: gpg-interface.c:115 +#, c-format +msgid "failed writing detached signature to '%s': %s" +msgstr "无法将分离式签名写入 '%s'：%s" + +#: grep.c:1622 #, c-format msgid "'%s': unable to read %s" msgstr "'%s'：无法读取 %s" -#: grep.c:1337 +#: grep.c:1639 #, c-format msgid "'%s': %s" msgstr "'%s'：%s" -#: grep.c:1348 +#: grep.c:1650 #, c-format msgid "'%s': short read %s" msgstr "'%s'：读取不完整 %s" @@ -395,7 +395,11 @@ msgstr "在 '%s' 下可用的 git 命令" msgid "git commands available from elsewhere on your $PATH" msgstr "在 $PATH 路径中的其他地方可用的 git 命令" -#: help.c:275 +#: help.c:235 +msgid "The most commonly used git commands are:" +msgstr "最常用的 git 命令有：" + +#: help.c:292 #, c-format msgid "" "'%s' appears to be a git command, but we were not\n" @@ -404,11 +408,11 @@ msgstr "" "'%s' 像是一个 git 命令，但却无法运行。\n" "可能是 git-%s 受损？" -#: help.c:332 +#: help.c:349 msgid "Uh oh. Your system reports no Git commands at all." msgstr "唉呀，您的系统中未发现 Git 命令。" -#: help.c:354 +#: help.c:371 #, c-format msgid "" "WARNING: You called a Git command named '%s', which does not exist.\n" @@ -417,17 +421,17 @@ msgstr "" "警告：您运行一个不存在的 Git 命令 '%s'。继续执行假定您要要运行的\n" "是 '%s'" -#: help.c:359 +#: help.c:376 #, c-format msgid "in %0.1f seconds automatically..." msgstr "在 %0.1f 秒钟后自动运行..." -#: help.c:366 +#: help.c:383 #, c-format msgid "git: '%s' is not a git command. See 'git --help'." msgstr "git：'%s' 不是一个 git 命令。参见 'git --help'。" -#: help.c:370 +#: help.c:387 msgid "" "\n" "Did you mean this?" @@ -441,6 +445,15 @@ msgstr[1] "" "\n" "您指的是这其中的某一个么？" +#: merge.c:56 +msgid "failed to read the cache" +msgstr "无法读取缓存" + +#: merge.c:110 builtin/checkout.c:333 builtin/checkout.c:534 +#: builtin/clone.c:586 +msgid "unable to write new index file" +msgstr "无法写新的索引文件" + #: merge-recursive.c:190 #, c-format msgid "(bad commit)\n" @@ -484,7 +497,7 @@ msgstr "不能读取对象 %s '%s'" #: merge-recursive.c:750 #, c-format msgid "blob expected for %s '%s'" -msgstr "%s '%s' 应为二进制对象（blob）" +msgstr "%s '%s' 应为数据（blob）对象" #: merge-recursive.c:773 builtin/clone.c:302 #, c-format @@ -568,7 +581,7 @@ msgstr "" #: merge-recursive.c:1248 #, c-format msgid "Renaming %s to %s and %s to %s instead" -msgstr "而是重命名 %s 至 %s 以及 %s 至 %s" +msgstr "而是重命名 %s 至 %s，以及 %s 至 %s" #: merge-recursive.c:1447 #, c-format @@ -593,7 +606,7 @@ msgstr "不能读取对象 %s" #: merge-recursive.c:1516 #, c-format msgid "object %s is not a blob" -msgstr "对象 %s 不是一个二进制对象（blob）" +msgstr "对象 %s 不是一个数据（blob）对象" #: merge-recursive.c:1564 msgid "modify" @@ -621,7 +634,7 @@ msgstr "略过 %s（已经做过相同合并）" msgid "Auto-merging %s" msgstr "自动合并 %s" -#: merge-recursive.c:1633 git-submodule.sh:869 +#: merge-recursive.c:1633 git-submodule.sh:942 msgid "submodule" msgstr "子模组" @@ -691,40 +704,58 @@ msgstr "合并未返回提交" msgid "Could not parse object '%s'" msgstr "不能解析对象 '%s'" -#: merge-recursive.c:2009 builtin/merge.c:696 +#: merge-recursive.c:2009 builtin/merge.c:643 msgid "Unable to write index." msgstr "不能写入索引。" -#: parse-options.c:494 +#: parse-options.c:489 msgid "..." msgstr "..." -#: parse-options.c:512 +#: parse-options.c:507 #, c-format msgid "usage: %s" msgstr "用法：%s" #. TRANSLATORS: the colon here should align with the #. one in "usage: %s" translation -#: parse-options.c:516 +#: parse-options.c:511 #, c-format msgid " or: %s" msgstr " 或：%s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: parse-options.c:519 +#: parse-options.c:514 #, c-format msgid " %s" msgstr " %s" -#: remote.c:1632 +#: parse-options.c:548 +msgid "-NUM" +msgstr "-数字" + +#: pathspec.c:83 +#, c-format +msgid "Path '%s' is in submodule '%.*s'" +msgstr "路径 '%s' 属于模组 '%.*s'" + +#: pathspec.c:99 +#, c-format +msgid "'%s' is beyond a symbolic link" +msgstr "'%s' 位于符号链接中" + +#: remote.c:1653 #, 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:1638 +#: remote.c:1659 +msgid " (use \"git push\" to publish your local commits)\n" +msgstr " （使用 \"git push\" 来发布您的本地提交）\n" + +#: remote.c:1662 #, c-format msgid "Your branch is behind '%s' by %d commit, and can be fast-forwarded.\n" msgid_plural "" @@ -732,7 +763,12 @@ msgid_plural "" msgstr[0] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" msgstr[1] "您的分支落后 '%s' 共 %d 个提交，并且可以快进。\n" -#: remote.c:1646 +# 译者：注意保持前导空格 +#: remote.c:1670 +msgid " (use \"git pull\" to update your local branch)\n" +msgstr " （使用 \"git pull\" 来更新您的本地分支）\n" + +#: remote.c:1673 #, c-format msgid "" "Your branch and '%s' have diverged,\n" @@ -747,19 +783,24 @@ msgstr[1] "" "您的分支和 '%s' 出现了偏离，\n" "并且分别有 %d 和 %d 处不同的提交。\n" -#: sequencer.c:121 builtin/merge.c:864 builtin/merge.c:977 -#: builtin/merge.c:1087 builtin/merge.c:1097 +# 译者：注意保持前导空格 +#: remote.c:1683 +msgid " (use \"git pull\" to merge the remote branch into yours)\n" +msgstr " （使用 \"git pull\" 来合并远程分支）\n" + +#: sequencer.c:123 builtin/merge.c:761 builtin/merge.c:874 builtin/merge.c:984 +#: builtin/merge.c:994 #, c-format msgid "Could not open '%s' for writing" msgstr "不能为写入打开 '%s'" -#: sequencer.c:123 builtin/merge.c:333 builtin/merge.c:867 -#: builtin/merge.c:1089 builtin/merge.c:1102 +#: sequencer.c:125 builtin/merge.c:333 builtin/merge.c:764 builtin/merge.c:986 +#: builtin/merge.c:999 #, c-format msgid "Could not write to '%s'" msgstr "不能写入 '%s'" -#: sequencer.c:144 +#: sequencer.c:146 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'" @@ -767,7 +808,7 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "命令标记修正后的文件" -#: sequencer.c:147 +#: sequencer.c:149 msgid "" "after resolving the conflicts, mark the corrected paths\n" "with 'git add <paths>' or 'git rm <paths>'\n" @@ -776,214 +817,210 @@ msgstr "" "冲突解决完毕后，用 'git add <paths>' 或 'git rm <paths>'\n" "对修正后的文件做标记，然后用 'git commit' 提交" -#: sequencer.c:160 sequencer.c:765 sequencer.c:848 +#: sequencer.c:162 sequencer.c:774 sequencer.c:857 #, c-format msgid "Could not write to %s" msgstr "不能写入 %s" -#: sequencer.c:163 +#: sequencer.c:165 #, c-format msgid "Error wrapping up %s" msgstr "错误收尾 %s" -#: sequencer.c:178 +#: sequencer.c:180 msgid "Your local changes would be overwritten by cherry-pick." msgstr "您的本地修改将被拣选操作覆盖。" -#: sequencer.c:180 +#: sequencer.c:182 msgid "Your local changes would be overwritten by revert." msgstr "您的本地修改将被还原操作覆盖。" -#: sequencer.c:183 +#: sequencer.c:185 msgid "Commit your changes or stash them to proceed." msgstr "提交您的修改或保存进度后再继续。" #. TRANSLATORS: %s will be "revert" or "cherry-pick" -#: sequencer.c:233 +#: sequencer.c:236 #, c-format msgid "%s: Unable to write new index file" msgstr "%s：无法写入新索引文件" -#: sequencer.c:261 +#: sequencer.c:267 msgid "Could not resolve HEAD commit\n" msgstr "不能解析 HEAD 提交\n" -#: sequencer.c:282 +#: sequencer.c:288 msgid "Unable to update cache tree\n" msgstr "不能更新缓存\n" -#: sequencer.c:327 +#: sequencer.c:333 #, c-format msgid "Could not parse commit %s\n" msgstr "不能解析提交 %s\n" -#: sequencer.c:332 +#: sequencer.c:338 #, c-format msgid "Could not parse parent commit %s\n" msgstr "不能解析父提交 %s\n" -#: sequencer.c:398 +#: sequencer.c:404 msgid "Your index file is unmerged." msgstr "您的索引文件未完成合并。" -#: sequencer.c:401 -msgid "You do not have a valid HEAD" -msgstr "您没有一个有效的 HEAD" - -#: sequencer.c:416 +#: sequencer.c:423 #, c-format msgid "Commit %s is a merge but no -m option was given." msgstr "提交 %s 是一个合并提交但未提供 -m 选项。" -#: sequencer.c:424 +#: sequencer.c:431 #, c-format msgid "Commit %s does not have parent %d" msgstr "提交 %s 没有父提交 %d" -#: sequencer.c:428 +#: sequencer.c:435 #, 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:439 +#: sequencer.c:448 #, c-format msgid "%s: cannot parse parent commit %s" msgstr "%s：不能解析父提交 %s" -#: sequencer.c:443 +#: sequencer.c:452 #, c-format msgid "Cannot get commit message for %s" msgstr "不能得到 %s 的提交说明" -#: sequencer.c:527 +#: sequencer.c:536 #, c-format msgid "could not revert %s... %s" msgstr "不能还原 %s... %s" -#: sequencer.c:528 +#: sequencer.c:537 #, c-format msgid "could not apply %s... %s" msgstr "不能应用 %s... %s" -#: sequencer.c:560 +#: sequencer.c:569 msgid "empty commit set passed" msgstr "提供了空的提交集" -#: sequencer.c:568 +#: sequencer.c:577 #, c-format msgid "git %s: failed to read the index" msgstr "git %s：无法读取索引" -#: sequencer.c:573 +#: sequencer.c:582 #, c-format msgid "git %s: failed to refresh the index" msgstr "git %s：无法刷新索引" -#: sequencer.c:631 +#: sequencer.c:640 #, c-format msgid "Cannot %s during a %s" msgstr "无法 %s 在一个 %s 过程中" -#: sequencer.c:653 +#: sequencer.c:662 #, c-format msgid "Could not parse line %d." msgstr "不能解析第 %d 行。" -#: sequencer.c:658 +#: sequencer.c:667 msgid "No commits parsed." msgstr "没有提交被解析。" -#: sequencer.c:671 +#: sequencer.c:680 #, c-format msgid "Could not open %s" msgstr "不能打开 %s" -#: sequencer.c:675 +#: sequencer.c:684 #, c-format msgid "Could not read %s." msgstr "不能读取 %s。" -#: sequencer.c:682 +#: sequencer.c:691 #, c-format msgid "Unusable instruction sheet: %s" msgstr "无用的指令表单：%s" -#: sequencer.c:710 +#: sequencer.c:719 #, c-format msgid "Invalid key: %s" msgstr "无效键名：%s" -#: sequencer.c:713 +#: sequencer.c:722 #, c-format msgid "Invalid value for %s: %s" msgstr "%s 的值无效：%s" -#: sequencer.c:725 +#: sequencer.c:734 #, c-format msgid "Malformed options sheet: %s" msgstr "非法的选项表单：%s" -#: sequencer.c:746 +#: sequencer.c:755 msgid "a cherry-pick or revert is already in progress" msgstr "一个拣选或还原操作已在进行" -#: sequencer.c:747 +#: sequencer.c:756 msgid "try \"git cherry-pick (--continue | --quit | --abort)\"" msgstr "尝试 \"git cherry-pick (--continue | --quit | --abort)\"" -#: sequencer.c:751 +#: sequencer.c:760 #, c-format msgid "Could not create sequencer directory %s" msgstr "不能创建序列目录 %s" -#: sequencer.c:767 sequencer.c:852 +#: sequencer.c:776 sequencer.c:861 #, c-format msgid "Error wrapping up %s." msgstr "错误收尾 %s。" -#: sequencer.c:786 sequencer.c:920 +#: sequencer.c:795 sequencer.c:929 msgid "no cherry-pick or revert in progress" msgstr "拣选或还原操作并未进行" -#: sequencer.c:788 +#: sequencer.c:797 msgid "cannot resolve HEAD" msgstr "不能解析 HEAD" -#: sequencer.c:790 +#: sequencer.c:799 msgid "cannot abort from a branch yet to be born" msgstr "不能从尚未建立的分支终止" -#: sequencer.c:812 builtin/apply.c:4005 +#: sequencer.c:821 builtin/apply.c:4056 #, c-format msgid "cannot open %s: %s" msgstr "不能打开 %s：%s" -#: sequencer.c:815 +#: sequencer.c:824 #, c-format msgid "cannot read %s: %s" msgstr "不能读取 %s：%s" -#: sequencer.c:816 +#: sequencer.c:825 msgid "unexpected end of file" msgstr "意外的文件结束" -#: sequencer.c:822 +#: sequencer.c:831 #, c-format msgid "stored pre-cherry-pick HEAD file '%s' is corrupt" msgstr "保存拣选提交前的 HEAD 文件 '%s' 损坏" -#: sequencer.c:845 +#: sequencer.c:854 #, c-format msgid "Could not format %s." msgstr "不能格式化 %s。" -#: sequencer.c:1007 +#: sequencer.c:1016 msgid "Can't revert as initial commit" msgstr "不能作为初始提交还原" -#: sequencer.c:1008 +#: sequencer.c:1017 msgid "Can't cherry-pick into empty head" msgstr "不能拣选到空分支" @@ -1007,16 +1044,21 @@ msgid "Upstream branch '%s' not stored as a remote-tracking branch" msgstr "上游分支 '%s' 没有存储为一个远程跟踪分支" #: wrapper.c:408 -#, fuzzy, c-format +#, c-format msgid "unable to access '%s': %s" -msgstr "不能创建 '%s'" +msgstr "不能访问 '%s'：%s" + +#: wrapper.c:423 +#, c-format +msgid "unable to access '%s'" +msgstr "不能访问 '%s'" -#: wrapper.c:426 +#: wrapper.c:434 #, c-format msgid "unable to look up current user in the passwd file: %s" -msgstr "无法在 passwd 文件中查询到该用户：%s" +msgstr "无法在口令文件中查询到当前用户：%s" -#: wrapper.c:427 +#: wrapper.c:435 msgid "no such user" msgstr "无此用户" @@ -1185,216 +1227,235 @@ msgstr "未合并： %s" msgid "bug: unhandled diff status %c" msgstr "bug：未处理的差异状态 %c" -#: wt-status.c:785 +#: wt-status.c:789 msgid "You have unmerged paths." msgstr "您有尚未合并的路径。" # 译者：注意保持前导空格 -#: wt-status.c:788 wt-status.c:912 +#: wt-status.c:792 wt-status.c:944 msgid " (fix conflicts and run \"git commit\")" msgstr " （解决冲突并运行 \"git commit\"）" -#: wt-status.c:791 +#: wt-status.c:795 msgid "All conflicts fixed but you are still merging." msgstr "所有冲突已解决但您仍处于合并中。" # 译者：注意保持前导空格 -#: wt-status.c:794 +#: wt-status.c:798 msgid " (use \"git commit\" to conclude merge)" msgstr " （使用 \"git commit\" 结束合并）" -#: wt-status.c:804 +#: wt-status.c:808 msgid "You are in the middle of an am session." msgstr "您正处于一个 am 过程中。" -#: wt-status.c:807 +#: wt-status.c:811 msgid "The current patch is empty." msgstr "当前的补丁为空。" # 译者：注意保持前导空格 -#: wt-status.c:811 +#: wt-status.c:815 msgid " (fix conflicts and then run \"git am --resolved\")" msgstr " （解决冲突，然后运行 \"git am --resolved\"）" # 译者：注意保持前导空格 -#: wt-status.c:813 +#: wt-status.c:817 msgid " (use \"git am --skip\" to skip this patch)" msgstr " （使用 \"git am --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:815 +#: wt-status.c:819 msgid " (use \"git am --abort\" to restore the original branch)" msgstr " （使用 \"git am --abort\" 恢复原有分支）" -#: wt-status.c:873 wt-status.c:883 +#: wt-status.c:879 wt-status.c:896 +#, c-format +msgid "You are currently rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s'。" + +#: wt-status.c:884 wt-status.c:901 msgid "You are currently rebasing." msgstr "您正在变基。" # 译者：注意保持前导空格 -#: wt-status.c:876 +#: wt-status.c:887 msgid " (fix conflicts and then run \"git rebase --continue\")" msgstr " （解决冲突，然后运行 \"git rebase --continue\"）" # 译者：注意保持前导空格 -#: wt-status.c:878 +#: wt-status.c:889 msgid " (use \"git rebase --skip\" to skip this patch)" msgstr " （使用 \"git rebase --skip\" 跳过此补丁）" # 译者：注意保持前导空格 -#: wt-status.c:880 +#: wt-status.c:891 msgid " (use \"git rebase --abort\" to check out the original branch)" msgstr " （使用 \"git rebase --abort\" 以检出原有分支）" # 译者：注意保持前导空格 -#: wt-status.c:886 +#: wt-status.c:904 msgid " (all conflicts fixed: run \"git rebase --continue\")" msgstr " （所有冲突已解决：运行 \"git rebase --continue\"）" -#: wt-status.c:888 +#: wt-status.c:908 +#, c-format +msgid "" +"You are currently splitting a commit while rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中拆分一个提交。" + +#: wt-status.c:913 msgid "You are currently splitting a commit during a rebase." msgstr "您正在变基过程中拆分一个提交。" # 译者：注意保持前导空格 -#: wt-status.c:891 +#: wt-status.c:916 msgid " (Once your working directory is clean, run \"git rebase --continue\")" msgstr " （一旦您工作目录提交干净后，运行 \"git rebase --continue\"）" -#: wt-status.c:893 +#: wt-status.c:920 +#, c-format +msgid "You are currently editing a commit while rebasing branch '%s' on '%s'." +msgstr "您正在将分支 '%s' 变基到 '%s' 过程中编辑一个提交。" + +#: wt-status.c:925 msgid "You are currently editing a commit during a rebase." msgstr "您正在变基过程中编辑一个提交。" # 译者：注意保持前导空格 -#: wt-status.c:896 +#: wt-status.c:928 msgid " (use \"git commit --amend\" to amend the current commit)" msgstr " （使用 \"git commit --amend\" 修补当前提交）" # 译者：注意保持前导空格 -#: wt-status.c:898 +#: wt-status.c:930 msgid "" " (use \"git rebase --continue\" once you are satisfied with your changes)" msgstr " （当您对您的修改满意后执行 \"git rebase --continue\"）" -#: wt-status.c:908 +#: wt-status.c:940 msgid "You are currently cherry-picking." msgstr "您正在做拣选操作。" # 译者：注意保持前导空格 -#: wt-status.c:915 +#: wt-status.c:947 msgid " (all conflicts fixed: run \"git commit\")" msgstr " （解决所有冲突后，执行 \"git commit\"）" -#: wt-status.c:924 +#: wt-status.c:958 +#, c-format +msgid "You are currently bisecting branch '%s'." +msgstr "您正在分支 '%s' 中做二分查找。" + +#: wt-status.c:962 msgid "You are currently bisecting." msgstr "您正在做二分查找。" # 译者：注意保持前导空格 -#: wt-status.c:927 +#: wt-status.c:965 msgid " (use \"git bisect reset\" to get back to the original branch)" msgstr " （使用 \"git bisect reset\" 以回到原有分支）" -#: wt-status.c:978 +#: wt-status.c:1064 msgid "On branch " msgstr "位于分支 " -#: wt-status.c:985 +#: wt-status.c:1071 msgid "Not currently on any branch." msgstr "当前不在任何分支上。" -#: wt-status.c:997 +#: wt-status.c:1083 msgid "Initial commit" msgstr "初始提交" -#: wt-status.c:1011 -#, fuzzy +#: wt-status.c:1097 msgid "Untracked files" -msgstr "未跟踪的" +msgstr "未跟踪的文件" -#: wt-status.c:1013 -#, fuzzy +#: wt-status.c:1099 msgid "Ignored files" -msgstr "忽略的" +msgstr "忽略的文件" -#: wt-status.c:1015 +#: wt-status.c:1101 #, c-format msgid "Untracked files not listed%s" msgstr "未跟踪的文件没有列出%s" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1017 +#: wt-status.c:1103 msgid " (use -u option to show untracked files)" msgstr "（使用 -u 参数显示未跟踪的文件）" -#: wt-status.c:1023 +#: wt-status.c:1109 msgid "No changes" msgstr "没有修改" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1028 -#, fuzzy, c-format +#: wt-status.c:1114 +#, c-format msgid "no changes added to commit (use \"git add\" and/or \"git commit -a\")\n" -msgstr "（使用 \"git add\" 和/或 \"git commit -a\"）" +msgstr "修改尚未加入提交（使用 \"git add\" 和/或 \"git commit -a\"）\n" -#: wt-status.c:1031 -#, fuzzy, c-format +#: wt-status.c:1117 +#, c-format msgid "no changes added to commit\n" -msgstr "修改尚未加入提交%s\n" +msgstr "修改尚未加入提交\n" -#: wt-status.c:1034 -#, fuzzy, c-format +#: wt-status.c:1120 +#, c-format msgid "" "nothing added to commit but untracked files present (use \"git add\" to " "track)\n" -msgstr "空提交但存在未跟踪文件%s\n" +msgstr "提交为空，但是存在尚未跟踪的文件（使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1037 -#, fuzzy, c-format +#: wt-status.c:1123 +#, c-format msgid "nothing added to commit but untracked files present\n" -msgstr "空提交但存在未跟踪文件%s\n" +msgstr "提交为空，但是存在尚未跟踪的文件\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1040 -#, fuzzy, c-format +#: wt-status.c:1126 +#, c-format msgid "nothing to commit (create/copy files and use \"git add\" to track)\n" -msgstr "（新建/拷贝的文件使用 \"git add\" 建立跟踪）" +msgstr "无文件要提交（创建/拷贝文件并使用 \"git add\" 建立跟踪）\n" -#: wt-status.c:1043 wt-status.c:1048 -#, fuzzy, c-format +#: wt-status.c:1129 wt-status.c:1134 +#, c-format msgid "nothing to commit\n" -msgstr "无须提交%s\n" +msgstr "无文件要提交\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1046 -#, fuzzy, c-format +#: wt-status.c:1132 +#, c-format msgid "nothing to commit (use -u to show untracked files)\n" -msgstr "（使用 -u 显示未跟踪文件）" +msgstr "无文件要提交（使用 -u 显示未跟踪的文件）\n" # 译者：中文字符串拼接，可删除前导空格 -#: wt-status.c:1050 -#, fuzzy, c-format +#: wt-status.c:1136 +#, c-format msgid "nothing to commit, working directory clean\n" -msgstr "（干净的工作区）" +msgstr "无文件要提交，干净的工作区\n" -#: wt-status.c:1158 +#: wt-status.c:1244 msgid "HEAD (no branch)" msgstr "HEAD（非分支）" # 译者：注意保持句尾空格 -#: wt-status.c:1164 +#: wt-status.c:1250 msgid "Initial commit on " msgstr "初始提交于 " # 译者：注意保持句尾空格 -#: wt-status.c:1179 +#: wt-status.c:1265 msgid "behind " msgstr "落后 " # 译者：注意保持句尾空格 -#: wt-status.c:1182 wt-status.c:1185 +#: wt-status.c:1268 wt-status.c:1271 msgid "ahead " msgstr "领先 " # 译者：注意保持句尾空格 -#: wt-status.c:1187 +#: wt-status.c:1273 msgid ", behind " msgstr "，落后 " @@ -1403,148 +1464,178 @@ msgstr "，落后 " msgid "failed to unlink '%s'" msgstr "无法删除 '%s'" -#: builtin/add.c:19 -#, fuzzy -msgid "git add [options] [--] <filepattern>..." -msgstr "git apply [选项] [<补丁>...]" +#: builtin/add.c:20 +msgid "git add [options] [--] <pathspec>..." +msgstr "git add [选项] [--] <路径匹配>..." -#: builtin/add.c:62 +#: builtin/add.c:63 #, c-format msgid "unexpected diff status %c" msgstr "意外的差异状态 %c" -#: builtin/add.c:67 builtin/commit.c:229 +#: builtin/add.c:68 builtin/commit.c:231 msgid "updating files failed" msgstr "更新文件失败" -#: builtin/add.c:77 +#: builtin/add.c:78 #, c-format msgid "remove '%s'\n" msgstr "删除 '%s'\n" -#: builtin/add.c:176 -#, c-format -msgid "Path '%s' is in submodule '%.*s'" -msgstr "路径 '%s' 属于模组 '%.*s'" - -#: builtin/add.c:192 +#: builtin/add.c:148 msgid "Unstaged changes after refreshing the index:" msgstr "刷新索引之后尚未被暂存的变更：" -#: builtin/add.c:195 builtin/add.c:460 builtin/rm.c:186 +#: builtin/add.c:151 builtin/add.c:460 builtin/rm.c:275 #, c-format msgid "pathspec '%s' did not match any files" msgstr "路径 '%s' 未匹配任何文件" -#: builtin/add.c:209 -#, c-format -msgid "'%s' is beyond a symbolic link" -msgstr "'%s' 位于符号链接中" - -#: builtin/add.c:276 +#: builtin/add.c:234 msgid "Could not read the index" msgstr "不能读取索引" -#: builtin/add.c:286 +#: builtin/add.c:244 #, c-format msgid "Could not open '%s' for writing." msgstr "不能打开 '%s' 以写入。" -#: builtin/add.c:290 +#: builtin/add.c:248 msgid "Could not write patch" msgstr "不能生成补丁" -#: builtin/add.c:295 +#: builtin/add.c:253 #, c-format msgid "Could not stat '%s'" msgstr "不能查看文件状态 '%s'" -#: builtin/add.c:297 +#: builtin/add.c:255 msgid "Empty patch. Aborted." msgstr "空补丁。异常终止。" -#: builtin/add.c:303 +#: builtin/add.c:261 #, c-format msgid "Could not apply '%s'" msgstr "不能应用 '%s'" -#: builtin/add.c:313 +#: builtin/add.c:271 msgid "The following paths are ignored by one of your .gitignore files:\n" msgstr "下列路径根据您的一个 .gitignore 文件而被忽略：\n" -#: builtin/add.c:319 builtin/clean.c:52 builtin/fetch.c:78 builtin/mv.c:63 -#: builtin/prune-packed.c:76 builtin/push.c:388 builtin/remote.c:1253 -#: builtin/rm.c:133 +#: builtin/add.c:277 builtin/clean.c:161 builtin/fetch.c:78 builtin/mv.c:63 +#: builtin/prune-packed.c:76 builtin/push.c:425 builtin/remote.c:1253 +#: builtin/rm.c:206 msgid "dry run" -msgstr "" +msgstr "演习" -#: builtin/add.c:320 builtin/apply.c:4354 builtin/commit.c:1187 -#: builtin/count-objects.c:82 builtin/fsck.c:613 builtin/log.c:1477 -#: builtin/mv.c:62 builtin/read-tree.c:112 +#: builtin/add.c:278 builtin/apply.c:4405 builtin/check-ignore.c:19 +#: builtin/commit.c:1150 builtin/count-objects.c:82 builtin/fsck.c:613 +#: builtin/log.c:1522 builtin/mv.c:62 builtin/read-tree.c:112 msgid "be verbose" msgstr "冗长输出" -#: builtin/add.c:322 -#, fuzzy +#: builtin/add.c:280 msgid "interactive picking" -msgstr "交互式添加失败" +msgstr "交互式拣选" -#: builtin/add.c:323 builtin/checkout.c:1028 builtin/reset.c:248 +#: builtin/add.c:281 builtin/checkout.c:1031 builtin/reset.c:258 msgid "select hunks interactively" -msgstr "" +msgstr "交互式挑选数据块" -#: builtin/add.c:324 +#: builtin/add.c:282 msgid "edit current diff and apply" -msgstr "" +msgstr "编辑当前差异并应用" -#: builtin/add.c:325 +#: builtin/add.c:283 msgid "allow adding otherwise ignored files" -msgstr "" +msgstr "允许添加忽略的文件" -#: builtin/add.c:326 -#, fuzzy +#: builtin/add.c:284 msgid "update tracked files" -msgstr "无法存储包文件" +msgstr "更新已跟踪的文件" -#: builtin/add.c:327 +#: builtin/add.c:285 msgid "record only the fact that the path will be added later" -msgstr "" +msgstr "只记录，该路径稍后再添加" -#: builtin/add.c:328 +#: builtin/add.c:286 msgid "add changes from all tracked and untracked files" -msgstr "" +msgstr "添加所有改变的已跟踪文件和未跟踪文件" -#: builtin/add.c:329 -#, fuzzy +#: builtin/add.c:287 msgid "don't add, only refresh the index" -msgstr "git %s：无法刷新索引" +msgstr "不添加，只刷新索引" -#: builtin/add.c:330 +#: builtin/add.c:288 msgid "just skip files which cannot be added because of errors" -msgstr "" +msgstr "跳过因出错不能添加的文件" -#: builtin/add.c:331 +#: builtin/add.c:289 msgid "check if - even missing - files are ignored in dry run" -msgstr "" +msgstr "检查在演习模式下文件（即使不存在）是否被忽略" -#: builtin/add.c:353 +#: builtin/add.c:311 #, c-format msgid "Use -f if you really want to add them.\n" msgstr "使用 -f 参数如果您确实要添加它们。\n" -#: builtin/add.c:354 +#: builtin/add.c:312 msgid "no files added" msgstr "没有文件被添加" -#: builtin/add.c:360 +#: builtin/add.c:318 msgid "adding files failed" msgstr "添加文件失败" -#: builtin/add.c:392 +# 译者：字符串首行行首要添加“warning: ”字串，故此首行要较其余行短 +#. +#. * To be consistent with "git add -p" and most Git +#. * commands, we should default to being tree-wide, but +#. * this is not the original behavior and can't be +#. * changed until users trained themselves not to type +#. * "git add -u" or "git add -A". For now, we warn and +#. * keep the old behavior. Later, this warning can be +#. * turned into a die(...), and eventually we may +#. * reallow the command with a new behavior. +#. +#: builtin/add.c:335 +#, c-format +msgid "" +"The behavior of 'git add %s (or %s)' with no path argument from a\n" +"subdirectory of the tree will change in Git 2.0 and should not be used " +"anymore.\n" +"To add content for the whole tree, run:\n" +"\n" +" git add %s :/\n" +" (or git add %s :/)\n" +"\n" +"To restrict the command to the current directory, run:\n" +"\n" +" git add %s .\n" +" (or git add %s .)\n" +"\n" +"With the current Git version, the command is restricted to the current " +"directory." +msgstr "" +"在 Git 2.0 版本，将不再允许在一个子目录下不带任何路径参数地执行\n" +"命令 'git add %s (或 %s)'。所以不要再继续使用了。\n" +"如果要添加整个目录树的内容，执行：\n" +"\n" +" git add %s :/\n" +" (或 git add %s :/)\n" +"\n" +"如果要限制该命令只作用于当前目录，执行：\n" +"\n" +" git add %s .\n" +" (或 git add %s .)\n" +"\n" +"对于当前版本的 Git，这条命令只作用于当前目录。" + +#: builtin/add.c:381 msgid "-A and -u are mutually incompatible" msgstr "-A 和 -u 选项互斥" -#: builtin/add.c:394 +#: builtin/add.c:383 msgid "Option --ignore-missing can only be used together with --dry-run" msgstr "选项 --ignore-missing 只能和 --dry-run 同时使用" @@ -1558,12 +1649,12 @@ msgstr "没有指定文件，也没有文件被添加。\n" msgid "Maybe you wanted to say 'git add .'?\n" msgstr "也许您想要执行 'git add .'？\n" -#: builtin/add.c:421 builtin/clean.c:95 builtin/commit.c:289 builtin/mv.c:82 -#: builtin/rm.c:162 +#: builtin/add.c:421 builtin/check-ignore.c:67 builtin/clean.c:204 +#: builtin/commit.c:291 builtin/mv.c:82 builtin/rm.c:235 msgid "index file corrupt" msgstr "索引文件损坏" -#: builtin/add.c:481 builtin/apply.c:4450 builtin/mv.c:229 builtin/rm.c:260 +#: builtin/add.c:481 builtin/apply.c:4501 builtin/mv.c:229 builtin/rm.c:370 msgid "Unable to write new index file" msgstr "无法写入新索引文件" @@ -1616,17 +1707,17 @@ msgstr "git apply：错误的 git-diff - 第 %d 行上旧文件名不一致" msgid "git apply: bad git-diff - expected /dev/null on line %d" msgstr "git apply：错误的 git-diff - 第 %d 行处应为 /dev/null" -#: builtin/apply.c:1420 +#: builtin/apply.c:1422 #, c-format msgid "recount: unexpected line: %.*s" msgstr "recount：意外的行：%.*s" -#: builtin/apply.c:1477 +#: builtin/apply.c:1479 #, c-format msgid "patch fragment without header at line %d: %.*s" msgstr "第 %d 行的补丁片段没有头信息：%.*s" -#: builtin/apply.c:1494 +#: builtin/apply.c:1496 #, c-format msgid "" "git diff header lacks filename information when removing %d leading pathname " @@ -1637,82 +1728,78 @@ msgid_plural "" msgstr[0] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" msgstr[1] "当移除 %d 个前导路径后 git diff 头缺乏文件名信息（第 %d 行）" -#: builtin/apply.c:1654 +#: builtin/apply.c:1656 msgid "new file depends on old contents" msgstr "新文件依赖旧内容" -#: builtin/apply.c:1656 +#: builtin/apply.c:1658 msgid "deleted file still has contents" msgstr "删除的文件仍有内容" -#: builtin/apply.c:1682 +#: builtin/apply.c:1684 #, c-format msgid "corrupt patch at line %d" msgstr "补丁在第 %d 行损坏" -#: builtin/apply.c:1718 +#: builtin/apply.c:1720 #, c-format msgid "new file %s depends on old contents" msgstr "新文件 %s 依赖旧内容" -#: builtin/apply.c:1720 +#: builtin/apply.c:1722 #, c-format msgid "deleted file %s still has contents" msgstr "删除的文件 %s 仍有内容" -#: builtin/apply.c:1723 +#: builtin/apply.c:1725 #, c-format msgid "** warning: file %s becomes empty but is not deleted" msgstr "** 警告：文件 %s 成为空文件但并未删除" -#: builtin/apply.c:1869 +#: builtin/apply.c:1871 #, c-format msgid "corrupt binary patch at line %d: %.*s" msgstr "二进制补丁在第 %d 行损坏：%.*s" #. there has to be one hunk (forward hunk) -#: builtin/apply.c:1898 +#: builtin/apply.c:1900 #, c-format msgid "unrecognized binary patch at line %d" msgstr "未能识别的二进制补丁位于第 %d 行" -#: builtin/apply.c:1984 +#: builtin/apply.c:1986 #, c-format msgid "patch with only garbage at line %d" msgstr "补丁文件的第 %d 行只有垃圾数据" -#: builtin/apply.c:2074 +#: builtin/apply.c:2076 #, c-format msgid "unable to read symlink %s" msgstr "无法读取符号链接 %s" -#: builtin/apply.c:2078 +#: builtin/apply.c:2080 #, c-format msgid "unable to open or read %s" msgstr "不能打开或读取 %s" -#: builtin/apply.c:2149 -msgid "oops" -msgstr "哎哟" - -#: builtin/apply.c:2671 +#: builtin/apply.c:2684 #, c-format msgid "invalid start of line: '%c'" msgstr "无效的行首字符：'%c'" -#: builtin/apply.c:2789 +#: builtin/apply.c:2802 #, 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 行）" +msgstr[0] "块 #%d 成功应用于 %d（偏移 %d 行）" +msgstr[1] "块 #%d 成功应用于 %d（偏移 %d 行）" -#: builtin/apply.c:2801 +#: builtin/apply.c:2814 #, c-format msgid "Context reduced to (%ld/%ld) to apply fragment at %d" msgstr "上下文减少到（%ld/%ld）以在第 %d 行应用补丁片段" -#: builtin/apply.c:2807 +#: builtin/apply.c:2820 #, c-format msgid "" "while searching for:\n" @@ -1721,319 +1808,318 @@ msgstr "" "当查询：\n" "%.*s" -#: builtin/apply.c:2826 +#: builtin/apply.c:2839 #, c-format msgid "missing binary patch data for '%s'" msgstr "缺失 '%s' 的二进制补丁数据" -#: builtin/apply.c:2929 +#: builtin/apply.c:2942 #, c-format msgid "binary patch does not apply to '%s'" msgstr "二进制补丁未应用到 '%s'" -#: builtin/apply.c:2935 +#: builtin/apply.c:2948 #, c-format msgid "binary patch to '%s' creates incorrect result (expecting %s, got %s)" msgstr "到 '%s' 的二进制补丁产生了不正确的结果（应为 %s，却为 %s）" -#: builtin/apply.c:2956 +#: builtin/apply.c:2969 #, c-format msgid "patch failed: %s:%ld" msgstr "打补丁失败：%s:%ld" -#: builtin/apply.c:3078 +#: builtin/apply.c:3091 #, c-format msgid "cannot checkout %s" msgstr "不能检出 %s" -#: builtin/apply.c:3123 builtin/apply.c:3132 builtin/apply.c:3176 +#: builtin/apply.c:3136 builtin/apply.c:3145 builtin/apply.c:3189 #, c-format msgid "read of %s failed" msgstr "读取 %s 失败" -#: builtin/apply.c:3156 builtin/apply.c:3378 +#: builtin/apply.c:3169 builtin/apply.c:3391 #, c-format msgid "path %s has been renamed/deleted" msgstr "路径 %s 已经被重命名/删除" -#: builtin/apply.c:3237 builtin/apply.c:3392 +#: builtin/apply.c:3250 builtin/apply.c:3405 #, c-format msgid "%s: does not exist in index" msgstr "%s：不存在于索引中" -#: builtin/apply.c:3241 builtin/apply.c:3384 builtin/apply.c:3406 +#: builtin/apply.c:3254 builtin/apply.c:3397 builtin/apply.c:3419 #, c-format msgid "%s: %s" msgstr "%s：%s" -#: builtin/apply.c:3246 builtin/apply.c:3400 +#: builtin/apply.c:3259 builtin/apply.c:3413 #, c-format msgid "%s: does not match index" msgstr "%s：和索引不匹配" -#: builtin/apply.c:3348 +#: builtin/apply.c:3361 msgid "removal patch leaves file contents" msgstr "移除补丁仍留下了文件内容" -#: builtin/apply.c:3417 +#: builtin/apply.c:3430 #, c-format msgid "%s: wrong type" msgstr "%s：错误类型" -#: builtin/apply.c:3419 +#: builtin/apply.c:3432 #, c-format msgid "%s has type %o, expected %o" msgstr "%s 的类型是 %o，应为 %o" -#: builtin/apply.c:3520 +#: builtin/apply.c:3533 #, c-format msgid "%s: already exists in index" msgstr "%s：已经存在于索引中" -#: builtin/apply.c:3523 +#: builtin/apply.c:3536 #, c-format msgid "%s: already exists in working directory" msgstr "%s：已经存在于工作区中" -#: builtin/apply.c:3543 +#: builtin/apply.c:3556 #, c-format msgid "new mode (%o) of %s does not match old mode (%o)" msgstr "%2$s 的新模式（%1$o）和旧模式（%3$o）不匹配" -#: builtin/apply.c:3548 +#: builtin/apply.c:3561 #, 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:3556 +#: builtin/apply.c:3569 #, c-format msgid "%s: patch does not apply" msgstr "%s：补丁未应用" -#: builtin/apply.c:3569 +#: builtin/apply.c:3582 #, c-format msgid "Checking patch %s..." msgstr "检查补丁 %s..." -#: builtin/apply.c:3624 builtin/checkout.c:215 builtin/reset.c:158 +#: builtin/apply.c:3675 builtin/checkout.c:215 builtin/reset.c:124 #, c-format msgid "make_cache_entry failed for path '%s'" msgstr "对路径 '%s' 的 make_cache_entry 操作失败" -#: builtin/apply.c:3767 +#: builtin/apply.c:3818 #, c-format msgid "unable to remove %s from index" msgstr "不能从索引中移除 %s" -#: builtin/apply.c:3795 +#: builtin/apply.c:3846 #, c-format msgid "corrupt patch for subproject %s" msgstr "子项目 %s 损坏的补丁" -#: builtin/apply.c:3799 +#: builtin/apply.c:3850 #, c-format msgid "unable to stat newly created file '%s'" msgstr "不能枚举新建文件 '%s' 的状态" -#: builtin/apply.c:3804 +#: builtin/apply.c:3855 #, c-format msgid "unable to create backing store for newly created file %s" msgstr "不能为新建文件 %s 创建后端存储" -#: builtin/apply.c:3807 builtin/apply.c:3915 +#: builtin/apply.c:3858 builtin/apply.c:3966 #, c-format msgid "unable to add cache entry for %s" msgstr "无法为 %s 添加缓存条目" -#: builtin/apply.c:3840 +#: builtin/apply.c:3891 #, c-format msgid "closing file '%s'" msgstr "关闭文件 '%s'" -#: builtin/apply.c:3889 +#: builtin/apply.c:3940 #, c-format msgid "unable to write file '%s' mode %o" msgstr "不能写文件 '%s' 权限 %o" -#: builtin/apply.c:3976 +#: builtin/apply.c:4027 #, c-format msgid "Applied patch %s cleanly." msgstr "成功应用补丁 %s。" -#: builtin/apply.c:3984 +#: builtin/apply.c:4035 msgid "internal error" msgstr "内部错误" #. Say this even without --verbose -#: builtin/apply.c:3987 +#: builtin/apply.c:4038 #, 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:3997 +#: builtin/apply.c:4048 #, c-format msgid "truncating .rej filename to %.*s.rej" msgstr "截短 .rej 文件名为 %.*s.rej" -#: builtin/apply.c:4018 +#: builtin/apply.c:4069 #, c-format msgid "Hunk #%d applied cleanly." msgstr "第 #%d 个片段成功应用。" -#: builtin/apply.c:4021 +#: builtin/apply.c:4072 #, c-format msgid "Rejected hunk #%d." msgstr "拒绝第 #%d 个片段。" -#: builtin/apply.c:4171 +#: builtin/apply.c:4222 msgid "unrecognized input" msgstr "未能识别的输入" -#: builtin/apply.c:4182 +#: builtin/apply.c:4233 msgid "unable to read index file" msgstr "无法读取索引文件" -#: builtin/apply.c:4301 builtin/apply.c:4304 builtin/clone.c:91 +#: builtin/apply.c:4352 builtin/apply.c:4355 builtin/clone.c:91 #: builtin/fetch.c:63 msgid "path" msgstr "路径" -#: builtin/apply.c:4302 +#: builtin/apply.c:4353 msgid "don't apply changes matching the given path" msgstr "不要应用与给出路径向匹配的变更" -#: builtin/apply.c:4305 +#: builtin/apply.c:4356 msgid "apply changes matching the given path" msgstr "应用与给出路径向匹配的变更" -#: builtin/apply.c:4307 +#: builtin/apply.c:4358 msgid "num" msgstr "数字" -#: builtin/apply.c:4308 +#: builtin/apply.c:4359 msgid "remove <num> leading slashes from traditional diff paths" -msgstr "从传统的 diff 路径中移除 <数字> 个前导路径" +msgstr "从传统的 diff 路径中移除指定数量的前导斜线" -#: builtin/apply.c:4311 +#: builtin/apply.c:4362 msgid "ignore additions made by the patch" msgstr "忽略补丁中的添加的文件" -#: builtin/apply.c:4313 +#: builtin/apply.c:4364 msgid "instead of applying the patch, output diffstat for the input" msgstr "不应用补丁，而是显示输入的差异统计（diffstat）" -#: builtin/apply.c:4317 -#, fuzzy +#: builtin/apply.c:4368 msgid "show number of added and deleted lines in decimal notation" -msgstr "以数字方式显示添加或删除行的数量" +msgstr "以十进制数显示添加和删除的行数" -#: builtin/apply.c:4319 +#: builtin/apply.c:4370 msgid "instead of applying the patch, output a summary for the input" msgstr "不应用补丁，而是显示输入的概要" -#: builtin/apply.c:4321 +#: builtin/apply.c:4372 msgid "instead of applying the patch, see if the patch is applicable" msgstr "不应用补丁，而是查看补丁是否可应用" -#: builtin/apply.c:4323 +#: builtin/apply.c:4374 msgid "make sure the patch is applicable to the current index" msgstr "确认补丁可以应用到当前索引" -#: builtin/apply.c:4325 +#: builtin/apply.c:4376 msgid "apply a patch without touching the working tree" msgstr "应用补丁而不修改工作区" -#: builtin/apply.c:4327 +#: builtin/apply.c:4378 msgid "also apply the patch (use with --stat/--summary/--check)" msgstr "还应用此补丁（与 --stat/--summary/--check 选项同时使用）" -#: builtin/apply.c:4329 +#: builtin/apply.c:4380 msgid "attempt three-way merge if a patch does not apply" msgstr "如果一个补丁不能应用则尝试三路合并" -#: builtin/apply.c:4331 +#: builtin/apply.c:4382 msgid "build a temporary index based on embedded index information" msgstr "创建一个临时索引基于嵌入的索引信息" -#: builtin/apply.c:4333 builtin/checkout-index.c:197 builtin/ls-files.c:460 +#: builtin/apply.c:4384 builtin/checkout-index.c:197 builtin/ls-files.c:463 msgid "paths are separated with NUL character" msgstr "路径以 NUL 字符分隔" -#: builtin/apply.c:4336 +#: builtin/apply.c:4387 msgid "ensure at least <n> lines of context match" msgstr "确保至少匹配 <n> 行上下文" -#: builtin/apply.c:4337 +#: builtin/apply.c:4388 msgid "action" msgstr "动作" -#: builtin/apply.c:4338 +#: builtin/apply.c:4389 msgid "detect new or modified lines that have whitespace errors" msgstr "检查新增和修改的行中间的空白字符滥用" -#: builtin/apply.c:4341 builtin/apply.c:4344 +#: builtin/apply.c:4392 builtin/apply.c:4395 msgid "ignore changes in whitespace when finding context" msgstr "查找上下文时忽略空白字符的变更" -#: builtin/apply.c:4347 +#: builtin/apply.c:4398 msgid "apply the patch in reverse" msgstr "反向应用补丁" -#: builtin/apply.c:4349 +#: builtin/apply.c:4400 msgid "don't expect at least one line of context" msgstr "无需至少一行上下文" -#: builtin/apply.c:4351 +#: builtin/apply.c:4402 msgid "leave the rejected hunks in corresponding *.rej files" msgstr "将拒绝的补丁片段保存在对应的 *.rej 文件中" -#: builtin/apply.c:4353 +#: builtin/apply.c:4404 msgid "allow overlapping hunks" msgstr "允许重叠的补丁片段" -#: builtin/apply.c:4356 +#: builtin/apply.c:4407 msgid "tolerate incorrectly detected missing new-line at the end of file" msgstr "允许不正确的文件末尾换行符" -#: builtin/apply.c:4359 +#: builtin/apply.c:4410 msgid "do not trust the line counts in the hunk headers" msgstr "不信任补丁片段的头信息中的行号" -#: builtin/apply.c:4361 +#: builtin/apply.c:4412 msgid "root" msgstr "根目录" -#: builtin/apply.c:4362 +#: builtin/apply.c:4413 msgid "prepend <root> to all filenames" msgstr "为所有文件名前添加 <根目录>" -#: builtin/apply.c:4384 +#: builtin/apply.c:4435 msgid "--3way outside a repository" msgstr "--3way 在一个版本库之外" -#: builtin/apply.c:4392 +#: builtin/apply.c:4443 msgid "--index outside a repository" msgstr "--index 在一个版本库之外" -#: builtin/apply.c:4395 +#: builtin/apply.c:4446 msgid "--cached outside a repository" msgstr "--cached 在一个版本库之外" -#: builtin/apply.c:4411 +#: builtin/apply.c:4462 #, c-format msgid "can't open patch '%s'" msgstr "不能打开补丁 '%s'" -#: builtin/apply.c:4425 +#: builtin/apply.c:4476 #, c-format msgid "squelched %d whitespace error" msgid_plural "squelched %d whitespace errors" msgstr[0] "抑制下仍有 %d 个空白字符误用" msgstr[1] "抑制下仍有 %d 个空白字符误用" -#: builtin/apply.c:4431 builtin/apply.c:4441 +#: builtin/apply.c:4482 builtin/apply.c:4492 #, c-format msgid "%d line adds whitespace errors." msgid_plural "%d lines add whitespace errors." @@ -2077,135 +2163,131 @@ msgstr "git archive：应为刷新" #: builtin/bisect--helper.c:7 msgid "git bisect--helper --next-all [--no-checkout]" -msgstr "" +msgstr "git bisect--helper --next-all [--no-checkout]" #: builtin/bisect--helper.c:17 msgid "perform 'git bisect next'" -msgstr "" +msgstr "执行 'git bisect next'" #: builtin/bisect--helper.c:19 msgid "update BISECT_HEAD instead of checking out the current commit" -msgstr "" +msgstr "更新 BISECT_HEAD 而非检出当前提交" #: builtin/blame.c:25 msgid "git blame [options] [rev-opts] [rev] [--] file" -msgstr "" +msgstr "git blame [选项] [版本选项] [版本] [--] 文件" #: builtin/blame.c:30 builtin/shortlog.c:15 msgid "[rev-opts] are documented in git-rev-list(1)" -msgstr "" +msgstr "[版本选项] 的文档记录在 git-rev-list(1) 中" -#: builtin/blame.c:2316 +#: builtin/blame.c:2350 msgid "Show blame entries as we find them, incrementally" -msgstr "" +msgstr "增量式地显示发现的 blame 条目" -#: builtin/blame.c:2317 +#: builtin/blame.c:2351 msgid "Show blank SHA-1 for boundary commits (Default: off)" -msgstr "" +msgstr "边界提交显示空的 SHA-1（默认：关闭）" -#: builtin/blame.c:2318 +#: builtin/blame.c:2352 msgid "Do not treat root commits as boundaries (Default: off)" -msgstr "" +msgstr "不把根提交作为边界（默认：关闭）" -#: builtin/blame.c:2319 -#, fuzzy +#: builtin/blame.c:2353 msgid "Show work cost statistics" -msgstr "显示工作区状态" +msgstr "显示命令消耗统计" -#: builtin/blame.c:2320 +#: builtin/blame.c:2354 msgid "Show output score for blame entries" -msgstr "" +msgstr "显示判断 blame 条目位移的得分诊断信息" -#: builtin/blame.c:2321 +#: builtin/blame.c:2355 msgid "Show original filename (Default: auto)" -msgstr "" +msgstr "显示原始文件名（默认：自动）" -#: builtin/blame.c:2322 +#: builtin/blame.c:2356 msgid "Show original linenumber (Default: off)" -msgstr "" +msgstr "显示原始的行号（默认：关闭）" -#: builtin/blame.c:2323 +#: builtin/blame.c:2357 msgid "Show in a format designed for machine consumption" -msgstr "" +msgstr "显示为一个适合机器读取的格式" -#: builtin/blame.c:2324 +#: builtin/blame.c:2358 msgid "Show porcelain format with per-line commit information" -msgstr "" +msgstr "为每一行显示机器适用的提交信息" -#: builtin/blame.c:2325 +#: builtin/blame.c:2359 msgid "Use the same output mode as git-annotate (Default: off)" -msgstr "" +msgstr "使用和 git-annotate 相同的输出模式（默认：关闭）" -#: builtin/blame.c:2326 +#: builtin/blame.c:2360 msgid "Show raw timestamp (Default: off)" -msgstr "" +msgstr "显示原始时间戳（默认：关闭）" -#: builtin/blame.c:2327 +#: builtin/blame.c:2361 msgid "Show long commit SHA1 (Default: off)" -msgstr "" +msgstr "显示长的SHA1提交号（默认：关闭）" -#: builtin/blame.c:2328 +#: builtin/blame.c:2362 msgid "Suppress author name and timestamp (Default: off)" -msgstr "" +msgstr "隐藏作者名字和时间戳（默认：关闭）" -#: builtin/blame.c:2329 +#: builtin/blame.c:2363 msgid "Show author email instead of name (Default: off)" -msgstr "" +msgstr "显示作者的邮箱而不是名字（默认：关闭）" -#: builtin/blame.c:2330 +#: builtin/blame.c:2364 msgid "Ignore whitespace differences" -msgstr "" +msgstr "忽略空白差异" -#: builtin/blame.c:2331 +#: builtin/blame.c:2365 msgid "Spend extra cycles to find better match" -msgstr "" +msgstr "花费额外的循环来找到更好的匹配" -#: builtin/blame.c:2332 +#: builtin/blame.c:2366 msgid "Use revisions from <file> instead of calling git-rev-list" -msgstr "" +msgstr "使用来自 <file> 的修订集而不是调用 git-rev-list" -#: builtin/blame.c:2333 -#, fuzzy +#: builtin/blame.c:2367 msgid "Use <file>'s contents as the final image" -msgstr "添加文件内容至索引" +msgstr "使用 <file> 的内容作为最终的图片" -#: builtin/blame.c:2334 builtin/blame.c:2335 +#: builtin/blame.c:2368 builtin/blame.c:2369 msgid "score" -msgstr "" +msgstr "得分" -#: builtin/blame.c:2334 +#: builtin/blame.c:2368 msgid "Find line copies within and across files" -msgstr "" +msgstr "找到文件内及跨文件的行拷贝" -#: builtin/blame.c:2335 +#: builtin/blame.c:2369 msgid "Find line movements within and across files" -msgstr "" +msgstr "找到文件内及跨文件的行移动" -#: builtin/blame.c:2336 -#, fuzzy +#: builtin/blame.c:2370 msgid "n,m" -msgstr "数字" +msgstr "n,m" -#: builtin/blame.c:2336 +#: builtin/blame.c:2370 msgid "Process only line range n,m, counting from 1" -msgstr "" +msgstr "只处理行范围在 n 和 m 之间的，从 1 开始" #: builtin/branch.c:23 msgid "git branch [options] [-r | -a] [--merged | --no-merged]" -msgstr "" +msgstr "git branch [选项] [-r | -a] [--merged | --no-merged]" #: builtin/branch.c:24 msgid "git branch [options] [-l] [-f] <branchname> [<start-point>]" -msgstr "" +msgstr "git branch [选项] [-l] [-f] <分支名> [<起始点>]" #: builtin/branch.c:25 -#, fuzzy msgid "git branch [options] [-r] (-d | -D) <branchname>..." -msgstr "git apply [选项] [<补丁>...]" +msgstr "git branch [选项] [-r] (-d | -D) <分支名>..." #: builtin/branch.c:26 msgid "git branch [options] (-m | -M) [<oldbranch>] <newbranch>" -msgstr "" +msgstr "git branch [选项] (-m | -M) [<旧分支>] <新分支>" # 译者：保持原换行格式，在输出时 %s 的替代内容会让字符串变长 #: builtin/branch.c:145 @@ -2227,294 +2309,326 @@ msgstr "" "并未删除分支 '%s'， 虽然它已经合并到 HEAD，\n" " 然而却尚未被合并到分支 '%s' 。" -#: builtin/branch.c:181 +#: builtin/branch.c:163 +#, c-format +msgid "Couldn't look up commit object for '%s'" +msgstr "无法查询 '%s' 指向的提交对象" + +#: builtin/branch.c:167 +#, c-format +msgid "" +"The branch '%s' is not fully merged.\n" +"If you are sure you want to delete it, run 'git branch -D %s'." +msgstr "" +"分支 '%s' 没有完全合并。\n" +"如果您确认要删除它，执行 'git branch -D %s'。" + +#: builtin/branch.c:180 +msgid "Update of config-file failed" +msgstr "无法更新 config 文件" + +#: builtin/branch.c:208 msgid "cannot use -a with -d" msgstr "不能将 -a 和 -d 同时使用" -#: builtin/branch.c:187 +#: builtin/branch.c:214 msgid "Couldn't look up commit object for HEAD" msgstr "无法查询 HEAD 指向的提交对象" -#: builtin/branch.c:192 +#: builtin/branch.c:222 #, c-format msgid "Cannot delete the branch '%s' which you are currently on." msgstr "无法删除您当前所在的分支 '%s'。" -#: builtin/branch.c:203 +#: builtin/branch.c:235 #, c-format msgid "remote branch '%s' not found." msgstr "远程分支 '%s' 未发现。" -#: builtin/branch.c:204 +#: builtin/branch.c:236 #, c-format msgid "branch '%s' not found." msgstr "分支 '%s' 未发现。" -#: builtin/branch.c:211 -#, c-format -msgid "Couldn't look up commit object for '%s'" -msgstr "无法查询 '%s' 指向的提交对象" - -#: builtin/branch.c:217 -#, c-format -msgid "" -"The branch '%s' is not fully merged.\n" -"If you are sure you want to delete it, run 'git branch -D %s'." -msgstr "" -"分支 '%s' 没有完全合并。\n" -"如果您确认要删除它，执行 'git branch -D %s'。" - -#: builtin/branch.c:226 +#: builtin/branch.c:250 #, c-format msgid "Error deleting remote branch '%s'" msgstr "删除远程分支 '%s' 时出错" -#: builtin/branch.c:227 +#: builtin/branch.c:251 #, c-format msgid "Error deleting branch '%s'" msgstr "删除分支 '%s' 时出错" -#: builtin/branch.c:234 +#: builtin/branch.c:258 #, c-format msgid "Deleted remote branch %s (was %s).\n" msgstr "已删除远程分支 %s（曾为 %s）。\n" -#: builtin/branch.c:235 +#: builtin/branch.c:259 #, c-format msgid "Deleted branch %s (was %s).\n" msgstr "已删除分支 %s（曾为 %s）。\n" -#: builtin/branch.c:240 -msgid "Update of config-file failed" -msgstr "无法更新 config 文件" - -#: builtin/branch.c:338 +#: builtin/branch.c:361 #, c-format msgid "branch '%s' does not point at a commit" msgstr "分支 '%s' 未指向一个提交" -#: builtin/branch.c:410 +#: builtin/branch.c:433 #, c-format msgid "[%s: behind %d]" msgstr "[%s：落后 %d]" -#: builtin/branch.c:412 +#: builtin/branch.c:435 #, c-format msgid "[behind %d]" msgstr "[落后 %d]" -#: builtin/branch.c:416 +#: builtin/branch.c:439 #, c-format msgid "[%s: ahead %d]" msgstr "[%s：领先 %d]" -#: builtin/branch.c:418 +#: builtin/branch.c:441 #, c-format msgid "[ahead %d]" msgstr "[领先 %d]" -#: builtin/branch.c:421 +#: builtin/branch.c:444 #, c-format msgid "[%s: ahead %d, behind %d]" msgstr "[%s：领先 %d，落后 %d]" -#: builtin/branch.c:424 +#: builtin/branch.c:447 #, c-format msgid "[ahead %d, behind %d]" msgstr "[领先 %d，落后 %d]" -#: builtin/branch.c:537 +#: builtin/branch.c:469 +msgid " **** invalid ref ****" +msgstr " **** 无效引用 ****" + +#: builtin/branch.c:560 msgid "(no branch)" msgstr "（非分支）" -#: builtin/branch.c:602 +#: builtin/branch.c:593 +#, c-format +msgid "object '%s' does not point to a commit" +msgstr "对象 '%s' 没有指向一个提交" + +#: builtin/branch.c:625 msgid "some refs could not be read" msgstr "一些引用不能读取" -#: builtin/branch.c:615 +#: builtin/branch.c:638 msgid "cannot rename the current branch while not on any." msgstr "无法重命名当前分支因为不处于任何分支上。" -#: builtin/branch.c:625 +#: builtin/branch.c:648 #, c-format msgid "Invalid branch name: '%s'" msgstr "无效的分支名：'%s'" -#: builtin/branch.c:640 +#: builtin/branch.c:663 msgid "Branch rename failed" msgstr "分支重命名失败" -#: builtin/branch.c:644 +#: builtin/branch.c:667 #, c-format msgid "Renamed a misnamed branch '%s' away" msgstr "重命名掉一个错误命名的旧分支 '%s'" -#: builtin/branch.c:648 +#: builtin/branch.c:671 #, c-format msgid "Branch renamed to %s, but HEAD is not updated!" msgstr "分支重命名为 %s，但 HEAD 没有更新！" -#: builtin/branch.c:655 +#: builtin/branch.c:678 msgid "Branch is renamed, but update of config-file failed" msgstr "分支被重命名，但更新 config 文件失败" -#: builtin/branch.c:670 +#: builtin/branch.c:693 #, c-format msgid "malformed object name %s" msgstr "非法的对象名 %s" -#: builtin/branch.c:694 +#: builtin/branch.c:717 #, c-format msgid "could not write branch description template: %s" msgstr "不能写分支描述模版：%s" -#: builtin/branch.c:724 -#, fuzzy +#: builtin/branch.c:747 msgid "Generic options" -msgstr "无效选项：%s" +msgstr "通用选项" -#: builtin/branch.c:726 +#: builtin/branch.c:749 msgid "show hash and subject, give twice for upstream branch" -msgstr "" +msgstr "显示哈希值和主题，若参数出现两次则显示上游分支" -#: builtin/branch.c:727 +#: builtin/branch.c:750 msgid "suppress informational messages" -msgstr "" +msgstr "不显示信息" -#: builtin/branch.c:728 +#: builtin/branch.c:751 msgid "set up tracking mode (see git-pull(1))" -msgstr "" +msgstr "设置跟踪模式（参见 git-pull(1)）" -#: builtin/branch.c:730 +#: builtin/branch.c:753 msgid "change upstream info" -msgstr "" +msgstr "改变上游信息" -#: builtin/branch.c:734 -#, fuzzy +#: builtin/branch.c:757 msgid "use colored output" -msgstr "不能输出重定向" +msgstr "使用彩色输出" -#: builtin/branch.c:735 -#, fuzzy +#: builtin/branch.c:758 msgid "act on remote-tracking branches" -msgstr "%s 没有来自 %s 的远程跟踪分支" +msgstr "作用于远程跟踪分支" -#: builtin/branch.c:738 builtin/branch.c:744 builtin/branch.c:765 -#: builtin/branch.c:771 builtin/commit.c:1395 builtin/commit.c:1396 -#: builtin/commit.c:1397 builtin/commit.c:1398 builtin/tag.c:470 -#, fuzzy +#: builtin/branch.c:761 builtin/branch.c:767 builtin/branch.c:788 +#: builtin/branch.c:794 builtin/commit.c:1366 builtin/commit.c:1367 +#: builtin/commit.c:1368 builtin/commit.c:1369 builtin/tag.c:468 msgid "commit" -msgstr "（坏提交）\n" +msgstr "提交" -#: builtin/branch.c:739 builtin/branch.c:745 +#: builtin/branch.c:762 builtin/branch.c:768 msgid "print only branches that contain the commit" -msgstr "" +msgstr "只打印包含该提交的分支" -#: builtin/branch.c:751 +#: builtin/branch.c:774 msgid "Specific git-branch actions:" -msgstr "" +msgstr "具体的 git-branch 动作：" -#: builtin/branch.c:752 +#: builtin/branch.c:775 msgid "list both remote-tracking and local branches" -msgstr "" +msgstr "列出远程跟踪及本地分支" -#: builtin/branch.c:754 +#: builtin/branch.c:777 msgid "delete fully merged branch" -msgstr "" +msgstr "删除完全合并的分支" -#: builtin/branch.c:755 +#: builtin/branch.c:778 msgid "delete branch (even if not merged)" -msgstr "" +msgstr "删除分支（即使没有合并）" -#: builtin/branch.c:756 +#: builtin/branch.c:779 msgid "move/rename a branch and its reflog" -msgstr "" +msgstr "移动/重命名一个分支，以及它的引用日志" -#: builtin/branch.c:757 +#: builtin/branch.c:780 msgid "move/rename a branch, even if target exists" -msgstr "" +msgstr "移动/重命名一个分支，即使目标已存在" -#: builtin/branch.c:758 -#, fuzzy +#: builtin/branch.c:781 msgid "list branch names" -msgstr "无效的分支名：'%s'" +msgstr "列出分支名" -#: builtin/branch.c:759 +#: builtin/branch.c:782 msgid "create the branch's reflog" -msgstr "" +msgstr "创建分支的引用日志" -#: builtin/branch.c:761 +#: builtin/branch.c:784 msgid "edit the description for the branch" -msgstr "" +msgstr "标记分支的描述" -#: builtin/branch.c:762 -#, fuzzy +#: builtin/branch.c:785 msgid "force creation (when already exists)" -msgstr "远程 %s 已经存在。" +msgstr "强制创建（当已经存在）" -#: builtin/branch.c:765 -#, fuzzy +#: builtin/branch.c:788 msgid "print only not merged branches" -msgstr "无法移除分支 %s" +msgstr "只打印没有合并的分支" -#: builtin/branch.c:771 +#: builtin/branch.c:794 msgid "print only merged branches" -msgstr "" +msgstr "只打印合并的分支" -#: builtin/branch.c:775 +#: builtin/branch.c:798 msgid "list branches in columns" -msgstr "" +msgstr "以列的方式显示分支" -#: builtin/branch.c:788 +#: builtin/branch.c:811 msgid "Failed to resolve HEAD as a valid ref." msgstr "无法将 HEAD 解析为有效引用。" -#: builtin/branch.c:793 builtin/clone.c:561 +#: builtin/branch.c:816 builtin/clone.c:561 msgid "HEAD not found below refs/heads!" msgstr "HEAD 没有位于 /refs/heads 之下！" -#: builtin/branch.c:813 +#: builtin/branch.c:839 msgid "--column and --verbose are incompatible" msgstr "--column 和 --verbose 不兼容" -#: builtin/branch.c:864 -#, fuzzy, c-format +#: builtin/branch.c:845 +msgid "branch name required" +msgstr "必须提供分支名" + +#: builtin/branch.c:860 +msgid "Cannot give description to detached HEAD" +msgstr "不能向分离头指针提供描述" + +#: builtin/branch.c:865 +msgid "cannot edit description of more than one branch" +msgstr "不能为一个以上的分支编辑描述" + +#: builtin/branch.c:872 +#, c-format +msgid "No commit on branch '%s' yet." +msgstr "分支 '%s' 尚无提交。" + +#: builtin/branch.c:875 +#, c-format +msgid "No branch named '%s'." +msgstr "没有分支 '%s'。" + +#: builtin/branch.c:888 +msgid "too many branches for a rename operation" +msgstr "为重命名操作提供了太多的分支名" + +#: builtin/branch.c:893 +#, c-format msgid "branch '%s' does not exist" -msgstr "版本库 '%s' 不存在" +msgstr "分支 '%s' 不存在" -#: builtin/branch.c:876 +#: builtin/branch.c:905 #, c-format msgid "Branch '%s' has no upstream information" -msgstr "" +msgstr "分支 '%s' 没有上游信息" -#: builtin/branch.c:891 +#: builtin/branch.c:920 msgid "-a and -r options to 'git branch' do not make sense with a branch name" msgstr "'git branch' 的 -a 和 -r 选项带一个分支名参数没有意义" -#: builtin/branch.c:894 +#: builtin/branch.c:923 #, c-format msgid "" "The --set-upstream flag is deprecated and will be removed. Consider using --" "track or --set-upstream-to\n" msgstr "" +"选项 --set-upstream 已弃用并将被移除。考虑使用 --track 或 --set-upstream-to\n" -#: builtin/branch.c:911 +#: builtin/branch.c:940 #, c-format msgid "" "\n" "If you wanted to make '%s' track '%s', do this:\n" "\n" msgstr "" +"\n" +"如果你想用 '%s' 跟踪 '%s', 这么做：\n" +"\n" -#: builtin/branch.c:912 -#, fuzzy, c-format +#: builtin/branch.c:941 +#, c-format msgid " git branch -d %s\n" -msgstr " HEAD分支：%s" +msgstr " git branch -d %s\n" -#: builtin/branch.c:913 +#: builtin/branch.c:942 #, c-format msgid " git branch --set-upstream-to %s\n" -msgstr "" +msgstr " git branch --set-upstream-to %s\n" #: builtin/bundle.c:47 #, c-format @@ -2531,129 +2645,143 @@ msgstr "需要一个版本库来解包。" #: builtin/cat-file.c:247 msgid "git cat-file (-t|-s|-e|-p|<type>|--textconv) <object>" -msgstr "" +msgstr "git cat-file (-t|-s|-e|-p|<类型>|--textconv) <对象>" #: builtin/cat-file.c:248 msgid "git cat-file (--batch|--batch-check) < <list_of_objects>" -msgstr "" +msgstr "git cat-file (--batch|--batch-check) < <对象列表>" #: builtin/cat-file.c:266 msgid "<type> can be one of: blob, tree, commit, tag" -msgstr "" +msgstr "<类型> 可以是其中之一：blob、tree、commit、tag" #: builtin/cat-file.c:267 -#, fuzzy msgid "show object type" -msgstr "坏的对象类型。" +msgstr "显示对象类型" #: builtin/cat-file.c:268 -#, fuzzy msgid "show object size" -msgstr "坏对象 %s" +msgstr "显示对象大小" #: builtin/cat-file.c:270 msgid "exit with zero when there's no error" -msgstr "" +msgstr "当没有错误时退出并返回零" #: builtin/cat-file.c:271 msgid "pretty-print object's content" -msgstr "" +msgstr "美观地打印对象的内容" #: builtin/cat-file.c:273 msgid "for blob objects, run textconv on object's content" -msgstr "" +msgstr "对于数据（blob）对象，对其内容执行 textconv" #: builtin/cat-file.c:275 msgid "show info and content of objects fed from the standard input" -msgstr "" +msgstr "显示从标准输入提供的对象的信息和内容" #: builtin/cat-file.c:278 -#, fuzzy msgid "show info about objects fed from the standard input" -msgstr "不能从标准输入中读取日志信息" +msgstr "显示从标准输入提供的对象的信息" #: builtin/check-attr.c:11 msgid "git check-attr [-a | --all | attr...] [--] pathname..." -msgstr "" +msgstr "git check-attr [-a | --all | attr...] [--] 路径名..." #: builtin/check-attr.c:12 -msgid "git check-attr --stdin [-a | --all | attr...] < <list-of-paths>" -msgstr "" +msgid "git check-attr --stdin [-z] [-a | --all | attr...] < <list-of-paths>" +msgstr "git check-attr --stdin [-z] [-a | --all | attr...] < <路径列表>" #: builtin/check-attr.c:19 msgid "report all attributes set on file" -msgstr "" +msgstr "报告设置在文件上的所有属性" #: builtin/check-attr.c:20 msgid "use .gitattributes only from the index" -msgstr "" +msgstr "只使用索引中的 .gitattributes" -#: builtin/check-attr.c:21 builtin/hash-object.c:75 -#, fuzzy +#: builtin/check-attr.c:21 builtin/check-ignore.c:22 builtin/hash-object.c:75 msgid "read file names from stdin" -msgstr "（正从标准输入中读取日志信息）\n" +msgstr "从标准输入读出文件名" -#: builtin/check-attr.c:23 -#, fuzzy +#: builtin/check-attr.c:23 builtin/check-ignore.c:24 msgid "input paths are terminated by a null character" -msgstr "路径以 NUL 字符分隔" +msgstr "输入路径以null字符终止" + +#: builtin/check-ignore.c:18 builtin/checkout.c:1012 builtin/gc.c:177 +msgid "suppress progress reporting" +msgstr "不显示进度报告" + +#: builtin/check-ignore.c:151 +msgid "cannot specify pathnames with --stdin" +msgstr "不能同时提供路径及 --stdin 参数" + +#: builtin/check-ignore.c:154 +msgid "-z only makes sense with --stdin" +msgstr "-z 需要和 --stdin 参数共用才有意义" + +#: builtin/check-ignore.c:156 +msgid "no path specified" +msgstr "未指定路径" + +#: builtin/check-ignore.c:160 +msgid "--quiet is only valid with a single pathname" +msgstr "参数 --quiet 只在提供一个路径名时有效" + +#: builtin/check-ignore.c:162 +msgid "cannot have both --quiet and --verbose" +msgstr "不能同时提供 --quiet 和 --verbose 参数" #: builtin/checkout-index.c:126 msgid "git checkout-index [options] [--] [<file>...]" -msgstr "" +msgstr "git checkout-index [选项] [--] [<文件>...]" #: builtin/checkout-index.c:187 msgid "check out all files in the index" -msgstr "" +msgstr "检出索引区的所有文件" #: builtin/checkout-index.c:188 msgid "force overwrite of existing files" -msgstr "" +msgstr "强制覆盖现有的文件" #: builtin/checkout-index.c:190 msgid "no warning for existing files and files not in index" -msgstr "" +msgstr "存在或不在索引中的文件都没有警告" #: builtin/checkout-index.c:192 -#, fuzzy msgid "don't checkout new files" -msgstr "不能检出 %s" +msgstr "不检出新文件" #: builtin/checkout-index.c:194 -#, fuzzy msgid "update stat information in the index file" -msgstr "无法写新的索引文件" +msgstr "更新索引中文件的状态信息" #: builtin/checkout-index.c:200 -#, fuzzy msgid "read list of paths from the standard input" -msgstr "（正从标准输入中读取日志信息）\n" +msgstr "从标准输入读取路径列表" #: builtin/checkout-index.c:202 msgid "write the content to temporary files" -msgstr "" +msgstr "将内容写入临时文件" #: builtin/checkout-index.c:203 builtin/column.c:30 msgid "string" -msgstr "" +msgstr "字符串" #: builtin/checkout-index.c:204 msgid "when creating files, prepend <string>" -msgstr "" +msgstr "在创建文件时，在前面加上<字符串>" #: builtin/checkout-index.c:207 msgid "copy out the files from named stage" -msgstr "" +msgstr "从指定暂存区中拷出文件" #: builtin/checkout.c:25 -#, fuzzy msgid "git checkout [options] <branch>" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git checkout [选项] <分支>" #: builtin/checkout.c:26 -#, fuzzy msgid "git checkout [options] [<branch>] -- <file>..." -msgstr "git apply [选项] [<补丁>...]" +msgstr "git checkout [选项] [<分支>] -- <文件>..." #: builtin/checkout.c:116 builtin/checkout.c:149 #, c-format @@ -2687,19 +2815,19 @@ msgstr "无法为 '%s' 添加合并结果" #: builtin/checkout.c:236 builtin/checkout.c:239 builtin/checkout.c:242 #: builtin/checkout.c:245 -#, fuzzy, c-format +#, c-format msgid "'%s' cannot be used with updating paths" -msgstr "%s：%s 不能和 %s 同时使用" +msgstr "'%s' 不能在更新路径时使用" #: builtin/checkout.c:248 builtin/checkout.c:251 -#, fuzzy, c-format +#, c-format msgid "'%s' cannot be used with %s" -msgstr "%s：%s 不能和 %s 同时使用" +msgstr "'%s' 不能和 %s 同时使用" #: builtin/checkout.c:254 #, c-format msgid "Cannot update paths and switch to branch '%s' at the same time." -msgstr "" +msgstr "不能同时更新路径并切换到分支'%s'。" #: builtin/checkout.c:265 builtin/checkout.c:426 msgid "corrupt index file" @@ -2710,11 +2838,6 @@ msgstr "损坏的索引文件" msgid "path '%s' is unmerged" msgstr "路径 '%s' 未合并" -#: builtin/checkout.c:333 builtin/checkout.c:534 builtin/clone.c:586 -#: builtin/merge.c:811 -msgid "unable to write new index file" -msgstr "无法写新的索引文件" - #: builtin/checkout.c:448 msgid "you need to resolve your current index first" msgstr "您需要先解决当前索引的冲突" @@ -2743,7 +2866,7 @@ msgstr "已经位于 '%s'\n" msgid "Switched to and reset branch '%s'\n" msgstr "切换并重置分支 '%s'\n" -#: builtin/checkout.c:618 +#: builtin/checkout.c:618 builtin/checkout.c:955 #, c-format msgid "Switched to a new branch '%s'\n" msgstr "切换到一个新分支 '%s'\n" @@ -2820,313 +2943,295 @@ msgstr "无效引用：%s" msgid "reference is not a tree: %s" msgstr "引用不是一个树：%s" -#: builtin/checkout.c:961 -#, fuzzy +#: builtin/checkout.c:964 msgid "paths cannot be used with switching branches" -msgstr "--ours/--theirs 和切换分支不兼容。" +msgstr "路径不能和切换分支同时使用" -#: builtin/checkout.c:964 builtin/checkout.c:968 -#, fuzzy, c-format +#: builtin/checkout.c:967 builtin/checkout.c:971 +#, c-format msgid "'%s' cannot be used with switching branches" -msgstr "%s：%s 不能和 %s 同时使用" +msgstr "'%s' 不能和切换分支同时使用" -#: builtin/checkout.c:972 builtin/checkout.c:975 builtin/checkout.c:980 -#: builtin/checkout.c:983 -#, fuzzy, c-format +#: builtin/checkout.c:975 builtin/checkout.c:978 builtin/checkout.c:983 +#: builtin/checkout.c:986 +#, c-format msgid "'%s' cannot be used with '%s'" -msgstr "%s：%s 不能和 %s 同时使用" +msgstr "'%s' 不能和 '%s' 同时使用" -#: builtin/checkout.c:988 -#, fuzzy, c-format +#: builtin/checkout.c:991 +#, c-format msgid "Cannot switch branch to a non-commit '%s'" -msgstr "无法切换分支到一个非提交。" +msgstr "不能切换分支到一个非提交 '%s'" -#: builtin/checkout.c:1009 builtin/gc.c:177 -msgid "suppress progress reporting" -msgstr "" - -#: builtin/checkout.c:1010 builtin/checkout.c:1012 builtin/clone.c:89 +#: builtin/checkout.c:1013 builtin/checkout.c:1015 builtin/clone.c:89 #: builtin/remote.c:169 builtin/remote.c:171 -#, fuzzy msgid "branch" -msgstr "位于分支 " +msgstr "分支" -#: builtin/checkout.c:1011 +#: builtin/checkout.c:1014 msgid "create and checkout a new branch" -msgstr "" +msgstr "创建并检出一个新的分支" -#: builtin/checkout.c:1013 +#: builtin/checkout.c:1016 msgid "create/reset and checkout a branch" -msgstr "" +msgstr "创建/重置并检出一个分支" -#: builtin/checkout.c:1014 -#, fuzzy +#: builtin/checkout.c:1017 msgid "create reflog for new branch" -msgstr "列出、创建或删除分支" +msgstr "为新的分支创建引用日志" -#: builtin/checkout.c:1015 +#: builtin/checkout.c:1018 msgid "detach the HEAD at named commit" -msgstr "" +msgstr "成为指向该提交的分离头指针" -#: builtin/checkout.c:1016 -#, fuzzy +#: builtin/checkout.c:1019 msgid "set upstream info for new branch" -msgstr "尚未给分支 '%s' 设置上游" +msgstr "为新的分支设置上游信息" -#: builtin/checkout.c:1018 -#, fuzzy +#: builtin/checkout.c:1021 msgid "new branch" -msgstr "[新分支]" +msgstr "新分支" -#: builtin/checkout.c:1018 -#, fuzzy +#: builtin/checkout.c:1021 msgid "new unparented branch" -msgstr "没有当前分支。" +msgstr "新的没有父提交的分支" -#: builtin/checkout.c:1019 +#: builtin/checkout.c:1022 msgid "checkout our version for unmerged files" -msgstr "" +msgstr "对尚未合并的文件检出我们的版本" -#: builtin/checkout.c:1021 +#: builtin/checkout.c:1024 msgid "checkout their version for unmerged files" -msgstr "" +msgstr "对尚未合并的文件检出他们的版本" -#: builtin/checkout.c:1023 +#: builtin/checkout.c:1026 msgid "force checkout (throw away local modifications)" -msgstr "" +msgstr "强制检出（丢弃本地修改）" -#: builtin/checkout.c:1024 +#: builtin/checkout.c:1027 msgid "perform a 3-way merge with the new branch" -msgstr "" +msgstr "和新的分支执行三路合并" -#: builtin/checkout.c:1025 builtin/merge.c:215 -#, fuzzy +#: builtin/checkout.c:1028 builtin/merge.c:215 msgid "update ignored files (default)" -msgstr "更新文件失败" +msgstr "更新忽略的文件（默认）" -#: builtin/checkout.c:1026 builtin/log.c:1111 parse-options.h:241 +#: builtin/checkout.c:1029 builtin/log.c:1147 parse-options.h:245 msgid "style" -msgstr "" +msgstr "风格" -#: builtin/checkout.c:1027 +#: builtin/checkout.c:1030 msgid "conflict style (merge or diff3)" -msgstr "" +msgstr "冲突输出风格（merge 或 diff3）" -#: builtin/checkout.c:1030 +#: builtin/checkout.c:1033 msgid "second guess 'git checkout no-such-branch'" -msgstr "" +msgstr "再者猜测'git checkout no-such-branch'" -#: builtin/checkout.c:1054 -#, fuzzy +#: builtin/checkout.c:1057 msgid "-b, -B and --orphan are mutually exclusive" -msgstr "-n 和 -k 互斥。" +msgstr "-b、-B 和 --orphan 是互斥的" -#: builtin/checkout.c:1071 +#: builtin/checkout.c:1074 msgid "--track needs a branch name" msgstr "--track 需要一个分支名" -#: builtin/checkout.c:1078 +#: builtin/checkout.c:1081 msgid "Missing branch name; try -b" msgstr "缺少分支名；尝试 -b" -#: builtin/checkout.c:1113 +#: builtin/checkout.c:1116 msgid "invalid path specification" msgstr "无效的路径规格" -#: builtin/checkout.c:1120 -#, fuzzy, c-format +#: builtin/checkout.c:1123 +#, c-format msgid "" "Cannot update paths and switch to branch '%s' at the same time.\n" "Did you intend to checkout '%s' which can not be resolved as commit?" msgstr "" -"git checkout：更新路径和切换分支不兼容。\n" -"您是想要检出 '%s' 但未能将其解析为提交么？" +"不能同时更新路径并切换到分支'%s'。\n" +"您是想要检出 '%s' 但其未能解析为提交么？" -#: builtin/checkout.c:1125 -#, fuzzy, c-format +#: builtin/checkout.c:1128 +#, c-format msgid "git checkout: --detach does not take a path argument '%s'" -msgstr "git checkout：--detach 不跟路径参数" +msgstr "git checkout：--detach 不能接收路径参数 '%s'" -#: builtin/checkout.c:1129 +#: builtin/checkout.c:1132 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/clean.c:19 +#: builtin/clean.c:20 msgid "git clean [-d] [-f] [-n] [-q] [-e <pattern>] [-x | -X] [--] <paths>..." -msgstr "" +msgstr "git clean [-d] [-f] [-n] [-q] [-e <模式>] [-x | -X] [--] <路径>..." + +#: builtin/clean.c:24 +#, c-format +msgid "Removing %s\n" +msgstr "正删除 %s\n" + +#: builtin/clean.c:25 +#, c-format +msgid "Would remove %s\n" +msgstr "将删除 %s\n" + +#: builtin/clean.c:26 +#, c-format +msgid "Skipping repository %s\n" +msgstr "忽略版本库 %s\n" -#: builtin/clean.c:51 +#: builtin/clean.c:27 +#, c-format +msgid "Would skip repository %s\n" +msgstr "将忽略版本库 %s\n" + +#: builtin/clean.c:28 +#, c-format +msgid "failed to remove %s" +msgstr "无法删除 %s" + +#: builtin/clean.c:160 msgid "do not print names of files removed" -msgstr "" +msgstr "不打印删除文件的名称" -#: builtin/clean.c:53 +#: builtin/clean.c:162 msgid "force" -msgstr "" +msgstr "强制" -#: builtin/clean.c:55 -#, fuzzy +#: builtin/clean.c:164 msgid "remove whole directories" -msgstr "两个输出目录？" +msgstr "删除整个目录" -#: builtin/clean.c:56 builtin/describe.c:413 builtin/grep.c:802 -#: builtin/ls-files.c:491 builtin/name-rev.c:231 builtin/show-ref.c:199 +#: builtin/clean.c:165 builtin/describe.c:413 builtin/grep.c:717 +#: builtin/ls-files.c:494 builtin/name-rev.c:231 builtin/show-ref.c:182 msgid "pattern" -msgstr "" +msgstr "模式" -#: builtin/clean.c:57 +#: builtin/clean.c:166 msgid "add <pattern> to ignore rules" -msgstr "" +msgstr "添加<模式>到忽略规则" -#: builtin/clean.c:58 +#: builtin/clean.c:167 msgid "remove ignored files, too" -msgstr "" +msgstr "也删除忽略的文件" -#: builtin/clean.c:60 +#: builtin/clean.c:169 msgid "remove only ignored files" -msgstr "" +msgstr "只删除忽略的文件" -#: builtin/clean.c:78 +#: builtin/clean.c:187 msgid "-x and -X cannot be used together" msgstr "-x 和 -X 不能同时使用" -#: builtin/clean.c:82 +#: builtin/clean.c:191 msgid "" "clean.requireForce set to true and neither -n nor -f given; refusing to clean" msgstr "" "clean.requireForce 设置为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:85 +#: builtin/clean.c:194 msgid "" "clean.requireForce defaults to true and neither -n nor -f given; refusing to " "clean" msgstr "" "clean.requireForce 默认为 true 且未提供 -n 或 -f 选项，拒绝执行清理动作" -#: builtin/clean.c:155 builtin/clean.c:176 -#, c-format -msgid "Would remove %s\n" -msgstr "将删除 %s\n" - -#: builtin/clean.c:159 builtin/clean.c:179 -#, c-format -msgid "Removing %s\n" -msgstr "正删除 %s\n" - -#: builtin/clean.c:162 builtin/clean.c:182 -#, c-format -msgid "failed to remove %s" -msgstr "无法删除 %s" - -#: builtin/clean.c:166 -#, c-format -msgid "Would not remove %s\n" -msgstr "不会删除 %s\n" - -#: builtin/clean.c:168 -#, c-format -msgid "Not removing %s\n" -msgstr "未删除 %s\n" - #: builtin/clone.c:36 msgid "git clone [options] [--] <repo> [<dir>]" -msgstr "" +msgstr "git clone [选项] [--] <版本库> [<路径>]" #: builtin/clone.c:64 builtin/fetch.c:82 builtin/merge.c:212 -#: builtin/push.c:399 +#: builtin/push.c:436 msgid "force progress reporting" -msgstr "" +msgstr "强制显示进度报告" #: builtin/clone.c:66 msgid "don't create a checkout" -msgstr "" +msgstr "不创建一个检出" #: builtin/clone.c:67 builtin/clone.c:69 builtin/init-db.c:488 -#, fuzzy msgid "create a bare repository" -msgstr "不是一个 git 版本库" +msgstr "创建一个裸版本库" #: builtin/clone.c:72 msgid "create a mirror repository (implies bare)" -msgstr "" +msgstr "创建一个镜像版本库（也是裸版本库）" #: builtin/clone.c:74 msgid "to clone from a local repository" -msgstr "" +msgstr "从本地版本库克隆" #: builtin/clone.c:76 msgid "don't use local hardlinks, always copy" -msgstr "" +msgstr "不使用本地硬链接，始终复制" #: builtin/clone.c:78 -#, fuzzy msgid "setup as shared repository" -msgstr "不是一个 git 版本库" +msgstr "设置为共享版本库" #: builtin/clone.c:80 builtin/clone.c:82 msgid "initialize submodules in the clone" -msgstr "" +msgstr "在克隆时初始化子模组" #: builtin/clone.c:83 builtin/init-db.c:485 -#, fuzzy msgid "template-directory" -msgstr "文件/目录" +msgstr "模板目录" #: builtin/clone.c:84 builtin/init-db.c:486 msgid "directory from which templates will be used" -msgstr "" +msgstr "模板目录将被使用" #: builtin/clone.c:86 msgid "reference repository" -msgstr "" +msgstr "引用版本库" #: builtin/clone.c:87 builtin/column.c:26 builtin/merge-file.c:44 -#, fuzzy msgid "name" -msgstr "重命名" +msgstr "名称" #: builtin/clone.c:88 msgid "use <name> instead of 'origin' to track upstream" -msgstr "" +msgstr "使用<名称>而不是 'origin' 去跟踪上游" #: builtin/clone.c:90 msgid "checkout <branch> instead of the remote's HEAD" -msgstr "" +msgstr "检出<分支>而不是远程HEAD" #: builtin/clone.c:92 msgid "path to git-upload-pack on the remote" -msgstr "" +msgstr "远程 git-upload-pack 路径" -#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:747 +#: builtin/clone.c:93 builtin/fetch.c:83 builtin/grep.c:662 msgid "depth" -msgstr "" +msgstr "深度" #: builtin/clone.c:94 msgid "create a shallow clone of that depth" -msgstr "" +msgstr "创建一个指定深度的浅克隆" #: builtin/clone.c:96 msgid "clone only one branch, HEAD or --branch" -msgstr "" +msgstr "只克隆一个分支、HEAD 或 --branch" #: builtin/clone.c:97 builtin/init-db.c:494 msgid "gitdir" -msgstr "" +msgstr "git目录" #: builtin/clone.c:98 builtin/init-db.c:495 msgid "separate git dir from working tree" -msgstr "" +msgstr "git目录和工作区分离" #: builtin/clone.c:99 msgid "key=value" -msgstr "" +msgstr "key=value" #: builtin/clone.c:100 -#, fuzzy msgid "set config inside the new repository" -msgstr "记录变更到版本库" +msgstr "在新版本库中设置配置信息" #: builtin/clone.c:243 #, c-format @@ -3177,116 +3282,117 @@ msgstr "不能发现要克隆的远程分支 %s。" msgid "remote HEAD refers to nonexistent ref, unable to checkout.\n" msgstr "远程 HEAD 指向一个不存在的引用，无法检出。\n" -#: builtin/clone.c:642 +#: builtin/clone.c:690 msgid "Too many arguments." msgstr "太多参数。" -#: builtin/clone.c:646 +#: builtin/clone.c:694 msgid "You must specify a repository to clone." msgstr "您必须指定一个版本库来克隆。" -#: builtin/clone.c:657 +#: builtin/clone.c:705 #, c-format msgid "--bare and --origin %s options are incompatible." msgstr "--bare 和 --origin %s 选项不兼容。" -#: builtin/clone.c:671 +#: builtin/clone.c:708 +msgid "--bare and --separate-git-dir are incompatible." +msgstr "--bare 和 --separate-git-dir 选项不兼容。" + +#: builtin/clone.c:721 #, c-format msgid "repository '%s' does not exist" msgstr "版本库 '%s' 不存在" -#: builtin/clone.c:676 +#: builtin/clone.c:726 msgid "--depth is ignored in local clones; use file:// instead." msgstr "--depth 在本地克隆被忽略，改为 file:// 协议试试。" -#: builtin/clone.c:686 +#: builtin/clone.c:736 #, c-format msgid "destination path '%s' already exists and is not an empty directory." msgstr "目标路径 '%s' 已经存在，并且不是一个空目录。" -#: builtin/clone.c:696 +#: builtin/clone.c:746 #, c-format msgid "working tree '%s' already exists." msgstr "工作区 '%s' 已经存在。" -#: builtin/clone.c:709 builtin/clone.c:723 +#: builtin/clone.c:759 builtin/clone.c:771 #, c-format msgid "could not create leading directories of '%s'" msgstr "不能为 '%s' 创建先导目录" -#: builtin/clone.c:712 +#: builtin/clone.c:762 #, c-format msgid "could not create work tree dir '%s'." msgstr "不能为 '%s' 创建工作区目录。" -#: builtin/clone.c:731 +#: builtin/clone.c:781 #, c-format msgid "Cloning into bare repository '%s'...\n" msgstr "克隆到裸版本库 '%s'...\n" -#: builtin/clone.c:733 +#: builtin/clone.c:783 #, c-format msgid "Cloning into '%s'...\n" msgstr "正克隆到 '%s'...\n" -#: builtin/clone.c:789 +#: builtin/clone.c:818 #, c-format msgid "Don't know how to clone %s" msgstr "不知道如何克隆 %s" -#: builtin/clone.c:838 +#: builtin/clone.c:867 #, c-format msgid "Remote branch %s not found in upstream %s" msgstr "远程分支 %s 在上游 %s 未发现" -#: builtin/clone.c:845 +#: builtin/clone.c:874 msgid "You appear to have cloned an empty repository." msgstr "您似乎克隆了一个空版本库。" #: builtin/column.c:9 msgid "git column [options]" -msgstr "" +msgstr "git column [选项]" #: builtin/column.c:26 msgid "lookup config vars" -msgstr "" +msgstr "查找配置变量" #: builtin/column.c:27 builtin/column.c:28 -#, fuzzy msgid "layout to use" -msgstr "本地已过时" +msgstr "要使用的布局" #: builtin/column.c:29 msgid "Maximum width" -msgstr "" +msgstr "最大宽度" #: builtin/column.c:30 msgid "Padding space on left border" -msgstr "" +msgstr "左边框的填充空间" #: builtin/column.c:31 msgid "Padding space on right border" -msgstr "" +msgstr "右边框的填充空间" #: builtin/column.c:32 msgid "Padding space between columns" -msgstr "" +msgstr "两列之间的填充空间" #: builtin/column.c:51 msgid "--command must be the first argument" msgstr "--command 必须是第一个参数" -#: builtin/commit.c:33 -#, fuzzy -msgid "git commit [options] [--] <filepattern>..." -msgstr "git apply [选项] [<补丁>...]" +#: builtin/commit.c:34 +msgid "git commit [options] [--] <pathspec>..." +msgstr "git commit [选项] [--] <路径匹配>..." -#: builtin/commit.c:38 -#, fuzzy -msgid "git status [options] [--] <filepattern>..." -msgstr "git apply [选项] [<补丁>...]" +#: builtin/commit.c:39 +msgid "git status [options] [--] <pathspec>..." +msgstr "git status [选项] [--] <路径匹配>..." -#: builtin/commit.c:43 +#: builtin/commit.c:44 msgid "" "Your name and email address were configured automatically based\n" "on your username and hostname. Please check that they are accurate.\n" @@ -3309,7 +3415,7 @@ msgstr "" "\n" " git commit --amend --reset-author\n" -#: builtin/commit.c:55 +#: builtin/commit.c:56 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" @@ -3318,7 +3424,7 @@ msgstr "" "您要修补最近的提交，但这么做会让它成为空提交。您可以重复您的命令并带上\n" "--allow-empty 选项，或者您可用命令 \"git reset HEAD^\" 整个删除该提交。\n" -#: builtin/commit.c:60 +#: builtin/commit.c:61 msgid "" "The previous cherry-pick is now empty, possibly due to conflict resolution.\n" "If you wish to commit it anyway, use:\n" @@ -3334,93 +3440,93 @@ msgstr "" "\n" "否则，请使用命令 'git reset'\n" -#: builtin/commit.c:256 +#: builtin/commit.c:258 msgid "failed to unpack HEAD tree object" msgstr "无法解包 HEAD 树对象" -#: builtin/commit.c:298 +#: builtin/commit.c:300 msgid "unable to create temporary index" msgstr "不能创建临时索引" -#: builtin/commit.c:304 +#: builtin/commit.c:306 msgid "interactive add failed" msgstr "交互式添加失败" -#: builtin/commit.c:337 builtin/commit.c:358 builtin/commit.c:408 +#: builtin/commit.c:339 builtin/commit.c:360 builtin/commit.c:410 msgid "unable to write new_index file" msgstr "无法写 new_index 文件" -#: builtin/commit.c:389 +#: builtin/commit.c:391 msgid "cannot do a partial commit during a merge." msgstr "在合并过程中不能做部分提交。" -#: builtin/commit.c:391 +#: builtin/commit.c:393 msgid "cannot do a partial commit during a cherry-pick." msgstr "在拣选过程中不能做部分提交。" -#: builtin/commit.c:401 +#: builtin/commit.c:403 msgid "cannot read the index" msgstr "无法读取索引" -#: builtin/commit.c:421 +#: builtin/commit.c:423 msgid "unable to write temporary index file" msgstr "无法写临时索引文件" -#: builtin/commit.c:510 builtin/commit.c:516 +#: builtin/commit.c:511 builtin/commit.c:517 #, c-format msgid "invalid commit: %s" msgstr "无效的提交：%s" -#: builtin/commit.c:539 +#: builtin/commit.c:540 msgid "malformed --author parameter" msgstr "非法的 --author 参数" -#: builtin/commit.c:600 +#: builtin/commit.c:560 #, c-format msgid "Malformed ident string: '%s'" msgstr "非法的身份字符串：'%s'" -#: builtin/commit.c:638 builtin/commit.c:671 builtin/commit.c:985 +#: builtin/commit.c:598 builtin/commit.c:631 builtin/commit.c:954 #, c-format msgid "could not lookup commit %s" msgstr "不能查询提交 %s" -#: builtin/commit.c:650 builtin/shortlog.c:296 +#: builtin/commit.c:610 builtin/shortlog.c:272 #, c-format msgid "(reading log message from standard input)\n" msgstr "（正从标准输入中读取日志信息）\n" -#: builtin/commit.c:652 +#: builtin/commit.c:612 msgid "could not read log from standard input" msgstr "不能从标准输入中读取日志信息" -#: builtin/commit.c:656 +#: builtin/commit.c:616 #, c-format msgid "could not read log file '%s'" msgstr "不能读取日志文件 '%s'" -#: builtin/commit.c:662 +#: builtin/commit.c:622 msgid "commit has empty message" msgstr "提交说明为空" -#: builtin/commit.c:678 +#: builtin/commit.c:638 msgid "could not read MERGE_MSG" msgstr "不能读取 MERGE_MSG" -#: builtin/commit.c:682 +#: builtin/commit.c:642 msgid "could not read SQUASH_MSG" msgstr "不能读取 SQUASH_MSG" -#: builtin/commit.c:686 +#: builtin/commit.c:646 #, c-format msgid "could not read '%s'" msgstr "不能读取 '%s'" -#: builtin/commit.c:738 +#: builtin/commit.c:707 msgid "could not write commit template" msgstr "不能写提交模版" -#: builtin/commit.c:749 +#: builtin/commit.c:718 #, c-format msgid "" "\n" @@ -3434,7 +3540,7 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:754 +#: builtin/commit.c:723 #, c-format msgid "" "\n" @@ -3448,375 +3554,375 @@ msgstr "" "\t%s\n" "然后重试。\n" -#: builtin/commit.c:766 +#: builtin/commit.c:735 +#, c-format msgid "" "Please enter the commit message for your changes. Lines starting\n" -"with '#' will be ignored, and an empty message aborts the commit.\n" +"with '%c' will be ignored, and an empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '#' 开始的行将被忽略，而一个空的提交\n" +"请为您的变更输入提交说明。以 '%c' 开始的行将被忽略，而一个空的提交\n" "说明将会终止提交。\n" -#: builtin/commit.c:771 +#: builtin/commit.c:740 +#, c-format 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" +"with '%c' will be kept; you may remove them yourself if you want to.\n" "An empty message aborts the commit.\n" msgstr "" -"请为您的变更输入提交说明。以 '#' 开始的行将被保留，您可以删除它们\n" -"如果您想这样做的话。而一个空的提交说明将会终止提交。\n" +"请为您的变更输入提交说明。以 '%c' 开始的行将被保留，如果您原意\n" +"也可以删除它们。一个空的提交说明将会终止提交。\n" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:784 +#: builtin/commit.c:753 #, c-format msgid "%sAuthor: %s" msgstr "%s作者： %s" # 译者：为保证在输出中对齐，注意调整句中空格！ -#: builtin/commit.c:791 +#: builtin/commit.c:760 #, c-format msgid "%sCommitter: %s" msgstr "%s提交者： %s" -#: builtin/commit.c:811 +#: builtin/commit.c:780 msgid "Cannot read index" msgstr "无法读取索引" -#: builtin/commit.c:848 +#: builtin/commit.c:817 msgid "Error building trees" msgstr "无法创建树对象" -#: builtin/commit.c:863 builtin/tag.c:361 +#: builtin/commit.c:832 builtin/tag.c:359 #, c-format msgid "Please supply the message using either -m or -F option.\n" -msgstr "请使用 -m 或者 -F 选项提供提交说明。\n" +msgstr "请使用 -m 或 -F 选项提供提交说明。\n" -#: builtin/commit.c:960 +#: builtin/commit.c:929 #, c-format msgid "No existing author found with '%s'" msgstr "没有找到匹配 '%s' 的作者" -#: builtin/commit.c:975 builtin/commit.c:1175 +#: builtin/commit.c:944 builtin/commit.c:1138 #, c-format msgid "Invalid untracked files mode '%s'" msgstr "无效的未追踪文件参数 '%s'" -#: builtin/commit.c:1015 +#: builtin/commit.c:974 msgid "Using both --reset-author and --author does not make sense" msgstr "同时使用 --reset-author 和 --author 没有意义" -#: builtin/commit.c:1026 +#: builtin/commit.c:985 msgid "You have nothing to amend." msgstr "您没有可修补的提交。" -#: builtin/commit.c:1029 +#: builtin/commit.c:988 msgid "You are in the middle of a merge -- cannot amend." msgstr "您正处于一个合并过程中 -- 无法修补提交。" -#: builtin/commit.c:1031 +#: builtin/commit.c:990 msgid "You are in the middle of a cherry-pick -- cannot amend." msgstr "您正处于一个拣选过程中 -- 无法修补提交。" -#: builtin/commit.c:1034 +#: builtin/commit.c:993 msgid "Options --squash and --fixup cannot be used together" msgstr "选项 --squash 和 --fixup 不能同时使用" -#: builtin/commit.c:1044 +#: builtin/commit.c:1003 msgid "Only one of -c/-C/-F/--fixup can be used." msgstr "只能用一个 -c/-C/-F/--fixup 选项。" -#: builtin/commit.c:1046 +#: builtin/commit.c:1005 msgid "Option -m cannot be combined with -c/-C/-F/--fixup." msgstr "选项 -m 不能和 -c/-C/-F/--fixup 同时使用。" -#: builtin/commit.c:1054 +#: builtin/commit.c:1013 msgid "--reset-author can be used only with -C, -c or --amend." msgstr "--reset-author 只能和 -C、-c 或 --amend 同时使用。" -#: builtin/commit.c:1071 +#: builtin/commit.c:1030 msgid "Only one of --include/--only/--all/--interactive/--patch can be used." msgstr "只能用一个 --include/--only/--all/--interactive/--patch 选项。" -#: builtin/commit.c:1073 +#: builtin/commit.c:1032 msgid "No paths with --include/--only does not make sense." msgstr "参数 --include/--only 不跟路径没有意义。" -#: builtin/commit.c:1075 +#: builtin/commit.c:1034 msgid "Clever... amending the last one with dirty index." msgstr "聪明... 在索引不干净下修补最后的提交。" -#: builtin/commit.c:1077 +#: builtin/commit.c:1036 msgid "Explicit paths specified without -i nor -o; assuming --only paths..." msgstr "指定了明确的路径而没有使用 -i 或 -o 选项；认为是 --only paths..." -#: builtin/commit.c:1087 builtin/tag.c:577 +#: builtin/commit.c:1046 builtin/tag.c:575 #, c-format msgid "Invalid cleanup mode %s" msgstr "无效的清理模式 %s" -#: builtin/commit.c:1092 +#: builtin/commit.c:1051 msgid "Paths with -a does not make sense." msgstr "路径和 -a 选项同时使用没有意义。" -#: builtin/commit.c:1189 builtin/commit.c:1417 +#: builtin/commit.c:1057 builtin/commit.c:1192 +msgid "--long and -z are incompatible" +msgstr "--long 和 -z 选项不兼容" + +#: builtin/commit.c:1152 builtin/commit.c:1388 msgid "show status concisely" -msgstr "" +msgstr "以简洁的格式显示状态" -#: builtin/commit.c:1191 builtin/commit.c:1419 +#: builtin/commit.c:1154 builtin/commit.c:1390 msgid "show branch information" -msgstr "" +msgstr "显示分支信息" -#: builtin/commit.c:1193 builtin/commit.c:1421 builtin/push.c:389 +#: builtin/commit.c:1156 builtin/commit.c:1392 builtin/push.c:426 msgid "machine-readable output" -msgstr "" +msgstr "机器可读的输出" + +#: builtin/commit.c:1159 builtin/commit.c:1394 +msgid "show status in long format (default)" +msgstr "以长格式显示状态（默认）" -#: builtin/commit.c:1196 builtin/commit.c:1423 +#: builtin/commit.c:1162 builtin/commit.c:1397 msgid "terminate entries with NUL" -msgstr "" +msgstr "条目以NUL字符结尾" -#: builtin/commit.c:1198 builtin/commit.c:1426 builtin/fast-export.c:636 -#: builtin/fast-export.c:639 builtin/tag.c:461 +#: builtin/commit.c:1164 builtin/commit.c:1400 builtin/fast-export.c:647 +#: builtin/fast-export.c:650 builtin/tag.c:459 msgid "mode" -msgstr "" +msgstr "模式" -#: builtin/commit.c:1199 builtin/commit.c:1426 +#: builtin/commit.c:1165 builtin/commit.c:1400 msgid "show untracked files, optional modes: all, normal, no. (Default: all)" -msgstr "" +msgstr "显示未跟踪的文件，“模式”的可选参数：all、normal、no。（默认：all）" -#: builtin/commit.c:1202 +#: builtin/commit.c:1168 msgid "show ignored files" -msgstr "" +msgstr "显示忽略的文件" -#: builtin/commit.c:1203 parse-options.h:151 +#: builtin/commit.c:1169 parse-options.h:151 msgid "when" msgstr "何时" -#: builtin/commit.c:1204 +#: builtin/commit.c:1170 msgid "" "ignore changes to submodules, optional when: all, dirty, untracked. " "(Default: all)" msgstr "" +"忽略子模组的更改，“何时”的可选参数：all、dirty、untracked。（默认：all）" -#: builtin/commit.c:1206 -#, fuzzy +#: builtin/commit.c:1172 msgid "list untracked files in columns" -msgstr "无效的未追踪文件参数 '%s'" +msgstr "以列的方式显示未跟踪的文件" -#: builtin/commit.c:1275 +#: builtin/commit.c:1246 msgid "couldn't look up newly created commit" msgstr "无法找到新创建的提交" -#: builtin/commit.c:1277 +#: builtin/commit.c:1248 msgid "could not parse newly created commit" msgstr "不能解析新创建的提交" -#: builtin/commit.c:1318 +#: builtin/commit.c:1289 msgid "detached HEAD" msgstr "分离头指针" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/commit.c:1320 +#: builtin/commit.c:1291 msgid " (root-commit)" msgstr "（根提交）" -#: builtin/commit.c:1387 +#: builtin/commit.c:1358 msgid "suppress summary after successful commit" -msgstr "" +msgstr "提交成功后不显示概述信息" -#: builtin/commit.c:1388 +#: builtin/commit.c:1359 msgid "show diff in commit message template" -msgstr "" +msgstr "在提交说明模板里显示差异" -#: builtin/commit.c:1390 -#, fuzzy +#: builtin/commit.c:1361 msgid "Commit message options" -msgstr "不能得到 %s 的提交说明" +msgstr "提交说明选项" -#: builtin/commit.c:1391 builtin/tag.c:459 +#: builtin/commit.c:1362 builtin/tag.c:457 msgid "read message from file" -msgstr "" +msgstr "从文件中读取提交说明" -#: builtin/commit.c:1392 +#: builtin/commit.c:1363 msgid "author" -msgstr "" +msgstr "作者" -#: builtin/commit.c:1392 -#, fuzzy +#: builtin/commit.c:1363 msgid "override author for commit" -msgstr "合并未返回提交" +msgstr "提交时覆盖作者" -#: builtin/commit.c:1393 builtin/gc.c:178 +#: builtin/commit.c:1364 builtin/gc.c:178 msgid "date" -msgstr "" +msgstr "日期" -#: builtin/commit.c:1393 -#, fuzzy +#: builtin/commit.c:1364 msgid "override date for commit" -msgstr "合并未返回提交" +msgstr "提交时覆盖日期" -#: builtin/commit.c:1394 builtin/merge.c:206 builtin/notes.c:534 -#: builtin/notes.c:691 builtin/tag.c:457 -#, fuzzy +#: builtin/commit.c:1365 builtin/merge.c:206 builtin/notes.c:533 +#: builtin/notes.c:690 builtin/tag.c:455 msgid "message" -msgstr "无 tag 说明？" +msgstr "说明" -#: builtin/commit.c:1394 -#, fuzzy +#: builtin/commit.c:1365 msgid "commit message" -msgstr "空提交信息。" +msgstr "提交说明" -#: builtin/commit.c:1395 +#: builtin/commit.c:1366 msgid "reuse and edit message from specified commit" -msgstr "" +msgstr "重用并编辑指定提交的提交说明" -#: builtin/commit.c:1396 +#: builtin/commit.c:1367 msgid "reuse message from specified commit" -msgstr "" +msgstr "重用指定提交的提交说明" -#: builtin/commit.c:1397 +#: builtin/commit.c:1368 msgid "use autosquash formatted message to fixup specified commit" -msgstr "" +msgstr "使用 autosquash 格式的提交说明用以修正指定的提交" -#: builtin/commit.c:1398 +#: builtin/commit.c:1369 msgid "use autosquash formatted message to squash specified commit" -msgstr "" +msgstr "使用 autosquash 格式的提交说明用以压缩至指定的提交" -#: builtin/commit.c:1399 +#: builtin/commit.c:1370 msgid "the commit is authored by me now (used with -C/-c/--amend)" -msgstr "" +msgstr "现在将该提交的作者改为我（和 -C/-c/--amend 参数共用）" -#: builtin/commit.c:1400 builtin/log.c:1068 builtin/revert.c:109 +#: builtin/commit.c:1371 builtin/log.c:1102 builtin/revert.c:109 msgid "add Signed-off-by:" -msgstr "" +msgstr "添加 Signed-off-by: 签名" -#: builtin/commit.c:1401 +#: builtin/commit.c:1372 msgid "use specified template file" -msgstr "" +msgstr "使用指定的模板文件" -#: builtin/commit.c:1402 -#, fuzzy +#: builtin/commit.c:1373 msgid "force edit of commit" -msgstr "合并未返回提交" +msgstr "强制编辑提交" -#: builtin/commit.c:1403 +# 译者：可选值，不能翻译（或是原文中笔误，应为 mode） +#: builtin/commit.c:1374 msgid "default" -msgstr "" +msgstr "default" -#: builtin/commit.c:1403 builtin/tag.c:462 +#: builtin/commit.c:1374 builtin/tag.c:460 msgid "how to strip spaces and #comments from message" -msgstr "" +msgstr "设置如何删除提交说明里的空格和#注释" -#: builtin/commit.c:1404 -#, fuzzy +#: builtin/commit.c:1375 msgid "include status in commit message template" -msgstr "不能写提交模版" +msgstr "在提交说明模板里包含状态信息" -#: builtin/commit.c:1405 builtin/merge.c:213 builtin/tag.c:463 +#: builtin/commit.c:1376 builtin/merge.c:213 builtin/tag.c:461 msgid "key id" -msgstr "" +msgstr "key id" -#: builtin/commit.c:1406 builtin/merge.c:214 +#: builtin/commit.c:1377 builtin/merge.c:214 msgid "GPG sign commit" -msgstr "" +msgstr "GPG 提交签名" #. end commit message options -#: builtin/commit.c:1409 +#: builtin/commit.c:1380 msgid "Commit contents options" -msgstr "" +msgstr "提交内容选项" -#: builtin/commit.c:1410 +#: builtin/commit.c:1381 msgid "commit all changed files" -msgstr "" +msgstr "提交所有改动的文件" -#: builtin/commit.c:1411 +#: builtin/commit.c:1382 msgid "add specified files to index for commit" -msgstr "" +msgstr "添加指定的文件到索引区等待提交" -#: builtin/commit.c:1412 -#, fuzzy +#: builtin/commit.c:1383 msgid "interactively add files" -msgstr "交互式添加失败" +msgstr "交互式添加文件" -#: builtin/commit.c:1413 -#, fuzzy +#: builtin/commit.c:1384 msgid "interactively add changes" -msgstr "交互式添加失败" +msgstr "交互式添加变更" -#: builtin/commit.c:1414 -#, fuzzy +#: builtin/commit.c:1385 msgid "commit only specified files" -msgstr "无法还原修改的文件" +msgstr "只提交指定的文件" -#: builtin/commit.c:1415 +#: builtin/commit.c:1386 msgid "bypass pre-commit hook" -msgstr "" +msgstr "绕过 pre-commit 钩子" -#: builtin/commit.c:1416 -#, fuzzy +#: builtin/commit.c:1387 msgid "show what would be committed" -msgstr "要提交的变更：" +msgstr "显示将要提交的内容" -#: builtin/commit.c:1424 +#: builtin/commit.c:1398 msgid "amend previous commit" -msgstr "" +msgstr "修改先前的提交" -#: builtin/commit.c:1425 +#: builtin/commit.c:1399 msgid "bypass post-rewrite hook" -msgstr "" +msgstr "绕过 post-rewrite 钩子" -#: builtin/commit.c:1430 +#: builtin/commit.c:1404 msgid "ok to record an empty change" -msgstr "" +msgstr "允许一个空提交" -#: builtin/commit.c:1433 +#: builtin/commit.c:1407 msgid "ok to record a change with an empty message" -msgstr "" +msgstr "允许空的提交说明" -#: builtin/commit.c:1464 +#: builtin/commit.c:1439 msgid "could not parse HEAD commit" msgstr "不能解析 HEAD 提交" -#: builtin/commit.c:1502 builtin/merge.c:508 +#: builtin/commit.c:1477 builtin/merge.c:508 #, c-format msgid "could not open '%s' for reading" msgstr "不能为读入打开 '%s'" -#: builtin/commit.c:1509 +#: builtin/commit.c:1484 #, c-format msgid "Corrupt MERGE_HEAD file (%s)" msgstr "损坏的 MERGE_HEAD 文件（%s）" -#: builtin/commit.c:1516 +#: builtin/commit.c:1491 msgid "could not read MERGE_MODE" msgstr "不能读取 MERGE_MODE" -#: builtin/commit.c:1535 +#: builtin/commit.c:1510 #, c-format msgid "could not read commit message: %s" msgstr "不能读取提交说明：%s" -#: builtin/commit.c:1549 +#: builtin/commit.c:1524 #, c-format msgid "Aborting commit; you did not edit the message.\n" msgstr "终止提交；您未更改来自模版的提交说明。\n" -#: builtin/commit.c:1554 +#: builtin/commit.c:1529 #, c-format msgid "Aborting commit due to empty commit message.\n" msgstr "终止提交因为提交说明为空。\n" -#: builtin/commit.c:1569 builtin/merge.c:935 builtin/merge.c:960 +#: builtin/commit.c:1544 builtin/merge.c:832 builtin/merge.c:857 msgid "failed to write commit object" msgstr "无法写提交对象" -#: builtin/commit.c:1590 +#: builtin/commit.c:1565 msgid "cannot lock HEAD ref" msgstr "无法锁定 HEAD 引用" -#: builtin/commit.c:1594 +#: builtin/commit.c:1569 msgid "cannot update HEAD ref" msgstr "无法更新 HEAD 引用" -#: builtin/commit.c:1605 +#: builtin/commit.c:1580 msgid "" "Repository has been updated, but unable to write\n" "new_index file. Check that disk is not full or quota is\n" @@ -3827,135 +3933,131 @@ msgstr "" #: builtin/config.c:7 msgid "git config [options]" -msgstr "" +msgstr "git config [选项]" -#: builtin/config.c:52 +#: builtin/config.c:51 msgid "Config file location" -msgstr "" +msgstr "配置文件位置" -#: builtin/config.c:53 -#, fuzzy +#: builtin/config.c:52 msgid "use global config file" -msgstr "无法更新 config 文件" +msgstr "使用全局配置文件" -#: builtin/config.c:54 +#: builtin/config.c:53 msgid "use system config file" -msgstr "" +msgstr "使用系统级配置文件" -#: builtin/config.c:55 -#, fuzzy +#: builtin/config.c:54 msgid "use repository config file" -msgstr "需要一个版本库来解包。" +msgstr "使用版本库级配置文件" -#: builtin/config.c:56 -#, fuzzy +#: builtin/config.c:55 msgid "use given config file" -msgstr "未预期的文件结束" +msgstr "使用指定的配置文件" -#: builtin/config.c:57 -#, fuzzy +#: builtin/config.c:56 msgid "Action" -msgstr "动作" +msgstr "操作" -#: builtin/config.c:58 +#: builtin/config.c:57 msgid "get value: name [value-regex]" -msgstr "" +msgstr "获取值：name [value-regex]" -#: builtin/config.c:59 +#: builtin/config.c:58 msgid "get all values: key [value-regex]" -msgstr "" +msgstr "获得所有的值：key [value-regex]" -#: builtin/config.c:60 +#: builtin/config.c:59 msgid "get values for regexp: name-regex [value-regex]" -msgstr "" +msgstr "根据正则表达式获得值：name-regex [value-regex]" -#: builtin/config.c:61 +#: builtin/config.c:60 msgid "replace all matching variables: name value [value_regex]" -msgstr "" +msgstr "替换所有匹配的变量：name value [value_regex]" -#: builtin/config.c:62 +#: builtin/config.c:61 msgid "add a new variable: name value" -msgstr "" +msgstr "添加一个新的变量：name value" -#: builtin/config.c:63 +#: builtin/config.c:62 msgid "remove a variable: name [value-regex]" -msgstr "" +msgstr "删除一个变量：name [value-regex]" -#: builtin/config.c:64 +#: builtin/config.c:63 msgid "remove all matches: name [value-regex]" -msgstr "" +msgstr "删除所有匹配项：name [value-regex]" -#: builtin/config.c:65 +#: builtin/config.c:64 msgid "rename section: old-name new-name" -msgstr "" +msgstr "重命名小节：old-name new-name" -#: builtin/config.c:66 +#: builtin/config.c:65 msgid "remove a section: name" -msgstr "" +msgstr "删除一个小节：name" -#: builtin/config.c:67 +#: builtin/config.c:66 msgid "list all" -msgstr "" +msgstr "列出所有" -#: builtin/config.c:68 +#: builtin/config.c:67 msgid "open an editor" -msgstr "" +msgstr "打开一个编辑器" -#: builtin/config.c:69 builtin/config.c:70 +#: builtin/config.c:68 builtin/config.c:69 msgid "slot" -msgstr "" +msgstr "slot" -#: builtin/config.c:69 +#: builtin/config.c:68 msgid "find the color configured: [default]" -msgstr "" +msgstr "找到配置的颜色：[默认]" -#: builtin/config.c:70 +#: builtin/config.c:69 msgid "find the color setting: [stdout-is-tty]" -msgstr "" +msgstr "找到颜色设置：[stdout-is-tty]" -#: builtin/config.c:71 +#: builtin/config.c:70 msgid "Type" -msgstr "" +msgstr "类型" -#: builtin/config.c:72 +#: builtin/config.c:71 msgid "value is \"true\" or \"false\"" -msgstr "" +msgstr "值是 \"true\" 或 \"false\"" -#: builtin/config.c:73 +#: builtin/config.c:72 msgid "value is decimal number" -msgstr "" +msgstr "值是十进制数" -#: builtin/config.c:74 +#: builtin/config.c:73 msgid "value is --bool or --int" -msgstr "" +msgstr "值是 --bool or --int" -#: builtin/config.c:75 +#: builtin/config.c:74 msgid "value is a path (file or directory name)" -msgstr "" +msgstr "值是一个路径（文件或目录名）" -#: builtin/config.c:76 +#: builtin/config.c:75 msgid "Other" -msgstr "" +msgstr "其它" -#: builtin/config.c:77 +#: builtin/config.c:76 msgid "terminate values with NUL byte" -msgstr "" +msgstr "终止值是NUL字节" -#: builtin/config.c:78 +#: builtin/config.c:77 msgid "respect include directives on lookup" -msgstr "" +msgstr "查询时参照 include 指令递归查找" #: builtin/count-objects.c:69 msgid "git count-objects [-v]" -msgstr "" +msgstr "git count-objects [-v]" #: builtin/describe.c:15 msgid "git describe [options] <committish>*" -msgstr "" +msgstr "git describe [选项] <提交号>*" #: builtin/describe.c:16 msgid "git describe [options] --dirty" -msgstr "" +msgstr "git describe [选项] --dirty" #: builtin/describe.c:234 #, c-format @@ -4031,49 +4133,47 @@ msgstr "" #: builtin/describe.c:403 msgid "find the tag that comes after the commit" -msgstr "" +msgstr "寻找提交之后的 tag（用于描述提交）" #: builtin/describe.c:404 msgid "debug search strategy on stderr" -msgstr "" +msgstr "在标准错误上调试搜索策略" #: builtin/describe.c:405 msgid "use any ref in .git/refs" -msgstr "" +msgstr "使用 .git/refs 里的任意引用" #: builtin/describe.c:406 msgid "use any tag in .git/refs/tags" -msgstr "" +msgstr "使用 .git/refs/tags 里的任意 tag" #: builtin/describe.c:407 msgid "always use long format" -msgstr "" +msgstr "始终使用长提交号格式" #: builtin/describe.c:410 -#, fuzzy msgid "only output exact matches" -msgstr "没有 tag 准确匹配 '%s'" +msgstr "只输出精确匹配" #: builtin/describe.c:412 msgid "consider <n> most recent tags (default: 10)" -msgstr "" +msgstr "考虑最近 <n> 个 tags（默认：10）" #: builtin/describe.c:414 -#, fuzzy msgid "only consider tags matching <pattern>" -msgstr "输出和模式匹配的行" +msgstr "只考虑匹配 <模式> 的 tags" #: builtin/describe.c:416 builtin/name-rev.c:238 msgid "show abbreviated commit object as fallback" -msgstr "" +msgstr "显示简写的提交号作为后备" #: builtin/describe.c:417 msgid "mark" -msgstr "" +msgstr "标记" #: builtin/describe.c:418 msgid "append <mark> on dirty working tree (default: \"-dirty\")" -msgstr "" +msgstr "若工作区脏（有变更）在结尾添加 <标记>（默认：\"-dirty\"）" #: builtin/describe.c:436 msgid "--long is incompatible with --abbrev=0" @@ -4092,232 +4192,231 @@ msgstr "--dirty 不能与提交同时使用" msgid "'%s': not a regular file or symlink" msgstr "'%s'：不是一个正规文件或符号链接" -#: builtin/diff.c:224 +#: builtin/diff.c:228 #, c-format msgid "invalid option: %s" msgstr "无效选项：%s" -#: builtin/diff.c:301 +#: builtin/diff.c:305 msgid "Not a git repository" msgstr "不是一个 git 版本库" -#: builtin/diff.c:344 +#: builtin/diff.c:348 #, c-format msgid "invalid object '%s' given." msgstr "提供了无效对象 '%s'。" -#: builtin/diff.c:349 +#: builtin/diff.c:353 #, c-format msgid "more than %d trees given: '%s'" msgstr "提供了超过 %d 个树对象：'%s'" -#: builtin/diff.c:359 +#: builtin/diff.c:363 #, c-format msgid "more than two blobs given: '%s'" -msgstr "提供了超过两个二进制对象（blob）：'%s'" +msgstr "提供了超过两个数据（blob）对象：'%s'" -#: builtin/diff.c:367 +#: builtin/diff.c:371 #, c-format msgid "unhandled object '%s' given." msgstr "提供了无法处理的对象 '%s'。" #: builtin/fast-export.c:22 msgid "git fast-export [rev-list-opts]" -msgstr "" +msgstr "git fast-export [rev-list-opts]" -#: builtin/fast-export.c:635 -#, fuzzy +#: builtin/fast-export.c:646 msgid "show progress after <n> objects" -msgstr "显示各种类型的对象" +msgstr "在 <n> 个对象之后显示进度" -#: builtin/fast-export.c:637 +#: builtin/fast-export.c:648 msgid "select handling of signed tags" -msgstr "" +msgstr "选择如何处理签名 tags" -#: builtin/fast-export.c:640 +#: builtin/fast-export.c:651 msgid "select handling of tags that tag filtered objects" -msgstr "" +msgstr "选择当 tag 指向被过滤时 tags 的处理方式" -#: builtin/fast-export.c:643 +#: builtin/fast-export.c:654 msgid "Dump marks to this file" -msgstr "" +msgstr "把标记存储到这个文件" -#: builtin/fast-export.c:645 +#: builtin/fast-export.c:656 msgid "Import marks from this file" -msgstr "" +msgstr "从这个文件导入标记" -#: builtin/fast-export.c:647 +#: builtin/fast-export.c:658 msgid "Fake a tagger when tags lack one" -msgstr "" +msgstr "当 tags 缺少标记者字段时，假装提供一个" -#: builtin/fast-export.c:649 +#: builtin/fast-export.c:660 msgid "Output full tree for each commit" -msgstr "" +msgstr "每次提交都输出整个树" -#: builtin/fast-export.c:651 +#: builtin/fast-export.c:662 msgid "Use the done feature to terminate the stream" -msgstr "" +msgstr "使用 done 功能来终止流" -#: builtin/fast-export.c:652 +#: builtin/fast-export.c:663 msgid "Skip output of blob data" -msgstr "" +msgstr "跳过数据对象的输出" #: builtin/fetch.c:20 -#, fuzzy msgid "git fetch [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git fetch [<选项>] [<版本库> [<引用表达式>...]]" #: builtin/fetch.c:21 msgid "git fetch [<options>] <group>" -msgstr "" +msgstr "git fetch [<选项>] <组>" #: builtin/fetch.c:22 msgid "git fetch --multiple [<options>] [(<repository> | <group>)...]" -msgstr "" +msgstr "git fetch --multiple [<选项>] [(<版本库> | <组>)...]" #: builtin/fetch.c:23 msgid "git fetch --all [<options>]" -msgstr "" +msgstr "git fetch --all [<选项>]" #: builtin/fetch.c:60 msgid "fetch from all remotes" -msgstr "" +msgstr "从所有的远程抓取" #: builtin/fetch.c:62 msgid "append to .git/FETCH_HEAD instead of overwriting" -msgstr "" +msgstr "追加到 .git/FETCH_HEAD 而不是覆盖它" #: builtin/fetch.c:64 msgid "path to upload pack on remote end" -msgstr "" +msgstr "上传包到远程的路径" #: builtin/fetch.c:65 msgid "force overwrite of local branch" -msgstr "" +msgstr "强制覆盖本地分支" #: builtin/fetch.c:67 msgid "fetch from multiple remotes" -msgstr "" +msgstr "从多个远程抓取" #: builtin/fetch.c:69 -#, fuzzy msgid "fetch all tags and associated objects" -msgstr "更新远程引用和相关的对象" +msgstr "抓取所有的 tags 和关联对象" #: builtin/fetch.c:71 msgid "do not fetch all tags (--no-tags)" -msgstr "" +msgstr "不抓取任何 tags (--no-tags)" #: builtin/fetch.c:73 -#, fuzzy msgid "prune remote-tracking branches no longer on remote" -msgstr "%s 没有来自 %s 的远程跟踪分支" +msgstr "清除远程已经不存在的分支的跟踪分支" +# 译者：可选值，不能翻译 #: builtin/fetch.c:74 msgid "on-demand" -msgstr "" +msgstr "on-demand" #: builtin/fetch.c:75 msgid "control recursive fetching of submodules" -msgstr "" +msgstr "控制子模组的递归抓取" #: builtin/fetch.c:79 msgid "keep downloaded pack" -msgstr "" +msgstr "保持下载包" #: builtin/fetch.c:81 -#, fuzzy msgid "allow updating of HEAD ref" -msgstr "无法更新 HEAD 引用" +msgstr "允许更新 HEAD 引用" #: builtin/fetch.c:84 msgid "deepen history of shallow clone" -msgstr "" +msgstr "深化浅克隆的历史" -#: builtin/fetch.c:85 builtin/log.c:1083 +#: builtin/fetch.c:86 +msgid "convert to a complete repository" +msgstr "转换为一个完整的版本库" + +#: builtin/fetch.c:88 builtin/log.c:1119 msgid "dir" -msgstr "" +msgstr "目录" -#: builtin/fetch.c:86 -#, fuzzy +#: builtin/fetch.c:89 msgid "prepend this to submodule path output" -msgstr "无法递归进子模组路径 '$sm_path'" +msgstr "在子模组路径输出的前面加上此目录" -#: builtin/fetch.c:89 +#: builtin/fetch.c:92 msgid "default mode for recursion" -msgstr "" +msgstr "递归的默认模式" -#: builtin/fetch.c:201 +#: builtin/fetch.c:204 msgid "Couldn't find remote ref HEAD" msgstr "无法发现远程 HEAD 引用" -#: builtin/fetch.c:254 +#: builtin/fetch.c:257 #, c-format msgid "object %s not found" msgstr "对象 %s 未发现" -#: builtin/fetch.c:260 +#: builtin/fetch.c:262 msgid "[up to date]" msgstr "[最新]" -#: builtin/fetch.c:274 +#: builtin/fetch.c:276 #, c-format msgid "! %-*s %-*s -> %s (can't fetch in current branch)" msgstr "! %-*s %-*s -> %s （在当前分支下不能获取）" -#: builtin/fetch.c:275 builtin/fetch.c:361 +#: builtin/fetch.c:277 builtin/fetch.c:363 msgid "[rejected]" msgstr "[已拒绝]" -#: builtin/fetch.c:286 +#: builtin/fetch.c:288 msgid "[tag update]" msgstr "[tag更新]" # 译者：注意保持前导空格 -#: builtin/fetch.c:288 builtin/fetch.c:323 builtin/fetch.c:341 +#: builtin/fetch.c:290 builtin/fetch.c:325 builtin/fetch.c:343 msgid " (unable to update local ref)" msgstr " （不能更新本地引用）" -#: builtin/fetch.c:306 +#: builtin/fetch.c:308 msgid "[new tag]" msgstr "[新tag]" -#: builtin/fetch.c:309 +#: builtin/fetch.c:311 msgid "[new branch]" msgstr "[新分支]" -#: builtin/fetch.c:312 +#: builtin/fetch.c:314 msgid "[new ref]" msgstr "[新引用]" -#: builtin/fetch.c:357 +#: builtin/fetch.c:359 msgid "unable to update local ref" msgstr "不能更新本地引用" -#: builtin/fetch.c:357 +#: builtin/fetch.c:359 msgid "forced update" msgstr "强制更新" -#: builtin/fetch.c:363 +#: builtin/fetch.c:365 msgid "(non-fast-forward)" msgstr "（非快进式）" -#: builtin/fetch.c:394 builtin/fetch.c:686 +#: builtin/fetch.c:396 builtin/fetch.c:688 #, c-format msgid "cannot open %s: %s\n" msgstr "无法打开 %s：%s\n" -#: builtin/fetch.c:403 +#: builtin/fetch.c:405 #, c-format msgid "%s did not send all necessary objects\n" msgstr "%s 未发送所有必须的对象\n" -#: builtin/fetch.c:489 +#: builtin/fetch.c:491 #, c-format msgid "From %.*s\n" msgstr "来自 %.*s\n" -#: builtin/fetch.c:500 +#: builtin/fetch.c:502 #, c-format msgid "" "some local refs could not be updated; try running\n" @@ -4327,203 +4426,208 @@ msgstr "" " 'git remote prune %s' 来删除旧的、有冲突的分支" # 译者：注意保持前导空格 -#: builtin/fetch.c:550 +#: builtin/fetch.c:552 #, c-format msgid " (%s will become dangling)" -msgstr " （%s 将成为悬空状态）" +msgstr " （%s 将成为摇摆状态）" # 译者：注意保持前导空格 -#: builtin/fetch.c:551 +#: builtin/fetch.c:553 #, c-format msgid " (%s has become dangling)" -msgstr " （%s 已成为悬空状态）" +msgstr " （%s 已成为摇摆状态）" -#: builtin/fetch.c:558 +#: builtin/fetch.c:560 msgid "[deleted]" msgstr "[已删除]" -#: builtin/fetch.c:559 builtin/remote.c:1055 +#: builtin/fetch.c:561 builtin/remote.c:1055 msgid "(none)" msgstr "（无）" -#: builtin/fetch.c:676 +#: builtin/fetch.c:678 #, c-format msgid "Refusing to fetch into current branch %s of non-bare repository" msgstr "拒绝获取到非裸版本库的当前分支 %s" -#: builtin/fetch.c:710 +#: builtin/fetch.c:712 #, c-format msgid "Don't know how to fetch from %s" msgstr "不知道如何从 %s 获取" -#: builtin/fetch.c:787 +#: builtin/fetch.c:789 #, c-format msgid "Option \"%s\" value \"%s\" is not valid for %s" msgstr "选项 \"%s\" 的值 \"%s\" 对于 %s 是无效的" -#: builtin/fetch.c:790 +#: builtin/fetch.c:792 #, c-format msgid "Option \"%s\" is ignored for %s\n" msgstr "选项 \"%s\" 为 %s 所忽略\n" -#: builtin/fetch.c:892 +#: builtin/fetch.c:894 #, c-format msgid "Fetching %s\n" msgstr "正在获取 %s\n" -#: builtin/fetch.c:894 builtin/remote.c:100 +#: builtin/fetch.c:896 builtin/remote.c:100 #, c-format msgid "Could not fetch %s" msgstr "不能获取 %s" -#: builtin/fetch.c:913 +#: builtin/fetch.c:915 msgid "" "No remote repository specified. Please, specify either a URL or a\n" "remote name from which new revisions should be fetched." msgstr "未指定远程版本库。请通过一个URL或远程版本库名指定，用以获取新提交。" -#: builtin/fetch.c:933 +#: builtin/fetch.c:935 msgid "You need to specify a tag name." msgstr "您需要指定一个 tag 名称。" -#: builtin/fetch.c:985 +#: builtin/fetch.c:981 +msgid "--depth and --unshallow cannot be used together" +msgstr "--depth 和 --unshallow 不能同时使用" + +#: builtin/fetch.c:983 +msgid "--unshallow on a complete repository does not make sense" +msgstr "对于一个完整的版本库，参数 --unshallow 没有意义" + +#: builtin/fetch.c:1002 msgid "fetch --all does not take a repository argument" msgstr "fetch --all 不能带一个版本库参数" -#: builtin/fetch.c:987 +#: builtin/fetch.c:1004 msgid "fetch --all does not make sense with refspecs" msgstr "fetch --all 带引用表达式没有任何意义" -#: builtin/fetch.c:998 +#: builtin/fetch.c:1015 #, c-format msgid "No such remote or remote group: %s" msgstr "没有这样的远程或远程组：%s" -#: builtin/fetch.c:1006 +#: builtin/fetch.c:1023 msgid "Fetching a group and specifying refspecs does not make sense" msgstr "获取组并指定引用表达式没有意义" #: builtin/fmt-merge-msg.c:13 msgid "git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" msgstr "" +"git fmt-merge-msg [-m <message>] [--log[=<n>]|--no-log] [--file <file>]" -#: builtin/fmt-merge-msg.c:653 builtin/fmt-merge-msg.c:656 builtin/grep.c:786 -#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:192 -#: builtin/tag.c:448 parse-options.h:133 parse-options.h:235 +#: builtin/fmt-merge-msg.c:659 builtin/fmt-merge-msg.c:662 builtin/grep.c:701 +#: builtin/merge.c:188 builtin/show-branch.c:656 builtin/show-ref.c:175 +#: builtin/tag.c:446 parse-options.h:133 parse-options.h:239 msgid "n" -msgstr "数字" +msgstr "n" -#: builtin/fmt-merge-msg.c:654 +#: builtin/fmt-merge-msg.c:660 msgid "populate log with at most <n> entries from shortlog" -msgstr "" +msgstr "向提交说明中最多复制指定条目（合并而来的提交）的简短说明" -#: builtin/fmt-merge-msg.c:657 +#: builtin/fmt-merge-msg.c:663 msgid "alias for --log (deprecated)" -msgstr "" +msgstr "参数 --log 的别名（已弃用）" -#: builtin/fmt-merge-msg.c:660 +#: builtin/fmt-merge-msg.c:666 msgid "text" -msgstr "" +msgstr "文本" -#: builtin/fmt-merge-msg.c:661 +#: builtin/fmt-merge-msg.c:667 msgid "use <text> as start of message" -msgstr "" +msgstr "使用 <文本> 作为提交说明的开始" -#: builtin/fmt-merge-msg.c:662 -#, fuzzy +#: builtin/fmt-merge-msg.c:668 msgid "file to read from" -msgstr "不能读 %s" +msgstr "从文件中读取" #: builtin/for-each-ref.c:979 -#, fuzzy msgid "git for-each-ref [options] [<pattern>]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git for-each-ref [选项] [<模式>]" #: builtin/for-each-ref.c:994 msgid "quote placeholders suitably for shells" -msgstr "" +msgstr "引用占位符适用于 shells" #: builtin/for-each-ref.c:996 msgid "quote placeholders suitably for perl" -msgstr "" +msgstr "引用占位符适用于 perl" #: builtin/for-each-ref.c:998 msgid "quote placeholders suitably for python" -msgstr "" +msgstr "引用占位符适用于 python" #: builtin/for-each-ref.c:1000 msgid "quote placeholders suitably for tcl" -msgstr "" +msgstr "引用占位符适用于 tcl" #: builtin/for-each-ref.c:1003 msgid "show only <n> matched refs" -msgstr "" +msgstr "只显示 <n> 个匹配的引用" #: builtin/for-each-ref.c:1004 msgid "format" -msgstr "" +msgstr "格式" #: builtin/for-each-ref.c:1004 msgid "format to use for the output" -msgstr "" +msgstr "输出格式" #: builtin/for-each-ref.c:1005 msgid "key" -msgstr "" +msgstr "key" #: builtin/for-each-ref.c:1006 msgid "field name to sort on" -msgstr "" +msgstr "排序的字段名" #: builtin/fsck.c:608 -#, fuzzy msgid "git fsck [options] [<object>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git fsck [选项] [<对象>...]" #: builtin/fsck.c:614 msgid "show unreachable objects" -msgstr "" +msgstr "显示不可达的对象" #: builtin/fsck.c:615 -#, fuzzy msgid "show dangling objects" -msgstr "索引对象中" +msgstr "显示摇摆的对象" #: builtin/fsck.c:616 msgid "report tags" -msgstr "" +msgstr "报告 tags" #: builtin/fsck.c:617 msgid "report root nodes" -msgstr "" +msgstr "报告根节点" #: builtin/fsck.c:618 msgid "make index objects head nodes" -msgstr "" +msgstr "将索引亦作为检查的头节点" #: builtin/fsck.c:619 msgid "make reflogs head nodes (default)" -msgstr "" +msgstr "将引用日志作为检查的头节点（默认）" #: builtin/fsck.c:620 msgid "also consider packs and alternate objects" -msgstr "" +msgstr "也考虑包和备用对象" #: builtin/fsck.c:621 msgid "enable more strict checking" -msgstr "" +msgstr "启用更严格的检查" #: builtin/fsck.c:623 msgid "write dangling objects in .git/lost-found" -msgstr "" +msgstr "将摇摆对象写入 .git/lost-found 中" #: builtin/fsck.c:624 builtin/prune.c:134 msgid "show progress" -msgstr "" +msgstr "显示进度" #: builtin/gc.c:22 msgid "git gc [options]" -msgstr "" +msgstr "git gc [选项]" #: builtin/gc.c:63 #, c-format @@ -4537,22 +4641,17 @@ msgstr "不正常的长对象目录 %.*s" #: builtin/gc.c:179 msgid "prune unreferenced objects" -msgstr "" +msgstr "清除未引用的对象" #: builtin/gc.c:181 msgid "be more thorough (increased runtime)" -msgstr "" +msgstr "更彻底（增加运行时间）" #: builtin/gc.c:182 msgid "enable auto-gc mode" -msgstr "" - -#: builtin/gc.c:221 -#, c-format -msgid "Auto packing the repository for optimum performance.\n" -msgstr "自动打包版本库以求最佳性能。\n" +msgstr "启用自动垃圾回收模式" -#: builtin/gc.c:224 +#: builtin/gc.c:222 #, c-format msgid "" "Auto packing the repository for optimum performance. You may also\n" @@ -4561,239 +4660,240 @@ msgstr "" "自动打包版本库以求最佳性能。您还可以手动运行 \"git gc\"。\n" "参见 \"git help gc\" 以获取更多信息。\n" -#: builtin/gc.c:251 +#: builtin/gc.c:249 msgid "" "There are too many unreachable loose objects; run 'git prune' to remove them." msgstr "有太多不可达的松散对象，运行 'git prune' 删除它们。" #: builtin/grep.c:22 msgid "git grep [options] [-e] <pattern> [<rev>...] [[--] <path>...]" -msgstr "" +msgstr "git grep [选项] [-e] <模式> [<修订>...] [[--] <路径>...]" -#: builtin/grep.c:216 +#: builtin/grep.c:217 #, c-format msgid "grep: failed to create thread: %s" msgstr "grep：无法创建线程：%s" -#: builtin/grep.c:454 +#: builtin/grep.c:365 #, c-format msgid "Failed to chdir: %s" msgstr "无法切换目录：%s" -#: builtin/grep.c:530 builtin/grep.c:564 +#: builtin/grep.c:443 builtin/grep.c:478 #, c-format msgid "unable to read tree (%s)" msgstr "无法读取树（%s）" -#: builtin/grep.c:578 +#: builtin/grep.c:493 #, c-format msgid "unable to grep from object of type %s" msgstr "无法抓取来自于 %s 类型的对象" -#: builtin/grep.c:636 +#: builtin/grep.c:551 #, c-format msgid "switch `%c' expects a numerical value" msgstr "开关 `%c' 期望一个数字值" -#: builtin/grep.c:653 +#: builtin/grep.c:568 #, c-format msgid "cannot open '%s'" msgstr "不能打开 '%s'" -#: builtin/grep.c:728 +#: builtin/grep.c:643 msgid "search in index instead of in the work tree" -msgstr "" +msgstr "在索引区搜索而不是在工作区" -#: builtin/grep.c:730 +#: builtin/grep.c:645 msgid "find in contents not managed by git" -msgstr "" +msgstr "在未被 git 管理的内容中查找" # 译者：中文字符串拼接，可删除前导空格 -#: builtin/grep.c:732 -#, fuzzy +#: builtin/grep.c:647 msgid "search in both tracked and untracked files" -msgstr "（使用 -u 参数显示未跟踪的文件）" +msgstr "在跟踪和未跟踪的文件中搜索" -#: builtin/grep.c:734 +#: builtin/grep.c:649 msgid "search also in ignored files" -msgstr "" +msgstr "也在忽略的文件中搜索" -#: builtin/grep.c:737 +#: builtin/grep.c:652 msgid "show non-matching lines" -msgstr "" +msgstr "显示未匹配的行" -#: builtin/grep.c:739 +#: builtin/grep.c:654 msgid "case insensitive matching" -msgstr "" +msgstr "不区分大小写匹配" -#: builtin/grep.c:741 +#: builtin/grep.c:656 msgid "match patterns only at word boundaries" -msgstr "" +msgstr "只在单词边界匹配模式" -#: builtin/grep.c:743 +#: builtin/grep.c:658 msgid "process binary files as text" -msgstr "" +msgstr "把二进制文件当做文本处理" -#: builtin/grep.c:745 +#: builtin/grep.c:660 msgid "don't match patterns in binary files" -msgstr "" +msgstr "不在二进制文件中匹配模式" -#: builtin/grep.c:748 +#: builtin/grep.c:663 msgid "descend at most <depth> levels" -msgstr "" +msgstr "最多以指定的深度向下寻找" -#: builtin/grep.c:752 +#: builtin/grep.c:667 msgid "use extended POSIX regular expressions" -msgstr "" +msgstr "使用扩展的 POSIX 正则表达式" -#: builtin/grep.c:755 +#: builtin/grep.c:670 msgid "use basic POSIX regular expressions (default)" -msgstr "" +msgstr "使用基本的 POSIX 正则表达式（默认）" -#: builtin/grep.c:758 +#: builtin/grep.c:673 msgid "interpret patterns as fixed strings" -msgstr "" +msgstr "把模式解析为固定的字符串" -#: builtin/grep.c:761 +#: builtin/grep.c:676 msgid "use Perl-compatible regular expressions" -msgstr "" +msgstr "使用 Perl 兼容的正则表达式" -#: builtin/grep.c:764 +#: builtin/grep.c:679 msgid "show line numbers" -msgstr "" +msgstr "显示行号" -#: builtin/grep.c:765 +#: builtin/grep.c:680 msgid "don't show filenames" -msgstr "" +msgstr "不显示文件名" -#: builtin/grep.c:766 -#, fuzzy +#: builtin/grep.c:681 msgid "show filenames" -msgstr "%s文件：" +msgstr "显示文件名" -#: builtin/grep.c:768 +#: builtin/grep.c:683 msgid "show filenames relative to top directory" -msgstr "" +msgstr "显示相对于顶级目录的文件名" -#: builtin/grep.c:770 +#: builtin/grep.c:685 msgid "show only filenames instead of matching lines" -msgstr "" +msgstr "只显示文件名而不显示匹配的行" -#: builtin/grep.c:772 +#: builtin/grep.c:687 msgid "synonym for --files-with-matches" -msgstr "" +msgstr "和 --files-with-matches 同义" -#: builtin/grep.c:775 +#: builtin/grep.c:690 msgid "show only the names of files without match" -msgstr "" +msgstr "只显示未匹配的文件名" -#: builtin/grep.c:777 -#, fuzzy +#: builtin/grep.c:692 msgid "print NUL after filenames" -msgstr "为所有文件名前添加 <根目录>" +msgstr "在文件名后输出 NUL 字符" -#: builtin/grep.c:779 +#: builtin/grep.c:694 msgid "show the number of matches instead of matching lines" -msgstr "" +msgstr "显示总匹配行数，而不显示匹配的行" -#: builtin/grep.c:780 +#: builtin/grep.c:695 msgid "highlight matches" -msgstr "" +msgstr "高亮显示匹配项" -#: builtin/grep.c:782 +#: builtin/grep.c:697 msgid "print empty line between matches from different files" -msgstr "" +msgstr "在不同文件的匹配项之间打印空行" -#: builtin/grep.c:784 +#: builtin/grep.c:699 msgid "show filename only once above matches from same file" -msgstr "" +msgstr "只在同一文件的匹配项的上面显示一次文件名" -#: builtin/grep.c:787 +#: builtin/grep.c:702 msgid "show <n> context lines before and after matches" -msgstr "" +msgstr "显示匹配项前后的 <n> 行上下文" -#: builtin/grep.c:790 +#: builtin/grep.c:705 msgid "show <n> context lines before matches" -msgstr "" +msgstr "显示匹配项前 <n> 行上下文" -#: builtin/grep.c:792 +#: builtin/grep.c:707 msgid "show <n> context lines after matches" -msgstr "" +msgstr "显示匹配项后 <n> 行上下文" -#: builtin/grep.c:793 +#: builtin/grep.c:708 msgid "shortcut for -C NUM" -msgstr "" +msgstr "快捷键 -C 数字" -#: builtin/grep.c:796 +#: builtin/grep.c:711 msgid "show a line with the function name before matches" -msgstr "" +msgstr "在匹配的前面显示一行函数名" -#: builtin/grep.c:798 +#: builtin/grep.c:713 msgid "show the surrounding function" -msgstr "" +msgstr "显示所在函数的前后内容" -#: builtin/grep.c:801 +#: builtin/grep.c:716 msgid "read patterns from file" -msgstr "" +msgstr "从文件读取模式" -#: builtin/grep.c:803 +#: builtin/grep.c:718 msgid "match <pattern>" -msgstr "" +msgstr "匹配 <模式>" -#: builtin/grep.c:805 +#: builtin/grep.c:720 msgid "combine patterns specified with -e" -msgstr "" +msgstr "组合用 -e 参数设定的模式" -#: builtin/grep.c:817 +#: builtin/grep.c:732 msgid "indicate hit with exit status without output" -msgstr "" +msgstr "不输出，而用退出码标识命中状态" -#: builtin/grep.c:819 +#: builtin/grep.c:734 msgid "show only matches from files that match all patterns" -msgstr "" +msgstr "只显示匹配所有模式的文件中的匹配" + +#: builtin/grep.c:736 +msgid "show parse tree for grep expression" +msgstr "显示 grep 表达式的解析树" -#: builtin/grep.c:822 +#: builtin/grep.c:740 msgid "pager" -msgstr "" +msgstr "分页" -#: builtin/grep.c:822 +#: builtin/grep.c:740 msgid "show matching files in the pager" -msgstr "" +msgstr "分页显示匹配的文件" -#: builtin/grep.c:825 +#: builtin/grep.c:743 msgid "allow calling of grep(1) (ignored by this build)" -msgstr "" +msgstr "允许调用 grep(1)（本次构建忽略）" -#: builtin/grep.c:826 builtin/show-ref.c:201 +#: builtin/grep.c:744 builtin/show-ref.c:184 msgid "show usage" -msgstr "" +msgstr "显示用法" -#: builtin/grep.c:917 +#: builtin/grep.c:811 msgid "no pattern given." msgstr "未提供模式匹配。" -#: builtin/grep.c:931 +#: builtin/grep.c:825 #, c-format msgid "bad object %s" msgstr "坏对象 %s" -#: builtin/grep.c:972 +#: builtin/grep.c:868 msgid "--open-files-in-pager only works on the worktree" msgstr "--open-files-in-pager 仅用于工作区" -#: builtin/grep.c:995 +#: builtin/grep.c:891 msgid "--cached or --untracked cannot be used with --no-index." msgstr "--cached 或 --untracked 不能与 --no-index 同时使用。" -#: builtin/grep.c:1000 +#: builtin/grep.c:896 msgid "--no-index or --untracked cannot be used with revs." msgstr "--no-index 或 --untracked 不能和版本同时使用。" -#: builtin/grep.c:1003 +#: builtin/grep.c:899 msgid "--[no-]exclude-standard cannot be used for tracked contents." msgstr "--[no-]exclude-standard 不能用于已跟踪内容。" -#: builtin/grep.c:1011 +#: builtin/grep.c:907 msgid "both --cached and trees are given." msgstr "同时给出了 --cached 和树对象。" @@ -4802,81 +4902,81 @@ msgid "" "git hash-object [-t <type>] [-w] [--path=<file>|--no-filters] [--stdin] [--] " "<file>..." msgstr "" +"git hash-object [-t <类型>] [-w] [--path=<文件>|--no-filters] [--stdin] [--] " +"<文件>..." #: builtin/hash-object.c:61 msgid "git hash-object --stdin-paths < <list-of-paths>" -msgstr "" +msgstr "git hash-object --stdin-paths < <路径列表>" #: builtin/hash-object.c:72 msgid "type" -msgstr "" +msgstr "类型" #: builtin/hash-object.c:72 -#, fuzzy msgid "object type" -msgstr "坏的对象类型。" +msgstr "对象类型" #: builtin/hash-object.c:73 msgid "write the object into the object database" -msgstr "" +msgstr "将对象写入对象数据库" #: builtin/hash-object.c:74 msgid "read the object from stdin" -msgstr "" +msgstr "从标准输入读取对象" #: builtin/hash-object.c:76 msgid "store file as is without filters" -msgstr "" +msgstr "原样存储文件不使用过滤器" #: builtin/hash-object.c:77 msgid "process file as it were from this path" -msgstr "" +msgstr "处理文件并假设其来自于此路径" -#: builtin/help.c:43 -#, fuzzy +#: builtin/help.c:42 msgid "print all available commands" -msgstr "在 '%s' 下可用的 git 命令" +msgstr "打印所有可用的命令" -#: builtin/help.c:44 +#: builtin/help.c:43 msgid "show man page" -msgstr "" +msgstr "显示 man 手册" -#: builtin/help.c:45 +#: builtin/help.c:44 msgid "show manual in web browser" -msgstr "" +msgstr "在 web 浏览器中显示手册" -#: builtin/help.c:47 +#: builtin/help.c:46 msgid "show info page" -msgstr "" +msgstr "显示 info 手册" -#: builtin/help.c:53 +#: builtin/help.c:52 msgid "git help [--all] [--man|--web|--info] [command]" -msgstr "" +msgstr "git help [--all] [--man|--web|--info] [命令]" -#: builtin/help.c:65 +#: builtin/help.c:64 #, c-format msgid "unrecognized help format '%s'" msgstr "未能识别的帮助格式 '%s'" -#: builtin/help.c:93 +#: builtin/help.c:92 msgid "Failed to start emacsclient." msgstr "无法启动 emacsclient。" -#: builtin/help.c:106 +#: builtin/help.c:105 msgid "Failed to parse emacsclient version." msgstr "无法解析 emacsclient 版本。" -#: builtin/help.c:114 +#: builtin/help.c:113 #, c-format msgid "emacsclient version '%d' too old (< 22)." -msgstr "emacsclient 版本 '%d' 太老 (< 22)。" +msgstr "emacsclient 版本 '%d' 太老（< 22）。" -#: builtin/help.c:132 builtin/help.c:160 builtin/help.c:169 builtin/help.c:177 +#: builtin/help.c:131 builtin/help.c:159 builtin/help.c:168 builtin/help.c:176 #, c-format msgid "failed to exec '%s': %s" msgstr "无法执行 '%s'：%s" -#: builtin/help.c:217 +#: builtin/help.c:216 #, c-format msgid "" "'%s': path for unsupported man viewer.\n" @@ -4885,7 +4985,7 @@ msgstr "" "'%s'：不支持的 man 手册查看器的路径。\n" "请使用 'man.<tool>.cmd'。" -#: builtin/help.c:229 +#: builtin/help.c:228 #, c-format msgid "" "'%s': cmd for supported man viewer.\n" @@ -4894,29 +4994,25 @@ msgstr "" "'%s': 支持的 man 手册查看器命令。\n" "请使用 'man.<tool>.path'。" -#: builtin/help.c:299 -msgid "The most commonly used git commands are:" -msgstr "最常用的 git 命令有：" - -#: builtin/help.c:367 +#: builtin/help.c:349 #, c-format msgid "'%s': unknown man viewer." msgstr "'%s'：未知的 man 查看器。" -#: builtin/help.c:384 +#: builtin/help.c:366 msgid "no man viewer handled the request" msgstr "没有 man 查看器处理此请求" -#: builtin/help.c:392 +#: builtin/help.c:374 msgid "no info viewer handled the request" msgstr "没有 info 查看器处理此请求" -#: builtin/help.c:447 builtin/help.c:454 +#: builtin/help.c:429 builtin/help.c:436 #, c-format msgid "usage: %s%s" msgstr "用法：%s%s" -#: builtin/help.c:470 +#: builtin/help.c:452 #, c-format msgid "`git %s' is aliased to `%s'" msgstr "`git %s' 是 `%s' 的别名" @@ -4970,7 +5066,7 @@ msgstr "包签名不匹配" #: builtin/index-pack.c:294 #, c-format msgid "pack version %<PRIu32> unsupported" -msgstr "" +msgstr "不支持包版本 %<PRIu32>" #: builtin/index-pack.c:312 #, c-format @@ -5030,7 +5126,7 @@ msgstr "不能读取现存对象 %s" #: builtin/index-pack.c:732 #, c-format msgid "invalid blob object %s" -msgstr "无效的二进制对象（blob）%s" +msgstr "无效的数据（blob）对象 %s" #: builtin/index-pack.c:747 #, c-format @@ -5079,9 +5175,9 @@ msgid "Resolving deltas" msgstr "处理 delta 中" #: builtin/index-pack.c:1064 -#, fuzzy, c-format +#, c-format msgid "unable to create thread: %s" -msgstr "grep：无法创建线程：%s" +msgstr "不能创建线程：%s" #: builtin/index-pack.c:1106 msgid "confusion beyond insanity" @@ -5090,12 +5186,12 @@ msgstr "不可理喻" #: builtin/index-pack.c:1112 #, c-format msgid "completed with %d local objects" -msgstr "" +msgstr "完成 %d 个本地对象" #: builtin/index-pack.c:1121 #, c-format msgid "Unexpected tail checksum for %s (disk corruption?)" -msgstr "" +msgstr "对 %s 的尾部校验出现意外（磁盘损坏？）" #: builtin/index-pack.c:1125 #, c-format @@ -5107,7 +5203,7 @@ msgstr[1] "包有 %d 个未解决的 delta" #: builtin/index-pack.c:1150 #, c-format msgid "unable to deflate appended object (%d)" -msgstr "不能缩小附加对象（%d）" +msgstr "不能压缩附加对象（%d）" #: builtin/index-pack.c:1229 #, c-format @@ -5137,19 +5233,19 @@ msgid "cannot store index file" msgstr "无法存储索引文件" #: builtin/index-pack.c:1331 -#, fuzzy, c-format +#, c-format msgid "bad pack.indexversion=%<PRIu32>" -msgstr "坏的索引版本 '%s'" +msgstr "坏的 pack.indexversion=%<PRIu32>" #: builtin/index-pack.c:1337 #, c-format msgid "invalid number of threads specified (%d)" -msgstr "" +msgstr "指定的线程数无效（%d）" #: builtin/index-pack.c:1341 builtin/index-pack.c:1514 #, c-format msgid "no threads support, ignoring %s" -msgstr "" +msgstr "没有线程支持，忽略 %s" #: builtin/index-pack.c:1399 #, c-format @@ -5317,22 +5413,23 @@ msgstr "无法获知当前路径" #: builtin/init-db.c:467 msgid "" -"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--shared" -"[=<permissions>]] [directory]" +"git init [-q | --quiet] [--bare] [--template=<template-directory>] [--" +"shared[=<permissions>]] [directory]" msgstr "" +"git init [-q | --quiet] [--bare] [--template=<模板目录>] [--shared[=<权限>]] " +"[目录]" #: builtin/init-db.c:490 msgid "permissions" -msgstr "" +msgstr "权限" #: builtin/init-db.c:491 msgid "specify that the git repository is to be shared amongst several users" -msgstr "" +msgstr "指定 git 版本库是多个用户之间共享的" #: builtin/init-db.c:493 builtin/prune-packed.c:77 -#, fuzzy msgid "be quiet" -msgstr "更加安静" +msgstr "保持安静" #: builtin/init-db.c:522 builtin/init-db.c:529 #, c-format @@ -5362,403 +5459,395 @@ msgstr "不能访问当前工作目录" msgid "Cannot access work tree '%s'" msgstr "不能访问工作区 '%s'" -#: builtin/log.c:37 -#, fuzzy +#: builtin/log.c:39 msgid "git log [<options>] [<since>..<until>] [[--] <path>...]\n" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git log [<选项>] [<从>..<到>] [[--] <路径>...]\n" -#: builtin/log.c:38 -#, fuzzy +#: builtin/log.c:40 msgid " or: git show [options] <object>..." -msgstr "git apply [选项] [<补丁>...]" +msgstr " 或者：git show [选项] <对象>..." -#: builtin/log.c:100 +#: builtin/log.c:102 msgid "suppress diff output" -msgstr "" +msgstr "不显示差异输出" -#: builtin/log.c:101 -#, fuzzy +#: builtin/log.c:103 msgid "show source" -msgstr "坏的源" +msgstr "显示源" -#: builtin/log.c:102 +#: builtin/log.c:104 +msgid "Use mail map file" +msgstr "使用邮件映射文件" + +#: builtin/log.c:105 msgid "decorate options" -msgstr "" +msgstr "修饰选项" -#: builtin/log.c:189 +#: builtin/log.c:198 #, c-format msgid "Final output: %d %s\n" msgstr "最终输出：%d %s\n" -#: builtin/log.c:403 builtin/log.c:494 +#: builtin/log.c:419 builtin/log.c:511 #, c-format msgid "Could not read object %s" msgstr "不能读取对象 %s" -#: builtin/log.c:518 +#: builtin/log.c:535 #, c-format msgid "Unknown type: %d" msgstr "未知类型：%d" -#: builtin/log.c:608 +#: builtin/log.c:627 msgid "format.headers without value" msgstr "format.headers 没有值" -#: builtin/log.c:682 +#: builtin/log.c:701 msgid "name of output directory is too long" msgstr "输出目录名太长" -#: builtin/log.c:693 +#: builtin/log.c:717 #, c-format msgid "Cannot open patch file %s" msgstr "无法打开补丁文件 %s" -#: builtin/log.c:707 +#: builtin/log.c:731 msgid "Need exactly one range." msgstr "只需要一个范围。" -#: builtin/log.c:715 +#: builtin/log.c:739 msgid "Not a range." msgstr "不是一个范围。" -#: builtin/log.c:789 +#: builtin/log.c:812 msgid "Cover letter needs email format" msgstr "信封需要邮件地址格式" -#: builtin/log.c:862 +#: builtin/log.c:885 #, c-format msgid "insane in-reply-to: %s" msgstr "不正常的 in-reply-to：%s" -#: builtin/log.c:890 +#: builtin/log.c:913 msgid "git format-patch [options] [<since> | <revision range>]" -msgstr "" +msgstr "git format-patch [选项] [<从> | <修订集范围>]" -#: builtin/log.c:935 +#: builtin/log.c:958 msgid "Two output directories?" msgstr "两个输出目录？" -#: builtin/log.c:1063 +#: builtin/log.c:1097 msgid "use [PATCH n/m] even with a single patch" -msgstr "" +msgstr "使用 [PATCH n/m]，即使只有一个补丁" -#: builtin/log.c:1066 +#: builtin/log.c:1100 msgid "use [PATCH] even with multiple patches" -msgstr "" +msgstr "使用 [PATCH]，即使有多个补丁" -#: builtin/log.c:1070 +#: builtin/log.c:1104 msgid "print patches to standard out" -msgstr "" +msgstr "打印补丁到标准输出" -#: builtin/log.c:1072 +#: builtin/log.c:1106 msgid "generate a cover letter" -msgstr "" +msgstr "生成一封附信" -#: builtin/log.c:1074 +#: builtin/log.c:1108 msgid "use simple number sequence for output file names" -msgstr "" +msgstr "使用简单的数字序列作为输出文件名" -#: builtin/log.c:1075 +#: builtin/log.c:1109 msgid "sfx" -msgstr "" +msgstr "后缀" -#: builtin/log.c:1076 +#: builtin/log.c:1110 msgid "use <sfx> instead of '.patch'" -msgstr "" +msgstr "使用 <后缀> 代替 '.patch'" -#: builtin/log.c:1078 +#: builtin/log.c:1112 msgid "start numbering patches at <n> instead of 1" -msgstr "" +msgstr "补丁以 <n> 开始编号，而不是1" -#: builtin/log.c:1080 +#: builtin/log.c:1114 +msgid "mark the series as Nth re-roll" +msgstr "标记补丁系列是第几次重制" + +#: builtin/log.c:1116 msgid "Use [<prefix>] instead of [PATCH]" -msgstr "" +msgstr "使用 [<前缀>] 代替 [PATCH]" -#: builtin/log.c:1083 +#: builtin/log.c:1119 msgid "store resulting files in <dir>" -msgstr "" +msgstr "把结果文件存储在 <dir>" -#: builtin/log.c:1086 +#: builtin/log.c:1122 msgid "don't strip/add [PATCH]" -msgstr "" +msgstr "不删除/添加 [PATCH]" -#: builtin/log.c:1089 +#: builtin/log.c:1125 msgid "don't output binary diffs" -msgstr "" +msgstr "不输出二进制差异" -#: builtin/log.c:1091 +#: builtin/log.c:1127 msgid "don't include a patch matching a commit upstream" -msgstr "" +msgstr "不包含已在上游提交中的补丁" -#: builtin/log.c:1093 +#: builtin/log.c:1129 msgid "show patch format instead of default (patch + stat)" -msgstr "" +msgstr "显示纯补丁格式而非默认的（补丁+状态）" -#: builtin/log.c:1095 -#, fuzzy +#: builtin/log.c:1131 msgid "Messaging" -msgstr "合并：" +msgstr "邮件发送" -# 译者：注意保持句尾空格 -#: builtin/log.c:1096 -#, fuzzy +#: builtin/log.c:1132 msgid "header" -msgstr "领先 " +msgstr "header" -#: builtin/log.c:1097 +#: builtin/log.c:1133 msgid "add email header" -msgstr "" +msgstr "添加邮件头" -#: builtin/log.c:1098 builtin/log.c:1100 +#: builtin/log.c:1134 builtin/log.c:1136 msgid "email" -msgstr "" +msgstr "邮件地址" -#: builtin/log.c:1098 +#: builtin/log.c:1134 msgid "add To: header" -msgstr "" +msgstr "添加收件人" -#: builtin/log.c:1100 +#: builtin/log.c:1136 msgid "add Cc: header" -msgstr "" +msgstr "添加抄送" -#: builtin/log.c:1102 +#: builtin/log.c:1138 msgid "message-id" -msgstr "" +msgstr "message-id" -#: builtin/log.c:1103 +#: builtin/log.c:1139 msgid "make first mail a reply to <message-id>" -msgstr "" +msgstr "使第一封邮件作为对 <message-id> 的回复" -#: builtin/log.c:1104 builtin/log.c:1107 +#: builtin/log.c:1140 builtin/log.c:1143 msgid "boundary" -msgstr "" +msgstr "边界" -#: builtin/log.c:1105 +#: builtin/log.c:1141 msgid "attach the patch" -msgstr "" +msgstr "附件方式添加补丁" -#: builtin/log.c:1108 -#, fuzzy +#: builtin/log.c:1144 msgid "inline the patch" -msgstr "忽略补丁中的添加的文件" +msgstr "内联显示补丁" -#: builtin/log.c:1112 +#: builtin/log.c:1148 msgid "enable message threading, styles: shallow, deep" -msgstr "" +msgstr "启用邮件线索，风格：浅，深" -#: builtin/log.c:1114 +#: builtin/log.c:1150 msgid "signature" -msgstr "" +msgstr "签名" -#: builtin/log.c:1115 +#: builtin/log.c:1151 msgid "add a signature" -msgstr "" +msgstr "添加一个签名" -#: builtin/log.c:1117 -#, fuzzy +#: builtin/log.c:1153 msgid "don't print the patch filenames" -msgstr "无法打开补丁文件 %s" +msgstr "不要打印补丁文件名" -#: builtin/log.c:1157 +#: builtin/log.c:1202 #, c-format msgid "bogus committer info %s" msgstr "虚假的提交者信息 %s" -#: builtin/log.c:1202 +#: builtin/log.c:1247 msgid "-n and -k are mutually exclusive." msgstr "-n 和 -k 互斥。" -#: builtin/log.c:1204 +#: builtin/log.c:1249 msgid "--subject-prefix and -k are mutually exclusive." msgstr "--subject-prefix 和 -k 互斥。" -#: builtin/log.c:1212 +#: builtin/log.c:1257 msgid "--name-only does not make sense" msgstr "--name-only 无意义" -#: builtin/log.c:1214 +#: builtin/log.c:1259 msgid "--name-status does not make sense" msgstr "--name-status 无意义" -#: builtin/log.c:1216 +#: builtin/log.c:1261 msgid "--check does not make sense" msgstr "--check 无意义" -#: builtin/log.c:1239 +#: builtin/log.c:1284 msgid "standard output, or directory, which one?" msgstr "标准输出或目录，哪一个？" -#: builtin/log.c:1241 +#: builtin/log.c:1286 #, c-format msgid "Could not create directory '%s'" msgstr "不能创建目录 '%s'" -#: builtin/log.c:1394 +#: builtin/log.c:1439 msgid "Failed to create output files" msgstr "无法创建输出文件" -#: builtin/log.c:1443 +#: builtin/log.c:1488 msgid "git cherry [-v] [<upstream> [<head> [<limit>]]]" -msgstr "" +msgstr "git cherry [-v] [<上游> [<头> [<限制>]]]" -#: builtin/log.c:1498 +#: builtin/log.c:1543 #, c-format msgid "" "Could not find a tracked remote branch, please specify <upstream> manually.\n" msgstr "不能找到跟踪的远程分支，请手工指定 <upstream>。\n" -#: builtin/log.c:1511 builtin/log.c:1513 builtin/log.c:1525 +#: builtin/log.c:1556 builtin/log.c:1558 builtin/log.c:1570 #, c-format msgid "Unknown commit %s" msgstr "未知提交 %s" -#: builtin/ls-files.c:408 -#, fuzzy +#: builtin/ls-files.c:409 msgid "git ls-files [options] [<file>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git ls-files [选项] [<文件>...]" -#: builtin/ls-files.c:463 +#: builtin/ls-files.c:466 msgid "identify the file status with tags" -msgstr "" +msgstr "用标签标识文件的状态" -#: builtin/ls-files.c:465 +#: builtin/ls-files.c:468 msgid "use lowercase letters for 'assume unchanged' files" -msgstr "" +msgstr "使用小写字母表示 '假设未改变的' 文件" -#: builtin/ls-files.c:467 +#: builtin/ls-files.c:470 msgid "show cached files in the output (default)" -msgstr "" +msgstr "显示缓存的文件（默认）" -#: builtin/ls-files.c:469 -#, fuzzy +#: builtin/ls-files.c:472 msgid "show deleted files in the output" -msgstr "删除的文件 %s 仍有内容" +msgstr "显示已删除的文件" -#: builtin/ls-files.c:471 +#: builtin/ls-files.c:474 msgid "show modified files in the output" -msgstr "" +msgstr "显示已修改的文件" -#: builtin/ls-files.c:473 +#: builtin/ls-files.c:476 msgid "show other files in the output" -msgstr "" +msgstr "显示其它文件" -#: builtin/ls-files.c:475 +#: builtin/ls-files.c:478 msgid "show ignored files in the output" -msgstr "" +msgstr "显示忽略的文件" -#: builtin/ls-files.c:478 +#: builtin/ls-files.c:481 msgid "show staged contents' object name in the output" -msgstr "" +msgstr "显示暂存区内容的对象名称" -#: builtin/ls-files.c:480 +#: builtin/ls-files.c:483 msgid "show files on the filesystem that need to be removed" -msgstr "" +msgstr "显示文件系统需要删除的文件" -#: builtin/ls-files.c:482 +#: builtin/ls-files.c:485 msgid "show 'other' directories' name only" -msgstr "" +msgstr "只显示“其他”目录的名称" -#: builtin/ls-files.c:485 -#, fuzzy +#: builtin/ls-files.c:488 msgid "don't show empty directories" -msgstr "两个输出目录？" +msgstr "不显示空目录" -#: builtin/ls-files.c:488 +#: builtin/ls-files.c:491 msgid "show unmerged files in the output" -msgstr "" +msgstr "显示未合并的文件" -#: builtin/ls-files.c:490 +#: builtin/ls-files.c:493 msgid "show resolve-undo information" -msgstr "" +msgstr "显示 resolve-undo 信息" -#: builtin/ls-files.c:492 -#, fuzzy +#: builtin/ls-files.c:495 msgid "skip files matching pattern" -msgstr "输出和模式匹配的行" +msgstr "匹配排除文件的模式" -#: builtin/ls-files.c:495 +#: builtin/ls-files.c:498 msgid "exclude patterns are read from <file>" -msgstr "" +msgstr "从 <文件> 中读取排除模式" -#: builtin/ls-files.c:498 +#: builtin/ls-files.c:501 msgid "read additional per-directory exclude patterns in <file>" -msgstr "" +msgstr "从 <文件> 读取额外的每个目录的排除模式" -#: builtin/ls-files.c:500 +#: builtin/ls-files.c:503 msgid "add the standard git exclusions" -msgstr "" +msgstr "添加标准的 git 排除" -#: builtin/ls-files.c:503 +#: builtin/ls-files.c:506 msgid "make the output relative to the project top directory" -msgstr "" +msgstr "显示相对于顶级目录的文件名" -#: builtin/ls-files.c:506 +#: builtin/ls-files.c:509 msgid "if any <file> is not in the index, treat this as an error" -msgstr "" +msgstr "如果任何 <文件> 都不在索引区，视为错误" -#: builtin/ls-files.c:507 +#: builtin/ls-files.c:510 msgid "tree-ish" -msgstr "" +msgstr "树或提交" -#: builtin/ls-files.c:508 +#: builtin/ls-files.c:511 msgid "pretend that paths removed since <tree-ish> are still present" -msgstr "" +msgstr "假装自从 <树或提交> 之后删除的路径仍然存在" -#: builtin/ls-files.c:510 +#: builtin/ls-files.c:513 msgid "show debugging data" -msgstr "" +msgstr "显示调试数据" #: builtin/ls-tree.c:27 -#, fuzzy msgid "git ls-tree [<options>] <tree-ish> [<path>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git ls-tree [<选项>] <树或提交> [<路径>...]" #: builtin/ls-tree.c:125 msgid "only show trees" -msgstr "" +msgstr "只显示树" #: builtin/ls-tree.c:127 -#, fuzzy msgid "recurse into subtrees" -msgstr "变基到远程 %s" +msgstr "递归到子树" #: builtin/ls-tree.c:129 msgid "show trees when recursing" -msgstr "" +msgstr "当递归时显示树" #: builtin/ls-tree.c:132 msgid "terminate entries with NUL byte" -msgstr "" +msgstr "条目以NUL字符终止" #: builtin/ls-tree.c:133 -#, fuzzy msgid "include object size" -msgstr "提供了无效对象 '%s'。" +msgstr "包括对象大小" #: builtin/ls-tree.c:135 builtin/ls-tree.c:137 msgid "list only filenames" -msgstr "" +msgstr "只列出文件名" #: builtin/ls-tree.c:140 msgid "use full path names" -msgstr "" +msgstr "使用文件的全路径" #: builtin/ls-tree.c:142 msgid "list entire tree; not just current directory (implies --full-name)" -msgstr "" +msgstr "列出整个树；不仅仅当前目录（隐含 --full-name）" #: builtin/merge.c:43 -#, fuzzy msgid "git merge [options] [<commit>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git merge [选项] [<提交>...]" #: builtin/merge.c:44 msgid "git merge [options] <msg> HEAD <commit>" -msgstr "" +msgstr "git merge [选项] <说明> HEAD <提交>" #: builtin/merge.c:45 msgid "git merge --abort" -msgstr "" +msgstr "git merge --abort" #: builtin/merge.c:90 msgid "switch `m' requires a value" @@ -5781,68 +5870,63 @@ msgstr "可用的自定义策略有：" #: builtin/merge.c:183 msgid "do not show a diffstat at the end of the merge" -msgstr "" +msgstr "在合并的最后不显示差异统计" #: builtin/merge.c:186 msgid "show a diffstat at the end of the merge" -msgstr "" +msgstr "在合并的最后显示差异统计" #: builtin/merge.c:187 msgid "(synonym to --stat)" -msgstr "" +msgstr "（和 --stat 同义）" #: builtin/merge.c:189 msgid "add (at most <n>) entries from shortlog to merge commit message" -msgstr "" +msgstr "在合并提交信息中添加（最多 <n> 条）精简提交记录" #: builtin/merge.c:192 -#, fuzzy msgid "create a single commit instead of doing a merge" -msgstr "在合并过程中不能做部分提交。" +msgstr "创建一个单独的提交而不是做一次合并" #: builtin/merge.c:194 msgid "perform a commit if the merge succeeds (default)" -msgstr "" +msgstr "如果合并成功，执行一次提交（默认）" #: builtin/merge.c:196 -#, fuzzy msgid "edit message before committing" -msgstr "尚未暂存以备提交的变更：" +msgstr "在提交前编辑提交说明" #: builtin/merge.c:198 -#, fuzzy msgid "allow fast-forward (default)" -msgstr "可快进" +msgstr "允许快进（默认）" #: builtin/merge.c:200 msgid "abort if fast-forward is not possible" -msgstr "" +msgstr "如果不能快进就放弃合并" -#: builtin/merge.c:202 builtin/notes.c:867 builtin/revert.c:112 +#: builtin/merge.c:202 builtin/notes.c:866 builtin/revert.c:112 msgid "strategy" -msgstr "" +msgstr "策略" #: builtin/merge.c:203 -#, fuzzy msgid "merge strategy to use" -msgstr "尝试合并策略 %s...\n" +msgstr "要使用的合并策略" #: builtin/merge.c:204 msgid "option=value" -msgstr "" +msgstr "option=value" #: builtin/merge.c:205 msgid "option for selected merge strategy" -msgstr "" +msgstr "所选的合并策略的选项" #: builtin/merge.c:207 msgid "merge commit message (for a non-fast-forward merge)" -msgstr "" +msgstr "合并的提交说明（针对非快进式合并）" #: builtin/merge.c:211 -#, fuzzy msgid "abort the current in-progress merge" -msgstr "无法保存当前索引状态" +msgstr "放弃当前正在进行的合并" #: builtin/merge.c:240 msgid "could not run stash." @@ -5898,93 +5982,90 @@ msgstr "坏的 branch.%s.mergeoptions 字符串：%s" msgid "git write-tree failed to write a tree" msgstr "git write-tree 无法写入一树对象" -#: builtin/merge.c:678 -msgid "failed to read the cache" -msgstr "无法读取缓存" - -#: builtin/merge.c:709 +#: builtin/merge.c:656 msgid "Not handling anything other than two heads merge." msgstr "不能处理两个头合并之外的任何操作。" -#: builtin/merge.c:723 +#: builtin/merge.c:670 #, c-format msgid "Unknown option for merge-recursive: -X%s" msgstr "merge-recursive 的未知选项：-X%s" -#: builtin/merge.c:737 +#: builtin/merge.c:684 #, c-format msgid "unable to write %s" msgstr "不能写 %s" -#: builtin/merge.c:876 +#: builtin/merge.c:773 #, c-format msgid "Could not read from '%s'" msgstr "不能从 '%s' 读取" -#: builtin/merge.c:885 +#: builtin/merge.c:782 #, c-format msgid "Not committing merge; use 'git commit' to complete the merge.\n" msgstr "未提交合并，使用 'git commit' 完成此次合并。\n" -#: builtin/merge.c:891 +#: builtin/merge.c:788 +#, c-format msgid "" "Please enter a commit message to explain why this merge is necessary,\n" "especially if it merges an updated upstream into a topic branch.\n" "\n" -"Lines starting with '#' will be ignored, and an empty message aborts\n" +"Lines starting with '%c' will be ignored, and an empty message aborts\n" "the commit.\n" msgstr "" "请输入一个提交信息以解释此合并的必要性，尤其是将一个更新后的上游分支\n" "合并到主题分支。\n" "\n" -"以 '#' 开头的行将被忽略，而且空提交说明将会终止提交。\n" +"以 '%c' 开头的行将被忽略，而且空提交说明将会终止提交。\n" -#: builtin/merge.c:915 +#: builtin/merge.c:812 msgid "Empty commit message." msgstr "空提交信息。" -#: builtin/merge.c:927 +#: builtin/merge.c:824 #, c-format msgid "Wonderful.\n" msgstr "太棒了。\n" -#: builtin/merge.c:992 +#: builtin/merge.c:889 #, c-format msgid "Automatic merge failed; fix conflicts and then commit the result.\n" msgstr "自动合并失败，修正冲突然后提交修正的结果。\n" -#: builtin/merge.c:1008 +#: builtin/merge.c:905 #, c-format msgid "'%s' is not a commit" msgstr "'%s' 不是一个提交" -#: builtin/merge.c:1049 +#: builtin/merge.c:946 msgid "No current branch." msgstr "没有当前分支。" -#: builtin/merge.c:1051 +#: builtin/merge.c:948 msgid "No remote for the current branch." msgstr "当前分支没有对应的远程版本库。" -#: builtin/merge.c:1053 +#: builtin/merge.c:950 msgid "No default upstream defined for the current branch." msgstr "当前分支没有定义默认的上游分支。" -#: builtin/merge.c:1058 +#: builtin/merge.c:955 #, c-format msgid "No remote tracking branch for %s from %s" msgstr "%s 没有来自 %s 的远程跟踪分支" -#: builtin/merge.c:1145 builtin/merge.c:1302 +#: builtin/merge.c:1042 builtin/merge.c:1199 #, c-format msgid "%s - not something we can merge" msgstr "%s - 不能被合并" -#: builtin/merge.c:1213 +#: builtin/merge.c:1110 msgid "There is no merge to abort (MERGE_HEAD missing)." msgstr "没有要终止的合并（MERGE_HEAD 丢失）。" -#: builtin/merge.c:1229 git-pull.sh:31 +#: builtin/merge.c:1126 git-pull.sh:31 msgid "" "You have not concluded your merge (MERGE_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -5992,11 +6073,11 @@ msgstr "" "您尚未结束您的合并（存在 MERGE_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1232 git-pull.sh:34 +#: builtin/merge.c:1129 git-pull.sh:34 msgid "You have not concluded your merge (MERGE_HEAD exists)." msgstr "您尚未结束您的合并（存在 MERGE_HEAD）。" -#: builtin/merge.c:1236 +#: builtin/merge.c:1133 msgid "" "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists).\n" "Please, commit your changes before you can merge." @@ -6004,183 +6085,181 @@ msgstr "" "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。\n" "请在合并前先提交您的修改。" -#: builtin/merge.c:1239 +#: builtin/merge.c:1136 msgid "You have not concluded your cherry-pick (CHERRY_PICK_HEAD exists)." msgstr "您尚未结束您的拣选（存在 CHERRY_PICK_HEAD）。" -#: builtin/merge.c:1248 +#: builtin/merge.c:1145 msgid "You cannot combine --squash with --no-ff." msgstr "您不能将 --squash 与 --no-ff 同时使用。" -#: builtin/merge.c:1253 +#: builtin/merge.c:1150 msgid "You cannot combine --no-ff with --ff-only." msgstr "您不能将 --no-ff 与 --ff-only 同时使用。" -#: builtin/merge.c:1260 +#: builtin/merge.c:1157 msgid "No commit specified and merge.defaultToUpstream not set." msgstr "未指定提交并且 merge.defaultToUpstream 未设置。" -#: builtin/merge.c:1292 +#: builtin/merge.c:1189 msgid "Can merge only exactly one commit into empty head" msgstr "只能将一个提交合并到空分支上" -#: builtin/merge.c:1295 +#: builtin/merge.c:1192 msgid "Squash commit into empty head not supported yet" msgstr "尚不支持到空分支的压缩提交" -#: builtin/merge.c:1297 +#: builtin/merge.c:1194 msgid "Non-fast-forward commit does not make sense into an empty head" msgstr "到空分支的非快进式提交没有意义" -#: builtin/merge.c:1412 +#: builtin/merge.c:1310 #, c-format msgid "Updating %s..%s\n" msgstr "更新 %s..%s\n" -#: builtin/merge.c:1450 +#: builtin/merge.c:1349 #, c-format msgid "Trying really trivial in-index merge...\n" msgstr "尝试非常小的索引内合并...\n" -#: builtin/merge.c:1457 +#: builtin/merge.c:1356 #, c-format msgid "Nope.\n" msgstr "无。\n" -#: builtin/merge.c:1489 +#: builtin/merge.c:1388 msgid "Not possible to fast-forward, aborting." msgstr "无法快进，终止。" -#: builtin/merge.c:1512 builtin/merge.c:1591 +#: builtin/merge.c:1411 builtin/merge.c:1490 #, c-format msgid "Rewinding the tree to pristine...\n" msgstr "将树回滚至原始状态...\n" -#: builtin/merge.c:1516 +#: builtin/merge.c:1415 #, c-format msgid "Trying merge strategy %s...\n" msgstr "尝试合并策略 %s...\n" -#: builtin/merge.c:1582 +#: builtin/merge.c:1481 #, c-format msgid "No merge strategy handled the merge.\n" msgstr "没有合并策略处理此合并。\n" -#: builtin/merge.c:1584 +#: builtin/merge.c:1483 #, c-format msgid "Merge with strategy %s failed.\n" msgstr "使用策略 %s 合并失败。\n" -#: builtin/merge.c:1593 +#: builtin/merge.c:1492 #, c-format msgid "Using the %s to prepare resolving by hand.\n" msgstr "使用 %s 以准备手工解决。\n" -#: builtin/merge.c:1605 +#: builtin/merge.c:1504 #, c-format msgid "Automatic merge went well; stopped before committing as requested\n" msgstr "自动合并进展顺利，按要求在提交前停止\n" #: builtin/merge-base.c:26 msgid "git merge-base [-a|--all] <commit> <commit>..." -msgstr "" +msgstr "git merge-base [-a|--all] <提交> <提交>..." #: builtin/merge-base.c:27 msgid "git merge-base [-a|--all] --octopus <commit>..." -msgstr "" +msgstr "git merge-base [-a|--all] --octopus <提交>..." #: builtin/merge-base.c:28 msgid "git merge-base --independent <commit>..." -msgstr "" +msgstr "git merge-base --independent <提交>..." #: builtin/merge-base.c:29 msgid "git merge-base --is-ancestor <commit> <commit>" -msgstr "" +msgstr "git merge-base --is-ancestor <提交> <提交>" #: builtin/merge-base.c:98 -#, fuzzy msgid "output all common ancestors" -msgstr "发现 %u 个共同祖先：" +msgstr "输出所有共同的祖先" #: builtin/merge-base.c:99 msgid "find ancestors for a single n-way merge" -msgstr "" +msgstr "查找一个多路合并的祖先提交" #: builtin/merge-base.c:100 msgid "list revs not reachable from others" -msgstr "" +msgstr "显示不能被其他访问到的版本" #: builtin/merge-base.c:102 msgid "is the first one ancestor of the other?" -msgstr "" +msgstr "第一个是其他的祖先提交么？" #: builtin/merge-file.c:8 msgid "" "git merge-file [options] [-L name1 [-L orig [-L name2]]] file1 orig_file " "file2" msgstr "" +"git merge-file [选项] [-L name1 [-L orig [-L name2]]] file1 orig_file file2" #: builtin/merge-file.c:33 msgid "send results to standard output" -msgstr "" +msgstr "将结果发送到标准输出" #: builtin/merge-file.c:34 msgid "use a diff3 based merge" -msgstr "" +msgstr "使用基于 diff3 的合并" #: builtin/merge-file.c:35 msgid "for conflicts, use our version" -msgstr "" +msgstr "如果冲突，使用我们的版本" #: builtin/merge-file.c:37 msgid "for conflicts, use their version" -msgstr "" +msgstr "如果冲突，使用他们的版本" #: builtin/merge-file.c:39 msgid "for conflicts, use a union version" -msgstr "" +msgstr "如果冲突，使用联合版本" #: builtin/merge-file.c:42 msgid "for conflicts, use this marker size" -msgstr "" +msgstr "如果冲突，使用指定长度的标记" #: builtin/merge-file.c:43 msgid "do not warn about conflicts" -msgstr "" +msgstr "不要警告冲突" #: builtin/merge-file.c:45 msgid "set labels for file1/orig_file/file2" -msgstr "" +msgstr "为 file1/orig_file/file2 设置标签" #: builtin/mktree.c:67 msgid "git mktree [-z] [--missing] [--batch]" -msgstr "" +msgstr "git mktree [-z] [--missing] [--batch]" #: builtin/mktree.c:153 msgid "input is NUL terminated" -msgstr "" +msgstr "输入以 NUL 字符终止" #: builtin/mktree.c:154 builtin/write-tree.c:24 -#, fuzzy msgid "allow missing objects" -msgstr "接收对象中" +msgstr "允许丢失的对象" #: builtin/mktree.c:155 msgid "allow creation of more than one tree" -msgstr "" +msgstr "允许创建一个以上的树" #: builtin/mv.c:14 msgid "git mv [options] <source>... <destination>" -msgstr "" +msgstr "git mv [选项] <源>... <目标>" #: builtin/mv.c:64 msgid "force move/rename even if target exists" -msgstr "" +msgstr "强制移动/重命令，即使目标存在" #: builtin/mv.c:65 -#, fuzzy msgid "skip move/rename errors" -msgstr "程序错误" +msgstr "跳过移动/重命名错误" #: builtin/mv.c:108 #, c-format @@ -6245,326 +6324,314 @@ msgid "renaming '%s' failed" msgstr "重命名 '%s' 失败" #: builtin/name-rev.c:175 -#, fuzzy msgid "git name-rev [options] <commit>..." -msgstr "git apply [选项] [<补丁>...]" +msgstr "git name-rev [选项] <提交>..." #: builtin/name-rev.c:176 msgid "git name-rev [options] --all" -msgstr "" +msgstr "git name-rev [选项] --all" #: builtin/name-rev.c:177 msgid "git name-rev [options] --stdin" -msgstr "" +msgstr "git name-rev [选项] --stdin" #: builtin/name-rev.c:229 msgid "print only names (no SHA-1)" -msgstr "" +msgstr "只打印名称（无 SHA-1）" #: builtin/name-rev.c:230 msgid "only use tags to name the commits" -msgstr "" +msgstr "只使用 tags 来命名提交" #: builtin/name-rev.c:232 -#, fuzzy msgid "only use refs matching <pattern>" -msgstr "输出和模式匹配的行" +msgstr "只使用和 <模式> 相匹配的引用" #: builtin/name-rev.c:234 msgid "list all commits reachable from all refs" -msgstr "" +msgstr "列出可以从所有引用访问的提交" #: builtin/name-rev.c:235 msgid "read from stdin" -msgstr "" +msgstr "从标准输入读取" #: builtin/name-rev.c:236 msgid "allow to print `undefined` names" -msgstr "" +msgstr "允许打印 `未定义` 的名称" -#: builtin/notes.c:23 +#: builtin/notes.c:26 msgid "git notes [--ref <notes_ref>] [list [<object>]]" -msgstr "" +msgstr "git notes [--ref <注解引用>] [list [<对象>]]" -#: builtin/notes.c:24 +#: builtin/notes.c:27 msgid "" "git notes [--ref <notes_ref>] add [-f] [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" +"git notes [--ref <注解引用>] add [-f] [-m <说明> | -F <文件> | (-c | -C) <对" +"象>] [<对象>]" -#: builtin/notes.c:25 +#: builtin/notes.c:28 msgid "git notes [--ref <notes_ref>] copy [-f] <from-object> <to-object>" -msgstr "" +msgstr "git notes [--ref <注解引用>] copy [-f] <源对象> <目标对象>" -#: builtin/notes.c:26 +#: builtin/notes.c:29 msgid "" "git notes [--ref <notes_ref>] append [-m <msg> | -F <file> | (-c | -C) " "<object>] [<object>]" msgstr "" +"git notes [--ref <注解引用>] append [-m <说明> | -F <文件> | (-c | -C) <对象" +">] [<对象>]" -#: builtin/notes.c:27 +#: builtin/notes.c:30 msgid "git notes [--ref <notes_ref>] edit [<object>]" -msgstr "" +msgstr "git notes [--ref <注解引用>] edit [<对象>]" -#: builtin/notes.c:28 +#: builtin/notes.c:31 msgid "git notes [--ref <notes_ref>] show [<object>]" -msgstr "" +msgstr "git notes [--ref <注解引用>] show [<对象>]" -#: builtin/notes.c:29 +#: builtin/notes.c:32 msgid "" "git notes [--ref <notes_ref>] merge [-v | -q] [-s <strategy> ] <notes_ref>" -msgstr "" +msgstr "git notes [--ref <注解引用>] merge [-v | -q] [-s <策略> ] <注解引用>" -#: builtin/notes.c:30 +#: builtin/notes.c:33 msgid "git notes merge --commit [-v | -q]" -msgstr "" +msgstr "git notes merge --commit [-v | -q]" -#: builtin/notes.c:31 +#: builtin/notes.c:34 msgid "git notes merge --abort [-v | -q]" -msgstr "" +msgstr "git notes merge --abort [-v | -q]" -#: builtin/notes.c:32 +#: builtin/notes.c:35 msgid "git notes [--ref <notes_ref>] remove [<object>...]" -msgstr "" +msgstr "git notes [--ref <注解引用>] remove [<对象>...]" -#: builtin/notes.c:33 +#: builtin/notes.c:36 msgid "git notes [--ref <notes_ref>] prune [-n | -v]" -msgstr "" +msgstr "git notes [--ref <注解引用>] prune [-n | -v]" -#: builtin/notes.c:34 +#: builtin/notes.c:37 msgid "git notes [--ref <notes_ref>] get-ref" -msgstr "" +msgstr "git notes [--ref <注解引用>] get-ref" -#: builtin/notes.c:39 +#: builtin/notes.c:42 msgid "git notes [list [<object>]]" -msgstr "" +msgstr "git notes [list [<对象>]]" -#: builtin/notes.c:44 -#, fuzzy +#: builtin/notes.c:47 msgid "git notes add [<options>] [<object>]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git notes add [<选项>] [<对象>]" -#: builtin/notes.c:49 +#: builtin/notes.c:52 msgid "git notes copy [<options>] <from-object> <to-object>" -msgstr "" +msgstr "git notes copy [<选项>] <源对象> <目标对象>" -#: builtin/notes.c:50 +#: builtin/notes.c:53 msgid "git notes copy --stdin [<from-object> <to-object>]..." -msgstr "" +msgstr "git notes copy --stdin [<源对象> <目标对象>]..." -#: builtin/notes.c:55 -#, fuzzy +#: builtin/notes.c:58 msgid "git notes append [<options>] [<object>]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git notes append [<选项>] [<对象>]" -#: builtin/notes.c:60 +#: builtin/notes.c:63 msgid "git notes edit [<object>]" -msgstr "" +msgstr "git notes edit [<对象>]" -#: builtin/notes.c:65 +#: builtin/notes.c:68 msgid "git notes show [<object>]" -msgstr "" +msgstr "git notes show [<对象>]" -#: builtin/notes.c:70 +#: builtin/notes.c:73 msgid "git notes merge [<options>] <notes_ref>" -msgstr "" +msgstr "git notes merge [<选项>] <注解引用>" -#: builtin/notes.c:71 +#: builtin/notes.c:74 msgid "git notes merge --commit [<options>]" -msgstr "" +msgstr "git notes merge --commit [<选项>]" -#: builtin/notes.c:72 +#: builtin/notes.c:75 msgid "git notes merge --abort [<options>]" -msgstr "" +msgstr "git notes merge --abort [<选项>]" -#: builtin/notes.c:77 +#: builtin/notes.c:80 msgid "git notes remove [<object>]" -msgstr "" +msgstr "git notes remove [<对象>]" -#: builtin/notes.c:82 +#: builtin/notes.c:85 msgid "git notes prune [<options>]" -msgstr "" +msgstr "git notes prune [<选项>]" -#: builtin/notes.c:87 +#: builtin/notes.c:90 msgid "git notes get-ref" -msgstr "" +msgstr "git notes get-ref" #: builtin/notes.c:139 #, c-format msgid "unable to start 'show' for object '%s'" msgstr "不能为对象 '%s' 开始 'show'" -#: builtin/notes.c:145 -msgid "can't fdopen 'show' output fd" -msgstr "不能打开 'show' 输出文件句柄" +#: builtin/notes.c:143 +msgid "could not read 'show' output" +msgstr "不能读取 'show' 的输出" -#: builtin/notes.c:155 -#, c-format -msgid "failed to close pipe to 'show' for object '%s'" -msgstr "无法为对象 '%s' 的 'show' 关闭管道" - -#: builtin/notes.c:158 +#: builtin/notes.c:151 #, c-format msgid "failed to finish 'show' for object '%s'" msgstr "无法为对象 '%s' 完成 'show'" -#: builtin/notes.c:175 builtin/tag.c:347 +#: builtin/notes.c:169 builtin/tag.c:341 #, c-format msgid "could not create file '%s'" msgstr "不能创建文件 '%s'" -#: builtin/notes.c:189 +#: builtin/notes.c:188 msgid "Please supply the note contents using either -m or -F option" msgstr "请通过 -m 或 -F 选项为注解提供内容" -#: builtin/notes.c:210 builtin/notes.c:973 +#: builtin/notes.c:209 builtin/notes.c:972 #, c-format msgid "Removing note for object %s\n" msgstr "删除对象 %s 的注解\n" -#: builtin/notes.c:215 +#: builtin/notes.c:214 msgid "unable to write note object" msgstr "不能写注解对象" -#: builtin/notes.c:217 +#: builtin/notes.c:216 #, c-format msgid "The note contents has been left in %s" msgstr "注解内容被留在文件 %s 中" -#: builtin/notes.c:251 builtin/tag.c:542 +#: builtin/notes.c:250 builtin/tag.c:540 #, c-format msgid "cannot read '%s'" msgstr "不能读取 '%s'" -#: builtin/notes.c:253 builtin/tag.c:545 +#: builtin/notes.c:252 builtin/tag.c:543 #, c-format msgid "could not open or read '%s'" 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:558 +#: builtin/notes.c:271 builtin/notes.c:444 builtin/notes.c:446 +#: builtin/notes.c:506 builtin/notes.c:560 builtin/notes.c:643 +#: builtin/notes.c:648 builtin/notes.c:723 builtin/notes.c:765 +#: builtin/notes.c:967 builtin/tag.c:556 #, c-format msgid "Failed to resolve '%s' as a valid ref." msgstr "无法解析 '%s' 为一个有效引用。" -#: builtin/notes.c:275 +#: builtin/notes.c:274 #, c-format msgid "Failed to read object '%s'." msgstr "无法读取对象 '%s'。" -#: builtin/notes.c:299 +#: builtin/notes.c:298 msgid "Cannot commit uninitialized/unreferenced notes tree" msgstr "不能提交未初始化/未引用的注解树" -#: builtin/notes.c:340 +#: builtin/notes.c:339 #, c-format msgid "Bad notes.rewriteMode value: '%s'" msgstr "坏的 notes.rewriteMode 值：'%s'" -#: builtin/notes.c:350 +#: builtin/notes.c:349 #, c-format msgid "Refusing to rewrite notes in %s (outside of refs/notes/)" msgstr "拒绝向 %s（在 refs/notes/ 之外）写入注解" #. TRANSLATORS: The first %s is the name of the #. environment variable, the second %s is its value -#: builtin/notes.c:377 +#: builtin/notes.c:376 #, c-format msgid "Bad %s value: '%s'" msgstr "坏的 %s 值：'%s'" -#: builtin/notes.c:441 +#: builtin/notes.c:440 #, c-format msgid "Malformed input line: '%s'." msgstr "非法的输入行：'%s'。" -#: builtin/notes.c:456 +#: builtin/notes.c:455 #, c-format msgid "Failed to copy notes from '%s' to '%s'" msgstr "无法从 '%s' 到 '%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 +#: builtin/notes.c:499 builtin/notes.c:553 builtin/notes.c:626 +#: builtin/notes.c:638 builtin/notes.c:711 builtin/notes.c:758 +#: builtin/notes.c:1032 msgid "too many parameters" msgstr "参数太多" -#: builtin/notes.c:513 builtin/notes.c:772 +#: builtin/notes.c:512 builtin/notes.c:771 #, c-format msgid "No note found for object %s." msgstr "未发现对象 %s 的注解。" -#: builtin/notes.c:535 builtin/notes.c:692 -#, fuzzy +#: builtin/notes.c:534 builtin/notes.c:691 msgid "note contents as a string" -msgstr "注解内容被留在文件 %s 中" +msgstr "注解内容作为一个字符串" -#: builtin/notes.c:538 builtin/notes.c:695 -#, fuzzy +#: builtin/notes.c:537 builtin/notes.c:694 msgid "note contents in a file" -msgstr "无法存储索引文件" +msgstr "注解内容到一个文件中" -#: builtin/notes.c:540 builtin/notes.c:543 builtin/notes.c:697 -#: builtin/notes.c:700 builtin/tag.c:476 -#, fuzzy +#: builtin/notes.c:539 builtin/notes.c:542 builtin/notes.c:696 +#: builtin/notes.c:699 builtin/tag.c:474 msgid "object" -msgstr "坏对象 %s" +msgstr "对象" -#: builtin/notes.c:541 builtin/notes.c:698 -#, fuzzy +#: builtin/notes.c:540 builtin/notes.c:697 msgid "reuse and edit specified note object" -msgstr "不能写注解对象" +msgstr "重用和编辑指定的注解对象" -#: builtin/notes.c:544 builtin/notes.c:701 -#, fuzzy +#: builtin/notes.c:543 builtin/notes.c:700 msgid "reuse specified note object" -msgstr "不能写注解对象" +msgstr "重用指定的注解对象" -#: builtin/notes.c:546 builtin/notes.c:614 -#, fuzzy +#: builtin/notes.c:545 builtin/notes.c:613 msgid "replace existing notes" -msgstr "不能读取现存对象 %s" +msgstr "替换已存在的注解" -#: builtin/notes.c:580 +#: builtin/notes.c:579 #, c-format msgid "" "Cannot add notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能添加注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:585 builtin/notes.c:662 +#: builtin/notes.c:584 builtin/notes.c:661 #, c-format msgid "Overwriting existing notes for object %s\n" msgstr "覆盖对象 %s 现存注解\n" -#: builtin/notes.c:615 -#, fuzzy +#: builtin/notes.c:614 msgid "read objects from stdin" -msgstr "坏对象 %s" +msgstr "从标准输入读取对象" -#: builtin/notes.c:617 +#: builtin/notes.c:616 msgid "load rewriting config for <command> (implies --stdin)" -msgstr "" +msgstr "重新加载 <命令> 的配置（隐含 --stdin）" -#: builtin/notes.c:635 +#: builtin/notes.c:634 msgid "too few parameters" msgstr "参数太少" -#: builtin/notes.c:656 +#: builtin/notes.c:655 #, c-format msgid "" "Cannot copy notes. Found existing notes for object %s. Use '-f' to overwrite " "existing notes" msgstr "不能拷贝注解。发现对象 %s 已存在注解。使用 '-f' 覆盖现存注解" -#: builtin/notes.c:668 +#: builtin/notes.c:667 #, c-format msgid "Missing notes on source object %s. Cannot copy." msgstr "源对象 %s 缺少注解。不能拷贝。" -#: builtin/notes.c:717 +#: builtin/notes.c:716 #, c-format msgid "" "The -m/-F/-c/-C options have been deprecated for the 'edit' subcommand.\n" @@ -6573,262 +6640,250 @@ msgstr "" "子命令 'edit' 的选项 -m/-F/-c/-C 已弃用。\n" "请换用 'git notes add -f -m/-F/-c/-C'。\n" -#: builtin/notes.c:864 -#, fuzzy +#: builtin/notes.c:863 msgid "General options" -msgstr "无效选项：%s" +msgstr "通用选项" -#: builtin/notes.c:866 +#: builtin/notes.c:865 msgid "Merge options" -msgstr "" +msgstr "合并选项" -#: builtin/notes.c:868 +#: builtin/notes.c:867 msgid "" "resolve notes conflicts using the given strategy (manual/ours/theirs/union/" "cat_sort_uniq)" -msgstr "" +msgstr "使用指定的策略解决注解冲突 (manual/ours/theirs/union/cat_sort_uniq)" -#: builtin/notes.c:870 +#: builtin/notes.c:869 msgid "Committing unmerged notes" -msgstr "" +msgstr "提交未合并的注解" -#: builtin/notes.c:872 +#: builtin/notes.c:871 msgid "finalize notes merge by committing unmerged notes" -msgstr "" +msgstr "通过提交未合并的注解来完成注解合并" -#: builtin/notes.c:874 +#: builtin/notes.c:873 msgid "Aborting notes merge resolution" -msgstr "" +msgstr "中止注解合并的方案" -#: builtin/notes.c:876 -#, fuzzy +#: builtin/notes.c:875 msgid "abort notes merge" -msgstr "path '%s'：无法合并" +msgstr "中止注解合并" -#: builtin/notes.c:971 +#: builtin/notes.c:970 #, c-format msgid "Object %s has no note\n" msgstr "对象 %s 没有注解\n" -#: builtin/notes.c:983 +#: builtin/notes.c:982 msgid "attempt to remove non-existent note is not an error" -msgstr "" +msgstr "尝试删除不存在的注解不是一个错误" -#: builtin/notes.c:986 -#, fuzzy +#: builtin/notes.c:985 msgid "read object names from the standard input" -msgstr "（正从标准输入中读取日志信息）\n" +msgstr "从标准输入读取对象名称" -#: builtin/notes.c:1067 +#: builtin/notes.c:1066 msgid "notes_ref" -msgstr "" +msgstr "注解引用" -#: builtin/notes.c:1068 +#: builtin/notes.c:1067 msgid "use notes from <notes_ref>" -msgstr "" +msgstr "从 <注解引用> 使用注解" -#: builtin/notes.c:1103 builtin/remote.c:1598 +#: builtin/notes.c:1102 builtin/remote.c:1598 #, c-format msgid "Unknown subcommand: %s" msgstr "未知子命令：%s" #: builtin/pack-objects.c:23 msgid "git pack-objects --stdout [options...] [< ref-list | < object-list]" -msgstr "" +msgstr "git pack-objects --stdout [选项...] [< 引用列表 | < 对象列表]" #: builtin/pack-objects.c:24 msgid "git pack-objects [options...] base-name [< ref-list | < object-list]" -msgstr "" +msgstr "git pack-objects [选项...] base-name [< 引用列表 | < 对象列表]" #: builtin/pack-objects.c:183 builtin/pack-objects.c:186 #, c-format msgid "deflate error (%d)" msgstr "压缩错误 (%d)" -#: builtin/pack-objects.c:2398 +#: builtin/pack-objects.c:2397 #, c-format msgid "unsupported index version %s" msgstr "不支持的索引版本 %s" -#: builtin/pack-objects.c:2402 +#: builtin/pack-objects.c:2401 #, c-format msgid "bad index version '%s'" msgstr "坏的索引版本 '%s'" -#: builtin/pack-objects.c:2425 +#: builtin/pack-objects.c:2424 #, c-format msgid "option %s does not accept negative form" msgstr "选项 %s 不接受否定格式" -#: builtin/pack-objects.c:2429 +#: builtin/pack-objects.c:2428 #, c-format msgid "unable to parse value '%s' for option %s" msgstr "不能解析选项 %1$s 的值 '%2$s'" -#: builtin/pack-objects.c:2448 +#: builtin/pack-objects.c:2447 msgid "do not show progress meter" -msgstr "" +msgstr "不显示进度表" -#: builtin/pack-objects.c:2450 +#: builtin/pack-objects.c:2449 msgid "show progress meter" -msgstr "" +msgstr "显示进度表" -#: builtin/pack-objects.c:2452 +#: builtin/pack-objects.c:2451 msgid "show progress meter during object writing phase" -msgstr "" +msgstr "在对象写入阶段显示进度表" -#: builtin/pack-objects.c:2455 +#: builtin/pack-objects.c:2454 msgid "similar to --all-progress when progress meter is shown" -msgstr "" +msgstr "当进度表显示时类似于 --all-progress" -#: builtin/pack-objects.c:2456 +#: builtin/pack-objects.c:2455 msgid "version[,offset]" -msgstr "" +msgstr "版本[,偏移]" -#: builtin/pack-objects.c:2457 +#: builtin/pack-objects.c:2456 msgid "write the pack index file in the specified idx format version" -msgstr "" +msgstr "用指定的 idx 格式版本来写包索引文件" -#: builtin/pack-objects.c:2460 -#, fuzzy +#: builtin/pack-objects.c:2459 msgid "maximum size of each output pack file" -msgstr "无法创建输出文件" +msgstr "每个输出包的最大尺寸" -#: builtin/pack-objects.c:2462 +#: builtin/pack-objects.c:2461 msgid "ignore borrowed objects from alternate object store" -msgstr "" +msgstr "忽略从替代对象存储里借用对象" -#: builtin/pack-objects.c:2464 -#, fuzzy +#: builtin/pack-objects.c:2463 msgid "ignore packed objects" -msgstr "不能读取对象 %s" +msgstr "忽略包对象" -#: builtin/pack-objects.c:2466 +#: builtin/pack-objects.c:2465 msgid "limit pack window by objects" -msgstr "" +msgstr "限制打包窗口的对象数" -#: builtin/pack-objects.c:2468 +#: builtin/pack-objects.c:2467 msgid "limit pack window by memory in addition to object limit" -msgstr "" +msgstr "除对象数量限制外设置打包窗口的内存限制" -#: builtin/pack-objects.c:2470 +#: builtin/pack-objects.c:2469 msgid "maximum length of delta chain allowed in the resulting pack" -msgstr "" +msgstr "打包允许的 delta 链的最大长度" -#: builtin/pack-objects.c:2472 -#, fuzzy +#: builtin/pack-objects.c:2471 msgid "reuse existing deltas" -msgstr "处理 delta 中" +msgstr "重用已存在的 deltas" -#: builtin/pack-objects.c:2474 -#, fuzzy +#: builtin/pack-objects.c:2473 msgid "reuse existing objects" -msgstr "不能读取现存对象 %s" +msgstr "重用已存在的对象" -#: builtin/pack-objects.c:2476 +#: builtin/pack-objects.c:2475 msgid "use OFS_DELTA objects" -msgstr "" +msgstr "使用 OFS_DELTA 对象" -#: builtin/pack-objects.c:2478 +#: builtin/pack-objects.c:2477 msgid "use threads when searching for best delta matches" -msgstr "" +msgstr "使用线程查询最佳 delta 匹配" -#: builtin/pack-objects.c:2480 +#: builtin/pack-objects.c:2479 msgid "do not create an empty pack output" -msgstr "" +msgstr "不创建空的包输出" -#: builtin/pack-objects.c:2482 -#, fuzzy +#: builtin/pack-objects.c:2481 msgid "read revision arguments from standard input" -msgstr "（正从标准输入中读取日志信息）\n" +msgstr "从标准输入读取修订号参数" -#: builtin/pack-objects.c:2484 +#: builtin/pack-objects.c:2483 msgid "limit the objects to those that are not yet packed" -msgstr "" +msgstr "限制那些尚未打包的对象" -#: builtin/pack-objects.c:2487 +#: builtin/pack-objects.c:2486 msgid "include objects reachable from any reference" -msgstr "" +msgstr "包括可以从任何引用访问到的对象" -#: builtin/pack-objects.c:2490 +#: builtin/pack-objects.c:2489 msgid "include objects referred by reflog entries" -msgstr "" +msgstr "包括被引用日志引用到的对象" -#: builtin/pack-objects.c:2493 +#: builtin/pack-objects.c:2492 msgid "output pack to stdout" -msgstr "" +msgstr "输出包到标准输出" -#: builtin/pack-objects.c:2495 +#: builtin/pack-objects.c:2494 msgid "include tag objects that refer to objects to be packed" -msgstr "" +msgstr "包括引用了打包对象的 tag" -#: builtin/pack-objects.c:2497 +#: builtin/pack-objects.c:2496 msgid "keep unreachable objects" -msgstr "" +msgstr "维持不可达的对象" -#: builtin/pack-objects.c:2498 parse-options.h:141 +#: builtin/pack-objects.c:2497 parse-options.h:141 msgid "time" msgstr "时间" -#: builtin/pack-objects.c:2499 +#: builtin/pack-objects.c:2498 msgid "unpack unreachable objects newer than <time>" -msgstr "" +msgstr "将比给定 <时间> 新的无法访问的对象解包" -#: builtin/pack-objects.c:2502 +#: builtin/pack-objects.c:2501 msgid "create thin packs" -msgstr "" +msgstr "创建精简包" -#: builtin/pack-objects.c:2504 +#: builtin/pack-objects.c:2503 msgid "ignore packs that have companion .keep file" -msgstr "" +msgstr "忽略配有 .keep 文件的包" -#: builtin/pack-objects.c:2506 +#: builtin/pack-objects.c:2505 msgid "pack compression level" -msgstr "" +msgstr "打包压缩级别" -#: builtin/pack-objects.c:2508 -#, fuzzy +#: builtin/pack-objects.c:2507 msgid "do not hide commits by grafts" -msgstr "不能写提交模版" +msgstr "不隐藏移植覆盖的提交" #: builtin/pack-refs.c:6 msgid "git pack-refs [options]" -msgstr "" +msgstr "git pack-refs [选项]" #: builtin/pack-refs.c:14 msgid "pack everything" -msgstr "" +msgstr "打包一切" #: builtin/pack-refs.c:15 msgid "prune loose refs (default)" -msgstr "" +msgstr "清除松散的引用（默认）" #: builtin/prune-packed.c:7 msgid "git prune-packed [-n|--dry-run] [-q|--quiet]" -msgstr "" +msgstr "git prune-packed [-n|--dry-run] [-q|--quiet]" #: builtin/prune.c:12 msgid "git prune [-n] [-v] [--expire <time>] [--] [<head>...]" -msgstr "" +msgstr "git prune [-n] [-v] [--expire <时间>] [--] [<头>...]" #: builtin/prune.c:132 -#, fuzzy msgid "do not remove, show only" -msgstr "不会删除 %s\n" +msgstr "不删除，只显示" #: builtin/prune.c:133 -#, fuzzy msgid "report pruned objects" -msgstr "不能读取对象 %s" +msgstr "报告清除的对象" #: builtin/prune.c:136 msgid "expire objects older than <time>" -msgstr "" +msgstr "使早于给定时间的对象过期" #: builtin/push.c:14 -#, fuzzy msgid "git push [<options>] [<repository> [<refspec>...]]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git push [<选项>] [<版本库> [<引用表达式>...]]" #: builtin/push.c:45 msgid "tag shorthand without <tag>" @@ -6983,22 +7038,48 @@ msgstr "" "检出该分支并与远程变更合并（如 'git pull'），然后再推送。详见\n" "'git push --help' 中的 'Note about fast-forwards' 小节。" -#: builtin/push.c:258 +#: builtin/push.c:224 +msgid "" +"Updates were rejected because the remote contains work that you do\n" +"not have locally. This is usually caused by another repository pushing\n" +"to the same ref. You may want to first merge the remote changes (e.g.,\n" +"'git pull') before pushing again.\n" +"See the 'Note about fast-forwards' in 'git push --help' for details." +msgstr "" +"更新被拒绝，因为远程版本库包含您本地尚不存在的提交。这通常是因为另外\n" +"一个版本库已推送了相同的引用。再次推送前，您可能需要先合并远程变更\n" +"（如 'git pull'）。\n" +"详见 'git push --help' 中的 'Note about fast-forwards' 小节。" + +#: builtin/push.c:231 +msgid "Updates were rejected because the tag already exists in the remote." +msgstr "更新被拒绝因为 tag 在远程已经存在。" + +#: builtin/push.c:234 +msgid "" +"You cannot update a remote ref that points at a non-commit object,\n" +"or update a remote ref to make it point at a non-commit object,\n" +"without using the '--force' option.\n" +msgstr "" +"如果不使用 '--force' 参数，您不能更新一个指向非提交对象的远程引用，\n" +"也不能更新远程引用让其指向一个非提交对象。\n" + +#: builtin/push.c:294 #, c-format msgid "Pushing to %s\n" msgstr "推送到 %s\n" -#: builtin/push.c:262 +#: builtin/push.c:298 #, c-format msgid "failed to push some refs to '%s'" msgstr "无法推送一些引用到 '%s'" -#: builtin/push.c:294 +#: builtin/push.c:331 #, c-format msgid "bad repository '%s'" msgstr "坏的版本库 '%s'" -#: builtin/push.c:295 +#: builtin/push.c:332 msgid "" "No configured push destination.\n" "Either specify the URL from the command-line or configure a remote " @@ -7011,7 +7092,7 @@ msgid "" " git push <name>\n" msgstr "" "没有配置推送目标。\n" -"或者通过命令行指定URL，或者用下面命令配置一个远程版本库\n" +"或通过命令行指定URL，或用下面命令配置一个远程版本库\n" "\n" " git remote add <name> <url>\n" "\n" @@ -7019,82 +7100,83 @@ msgstr "" "\n" " git push <name>\n" -#: builtin/push.c:310 +#: builtin/push.c:347 msgid "--all and --tags are incompatible" msgstr "--all 和 --tags 不兼容" -#: builtin/push.c:311 +#: builtin/push.c:348 msgid "--all can't be combined with refspecs" msgstr "--all 不能和引用表达式同时使用" -#: builtin/push.c:316 +#: builtin/push.c:353 msgid "--mirror and --tags are incompatible" msgstr "--mirror 和 --tags 不兼容" -#: builtin/push.c:317 +#: builtin/push.c:354 msgid "--mirror can't be combined with refspecs" msgstr "--mirror 不能和引用表达式同时使用" -#: builtin/push.c:322 +#: builtin/push.c:359 msgid "--all and --mirror are incompatible" msgstr "--all 和 --mirror 不兼容" -#: builtin/push.c:382 -#, fuzzy +#: builtin/push.c:419 msgid "repository" -msgstr "坏的版本库 '%s'" +msgstr "版本库" -#: builtin/push.c:383 +#: builtin/push.c:420 msgid "push all refs" -msgstr "" +msgstr "推送所有引用" -#: builtin/push.c:384 +#: builtin/push.c:421 msgid "mirror all refs" -msgstr "" +msgstr "镜像所有引用" -#: builtin/push.c:386 -#, fuzzy +#: builtin/push.c:423 msgid "delete refs" -msgstr "删除" +msgstr "删除引用" -#: builtin/push.c:387 +#: builtin/push.c:424 msgid "push tags (can't be used with --all or --mirror)" -msgstr "" +msgstr "推送 tags（不能使用 --all or --mirror）" -#: builtin/push.c:390 -#, fuzzy +#: builtin/push.c:427 msgid "force updates" msgstr "强制更新" -#: builtin/push.c:391 +#: builtin/push.c:428 msgid "check" -msgstr "" +msgstr "检查" -#: builtin/push.c:392 +#: builtin/push.c:429 msgid "control recursive pushing of submodules" -msgstr "" +msgstr "控制子模组的递归推送" -#: builtin/push.c:394 +#: builtin/push.c:431 msgid "use thin pack" -msgstr "" +msgstr "使用精简打包" -#: builtin/push.c:395 builtin/push.c:396 +#: builtin/push.c:432 builtin/push.c:433 msgid "receive pack program" -msgstr "" +msgstr "接收包程序" -#: builtin/push.c:397 +#: builtin/push.c:434 msgid "set upstream for git pull/status" -msgstr "" +msgstr "设置 git pull/status 的上游" -#: builtin/push.c:400 +#: builtin/push.c:437 msgid "prune locally removed refs" -msgstr "" +msgstr "清除本地删除的引用" + +#: builtin/push.c:439 +msgid "bypass pre-push hook" +msgstr "绕过 pre-push 钩子" -#: builtin/push.c:410 +#: builtin/push.c:448 msgid "--delete is incompatible with --all, --mirror and --tags" msgstr "--delete 与 --all、--mirror 及 --tags 不兼容" -#: builtin/push.c:412 +#: builtin/push.c:450 msgid "--delete doesn't make sense without any refs" msgstr "--delete 未接任何引用没有意义" @@ -7104,155 +7186,150 @@ msgid "" "[-u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" "index-output=<file>] (--empty | <tree-ish1> [<tree-ish2> [<tree-ish3>]])" msgstr "" +"git read-tree [[-m [--trivial] [--aggressive] | --reset | --prefix=<前缀>] [-" +"u [--exclude-per-directory=<gitignore>] | -i]] [--no-sparse-checkout] [--" +"index-output=<文件>] (--empty | <树或提交1> [<树或提交2> [<树或提交3>]])" #: builtin/read-tree.c:108 -#, fuzzy msgid "write resulting index to <file>" -msgstr "损坏的索引文件" +msgstr "将索引结果写入 <file>" #: builtin/read-tree.c:111 -#, fuzzy msgid "only empty the index" -msgstr "不能读取索引" +msgstr "只是清空索引" #: builtin/read-tree.c:113 -#, fuzzy msgid "Merging" -msgstr "合并：" +msgstr "合并" #: builtin/read-tree.c:115 msgid "perform a merge in addition to a read" -msgstr "" +msgstr "读取之余再执行一个合并" #: builtin/read-tree.c:117 msgid "3-way merge if no file level merging required" -msgstr "" +msgstr "如果没有文件级合并需要，执行三路合并" #: builtin/read-tree.c:119 msgid "3-way merge in presence of adds and removes" -msgstr "" +msgstr "存在添加和删除时，也执行三路合并" #: builtin/read-tree.c:121 msgid "same as -m, but discard unmerged entries" -msgstr "" +msgstr "类似于 -m，但丢弃未合并的条目" #: builtin/read-tree.c:122 -#, fuzzy msgid "<subdirectory>/" -msgstr "目录/文件" +msgstr "<子目录>/" #: builtin/read-tree.c:123 msgid "read the tree into the index under <subdirectory>/" -msgstr "" +msgstr "读取树对象到索引的 <子目录>/ 下" #: builtin/read-tree.c:126 msgid "update working tree with merge result" -msgstr "" +msgstr "用合并的结果更新工作区" #: builtin/read-tree.c:128 -#, fuzzy msgid "gitignore" -msgstr "忽略的" +msgstr "gitignore" #: builtin/read-tree.c:129 msgid "allow explicitly ignored files to be overwritten" -msgstr "" +msgstr "允许忽略文件中设定的文件可以被覆盖" #: builtin/read-tree.c:132 -#, fuzzy msgid "don't check the working tree after merging" -msgstr "显示工作区状态" +msgstr "合并后不检查工作区" #: builtin/read-tree.c:133 msgid "don't update the index or the work tree" -msgstr "" +msgstr "不更新索引区和工作区" #: builtin/read-tree.c:135 msgid "skip applying sparse checkout filter" -msgstr "" +msgstr "跳过应用稀疏检出过滤器" #: builtin/read-tree.c:137 msgid "debug unpack-trees" -msgstr "" +msgstr "调试 unpack-trees" #: builtin/remote.c:11 msgid "git remote [-v | --verbose]" -msgstr "" +msgstr "git remote [-v | --verbose]" #: builtin/remote.c:12 msgid "" "git remote add [-t <branch>] [-m <master>] [-f] [--tags|--no-tags] [--" "mirror=<fetch|push>] <name> <url>" msgstr "" +"git remote add [-t <分支>] [-m <master>] [-f] [--tags|--no-tags] [--" +"mirror=<fetch|push>] <名称> <url>" #: builtin/remote.c:13 builtin/remote.c:32 msgid "git remote rename <old> <new>" -msgstr "" +msgstr "git remote rename <旧名称> <新名称>" #: builtin/remote.c:14 builtin/remote.c:37 msgid "git remote remove <name>" -msgstr "" +msgstr "git remote remove <名称>" -#: builtin/remote.c:15 +#: builtin/remote.c:15 builtin/remote.c:42 msgid "git remote set-head <name> (-a | -d | <branch>)" -msgstr "" +msgstr "git remote set-head <名称> (-a | -d | <分支>)" #: builtin/remote.c:16 msgid "git remote [-v | --verbose] show [-n] <name>" -msgstr "" +msgstr "git remote [-v | --verbose] show [-n] <名称>" #: builtin/remote.c:17 msgid "git remote prune [-n | --dry-run] <name>" -msgstr "" +msgstr "git remote prune [-n | --dry-run] <名称>" #: builtin/remote.c:18 msgid "" "git remote [-v | --verbose] update [-p | --prune] [(<group> | <remote>)...]" -msgstr "" +msgstr "git remote [-v | --verbose] update [-p | --prune] [(<组> | <远程>)...]" #: builtin/remote.c:19 msgid "git remote set-branches [--add] <name> <branch>..." -msgstr "" +msgstr "git remote set-branches [--add] <名称> <分支>..." #: builtin/remote.c:20 builtin/remote.c:68 msgid "git remote set-url [--push] <name> <newurl> [<oldurl>]" -msgstr "" +msgstr "git remote set-url [--push] <名称> <新的地址> [<旧的地址>]" #: builtin/remote.c:21 builtin/remote.c:69 msgid "git remote set-url --add <name> <newurl>" -msgstr "" +msgstr "git remote set-url --add <名称> <新的地址>" #: builtin/remote.c:22 builtin/remote.c:70 msgid "git remote set-url --delete <name> <url>" -msgstr "" +msgstr "git remote set-url --delete <名称> <地址>" #: builtin/remote.c:27 msgid "git remote add [<options>] <name> <url>" -msgstr "" - -#: builtin/remote.c:42 -msgid "git remote set-head <name> (-a | -d | <branch>])" -msgstr "" +msgstr "git remote add [<选项>] <名称> <地址>" #: builtin/remote.c:47 msgid "git remote set-branches <name> <branch>..." -msgstr "" +msgstr "git remote set-branches <名称> <分支>..." #: builtin/remote.c:48 msgid "git remote set-branches --add <name> <branch>..." -msgstr "" +msgstr "git remote set-branches --add <名称> <分支>..." #: builtin/remote.c:53 msgid "git remote show [<options>] <name>" -msgstr "" +msgstr "git remote show [<选项>] <名称>" #: builtin/remote.c:58 msgid "git remote prune [<options>] <name>" -msgstr "" +msgstr "git remote prune [<选项>] <名称>" #: builtin/remote.c:63 msgid "git remote update [<options>] [<group> | <remote>]..." -msgstr "" +msgstr "git remote update [<选项>] [<组> | <远程>]..." #: builtin/remote.c:98 #, c-format @@ -7273,34 +7350,32 @@ msgid "unknown mirror argument: %s" msgstr "未知的镜像参数：%s" #: builtin/remote.c:163 -#, fuzzy msgid "fetch the remote branches" -msgstr " 远程分支：%s" +msgstr "抓取远程的分支" #: builtin/remote.c:165 msgid "import all tags and associated objects when fetching" -msgstr "" +msgstr "抓取时导入所有的 tags 和关联对象" #: builtin/remote.c:168 msgid "or do not fetch any tag at all (--no-tags)" -msgstr "" +msgstr "或不抓取任何 tag（--no-tags）" #: builtin/remote.c:170 msgid "branch(es) to track" -msgstr "" +msgstr "跟踪的分支" #: builtin/remote.c:171 -#, fuzzy msgid "master branch" -msgstr " 远程分支：%s" +msgstr "主线分支" #: builtin/remote.c:172 msgid "push|fetch" -msgstr "" +msgstr "push|fetch" #: builtin/remote.c:173 msgid "set up remote as a mirror to push to or fetch from" -msgstr "" +msgstr "把远程设置为用以推送或抓取的镜像" #: builtin/remote.c:185 msgid "specifying a master branch makes no sense with --mirror" @@ -7495,9 +7570,8 @@ msgid " %-*s pushes to %s" msgstr " %-*s 推送至 %s" #: builtin/remote.c:1091 -#, fuzzy msgid "do not query remotes" -msgstr "不会删除 %s\n" +msgstr "不查询远程" #: builtin/remote.c:1118 #, c-format @@ -7560,11 +7634,11 @@ msgstr[1] " 为 'git push' 配置的本地引用%s：" #: builtin/remote.c:1199 msgid "set refs/remotes/<name>/HEAD according to remote" -msgstr "" +msgstr "根据远程设置 refs/remotes/<名称>/HEAD" #: builtin/remote.c:1201 msgid "delete refs/remotes/<name>/HEAD" -msgstr "" +msgstr "删除 refs/remotes/<名称>/HEAD" #: builtin/remote.c:1216 msgid "Cannot determine remote HEAD" @@ -7593,13 +7667,13 @@ msgstr "不能设置 %s" #: builtin/remote.c:1274 #, c-format msgid " %s will become dangling!" -msgstr " %s 将成为悬空状态！" +msgstr " %s 将成为摇摆状态！" # 译者：注意保持前导空格 #: builtin/remote.c:1275 #, c-format msgid " %s has become dangling!" -msgstr " %s 已成为悬空状态！" +msgstr " %s 已成为摇摆状态！" #: builtin/remote.c:1281 #, c-format @@ -7623,7 +7697,7 @@ msgstr " * [已删除] %s" #: builtin/remote.c:1321 msgid "prune remotes after fetching" -msgstr "" +msgstr "抓取后清除远程" #: builtin/remote.c:1387 builtin/remote.c:1461 #, c-format @@ -7631,9 +7705,8 @@ msgid "No such remote '%s'" msgstr "没有此远程 '%s'" #: builtin/remote.c:1407 -#, fuzzy msgid "add branch" -msgstr "位于分支 " +msgstr "添加分支" #: builtin/remote.c:1414 msgid "no remote specified" @@ -7641,16 +7714,15 @@ msgstr "未指定远程" #: builtin/remote.c:1436 msgid "manipulate push URLs" -msgstr "" +msgstr "操作推送 URLS" #: builtin/remote.c:1438 msgid "add URL" -msgstr "" +msgstr "添加 URL" #: builtin/remote.c:1440 -#, fuzzy msgid "delete URLs" -msgstr "删除" +msgstr "删除 URLS" #: builtin/remote.c:1447 msgid "--add --delete doesn't make sense" @@ -7672,53 +7744,52 @@ msgstr "将不会删除所有非推送URL地址" #: builtin/remote.c:1569 msgid "be verbose; must be placed before a subcommand" -msgstr "" +msgstr "冗长输出；必须置于子命令之前" #: builtin/replace.c:17 msgid "git replace [-f] <object> <replacement>" -msgstr "" +msgstr "git replace [-f] <对象> <替换物>" #: builtin/replace.c:18 msgid "git replace -d <object>..." -msgstr "" +msgstr "git replace -d <对象>..." #: builtin/replace.c:19 msgid "git replace -l [<pattern>]" -msgstr "" +msgstr "git replace -l [<模式>]" -#: builtin/replace.c:118 +#: builtin/replace.c:121 msgid "list replace refs" -msgstr "" +msgstr "列出替换的引用" -#: builtin/replace.c:119 +#: builtin/replace.c:122 msgid "delete replace refs" -msgstr "" +msgstr "删除替换的引用" -#: builtin/replace.c:120 +#: builtin/replace.c:123 msgid "replace the ref if it exists" -msgstr "" +msgstr "如果存在则替换引用" #: builtin/rerere.c:11 msgid "git rerere [clear | forget path... | status | remaining | diff | gc]" -msgstr "" +msgstr "git rerere [clear | forget path... | status | remaining | diff | gc]" #: builtin/rerere.c:56 -#, fuzzy msgid "register clean resolutions in index" -msgstr "%s：已经存在于索引中" +msgstr "在索引中注册干净的解决方案" #: builtin/reset.c:25 msgid "" "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<commit>]" -msgstr "" +msgstr "git reset [--mixed | --soft | --hard | --merge | --keep] [-q] [<提交>]" #: builtin/reset.c:26 -msgid "git reset [-q] <commit> [--] <paths>..." -msgstr "" +msgid "git reset [-q] <tree-ish> [--] <paths>..." +msgstr "git reset [-q] <树或提交> [--] <路径>..." #: builtin/reset.c:27 -msgid "git reset --patch [<commit>] [--] [<paths>...]" -msgstr "" +msgid "git reset --patch [<tree-ish>] [--] [<paths>...]" +msgstr "git reset --patch [<树或提交>] [--] [<路径>...]" #: builtin/reset.c:33 msgid "mixed" @@ -7740,104 +7811,109 @@ msgstr "合并" msgid "keep" msgstr "保持" -#: builtin/reset.c:77 +#: builtin/reset.c:73 msgid "You do not have a valid HEAD." msgstr "您没有一个有效的 HEAD。" -#: builtin/reset.c:79 +#: builtin/reset.c:75 msgid "Failed to find tree of HEAD." msgstr "无法找到 HEAD 指向的树。" -#: builtin/reset.c:85 +#: builtin/reset.c:81 #, c-format msgid "Failed to find tree of %s." msgstr "无法找到 %s 指向的树。" -#: builtin/reset.c:96 -msgid "Could not write new index file." -msgstr "不能写入新的索引文件。" - -#: builtin/reset.c:106 +#: builtin/reset.c:98 #, c-format msgid "HEAD is now at %s" msgstr "HEAD 现在位于 %s" -#: builtin/reset.c:130 -msgid "Could not read index" -msgstr "不能读取索引" - -#: builtin/reset.c:133 -msgid "Unstaged changes after reset:" -msgstr "重置后撤出暂存区的变更：" - # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:223 +#: builtin/reset.c:169 #, c-format msgid "Cannot do a %s reset in the middle of a merge." msgstr "在合并过程中不能做%s重置操作。" -#: builtin/reset.c:238 +#: builtin/reset.c:248 msgid "be quiet, only report errors" -msgstr "" +msgstr "安静模式，只报告错误" -#: builtin/reset.c:240 +#: builtin/reset.c:250 msgid "reset HEAD and index" -msgstr "" +msgstr "重置 HEAD 和索引" -#: builtin/reset.c:241 +#: builtin/reset.c:251 msgid "reset only HEAD" -msgstr "" +msgstr "只重置 HEAD" -#: builtin/reset.c:243 builtin/reset.c:245 +#: builtin/reset.c:253 builtin/reset.c:255 msgid "reset HEAD, index and working tree" -msgstr "" +msgstr "重置 HEAD、索引和工作区" -#: builtin/reset.c:247 +#: builtin/reset.c:257 msgid "reset HEAD but keep local changes" -msgstr "" +msgstr "重置 HEAD 但保存本地变更" -#: builtin/reset.c:303 +#: builtin/reset.c:275 +#, c-format +msgid "Failed to resolve '%s' as a valid revision." +msgstr "无法将 '%s' 解析为一个有效的版本。" + +#: builtin/reset.c:278 builtin/reset.c:286 #, c-format msgid "Could not parse object '%s'." msgstr "不能解析对象 '%s'。" -#: builtin/reset.c:308 +#: builtin/reset.c:283 +#, c-format +msgid "Failed to resolve '%s' as a valid tree." +msgstr "无法将 '%s' 解析为一个有效的树对象。" + +#: builtin/reset.c:292 msgid "--patch is incompatible with --{hard,mixed,soft}" -msgstr "--patch 与 --{hard,mixed,soft} 不兼容" +msgstr "--patch 与 --{hard、mixed、soft} 选项不兼容" -#: builtin/reset.c:317 +#: builtin/reset.c:301 msgid "--mixed with paths is deprecated; use 'git reset -- <paths>' instead." msgstr "--mixed 带路径已弃用，而是用 'git reset -- <paths>'。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:319 +#: builtin/reset.c:303 #, c-format msgid "Cannot do %s reset with paths." msgstr "不能带路径进行%s重置。" # 译者：汉字之间无空格，故删除%s前后空格 -#: builtin/reset.c:331 +#: builtin/reset.c:313 #, c-format msgid "%s reset is not allowed in a bare repository" msgstr "不能对裸版本库进行%s重置" -#: builtin/reset.c:347 +#: builtin/reset.c:333 #, c-format msgid "Could not reset index file to revision '%s'." msgstr "不能重置索引文件至版本 '%s'。" +#: builtin/reset.c:339 +msgid "Unstaged changes after reset:" +msgstr "重置后撤出暂存区的变更：" + +#: builtin/reset.c:344 +msgid "Could not write new index file." +msgstr "不能写入新的索引文件。" + #: builtin/rev-parse.c:339 -#, fuzzy msgid "git rev-parse --parseopt [options] -- [<args>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git rev-parse --parseopt [选项] -- [<参数>...]" #: builtin/rev-parse.c:344 msgid "keep the `--` passed as an arg" -msgstr "" +msgstr "保持 `--` 作为一个参数传递" #: builtin/rev-parse.c:346 msgid "stop parsing after the first non-option argument" -msgstr "" +msgstr "遇到第一个非选项参数后停止解析" #: builtin/rev-parse.c:464 msgid "" @@ -7847,23 +7923,27 @@ msgid "" "\n" "Run \"git rev-parse --parseopt -h\" for more information on the first usage." msgstr "" +"git rev-parse --parseopt [选项] -- [<参数>...]\n" +" 或者：git rev-parse --sq-quote [<选项>...]\n" +" 或者：git rev-parse [options] [<选项>...]\n" +"\n" +"初次使用时执行 \"git rev-parse --parseopt -h\" 来获得更多信息。" #: builtin/revert.c:22 msgid "git revert [options] <commit-ish>" -msgstr "" +msgstr "git revert [选项] <提交号>" #: builtin/revert.c:23 msgid "git revert <subcommand>" -msgstr "" +msgstr "git revert <子命令>" #: builtin/revert.c:28 msgid "git cherry-pick [options] <commit-ish>" -msgstr "" +msgstr "git cherry-pick [选项] <提交号>" #: builtin/revert.c:29 -#, fuzzy msgid "git cherry-pick <subcommand>" -msgstr "拣选失败" +msgstr "git cherry-pick <子命令>" #: builtin/revert.c:70 builtin/revert.c:92 #, c-format @@ -7872,68 +7952,59 @@ msgstr "%s：%s 不能和 %s 同时使用" #: builtin/revert.c:103 msgid "end revert or cherry-pick sequence" -msgstr "" +msgstr "终止反转或拣选操作" #: builtin/revert.c:104 msgid "resume revert or cherry-pick sequence" -msgstr "" +msgstr "继续反转或拣选操作" #: builtin/revert.c:105 msgid "cancel revert or cherry-pick sequence" -msgstr "" +msgstr "取消反转或拣选操作" #: builtin/revert.c:106 -#, fuzzy msgid "don't automatically commit" -msgstr "不能作为初始提交还原" +msgstr "不要自动提交" #: builtin/revert.c:107 -#, fuzzy msgid "edit the commit message" -msgstr "空提交信息。" +msgstr "编辑提交说明" #: builtin/revert.c:110 msgid "parent number" -msgstr "" +msgstr "父编号" #: builtin/revert.c:112 -#, fuzzy msgid "merge strategy" -msgstr "尝试合并策略 %s...\n" +msgstr "合并策略" #: builtin/revert.c:113 -#, fuzzy msgid "option" -msgstr "动作" +msgstr "选项" #: builtin/revert.c:114 -#, fuzzy msgid "option for merge strategy" -msgstr "尝试合并策略 %s...\n" +msgstr "合并策略的选项" #: builtin/revert.c:125 msgid "append commit name" -msgstr "" +msgstr "追加提交名称" #: builtin/revert.c:126 -#, fuzzy msgid "allow fast-forward" -msgstr "（非快进式）" +msgstr "允许快进式" #: builtin/revert.c:127 -#, fuzzy msgid "preserve initially empty commits" -msgstr "不能作为初始提交还原" +msgstr "保留初始化的空提交" #: builtin/revert.c:128 -#, fuzzy msgid "allow commits with empty messages" -msgstr "提交说明为空" +msgstr "允许提交说明为空" #: builtin/revert.c:129 -#, fuzzy msgid "keep redundant, empty commits" -msgstr "合并未返回提交" +msgstr "保持多余的、空的提交" #: builtin/revert.c:133 msgid "program error" @@ -7947,12 +8018,20 @@ msgstr "还原失败" msgid "cherry-pick failed" msgstr "拣选失败" -#: builtin/rm.c:14 -#, fuzzy +#: builtin/rm.c:15 msgid "git rm [options] [--] <file>..." -msgstr "git apply [选项] [<补丁>...]" +msgstr "git rm [选项] [--] <文件>..." + +#: builtin/rm.c:64 builtin/rm.c:186 +#, c-format +msgid "" +"submodule '%s' (or one of its nested submodules) uses a .git directory\n" +"(use 'rm -rf' if you really want to remove it including all of its history)" +msgstr "" +"子模组 '%s'（或者它的一个嵌套子模组）使用一个 .git 目录\n" +"（使用 'rm -rf' 命令如果您真的想删除它及其全部历史）" -#: builtin/rm.c:109 +#: builtin/rm.c:174 #, c-format msgid "" "'%s' has staged content different from both the file and the HEAD\n" @@ -7961,7 +8040,7 @@ msgstr "" "'%s' 暂存的内容和工作区及 HEAD 中的都不一样\n" "（使用 -f 强制删除）" -#: builtin/rm.c:115 +#: builtin/rm.c:180 #, c-format msgid "" "'%s' has changes staged in the index\n" @@ -7970,7 +8049,7 @@ msgstr "" "'%s' 有变更已暂存至索引中\n" "（使用 --cached 保存文件，或用 -f 强制删除）" -#: builtin/rm.c:119 +#: builtin/rm.c:191 #, c-format msgid "" "'%s' has local modifications\n" @@ -7979,66 +8058,64 @@ msgstr "" "'%s' 有本地修改\n" "（使用 --cached 保存文件，或用 -f 强制删除）" -#: builtin/rm.c:134 -#, fuzzy +#: builtin/rm.c:207 msgid "do not list removed files" -msgstr "无法还原修改的文件" +msgstr "不列出删除的文件" -#: builtin/rm.c:135 -#, fuzzy +#: builtin/rm.c:208 msgid "only remove from the index" -msgstr "不能从索引中移除 %s" +msgstr "只从索引区删除" -#: builtin/rm.c:136 +#: builtin/rm.c:209 msgid "override the up-to-date check" -msgstr "" +msgstr "忽略文件更新状态检查" -#: builtin/rm.c:137 +#: builtin/rm.c:210 msgid "allow recursive removal" -msgstr "" +msgstr "允许递归删除" -#: builtin/rm.c:139 +#: builtin/rm.c:212 msgid "exit with a zero status even if nothing matched" -msgstr "" +msgstr "即使没有匹配，也以零状态退出" -#: builtin/rm.c:194 +#: builtin/rm.c:283 #, c-format msgid "not removing '%s' recursively without -r" msgstr "未提供 -r 选项不会递归删除 '%s'" -#: builtin/rm.c:230 +#: builtin/rm.c:322 #, c-format msgid "git rm: unable to remove %s" msgstr "git rm：不能删除 %s" #: builtin/shortlog.c:13 msgid "git shortlog [-n] [-s] [-e] [-w] [rev-opts] [--] [<commit-id>... ]" -msgstr "" +msgstr "git shortlog [-n] [-s] [-e] [-w] [版本选项] [--] [<提交号>... ]" -#: builtin/shortlog.c:157 +#: builtin/shortlog.c:133 #, c-format msgid "Missing author: %s" msgstr "缺少作者：%s" -#: builtin/shortlog.c:253 +#: builtin/shortlog.c:229 msgid "sort output according to the number of commits per author" -msgstr "" +msgstr "根据每个作者的提交数量排序" -#: builtin/shortlog.c:255 +#: builtin/shortlog.c:231 msgid "Suppress commit descriptions, only provides commit count" -msgstr "" +msgstr "隐藏提交说明，只提供提交数量" -#: builtin/shortlog.c:257 +#: builtin/shortlog.c:233 msgid "Show the email address of each author" -msgstr "" +msgstr "显示每个作者的电子邮件地址" -#: builtin/shortlog.c:258 +#: builtin/shortlog.c:234 msgid "w[,i1[,i2]]" -msgstr "" +msgstr "w[,i1[,i2]]" -#: builtin/shortlog.c:259 +#: builtin/shortlog.c:235 msgid "Linewrap output" -msgstr "" +msgstr "折行输出" #: builtin/show-branch.c:9 msgid "" @@ -8047,162 +8124,171 @@ msgid "" "independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " "<glob>)...]" msgstr "" +"git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--" +"current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --" +"independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | " +"<glob>)...]" #: builtin/show-branch.c:10 msgid "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" -msgstr "" +msgstr "git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]" #: builtin/show-branch.c:651 -#, fuzzy msgid "show remote-tracking and local branches" -msgstr "%s 没有来自 %s 的远程跟踪分支" +msgstr "显示远程跟踪的和本地的分支" #: builtin/show-branch.c:653 -#, fuzzy msgid "show remote-tracking branches" -msgstr "%s 没有来自 %s 的远程跟踪分支" +msgstr "显示远程跟踪的分支" #: builtin/show-branch.c:655 msgid "color '*!+-' corresponding to the branch" -msgstr "" +msgstr "着色 '*!+-' 到相应的分支" #: builtin/show-branch.c:657 msgid "show <n> more commits after the common ancestor" -msgstr "" +msgstr "显示共同祖先后的 <n> 个提交" #: builtin/show-branch.c:659 msgid "synonym to more=-1" -msgstr "" +msgstr "和 more=-1 同义" #: builtin/show-branch.c:660 msgid "suppress naming strings" -msgstr "" +msgstr "不显示字符串命名" #: builtin/show-branch.c:662 -#, fuzzy msgid "include the current branch" -msgstr "没有当前分支。" +msgstr "包括当前分支" #: builtin/show-branch.c:664 -#, fuzzy msgid "name commits with their object names" -msgstr "不能写注解对象" +msgstr "以对象名字命名提交" #: builtin/show-branch.c:666 msgid "show possible merge bases" -msgstr "" +msgstr "显示可能合并的基线" #: builtin/show-branch.c:668 msgid "show refs unreachable from any other ref" -msgstr "" +msgstr "显示没有任何引用的的引用" #: builtin/show-branch.c:670 msgid "show commits in topological order" -msgstr "" +msgstr "以拓扑顺序显示提交" #: builtin/show-branch.c:672 msgid "show only commits not on the first branch" -msgstr "" +msgstr "只显示不在第一个分支上的提交" #: builtin/show-branch.c:674 msgid "show merges reachable from only one tip" -msgstr "" +msgstr "显示仅一个分支可访问的合并提交" #: builtin/show-branch.c:676 msgid "show commits where no parent comes before its children" -msgstr "" +msgstr "显示提交时以时间为序且父提交不能领先子提交" #: builtin/show-branch.c:678 msgid "<n>[,<base>]" -msgstr "" +msgstr "<n>[,<base>]" #: builtin/show-branch.c:679 msgid "show <n> most recent ref-log entries starting at base" -msgstr "" +msgstr "显示从 base 开始的 <n> 条最近的引用日志记录" #: builtin/show-ref.c:10 msgid "" -"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--hash" -"[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " msgstr "" +"git show-ref [-q|--quiet] [--verify] [--head] [-d|--dereference] [-s|--" +"hash[=<n>]] [--abbrev[=<n>]] [--tags] [--heads] [--] [pattern*] " #: builtin/show-ref.c:11 msgid "git show-ref --exclude-existing[=pattern] < ref-list" -msgstr "" +msgstr "git show-ref --exclude-existing[=模式] < 引用列表" -#: builtin/show-ref.c:182 -#, fuzzy +#: builtin/show-ref.c:165 msgid "only show tags (can be combined with heads)" -msgstr "--all 不能和引用表达式同时使用" +msgstr "只显示 tags（可以和头共用）" -#: builtin/show-ref.c:183 -#, fuzzy +#: builtin/show-ref.c:166 msgid "only show heads (can be combined with tags)" -msgstr "--all 不能和引用表达式同时使用" +msgstr "只显示头（可以和 tags 共用）" -#: builtin/show-ref.c:184 +#: builtin/show-ref.c:167 msgid "stricter reference checking, requires exact ref path" -msgstr "" +msgstr "更严格的引用检测，需要精确的引用路径" -#: builtin/show-ref.c:187 builtin/show-ref.c:189 +#: builtin/show-ref.c:170 builtin/show-ref.c:172 msgid "show the HEAD reference" -msgstr "" +msgstr "显示 HEAD 引用" -#: builtin/show-ref.c:191 -#, fuzzy +#: builtin/show-ref.c:174 msgid "dereference tags into object IDs" -msgstr "引用不是一个树：%s" +msgstr "转换 tags 到对象ID" -#: builtin/show-ref.c:193 +#: builtin/show-ref.c:176 msgid "only show SHA1 hash using <n> digits" -msgstr "" +msgstr "只显示使用 <n> 个数字的 SHA1 哈希" -#: builtin/show-ref.c:197 +#: builtin/show-ref.c:180 msgid "do not print results to stdout (useful with --verify)" -msgstr "" +msgstr "不打印结果到标准输出（例如与 --verify 参数共用）" -#: builtin/show-ref.c:199 +#: builtin/show-ref.c:182 msgid "show refs from stdin that aren't in local repository" -msgstr "" +msgstr "显示从标准输入中读入的不在本地版本库中的引用" #: builtin/symbolic-ref.c:7 msgid "git symbolic-ref [options] name [ref]" -msgstr "" +msgstr "git symbolic-ref [选项] 名称 [引用]" -#: builtin/symbolic-ref.c:38 +#: builtin/symbolic-ref.c:8 +msgid "git symbolic-ref -d [-q] name" +msgstr "git symbolic-ref -d [-q] 名称" + +#: builtin/symbolic-ref.c:40 msgid "suppress error message for non-symbolic (detached) refs" -msgstr "" +msgstr "不显示非符号（分离的）引用的错误信息" + +#: builtin/symbolic-ref.c:41 +msgid "delete symbolic ref" +msgstr "删除符号引用" -#: builtin/symbolic-ref.c:39 +#: builtin/symbolic-ref.c:42 msgid "shorten ref output" -msgstr "" +msgstr "简短的引用输出" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason" -msgstr "" +msgstr "原因" -#: builtin/symbolic-ref.c:40 builtin/update-ref.c:18 +#: builtin/symbolic-ref.c:43 builtin/update-ref.c:18 msgid "reason of the update" -msgstr "" +msgstr "更新的原因" #: builtin/tag.c:22 msgid "" "git tag [-a|-s|-u <key-id>] [-f] [-m <msg>|-F <file>] <tagname> [<head>]" -msgstr "" +msgstr "git tag [-a|-s|-u <key-id>] [-f] [-m <说明>|-F <文件>] <标签名> [<头>]" #: builtin/tag.c:23 msgid "git tag -d <tagname>..." -msgstr "" +msgstr "git tag -d <标签名>..." #: builtin/tag.c:24 msgid "" "git tag -l [-n[<num>]] [--contains <commit>] [--points-at <object>] \n" "\t\t[<pattern>...]" msgstr "" +"git tag -l [-n[<num>]] [--contains <提交>] [--points-at <对象>] \n" +"\t\t[<模式>...]" #: builtin/tag.c:26 msgid "git tag -v <tagname>..." -msgstr "" +msgstr "git tag -v <标签名>..." #: builtin/tag.c:60 #, c-format @@ -8230,354 +8316,338 @@ msgid "could not verify the tag '%s'" msgstr "不能校验 tag '%s'" #: builtin/tag.c:249 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be ignored.\n" -"#\n" +"Write a tag message\n" +"Lines starting with '%c' will be ignored.\n" msgstr "" "\n" -"#\n" -"# 输入一个 tag 说明\n" -"# 以 '#' 开头的行将被忽略。\n" -"#\n" +"输入一个 tag 说明\n" +"以 '%c' 开头的行将被忽略。\n" -#: builtin/tag.c:256 +#: builtin/tag.c:253 +#, c-format msgid "" "\n" -"#\n" -"# Write a tag message\n" -"# Lines starting with '#' will be kept; you may remove them yourself if you " +"Write a tag message\n" +"Lines starting with '%c' will be kept; you may remove them yourself if you " "want to.\n" -"#\n" msgstr "" "\n" -"#\n" -"# 输入一个 tag 说明\n" -"# 以 '#' 开头的行将被忽略，您可以删除它们如果您想这样做。\n" -"#\n" +"输入一个 tag 说明\n" +"以 '%c' 开头的行将被保留，如果您愿意也可以删除它们。\n" -#: builtin/tag.c:298 +#: builtin/tag.c:292 msgid "unable to sign the tag" msgstr "无法签署 tag" -#: builtin/tag.c:300 +#: builtin/tag.c:294 msgid "unable to write tag file" msgstr "无法写 tag 文件" -#: builtin/tag.c:325 +#: builtin/tag.c:319 msgid "bad object type." msgstr "坏的对象类型。" -#: builtin/tag.c:338 +#: builtin/tag.c:332 msgid "tag header too big." msgstr "tag 头信息太大。" -#: builtin/tag.c:370 +#: builtin/tag.c:368 msgid "no tag message?" msgstr "无 tag 说明？" -#: builtin/tag.c:376 +#: builtin/tag.c:374 #, c-format msgid "The tag message has been left in %s\n" msgstr "tag 说明被保留在 %s\n" -#: builtin/tag.c:425 +#: builtin/tag.c:423 msgid "switch 'points-at' requires an object" msgstr "开关 'points-at' 需要一个对象" -#: builtin/tag.c:427 +#: builtin/tag.c:425 #, c-format msgid "malformed object name '%s'" msgstr "非法的对象名 '%s'" -#: builtin/tag.c:447 +#: builtin/tag.c:445 msgid "list tag names" -msgstr "" +msgstr "列出tag名称" -#: builtin/tag.c:449 +#: builtin/tag.c:447 msgid "print <n> lines of each tag message" -msgstr "" +msgstr "每个 tag 信息打印 <n> 行" -#: builtin/tag.c:451 -#, fuzzy +#: builtin/tag.c:449 msgid "delete tags" -msgstr "删除" +msgstr "删除 tags" -#: builtin/tag.c:452 +#: builtin/tag.c:450 msgid "verify tags" -msgstr "" +msgstr "验证 tags" -#: builtin/tag.c:454 +#: builtin/tag.c:452 msgid "Tag creation options" -msgstr "" +msgstr "Tag 创建选项" -#: builtin/tag.c:456 -#, fuzzy +#: builtin/tag.c:454 msgid "annotated tag, needs a message" -msgstr "注释 tag %s 没有嵌入名称" +msgstr "注解 tag，需要一个说明" -#: builtin/tag.c:458 -#, fuzzy +#: builtin/tag.c:456 msgid "tag message" -msgstr "无 tag 说明？" +msgstr "tag 说明" -#: builtin/tag.c:460 +#: builtin/tag.c:458 msgid "annotated and GPG-signed tag" -msgstr "" +msgstr "注解并 GPG 签名的 tag" -#: builtin/tag.c:464 -#, fuzzy +#: builtin/tag.c:462 msgid "use another key to sign the tag" -msgstr "无法签署 tag" +msgstr "使用另外的私钥签名 tag" -#: builtin/tag.c:465 +#: builtin/tag.c:463 msgid "replace the tag if exists" -msgstr "" +msgstr "如果存在，替换现有的 tag" -#: builtin/tag.c:466 +#: builtin/tag.c:464 msgid "show tag list in columns" -msgstr "" +msgstr "以列的方式显示 tag" -#: builtin/tag.c:468 +#: builtin/tag.c:466 msgid "Tag listing options" -msgstr "" +msgstr "Tag 列表选项" -#: builtin/tag.c:471 +#: builtin/tag.c:469 msgid "print only tags that contain the commit" -msgstr "" +msgstr "只打印包含提交的tags" -#: builtin/tag.c:477 +#: builtin/tag.c:475 msgid "print only tags of the object" -msgstr "" +msgstr "只打印tags对象" -#: builtin/tag.c:506 +#: builtin/tag.c:504 msgid "--column and -n are incompatible" msgstr "--column 和 -n 不兼容" -#: builtin/tag.c:523 +#: builtin/tag.c:521 msgid "-n option is only allowed with -l." msgstr "-n 选项只允许和 -l 同时使用。" -#: builtin/tag.c:525 +#: builtin/tag.c:523 msgid "--contains option is only allowed with -l." msgstr "--contains 选项只允许和 -l 同时使用。" -#: builtin/tag.c:527 +#: builtin/tag.c:525 msgid "--points-at option is only allowed with -l." msgstr "--points-at 选项只允许和 -l 同时使用。" -#: builtin/tag.c:535 +#: builtin/tag.c:533 msgid "only one -F or -m option is allowed." msgstr "只允许一个 -F 或 -m 选项。" -#: builtin/tag.c:555 +#: builtin/tag.c:553 msgid "too many params" msgstr "太多参数" -#: builtin/tag.c:561 +#: builtin/tag.c:559 #, c-format msgid "'%s' is not a valid tag name." msgstr "'%s' 不是一个有效的tag名称。" -#: builtin/tag.c:566 +#: builtin/tag.c:564 #, c-format msgid "tag '%s' already exists" msgstr "tag '%s' 已存在" -#: builtin/tag.c:584 +#: builtin/tag.c:582 #, c-format msgid "%s: cannot lock the ref" msgstr "%s：不能锁定引用" -#: builtin/tag.c:586 +#: builtin/tag.c:584 #, c-format msgid "%s: cannot update the ref" msgstr "%s：不能更新引用" -#: builtin/tag.c:588 +#: builtin/tag.c:586 #, c-format msgid "Updated tag '%s' (was %s)\n" msgstr "已更新tag '%s'（曾为 %s）\n" #: builtin/update-index.c:401 -#, fuzzy msgid "git update-index [options] [--] [<file>...]" -msgstr "git apply [选项] [<补丁>...]" +msgstr "git update-index [选项] [--] [<文件>...]" -#: builtin/update-index.c:717 +#: builtin/update-index.c:718 msgid "continue refresh even when index needs update" -msgstr "" +msgstr "当索引需要更新时继续刷新" -#: builtin/update-index.c:720 +#: builtin/update-index.c:721 msgid "refresh: ignore submodules" -msgstr "" +msgstr "刷新：忽略子模组" -#: builtin/update-index.c:723 -#, fuzzy +#: builtin/update-index.c:724 msgid "do not ignore new files" -msgstr "无法存储索引文件" +msgstr "不忽略新的文件" -#: builtin/update-index.c:725 +#: builtin/update-index.c:726 msgid "let files replace directories and vice-versa" -msgstr "" +msgstr "让文件替换目录（反之亦然）" -#: builtin/update-index.c:727 +#: builtin/update-index.c:728 msgid "notice files missing from worktree" -msgstr "" +msgstr "通知文件从工作区丢失" -#: builtin/update-index.c:729 +#: builtin/update-index.c:730 msgid "refresh even if index contains unmerged entries" -msgstr "" +msgstr "即使索引区包含未合并的条目也执行刷新" -#: builtin/update-index.c:732 +#: builtin/update-index.c:733 msgid "refresh stat information" -msgstr "" +msgstr "刷新统计信息" -#: builtin/update-index.c:736 +#: builtin/update-index.c:737 msgid "like --refresh, but ignore assume-unchanged setting" -msgstr "" +msgstr "类似于 --refresh，但是忽略 assume-unchanged 设置" -#: builtin/update-index.c:740 +#: builtin/update-index.c:741 msgid "<mode> <object> <path>" -msgstr "" +msgstr "<mode> <object> <path>" -#: builtin/update-index.c:741 -#, fuzzy +#: builtin/update-index.c:742 msgid "add the specified entry to the index" -msgstr "添加文件内容至索引" +msgstr "添加指定的条目到索引区" -#: builtin/update-index.c:745 +#: builtin/update-index.c:746 msgid "(+/-)x" -msgstr "" +msgstr "(+/-)x" -#: builtin/update-index.c:746 +#: builtin/update-index.c:747 msgid "override the executable bit of the listed files" -msgstr "" +msgstr "覆盖列表里文件的可执行位" -#: builtin/update-index.c:750 +#: builtin/update-index.c:751 msgid "mark files as \"not changing\"" -msgstr "" +msgstr "把文件标记为 \"没有变更\"" -#: builtin/update-index.c:753 +#: builtin/update-index.c:754 msgid "clear assumed-unchanged bit" -msgstr "" +msgstr "清除 assumed-unchanged 位" -#: builtin/update-index.c:756 +#: builtin/update-index.c:757 msgid "mark files as \"index-only\"" -msgstr "" +msgstr "把文件标记为 \"仅索引\"" -#: builtin/update-index.c:759 +#: builtin/update-index.c:760 msgid "clear skip-worktree bit" -msgstr "" +msgstr "清除 skip-worktree 位" -#: builtin/update-index.c:762 +#: builtin/update-index.c:763 msgid "add to index only; do not add content to object database" -msgstr "" +msgstr "只添加到索引区；不添加对象到对象库" -#: builtin/update-index.c:764 +#: builtin/update-index.c:765 msgid "remove named paths even if present in worktree" -msgstr "" +msgstr "即使存在工作区里，也删除路径" -#: builtin/update-index.c:766 +#: builtin/update-index.c:767 msgid "with --stdin: input lines are terminated by null bytes" -msgstr "" +msgstr "携带 --stdin：输入的行以 null 字符终止" -#: builtin/update-index.c:768 -#, fuzzy +#: builtin/update-index.c:769 msgid "read list of paths to be updated from standard input" -msgstr "（正从标准输入中读取日志信息）\n" +msgstr "从标准输入中读取需要更新的路径列表" -#: builtin/update-index.c:772 -#, fuzzy +#: builtin/update-index.c:773 msgid "add entries from standard input to the index" -msgstr "不能从标准输入中读取日志信息" +msgstr "从标准输入添加条目到索引区" -#: builtin/update-index.c:776 +#: builtin/update-index.c:777 msgid "repopulate stages #2 and #3 for the listed paths" -msgstr "" +msgstr "为指定文件重新生成第2和第3暂存区" -#: builtin/update-index.c:780 +#: builtin/update-index.c:781 msgid "only update entries that differ from HEAD" -msgstr "" +msgstr "只更新与 HEAD 不同的条目" -#: builtin/update-index.c:784 +#: builtin/update-index.c:785 msgid "ignore files missing from worktree" -msgstr "" +msgstr "忽略工作区丢失的文件" -#: builtin/update-index.c:787 +#: builtin/update-index.c:788 msgid "report actions to standard output" -msgstr "" +msgstr "在标准输出显示操作" -#: builtin/update-index.c:789 +#: builtin/update-index.c:790 msgid "(for porcelains) forget saved unresolved conflicts" -msgstr "" +msgstr "(for porcelains) 忘记保存的未解决的冲突" -#: builtin/update-index.c:793 +#: builtin/update-index.c:794 msgid "write index in this format" -msgstr "" +msgstr "以这种格式写入索引区" #: builtin/update-ref.c:7 msgid "git update-ref [options] -d <refname> [<oldval>]" -msgstr "" +msgstr "git update-ref [options] -d <引用名> [<旧值>]" #: builtin/update-ref.c:8 msgid "git update-ref [options] <refname> <newval> [<oldval>]" -msgstr "" +msgstr "git update-ref [options] <引用名> <新值> [<旧值>]" #: builtin/update-ref.c:19 msgid "delete the reference" -msgstr "" +msgstr "删除引用" #: builtin/update-ref.c:21 msgid "update <refname> not the one it points to" -msgstr "" +msgstr "更新 <引用名> 本身而不是它指向的引用" #: builtin/update-server-info.c:6 msgid "git update-server-info [--force]" -msgstr "" +msgstr "git update-server-info [--force]" #: builtin/update-server-info.c:14 msgid "update the info files from scratch" -msgstr "" +msgstr "从头开始更新文件信息" #: builtin/verify-pack.c:56 msgid "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." -msgstr "" +msgstr "git verify-pack [-v|--verbose] [-s|--stat-only] <pack>..." #: builtin/verify-pack.c:66 -#, fuzzy msgid "verbose" msgstr "冗长输出" #: builtin/verify-pack.c:68 msgid "show statistics only" -msgstr "" +msgstr "只显示统计" #: builtin/verify-tag.c:17 msgid "git verify-tag [-v|--verbose] <tag>..." -msgstr "" +msgstr "git verify-tag [-v|--verbose] <tag>..." #: builtin/verify-tag.c:73 msgid "print tag contents" -msgstr "" +msgstr "打印 tag 内容" #: builtin/write-tree.c:13 msgid "git write-tree [--missing-ok] [--prefix=<prefix>/]" -msgstr "" +msgstr "git write-tree [--missing-ok] [--prefix=<前缀>/]" #: builtin/write-tree.c:26 msgid "<prefix>/" -msgstr "" +msgstr "<前缀>/" #: builtin/write-tree.c:27 msgid "write tree object for a subdirectory <prefix>" -msgstr "" +msgstr "将 <前缀> 子目录内容写到一个树对象" #: builtin/write-tree.c:30 msgid "only useful for debugging" -msgstr "" +msgstr "只对调试有用" #: git.c:16 msgid "See 'git help <command>' for more information on a specific command." @@ -8587,15 +8657,15 @@ msgstr "参见 'git help <command>' 以获得该特定命令的详细信息。" msgid "no-op (backward compatibility)" msgstr "空操作（向后兼容）" -#: parse-options.h:228 +#: parse-options.h:232 msgid "be more verbose" msgstr "更加详细" -#: parse-options.h:230 +#: parse-options.h:234 msgid "be more quiet" msgstr "更加安静" -#: parse-options.h:236 +#: parse-options.h:240 msgid "use <n> digits to display SHA-1s" msgstr "用 <n> 位数字显示 SHA-1 哈希值" @@ -8636,8 +8706,8 @@ msgid "Print lines matching a pattern" msgstr "输出和模式匹配的行" #: common-cmds.h:17 -msgid "Create an empty git repository or reinitialize an existing one" -msgstr "创建一个空的 git 版本库或者重新初始化一个" +msgid "Create an empty Git repository or reinitialize an existing one" +msgstr "创建一个空的 Git 版本库或重新初始化一个已存在的版本库" #: common-cmds.h:18 msgid "Show commit logs" @@ -8710,11 +8780,11 @@ msgstr "无法求助于三路合并。" #: git-am.sh:137 msgid "Repository lacks necessary blobs to fall back on 3-way merge." -msgstr "版本库缺乏必要的二进制对象（blob）以进行三路合并。" +msgstr "版本库缺乏必要的数据（blob）对象以进行三路合并。" #: git-am.sh:139 msgid "Using index info to reconstruct a base tree..." -msgstr "更新索引信息以重建基树..." +msgstr "使用索引来重建一个（三路合并的）基础目录树..." #: git-am.sh:154 msgid "" @@ -8722,7 +8792,7 @@ msgid "" "It does not apply to blobs recorded in its index." msgstr "" "您是否曾手动编辑过您的补丁？\n" -"无法应用补丁到索引中的二进制对象（blob）上。" +"无法应用补丁到索引中的数据（blob）对象上。" #: git-am.sh:163 msgid "Falling back to patching base and 3-way merge..." @@ -8825,7 +8895,7 @@ msgstr "您的索引中仍有未合并的路径。您是否忘了执行 'git add #: git-am.sh:845 msgid "No changes -- Patch already applied." -msgstr "没有变更 -- 补丁已经应用过。" +msgstr "没有变更 —— 补丁已经应用过。" #: git-am.sh:855 #, sh-format @@ -8838,6 +8908,8 @@ msgid "" "The copy of the patch that failed is found in:\n" " $dotest/patch" msgstr "" +"失败的补丁文件副本位于：\n" +" $dotest/patch" #: git-am.sh:876 msgid "applying to an empty history" @@ -8954,7 +9026,7 @@ msgid "" "Try 'git bisect reset <commit>'." msgstr "" "不能检出原始 HEAD '$branch'。\n" -"尝试 'git bisect reset <commit>'。" +"尝试 'git bisect reset <提交>'。" #: git-bisect.sh:390 msgid "No logfile given" @@ -8981,7 +9053,7 @@ msgid "" "exit code $res from '$command' is < 0 or >= 128" msgstr "" "二分查找运行失败：\n" -"命令 '$command' 的退出码 $res 或者小于 0 或者大于等于 128" +"命令 '$command' 的退出码 $res 小于 0 或大于等于 128" #: git-bisect.sh:453 msgid "bisect run cannot continue any more" @@ -9022,7 +9094,7 @@ msgstr "更新尚未诞生的分支，变更添加至索引" #. 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 +#: git-pull.sh:229 #, sh-format msgid "" "Warning: fetch updated the current branch head.\n" @@ -9032,15 +9104,15 @@ msgstr "" "警告：fetch 更新了当前的分支。您的工作区\n" "警告：从原提交 $orig_head 快进。" -#: git-pull.sh:253 +#: git-pull.sh:254 msgid "Cannot merge multiple branches into empty head" msgstr "无法将多个分支合并到空分支" -#: git-pull.sh:257 +#: git-pull.sh:258 msgid "Cannot rebase onto multiple branches" msgstr "无法变基到多个分支" -#: git-rebase.sh:52 +#: git-rebase.sh:53 msgid "" "When you have resolved this problem, run \"git rebase --continue\".\n" "If you prefer to skip this patch, run \"git rebase --skip\" instead.\n" @@ -9051,27 +9123,31 @@ msgstr "" "如果您想跳过此补丁，则执行 \"git rebase --skip\"。\n" "要恢复原分支并停止变基，执行 \"git rebase --abort\"。" -#: git-rebase.sh:159 +#: git-rebase.sh:160 msgid "The pre-rebase hook refused to rebase." msgstr "钩子 pre-rebase 拒绝变基。" -#: git-rebase.sh:164 +#: git-rebase.sh:165 msgid "It looks like git-am is in progress. Cannot rebase." msgstr "似乎正处于在 git-am 的执行过程中。无法变基。" -#: git-rebase.sh:295 +#: git-rebase.sh:296 msgid "The --exec option must be used with the --interactive option" msgstr "选项 --exec 必须和选项 --interactive 同时使用" -#: git-rebase.sh:300 +#: git-rebase.sh:301 msgid "No rebase in progress?" msgstr "没有正在进行的变基？" -#: git-rebase.sh:313 +#: git-rebase.sh:312 +msgid "The --edit-todo action can only be used during interactive rebase." +msgstr "动作 --edit-todo 只能用在交互式变基过程中。" + +#: git-rebase.sh:319 msgid "Cannot read HEAD" msgstr "不能读取 HEAD" -#: git-rebase.sh:316 +#: git-rebase.sh:322 msgid "" "You must edit all merge conflicts and then\n" "mark them as resolved using git add" @@ -9079,12 +9155,12 @@ msgstr "" "您必须编辑所有的合并冲突，然后通过 git add\n" "命令将它们标记为已解决" -#: git-rebase.sh:334 +#: git-rebase.sh:340 #, sh-format msgid "Could not move back to $head_name" msgstr "无法移回 $head_name" -#: git-rebase.sh:350 +#: git-rebase.sh:359 #, sh-format msgid "" "It seems that there is already a $state_dir_base directory, and\n" @@ -9103,56 +9179,56 @@ msgstr "" "\t$cmd_clear_stale_rebase\n" "然后再重新执行变基。为避免您丢失重要数据，我已经停止当前操作。" -#: git-rebase.sh:395 +#: git-rebase.sh:404 #, sh-format msgid "invalid upstream $upstream_name" msgstr "无效的上游 $upstream_name" -#: git-rebase.sh:419 +#: git-rebase.sh:428 #, sh-format msgid "$onto_name: there are more than one merge bases" msgstr "$onto_name: 有一个以上的合并基准" -#: git-rebase.sh:422 git-rebase.sh:426 +#: git-rebase.sh:431 git-rebase.sh:435 #, sh-format msgid "$onto_name: there is no merge base" msgstr "$onto_name: 没有合并基准" -#: git-rebase.sh:431 +#: git-rebase.sh:440 #, sh-format msgid "Does not point to a valid commit: $onto_name" msgstr "没有指向一个有效的提交：$onto_name" -#: git-rebase.sh:454 +#: git-rebase.sh:463 #, sh-format msgid "fatal: no such branch: $branch_name" msgstr "严重错误：无此分支：$branch_name" -#: git-rebase.sh:474 +#: git-rebase.sh:483 msgid "Please commit or stash them." msgstr "请提交或为它们保存进度。" -#: git-rebase.sh:492 +#: git-rebase.sh:501 #, sh-format msgid "Current branch $branch_name is up to date." msgstr "当前分支 $branch_name 是最新的。" -#: git-rebase.sh:495 +#: git-rebase.sh:504 #, sh-format msgid "Current branch $branch_name is up to date, rebase forced." msgstr "当前分支 $branch_name 是最新的，强制变基。" -#: git-rebase.sh:506 +#: git-rebase.sh:515 #, sh-format msgid "Changes from $mb to $onto:" msgstr "变更从 $mb 到 $onto：" #. Detach HEAD and reset the tree -#: git-rebase.sh:515 +#: git-rebase.sh:524 msgid "First, rewinding head to replay your work on top of it..." msgstr "首先，重置头指针以便在上面重放您的工作..." -#: git-rebase.sh:523 +#: git-rebase.sh:532 #, sh-format msgid "Fast-forwarded $branch_name to $onto_name." msgstr "快进 $branch_name 至 $onto_name。" @@ -9286,37 +9362,37 @@ msgstr "未指定分支名" msgid "(To restore them type \"git stash apply\")" msgstr "（为恢复数据输入 \"git stash apply\"）" -#: git-submodule.sh:88 +#: git-submodule.sh:90 #, sh-format msgid "cannot strip one component off url '$remoteurl'" msgstr "无法从 url '$remoteurl' 剥离一个组件" -#: git-submodule.sh:167 +#: git-submodule.sh:195 #, sh-format msgid "No submodule mapping found in .gitmodules for path '$sm_path'" msgstr "未在 .gitmodules 中发现路径 '$sm_path' 的子模组映射" -#: git-submodule.sh:211 +#: git-submodule.sh:238 #, sh-format msgid "Clone of '$url' into submodule path '$sm_path' failed" msgstr "无法克隆 '$url' 到子模组路径 '$sm_path'" -#: git-submodule.sh:223 +#: git-submodule.sh:250 #, sh-format msgid "Gitdir '$a' is part of the submodule path '$b' or vice versa" -msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或者相反" +msgstr "Gitdir '$a' 在子模组路径 '$b' 之下或相反" -#: git-submodule.sh:312 +#: git-submodule.sh:343 #, sh-format msgid "repo URL: '$repo' must be absolute or begin with ./|../" msgstr "版本库URL：'$repo' 必须是绝对路径或以 ./|../ 起始" -#: git-submodule.sh:329 +#: git-submodule.sh:360 #, sh-format msgid "'$sm_path' already exists in the index" msgstr "'$sm_path' 已经存在于索引中" -#: git-submodule.sh:333 +#: git-submodule.sh:364 #, sh-format msgid "" "The following path is ignored by one of your .gitignore files:\n" @@ -9327,62 +9403,91 @@ msgstr "" "$sm_path\n" "如果您确实想添加它，使用 -f 参数。" -#: git-submodule.sh:344 +#: git-submodule.sh:382 #, sh-format msgid "Adding existing repo at '$sm_path' to the index" msgstr "添加位于 '$sm_path' 的现存版本库到索引" -#: git-submodule.sh:346 +#: git-submodule.sh:384 #, sh-format msgid "'$sm_path' already exists and is not a valid git repo" msgstr "'$sm_path' 已存在且不是一个有效的 git 版本库" -#: git-submodule.sh:360 +#: git-submodule.sh:392 +#, sh-format +msgid "A git directory for '$sm_name' is found locally with remote(s):" +msgstr "本地发现 '$sm_name' 的一个 git 目录，与其对应的远程版本库：" + +#: git-submodule.sh:394 +#, sh-format +msgid "" +"If you want to reuse this local git directory instead of cloning again from" +msgstr "如果您想重用此本地 git 目录而不是重新克隆自" + +#: git-submodule.sh:396 +#, sh-format +msgid "" +"use the '--force' option. If the local git directory is not the correct repo" +msgstr "使用 '--force' 参数。如果本地 git 目录不是正确的版本库" + +#: git-submodule.sh:397 +#, sh-format +msgid "" +"or you are unsure what this means choose another name with the '--name' " +"option." +msgstr "或者您不确定其中含义使用 '--name' 参数选择另外一个名称。" + +#: git-submodule.sh:399 +#, sh-format +msgid "Reactivating local git directory for submodule '$sm_name'." +msgstr "激活本地 git 目录到子模组 '$sm_name'。" + +#: git-submodule.sh:411 #, sh-format msgid "Unable to checkout submodule '$sm_path'" msgstr "不能检出子模组 '$sm_path'" -#: git-submodule.sh:365 +#: git-submodule.sh:416 #, sh-format msgid "Failed to add submodule '$sm_path'" msgstr "无法添加子模组 '$sm_path'" -#: git-submodule.sh:370 +#: git-submodule.sh:425 #, sh-format msgid "Failed to register submodule '$sm_path'" msgstr "无法注册子模组 '$sm_path'" -#: git-submodule.sh:413 +#: git-submodule.sh:468 #, sh-format msgid "Entering '$prefix$sm_path'" msgstr "正在进入 '$prefix$sm_path'" -#: git-submodule.sh:427 +#: git-submodule.sh:482 #, sh-format msgid "Stopping at '$sm_path'; script returned non-zero status." msgstr "停止于 '$sm_path'，脚本返回非零值。" -#: git-submodule.sh:471 +#: git-submodule.sh:526 #, sh-format msgid "No url found for submodule path '$sm_path' in .gitmodules" msgstr "在 .gitmodules 中未找到子模组路径 '$sm_path' 的 url" -#: git-submodule.sh:480 +#: git-submodule.sh:535 #, sh-format msgid "Failed to register url for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册 url" -#: git-submodule.sh:482 +#: git-submodule.sh:537 #, sh-format msgid "Submodule '$name' ($url) registered for path '$sm_path'" msgstr "子模组 '$name' ($url) 已为路径 '$sm_path' 注册" -#: git-submodule.sh:490 +#: git-submodule.sh:545 #, sh-format msgid "Failed to register update mode for submodule path '$sm_path'" msgstr "无法为子模组路径 '$sm_path' 注册更新模式" -#: git-submodule.sh:590 +#: git-submodule.sh:649 #, sh-format msgid "" "Submodule path '$sm_path' not initialized\n" @@ -9391,95 +9496,140 @@ msgstr "" "子模组路径 '$sm_path' 没有初始化\n" "也许您想用 'update --init'？" -#: git-submodule.sh:603 +#: git-submodule.sh:662 #, sh-format msgid "Unable to find current revision in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中找到当前版本" -#: git-submodule.sh:622 +#: git-submodule.sh:671 git-submodule.sh:695 #, sh-format msgid "Unable to fetch in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中获取" -#: git-submodule.sh:636 +#: git-submodule.sh:709 #, sh-format msgid "Unable to rebase '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中变基 '$sha1'" -#: git-submodule.sh:637 +#: git-submodule.sh:710 #, sh-format msgid "Submodule path '$sm_path': rebased into '$sha1'" msgstr "子模组路径 '$sm_path'：变基至 '$sha1'" -#: git-submodule.sh:642 +#: git-submodule.sh:715 #, sh-format msgid "Unable to merge '$sha1' in submodule path '$sm_path'" msgstr "无法合并 '$sha1' 到子模组路径 '$sm_path' 中" -#: git-submodule.sh:643 +#: git-submodule.sh:716 #, sh-format msgid "Submodule path '$sm_path': merged in '$sha1'" msgstr "子模组路径 '$sm_path'：已合并入 '$sha1'" -#: git-submodule.sh:648 +#: git-submodule.sh:721 #, sh-format msgid "Unable to checkout '$sha1' in submodule path '$sm_path'" msgstr "无法在子模组路径 '$sm_path' 中检出 '$sha1'" -#: git-submodule.sh:649 +#: git-submodule.sh:722 #, sh-format msgid "Submodule path '$sm_path': checked out '$sha1'" msgstr "子模组路径 '$sm_path'：检出 '$sha1'" -#: git-submodule.sh:671 git-submodule.sh:995 +#: git-submodule.sh:744 git-submodule.sh:1066 #, sh-format msgid "Failed to recurse into submodule path '$sm_path'" msgstr "无法递归进子模组路径 '$sm_path'" -#: git-submodule.sh:779 +#: git-submodule.sh:852 msgid "The --cached option cannot be used with the --files option" msgstr "选项 --cached 不能和选项 --files 同时使用" #. unexpected type -#: git-submodule.sh:819 +#: git-submodule.sh:892 #, sh-format msgid "unexpected mode $mod_dst" msgstr "意外的模式 $mod_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:837 +#: git-submodule.sh:910 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_src" msgstr " 警告：$name 未包含提交 $sha1_src" # 译者：注意保持前导空格 -#: git-submodule.sh:840 +#: git-submodule.sh:913 #, sh-format msgid " Warn: $name doesn't contain commit $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_dst" # 译者：注意保持前导空格 -#: git-submodule.sh:843 +#: git-submodule.sh:916 #, sh-format msgid " Warn: $name doesn't contain commits $sha1_src and $sha1_dst" msgstr " 警告：$name 未包含提交 $sha1_src 和 $sha1_dst" -#: git-submodule.sh:868 +#: git-submodule.sh:941 msgid "blob" -msgstr "二进制对象" +msgstr "数据对象" -#: git-submodule.sh:906 -msgid "# Submodules changed but not updated:" -msgstr "# 子模组已修改但尚未更新：" +#: git-submodule.sh:979 +msgid "Submodules changed but not updated:" +msgstr "子模组已修改但尚未更新：" -#: git-submodule.sh:908 -msgid "# Submodule changes to be committed:" +#: git-submodule.sh:981 +msgid "Submodule changes to be committed:" msgstr "要提交的子模组变更：" -#: git-submodule.sh:1054 +#: git-submodule.sh:1129 #, sh-format -msgid "Synchronizing submodule url for '$name'" -msgstr "为 '$name' 同步子模组 url" +msgid "Synchronizing submodule url for '$prefix$sm_path'" +msgstr "为 '$prefix$sm_path' 同步子模组 url" + +#~ msgid "can't fdopen 'show' output fd" +#~ msgstr "不能打开 'show' 输出文件句柄" + +#~ msgid "failed to close pipe to 'show' for object '%s'" +#~ msgstr "无法为对象 '%s' 的 'show' 关闭管道" + +#~ msgid " 0 files changed" +#~ msgstr " 0 个文件被修改" + +#~ msgid " %d file changed" +#~ msgid_plural " %d files changed" +#~ msgstr[0] " %d 个文件被修改" +#~ msgstr[1] " %d 个文件被修改" + +#~ msgid ", %d insertion(+)" +#~ msgid_plural ", %d insertions(+)" +#~ msgstr[0] "，插入 %d 行(+)" +#~ msgstr[1] "，插入 %d 行(+)" + +#~ msgid ", %d deletion(-)" +#~ msgid_plural ", %d deletions(-)" +#~ msgstr[0] "，删除 %d 行(-)" +#~ msgstr[1] "，删除 %d 行(-)" + +#~ msgid "You do not have a valid HEAD" +#~ msgstr "您没有一个有效的 HEAD" + +#~ msgid "oops" +#~ msgstr "哎哟" + +#~ msgid "Would not remove %s\n" +#~ msgstr "不会删除 %s\n" + +#~ msgid "Not removing %s\n" +#~ msgstr "未删除 %s\n" + +#~ msgid "Auto packing the repository for optimum performance.\n" +#~ msgstr "自动打包版本库以求最佳性能。\n" + +#~ msgid "git remote set-head <name> (-a | -d | <branch>])" +#~ msgstr "git remote set-head <名称> (-a | -d | <分支>])" + +#~ msgid "Could not read index" +#~ msgstr "不能读取索引" # 译者：中文字符串拼接，可删除前导空格 #~ msgid " (use \"git add\" to track)" @@ -345,7 +345,7 @@ static int needs_rfc2047_encoding(const char *line, int len, return 0; } -static void add_rfc2047(struct strbuf *sb, const char *line, int len, +static void add_rfc2047(struct strbuf *sb, const char *line, size_t len, const char *encoding, enum rfc2047_type type) { static const int max_encoded_length = 76; /* per rfc2047 */ @@ -355,9 +355,22 @@ static void add_rfc2047(struct strbuf *sb, const char *line, int len, strbuf_grow(sb, len * 3 + strlen(encoding) + 100); strbuf_addf(sb, "=?%s?q?", encoding); line_len += strlen(encoding) + 5; /* 5 for =??q? */ - for (i = 0; i < len; i++) { - unsigned ch = line[i] & 0xFF; - int is_special = is_rfc2047_special(ch, type); + + while (len) { + /* + * RFC 2047, section 5 (3): + * + * Each 'encoded-word' MUST represent an integral number of + * characters. A multi-octet character may not be split across + * adjacent 'encoded- word's. + */ + const unsigned char *p = (const unsigned char *)line; + int chrlen = mbs_chrlen(&line, &len, encoding); + int is_special = (chrlen > 1) || is_rfc2047_special(*p, type); + + /* "=%02X" * chrlen, or the byte itself */ + const char *encoded_fmt = is_special ? "=%02X" : "%c"; + int encoded_len = is_special ? 3 * chrlen : 1; /* * According to RFC 2047, we could encode the special character @@ -367,18 +380,15 @@ static void add_rfc2047(struct strbuf *sb, const char *line, int len, * causes ' ' to be encoded as '=20', avoiding this problem. */ - if (line_len + 2 + (is_special ? 3 : 1) > max_encoded_length) { + if (line_len + encoded_len + 2 > max_encoded_length) { + /* It won't fit with trailing "?=" --- break the line */ strbuf_addf(sb, "?=\n =?%s?q?", encoding); line_len = strlen(encoding) + 5 + 1; /* =??q? plus SP */ } - if (is_special) { - strbuf_addf(sb, "=%02X", ch); - line_len += 3; - } else { - strbuf_addch(sb, ch); - line_len++; - } + for (i = 0; i < chrlen; i++) + strbuf_addf(sb, encoded_fmt, p[i]); + line_len += encoded_len; } strbuf_addstr(sb, "?="); } @@ -387,56 +397,79 @@ void pp_user_info(const struct pretty_print_context *pp, const char *what, struct strbuf *sb, const char *line, const char *encoding) { + struct strbuf name; + struct strbuf mail; + struct ident_split ident; + int linelen; + char *line_end, *date; + const char *mailbuf, *namebuf; + size_t namelen, maillen; int max_length = 78; /* per rfc2822 */ - char *date; - int namelen; unsigned long time; int tz; if (pp->fmt == CMIT_FMT_ONELINE) return; - date = strchr(line, '>'); - if (!date) + + line_end = strchr(line, '\n'); + if (!line_end) { + line_end = strchr(line, '\0'); + if (!line_end) + return; + } + + linelen = ++line_end - line; + if (split_ident_line(&ident, line, linelen)) return; - namelen = ++date - line; - time = strtoul(date, &date, 10); + + + mailbuf = ident.mail_begin; + maillen = ident.mail_end - ident.mail_begin; + namebuf = ident.name_begin; + namelen = ident.name_end - ident.name_begin; + + if (pp->mailmap) + map_user(pp->mailmap, &mailbuf, &maillen, &namebuf, &namelen); + + strbuf_init(&mail, 0); + strbuf_init(&name, 0); + + strbuf_add(&mail, mailbuf, maillen); + strbuf_add(&name, namebuf, namelen); + + namelen = name.len + mail.len + 3; /* ' ' + '<' + '>' */ + time = strtoul(ident.date_begin, &date, 10); tz = strtol(date, NULL, 10); if (pp->fmt == CMIT_FMT_EMAIL) { - char *name_tail = strchr(line, '<'); - int display_name_length; - if (!name_tail) - return; - while (line < name_tail && isspace(name_tail[-1])) - name_tail--; - display_name_length = name_tail - line; strbuf_addstr(sb, "From: "); - if (needs_rfc2047_encoding(line, display_name_length, RFC2047_ADDRESS)) { - add_rfc2047(sb, line, display_name_length, - encoding, RFC2047_ADDRESS); + if (needs_rfc2047_encoding(name.buf, name.len, RFC2047_ADDRESS)) { + add_rfc2047(sb, name.buf, name.len, + encoding, RFC2047_ADDRESS); max_length = 76; /* per rfc2047 */ - } else if (needs_rfc822_quoting(line, display_name_length)) { + } else if (needs_rfc822_quoting(name.buf, name.len)) { struct strbuf quoted = STRBUF_INIT; - add_rfc822_quoted("ed, line, display_name_length); + add_rfc822_quoted("ed, name.buf, name.len); strbuf_add_wrapped_bytes(sb, quoted.buf, quoted.len, -6, 1, max_length); strbuf_release("ed); } else { - strbuf_add_wrapped_bytes(sb, line, display_name_length, - -6, 1, max_length); + strbuf_add_wrapped_bytes(sb, name.buf, name.len, + -6, 1, max_length); } - if (namelen - display_name_length + last_line_length(sb) > max_length) { + if (namelen - name.len + last_line_length(sb) > max_length) strbuf_addch(sb, '\n'); - if (!isspace(name_tail[0])) - strbuf_addch(sb, ' '); - } - strbuf_add(sb, name_tail, namelen - display_name_length); - strbuf_addch(sb, '\n'); + + strbuf_addf(sb, " <%s>\n", mail.buf); } else { - strbuf_addf(sb, "%s: %.*s%.*s\n", what, + strbuf_addf(sb, "%s: %.*s%s <%s>\n", what, (pp->fmt == CMIT_FMT_FULLER) ? 4 : 0, - " ", namelen, line); + " ", name.buf, mail.buf); } + + strbuf_release(&mail); + strbuf_release(&name); + switch (pp->fmt) { case CMIT_FMT_MEDIUM: strbuf_addf(sb, "Date: %s\n", show_date(time, tz, pp->date_mode)); @@ -501,10 +534,11 @@ static void add_merge_info(const struct pretty_print_context *pp, strbuf_addch(sb, '\n'); } -static char *get_header(const struct commit *commit, const char *key) +static char *get_header(const struct commit *commit, const char *msg, + const char *key) { int key_len = strlen(key); - const char *line = commit->buffer; + const char *line = msg; while (line) { const char *eol = strchr(line, '\n'), *next; @@ -565,28 +599,81 @@ char *logmsg_reencode(const struct commit *commit, static const char *utf8 = "UTF-8"; const char *use_encoding; char *encoding; + char *msg = commit->buffer; char *out; + if (!msg) { + enum object_type type; + unsigned long size; + + msg = read_sha1_file(commit->object.sha1, &type, &size); + if (!msg) + die("Cannot read commit object %s", + sha1_to_hex(commit->object.sha1)); + if (type != OBJ_COMMIT) + die("Expected commit for '%s', got %s", + sha1_to_hex(commit->object.sha1), typename(type)); + } + if (!output_encoding || !*output_encoding) - return NULL; - encoding = get_header(commit, "encoding"); + return msg; + encoding = get_header(commit, msg, "encoding"); use_encoding = encoding ? encoding : utf8; - if (same_encoding(use_encoding, output_encoding)) - if (encoding) /* we'll strip encoding header later */ - out = xstrdup(commit->buffer); - else - return NULL; /* nothing to do */ - else - out = reencode_string(commit->buffer, - output_encoding, use_encoding); + if (same_encoding(use_encoding, output_encoding)) { + /* + * No encoding work to be done. If we have no encoding header + * at all, then there's nothing to do, and we can return the + * message verbatim (whether newly allocated or not). + */ + if (!encoding) + return msg; + + /* + * Otherwise, we still want to munge the encoding header in the + * result, which will be done by modifying the buffer. If we + * are using a fresh copy, we can reuse it. But if we are using + * the cached copy from commit->buffer, we need to duplicate it + * to avoid munging commit->buffer. + */ + out = msg; + if (out == commit->buffer) + out = xstrdup(out); + } + else { + /* + * There's actual encoding work to do. Do the reencoding, which + * still leaves the header to be replaced in the next step. At + * this point, we are done with msg. If we allocated a fresh + * copy, we can free it. + */ + out = reencode_string(msg, output_encoding, use_encoding); + if (out && msg != commit->buffer) + free(msg); + } + + /* + * This replacement actually consumes the buffer we hand it, so we do + * not have to worry about freeing the old "out" here. + */ if (out) out = replace_encoding_header(out, output_encoding); free(encoding); - return out; + /* + * If the re-encoding failed, out might be NULL here; in that + * case we just return the commit message verbatim. + */ + return out ? out : msg; +} + +void logmsg_free(char *msg, const struct commit *commit) +{ + if (msg != commit->buffer) + free(msg); } -static int mailmap_name(char *email, int email_len, char *name, int name_len) +static int mailmap_name(const char **email, size_t *email_len, + const char **name, size_t *name_len) { static struct string_list *mail_map; if (!mail_map) { @@ -603,36 +690,26 @@ static size_t format_person_part(struct strbuf *sb, char part, const int placeholder_len = 2; int tz; unsigned long date = 0; - char person_name[1024]; - char person_mail[1024]; struct ident_split s; - const char *name_start, *name_end, *mail_start, *mail_end; + const char *name, *mail; + size_t maillen, namelen; if (split_ident_line(&s, msg, len) < 0) goto skip; - name_start = s.name_begin; - name_end = s.name_end; - mail_start = s.mail_begin; - mail_end = s.mail_end; - - if (part == 'N' || part == 'E') { /* mailmap lookup */ - snprintf(person_name, sizeof(person_name), "%.*s", - (int)(name_end - name_start), name_start); - snprintf(person_mail, sizeof(person_mail), "%.*s", - (int)(mail_end - mail_start), mail_start); - mailmap_name(person_mail, sizeof(person_mail), person_name, sizeof(person_name)); - name_start = person_name; - name_end = name_start + strlen(person_name); - mail_start = person_mail; - mail_end = mail_start + strlen(person_mail); - } + name = s.name_begin; + namelen = s.name_end - s.name_begin; + mail = s.mail_begin; + maillen = s.mail_end - s.mail_begin; + + if (part == 'N' || part == 'E') /* mailmap lookup */ + mailmap_name(&mail, &maillen, &name, &namelen); if (part == 'n' || part == 'N') { /* name */ - strbuf_add(sb, name_start, name_end-name_start); + strbuf_add(sb, name, namelen); return placeholder_len; } if (part == 'e' || part == 'E') { /* email */ - strbuf_add(sb, mail_start, mail_end-mail_start); + strbuf_add(sb, mail, maillen); return placeholder_len; } @@ -692,8 +769,10 @@ struct format_commit_context { unsigned commit_signature_parsed:1; struct { char *gpg_output; + char *gpg_status; char good_bad; char *signer; + char *key; } signature; char *message; size_t width, indent1, indent2; @@ -881,13 +960,13 @@ static struct { char result; const char *check; } signature_check[] = { - { 'G', ": Good signature from " }, - { 'B', ": BAD signature from " }, + { 'G', "\n[GNUPG:] GOODSIG " }, + { 'B', "\n[GNUPG:] BADSIG " }, }; static void parse_signature_lines(struct format_commit_context *ctx) { - const char *buf = ctx->signature.gpg_output; + const char *buf = ctx->signature.gpg_status; int i; for (i = 0; i < ARRAY_SIZE(signature_check); i++) { @@ -897,6 +976,8 @@ static void parse_signature_lines(struct format_commit_context *ctx) continue; ctx->signature.good_bad = signature_check[i].result; found += strlen(signature_check[i].check); + ctx->signature.key = xmemdupz(found, 16); + found += 17; next = strchrnul(found, '\n'); ctx->signature.signer = xmemdupz(found, next - found); break; @@ -908,6 +989,7 @@ static void parse_commit_signature(struct format_commit_context *ctx) struct strbuf payload = STRBUF_INIT; struct strbuf signature = STRBUF_INIT; struct strbuf gpg_output = STRBUF_INIT; + struct strbuf gpg_status = STRBUF_INIT; int status; ctx->commit_signature_parsed = 1; @@ -917,13 +999,15 @@ static void parse_commit_signature(struct format_commit_context *ctx) goto out; status = verify_signed_buffer(payload.buf, payload.len, signature.buf, signature.len, - &gpg_output); + &gpg_output, &gpg_status); if (status && !gpg_output.len) goto out; ctx->signature.gpg_output = strbuf_detach(&gpg_output, NULL); + ctx->signature.gpg_status = strbuf_detach(&gpg_status, NULL); parse_signature_lines(ctx); out: + strbuf_release(&gpg_status); strbuf_release(&gpg_output); strbuf_release(&payload); strbuf_release(&signature); @@ -966,7 +1050,7 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, if (!end) return 0; - if (!memcmp(begin, "auto,", 5)) { + if (!prefixcmp(begin, "auto,")) { if (!want_color(c->pretty_ctx->color)) return end - placeholder + 1; begin += 5; @@ -1133,6 +1217,10 @@ static size_t format_commit_one(struct strbuf *sb, const char *placeholder, if (c->signature.signer) strbuf_addstr(sb, c->signature.signer); break; + case 'K': + if (c->signature.key) + strbuf_addstr(sb, c->signature.key); + break; } return 2; } @@ -1264,14 +1352,11 @@ void format_commit_message(const struct commit *commit, context.pretty_ctx = pretty_ctx; context.wrap_start = sb->len; context.message = logmsg_reencode(commit, output_enc); - if (!context.message) - context.message = commit->buffer; strbuf_expand(sb, format, format_commit_item, &context); rewrap_message_tail(sb, &context, 0, 0, 0); - if (context.message != commit->buffer) - free(context.message); + logmsg_free(context.message, commit); free(context.signature.gpg_output); free(context.signature.signer); } @@ -1301,7 +1386,7 @@ static void pp_header(const struct pretty_print_context *pp, continue; } - if (!memcmp(line, "parent ", 7)) { + if (!prefixcmp(line, "parent ")) { if (linelen != 48) die("bad parent line in commit"); continue; @@ -1325,11 +1410,11 @@ static void pp_header(const struct pretty_print_context *pp, * FULL shows both authors but not dates. * FULLER shows both authors and dates. */ - if (!memcmp(line, "author ", 7)) { + if (!prefixcmp(line, "author ")) { strbuf_grow(sb, linelen + 80); pp_user_info(pp, "Author", sb, line + 7, encoding); } - if (!memcmp(line, "committer ", 10) && + if (!prefixcmp(line, "committer ") && (pp->fmt == CMIT_FMT_FULL || pp->fmt == CMIT_FMT_FULLER)) { strbuf_grow(sb, linelen + 80); pp_user_info(pp, "Commit", sb, line + 10, encoding); @@ -1418,7 +1503,7 @@ void pretty_print_commit(const struct pretty_print_context *pp, { unsigned long beginning_of_body; int indent = 4; - const char *msg = commit->buffer; + const char *msg; char *reencoded; const char *encoding; int need_8bit_cte = pp->need_8bit_cte; @@ -1429,10 +1514,7 @@ void pretty_print_commit(const struct pretty_print_context *pp, } encoding = get_log_output_encoding(); - reencoded = logmsg_reencode(commit, encoding); - if (reencoded) { - msg = reencoded; - } + msg = reencoded = logmsg_reencode(commit, encoding); if (pp->fmt == CMIT_FMT_ONELINE || pp->fmt == CMIT_FMT_EMAIL) indent = 0; @@ -1489,7 +1571,7 @@ void pretty_print_commit(const struct pretty_print_context *pp, if (pp->fmt == CMIT_FMT_EMAIL && sb->len <= beginning_of_body) strbuf_addch(sb, '\n'); - free(reencoded); + logmsg_free(reencoded, commit); } void pp_commit_easy(enum cmit_fmt fmt, const struct commit *commit, diff --git a/reachable.c b/reachable.c index bf7970661f..e7e6a1e342 100644 --- a/reachable.c +++ b/reachable.c @@ -152,11 +152,9 @@ static int add_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1, static int add_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data) { - struct object *object = parse_object(sha1); + struct object *object = parse_object_or_die(sha1, path); struct rev_info *revs = (struct rev_info *)cb_data; - if (!object) - die("bad object ref: %s:%s", path, sha1_to_hex(sha1)); add_pending_object(revs, object, ""); return 0; diff --git a/read-cache.c b/read-cache.c index fda78bc353..670a06bc79 100644 --- a/read-cache.c +++ b/read-cache.c @@ -197,21 +197,25 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) } if (ce->ce_mtime.sec != (unsigned int)st->st_mtime) changed |= MTIME_CHANGED; - if (trust_ctime && ce->ce_ctime.sec != (unsigned int)st->st_ctime) + if (trust_ctime && check_stat && + ce->ce_ctime.sec != (unsigned int)st->st_ctime) changed |= CTIME_CHANGED; #ifdef USE_NSEC - if (ce->ce_mtime.nsec != ST_MTIME_NSEC(*st)) + if (check_stat && ce->ce_mtime.nsec != ST_MTIME_NSEC(*st)) changed |= MTIME_CHANGED; - if (trust_ctime && ce->ce_ctime.nsec != ST_CTIME_NSEC(*st)) + if (trust_ctime && check_stat && + ce->ce_ctime.nsec != ST_CTIME_NSEC(*st)) changed |= CTIME_CHANGED; #endif - if (ce->ce_uid != (unsigned int) st->st_uid || - ce->ce_gid != (unsigned int) st->st_gid) - changed |= OWNER_CHANGED; - if (ce->ce_ino != (unsigned int) st->st_ino) - changed |= INODE_CHANGED; + if (check_stat) { + if (ce->ce_uid != (unsigned int) st->st_uid || + ce->ce_gid != (unsigned int) st->st_gid) + changed |= OWNER_CHANGED; + if (ce->ce_ino != (unsigned int) st->st_ino) + changed |= INODE_CHANGED; + } #ifdef USE_STDEV /* @@ -219,8 +223,8 @@ static int ce_match_stat_basic(struct cache_entry *ce, struct stat *st) * clients will have different views of what "device" * the filesystem is on */ - if (ce->ce_dev != (unsigned int) st->st_dev) - changed |= INODE_CHANGED; + if (check_stat && ce->ce_dev != (unsigned int) st->st_dev) + changed |= INODE_CHANGED; #endif if (ce->ce_size != (unsigned int) st->st_size) @@ -1256,7 +1260,7 @@ static int verify_hdr(struct cache_header *hdr, unsigned long size) if (hdr->hdr_signature != htonl(CACHE_SIGNATURE)) return error("bad signature"); hdr_version = ntohl(hdr->hdr_version); - if (hdr_version < 2 || 4 < hdr_version) + if (hdr_version < INDEX_FORMAT_LB || INDEX_FORMAT_UB < hdr_version) return error("bad index version %d", hdr_version); git_SHA1_Init(&c); git_SHA1_Update(&c, hdr, size - 20); @@ -3,6 +3,7 @@ #include "object.h" #include "tag.h" #include "dir.h" +#include "string-list.h" /* * Make sure "ref" is something reasonable to have under ".git/refs/"; @@ -333,14 +334,12 @@ struct string_slice { 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); + const struct string_slice *key = key_; + const struct ref_entry *ent = *(const struct ref_entry * const *)ent_; + int cmp = strncmp(key->str, ent->name, key->len); if (cmp) return cmp; - return key->len - entlen; + return '\0' - (unsigned char)ent->name[key->len]; } /* @@ -804,11 +803,38 @@ static const char *parse_ref_line(char *line, unsigned char *sha1) return line; } +/* + * Read f, which is a packed-refs file, into dir. + * + * A comment line of the form "# pack-refs with: " may contain zero or + * more traits. We interpret the traits as follows: + * + * No traits: + * + * Probably no references are peeled. But if the file contains a + * peeled value for a reference, we will use it. + * + * peeled: + * + * References under "refs/tags/", if they *can* be peeled, *are* + * peeled in this file. References outside of "refs/tags/" are + * probably not peeled even if they could have been, but if we find + * a peeled value for such a reference we will use it. + * + * fully-peeled: + * + * All references in the file that can be peeled are peeled. + * Inversely (and this is more important), any references in the + * file for which no peeled value is recorded is not peelable. This + * trait should typically be written alongside "peeled" for + * compatibility with older clients, but we do not require it + * (i.e., "peeled" is a no-op if "fully-peeled" is set). + */ static void read_packed_refs(FILE *f, struct ref_dir *dir) { struct ref_entry *last = NULL; char refline[PATH_MAX]; - int flag = REF_ISPACKED; + enum { PEELED_NONE, PEELED_TAGS, PEELED_FULLY } peeled = PEELED_NONE; while (fgets(refline, sizeof(refline), f)) { unsigned char sha1[20]; @@ -817,15 +843,20 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir) if (!strncmp(refline, header, sizeof(header)-1)) { const char *traits = refline + sizeof(header) - 1; - if (strstr(traits, " peeled ")) - flag |= REF_KNOWS_PEELED; + if (strstr(traits, " fully-peeled ")) + peeled = PEELED_FULLY; + else if (strstr(traits, " peeled ")) + peeled = PEELED_TAGS; /* perhaps other traits later as well */ continue; } refname = parse_ref_line(refline, sha1); if (refname) { - last = create_ref_entry(refname, sha1, flag, 1); + last = create_ref_entry(refname, sha1, REF_ISPACKED, 1); + if (peeled == PEELED_FULLY || + (peeled == PEELED_TAGS && !prefixcmp(refname, "refs/tags/"))) + last->flag |= REF_KNOWS_PEELED; add_ref(dir, last); continue; } @@ -833,8 +864,15 @@ static void read_packed_refs(FILE *f, struct ref_dir *dir) refline[0] == '^' && strlen(refline) == 42 && refline[41] == '\n' && - !get_sha1_hex(refline + 1, sha1)) + !get_sha1_hex(refline + 1, sha1)) { hashcpy(last->u.value.peeled, sha1); + /* + * Regardless of what the file header said, + * we definitely know the value of *this* + * reference: + */ + last->flag |= REF_KNOWS_PEELED; + } } } @@ -2294,59 +2332,117 @@ int read_ref_at(const char *refname, unsigned long at_time, int cnt, return 1; } -int for_each_recent_reflog_ent(const char *refname, each_reflog_ent_fn fn, long ofs, void *cb_data) +static int show_one_reflog_ent(struct strbuf *sb, each_reflog_ent_fn fn, void *cb_data) +{ + unsigned char osha1[20], nsha1[20]; + char *email_end, *message; + unsigned long timestamp; + int tz; + + /* old SP new SP name <email> SP time TAB msg LF */ + if (sb->len < 83 || sb->buf[sb->len - 1] != '\n' || + get_sha1_hex(sb->buf, osha1) || sb->buf[40] != ' ' || + get_sha1_hex(sb->buf + 41, nsha1) || sb->buf[81] != ' ' || + !(email_end = strchr(sb->buf + 82, '>')) || + email_end[1] != ' ' || + !(timestamp = strtoul(email_end + 2, &message, 10)) || + !message || message[0] != ' ' || + (message[1] != '+' && message[1] != '-') || + !isdigit(message[2]) || !isdigit(message[3]) || + !isdigit(message[4]) || !isdigit(message[5])) + return 0; /* corrupt? */ + email_end[1] = '\0'; + tz = strtol(message + 1, NULL, 10); + if (message[6] != '\t') + message += 6; + else + message += 7; + return fn(osha1, nsha1, sb->buf + 82, timestamp, tz, message, cb_data); +} + +static char *find_beginning_of_line(char *bob, char *scan) +{ + while (bob < scan && *(--scan) != '\n') + ; /* keep scanning backwards */ + /* + * Return either beginning of the buffer, or LF at the end of + * the previous line. + */ + return scan; +} + +int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data) { - const char *logfile; - FILE *logfp; struct strbuf sb = STRBUF_INIT; - int ret = 0; + FILE *logfp; + long pos; + int ret = 0, at_tail = 1; - logfile = git_path("logs/%s", refname); - logfp = fopen(logfile, "r"); + logfp = fopen(git_path("logs/%s", refname), "r"); if (!logfp) return -1; - if (ofs) { - struct stat statbuf; - if (fstat(fileno(logfp), &statbuf) || - statbuf.st_size < ofs || - fseek(logfp, -ofs, SEEK_END) || - strbuf_getwholeline(&sb, logfp, '\n')) { - fclose(logfp); - strbuf_release(&sb); - return -1; + /* Jump to the end */ + if (fseek(logfp, 0, SEEK_END) < 0) + return error("cannot seek back reflog for %s: %s", + refname, strerror(errno)); + pos = ftell(logfp); + while (!ret && 0 < pos) { + int cnt; + size_t nread; + char buf[BUFSIZ]; + char *endp, *scanp; + + /* Fill next block from the end */ + cnt = (sizeof(buf) < pos) ? sizeof(buf) : pos; + if (fseek(logfp, pos - cnt, SEEK_SET)) + return error("cannot seek back reflog for %s: %s", + refname, strerror(errno)); + nread = fread(buf, cnt, 1, logfp); + if (nread != 1) + return error("cannot read %d bytes from reflog for %s: %s", + cnt, refname, strerror(errno)); + pos -= cnt; + + scanp = endp = buf + cnt; + if (at_tail && scanp[-1] == '\n') + /* Looking at the final LF at the end of the file */ + scanp--; + at_tail = 0; + + while (buf < scanp) { + /* + * terminating LF of the previous line, or the beginning + * of the buffer. + */ + char *bp; + + bp = find_beginning_of_line(buf, scanp); + + if (*bp != '\n') { + strbuf_splice(&sb, 0, 0, buf, endp - buf); + if (pos) + break; /* need to fill another block */ + scanp = buf - 1; /* leave loop */ + } else { + /* + * (bp + 1) thru endp is the beginning of the + * current line we have in sb + */ + strbuf_splice(&sb, 0, 0, bp + 1, endp - (bp + 1)); + scanp = bp; + endp = bp + 1; + } + ret = show_one_reflog_ent(&sb, fn, cb_data); + strbuf_reset(&sb); + if (ret) + break; } - } - while (!strbuf_getwholeline(&sb, logfp, '\n')) { - unsigned char osha1[20], nsha1[20]; - char *email_end, *message; - unsigned long timestamp; - int tz; - - /* old SP new SP name <email> SP time TAB msg LF */ - if (sb.len < 83 || sb.buf[sb.len - 1] != '\n' || - get_sha1_hex(sb.buf, osha1) || sb.buf[40] != ' ' || - get_sha1_hex(sb.buf + 41, nsha1) || sb.buf[81] != ' ' || - !(email_end = strchr(sb.buf + 82, '>')) || - email_end[1] != ' ' || - !(timestamp = strtoul(email_end + 2, &message, 10)) || - !message || message[0] != ' ' || - (message[1] != '+' && message[1] != '-') || - !isdigit(message[2]) || !isdigit(message[3]) || - !isdigit(message[4]) || !isdigit(message[5])) - continue; /* corrupt? */ - email_end[1] = '\0'; - tz = strtol(message + 1, NULL, 10); - if (message[6] != '\t') - message += 6; - else - message += 7; - ret = fn(osha1, nsha1, sb.buf + 82, timestamp, tz, message, - cb_data); - if (ret) - break; } + if (!ret && sb.len) + ret = show_one_reflog_ent(&sb, fn, cb_data); + fclose(logfp); strbuf_release(&sb); return ret; @@ -2354,9 +2450,20 @@ int for_each_recent_reflog_ent(const char *refname, each_reflog_ent_fn fn, long int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data) { - return for_each_recent_reflog_ent(refname, fn, 0, cb_data); -} + FILE *logfp; + struct strbuf sb = STRBUF_INIT; + int ret = 0; + logfp = fopen(git_path("logs/%s", refname), "r"); + if (!logfp) + return -1; + + while (!ret && !strbuf_getwholeline(&sb, logfp, '\n')) + ret = show_one_reflog_ent(&sb, fn, cb_data); + fclose(logfp); + strbuf_release(&sb); + return ret; +} /* * Call fn for each reflog in the namespace indicated by name. name * must be empty or end with '/'. Name will be used as a scratch @@ -2556,3 +2663,46 @@ char *shorten_unambiguous_ref(const char *refname, int strict) free(short_name); return xstrdup(refname); } + +static struct string_list *hide_refs; + +int parse_hide_refs_config(const char *var, const char *value, const char *section) +{ + if (!strcmp("transfer.hiderefs", var) || + /* NEEDSWORK: use parse_config_key() once both are merged */ + (!prefixcmp(var, section) && var[strlen(section)] == '.' && + !strcmp(var + strlen(section), ".hiderefs"))) { + char *ref; + int len; + + if (!value) + return config_error_nonbool(var); + ref = xstrdup(value); + len = strlen(ref); + while (len && ref[len - 1] == '/') + ref[--len] = '\0'; + if (!hide_refs) { + hide_refs = xcalloc(1, sizeof(*hide_refs)); + hide_refs->strdup_strings = 1; + } + string_list_append(hide_refs, ref); + } + return 0; +} + +int ref_is_hidden(const char *refname) +{ + struct string_list_item *item; + + if (!hide_refs) + return 0; + for_each_string_list_item(item, hide_refs) { + int len; + if (prefixcmp(refname, item->string)) + continue; + len = strlen(item->string); + if (!refname[len] || refname[len] == '/') + return 1; + } + return 0; +} @@ -103,7 +103,7 @@ extern int read_ref_at(const char *refname, unsigned long at_time, int cnt, /* iterate over reflog entries */ typedef int each_reflog_ent_fn(unsigned char *osha1, unsigned char *nsha1, const char *, unsigned long, int, const char *, void *); int for_each_reflog_ent(const char *refname, each_reflog_ent_fn fn, void *cb_data); -int for_each_recent_reflog_ent(const char *refname, each_reflog_ent_fn fn, long, void *cb_data); +int for_each_reflog_ent_reverse(const char *refname, each_reflog_ent_fn fn, void *cb_data); /* * Calls the specified function for each reflog file until it returns nonzero, @@ -147,4 +147,7 @@ int update_ref(const char *action, const char *refname, const unsigned char *sha1, const unsigned char *oldval, int flags, enum action_on_err onerr); +extern int parse_hide_refs_config(const char *var, const char *value, const char *); +extern int ref_is_hidden(const char *); + #endif /* REFS_H */ diff --git a/remote-curl.c b/remote-curl.c index 9a8b123507..933c69ac26 100644 --- a/remote-curl.c +++ b/remote-curl.c @@ -92,6 +92,8 @@ static void free_discovery(struct discovery *d) static struct discovery* discover_refs(const char *service) { + struct strbuf exp = STRBUF_INIT; + struct strbuf type = STRBUF_INIT; struct strbuf buffer = STRBUF_INIT; struct discovery *last = last_discovery; char *refs_url; @@ -113,7 +115,7 @@ static struct discovery* discover_refs(const char *service) } refs_url = strbuf_detach(&buffer, NULL); - http_ret = http_get_strbuf(refs_url, &buffer, HTTP_NO_CACHE); + http_ret = http_get_strbuf(refs_url, &type, &buffer, HTTP_NO_CACHE); switch (http_ret) { case HTTP_OK: break; @@ -132,17 +134,20 @@ static struct discovery* discover_refs(const char *service) last->buf_alloc = strbuf_detach(&buffer, &last->len); last->buf = last->buf_alloc; - if (maybe_smart && 5 <= last->len && last->buf[4] == '#') { - /* smart HTTP response; validate that the service + strbuf_addf(&exp, "application/x-%s-advertisement", service); + if (maybe_smart && + (5 <= last->len && last->buf[4] == '#') && + !strbuf_cmp(&exp, &type)) { + /* + * smart HTTP response; validate that the service * pkt-line matches our request. */ - struct strbuf exp = STRBUF_INIT; - if (packet_get_line(&buffer, &last->buf, &last->len) <= 0) die("%s has invalid packet header", refs_url); if (buffer.len && buffer.buf[buffer.len - 1] == '\n') strbuf_setlen(&buffer, buffer.len - 1); + strbuf_reset(&exp); strbuf_addf(&exp, "# service=%s", service); if (strbuf_cmp(&exp, &buffer)) die("invalid server response; got '%s'", buffer.buf); @@ -160,6 +165,8 @@ static struct discovery* discover_refs(const char *service) } free(refs_url); + strbuf_release(&exp); + strbuf_release(&type); strbuf_release(&buffer); last_discovery = last; return last; @@ -15,6 +15,7 @@ static struct refspec s_tag_refspec = { 0, 1, 0, + 0, "refs/tags/*", "refs/tags/*" }; @@ -538,7 +539,7 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp /* * Before going on, special case ":" (or "+:") as a refspec - * for matching refs. + * for pushing matching refs. */ if (!fetch && rhs == lhs && rhs[1] == '\0') { rs[i].matching = 1; @@ -565,26 +566,25 @@ static struct refspec *parse_refspec_internal(int nr_refspec, const char **refsp flags = REFNAME_ALLOW_ONELEVEL | (is_glob ? REFNAME_REFSPEC_PATTERN : 0); if (fetch) { - /* - * LHS - * - empty is allowed; it means HEAD. - * - otherwise it must be a valid looking ref. - */ + unsigned char unused[40]; + + /* LHS */ if (!*rs[i].src) - ; /* empty is ok */ - else if (check_refname_format(rs[i].src, flags)) + ; /* empty is ok; it means "HEAD" */ + else if (llen == 40 && !get_sha1_hex(rs[i].src, unused)) + rs[i].exact_sha1 = 1; /* ok */ + else if (!check_refname_format(rs[i].src, flags)) + ; /* valid looking ref is ok */ + else goto invalid; - /* - * RHS - * - missing is ok, and is same as empty. - * - empty is ok; it means not to store. - * - otherwise it must be a valid looking ref. - */ + /* RHS */ if (!rs[i].dst) - ; /* ok */ + ; /* missing is ok; it is the same as empty */ else if (!*rs[i].dst) - ; /* ok */ - else if (check_refname_format(rs[i].dst, flags)) + ; /* empty is ok; it means "do not store" */ + else if (!check_refname_format(rs[i].dst, flags)) + ; /* valid looking ref is ok */ + else goto invalid; } else { /* @@ -1195,6 +1195,101 @@ static struct ref **tail_ref(struct ref **head) return tail; } +struct tips { + struct commit **tip; + int nr, alloc; +}; + +static void add_to_tips(struct tips *tips, const unsigned char *sha1) +{ + struct commit *commit; + + if (is_null_sha1(sha1)) + return; + commit = lookup_commit_reference_gently(sha1, 1); + if (!commit || (commit->object.flags & TMP_MARK)) + return; + commit->object.flags |= TMP_MARK; + ALLOC_GROW(tips->tip, tips->nr + 1, tips->alloc); + tips->tip[tips->nr++] = commit; +} + +static void add_missing_tags(struct ref *src, struct ref **dst, struct ref ***dst_tail) +{ + struct string_list dst_tag = STRING_LIST_INIT_NODUP; + struct string_list src_tag = STRING_LIST_INIT_NODUP; + struct string_list_item *item; + struct ref *ref; + struct tips sent_tips; + + /* + * Collect everything we know they would have at the end of + * this push, and collect all tags they have. + */ + memset(&sent_tips, 0, sizeof(sent_tips)); + for (ref = *dst; ref; ref = ref->next) { + if (ref->peer_ref && + !is_null_sha1(ref->peer_ref->new_sha1)) + add_to_tips(&sent_tips, ref->peer_ref->new_sha1); + else + add_to_tips(&sent_tips, ref->old_sha1); + if (!prefixcmp(ref->name, "refs/tags/")) + string_list_append(&dst_tag, ref->name); + } + clear_commit_marks_many(sent_tips.nr, sent_tips.tip, TMP_MARK); + + sort_string_list(&dst_tag); + + /* Collect tags they do not have. */ + for (ref = src; ref; ref = ref->next) { + if (prefixcmp(ref->name, "refs/tags/")) + continue; /* not a tag */ + if (string_list_has_string(&dst_tag, ref->name)) + continue; /* they already have it */ + if (sha1_object_info(ref->new_sha1, NULL) != OBJ_TAG) + continue; /* be conservative */ + item = string_list_append(&src_tag, ref->name); + item->util = ref; + } + string_list_clear(&dst_tag, 0); + + /* + * At this point, src_tag lists tags that are missing from + * dst, and sent_tips lists the tips we are pushing or those + * that we know they already have. An element in the src_tag + * that is an ancestor of any of the sent_tips needs to be + * sent to the other side. + */ + if (sent_tips.nr) { + for_each_string_list_item(item, &src_tag) { + struct ref *ref = item->util; + struct ref *dst_ref; + struct commit *commit; + + if (is_null_sha1(ref->new_sha1)) + continue; + commit = lookup_commit_reference_gently(ref->new_sha1, 1); + if (!commit) + /* not pushing a commit, which is not an error */ + continue; + + /* + * Is this tag, which they do not have, reachable from + * any of the commits we are sending? + */ + if (!in_merge_bases_many(commit, sent_tips.nr, sent_tips.tip)) + continue; + + /* Add it in */ + dst_ref = make_linked_ref(ref->name, dst_tail); + hashcpy(dst_ref->new_sha1, ref->new_sha1); + dst_ref->peer_ref = copy_ref(ref); + } + } + string_list_clear(&src_tag, 0); + free(sent_tips.tip); +} + /* * Given the set of refs the local repository has, the set of refs the * remote repository has, and the refspec used for push, determine @@ -1257,6 +1352,10 @@ int match_push_refs(struct ref *src, struct ref **dst, free_name: free(dst_name); } + + if (flags & MATCH_REFS_FOLLOW_TAGS) + add_missing_tags(src, dst, &dst_tail); + if (send_prune) { /* check for missing refs on the remote */ for (ref = *dst; ref; ref = ref->next) { @@ -1279,26 +1378,6 @@ int match_push_refs(struct ref *src, struct ref **dst, return 0; } -static inline int is_forwardable(struct ref* ref) -{ - struct object *o; - - if (!prefixcmp(ref->name, "refs/tags/")) - return 0; - - /* old object must be a commit */ - o = parse_object(ref->old_sha1); - if (!o || o->type != OBJ_COMMIT) - return 0; - - /* new object must be commit-ish */ - o = deref_tag(parse_object(ref->new_sha1), NULL, 0); - if (!o || o->type != OBJ_COMMIT) - return 0; - - return 1; -} - void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, int force_update) { @@ -1320,54 +1399,40 @@ void set_ref_status_for_push(struct ref *remote_refs, int send_mirror, } /* - * The below logic determines whether an individual - * refspec A:B can be pushed. The push will succeed - * if any of the following are true: + * Decide whether an individual refspec A:B can be + * pushed. The push will succeed if any of the + * following are true: * * (1) the remote reference B does not exist * * (2) the remote reference B is being removed (i.e., * pushing :B where no source is specified) * - * (3) the update meets all fast-forwarding criteria: - * - * (a) the destination is not under refs/tags/ - * (b) the old is a commit - * (c) the new is a descendant of the old - * - * NOTE: We must actually have the old object in - * order to overwrite it in the remote reference, - * and the new object must be commit-ish. These are - * implied by (b) and (c) respectively. + * (3) the destination is not under refs/tags/, and + * if the old and new value is a commit, the new + * is a descendant of the old. * * (4) it is forced using the +A:B notation, or by * passing the --force argument */ - ref->not_forwardable = !is_forwardable(ref); - - ref->update = - !ref->deletion && - !is_null_sha1(ref->old_sha1); - - if (ref->update) { - ref->nonfastforward = - !has_sha1_file(ref->old_sha1) - || !ref_newer(ref->new_sha1, ref->old_sha1); - - if (ref->not_forwardable) { - ref->requires_force = 1; - if (!force_ref_update) { - ref->status = REF_STATUS_REJECT_ALREADY_EXISTS; - continue; - } - } else if (ref->nonfastforward) { - ref->requires_force = 1; - if (!force_ref_update) { - ref->status = REF_STATUS_REJECT_NONFASTFORWARD; - continue; - } - } + if (!ref->deletion && !is_null_sha1(ref->old_sha1)) { + int why = 0; /* why would this push require --force? */ + + if (!prefixcmp(ref->name, "refs/tags/")) + why = REF_STATUS_REJECT_ALREADY_EXISTS; + else if (!has_sha1_file(ref->old_sha1)) + why = REF_STATUS_REJECT_FETCH_FIRST; + else if (!lookup_commit_reference_gently(ref->old_sha1, 1) || + !lookup_commit_reference_gently(ref->new_sha1, 1)) + why = REF_STATUS_REJECT_NEEDS_FORCE; + else if (!ref_newer(ref->new_sha1, ref->old_sha1)) + why = REF_STATUS_REJECT_NONFASTFORWARD; + + if (!force_ref_update) + ref->status = why; + else if (why) + ref->forced_update = 1; } } } @@ -1500,7 +1565,12 @@ int get_fetch_map(const struct ref *remote_refs, } else { const char *name = refspec->src[0] ? refspec->src : "HEAD"; - ref_map = get_remote_ref(remote_refs, name); + if (refspec->exact_sha1) { + ref_map = alloc_ref(name); + get_sha1_hex(name, ref_map->old_sha1); + } else { + ref_map = get_remote_ref(remote_refs, name); + } if (!missing_ok && !ref_map) die("Couldn't find remote ref %s", name); if (ref_map) { @@ -1561,7 +1631,8 @@ int ref_newer(const unsigned char *new_sha1, const unsigned char *old_sha1) struct commit_list *list, *used; int found = 0; - /* Both new and old must be commit-ish and new is descendant of + /* + * Both new and old must be commit-ish and new is descendant of * old. Otherwise we require --force. */ o = deref_tag(parse_object(old_sha1), NULL, 0); @@ -62,6 +62,7 @@ struct refspec { unsigned force : 1; unsigned pattern : 1; unsigned matching : 1; + unsigned exact_sha1 : 1; char *src; char *dst; @@ -148,7 +149,8 @@ enum match_refs_flags { MATCH_REFS_NONE = 0, MATCH_REFS_ALL = (1 << 0), MATCH_REFS_MIRROR = (1 << 1), - MATCH_REFS_PRUNE = (1 << 2) + MATCH_REFS_PRUNE = (1 << 2), + MATCH_REFS_FOLLOW_TAGS = (1 << 3) }; /* Reporting of tracking info */ diff --git a/revision.c b/revision.c index 95d21e6472..ef60205412 100644 --- a/revision.c +++ b/revision.c @@ -13,6 +13,7 @@ #include "decorate.h" #include "log-tree.h" #include "string-list.h" +#include "mailmap.h" volatile show_early_output_fn_t show_early_output; @@ -2219,10 +2220,58 @@ static int rewrite_parents(struct rev_info *revs, struct commit *commit) return 0; } +static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap) +{ + char *person, *endp; + size_t len, namelen, maillen; + const char *name; + const char *mail; + struct ident_split ident; + + person = strstr(buf->buf, what); + if (!person) + return 0; + + person += strlen(what); + endp = strchr(person, '\n'); + if (!endp) + return 0; + + len = endp - person; + + if (split_ident_line(&ident, person, len)) + return 0; + + mail = ident.mail_begin; + maillen = ident.mail_end - ident.mail_begin; + name = ident.name_begin; + namelen = ident.name_end - ident.name_begin; + + if (map_user(mailmap, &mail, &maillen, &name, &namelen)) { + struct strbuf namemail = STRBUF_INIT; + + strbuf_addf(&namemail, "%.*s <%.*s>", + (int)namelen, name, (int)maillen, mail); + + strbuf_splice(buf, ident.name_begin - buf->buf, + ident.mail_end - ident.name_begin + 1, + namemail.buf, namemail.len); + + strbuf_release(&namemail); + + return 1; + } + + return 0; +} + static int commit_match(struct commit *commit, struct rev_info *opt) { int retval; + const char *encoding; + char *message; struct strbuf buf = STRBUF_INIT; + if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list) return 1; @@ -2233,25 +2282,43 @@ static int commit_match(struct commit *commit, struct rev_info *opt) strbuf_addch(&buf, '\n'); } + /* + * We grep in the user's output encoding, under the assumption that it + * is the encoding they are most likely to write their grep pattern + * for. In addition, it means we will match the "notes" encoding below, + * so we will not end up with a buffer that has two different encodings + * in it. + */ + encoding = get_log_output_encoding(); + message = logmsg_reencode(commit, encoding); + /* Copy the commit to temporary if we are using "fake" headers */ if (buf.len) - strbuf_addstr(&buf, commit->buffer); + strbuf_addstr(&buf, message); + + if (opt->grep_filter.header_list && opt->mailmap) { + if (!buf.len) + strbuf_addstr(&buf, message); + + commit_rewrite_person(&buf, "\nauthor ", opt->mailmap); + commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap); + } /* Append "fake" message parts as needed */ if (opt->show_notes) { if (!buf.len) - strbuf_addstr(&buf, commit->buffer); - format_display_notes(commit->object.sha1, &buf, - get_log_output_encoding(), 1); + strbuf_addstr(&buf, message); + format_display_notes(commit->object.sha1, &buf, encoding, 1); } - /* Find either in the commit object, or in the temporary */ + /* Find either in the original commit message, or in the temporary */ if (buf.len) retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len); else retval = grep_buffer(&opt->grep_filter, - commit->buffer, strlen(commit->buffer)); + message, strlen(message)); strbuf_release(&buf); + logmsg_free(message, commit); return retval; } diff --git a/revision.h b/revision.h index a395c3639a..5da09ee3ef 100644 --- a/revision.h +++ b/revision.h @@ -144,6 +144,7 @@ struct rev_info { const char *subject_prefix; int no_inline; int show_log_size; + struct string_list *mailmap; /* Filter by commit log message */ struct grep_opt grep_filter; diff --git a/run-command.c b/run-command.c index 04712191e8..765c2ce056 100644 --- a/run-command.c +++ b/run-command.c @@ -273,7 +273,8 @@ int start_command(struct child_process *cmd) { int need_in, need_out, need_err; int fdin[2], fdout[2], fderr[2]; - int failed_errno = failed_errno; + int failed_errno; + char *str; /* * In case of errors we must keep the promise to close FDs @@ -286,6 +287,7 @@ int start_command(struct child_process *cmd) failed_errno = errno; if (cmd->out > 0) close(cmd->out); + str = "standard input"; goto fail_pipe; } cmd->in = fdin[1]; @@ -301,6 +303,7 @@ int start_command(struct child_process *cmd) close_pair(fdin); else if (cmd->in) close(cmd->in); + str = "standard output"; goto fail_pipe; } cmd->out = fdout[0]; @@ -318,9 +321,10 @@ int start_command(struct child_process *cmd) close_pair(fdout); else if (cmd->out) close(cmd->out); + str = "standard error"; fail_pipe: - error("cannot create pipe for %s: %s", - cmd->argv[0], strerror(failed_errno)); + error("cannot create %s pipe for %s: %s", + str, cmd->argv[0], strerror(failed_errno)); errno = failed_errno; return -1; } @@ -337,6 +341,7 @@ fail_pipe: notify_pipe[0] = notify_pipe[1] = -1; cmd->pid = fork(); + failed_errno = errno; if (!cmd->pid) { /* * Redirect the channel to write syscall error messages to @@ -416,7 +421,7 @@ fail_pipe: } if (cmd->pid < 0) error("cannot fork() for %s: %s", cmd->argv[0], - strerror(failed_errno = errno)); + strerror(errno)); else if (cmd->clean_on_exit) mark_child_for_cleanup(cmd->pid); @@ -735,6 +740,15 @@ int finish_async(struct async *async) #endif } +char *find_hook(const char *name) +{ + char *path = git_path("hooks/%s", name); + if (access(path, X_OK) < 0) + path = NULL; + + return path; +} + int run_hook(const char *index_file, const char *name, ...) { struct child_process hook; @@ -744,11 +758,13 @@ int run_hook(const char *index_file, const char *name, ...) va_list args; int ret; - if (access(git_path("hooks/%s", name), X_OK) < 0) + p = find_hook(name); + if (!p) return 0; + argv_array_push(&argv, p); + va_start(args, name); - argv_array_push(&argv, git_path("hooks/%s", name)); while ((p = va_arg(args, const char *))) argv_array_push(&argv, p); va_end(args); diff --git a/run-command.h b/run-command.h index 850c638f19..221ce33140 100644 --- a/run-command.h +++ b/run-command.h @@ -45,6 +45,7 @@ int start_command(struct child_process *); int finish_command(struct child_process *); int run_command(struct child_process *); +extern char *find_hook(const char *name); extern int run_hook(const char *index_file, const char *name, ...); #define RUN_COMMAND_NO_STDIN 1 diff --git a/send-pack.c b/send-pack.c index 1c375f0a28..97ab336097 100644 --- a/send-pack.c +++ b/send-pack.c @@ -230,6 +230,8 @@ int send_pack(struct send_pack_args *args, switch (ref->status) { case REF_STATUS_REJECT_NONFASTFORWARD: case REF_STATUS_REJECT_ALREADY_EXISTS: + case REF_STATUS_REJECT_FETCH_FIRST: + case REF_STATUS_REJECT_NEEDS_FORCE: case REF_STATUS_UPTODATE: continue; default: @@ -66,7 +66,14 @@ int check_filename(const char *prefix, const char *arg) const char *name; struct stat st; - name = prefix ? prefix_filename(prefix, strlen(prefix), arg) : arg; + if (!prefixcmp(arg, ":/")) { + if (arg[2] == '\0') /* ":/" is root dir, always exists */ + return 1; + name = arg + 2; + } else if (prefix) + name = prefix_filename(prefix, strlen(prefix), arg); + else + name = arg; if (!lstat(name, &st)) return 1; /* file exists */ if (errno == ENOENT || errno == ENOTDIR) @@ -200,10 +207,11 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char *copyfrom && *copyfrom != ')'; copyfrom = nextat) { size_t len = strcspn(copyfrom, ",)"); - if (copyfrom[len] == ')') - nextat = copyfrom + len; - else + if (copyfrom[len] == ',') nextat = copyfrom + len + 1; + else + /* handle ')' and '\0' */ + nextat = copyfrom + len; if (!len) continue; for (i = 0; i < ARRAY_SIZE(pathspec_magic); i++) @@ -216,8 +224,9 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char die("Invalid pathspec magic '%.*s' in '%s'", (int) len, copyfrom, elt); } - if (*copyfrom == ')') - copyfrom++; + if (*copyfrom != ')') + die("Missing ')' at the end of pathspec magic in '%s'", elt); + copyfrom++; } else { /* shorthand */ for (copyfrom = elt + 1; @@ -246,6 +255,25 @@ static const char *prefix_pathspec(const char *prefix, int prefixlen, const char return prefix_path(prefix, prefixlen, copyfrom); } +/* + * N.B. get_pathspec() is deprecated in favor of the "struct pathspec" + * based interface - see pathspec_magic above. + * + * Arguments: + * - prefix - a path relative to the root of the working tree + * - pathspec - a list of paths underneath the prefix path + * + * Iterates over pathspec, prepending each path with prefix, + * and return the resulting list. + * + * If pathspec is empty, return a singleton list containing prefix. + * + * If pathspec and prefix are both empty, return an empty list. + * + * This is typically used by built-in commands such as add.c, in order + * to normalize argv arguments provided to the built-in into a list of + * paths to process, all relative to the root of the working tree. + */ const char **get_pathspec(const char *prefix, const char **pathspec) { const char *entry = *pathspec; @@ -497,6 +525,12 @@ static const char *setup_explicit_git_dir(const char *gitdirenv, set_git_work_tree(core_worktree); } } + else if (!git_env_bool(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, 1)) { + /* #16d */ + set_git_dir(gitdirenv); + free(gitfile); + return NULL; + } else /* #2, #10 */ set_git_work_tree("."); @@ -575,6 +609,8 @@ static const char *setup_bare_git_dir(char *cwd, int offset, int len, int *nongi if (check_repository_format_gently(".", nongit_ok)) return NULL; + setenv(GIT_IMPLICIT_WORK_TREE_ENVIRONMENT, "0", 1); + /* --work-tree is set without --git-dir; use discovered one */ if (getenv(GIT_WORK_TREE_ENVIRONMENT) || git_work_tree_cfg) { const char *gitdir; @@ -624,22 +660,32 @@ static dev_t get_device_or_die(const char *path, const char *prefix, int prefix_ /* * A "string_list_each_func_t" function that canonicalizes an entry * from GIT_CEILING_DIRECTORIES using real_path_if_valid(), or - * discards it if unusable. + * discards it if unusable. The presence of an empty entry in + * GIT_CEILING_DIRECTORIES turns off canonicalization for all + * subsequent entries. */ static int canonicalize_ceiling_entry(struct string_list_item *item, - void *unused) + void *cb_data) { + int *empty_entry_found = cb_data; char *ceil = item->string; - const char *real_path; - if (!*ceil || !is_absolute_path(ceil)) + if (!*ceil) { + *empty_entry_found = 1; return 0; - real_path = real_path_if_valid(ceil); - if (!real_path) + } else if (!is_absolute_path(ceil)) { return 0; - free(item->string); - item->string = xstrdup(real_path); - return 1; + } else if (*empty_entry_found) { + /* Keep entry but do not canonicalize it */ + return 1; + } else { + const char *real_path = real_path_if_valid(ceil); + if (!real_path) + return 0; + free(item->string); + item->string = xstrdup(real_path); + return 1; + } } /* @@ -679,9 +725,11 @@ static const char *setup_git_directory_gently_1(int *nongit_ok) return setup_explicit_git_dir(gitdirenv, cwd, len, nongit_ok); if (env_ceiling_dirs) { + int empty_entry_found = 0; + string_list_split(&ceiling_dirs, env_ceiling_dirs, PATH_SEP, -1); filter_string_list(&ceiling_dirs, 0, - canonicalize_ceiling_entry, NULL); + canonicalize_ceiling_entry, &empty_entry_found); ceil_offset = longest_ancestor_length(cwd, &ceiling_dirs); string_list_clear(&ceiling_dirs, 0); } @@ -756,9 +804,9 @@ const char *setup_git_directory_gently(int *nongit_ok) prefix = setup_git_directory_gently_1(nongit_ok); if (prefix) - setenv("GIT_PREFIX", prefix, 1); + setenv(GIT_PREFIX_ENVIRONMENT, prefix, 1); else - setenv("GIT_PREFIX", "", 1); + setenv(GIT_PREFIX_ENVIRONMENT, "", 1); if (startup_info) { startup_info->have_repository = !nongit_ok || !*nongit_ok; diff --git a/sha1_file.c b/sha1_file.c index 40b23297b2..16967d3b9a 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -21,6 +21,7 @@ #include "sha1-lookup.h" #include "bulk-checkin.h" #include "streaming.h" +#include "dir.h" #ifndef O_NOATIME #if defined(__linux__) && (defined(__i386__) || defined(__PPC__)) @@ -1000,6 +1001,63 @@ void install_packed_git(struct packed_git *pack) packed_git = pack; } +void (*report_garbage)(const char *desc, const char *path); + +static void report_helper(const struct string_list *list, + int seen_bits, int first, int last) +{ + const char *msg; + switch (seen_bits) { + case 0: + msg = "no corresponding .idx nor .pack"; + break; + case 1: + msg = "no corresponding .idx"; + break; + case 2: + msg = "no corresponding .pack"; + break; + default: + return; + } + for (; first < last; first++) + report_garbage(msg, list->items[first].string); +} + +static void report_pack_garbage(struct string_list *list) +{ + int i, baselen = -1, first = 0, seen_bits = 0; + + if (!report_garbage) + return; + + sort_string_list(list); + + for (i = 0; i < list->nr; i++) { + const char *path = list->items[i].string; + if (baselen != -1 && + strncmp(path, list->items[first].string, baselen)) { + report_helper(list, seen_bits, first, i); + baselen = -1; + seen_bits = 0; + } + if (baselen == -1) { + const char *dot = strrchr(path, '.'); + if (!dot) { + report_garbage("garbage found", path); + continue; + } + baselen = dot - path + 1; + first = i; + } + if (!strcmp(path + baselen, "pack")) + seen_bits |= 1; + else if (!strcmp(path + baselen, "idx")) + seen_bits |= 2; + } + report_helper(list, seen_bits, first, list->nr); +} + static void prepare_packed_git_one(char *objdir, int local) { /* Ensure that this buffer is large enough so that we can @@ -1009,6 +1067,7 @@ static void prepare_packed_git_one(char *objdir, int local) int len; DIR *dir; struct dirent *de; + struct string_list garbage = STRING_LIST_INIT_DUP; sprintf(path, "%s/pack", objdir); len = strlen(path); @@ -1024,29 +1083,49 @@ static void prepare_packed_git_one(char *objdir, int local) int namelen = strlen(de->d_name); struct packed_git *p; - if (!has_extension(de->d_name, ".idx")) + if (len + namelen + 1 > sizeof(path)) { + if (report_garbage) { + struct strbuf sb = STRBUF_INIT; + strbuf_addf(&sb, "%.*s/%s", len - 1, path, de->d_name); + report_garbage("path too long", sb.buf); + strbuf_release(&sb); + } continue; + } - if (len + namelen + 1 > sizeof(path)) + if (is_dot_or_dotdot(de->d_name)) continue; - /* Don't reopen a pack we already have. */ strcpy(path + len, de->d_name); - for (p = packed_git; p; p = p->next) { - if (!memcmp(path, p->pack_name, len + namelen - 4)) - break; + + if (has_extension(de->d_name, ".idx")) { + /* Don't reopen a pack we already have. */ + for (p = packed_git; p; p = p->next) { + if (!memcmp(path, p->pack_name, len + namelen - 4)) + break; + } + if (p == NULL && + /* + * See if it really is a valid .idx file with + * corresponding .pack file that we can map. + */ + (p = add_packed_git(path, len + namelen, local)) != NULL) + install_packed_git(p); } - if (p) - continue; - /* See if it really is a valid .idx file with corresponding - * .pack file that we can map. - */ - p = add_packed_git(path, len + namelen, local); - if (!p) + + if (!report_garbage) continue; - install_packed_git(p); + + if (has_extension(de->d_name, ".idx") || + has_extension(de->d_name, ".pack") || + has_extension(de->d_name, ".keep")) + string_list_append(&garbage, path); + else + report_garbage("garbage found", path); } closedir(dir); + report_pack_garbage(&garbage); + string_list_clear(&garbage, 0); } static int sort_pack(const void *a_, const void *b_) diff --git a/sha1_name.c b/sha1_name.c index 95003c77ea..2fbda48e02 100644 --- a/sha1_name.c +++ b/sha1_name.c @@ -856,8 +856,8 @@ static int get_sha1_oneline(const char *prefix, unsigned char *sha1, } struct grab_nth_branch_switch_cbdata { - long cnt, alloc; - struct strbuf *buf; + int remaining; + struct strbuf buf; }; static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, @@ -867,7 +867,6 @@ static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, struct grab_nth_branch_switch_cbdata *cb = cb_data; const char *match = NULL, *target = NULL; size_t len; - int nth; if (!prefixcmp(message, "checkout: moving from ")) { match = message + strlen("checkout: moving from "); @@ -876,11 +875,12 @@ static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, if (!match || !target) return 0; - - len = target - match; - nth = cb->cnt++ % cb->alloc; - strbuf_reset(&cb->buf[nth]); - strbuf_add(&cb->buf[nth], match, len); + if (--(cb->remaining) == 0) { + len = target - match; + strbuf_reset(&cb->buf); + strbuf_add(&cb->buf, match, len); + return 1; /* we are done */ + } return 0; } @@ -891,7 +891,7 @@ static int grab_nth_branch_switch(unsigned char *osha1, unsigned char *nsha1, static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf) { long nth; - int i, retval; + int retval; struct grab_nth_branch_switch_cbdata cb; const char *brace; char *num_end; @@ -901,34 +901,22 @@ static int interpret_nth_prior_checkout(const char *name, struct strbuf *buf) brace = strchr(name, '}'); if (!brace) return -1; - nth = strtol(name+3, &num_end, 10); + nth = strtol(name + 3, &num_end, 10); if (num_end != brace) return -1; if (nth <= 0) return -1; - cb.alloc = nth; - cb.buf = xmalloc(nth * sizeof(struct strbuf)); - for (i = 0; i < nth; i++) - strbuf_init(&cb.buf[i], 20); - cb.cnt = 0; + cb.remaining = nth; + strbuf_init(&cb.buf, 20); + retval = 0; - for_each_recent_reflog_ent("HEAD", grab_nth_branch_switch, 40960, &cb); - if (cb.cnt < nth) { - cb.cnt = 0; - for_each_reflog_ent("HEAD", grab_nth_branch_switch, &cb); + if (0 < for_each_reflog_ent_reverse("HEAD", grab_nth_branch_switch, &cb)) { + strbuf_reset(buf); + strbuf_add(buf, cb.buf.buf, cb.buf.len); + retval = brace - name + 1; } - if (cb.cnt < nth) - goto release_return; - i = cb.cnt % nth; - strbuf_reset(buf); - strbuf_add(buf, cb.buf[i].buf, cb.buf[i].len); - retval = brace-name+1; - -release_return: - for (i = 0; i < nth; i++) - strbuf_release(&cb.buf[i]); - free(cb.buf); + strbuf_release(&cb.buf); return retval; } @@ -1137,7 +1125,8 @@ int get_sha1_blob(const char *name, unsigned char *sha1) static void diagnose_invalid_sha1_path(const char *prefix, const char *filename, const unsigned char *tree_sha1, - const char *object_name) + const char *object_name, + int object_name_len) { struct stat st; unsigned char sha1[20]; @@ -1147,8 +1136,8 @@ static void diagnose_invalid_sha1_path(const char *prefix, prefix = ""; if (!lstat(filename, &st)) - die("Path '%s' exists on disk, but not in '%s'.", - filename, object_name); + die("Path '%s' exists on disk, but not in '%.*s'.", + filename, object_name_len, object_name); if (errno == ENOENT || errno == ENOTDIR) { char *fullname = xmalloc(strlen(filename) + strlen(prefix) + 1); @@ -1158,16 +1147,16 @@ static void diagnose_invalid_sha1_path(const char *prefix, if (!get_tree_entry(tree_sha1, fullname, sha1, &mode)) { die("Path '%s' exists, but not '%s'.\n" - "Did you mean '%s:%s' aka '%s:./%s'?", + "Did you mean '%.*s:%s' aka '%.*s:./%s'?", fullname, filename, - object_name, + object_name_len, object_name, fullname, - object_name, + object_name_len, object_name, filename); } - die("Path '%s' does not exist in '%s'", - filename, object_name); + die("Path '%s' does not exist in '%.*s'", + filename, object_name_len, object_name); } } @@ -1332,13 +1321,8 @@ static int get_sha1_with_context_1(const char *name, } if (*cp == ':') { unsigned char tree_sha1[20]; - char *object_name = NULL; - if (only_to_die) { - object_name = xmalloc(cp-name+1); - strncpy(object_name, name, cp-name); - object_name[cp-name] = '\0'; - } - if (!get_sha1_1(name, cp-name, tree_sha1, GET_SHA1_TREEISH)) { + int len = cp - name; + if (!get_sha1_1(name, len, tree_sha1, GET_SHA1_TREEISH)) { const char *filename = cp+1; char *new_filename = NULL; @@ -1348,8 +1332,8 @@ static int get_sha1_with_context_1(const char *name, ret = get_tree_entry(tree_sha1, filename, sha1, &oc->mode); if (ret && only_to_die) { diagnose_invalid_sha1_path(prefix, filename, - tree_sha1, object_name); - free(object_name); + tree_sha1, + name, len); } hashcpy(oc->tree, tree_sha1); strncpy(oc->path, filename, @@ -1360,7 +1344,7 @@ static int get_sha1_with_context_1(const char *name, return ret; } else { if (only_to_die) - die("Invalid object name '%s'.", object_name); + die("Invalid object name '%.*s'.", len, name); } } return ret; @@ -72,8 +72,14 @@ struct commit_list *get_shallow_commits(struct object_array *heads, int depth, } if (parse_commit(commit)) die("invalid commit"); - commit->object.flags |= not_shallow_flag; cur_depth++; + if (cur_depth >= depth) { + commit_list_insert(commit, &result); + commit->object.flags |= shallow_flag; + commit = NULL; + continue; + } + commit->object.flags |= not_shallow_flag; for (p = commit->parents, commit = NULL; p; p = p->next) { if (!p->item->util) { int *pointer = xmalloc(sizeof(int)); @@ -6,6 +6,7 @@ #define COMMAND_DIR "git-shell-commands" #define HELP_COMMAND COMMAND_DIR "/help" +#define NOLOGIN_COMMAND COMMAND_DIR "/no-interactive-login" static int do_generic_cmd(const char *me, char *arg) { @@ -65,6 +66,18 @@ static void run_shell(void) { int done = 0; static const char *help_argv[] = { HELP_COMMAND, NULL }; + + if (!access(NOLOGIN_COMMAND, F_OK)) { + /* Interactive login disabled. */ + const char *argv[] = { NOLOGIN_COMMAND, NULL }; + int status; + + status = run_command_v_opt(argv, 0); + if (status < 0) + exit(127); + exit(status); + } + /* Print help if enabled */ run_command_v_opt(help_argv, RUN_SILENT_EXEC_FAILURE); @@ -204,6 +204,54 @@ void strbuf_addf(struct strbuf *sb, const char *fmt, ...) va_end(ap); } +static void add_lines(struct strbuf *out, + const char *prefix1, + const char *prefix2, + const char *buf, size_t size) +{ + while (size) { + const char *prefix; + const char *next = memchr(buf, '\n', size); + next = next ? (next + 1) : (buf + size); + + prefix = (prefix2 && buf[0] == '\n') ? prefix2 : prefix1; + strbuf_addstr(out, prefix); + strbuf_add(out, buf, next - buf); + size -= next - buf; + buf = next; + } + strbuf_complete_line(out); +} + +void strbuf_add_commented_lines(struct strbuf *out, const char *buf, size_t size) +{ + static char prefix1[3]; + static char prefix2[2]; + + if (prefix1[0] != comment_line_char) { + sprintf(prefix1, "%c ", comment_line_char); + sprintf(prefix2, "%c", comment_line_char); + } + add_lines(out, prefix1, prefix2, buf, size); +} + +void strbuf_commented_addf(struct strbuf *sb, const char *fmt, ...) +{ + va_list params; + struct strbuf buf = STRBUF_INIT; + int incomplete_line = sb->len && sb->buf[sb->len - 1] != '\n'; + + va_start(params, fmt); + strbuf_vaddf(&buf, fmt, params); + va_end(params); + + strbuf_add_commented_lines(sb, buf.buf, buf.len); + if (incomplete_line) + sb->buf[--sb->len] = '\0'; + + strbuf_release(&buf); +} + void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap) { int len; @@ -414,15 +462,7 @@ int strbuf_read_file(struct strbuf *sb, const char *path, size_t hint) void strbuf_add_lines(struct strbuf *out, const char *prefix, const char *buf, size_t size) { - while (size) { - const char *next = memchr(buf, '\n', size); - next = next ? (next + 1) : (buf + size); - strbuf_addstr(out, prefix); - strbuf_add(out, buf, next - buf); - size -= next - buf; - buf = next; - } - strbuf_complete_line(out); + add_lines(out, prefix, NULL, buf, size); } void strbuf_addstr_xml_quoted(struct strbuf *buf, const char *s) @@ -110,6 +110,8 @@ extern void strbuf_remove(struct strbuf *, size_t pos, size_t len); extern void strbuf_splice(struct strbuf *, size_t pos, size_t len, const void *, size_t); +extern void strbuf_add_commented_lines(struct strbuf *out, const char *buf, size_t size); + extern void strbuf_add(struct strbuf *, const void *, size_t); static inline void strbuf_addstr(struct strbuf *sb, const char *s) { strbuf_add(sb, s, strlen(s)); @@ -131,6 +133,8 @@ extern void strbuf_addbuf_percentquote(struct strbuf *dst, const struct strbuf * __attribute__((format (printf,2,3))) extern void strbuf_addf(struct strbuf *sb, const char *fmt, ...); +__attribute__((format (printf, 2, 3))) +extern void strbuf_commented_addf(struct strbuf *sb, const char *fmt, ...); __attribute__((format (printf,2,0))) extern void strbuf_vaddf(struct strbuf *sb, const char *fmt, va_list ap); diff --git a/string-list.c b/string-list.c index 480173fe6d..aabb25ef4c 100644 --- a/string-list.c +++ b/string-list.c @@ -7,10 +7,11 @@ static int get_entry_index(const struct string_list *list, const char *string, int *exact_match) { int left = -1, right = list->nr; + compare_strings_fn cmp = list->cmp ? list->cmp : strcmp; while (left + 1 < right) { int middle = (left + right) / 2; - int compare = strcmp(string, list->items[middle].string); + int compare = cmp(string, list->items[middle].string); if (compare < 0) right = middle; else if (compare > 0) @@ -96,8 +97,9 @@ void string_list_remove_duplicates(struct string_list *list, int free_util) { if (list->nr > 1) { int src, dst; + compare_strings_fn cmp = list->cmp ? list->cmp : strcmp; for (src = dst = 1; src < list->nr; src++) { - if (!strcmp(list->items[dst - 1].string, list->items[src].string)) { + if (!cmp(list->items[dst - 1].string, list->items[src].string)) { if (list->strdup_strings) free(list->items[src].string); if (free_util) @@ -210,15 +212,20 @@ struct string_list_item *string_list_append(struct string_list *list, list->strdup_strings ? xstrdup(string) : (char *)string); } +/* Yuck */ +static compare_strings_fn compare_for_qsort; + +/* Only call this from inside sort_string_list! */ static int cmp_items(const void *a, const void *b) { const struct string_list_item *one = a; const struct string_list_item *two = b; - return strcmp(one->string, two->string); + return compare_for_qsort(one->string, two->string); } void sort_string_list(struct string_list *list) { + compare_for_qsort = list->cmp ? list->cmp : strcmp; qsort(list->items, list->nr, sizeof(*list->items), cmp_items); } @@ -226,8 +233,10 @@ struct string_list_item *unsorted_string_list_lookup(struct string_list *list, const char *string) { int i; + compare_strings_fn cmp = list->cmp ? list->cmp : strcmp; + for (i = 0; i < list->nr; i++) - if (!strcmp(string, list->items[i].string)) + if (!cmp(string, list->items[i].string)) return list->items + i; return NULL; } diff --git a/string-list.h b/string-list.h index db1284861a..de6769c92d 100644 --- a/string-list.h +++ b/string-list.h @@ -5,10 +5,14 @@ struct string_list_item { char *string; void *util; }; + +typedef int (*compare_strings_fn)(const char *, const char *); + struct string_list { struct string_list_item *items; unsigned int nr, alloc; unsigned int strdup_strings:1; + compare_strings_fn cmp; /* NULL uses strcmp() */ }; #define STRING_LIST_INIT_NODUP { NULL, 0, 0, 0 } diff --git a/submodule.c b/submodule.c index 2f55436234..9ba1496543 100644 --- a/submodule.c +++ b/submodule.c @@ -126,45 +126,44 @@ void gitmodules_config(void) int parse_submodule_config_option(const char *var, const char *value) { - int len; struct string_list_item *config; - struct strbuf submodname = STRBUF_INIT; + const char *name, *key; + int namelen; - var += 10; /* Skip "submodule." */ + if (parse_config_key(var, "submodule", &name, &namelen, &key) < 0 || !name) + return 0; - len = strlen(var); - if ((len > 5) && !strcmp(var + len - 5, ".path")) { - strbuf_add(&submodname, var, len - 5); + if (!strcmp(key, "path")) { config = unsorted_string_list_lookup(&config_name_for_path, value); if (config) free(config->util); else config = string_list_append(&config_name_for_path, xstrdup(value)); - config->util = strbuf_detach(&submodname, NULL); - strbuf_release(&submodname); - } else if ((len > 23) && !strcmp(var + len - 23, ".fetchrecursesubmodules")) { - strbuf_add(&submodname, var, len - 23); - config = unsorted_string_list_lookup(&config_fetch_recurse_submodules_for_name, submodname.buf); + config->util = xmemdupz(name, namelen); + } else if (!strcmp(key, "fetchrecursesubmodules")) { + char *name_cstr = xmemdupz(name, namelen); + config = unsorted_string_list_lookup(&config_fetch_recurse_submodules_for_name, name_cstr); if (!config) - config = string_list_append(&config_fetch_recurse_submodules_for_name, - strbuf_detach(&submodname, NULL)); + config = string_list_append(&config_fetch_recurse_submodules_for_name, name_cstr); + else + free(name_cstr); config->util = (void *)(intptr_t)parse_fetch_recurse_submodules_arg(var, value); - strbuf_release(&submodname); - } else if ((len > 7) && !strcmp(var + len - 7, ".ignore")) { + } else if (!strcmp(key, "ignore")) { + char *name_cstr; + if (strcmp(value, "untracked") && strcmp(value, "dirty") && strcmp(value, "all") && strcmp(value, "none")) { warning("Invalid parameter \"%s\" for config option \"submodule.%s.ignore\"", value, var); return 0; } - strbuf_add(&submodname, var, len - 7); - config = unsorted_string_list_lookup(&config_ignore_for_name, submodname.buf); - if (config) + name_cstr = xmemdupz(name, namelen); + config = unsorted_string_list_lookup(&config_ignore_for_name, name_cstr); + if (config) { free(config->util); - else - config = string_list_append(&config_ignore_for_name, - strbuf_detach(&submodname, NULL)); - strbuf_release(&submodname); + free(name_cstr); + } else + config = string_list_append(&config_ignore_for_name, name_cstr); config->util = xstrdup(value); return 0; } diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index 7061dce7e5..2098b9ba05 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -8,7 +8,8 @@ TEST_NO_CREATE_REPO=NoThanks . ./test-lib.sh -if ! test_have_prereq PYTHON; then +if ! test_have_prereq PYTHON +then skip_all='skipping git p4 tests; python not available' test_done fi @@ -17,6 +18,24 @@ fi test_done } +# On cygwin, the NT version of Perforce can be used. When giving +# it paths, either on the command-line or in client specifications, +# be sure to use the native windows form. +# +# Older versions of perforce were available compiled natively for +# cygwin. Those do not accept native windows paths, so make sure +# not to convert for them. +native_path() { + path="$1" && + if test_have_prereq CYGWIN && ! p4 -V | grep -q CYGWIN + then + path=$(cygpath --windows "$path") + else + path=$(test-path-utils real_path "$path") + fi && + echo "$path" +} + # Try to pick a unique port: guess a large number, then hope # no more than one of each test is running. # @@ -32,7 +51,7 @@ P4EDITOR=: export P4PORT P4CLIENT P4EDITOR db="$TRASH_DIRECTORY/db" -cli=$(test-path-utils real_path "$TRASH_DIRECTORY/cli") +cli="$TRASH_DIRECTORY/cli" git="$TRASH_DIRECTORY/git" pidfile="$TRASH_DIRECTORY/p4d.pid" @@ -40,8 +59,11 @@ start_p4d() { mkdir -p "$db" "$cli" "$git" && rm -f "$pidfile" && ( - p4d -q -r "$db" -p $P4DPORT & - echo $! >"$pidfile" + cd "$db" && + { + p4d -q -p $P4DPORT & + echo $! >"$pidfile" + } ) && # This gives p4d a long time to start up, as it can be @@ -74,15 +96,8 @@ start_p4d() { fi # build a client - ( - cd "$cli" && - p4 client -i <<-EOF - Client: client - Description: client - Root: $cli - View: //depot/... //client/... - EOF - ) + client_view "//depot/... //client/..." && + return 0 } @@ -123,13 +138,26 @@ marshal_dump() { client_view() { ( cat <<-EOF && - Client: client - Description: client + Client: $P4CLIENT + Description: $P4CLIENT Root: $cli + AltRoots: $(native_path "$cli") + LineEnd: unix View: EOF - for arg ; do - printf "\t$arg\n" - done + printf "\t%s\n" "$@" ) | p4 client -i } + +is_cli_file_writeable() { + # cygwin version of p4 does not set read-only attr, + # will be marked 444 but -w is true + file="$1" && + if test_have_prereq CYGWIN && p4 -V | grep -q CYGWIN + then + stat=$(stat --format=%a "$file") && + test $stat = 644 + else + test -w "$file" + fi +} diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index 199f22c231..c5e55b190b 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -148,7 +148,7 @@ stop_httpd () { convert_to_rev_db () { "$PERL_PATH" -w -- - "$@" <<\EOF use strict; -@ARGV == 2 or die "Usage: convert_to_rev_db <input> <output>"; +@ARGV == 2 or die "usage: convert_to_rev_db <input> <output>"; open my $wr, '+>', $ARGV[1] or die "$!: couldn't open: $ARGV[1]"; open my $rd, '<', $ARGV[0] or die "$!: couldn't open: $ARGV[0]"; my $size = (stat($rd))[7]; diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh index 02f442bfad..895b9258b0 100644 --- a/t/lib-httpd.sh +++ b/t/lib-httpd.sh @@ -80,6 +80,7 @@ fi prepare_httpd() { mkdir -p "$HTTPD_DOCUMENT_ROOT_PATH" cp "$TEST_PATH"/passwd "$HTTPD_ROOT_PATH" + cp "$TEST_PATH"/broken-smart-http.sh "$HTTPD_ROOT_PATH" ln -s "$LIB_HTTPD_MODULE_PATH" "$HTTPD_ROOT_PATH/modules" diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf index fe76e84b74..938b4cf803 100644 --- a/t/lib-httpd/apache.conf +++ b/t/lib-httpd/apache.conf @@ -62,9 +62,13 @@ Alias /auth/dumb/ www/auth/dumb/ SetEnv GIT_COMMITTER_EMAIL custom@example.com </LocationMatch> ScriptAliasMatch /smart_*[^/]*/(.*) ${GIT_EXEC_PATH}/git-http-backend/$1 +ScriptAlias /broken_smart/ broken-smart-http.sh/ <Directory ${GIT_EXEC_PATH}> Options FollowSymlinks </Directory> +<Files broken-smart-http.sh> + Options ExecCGI +</Files> <Files ${GIT_EXEC_PATH}/git-http-backend> Options ExecCGI </Files> diff --git a/t/lib-httpd/broken-smart-http.sh b/t/lib-httpd/broken-smart-http.sh new file mode 100755 index 0000000000..f7ebfffa80 --- /dev/null +++ b/t/lib-httpd/broken-smart-http.sh @@ -0,0 +1,11 @@ +#!/bin/sh +printf "Content-Type: text/%s\n" "html" +echo +printf "%s\n" "001e# service=git-upload-pack" +printf "%s" "0000" +printf "%s%c%s%s\n" \ + "00a58681d9f286a48b08f37b3a095330da16689e3693 HEAD" \ + 0 \ + " include-tag multi_ack_detailed multi_ack ofs-delta" \ + " side-band side-band-64k thin-pack no-progress shallow no-done " +printf "%s" "0000" diff --git a/t/perf/README b/t/perf/README index b2dbad4d50..c552f561bf 100644 --- a/t/perf/README +++ b/t/perf/README @@ -56,7 +56,7 @@ You can set the following variables (also in your config.mak): GIT_PERF_REPEAT_COUNT Number of times a test should be repeated for best-of-N - measurements. Defaults to 5. + measurements. Defaults to 3. GIT_PERF_MAKE_OPTS Options to use when automatically building a git tree for diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh index 43b25137e9..0b98b6f8d0 100755 --- a/t/t0003-attributes.sh +++ b/t/t0003-attributes.sh @@ -198,7 +198,8 @@ test_expect_success 'root subdir attribute test' ' test_expect_success 'negative patterns' ' echo "!f test=bar" >.gitattributes && - test_must_fail git check-attr test -- f + git check-attr test -- '"'"'!f'"'"' 2>errors && + test_i18ngrep "Negative patterns are ignored" errors ' test_expect_success 'patterns starting with exclamation' ' diff --git a/t/t0008-ignores.sh b/t/t0008-ignores.sh new file mode 100755 index 0000000000..9c1bde1fd6 --- /dev/null +++ b/t/t0008-ignores.sh @@ -0,0 +1,652 @@ +#!/bin/sh + +test_description=check-ignore + +. ./test-lib.sh + +init_vars () { + global_excludes="$(pwd)/global-excludes" +} + +enable_global_excludes () { + init_vars && + git config core.excludesfile "$global_excludes" +} + +expect_in () { + dest="$HOME/expected-$1" text="$2" + if test -z "$text" + then + >"$dest" # avoid newline + else + echo "$text" >"$dest" + fi +} + +expect () { + expect_in stdout "$1" +} + +expect_from_stdin () { + cat >"$HOME/expected-stdout" +} + +test_stderr () { + expected="$1" + expect_in stderr "$1" && + test_cmp "$HOME/expected-stderr" "$HOME/stderr" +} + +stderr_contains () { + regexp="$1" + if grep "$regexp" "$HOME/stderr" + then + return 0 + else + echo "didn't find /$regexp/ in $HOME/stderr" + cat "$HOME/stderr" + return 1 + fi +} + +stderr_empty_on_success () { + expect_code="$1" + if test $expect_code = 0 + then + test_stderr "" + else + # If we expect failure then stderr might or might not be empty + # due to --quiet - the caller can check its contents + return 0 + fi +} + +test_check_ignore () { + args="$1" expect_code="${2:-0}" global_args="$3" + + init_vars && + rm -f "$HOME/stdout" "$HOME/stderr" "$HOME/cmd" && + echo git $global_args check-ignore $quiet_opt $verbose_opt $args \ + >"$HOME/cmd" && + test_expect_code "$expect_code" \ + git $global_args check-ignore $quiet_opt $verbose_opt $args \ + >"$HOME/stdout" 2>"$HOME/stderr" && + test_cmp "$HOME/expected-stdout" "$HOME/stdout" && + stderr_empty_on_success "$expect_code" +} + +# Runs the same code with 3 different levels of output verbosity, +# expecting success each time. Takes advantage of the fact that +# check-ignore --verbose output is the same as normal output except +# for the extra first column. +# +# Arguments: +# - (optional) prereqs for this test, e.g. 'SYMLINKS' +# - test name +# - output to expect from -v / --verbose mode +# - code to run (should invoke test_check_ignore) +test_expect_success_multi () { + prereq= + if test $# -eq 4 + then + prereq=$1 + shift + fi + testname="$1" expect_verbose="$2" code="$3" + + expect=$( echo "$expect_verbose" | sed -e 's/.* //' ) + + test_expect_success $prereq "$testname" ' + expect "$expect" && + eval "$code" + ' + + for quiet_opt in '-q' '--quiet' + do + test_expect_success $prereq "$testname${quiet_opt:+ with $quiet_opt}" " + expect '' && + $code + " + done + quiet_opt= + + for verbose_opt in '-v' '--verbose' + do + test_expect_success $prereq "$testname${verbose_opt:+ with $verbose_opt}" " + expect '$expect_verbose' && + $code + " + done + verbose_opt= +} + +test_expect_success 'setup' ' + init_vars && + mkdir -p a/b/ignored-dir a/submodule b && + if test_have_prereq SYMLINKS + then + ln -s b a/symlink + fi && + ( + cd a/submodule && + git init && + echo a >a && + git add a && + git commit -m"commit in submodule" + ) && + git add a/submodule && + cat <<-\EOF >.gitignore && + one + ignored-* + top-level-dir/ + EOF + for dir in . a + do + : >$dir/not-ignored && + : >$dir/ignored-and-untracked && + : >$dir/ignored-but-in-index + done && + git add -f ignored-but-in-index a/ignored-but-in-index && + cat <<-\EOF >a/.gitignore && + two* + *three + EOF + cat <<-\EOF >a/b/.gitignore && + four + five + # this comment should affect the line numbers + six + ignored-dir/ + # and so should this blank line: + + !on* + !two + EOF + echo "seven" >a/b/ignored-dir/.gitignore && + test -n "$HOME" && + cat <<-\EOF >"$global_excludes" && + globalone + !globaltwo + globalthree + EOF + cat <<-\EOF >>.git/info/exclude + per-repo + EOF +' + +############################################################################ +# +# test invalid inputs + +test_expect_success_multi '. corner-case' '' ' + test_check_ignore . 1 +' + +test_expect_success_multi 'empty command line' '' ' + test_check_ignore "" 128 && + stderr_contains "fatal: no path specified" +' + +test_expect_success_multi '--stdin with empty STDIN' '' ' + test_check_ignore "--stdin" 1 </dev/null && + if test -n "$quiet_opt"; then + test_stderr "" + else + test_stderr "no pathspec given." + fi +' + +test_expect_success '-q with multiple args' ' + expect "" && + test_check_ignore "-q one two" 128 && + stderr_contains "fatal: --quiet is only valid with a single pathname" +' + +test_expect_success '--quiet with multiple args' ' + expect "" && + test_check_ignore "--quiet one two" 128 && + stderr_contains "fatal: --quiet is only valid with a single pathname" +' + +for verbose_opt in '-v' '--verbose' +do + for quiet_opt in '-q' '--quiet' + do + test_expect_success "$quiet_opt $verbose_opt" " + expect '' && + test_check_ignore '$quiet_opt $verbose_opt foo' 128 && + stderr_contains 'fatal: cannot have both --quiet and --verbose' + " + done +done + +test_expect_success '--quiet with multiple args' ' + expect "" && + test_check_ignore "--quiet one two" 128 && + stderr_contains "fatal: --quiet is only valid with a single pathname" +' + +test_expect_success_multi 'erroneous use of --' '' ' + test_check_ignore "--" 128 && + stderr_contains "fatal: no path specified" +' + +test_expect_success_multi '--stdin with superfluous arg' '' ' + test_check_ignore "--stdin foo" 128 && + stderr_contains "fatal: cannot specify pathnames with --stdin" +' + +test_expect_success_multi '--stdin -z with superfluous arg' '' ' + test_check_ignore "--stdin -z foo" 128 && + stderr_contains "fatal: cannot specify pathnames with --stdin" +' + +test_expect_success_multi '-z without --stdin' '' ' + test_check_ignore "-z" 128 && + stderr_contains "fatal: -z only makes sense with --stdin" +' + +test_expect_success_multi '-z without --stdin and superfluous arg' '' ' + test_check_ignore "-z foo" 128 && + stderr_contains "fatal: -z only makes sense with --stdin" +' + +test_expect_success_multi 'needs work tree' '' ' + ( + cd .git && + test_check_ignore "foo" 128 + ) && + stderr_contains "fatal: This operation must be run in a work tree" +' + +############################################################################ +# +# test standard ignores + +# First make sure that the presence of a file in the working tree +# does not impact results, but that the presence of a file in the +# index does. + +for subdir in '' 'a/' +do + if test -z "$subdir" + then + where="at top-level" + else + where="in subdir $subdir" + fi + + test_expect_success_multi "non-existent file $where not ignored" '' " + test_check_ignore '${subdir}non-existent' 1 + " + + test_expect_success_multi "non-existent file $where ignored" \ + ".gitignore:1:one ${subdir}one" " + test_check_ignore '${subdir}one' + " + + test_expect_success_multi "existing untracked file $where not ignored" '' " + test_check_ignore '${subdir}not-ignored' 1 + " + + test_expect_success_multi "existing tracked file $where not ignored" '' " + test_check_ignore '${subdir}ignored-but-in-index' 1 + " + + test_expect_success_multi "existing untracked file $where ignored" \ + ".gitignore:2:ignored-* ${subdir}ignored-and-untracked" " + test_check_ignore '${subdir}ignored-and-untracked' + " +done + +# Having established the above, from now on we mostly test against +# files which do not exist in the working tree or index. + +test_expect_success 'sub-directory local ignore' ' + expect "a/3-three" && + test_check_ignore "a/3-three a/three-not-this-one" +' + +test_expect_success 'sub-directory local ignore with --verbose' ' + expect "a/.gitignore:2:*three a/3-three" && + test_check_ignore "--verbose a/3-three a/three-not-this-one" +' + +test_expect_success 'local ignore inside a sub-directory' ' + expect "3-three" && + ( + cd a && + test_check_ignore "3-three three-not-this-one" + ) +' +test_expect_success 'local ignore inside a sub-directory with --verbose' ' + expect "a/.gitignore:2:*three 3-three" && + ( + cd a && + test_check_ignore "--verbose 3-three three-not-this-one" + ) +' + +test_expect_success_multi 'nested include' \ + 'a/b/.gitignore:8:!on* a/b/one' ' + test_check_ignore "a/b/one" +' + +############################################################################ +# +# test ignored sub-directories + +test_expect_success_multi 'ignored sub-directory' \ + 'a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir' ' + test_check_ignore "a/b/ignored-dir" +' + +test_expect_success 'multiple files inside ignored sub-directory' ' + expect_from_stdin <<-\EOF && + a/b/ignored-dir/foo + a/b/ignored-dir/twoooo + a/b/ignored-dir/seven + EOF + test_check_ignore "a/b/ignored-dir/foo a/b/ignored-dir/twoooo a/b/ignored-dir/seven" +' + +test_expect_success 'multiple files inside ignored sub-directory with -v' ' + expect_from_stdin <<-\EOF && + a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir/foo + a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir/twoooo + a/b/.gitignore:5:ignored-dir/ a/b/ignored-dir/seven + EOF + test_check_ignore "-v a/b/ignored-dir/foo a/b/ignored-dir/twoooo a/b/ignored-dir/seven" +' + +test_expect_success 'cd to ignored sub-directory' ' + expect_from_stdin <<-\EOF && + foo + twoooo + ../one + seven + ../../one + EOF + ( + cd a/b/ignored-dir && + test_check_ignore "foo twoooo ../one seven ../../one" + ) +' + +test_expect_success 'cd to ignored sub-directory with -v' ' + expect_from_stdin <<-\EOF && + a/b/.gitignore:5:ignored-dir/ foo + a/b/.gitignore:5:ignored-dir/ twoooo + a/b/.gitignore:8:!on* ../one + a/b/.gitignore:5:ignored-dir/ seven + .gitignore:1:one ../../one + EOF + ( + cd a/b/ignored-dir && + test_check_ignore "-v foo twoooo ../one seven ../../one" + ) +' + +############################################################################ +# +# test handling of symlinks + +test_expect_success_multi SYMLINKS 'symlink' '' ' + test_check_ignore "a/symlink" 1 +' + +test_expect_success_multi SYMLINKS 'beyond a symlink' '' ' + test_check_ignore "a/symlink/foo" 128 && + test_stderr "fatal: '\''a/symlink/foo'\'' is beyond a symbolic link" +' + +test_expect_success_multi SYMLINKS 'beyond a symlink from subdirectory' '' ' + ( + cd a && + test_check_ignore "symlink/foo" 128 + ) && + test_stderr "fatal: '\''symlink/foo'\'' is beyond a symbolic link" +' + +############################################################################ +# +# test handling of submodules + +test_expect_success_multi 'submodule' '' ' + test_check_ignore "a/submodule/one" 128 && + test_stderr "fatal: Path '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''" +' + +test_expect_success_multi 'submodule from subdirectory' '' ' + ( + cd a && + test_check_ignore "submodule/one" 128 + ) && + test_stderr "fatal: Path '\''a/submodule/one'\'' is in submodule '\''a/submodule'\''" +' + +############################################################################ +# +# test handling of global ignore files + +test_expect_success 'global ignore not yet enabled' ' + expect_from_stdin <<-\EOF && + .git/info/exclude:7:per-repo per-repo + a/.gitignore:2:*three a/globalthree + .git/info/exclude:7:per-repo a/per-repo + EOF + test_check_ignore "-v globalone per-repo a/globalthree a/per-repo not-ignored a/globaltwo" +' + +test_expect_success 'global ignore' ' + enable_global_excludes && + expect_from_stdin <<-\EOF && + globalone + per-repo + globalthree + a/globalthree + a/per-repo + globaltwo + EOF + test_check_ignore "globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo" +' + +test_expect_success 'global ignore with -v' ' + enable_global_excludes && + expect_from_stdin <<-EOF && + $global_excludes:1:globalone globalone + .git/info/exclude:7:per-repo per-repo + $global_excludes:3:globalthree globalthree + a/.gitignore:2:*three a/globalthree + .git/info/exclude:7:per-repo a/per-repo + $global_excludes:2:!globaltwo globaltwo + EOF + test_check_ignore "-v globalone per-repo globalthree a/globalthree a/per-repo not-ignored globaltwo" +' + +############################################################################ +# +# test --stdin + +cat <<-\EOF >stdin + one + not-ignored + a/one + a/not-ignored + a/b/on + a/b/one + a/b/one one + "a/b/one two" + "a/b/one\"three" + a/b/not-ignored + a/b/two + a/b/twooo + globaltwo + a/globaltwo + a/b/globaltwo + b/globaltwo +EOF +cat <<-\EOF >expected-default + one + a/one + a/b/on + a/b/one + a/b/one one + a/b/one two + "a/b/one\"three" + a/b/two + a/b/twooo + globaltwo + a/globaltwo + a/b/globaltwo + b/globaltwo +EOF +cat <<-EOF >expected-verbose + .gitignore:1:one one + .gitignore:1:one a/one + a/b/.gitignore:8:!on* a/b/on + a/b/.gitignore:8:!on* a/b/one + a/b/.gitignore:8:!on* a/b/one one + a/b/.gitignore:8:!on* a/b/one two + a/b/.gitignore:8:!on* "a/b/one\"three" + a/b/.gitignore:9:!two a/b/two + a/.gitignore:1:two* a/b/twooo + $global_excludes:2:!globaltwo globaltwo + $global_excludes:2:!globaltwo a/globaltwo + $global_excludes:2:!globaltwo a/b/globaltwo + $global_excludes:2:!globaltwo b/globaltwo +EOF + +sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ + tr "\n" "\0" >stdin0 +sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ + tr "\n" "\0" >expected-default0 +sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ + tr ":\t\n" "\0" >expected-verbose0 + +test_expect_success '--stdin' ' + expect_from_stdin <expected-default && + test_check_ignore "--stdin" <stdin +' + +test_expect_success '--stdin -q' ' + expect "" && + test_check_ignore "-q --stdin" <stdin +' + +test_expect_success '--stdin -v' ' + expect_from_stdin <expected-verbose && + test_check_ignore "-v --stdin" <stdin +' + +for opts in '--stdin -z' '-z --stdin' +do + test_expect_success "$opts" " + expect_from_stdin <expected-default0 && + test_check_ignore '$opts' <stdin0 + " + + test_expect_success "$opts -q" " + expect "" && + test_check_ignore '-q $opts' <stdin0 + " + + test_expect_success "$opts -v" " + expect_from_stdin <expected-verbose0 && + test_check_ignore '-v $opts' <stdin0 + " +done + +cat <<-\EOF >stdin + ../one + ../not-ignored + one + not-ignored + b/on + b/one + b/one one + "b/one two" + "b/one\"three" + b/two + b/not-ignored + b/twooo + ../globaltwo + globaltwo + b/globaltwo + ../b/globaltwo +EOF +cat <<-\EOF >expected-default + ../one + one + b/on + b/one + b/one one + b/one two + "b/one\"three" + b/two + b/twooo + ../globaltwo + globaltwo + b/globaltwo + ../b/globaltwo +EOF +cat <<-EOF >expected-verbose + .gitignore:1:one ../one + .gitignore:1:one one + a/b/.gitignore:8:!on* b/on + a/b/.gitignore:8:!on* b/one + a/b/.gitignore:8:!on* b/one one + a/b/.gitignore:8:!on* b/one two + a/b/.gitignore:8:!on* "b/one\"three" + a/b/.gitignore:9:!two b/two + a/.gitignore:1:two* b/twooo + $global_excludes:2:!globaltwo ../globaltwo + $global_excludes:2:!globaltwo globaltwo + $global_excludes:2:!globaltwo b/globaltwo + $global_excludes:2:!globaltwo ../b/globaltwo +EOF + +sed -e 's/^"//' -e 's/\\//' -e 's/"$//' stdin | \ + tr "\n" "\0" >stdin0 +sed -e 's/^"//' -e 's/\\//' -e 's/"$//' expected-default | \ + tr "\n" "\0" >expected-default0 +sed -e 's/ "/ /' -e 's/\\//' -e 's/"$//' expected-verbose | \ + tr ":\t\n" "\0" >expected-verbose0 + +test_expect_success '--stdin from subdirectory' ' + expect_from_stdin <expected-default && + ( + cd a && + test_check_ignore "--stdin" <../stdin + ) +' + +test_expect_success '--stdin from subdirectory with -v' ' + expect_from_stdin <expected-verbose && + ( + cd a && + test_check_ignore "--stdin -v" <../stdin + ) +' + +for opts in '--stdin -z' '-z --stdin' +do + test_expect_success "$opts from subdirectory" ' + expect_from_stdin <expected-default0 && + ( + cd a && + test_check_ignore "'"$opts"'" <../stdin0 + ) + ' + + test_expect_success "$opts from subdirectory with -v" ' + expect_from_stdin <expected-verbose0 && + ( + cd a && + test_check_ignore "'"$opts"' -v" <../stdin0 + ) + ' +done + + +test_done diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh index 5378787e1b..4e9fa3cd68 100755 --- a/t/t0024-crlf-archive.sh +++ b/t/t0024-crlf-archive.sh @@ -3,12 +3,6 @@ test_description='respect crlf in git archive' . ./test-lib.sh -GIT_UNZIP=${GIT_UNZIP:-unzip} - -test_lazy_prereq UNZIP ' - "$GIT_UNZIP" -v - test $? -ne 127 -' test_expect_success setup ' diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh index ccb0a3cb61..a8e84d8546 100755 --- a/t/t0030-stripspace.sh +++ b/t/t0030-stripspace.sh @@ -397,4 +397,39 @@ test_expect_success 'strip comments, too' ' test -z "$(echo "# comment" | git stripspace -s)" ' +test_expect_success 'strip comments with changed comment char' ' + test ! -z "$(echo "; comment" | git -c core.commentchar=";" stripspace)" && + test -z "$(echo "; comment" | git -c core.commentchar=";" stripspace -s)" +' + +test_expect_success '-c with single line' ' + printf "# foo\n" >expect && + printf "foo" | git stripspace -c >actual && + test_cmp expect actual +' + +test_expect_success '-c with single line followed by empty line' ' + printf "# foo\n#\n" >expect && + printf "foo\n\n" | git stripspace -c >actual && + test_cmp expect actual +' + +test_expect_success '-c with newline only' ' + printf "#\n" >expect && + printf "\n" | git stripspace -c >actual && + test_cmp expect actual +' + +test_expect_success '--comment-lines with single line' ' + printf "# foo\n" >expect && + printf "foo" | git stripspace -c >actual && + test_cmp expect actual +' + +test_expect_success '-c with changed comment char' ' + printf "; foo\n" >expect && + printf "foo" | git -c core.commentchar=";" stripspace -c >actual && + test_cmp expect actual +' + test_done diff --git a/t/t0050-filesystem.sh b/t/t0050-filesystem.sh index 78816d9d93..05d78d22a6 100755 --- a/t/t0050-filesystem.sh +++ b/t/t0050-filesystem.sh @@ -29,12 +29,10 @@ test_have_prereq SYMLINKS || if test_have_prereq CASE_INSENSITIVE_FS then test_expect_success "detection of case insensitive filesystem during repo init" ' - test $(git config --bool core.ignorecase) = true ' else test_expect_success "detection of case insensitive filesystem during repo init" ' - test_must_fail git config --bool core.ignorecase >/dev/null || test $(git config --bool core.ignorecase) = false ' @@ -43,20 +41,17 @@ fi if test_have_prereq SYMLINKS then test_expect_success "detection of filesystem w/o symlink support during repo init" ' - test_must_fail git config --bool core.symlinks || test "$(git config --bool core.symlinks)" = true ' else test_expect_success "detection of filesystem w/o symlink support during repo init" ' - v=$(git config --bool core.symlinks) && test "$v" = false ' fi test_expect_success "setup case tests" ' - git config core.ignorecase true && touch camelcase && git add camelcase && @@ -67,29 +62,23 @@ test_expect_success "setup case tests" ' git mv tmp CamelCase && git commit -m "rename" && git checkout -f master - ' $test_case 'rename (case change)' ' - git mv camelcase CamelCase && git commit -m "rename" - ' -$test_case 'merge (case change)' ' - +test_expect_success 'merge (case change)' ' rm -f CamelCase && rm -f camelcase && git reset --hard initial && git merge topic - ' -test_expect_failure 'add (with different case)' ' - +test_expect_failure CASE_INSENSITIVE_FS 'add (with different case)' ' git reset --hard initial && rm camelcase && echo 1 >CamelCase && @@ -97,37 +86,30 @@ test_expect_failure 'add (with different case)' ' camel=$(git ls-files | grep -i camelcase) && test $(echo "$camel" | wc -l) = 1 && test "z$(git cat-file blob :$camel)" = z1 - ' test_expect_success "setup unicode normalization tests" ' - - test_create_repo unicode && - cd unicode && - touch "$aumlcdiar" && - git add "$aumlcdiar" && - git commit -m initial && - git tag initial && - git checkout -b topic && - git mv $aumlcdiar tmp && - git mv tmp "$auml" && - git commit -m rename && - git checkout -f master - + test_create_repo unicode && + cd unicode && + touch "$aumlcdiar" && + git add "$aumlcdiar" && + git commit -m initial && + git tag initial && + git checkout -b topic && + git mv $aumlcdiar tmp && + git mv tmp "$auml" && + git commit -m rename && + git checkout -f master ' $test_unicode 'rename (silent unicode normalization)' ' - - git mv "$aumlcdiar" "$auml" && - git commit -m rename - + git mv "$aumlcdiar" "$auml" && + git commit -m rename ' $test_unicode 'merge (silent unicode normalization)' ' - - git reset --hard initial && - git merge topic - + git reset --hard initial && + git merge topic ' test_done diff --git a/t/t1504-ceiling-dirs.sh b/t/t1504-ceiling-dirs.sh index cce87a5ab5..3d51615e42 100755 --- a/t/t1504-ceiling-dirs.sh +++ b/t/t1504-ceiling-dirs.sh @@ -44,6 +44,10 @@ test_prefix ceil_at_sub "" GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/" test_prefix ceil_at_sub_slash "" +if test_have_prereq SYMLINKS +then + ln -s sub top +fi mkdir -p sub/dir || exit 1 cd sub/dir || exit 1 @@ -68,6 +72,19 @@ test_fail subdir_ceil_at_sub GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/" test_fail subdir_ceil_at_sub_slash +if test_have_prereq SYMLINKS +then + GIT_CEILING_DIRECTORIES="$TRASH_ROOT/top" + test_fail subdir_ceil_at_top + GIT_CEILING_DIRECTORIES="$TRASH_ROOT/top/" + test_fail subdir_ceil_at_top_slash + + GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top" + test_prefix subdir_ceil_at_top_no_resolve "sub/dir/" + GIT_CEILING_DIRECTORIES=":$TRASH_ROOT/top/" + test_prefix subdir_ceil_at_top_slash_no_resolve "sub/dir/" +fi + GIT_CEILING_DIRECTORIES="$TRASH_ROOT/sub/dir" test_prefix subdir_ceil_at_subdir "sub/dir/" diff --git a/t/t1507-rev-parse-upstream.sh b/t/t1507-rev-parse-upstream.sh index d6e576192f..b27a7209f7 100755 --- a/t/t1507-rev-parse-upstream.sh +++ b/t/t1507-rev-parse-upstream.sh @@ -54,6 +54,10 @@ test_expect_success 'my-side@{upstream} resolves to correct full name' ' test refs/remotes/origin/side = "$(full_name my-side@{u})" ' +test_expect_success 'refs/heads/my-side@{upstream} does not resolve to my-side{upstream}' ' + test_must_fail full_name refs/heads/my-side@{upstream} +' + test_expect_success 'my-side@{u} resolves to correct commit' ' git checkout side && test_commit 5 && diff --git a/t/t1509/prepare-chroot.sh b/t/t1509/prepare-chroot.sh index c5334a8fa4..62691172e3 100755 --- a/t/t1509/prepare-chroot.sh +++ b/t/t1509/prepare-chroot.sh @@ -14,7 +14,7 @@ xmkdir() { R="$1" -[ -n "$R" ] || die "Usage: prepare-chroot.sh <root>" +[ -n "$R" ] || die "usage: prepare-chroot.sh <root>" [ -x git ] || die "This script needs to be executed at git source code's top directory" [ -x /bin/busybox ] || die "You need busybox" diff --git a/t/t1510-repo-setup.sh b/t/t1510-repo-setup.sh index 80aedfca8c..cf2ee7885a 100755 --- a/t/t1510-repo-setup.sh +++ b/t/t1510-repo-setup.sh @@ -517,6 +517,25 @@ test_expect_success '#16c: bare .git has no worktree' ' "$here/16c/.git" "(null)" "$here/16c/sub" "(null)" ' +test_expect_success '#16d: bareness preserved across alias' ' + setup_repo 16d unset "" unset && + ( + cd 16d/.git && + test_must_fail git status && + git config alias.st status && + test_must_fail git st + ) +' + +test_expect_success '#16e: bareness preserved by --bare' ' + setup_repo 16e unset "" unset && + ( + cd 16e/.git && + test_must_fail git status && + test_must_fail git --bare status + ) +' + test_expect_success '#17: GIT_WORK_TREE without explicit GIT_DIR is accepted (bare case)' ' # Just like #16. setup_repo 17a unset "" true && diff --git a/t/t2013-checkout-submodule.sh b/t/t2013-checkout-submodule.sh index 70edbb33e2..06b18f8bc1 100755 --- a/t/t2013-checkout-submodule.sh +++ b/t/t2013-checkout-submodule.sh @@ -23,7 +23,7 @@ test_expect_success '"reset <submodule>" updates the index' ' git update-index --refresh && git diff-files --quiet && git diff-index --quiet --cached HEAD && - test_must_fail git reset HEAD^ submodule && + git reset HEAD^ submodule && test_must_fail git diff-files --quiet && git reset submodule && git diff-files --quiet diff --git a/t/t2200-add-update.sh b/t/t2200-add-update.sh index 4cdebda6a5..c317254b9a 100755 --- a/t/t2200-add-update.sh +++ b/t/t2200-add-update.sh @@ -80,6 +80,22 @@ test_expect_success 'change gets noticed' ' ' +# Note that this is scheduled to change in Git 2.0, when +# "git add -u" will become full-tree by default. +test_expect_success 'non-limited update in subdir leaves root alone' ' + ( + cd dir1 && + echo even more >>sub2 && + git add -u + ) && + cat >expect <<-\EOF && + check + top + EOF + git diff-files --name-only >actual && + test_cmp expect actual +' + test_expect_success SYMLINKS 'replace a file with a symlink' ' rm foo && diff --git a/t/t3070-wildmatch.sh b/t/t3070-wildmatch.sh index af54c83111..4c37057ddf 100755 --- a/t/t3070-wildmatch.sh +++ b/t/t3070-wildmatch.sh @@ -29,6 +29,18 @@ match() { fi } +pathmatch() { + if [ $1 = 1 ]; then + test_expect_success "pathmatch: match '$2' '$3'" " + test-wildmatch pathmatch '$2' '$3' + " + else + test_expect_success "pathmatch: no match '$2' '$3'" " + ! test-wildmatch pathmatch '$2' '$3' + " + fi +} + # Basic wildmat features match 1 1 foo foo match 0 0 foo bar @@ -191,5 +203,36 @@ match 1 1 'XXX/adobe/courier/bold/o/normal//12/120/75/75/m/70/iso8859/1' 'XXX/*/ match 0 0 'XXX/adobe/courier/bold/o/normal//12/120/75/75/X/70/iso8859/1' 'XXX/*/*/*/*/*/*/12/*/*/*/m/*/*/*' match 1 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txt' '**/*a*b*g*n*t' match 0 0 'abcd/abcdefg/abcdefghijk/abcdefghijklmnop.txtz' '**/*a*b*g*n*t' +match 0 x foo '*/*/*' +match 0 x foo/bar '*/*/*' +match 1 x foo/bba/arr '*/*/*' +match 0 x foo/bb/aa/rr '*/*/*' +match 1 x foo/bb/aa/rr '**/**/**' +match 1 x abcXdefXghi '*X*i' +match 0 x ab/cXd/efXg/hi '*X*i' +match 1 x ab/cXd/efXg/hi '*/*X*/*/*i' +match 1 x ab/cXd/efXg/hi '**/*X*/**/*i' + +pathmatch 1 foo foo +pathmatch 0 foo fo +pathmatch 1 foo/bar foo/bar +pathmatch 1 foo/bar 'foo/*' +pathmatch 1 foo/bba/arr 'foo/*' +pathmatch 1 foo/bba/arr 'foo/**' +pathmatch 1 foo/bba/arr 'foo*' +pathmatch 1 foo/bba/arr 'foo**' +pathmatch 1 foo/bba/arr 'foo/*arr' +pathmatch 1 foo/bba/arr 'foo/**arr' +pathmatch 0 foo/bba/arr 'foo/*z' +pathmatch 0 foo/bba/arr 'foo/**z' +pathmatch 1 foo/bar 'foo?bar' +pathmatch 1 foo/bar 'foo[/]bar' +pathmatch 0 foo '*/*/*' +pathmatch 0 foo/bar '*/*/*' +pathmatch 1 foo/bba/arr '*/*/*' +pathmatch 1 foo/bb/aa/rr '*/*/*' +pathmatch 1 abcXdefXghi '*X*i' +pathmatch 1 ab/cXd/efXg/hi '*/*X*/*/*i' +pathmatch 1 ab/cXd/efXg/hi '*Xg*i' test_done diff --git a/t/t3200-branch.sh b/t/t3200-branch.sh index 80e6be39d7..12f1e4a63c 100755 --- a/t/t3200-branch.sh +++ b/t/t3200-branch.sh @@ -42,6 +42,10 @@ test_expect_success \ 'git branch a/b/c should create a branch' \ 'git branch a/b/c && test_path_is_file .git/refs/heads/a/b/c' +test_expect_success \ + 'git branch HEAD should fail' \ + 'test_must_fail git branch HEAD' + cat >expect <<EOF $_z40 $HEAD $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> 1117150200 +0000 branch: Created from master EOF @@ -73,8 +77,8 @@ test_expect_success \ test_expect_success \ 'git branch -m dumps usage' \ - 'test_expect_code 129 git branch -m 2>err && - test_i18ngrep "[Uu]sage: git branch" err' + 'test_expect_code 128 git branch -m 2>err && + test_i18ngrep "too many branches for a rename operation" err' test_expect_success \ 'git branch -m m m/m should work' \ @@ -388,6 +392,14 @@ test_expect_success \ 'git tag foobar && test_must_fail git branch --track my11 foobar' +test_expect_success '--set-upstream-to fails on multiple branches' \ + 'test_must_fail git branch --set-upstream-to master a b c' + +test_expect_success '--set-upstream-to fails on detached HEAD' \ + 'git checkout HEAD^{} && + test_must_fail git branch --set-upstream-to master && + git checkout -' + test_expect_success 'use --set-upstream-to modify HEAD' \ 'test_config branch.master.remote foo && test_config branch.master.merge foo && @@ -417,6 +429,15 @@ test_expect_success 'test --unset-upstream on HEAD' \ test_must_fail git branch --unset-upstream ' +test_expect_success '--unset-upstream should fail on multiple branches' \ + 'test_must_fail git branch --unset-upstream a b c' + +test_expect_success '--unset-upstream should fail on detached HEAD' \ + 'git checkout HEAD^{} && + test_must_fail git branch --unset-upstream && + git checkout - +' + test_expect_success 'test --unset-upstream on a particular branch' \ 'git branch my15 git branch --set-upstream-to master my14 && diff --git a/t/t3201-branch-contains.sh b/t/t3201-branch-contains.sh index f86f4bc5eb..141b0611ea 100755 --- a/t/t3201-branch-contains.sh +++ b/t/t3201-branch-contains.sh @@ -55,6 +55,16 @@ test_expect_success 'branch --contains=side' ' ' +test_expect_success 'branch --contains with pattern implies --list' ' + + git branch --contains=master master >actual && + { + echo " master" + } >expect && + test_cmp expect actual + +' + test_expect_success 'side: branch --merged' ' git branch --merged >actual && @@ -66,6 +76,16 @@ test_expect_success 'side: branch --merged' ' ' +test_expect_success 'branch --merged with pattern implies --list' ' + + git branch --merged=side master >actual && + { + echo " master" + } >expect && + test_cmp expect actual + +' + test_expect_success 'side: branch --no-merged' ' git branch --no-merged >actual && @@ -95,4 +115,19 @@ test_expect_success 'master: branch --no-merged' ' ' +test_expect_success 'branch --no-merged with pattern implies --list' ' + + git branch --no-merged=master master >actual && + >expect && + test_cmp expect actual + +' + +test_expect_success 'implicit --list conflicts with modification options' ' + + test_must_fail git branch --contains=master -d && + test_must_fail git branch --contains=master -m foo + +' + test_done diff --git a/t/t3211-peel-ref.sh b/t/t3211-peel-ref.sh new file mode 100755 index 0000000000..d4d7792eae --- /dev/null +++ b/t/t3211-peel-ref.sh @@ -0,0 +1,64 @@ +#!/bin/sh + +test_description='tests for the peel_ref optimization of packed-refs' +. ./test-lib.sh + +test_expect_success 'create annotated tag in refs/tags' ' + test_commit base && + git tag -m annotated foo +' + +test_expect_success 'create annotated tag outside of refs/tags' ' + git update-ref refs/outside/foo refs/tags/foo +' + +# This matches show-ref's output +print_ref() { + echo "$(git rev-parse "$1") $1" +} + +test_expect_success 'set up expected show-ref output' ' + { + print_ref "refs/heads/master" && + print_ref "refs/outside/foo" && + print_ref "refs/outside/foo^{}" && + print_ref "refs/tags/base" && + print_ref "refs/tags/foo" && + print_ref "refs/tags/foo^{}" + } >expect +' + +test_expect_success 'refs are peeled outside of refs/tags (loose)' ' + git show-ref -d >actual && + test_cmp expect actual +' + +test_expect_success 'refs are peeled outside of refs/tags (packed)' ' + git pack-refs --all && + git show-ref -d >actual && + test_cmp expect actual +' + +test_expect_success 'create old-style pack-refs without fully-peeled' ' + # Git no longer writes without fully-peeled, so we just write our own + # from scratch; we could also munge the existing file to remove the + # fully-peeled bits, but that seems even more prone to failure, + # especially if the format ever changes again. At least this way we + # know we are emulating exactly what an older git would have written. + { + echo "# pack-refs with: peeled " && + print_ref "refs/heads/master" && + print_ref "refs/outside/foo" && + print_ref "refs/tags/base" && + print_ref "refs/tags/foo" && + echo "^$(git rev-parse "refs/tags/foo^{}")" + } >tmp && + mv tmp .git/packed-refs +' + +test_expect_success 'refs are peeled outside of refs/tags (old packed)' ' + git show-ref -d >actual && + test_cmp expect actual +' + +test_done diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index 8462be1db6..15dcbd42d3 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -934,4 +934,18 @@ test_expect_success 'rebase --edit-todo can be used to modify todo' ' test L = $(git cat-file commit HEAD | sed -ne \$p) ' +test_expect_success 'rebase -i respects core.commentchar' ' + git reset --hard && + git checkout E^0 && + git config core.commentchar "\\" && + test_when_finished "git config --unset core.commentchar" && + write_script remove-all-but-first.sh <<-\EOF && + sed -e "2,\$s/^/\\\\/" "$1" >"$1.tmp" && + mv "$1.tmp" "$1" + EOF + test_set_editor "$(pwd)/remove-all-but-first.sh" && + git rebase -i B && + test B = $(git cat-file commit HEAD^ | sed -ne \$p) +' + test_done diff --git a/t/t4001-diff-rename.sh b/t/t4001-diff-rename.sh index 844277cfa6..2f327b7495 100755 --- a/t/t4001-diff-rename.sh +++ b/t/t4001-diff-rename.sh @@ -102,4 +102,58 @@ test_expect_success 'setup for many rename source candidates' ' grep warning actual.err ' +test_expect_success 'rename pretty print with nothing in common' ' + mkdir -p a/b/ && + : >a/b/c && + git add a/b/c && + git commit -m "create a/b/c" && + mkdir -p c/b/ && + git mv a/b/c c/b/a && + git commit -m "a/b/c -> c/b/a" && + git diff -M --summary HEAD^ HEAD >output && + test_i18ngrep " a/b/c => c/b/a " output && + git diff -M --stat HEAD^ HEAD >output && + test_i18ngrep " a/b/c => c/b/a " output +' + +test_expect_success 'rename pretty print with common prefix' ' + mkdir -p c/d && + git mv c/b/a c/d/e && + git commit -m "c/b/a -> c/d/e" && + git diff -M --summary HEAD^ HEAD >output && + test_i18ngrep " c/{b/a => d/e} " output && + git diff -M --stat HEAD^ HEAD >output && + test_i18ngrep " c/{b/a => d/e} " output +' + +test_expect_success 'rename pretty print with common suffix' ' + mkdir d && + git mv c/d/e d/e && + git commit -m "c/d/e -> d/e" && + git diff -M --summary HEAD^ HEAD >output && + test_i18ngrep " {c/d => d}/e " output && + git diff -M --stat HEAD^ HEAD >output && + test_i18ngrep " {c/d => d}/e " output +' + +test_expect_success 'rename pretty print with common prefix and suffix' ' + mkdir d/f && + git mv d/e d/f/e && + git commit -m "d/e -> d/f/e" && + git diff -M --summary HEAD^ HEAD >output && + test_i18ngrep " d/{ => f}/e " output && + git diff -M --stat HEAD^ HEAD >output && + test_i18ngrep " d/{ => f}/e " output +' + +test_expect_success 'rename pretty print common prefix and suffix overlap' ' + mkdir d/f/f && + git mv d/f/e d/f/f/e && + git commit -m "d/f/e d/f/f/e" && + git diff -M --summary HEAD^ HEAD >output && + test_i18ngrep " d/f/{ => f}/e " output && + git diff -M --stat HEAD^ HEAD >output && + test_i18ngrep " d/f/{ => f}/e " output +' + test_done diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 7fa3647514..bb1fc47fe8 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -837,25 +837,26 @@ Subject: [PATCH] =?UTF-8?q?f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?= =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?= =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?= - =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3?= - =?UTF-8?q?=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= - =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3?= - =?UTF-8?q?=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= + =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= + =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?= =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?= =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?= - =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3?= - =?UTF-8?q?=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= - =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3?= - =?UTF-8?q?=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= + =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= + =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?= =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?= =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?= - =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3?= - =?UTF-8?q?=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= - =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3?= - =?UTF-8?q?=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= - =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?= + =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= + =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= + =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?= + =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?= + =?UTF-8?q?bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6?= + =?UTF-8?q?=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6?= + =?UTF-8?q?=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f?= + =?UTF-8?q?=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar?= + =?UTF-8?q?=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20bar=20f=C3=B6=C3=B6=20?= + =?UTF-8?q?bar?= EOF test_expect_success 'format-patch wraps extremely long subject (rfc2047)' ' rm -rf patches/ && diff --git a/t/t4038-diff-combined.sh b/t/t4038-diff-combined.sh index 40277c77aa..b7e16a7840 100755 --- a/t/t4038-diff-combined.sh +++ b/t/t4038-diff-combined.sh @@ -3,6 +3,7 @@ test_description='combined diff' . ./test-lib.sh +. "$TEST_DIRECTORY"/diff-lib.sh setup_helper () { one=$1 branch=$2 side=$3 && @@ -89,4 +90,138 @@ test_expect_success 'diagnose truncated file' ' grep "diff --cc file" out ' +test_expect_success 'setup for --cc --raw' ' + blob=$(echo file | git hash-object --stdin -w) && + base_tree=$(echo "100644 blob $blob file" | git mktree) && + trees= && + for i in `test_seq 1 40` + do + blob=$(echo file$i | git hash-object --stdin -w) && + trees="$trees$(echo "100644 blob $blob file" | git mktree)$LF" + done +' + +test_expect_success 'check --cc --raw with four trees' ' + four_trees=$(echo "$trees" | sed -e 4q) && + git diff --cc --raw $four_trees $base_tree >out && + # Check for four leading colons in the output: + grep "^::::[^:]" out +' + +test_expect_success 'check --cc --raw with forty trees' ' + git diff --cc --raw $trees $base_tree >out && + # Check for forty leading colons in the output: + grep "^::::::::::::::::::::::::::::::::::::::::[^:]" out +' + +test_expect_success 'setup combined ignore spaces' ' + git checkout master && + >test && + git add test && + git commit -m initial && + + tr -d Q <<-\EOF >test && + always coalesce + eol space coalesce Q + space change coalesce + all spa ces coalesce + eol spaces Q + space change + all spa ces + EOF + git commit -m "test space change" -a && + + git checkout -b side HEAD^ && + tr -d Q <<-\EOF >test && + always coalesce + eol space coalesce + space change coalesce + all spaces coalesce + eol spaces + space change + all spaces + EOF + git commit -m "test other space changes" -a && + + test_must_fail git merge master && + tr -d Q <<-\EOF >test && + eol spaces Q + space change + all spa ces + EOF + git commit -m merged -a +' + +test_expect_success 'check combined output (no ignore space)' ' + git show >actual.tmp && + sed -e "1,/^@@@/d" < actual.tmp >actual && + tr -d Q <<-\EOF >expected && + --always coalesce + - eol space coalesce + - space change coalesce + - all spaces coalesce + - eol spaces + - space change + - all spaces + -eol space coalesce Q + -space change coalesce + -all spa ces coalesce + + eol spaces Q + + space change + + all spa ces + EOF + compare_diff_patch expected actual +' + +test_expect_success 'check combined output (ignore space at eol)' ' + git show --ignore-space-at-eol >actual.tmp && + sed -e "1,/^@@@/d" < actual.tmp >actual && + tr -d Q <<-\EOF >expected && + --always coalesce + --eol space coalesce + - space change coalesce + - all spaces coalesce + -space change coalesce + -all spa ces coalesce + eol spaces Q + - space change + - all spaces + + space change + + all spa ces + EOF + compare_diff_patch expected actual +' + +test_expect_success 'check combined output (ignore space change)' ' + git show -b >actual.tmp && + sed -e "1,/^@@@/d" < actual.tmp >actual && + tr -d Q <<-\EOF >expected && + --always coalesce + --eol space coalesce + --space change coalesce + - all spaces coalesce + -all spa ces coalesce + eol spaces Q + space change + - all spaces + + all spa ces + EOF + compare_diff_patch expected actual +' + +test_expect_success 'check combined output (ignore all spaces)' ' + git show -w >actual.tmp && + sed -e "1,/^@@@/d" < actual.tmp >actual && + tr -d Q <<-\EOF >expected && + --always coalesce + --eol space coalesce + --space change coalesce + --all spaces coalesce + eol spaces Q + space change + all spa ces + EOF + compare_diff_patch expected actual +' + test_done diff --git a/t/t4042-diff-textconv-caching.sh b/t/t4042-diff-textconv-caching.sh index 91f8198f05..04a44d5c61 100755 --- a/t/t4042-diff-textconv-caching.sh +++ b/t/t4042-diff-textconv-caching.sh @@ -106,4 +106,12 @@ test_expect_success 'switching diff driver produces correct results' ' test_cmp expect actual ' +# The point here is to test that we can log the notes cache and still use it to +# produce a diff later (older versions of git would segfault on this). It's +# much more likely to come up in the real world with "log --all -p", but using +# --no-walk lets us reliably reproduce the order of traversal. +test_expect_success 'log notes cache and still use cache for -p' ' + git log --no-walk -p refs/notes/textconv/magic HEAD +' + test_done diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index aae30d97b1..842b7549ec 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -337,6 +337,62 @@ test_expect_success 'Log output (complex mapping)' ' test_cmp expect actual ' +cat >expect <<\EOF +Author: CTO <cto@company.xx> +Author: Santa Claus <santa.claus@northpole.xx> +Author: Santa Claus <santa.claus@northpole.xx> +Author: Other Author <other@author.xx> +Author: Other Author <other@author.xx> +Author: Some Dude <some@dude.xx> +Author: A U Thor <author@example.com> +EOF + +test_expect_success 'Log output with --use-mailmap' ' + git log --use-mailmap | grep Author >actual && + test_cmp expect actual +' + +cat >expect <<\EOF +Author: CTO <cto@company.xx> +Author: Santa Claus <santa.claus@northpole.xx> +Author: Santa Claus <santa.claus@northpole.xx> +Author: Other Author <other@author.xx> +Author: Other Author <other@author.xx> +Author: Some Dude <some@dude.xx> +Author: A U Thor <author@example.com> +EOF + +test_expect_success 'Log output with log.mailmap' ' + git -c log.mailmap=True log | grep Author >actual && + test_cmp expect actual +' + +cat >expect <<\EOF +Author: Santa Claus <santa.claus@northpole.xx> +Author: Santa Claus <santa.claus@northpole.xx> +EOF + +test_expect_success 'Grep author with --use-mailmap' ' + git log --use-mailmap --author Santa | grep Author >actual && + test_cmp expect actual +' +cat >expect <<\EOF +Author: Santa Claus <santa.claus@northpole.xx> +Author: Santa Claus <santa.claus@northpole.xx> +EOF + +test_expect_success 'Grep author with log.mailmap' ' + git -c log.mailmap=True log --author Santa | grep Author >actual && + test_cmp expect actual +' + +>expect + +test_expect_success 'Only grep replaced author with --use-mailmap' ' + git log --use-mailmap --author "<cto@coompany.xx>" >actual && + test_cmp expect actual +' + # git blame cat >expect <<\EOF ^OBJI (A U Thor DATE 1) one diff --git a/t/t4208-log-magic-pathspec.sh b/t/t4208-log-magic-pathspec.sh index 2c482b622b..72300b5f24 100755 --- a/t/t4208-log-magic-pathspec.sh +++ b/t/t4208-log-magic-pathspec.sh @@ -11,11 +11,24 @@ test_expect_success 'setup' ' mkdir sub ' -test_expect_success '"git log :/" should be ambiguous' ' - test_must_fail git log :/ 2>error && +test_expect_success '"git log :/" should not be ambiguous' ' + git log :/ +' + +test_expect_success '"git log :/a" should be ambiguous (applied both rev and worktree)' ' + : >a && + test_must_fail git log :/a 2>error && grep ambiguous error ' +test_expect_success '"git log :/a -- " should not be ambiguous' ' + git log :/a -- +' + +test_expect_success '"git log -- :/a" should not be ambiguous' ' + git log -- :/a +' + test_expect_success '"git log :" should be ambiguous' ' test_must_fail git log : 2>error && grep ambiguous error diff --git a/t/t4210-log-i18n.sh b/t/t4210-log-i18n.sh new file mode 100755 index 0000000000..52a74729ba --- /dev/null +++ b/t/t4210-log-i18n.sh @@ -0,0 +1,58 @@ +#!/bin/sh + +test_description='test log with i18n features' +. ./test-lib.sh + +# two forms of é +utf8_e=$(printf '\303\251') +latin1_e=$(printf '\351') + +test_expect_success 'create commits in different encodings' ' + test_tick && + cat >msg <<-EOF && + utf8 + + t${utf8_e}st + EOF + git add msg && + git -c i18n.commitencoding=utf8 commit -F msg && + cat >msg <<-EOF && + latin1 + + t${latin1_e}st + EOF + git add msg && + git -c i18n.commitencoding=ISO-8859-1 commit -F msg +' + +test_expect_success 'log --grep searches in log output encoding (utf8)' ' + cat >expect <<-\EOF && + latin1 + utf8 + EOF + git log --encoding=utf8 --format=%s --grep=$utf8_e >actual && + test_cmp expect actual +' + +test_expect_success 'log --grep searches in log output encoding (latin1)' ' + cat >expect <<-\EOF && + latin1 + utf8 + EOF + git log --encoding=ISO-8859-1 --format=%s --grep=$latin1_e >actual && + test_cmp expect actual +' + +test_expect_success 'log --grep does not find non-reencoded values (utf8)' ' + >expect && + git log --encoding=utf8 --format=%s --grep=$latin1_e >actual && + test_cmp expect actual +' + +test_expect_success 'log --grep does not find non-reencoded values (latin1)' ' + >expect && + git log --encoding=ISO-8859-1 --format=%s --grep=$utf8_e >actual && + test_cmp expect actual +' + +test_done diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index e7c240fc1f..3fbd366ec3 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -212,7 +212,8 @@ test_expect_success 'git-archive --prefix=olde-' ' test_expect_success 'setup tar filters' ' git config tar.tar.foo.command "tr ab ba" && git config tar.bar.command "tr ab ba" && - git config tar.bar.remote true + git config tar.bar.remote true && + git config tar.invalid baz ' test_expect_success 'archive --list mentions user filter' ' diff --git a/t/t5003-archive-zip.sh b/t/t5003-archive-zip.sh index 6a33606d28..4e7b05dd23 100755 --- a/t/t5003-archive-zip.sh +++ b/t/t5003-archive-zip.sh @@ -3,15 +3,9 @@ test_description='git archive --format=zip test' . ./test-lib.sh -GIT_UNZIP=${GIT_UNZIP:-unzip} SUBSTFORMAT=%H%n -test_lazy_prereq UNZIP ' - "$GIT_UNZIP" -v - test $? -ne 127 -' - test_lazy_prereq UNZIP_SYMLINKS ' ( mkdir unzip-symlinks && diff --git a/t/t5004-archive-corner-cases.sh b/t/t5004-archive-corner-cases.sh new file mode 100755 index 0000000000..cdb7d7a7f9 --- /dev/null +++ b/t/t5004-archive-corner-cases.sh @@ -0,0 +1,102 @@ +#!/bin/sh + +test_description='test corner cases of git-archive' +. ./test-lib.sh + +test_expect_success 'create commit with empty tree' ' + git commit --allow-empty -m foo +' + +# Make a dir and clean it up afterwards +make_dir() { + mkdir "$1" && + test_when_finished "rm -rf '$1'" +} + +# Check that the dir given in "$1" contains exactly the +# set of paths given as arguments. +check_dir() { + dir=$1; shift + { + echo "$dir" && + for i in "$@"; do + echo "$dir/$i" + done + } | sort >expect && + find "$dir" -print | sort >actual && + test_cmp expect actual +} + +test_expect_success 'tar archive of empty tree is empty' ' + git archive --format=tar HEAD >empty.tar && + make_dir extract && + "$TAR" xf empty.tar -C extract && + check_dir extract +' + +test_expect_success 'tar archive of empty tree with prefix' ' + git archive --format=tar --prefix=foo/ HEAD >prefix.tar && + make_dir extract && + "$TAR" xf prefix.tar -C extract && + check_dir extract foo +' + +test_expect_success UNZIP 'zip archive of empty tree is empty' ' + # Detect the exit code produced when our particular flavor of unzip + # sees an empty archive. Infozip will generate a warning and exit with + # code 1. But in the name of sanity, we do not expect other unzip + # implementations to do the same thing (it would be perfectly + # reasonable to exit 0, for example). + # + # This makes our test less rigorous on some platforms (unzip may not + # handle the empty repo at all, making our later check of its exit code + # a no-op). But we cannot do anything reasonable except skip the test + # on such platforms anyway, and this is the moral equivalent. + "$GIT_UNZIP" "$TEST_DIRECTORY"/t5004/empty.zip + expect_code=$? + + git archive --format=zip HEAD >empty.zip && + make_dir extract && + ( + cd extract && + test_expect_code $expect_code "$GIT_UNZIP" ../empty.zip + ) && + check_dir extract +' + +test_expect_success UNZIP 'zip archive of empty tree with prefix' ' + # We do not have to play exit-code tricks here, because our + # result should not be empty; it has a directory in it. + git archive --format=zip --prefix=foo/ HEAD >prefix.zip && + make_dir extract && + ( + cd extract && + "$GIT_UNZIP" ../prefix.zip + ) && + check_dir extract foo +' + +test_expect_success 'archive complains about pathspec on empty tree' ' + test_must_fail git archive --format=tar HEAD -- foo >/dev/null +' + +test_expect_success 'create a commit with an empty subtree' ' + empty_tree=$(git hash-object -t tree /dev/null) && + root_tree=$(printf "040000 tree $empty_tree\tsub\n" | git mktree) +' + +test_expect_success 'archive empty subtree with no pathspec' ' + git archive --format=tar $root_tree >subtree-all.tar && + make_dir extract && + "$TAR" xf subtree-all.tar -C extract && + check_dir extract sub +' + +test_expect_success 'archive empty subtree by direct pathspec' ' + git archive --format=tar $root_tree -- sub >subtree-path.tar && + make_dir extract && + "$TAR" xf subtree-path.tar -C extract && + check_dir extract sub +' + +test_done diff --git a/t/t5004/empty.zip b/t/t5004/empty.zip Binary files differnew file mode 100644 index 0000000000..1a76bb6005 --- /dev/null +++ b/t/t5004/empty.zip diff --git a/t/t5304-prune.sh b/t/t5304-prune.sh index d645328609..e4bb3a1457 100755 --- a/t/t5304-prune.sh +++ b/t/t5304-prune.sh @@ -195,4 +195,30 @@ test_expect_success 'gc: prune old objects after local clone' ' ) ' +test_expect_success 'garbage report in count-objects -v' ' + : >.git/objects/pack/foo && + : >.git/objects/pack/foo.bar && + : >.git/objects/pack/foo.keep && + : >.git/objects/pack/foo.pack && + : >.git/objects/pack/fake.bar && + : >.git/objects/pack/fake.keep && + : >.git/objects/pack/fake.pack && + : >.git/objects/pack/fake.idx && + : >.git/objects/pack/fake2.keep && + : >.git/objects/pack/fake3.idx && + git count-objects -v 2>stderr && + grep "index file .git/objects/pack/fake.idx is too small" stderr && + grep "^warning:" stderr | sort >actual && + cat >expected <<\EOF && +warning: garbage found: .git/objects/pack/fake.bar +warning: garbage found: .git/objects/pack/foo +warning: garbage found: .git/objects/pack/foo.bar +warning: no corresponding .idx nor .pack: .git/objects/pack/fake2.keep +warning: no corresponding .idx: .git/objects/pack/foo.keep +warning: no corresponding .idx: .git/objects/pack/foo.pack +warning: no corresponding .pack: .git/objects/pack/fake3.idx +EOF + test_cmp expected actual +' + test_done diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 6322e8ade8..d574085696 100755 --- a/t/t5500-fetch-pack.sh +++ b/t/t5500-fetch-pack.sh @@ -130,16 +130,25 @@ test_expect_success 'single given branch clone' ' test_must_fail git --git-dir=branch-a/.git rev-parse origin/B ' +test_expect_success 'clone shallow depth 1' ' + git clone --no-single-branch --depth 1 "file://$(pwd)/." shallow0 && + test "`git --git-dir=shallow0/.git rev-list --count HEAD`" = 1 +' + test_expect_success 'clone shallow' ' git clone --no-single-branch --depth 2 "file://$(pwd)/." shallow ' +test_expect_success 'clone shallow depth count' ' + test "`git --git-dir=shallow/.git rev-list --count HEAD`" = 2 +' + test_expect_success 'clone shallow object count' ' ( cd shallow && git count-objects -v ) > count.shallow && - grep "^in-pack: 18" count.shallow + grep "^in-pack: 12" count.shallow ' test_expect_success 'clone shallow object count (part 2)' ' @@ -256,12 +265,36 @@ test_expect_success 'additional simple shallow deepenings' ' ) ' +test_expect_success 'clone shallow depth count' ' + test "`git --git-dir=shallow/.git rev-list --count HEAD`" = 11 +' + test_expect_success 'clone shallow object count' ' ( cd shallow && git count-objects -v ) > count.shallow && - grep "^count: 52" count.shallow + grep "^count: 55" count.shallow +' + +test_expect_success 'fetch --no-shallow on full repo' ' + test_must_fail git fetch --noshallow +' + +test_expect_success 'fetch --depth --no-shallow' ' + ( + cd shallow && + test_must_fail git fetch --depth=1 --noshallow + ) +' + +test_expect_success 'turn shallow to complete repository' ' + ( + cd shallow && + git fetch --unshallow && + ! test -f .git/shallow && + git fsck --full + ) ' test_expect_success 'clone shallow without --no-single-branch' ' @@ -273,7 +306,7 @@ test_expect_success 'clone shallow object count' ' cd shallow2 && git count-objects -v ) > count.shallow2 && - grep "^in-pack: 6" count.shallow2 + grep "^in-pack: 3" count.shallow2 ' test_expect_success 'clone shallow with --branch' ' @@ -281,7 +314,7 @@ test_expect_success 'clone shallow with --branch' ' ' test_expect_success 'clone shallow object count' ' - echo "in-pack: 6" > count3.expected && + echo "in-pack: 3" > count3.expected && GIT_DIR=shallow3/.git git count-objects -v | grep "^in-pack" > count3.actual && test_cmp count3.expected count3.actual @@ -310,7 +343,7 @@ EOF GIT_DIR=shallow6/.git git tag -l >taglist.actual && test_cmp taglist.expected taglist.actual && - echo "in-pack: 7" > count6.expected && + echo "in-pack: 4" > count6.expected && GIT_DIR=shallow6/.git git count-objects -v | grep "^in-pack" > count6.actual && test_cmp count6.expected count6.actual @@ -325,12 +358,21 @@ EOF GIT_DIR=shallow7/.git git tag -l >taglist.actual && test_cmp taglist.expected taglist.actual && - echo "in-pack: 7" > count7.expected && + echo "in-pack: 4" > count7.expected && GIT_DIR=shallow7/.git git count-objects -v | grep "^in-pack" > count7.actual && test_cmp count7.expected count7.actual ' +test_expect_success 'clone shallow with packed refs' ' + git pack-refs --all && + git clone --depth 1 --branch A "file://$(pwd)/." shallow8 && + echo "in-pack: 4" > count8.expected && + GIT_DIR=shallow8/.git git count-objects -v | + grep "^in-pack" > count8.actual && + test_cmp count8.expected count8.actual +' + test_expect_success 'setup tests for the --stdin parameter' ' for head in C D E F do diff --git a/t/t5512-ls-remote.sh b/t/t5512-ls-remote.sh index d16e5d384a..321c3e5234 100755 --- a/t/t5512-ls-remote.sh +++ b/t/t5512-ls-remote.sh @@ -126,4 +126,16 @@ test_expect_success 'Report match with --exit-code' ' test_cmp expect actual ' +for configsection in transfer uploadpack +do + test_expect_success "Hide some refs with $configsection.hiderefs" ' + test_config $configsection.hiderefs refs/tags && + git ls-remote . >actual && + test_unconfig $configsection.hiderefs && + git ls-remote . | + sed -e "/ refs\/tags\//d" >expect && + test_cmp expect actual + ' +done + test_done diff --git a/t/t5516-fetch-push.sh b/t/t5516-fetch-push.sh index 60093728fe..d3dc5df7b1 100755 --- a/t/t5516-fetch-push.sh +++ b/t/t5516-fetch-push.sh @@ -950,27 +950,6 @@ test_expect_success 'push requires --force to update lightweight tag' ' ) ' -test_expect_success 'push requires --force to update annotated tag' ' - mk_test heads/master && - mk_child child1 && - mk_child child2 && - ( - cd child1 && - git tag -a -m "message 1" Tag && - git push ../child2 Tag:refs/tmp/Tag && - git push ../child2 Tag:refs/tmp/Tag && - >file1 && - git add file1 && - git commit -m "file1" && - git tag -f -a -m "message 2" Tag && - test_must_fail git push ../child2 Tag:refs/tmp/Tag && - git push --force ../child2 Tag:refs/tmp/Tag && - git tag -f -a -m "message 3" Tag HEAD~ && - test_must_fail git push ../child2 Tag:refs/tmp/Tag && - git push --force ../child2 Tag:refs/tmp/Tag - ) -' - test_expect_success 'push --porcelain' ' mk_empty && echo >.git/foo "To testrepo" && @@ -1037,4 +1016,138 @@ test_expect_success 'push --prune refspec' ' ! check_push_result $the_first_commit tmp/foo tmp/bar ' +for configsection in transfer receive +do + test_expect_success "push to update a ref hidden by $configsection.hiderefs" ' + mk_test heads/master hidden/one hidden/two hidden/three && + ( + cd testrepo && + git config $configsection.hiderefs refs/hidden + ) && + + # push to unhidden ref succeeds normally + git push testrepo master:refs/heads/master && + check_push_result $the_commit heads/master && + + # push to update a hidden ref should fail + test_must_fail git push testrepo master:refs/hidden/one && + check_push_result $the_first_commit hidden/one && + + # push to delete a hidden ref should fail + test_must_fail git push testrepo :refs/hidden/two && + check_push_result $the_first_commit hidden/two && + + # idempotent push to update a hidden ref should fail + test_must_fail git push testrepo $the_first_commit:refs/hidden/three && + check_push_result $the_first_commit hidden/three + ' +done + +test_expect_success 'fetch exact SHA1' ' + mk_test heads/master hidden/one && + git push testrepo master:refs/hidden/one && + ( + cd testrepo && + git config transfer.hiderefs refs/hidden + ) && + check_push_result $the_commit hidden/one && + + mk_child child && + ( + cd child && + + # make sure $the_commit does not exist here + git repack -a -d && + git prune && + test_must_fail git cat-file -t $the_commit && + + # fetching the hidden object should fail by default + test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy && + test_must_fail git rev-parse --verify refs/heads/copy && + + # the server side can allow it to succeed + ( + cd ../testrepo && + git config uploadpack.allowtipsha1inwant true + ) && + + git fetch -v ../testrepo $the_commit:refs/heads/copy && + result=$(git rev-parse --verify refs/heads/copy) && + test "$the_commit" = "$result" + ) +' + +test_expect_success 'fetch follows tags by default' ' + mk_test heads/master && + rm -fr src dst && + git init src && + ( + cd src && + git pull ../testrepo master && + git tag -m "annotated" tag && + git for-each-ref >tmp1 && + ( + cat tmp1 + sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1 + ) | + sort -k 3 >../expect + ) && + git init dst && + ( + cd dst && + git remote add origin ../src && + git config branch.master.remote origin && + git config branch.master.merge refs/heads/master && + git pull && + git for-each-ref >../actual + ) && + test_cmp expect actual +' + +test_expect_success 'push does not follow tags by default' ' + mk_test heads/master && + rm -fr src dst && + git init src && + git init --bare dst && + ( + cd src && + git pull ../testrepo master && + git tag -m "annotated" tag && + git checkout -b another && + git commit --allow-empty -m "future commit" && + git tag -m "future" future && + git checkout master && + git for-each-ref refs/heads/master >../expect && + git push ../dst master + ) && + ( + cd dst && + git for-each-ref >../actual + ) && + test_cmp expect actual +' + +test_expect_success 'push --follow-tag only pushes relevant tags' ' + mk_test heads/master && + rm -fr src dst && + git init src && + git init --bare dst && + ( + cd src && + git pull ../testrepo master && + git tag -m "annotated" tag && + git checkout -b another && + git commit --allow-empty -m "future commit" && + git tag -m "future" future && + git checkout master && + git for-each-ref refs/heads/master refs/tags/tag >../expect + git push --follow-tag ../dst master + ) && + ( + cd dst && + git for-each-ref >../actual + ) && + test_cmp expect actual +' + test_done diff --git a/t/t5521-pull-options.sh b/t/t5521-pull-options.sh index 1b06691bb4..aa31abe32b 100755 --- a/t/t5521-pull-options.sh +++ b/t/t5521-pull-options.sh @@ -19,6 +19,17 @@ test_expect_success 'git pull -q' ' test ! -s out) ' +test_expect_success 'git pull -q --rebase' ' + mkdir clonedqrb && + (cd clonedqrb && git init && + git pull -q --rebase "../parent" >out 2>err && + test ! -s err && + test ! -s out && + git pull -q --rebase "../parent" >out 2>err && + test ! -s err && + test ! -s out) +' + test_expect_success 'git pull' ' mkdir cloned && (cd cloned && git init && @@ -27,6 +38,14 @@ test_expect_success 'git pull' ' test ! -s out) ' +test_expect_success 'git pull --rebase' ' + mkdir clonedrb && + (cd clonedrb && git init && + git pull --rebase "../parent" >out 2>err && + test -s err && + test ! -s out) +' + test_expect_success 'git pull -v' ' mkdir clonedv && (cd clonedv && git init && @@ -35,6 +54,14 @@ test_expect_success 'git pull -v' ' test ! -s out) ' +test_expect_success 'git pull -v --rebase' ' + mkdir clonedvrb && + (cd clonedvrb && git init && + git pull -v --rebase "../parent" >out 2>err && + test -s err && + test ! -s out) +' + test_expect_success 'git pull -v -q' ' mkdir clonedvq && (cd clonedvq && git init && diff --git a/t/t5551-http-fetch.sh b/t/t5551-http-fetch.sh index c5cd2e348c..47eb76921d 100755 --- a/t/t5551-http-fetch.sh +++ b/t/t5551-http-fetch.sh @@ -157,6 +157,11 @@ test_expect_success 'GIT_SMART_HTTP can disable smart http' ' test_must_fail git fetch) ' +test_expect_success 'invalid Content-Type rejected' ' + test_must_fail git clone $HTTPD_URL/broken_smart/repo.git 2>actual + grep "not valid:" actual +' + test -n "$GIT_TEST_LONG" && test_set_prereq EXPENSIVE test_expect_success EXPENSIVE 'create 50,000 tags in the repo' ' diff --git a/t/t5571-pre-push-hook.sh b/t/t5571-pre-push-hook.sh new file mode 100755 index 0000000000..6f9916a390 --- /dev/null +++ b/t/t5571-pre-push-hook.sh @@ -0,0 +1,131 @@ +#!/bin/sh + +test_description='check pre-push hooks' +. ./test-lib.sh + +# Setup hook that always succeeds +HOOKDIR="$(git rev-parse --git-dir)/hooks" +HOOK="$HOOKDIR/pre-push" +mkdir -p "$HOOKDIR" +write_script "$HOOK" <<EOF +cat >/dev/null +exit 0 +EOF + +test_expect_success 'setup' ' + git config push.default upstream && + git init --bare repo1 && + git remote add parent1 repo1 && + test_commit one && + git push parent1 HEAD:foreign +' +write_script "$HOOK" <<EOF +cat >/dev/null +exit 1 +EOF + +COMMIT1="$(git rev-parse HEAD)" +export COMMIT1 + +test_expect_success 'push with failing hook' ' + test_commit two && + test_must_fail git push parent1 HEAD +' + +test_expect_success '--no-verify bypasses hook' ' + git push --no-verify parent1 HEAD +' + +COMMIT2="$(git rev-parse HEAD)" +export COMMIT2 + +write_script "$HOOK" <<'EOF' +echo "$1" >actual +echo "$2" >>actual +cat >>actual +EOF + +cat >expected <<EOF +parent1 +repo1 +refs/heads/master $COMMIT2 refs/heads/foreign $COMMIT1 +EOF + +test_expect_success 'push with hook' ' + git push parent1 master:foreign && + diff expected actual +' + +test_expect_success 'add a branch' ' + git checkout -b other parent1/foreign && + test_commit three +' + +COMMIT3="$(git rev-parse HEAD)" +export COMMIT3 + +cat >expected <<EOF +parent1 +repo1 +refs/heads/other $COMMIT3 refs/heads/foreign $COMMIT2 +EOF + +test_expect_success 'push to default' ' + git push && + diff expected actual +' + +cat >expected <<EOF +parent1 +repo1 +refs/tags/one $COMMIT1 refs/tags/tag1 $_z40 +HEAD~ $COMMIT2 refs/heads/prev $_z40 +EOF + +test_expect_success 'push non-branches' ' + git push parent1 one:tag1 HEAD~:refs/heads/prev && + diff expected actual +' + +cat >expected <<EOF +parent1 +repo1 +(delete) $_z40 refs/heads/prev $COMMIT2 +EOF + +test_expect_success 'push delete' ' + git push parent1 :prev && + diff expected actual +' + +cat >expected <<EOF +repo1 +repo1 +HEAD $COMMIT3 refs/heads/other $_z40 +EOF + +test_expect_success 'push to URL' ' + git push repo1 HEAD && + diff expected actual +' + +# Test that filling pipe buffers doesn't cause failure +# Too slow to leave enabled for general use +if false +then + printf 'parent1\nrepo1\n' >expected + nr=1000 + while test $nr -lt 2000 + do + nr=$(( $nr + 1 )) + git branch b/$nr $COMMIT3 + echo "refs/heads/b/$nr $COMMIT3 refs/heads/b/$nr $_z40" >>expected + done + + test_expect_success 'push many refs' ' + git push parent1 "refs/heads/b/*:refs/heads/b/*" && + diff expected actual + ' +fi + +test_done diff --git a/t/t5800-remote-testpy.sh b/t/t5800-remote-testpy.sh index 6750961507..1e683d4220 100755 --- a/t/t5800-remote-testpy.sh +++ b/t/t5800-remote-testpy.sh @@ -145,4 +145,25 @@ test_expect_failure 'push new branch with old:new refspec' ' compare_refs clone HEAD server refs/heads/new-refspec ' +test_expect_success 'proper failure checks for fetching' ' + (GIT_REMOTE_TESTGIT_FAILURE=1 && + export GIT_REMOTE_TESTGIT_FAILURE && + cd localclone && + test_must_fail git fetch 2>&1 | \ + grep "Error while running fast-import" + ) +' + +# We sleep to give fast-export a chance to catch the SIGPIPE +test_expect_failure 'proper failure checks for pushing' ' + (GIT_REMOTE_TESTGIT_FAILURE=1 && + export GIT_REMOTE_TESTGIT_FAILURE && + GIT_REMOTE_TESTGIT_SLEEPY=1 && + export GIT_REMOTE_TESTGIT_SLEEPY && + cd localclone && + test_must_fail git push --all 2>&1 | \ + grep "Error while running fast-export" + ) +' + test_done diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index f5a79b13ae..c8d6e9f88c 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -104,6 +104,18 @@ test_expect_success 'creating a tag using HEAD directly should succeed' ' tag_exists myhead ' +test_expect_success '--force can create a tag with the name of one existing' ' + tag_exists mytag && + git tag --force mytag && + tag_exists mytag' + +test_expect_success '--force is moot with a non-existing tag name' ' + git tag newtag >expect && + git tag --force forcetag >actual && + test_cmp expect actual +' +git tag -d newtag forcetag + # deleting tags: test_expect_success 'trying to delete an unknown tag should fail' ' diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index f4f38a5e73..52ef06b000 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -5,6 +5,7 @@ test_description='basic work tree status reporting' . ./test-lib.sh test_expect_success setup ' + git config --global advice.statusuoption false && test_commit A && test_commit B oneside added && git checkout A^0 && diff --git a/t/t7061-wtstatus-ignore.sh b/t/t7061-wtstatus-ignore.sh new file mode 100755 index 0000000000..0da1214bcc --- /dev/null +++ b/t/t7061-wtstatus-ignore.sh @@ -0,0 +1,146 @@ +#!/bin/sh + +test_description='git-status ignored files' + +. ./test-lib.sh + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +?? untracked/ +EOF + +test_expect_success 'status untracked directory with --ignored' ' + echo "ignored" >.gitignore && + mkdir untracked && + : >untracked/ignored && + : >untracked/uncommitted && + git status --porcelain --ignored >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +?? untracked/uncommitted +!! untracked/ignored +EOF + +test_expect_success 'status untracked directory with --ignored -u' ' + git status --porcelain --ignored -u >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +!! ignored/ +EOF + +test_expect_success 'status ignored directory with --ignore' ' + rm -rf untracked && + mkdir ignored && + : >ignored/uncommitted && + git status --porcelain --ignored >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +!! ignored/uncommitted +EOF + +test_expect_success 'status ignored directory with --ignore -u' ' + git status --porcelain --ignored -u >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +!! untracked-ignored/ +EOF + +test_expect_success 'status untracked directory with ignored files with --ignore' ' + rm -rf ignored && + mkdir untracked-ignored && + mkdir untracked-ignored/test && + : >untracked-ignored/ignored && + : >untracked-ignored/test/ignored && + git status --porcelain --ignored >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +!! untracked-ignored/ignored +!! untracked-ignored/test/ignored +EOF + +test_expect_success 'status untracked directory with ignored files with --ignore -u' ' + git status --porcelain --ignored -u >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +EOF + +test_expect_success 'status ignored tracked directory with --ignore' ' + rm -rf untracked-ignored && + mkdir tracked && + : >tracked/committed && + git add tracked/committed && + git commit -m. && + echo "tracked" >.gitignore && + git status --porcelain --ignored >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +EOF + +test_expect_success 'status ignored tracked directory with --ignore -u' ' + git status --porcelain --ignored -u >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +!! tracked/ +EOF + +test_expect_success 'status ignored tracked directory and uncommitted file with --ignore' ' + : >tracked/uncommitted && + git status --porcelain --ignored >actual && + test_cmp expected actual +' + +cat >expected <<\EOF +?? .gitignore +?? actual +?? expected +!! tracked/uncommitted +EOF + +test_expect_success 'status ignored tracked directory and uncommitted file with --ignore -u' ' + git status --porcelain --ignored -u >actual && + test_cmp expected actual +' + +test_done diff --git a/t/t7102-reset.sh b/t/t7102-reset.sh index b096dc88c2..df82ec9dda 100755 --- a/t/t7102-reset.sh +++ b/t/t7102-reset.sh @@ -28,7 +28,8 @@ test_expect_success 'creating initial files and commits' ' echo "1st line 2nd file" >secondfile && echo "2nd line 2nd file" >>secondfile && - git commit -a -m "modify 2nd file" + git commit -a -m "modify 2nd file" && + head5=$(git rev-parse --verify HEAD) ' # git log --pretty=oneline # to see those SHA1 involved @@ -56,7 +57,7 @@ test_expect_success 'giving a non existing revision should fail' ' test_must_fail git reset --mixed aaaaaa && test_must_fail git reset --soft aaaaaa && test_must_fail git reset --hard aaaaaa && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' test_expect_success 'reset --soft with unmerged index should fail' ' @@ -74,7 +75,7 @@ test_expect_success \ test_must_fail git reset --hard -- first && test_must_fail git reset --soft HEAD^ -- first && test_must_fail git reset --hard HEAD^ -- first && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' test_expect_success 'giving unrecognized options should fail' ' @@ -86,7 +87,7 @@ test_expect_success 'giving unrecognized options should fail' ' test_must_fail git reset --soft -o && test_must_fail git reset --hard --other && test_must_fail git reset --hard -o && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' test_expect_success \ @@ -110,7 +111,7 @@ test_expect_success \ git checkout master && git branch -D branch1 branch2 && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' test_expect_success \ @@ -133,27 +134,27 @@ test_expect_success \ git checkout master && git branch -D branch3 branch4 && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' test_expect_success \ 'resetting to HEAD with no changes should succeed and do nothing' ' git reset --hard && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset --hard HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset --soft && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset --soft HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset --mixed && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset --mixed HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git reset HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' >.diff_expect @@ -176,7 +177,7 @@ test_expect_success '--soft reset only should show changes in diff --cached' ' git reset --soft HEAD^ && check_changes d1a4bc3abce4829628ae2dcb0d60ef3d1a78b1c4 && test "$(git rev-parse ORIG_HEAD)" = \ - 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + $head5 ' >.diff_expect @@ -193,7 +194,7 @@ test_expect_success \ git commit -a -C ORIG_HEAD && check_changes 3d3b7be011a58ca0c179ae45d94e6c83c0b0cd0d && test "$(git rev-parse ORIG_HEAD)" = \ - 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + $head5 ' >.diff_expect @@ -303,7 +304,7 @@ test_expect_success 'redoing the last two commits should succeed' ' echo "1st line 2nd file" >secondfile && echo "2nd line 2nd file" >>secondfile && git commit -a -m "modify 2nd file" && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' >.diff_expect @@ -341,15 +342,15 @@ EOF test_expect_success \ '--hard reset to ORIG_HEAD should clear a fast-forward merge' ' git reset --hard HEAD^ && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git pull . branch1 && git reset --hard ORIG_HEAD && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc && + check_changes $head5 && git checkout master && git branch -D branch1 branch2 && - check_changes 3ec39651e7f44ea531a5de18a9fa791c0fd370fc + check_changes $head5 ' cat > expect << EOF @@ -388,7 +389,8 @@ test_expect_success 'test --mixed <paths>' ' echo 4 > file4 && echo 5 > file1 && git add file1 file3 file4 && - test_must_fail git reset HEAD -- file1 file2 file3 && + git reset HEAD -- file1 file2 file3 && + test_must_fail git diff --quiet && git diff > output && test_cmp output expect && git diff --cached > output && @@ -402,7 +404,8 @@ test_expect_success 'test resetting the index at give paths' ' >sub/file2 && git update-index --add sub/file1 sub/file2 && T=$(git write-tree) && - test_must_fail git reset HEAD sub/file2 && + git reset HEAD sub/file2 && + test_must_fail git diff --quiet && U=$(git write-tree) && echo "$T" && echo "$U" && @@ -440,7 +443,8 @@ test_expect_success 'resetting specific path that is unmerged' ' echo "100644 $F3 3 file2" } | git update-index --index-info && git ls-files -u && - test_must_fail git reset HEAD file2 && + git reset HEAD file2 && + test_must_fail git diff --quiet && git diff-index --exit-code --cached HEAD ' @@ -449,7 +453,8 @@ test_expect_success 'disambiguation (1)' ' git reset --hard && >secondfile && git add secondfile && - test_must_fail git reset secondfile && + git reset secondfile && + test_must_fail git diff --quiet -- secondfile && test -z "$(git diff --cached --name-only)" && test -f secondfile && test ! -s secondfile @@ -474,7 +479,8 @@ test_expect_success 'disambiguation (3)' ' >secondfile && git add secondfile && rm -f secondfile && - test_must_fail git reset HEAD secondfile && + git reset HEAD secondfile && + test_must_fail git diff --quiet && test -z "$(git diff --cached --name-only)" && test ! -f secondfile @@ -486,9 +492,18 @@ test_expect_success 'disambiguation (4)' ' >secondfile && git add secondfile && rm -f secondfile && - test_must_fail git reset -- secondfile && + git reset -- secondfile && + test_must_fail git diff --quiet && test -z "$(git diff --cached --name-only)" && test ! -f secondfile ' +test_expect_success 'reset with paths accepts tree' ' + # for simpler tests, drop last commit containing added files + git reset --hard HEAD^ && + git reset HEAD^^{tree} -- . && + git diff --cached HEAD^ --exit-code && + git diff HEAD --exit-code +' + test_done diff --git a/t/t7106-reset-unborn-branch.sh b/t/t7106-reset-unborn-branch.sh new file mode 100755 index 0000000000..8062cf502b --- /dev/null +++ b/t/t7106-reset-unborn-branch.sh @@ -0,0 +1,52 @@ +#!/bin/sh + +test_description='git reset should work on unborn branch' +. ./test-lib.sh + +test_expect_success 'setup' ' + echo a >a && + echo b >b +' + +test_expect_success 'reset' ' + git add a b && + git reset && + test "$(git ls-files)" = "" +' + +test_expect_success 'reset HEAD' ' + rm .git/index && + git add a b && + test_must_fail git reset HEAD +' + +test_expect_success 'reset $file' ' + rm .git/index && + git add a b && + git reset a && + test "$(git ls-files)" = "b" +' + +test_expect_success 'reset -p' ' + rm .git/index && + git add a && + echo y | git reset -p && + test "$(git ls-files)" = "" +' + +test_expect_success 'reset --soft is a no-op' ' + rm .git/index && + git add a && + git reset --soft + test "$(git ls-files)" = "a" +' + +test_expect_success 'reset --hard' ' + rm .git/index && + git add a && + git reset --hard && + test "$(git ls-files)" = "" && + test_path_is_missing a +' + +test_done diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index 2683cba7e3..5030f1f1bc 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -757,4 +757,104 @@ test_expect_success 'submodule add with an existing name fails unless forced' ' ) ' +test_expect_success 'set up a second submodule' ' + git submodule add ./init2 example2 && + git commit -m "submodule example2 added" +' + +test_expect_success 'submodule deinit should remove the whole submodule section from .git/config' ' + git config submodule.example.foo bar && + git config submodule.example2.frotz nitfol && + git submodule deinit init && + test -z "$(git config --get-regexp "submodule\.example\.")" && + test -n "$(git config --get-regexp "submodule\.example2\.")" && + test -f example2/.git && + rmdir init +' + +test_expect_success 'submodule deinit . deinits all initialized submodules' ' + git submodule update --init && + git config submodule.example.foo bar && + git config submodule.example2.frotz nitfol && + test_must_fail git submodule deinit && + git submodule deinit . && + test -z "$(git config --get-regexp "submodule\.example\.")" && + test -z "$(git config --get-regexp "submodule\.example2\.")" && + rmdir init example2 +' + +test_expect_success 'submodule deinit deinits a submodule when its work tree is missing or empty' ' + git submodule update --init && + rm -rf init example2/* example2/.git && + git submodule deinit init example2 && + test -z "$(git config --get-regexp "submodule\.example\.")" && + test -z "$(git config --get-regexp "submodule\.example2\.")" && + rmdir init +' + +test_expect_success 'submodule deinit fails when the submodule contains modifications unless forced' ' + git submodule update --init && + echo X >>init/s && + test_must_fail git submodule deinit init && + test -n "$(git config --get-regexp "submodule\.example\.")" && + test -f example2/.git && + git submodule deinit -f init && + test -z "$(git config --get-regexp "submodule\.example\.")" && + rmdir init +' + +test_expect_success 'submodule deinit fails when the submodule contains untracked files unless forced' ' + git submodule update --init && + echo X >>init/untracked && + test_must_fail git submodule deinit init && + test -n "$(git config --get-regexp "submodule\.example\.")" && + test -f example2/.git && + git submodule deinit -f init && + test -z "$(git config --get-regexp "submodule\.example\.")" && + rmdir init +' + +test_expect_success 'submodule deinit fails when the submodule HEAD does not match unless forced' ' + git submodule update --init && + ( + cd init && + git checkout HEAD^ + ) && + test_must_fail git submodule deinit init && + test -n "$(git config --get-regexp "submodule\.example\.")" && + test -f example2/.git && + git submodule deinit -f init && + test -z "$(git config --get-regexp "submodule\.example\.")" && + rmdir init +' + +test_expect_success 'submodule deinit is silent when used on an uninitialized submodule' ' + git submodule update --init && + git submodule deinit init >actual && + test_i18ngrep "Submodule .example. (.*) unregistered for path .init" actual && + git submodule deinit init >actual && + test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && + git submodule deinit . >actual && + test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && + test_i18ngrep "Submodule .example2. (.*) unregistered for path .example2" actual && + git submodule deinit . >actual && + test_i18ngrep ! "Submodule .example. (.*) unregistered for path .init" actual && + test_i18ngrep ! "Submodule .example2. (.*) unregistered for path .example2" actual && + rmdir init example2 +' + +test_expect_success 'submodule deinit fails when submodule has a .git directory even when forced' ' + git submodule update --init && + ( + cd init && + rm .git && + cp -R ../.git/modules/example .git && + GIT_WORK_TREE=. git config --unset core.worktree + ) && + test_must_fail git submodule deinit init && + test_must_fail git submodule deinit -f init && + test -d init/.git && + test -n "$(git config --get-regexp "submodule\.example\.")" +' + test_done diff --git a/t/t7402-submodule-rebase.sh b/t/t7402-submodule-rebase.sh index f919c8d34d..8e32f19007 100755 --- a/t/t7402-submodule-rebase.sh +++ b/t/t7402-submodule-rebase.sh @@ -3,7 +3,7 @@ # Copyright (c) 2008 Johannes Schindelin # -test_description='Test rebasing and stashing with dirty submodules' +test_description='Test rebasing, stashing, etc. with submodules' . ./test-lib.sh @@ -20,7 +20,8 @@ test_expect_success setup ' echo second line >> file && (cd submodule && git pull) && test_tick && - git commit -m file-and-submodule -a + git commit -m file-and-submodule -a && + git branch added-submodule ' @@ -89,4 +90,29 @@ test_expect_success 'stash with a dirty submodule' ' ' +test_expect_success 'rebasing submodule that should conflict' ' + git reset --hard && + git checkout added-submodule && + git add submodule && + test_tick && + git commit -m third && + ( + cd submodule && + git commit --allow-empty -m extra + ) && + git add submodule && + test_tick && + git commit -m fourth && + + test_must_fail git rebase --onto HEAD^^ HEAD^ HEAD^0 && + git ls-files -s submodule >actual && + ( + cd submodule && + echo "160000 $(git rev-parse HEAD^) 1 submodule" && + echo "160000 $(git rev-parse HEAD^^) 2 submodule" && + echo "160000 $(git rev-parse HEAD) 3 submodule" + ) >expect && + test_cmp expect actual +' + test_done diff --git a/t/t7406-submodule-update.sh b/t/t7406-submodule-update.sh index 4975ec07ce..1a3d20bdc3 100755 --- a/t/t7406-submodule-update.sh +++ b/t/t7406-submodule-update.sh @@ -643,7 +643,8 @@ test_expect_success 'submodule update places git-dir in superprojects git-dir re rm -rf super_update_r2 && git clone super_update_r super_update_r2 && (cd super_update_r2 && - git submodule update --init --recursive && + git submodule update --init --recursive >actual && + test_i18ngrep "Submodule path .submodule/subsubmodule.: checked out" actual && (cd submodule/subsubmodule && git log > ../../expected ) && diff --git a/t/t7500/add-content-and-comment b/t/t7500/add-content-and-comment new file mode 100755 index 0000000000..c4dccff13a --- /dev/null +++ b/t/t7500/add-content-and-comment @@ -0,0 +1,5 @@ +#!/bin/sh +echo "commit message" >> "$1" +echo "# comment" >> "$1" +exit 0 + diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index 1a5cb6983c..f9b44b7244 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -4,6 +4,15 @@ test_description='git commit porcelain-ish' . ./test-lib.sh +commit_msg_is () { + expect=commit_msg_is.expect + actual=commit_msg_is.actual + + printf "%s" "$(git log --pretty=format:%s%b -1)" >$actual && + printf "%s" "$1" >$expect && + test_i18ncmp $expect $actual +} + # Arguments: [<prefix] [<commit message>] [<commit options>] check_summary_oneline() { test_tick && @@ -168,17 +177,25 @@ test_expect_success 'verbose respects diff config' ' git config --unset color.diff ' -test_expect_success 'cleanup commit messages (verbatim,-t)' ' +mesg_with_comment_and_newlines=' +# text + +' + +test_expect_success 'prepare file with comment line and trailing newlines' ' + printf "%s" "$mesg_with_comment_and_newlines" >expect +' + +test_expect_success 'cleanup commit messages (verbatim option,-t)' ' echo >>negative && - { echo;echo "# text";echo; } >expect && - git commit --cleanup=verbatim -t expect -a && - git cat-file -p HEAD |sed -e "1,/^\$/d" |head -n 3 >actual && + git commit --cleanup=verbatim --no-status -t expect -a && + git cat-file -p HEAD |sed -e "1,/^\$/d" >actual && test_cmp expect actual ' -test_expect_success 'cleanup commit messages (verbatim,-F)' ' +test_expect_success 'cleanup commit messages (verbatim option,-F)' ' echo >>negative && git commit --cleanup=verbatim -F expect -a && @@ -187,16 +204,16 @@ test_expect_success 'cleanup commit messages (verbatim,-F)' ' ' -test_expect_success 'cleanup commit messages (verbatim,-m)' ' +test_expect_success 'cleanup commit messages (verbatim option,-m)' ' echo >>negative && - git commit --cleanup=verbatim -m "$(cat expect)" -a && + git commit --cleanup=verbatim -m "$mesg_with_comment_and_newlines" -a && git cat-file -p HEAD |sed -e "1,/^\$/d">actual && test_cmp expect actual ' -test_expect_success 'cleanup commit messages (whitespace,-F)' ' +test_expect_success 'cleanup commit messages (whitespace option,-F)' ' echo >>negative && { echo;echo "# text";echo; } >text && @@ -207,7 +224,7 @@ test_expect_success 'cleanup commit messages (whitespace,-F)' ' ' -test_expect_success 'cleanup commit messages (strip,-F)' ' +test_expect_success 'cleanup commit messages (strip option,-F)' ' echo >>negative && { echo;echo "# text";echo sample;echo; } >text && @@ -218,7 +235,7 @@ test_expect_success 'cleanup commit messages (strip,-F)' ' ' -test_expect_success 'cleanup commit messages (strip,-F,-e)' ' +test_expect_success 'cleanup commit messages (strip option,-F,-e)' ' echo >>negative && { echo;echo sample;echo; } >text && @@ -231,10 +248,79 @@ echo "sample # Please enter the commit message for your changes. Lines starting # with '#' will be ignored, and an empty message aborts the commit." >expect -test_expect_success 'cleanup commit messages (strip,-F,-e): output' ' +test_expect_success 'cleanup commit messages (strip option,-F,-e): output' ' test_i18ncmp expect actual ' +test_expect_success 'cleanup commit message (fail on invalid cleanup mode option)' ' + test_must_fail git commit --cleanup=non-existent +' + +test_expect_success 'cleanup commit message (fail on invalid cleanup mode configuration)' ' + test_must_fail git -c commit.cleanup=non-existent commit +' + +test_expect_success 'cleanup commit message (no config and no option uses default)' ' + echo content >>file && + git add file && + ( + test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && + git commit --no-status + ) && + commit_msg_is "commit message" +' + +test_expect_success 'cleanup commit message (option overrides default)' ' + echo content >>file && + git add file && + ( + test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && + git commit --cleanup=whitespace --no-status + ) && + commit_msg_is "commit message # comment" +' + +test_expect_success 'cleanup commit message (config overrides default)' ' + echo content >>file && + git add file && + ( + test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && + git -c commit.cleanup=whitespace commit --no-status + ) && + commit_msg_is "commit message # comment" +' + +test_expect_success 'cleanup commit message (option overrides config)' ' + echo content >>file && + git add file && + ( + test_set_editor "$TEST_DIRECTORY"/t7500/add-content-and-comment && + git -c commit.cleanup=whitespace commit --cleanup=default + ) && + commit_msg_is "commit message" +' + +test_expect_success 'cleanup commit message (default, -m)' ' + echo content >>file && + git add file && + git commit -m "message #comment " && + commit_msg_is "message #comment" +' + +test_expect_success 'cleanup commit message (whitespace option, -m)' ' + echo content >>file && + git add file && + git commit --cleanup=whitespace --no-status -m "message #comment " && + commit_msg_is "message #comment" +' + +test_expect_success 'cleanup commit message (whitespace config, -m)' ' + echo content >>file && + git add file && + git -c commit.cleanup=whitespace commit --no-status -m "message #comment " && + commit_msg_is "message #comment" +' + test_expect_success 'message shows author when it is not equal to committer' ' echo >>negative && git commit -e -m "sample" -a && @@ -447,4 +533,11 @@ use_template="-t template" try_commit_status_combo +test_expect_success 'commit --status with custom comment character' ' + test_when_finished "git config --unset core.commentchar" && + git config core.commentchar ";" && + try_commit --status && + test_i18ngrep "^; Changes to be committed:" .git/COMMIT_EDITMSG +' + test_done diff --git a/t/t7508-status.sh b/t/t7508-status.sh index e313ef196e..aecb4d1e5f 100755 --- a/t/t7508-status.sh +++ b/t/t7508-status.sh @@ -8,6 +8,7 @@ test_description='git status' . ./test-lib.sh test_expect_success 'status -h in broken repository' ' + git config --global advice.statusuoption false && mkdir broken && test_when_finished "rm -fr broken" && ( @@ -1254,6 +1255,56 @@ test_expect_success ".git/config ignore=dirty doesn't suppress submodule summary ' cat > expect << EOF +; On branch master +; Changes to be committed: +; (use "git reset HEAD <file>..." to unstage) +; +; modified: sm +; +; Changes not staged for commit: +; (use "git add <file>..." to update what will be committed) +; (use "git checkout -- <file>..." to discard changes in working directory) +; +; modified: dir1/modified +; modified: sm (new commits) +; +; Submodule changes to be committed: +; +; * sm $head...$new_head (1): +; > Add bar +; +; Submodules changed but not updated: +; +; * sm $new_head...$head2 (1): +; > 2nd commit +; +; Untracked files: +; (use "git add <file>..." to include in what will be committed) +; +; .gitmodules +; dir1/untracked +; dir2/modified +; dir2/untracked +; expect +; output +; untracked +EOF + +test_expect_success "status (core.commentchar with submodule summary)" ' + test_when_finished "git config --unset core.commentchar" && + git config core.commentchar ";" && + git status >output && + test_i18ncmp expect output +' + +test_expect_success "status (core.commentchar with two chars with submodule summary)" ' + test_when_finished "git config --unset core.commentchar" && + git config core.commentchar ";;" && + git status >output && + test_i18ncmp expect output +' + +cat > expect << EOF # On branch master # Changes not staged for commit: # (use "git add <file>..." to update what will be committed) diff --git a/t/t7512-status-help.sh b/t/t7512-status-help.sh index b3f6eb9c68..9d4610629d 100755 --- a/t/t7512-status-help.sh +++ b/t/t7512-status-help.sh @@ -5,7 +5,7 @@ # Grenoble INP Ensimag # -test_description='git status advices' +test_description='git status advice' . ./test-lib.sh @@ -14,6 +14,7 @@ test_description='git status advices' set_fake_editor test_expect_success 'prepare for conflicts' ' + git config --global advice.statusuoption false && test_commit init main.txt init && git branch conflicts && test_commit on_master main.txt on_master && @@ -73,10 +74,11 @@ test_expect_success 'prepare for rebase conflicts' ' test_expect_success 'status when rebase in progress before resolving conflicts' ' test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD^^) && test_must_fail git rebase HEAD^ --onto HEAD^^ && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently rebasing. + # You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''. # (fix conflicts and then run "git rebase --continue") # (use "git rebase --skip" to skip this patch) # (use "git rebase --abort" to check out the original branch) @@ -97,12 +99,13 @@ test_expect_success 'status when rebase in progress before resolving conflicts' test_expect_success 'status when rebase in progress before rebase --continue' ' git reset --hard rebase_conflicts && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD^^) && test_must_fail git rebase HEAD^ --onto HEAD^^ && echo three >main.txt && git add main.txt && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently rebasing. + # You are currently rebasing branch '\''rebase_conflicts'\'' on '\''$ONTO'\''. # (all conflicts fixed: run "git rebase --continue") # # Changes to be committed: @@ -130,10 +133,11 @@ test_expect_success 'prepare for rebase_i_conflicts' ' test_expect_success 'status during rebase -i when conflicts unresolved' ' test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short rebase_i_conflicts) && test_must_fail git rebase -i rebase_i_conflicts && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently rebasing. + # You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''. # (fix conflicts and then run "git rebase --continue") # (use "git rebase --skip" to skip this patch) # (use "git rebase --abort" to check out the original branch) @@ -154,11 +158,12 @@ test_expect_success 'status during rebase -i when conflicts unresolved' ' test_expect_success 'status during rebase -i after resolving conflicts' ' git reset --hard rebase_i_conflicts_second && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short rebase_i_conflicts) && test_must_fail git rebase -i rebase_i_conflicts && git add main.txt && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently rebasing. + # You are currently rebasing branch '\''rebase_i_conflicts_second'\'' on '\''$ONTO'\''. # (all conflicts fixed: run "git rebase --continue") # # Changes to be committed: @@ -182,10 +187,11 @@ test_expect_success 'status when rebasing -i in edit mode' ' FAKE_LINES="1 edit 2" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~2) && git rebase -i HEAD~2 && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''rebase_i_edit'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -206,11 +212,12 @@ test_expect_success 'status when splitting a commit' ' FAKE_LINES="1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git reset HEAD^ && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently splitting a commit during a rebase. + # You are currently splitting a commit while rebasing branch '\''split_commit'\'' on '\''$ONTO'\''. # (Once your working directory is clean, run "git rebase --continue") # # Changes not staged for commit: @@ -236,11 +243,12 @@ test_expect_success 'status after editing the last commit with --amend during a FAKE_LINES="1 2 edit 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git commit --amend -m "foo" && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''amend_last'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -265,11 +273,12 @@ test_expect_success 'status: (continue first edit) second edit' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git rebase --continue && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -285,12 +294,13 @@ test_expect_success 'status: (continue first edit) second edit and split' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git rebase --continue && git reset HEAD^ && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently splitting a commit during a rebase. + # You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (Once your working directory is clean, run "git rebase --continue") # # Changes not staged for commit: @@ -311,12 +321,13 @@ test_expect_success 'status: (continue first edit) second edit and amend' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git rebase --continue && git commit --amend -m "foo" && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -332,12 +343,13 @@ test_expect_success 'status: (amend first edit) second edit' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git commit --amend -m "a" && git rebase --continue && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -353,13 +365,14 @@ test_expect_success 'status: (amend first edit) second edit and split' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git commit --amend -m "b" && git rebase --continue && git reset HEAD^ && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently splitting a commit during a rebase. + # You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (Once your working directory is clean, run "git rebase --continue") # # Changes not staged for commit: @@ -380,13 +393,14 @@ test_expect_success 'status: (amend first edit) second edit and amend' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git commit --amend -m "c" && git rebase --continue && git commit --amend -m "d" && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -402,14 +416,15 @@ test_expect_success 'status: (split first edit) second edit' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git reset HEAD^ && git add main.txt && git commit -m "e" && git rebase --continue && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -425,15 +440,16 @@ test_expect_success 'status: (split first edit) second edit and split' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git reset HEAD^ && git add main.txt && git commit --amend -m "f" && git rebase --continue && git reset HEAD^ && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently splitting a commit during a rebase. + # You are currently splitting a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (Once your working directory is clean, run "git rebase --continue") # # Changes not staged for commit: @@ -454,15 +470,16 @@ test_expect_success 'status: (split first edit) second edit and amend' ' FAKE_LINES="edit 1 edit 2 3" && export FAKE_LINES && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD~3) && git rebase -i HEAD~3 && git reset HEAD^ && git add main.txt && git commit --amend -m "g" && git rebase --continue && git commit --amend -m "h" && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently editing a commit during a rebase. + # You are currently editing a commit while rebasing branch '\''several_edits'\'' on '\''$ONTO'\''. # (use "git commit --amend" to amend the current commit) # (use "git rebase --continue" once you are satisfied with your changes) # @@ -558,7 +575,7 @@ test_expect_success 'status when bisecting' ' git bisect good one_bisect && cat >expected <<-\EOF && # Not currently on any branch. - # You are currently bisecting. + # You are currently bisecting branch '\''bisect'\''. # (use "git bisect reset" to get back to the original branch) # nothing to commit (use -u to show untracked files) @@ -577,10 +594,11 @@ test_expect_success 'status when rebase conflicts with statushints disabled' ' test_commit two_statushints main.txt two && test_commit three_statushints main.txt three && test_when_finished "git rebase --abort" && + ONTO=$(git rev-parse --short HEAD^^) && test_must_fail git rebase HEAD^ --onto HEAD^^ && - cat >expected <<-\EOF && + cat >expected <<-EOF && # Not currently on any branch. - # You are currently rebasing. + # You are currently rebasing branch '\''statushints_disabled'\'' on '\''$ONTO'\''. # # Unmerged paths: # both modified: main.txt diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index eb1d3f85b5..3aab6e1500 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2009, 2010 David Aguilar +# Copyright (c) 2009, 2010, 2012, 2013 David Aguilar # test_description='git-difftool @@ -10,43 +10,25 @@ Testing basic diff tool invocation . ./test-lib.sh -remove_config_vars() +difftool_test_setup () { - # Unset all config variables used by git-difftool - git config --unset diff.tool - git config --unset diff.guitool - git config --unset difftool.test-tool.cmd - git config --unset difftool.prompt - git config --unset merge.tool - git config --unset mergetool.test-tool.cmd - git config --unset mergetool.prompt - return 0 + test_config diff.tool test-tool && + test_config difftool.test-tool.cmd 'cat "$LOCAL"' && + test_config difftool.bogus-tool.cmd false } -restore_test_defaults() -{ - # Restores the test defaults used by several tests - remove_config_vars - unset GIT_DIFF_TOOL - unset GIT_DIFFTOOL_PROMPT - unset GIT_DIFFTOOL_NO_PROMPT - git config diff.tool test-tool && - git config difftool.test-tool.cmd 'cat $LOCAL' - git config difftool.bogus-tool.cmd false -} - -prompt_given() +prompt_given () { prompt="$1" test "$prompt" = "Launch 'test-tool' [Y/n]: branch" } -stdin_contains() +stdin_contains () { grep >/dev/null "$1" } -stdin_doesnot_contain() +stdin_doesnot_contain () { ! stdin_contains "$1" } @@ -65,249 +47,237 @@ test_expect_success PERL 'setup' ' # Configure a custom difftool.<tool>.cmd and use it test_expect_success PERL 'custom commands' ' - restore_test_defaults && - git config difftool.test-tool.cmd "cat \$REMOTE" && + difftool_test_setup && + test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" && + echo master >expect && + git difftool --no-prompt branch >actual && + test_cmp expect actual && - diff=$(git difftool --no-prompt branch) && - test "$diff" = "master" && - - restore_test_defaults && - diff=$(git difftool --no-prompt branch) && - test "$diff" = "branch" + test_config difftool.test-tool.cmd "cat \"\$LOCAL\"" && + echo branch >expect && + git difftool --no-prompt branch >actual && + test_cmp expect actual ' -# Ensures that a custom difftool.<tool>.cmd overrides built-ins -test_expect_success PERL 'custom commands override built-ins' ' - restore_test_defaults && - git config difftool.defaults.cmd "cat \$REMOTE" && - - diff=$(git difftool --tool defaults --no-prompt branch) && - test "$diff" = "master" && - - git config --unset difftool.defaults.cmd +test_expect_success PERL 'custom tool commands override built-ins' ' + test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" && + echo master >expect && + git difftool --tool vimdiff --no-prompt branch >actual && + test_cmp expect actual ' -# Ensures that git-difftool ignores bogus --tool values test_expect_success PERL 'difftool ignores bad --tool values' ' - diff=$(git difftool --no-prompt --tool=bad-tool branch) - test "$?" = 1 && - test "$diff" = "" + : >expect && + test_expect_code 1 \ + git difftool --no-prompt --tool=bad-tool branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool forwards arguments to diff' ' + difftool_test_setup && >for-diff && git add for-diff && echo changes>for-diff && git add for-diff && - diff=$(git difftool --cached --no-prompt -- for-diff) && - test "$diff" = "" && + : >expect && + git difftool --cached --no-prompt -- for-diff >actual && + test_cmp expect actual && git reset -- for-diff && rm for-diff ' test_expect_success PERL 'difftool honors --gui' ' - git config merge.tool bogus-tool && - git config diff.tool bogus-tool && - git config diff.guitool test-tool && - - diff=$(git difftool --no-prompt --gui branch) && - test "$diff" = "branch" && + difftool_test_setup && + test_config merge.tool bogus-tool && + test_config diff.tool bogus-tool && + test_config diff.guitool test-tool && - restore_test_defaults + echo branch >expect && + git difftool --no-prompt --gui branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool --gui last setting wins' ' - git config diff.guitool bogus-tool && - git difftool --no-prompt --gui --no-gui && + difftool_test_setup && + : >expect && + git difftool --no-prompt --gui --no-gui >actual && + test_cmp expect actual && - git config merge.tool bogus-tool && - git config diff.tool bogus-tool && - git config diff.guitool test-tool && - diff=$(git difftool --no-prompt --no-gui --gui branch) && - test "$diff" = "branch" && - - restore_test_defaults + test_config merge.tool bogus-tool && + test_config diff.tool bogus-tool && + test_config diff.guitool test-tool && + echo branch >expect && + git difftool --no-prompt --no-gui --gui branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool --gui works without configured diff.guitool' ' - git config diff.tool test-tool && - - diff=$(git difftool --no-prompt --gui branch) && - test "$diff" = "branch" && - - restore_test_defaults + difftool_test_setup && + echo branch >expect && + git difftool --no-prompt --gui branch >actual && + test_cmp expect actual ' # Specify the diff tool using $GIT_DIFF_TOOL test_expect_success PERL 'GIT_DIFF_TOOL variable' ' - test_might_fail git config --unset diff.tool && - GIT_DIFF_TOOL=test-tool && - export GIT_DIFF_TOOL && - - diff=$(git difftool --no-prompt branch) && - test "$diff" = "branch" && - - restore_test_defaults + difftool_test_setup && + git config --unset diff.tool && + echo branch >expect && + GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual && + test_cmp expect actual ' # Test the $GIT_*_TOOL variables and ensure # that $GIT_DIFF_TOOL always wins unless --tool is specified test_expect_success PERL 'GIT_DIFF_TOOL overrides' ' - git config diff.tool bogus-tool && - git config merge.tool bogus-tool && - - GIT_DIFF_TOOL=test-tool && - export GIT_DIFF_TOOL && - - diff=$(git difftool --no-prompt branch) && - test "$diff" = "branch" && + difftool_test_setup && + test_config diff.tool bogus-tool && + test_config merge.tool bogus-tool && - GIT_DIFF_TOOL=bogus-tool && - export GIT_DIFF_TOOL && + echo branch >expect && + GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual && + test_cmp expect actual && - diff=$(git difftool --no-prompt --tool=test-tool branch) && - test "$diff" = "branch" && - - restore_test_defaults + test_config diff.tool bogus-tool && + test_config merge.tool bogus-tool && + GIT_DIFF_TOOL=bogus-tool \ + git difftool --no-prompt --tool=test-tool branch >actual && + test_cmp expect actual ' # Test that we don't have to pass --no-prompt to difftool # when $GIT_DIFFTOOL_NO_PROMPT is true test_expect_success PERL 'GIT_DIFFTOOL_NO_PROMPT variable' ' - GIT_DIFFTOOL_NO_PROMPT=true && - export GIT_DIFFTOOL_NO_PROMPT && - - diff=$(git difftool branch) && - test "$diff" = "branch" && - - restore_test_defaults + difftool_test_setup && + echo branch >expect && + GIT_DIFFTOOL_NO_PROMPT=true git difftool branch >actual && + test_cmp expect actual ' # git-difftool supports the difftool.prompt variable. # Test that GIT_DIFFTOOL_PROMPT can override difftool.prompt = false test_expect_success PERL 'GIT_DIFFTOOL_PROMPT variable' ' - git config difftool.prompt false && - GIT_DIFFTOOL_PROMPT=true && - export GIT_DIFFTOOL_PROMPT && - - prompt=$(echo | git difftool branch | tail -1) && - prompt_given "$prompt" && - - restore_test_defaults + difftool_test_setup && + test_config difftool.prompt false && + echo >input && + GIT_DIFFTOOL_PROMPT=true git difftool branch <input >output && + prompt=$(tail -1 <output) && + prompt_given "$prompt" ' # Test that we don't have to pass --no-prompt when difftool.prompt is false test_expect_success PERL 'difftool.prompt config variable is false' ' - git config difftool.prompt false && - - diff=$(git difftool branch) && - test "$diff" = "branch" && - - restore_test_defaults + difftool_test_setup && + test_config difftool.prompt false && + echo branch >expect && + git difftool branch >actual && + test_cmp expect actual ' # Test that we don't have to pass --no-prompt when mergetool.prompt is false test_expect_success PERL 'difftool merge.prompt = false' ' + difftool_test_setup && test_might_fail git config --unset difftool.prompt && - git config mergetool.prompt false && - - diff=$(git difftool branch) && - test "$diff" = "branch" && - - restore_test_defaults + test_config mergetool.prompt false && + echo branch >expect && + git difftool branch >actual && + test_cmp expect actual ' # Test that the -y flag can override difftool.prompt = true test_expect_success PERL 'difftool.prompt can overridden with -y' ' - git config difftool.prompt true && - - diff=$(git difftool -y branch) && - test "$diff" = "branch" && - - restore_test_defaults + difftool_test_setup && + test_config difftool.prompt true && + echo branch >expect && + git difftool -y branch >actual && + test_cmp expect actual ' # Test that the --prompt flag can override difftool.prompt = false test_expect_success PERL 'difftool.prompt can overridden with --prompt' ' - git config difftool.prompt false && - - prompt=$(echo | git difftool --prompt branch | tail -1) && - prompt_given "$prompt" && - - restore_test_defaults + difftool_test_setup && + test_config difftool.prompt false && + echo >input && + git difftool --prompt branch <input >output && + prompt=$(tail -1 <output) && + prompt_given "$prompt" ' # Test that the last flag passed on the command-line wins test_expect_success PERL 'difftool last flag wins' ' - diff=$(git difftool --prompt --no-prompt branch) && - test "$diff" = "branch" && - - restore_test_defaults && - - prompt=$(echo | git difftool --no-prompt --prompt branch | tail -1) && - prompt_given "$prompt" && - - restore_test_defaults + difftool_test_setup && + echo branch >expect && + git difftool --prompt --no-prompt branch >actual && + test_cmp expect actual && + echo >input && + git difftool --no-prompt --prompt branch <input >output && + prompt=$(tail -1 <output) && + prompt_given "$prompt" ' # git-difftool falls back to git-mergetool config variables # so test that behavior here test_expect_success PERL 'difftool + mergetool config variables' ' - remove_config_vars && - git config merge.tool test-tool && - git config mergetool.test-tool.cmd "cat \$LOCAL" && - - diff=$(git difftool --no-prompt branch) && - test "$diff" = "branch" && + test_config merge.tool test-tool && + test_config mergetool.test-tool.cmd "cat \$LOCAL" && + echo branch >expect && + git difftool --no-prompt branch >actual && + test_cmp expect actual && # set merge.tool to something bogus, diff.tool to test-tool - git config merge.tool bogus-tool && - git config diff.tool test-tool && - - diff=$(git difftool --no-prompt branch) && - test "$diff" = "branch" && - - restore_test_defaults + test_config merge.tool bogus-tool && + test_config diff.tool test-tool && + git difftool --no-prompt branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool.<tool>.path' ' - git config difftool.tkdiff.path echo && - diff=$(git difftool --tool=tkdiff --no-prompt branch) && - git config --unset difftool.tkdiff.path && - lines=$(echo "$diff" | grep file | wc -l) && - test "$lines" -eq 1 && - - restore_test_defaults + test_config difftool.tkdiff.path echo && + git difftool --tool=tkdiff --no-prompt branch >output && + lines=$(grep file output | wc -l) && + test "$lines" -eq 1 ' test_expect_success PERL 'difftool --extcmd=cat' ' - diff=$(git difftool --no-prompt --extcmd=cat branch) && - test "$diff" = branch"$LF"master + echo branch >expect && + echo master >>expect && + git difftool --no-prompt --extcmd=cat branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool --extcmd cat' ' - diff=$(git difftool --no-prompt --extcmd cat branch) && - test "$diff" = branch"$LF"master + echo branch >expect && + echo master >>expect && + git difftool --no-prompt --extcmd=cat branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool -x cat' ' - diff=$(git difftool --no-prompt -x cat branch) && - test "$diff" = branch"$LF"master + echo branch >expect && + echo master >>expect && + git difftool --no-prompt -x cat branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool --extcmd echo arg1' ' - diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"echo\ \$1\" branch) && - test "$diff" = file + echo file >expect && + git difftool --no-prompt \ + --extcmd sh\ -c\ \"echo\ \$1\" branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool --extcmd cat arg1' ' - diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$1\" branch) && - test "$diff" = master + echo master >expect && + git difftool --no-prompt \ + --extcmd sh\ -c\ \"cat\ \$1\" branch >actual && + test_cmp expect actual ' test_expect_success PERL 'difftool --extcmd cat arg2' ' - diff=$(git difftool --no-prompt --extcmd sh\ -c\ \"cat\ \$2\" branch) && - test "$diff" = branch + echo branch >expect && + git difftool --no-prompt \ + --extcmd sh\ -c\ \"cat\ \$2\" branch >actual && + test_cmp expect actual ' # Create a second file on master and a different version on branch @@ -324,26 +294,26 @@ test_expect_success PERL 'setup with 2 files different' ' ' test_expect_success PERL 'say no to the first file' ' - diff=$( (echo n; echo) | git difftool -x cat branch ) && - - echo "$diff" | stdin_contains m2 && - echo "$diff" | stdin_contains br2 && - echo "$diff" | stdin_doesnot_contain master && - echo "$diff" | stdin_doesnot_contain branch + (echo n && echo) >input && + git difftool -x cat branch <input >output && + stdin_contains m2 <output && + stdin_contains br2 <output && + stdin_doesnot_contain master <output && + stdin_doesnot_contain branch <output ' test_expect_success PERL 'say no to the second file' ' - diff=$( (echo; echo n) | git difftool -x cat branch ) && - - echo "$diff" | stdin_contains master && - echo "$diff" | stdin_contains branch && - echo "$diff" | stdin_doesnot_contain m2 && - echo "$diff" | stdin_doesnot_contain br2 + (echo && echo n) >input && + git difftool -x cat branch <input >output && + stdin_contains master <output && + stdin_contains branch <output && + stdin_doesnot_contain m2 <output && + stdin_doesnot_contain br2 <output ' test_expect_success PERL 'difftool --tool-help' ' - tool_help=$(git difftool --tool-help) && - echo "$tool_help" | stdin_contains tool + git difftool --tool-help >output && + stdin_contains tool <output ' test_expect_success PERL 'setup change in subdirectory' ' @@ -359,29 +329,29 @@ test_expect_success PERL 'setup change in subdirectory' ' ' test_expect_success PERL 'difftool -d' ' - diff=$(git difftool -d --extcmd ls branch) && - echo "$diff" | stdin_contains sub && - echo "$diff" | stdin_contains file + git difftool -d --extcmd ls branch >output && + stdin_contains sub <output && + stdin_contains file <output ' test_expect_success PERL 'difftool --dir-diff' ' - diff=$(git difftool --dir-diff --extcmd ls branch) && - echo "$diff" | stdin_contains sub && - echo "$diff" | stdin_contains file + git difftool --dir-diff --extcmd ls branch >output && + stdin_contains sub <output && + stdin_contains file <output ' test_expect_success PERL 'difftool --dir-diff ignores --prompt' ' - diff=$(git difftool --dir-diff --prompt --extcmd ls branch) && - echo "$diff" | stdin_contains sub && - echo "$diff" | stdin_contains file + git difftool --dir-diff --prompt --extcmd ls branch >output && + stdin_contains sub <output && + stdin_contains file <output ' test_expect_success PERL 'difftool --dir-diff from subdirectory' ' ( cd sub && - diff=$(git difftool --dir-diff --extcmd ls branch) && - echo "$diff" | stdin_contains sub && - echo "$diff" | stdin_contains file + git difftool --dir-diff --extcmd ls branch >output && + stdin_contains sub <output && + stdin_contains file <output ) ' diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh index 749b75e8d4..4fea8d901b 100755 --- a/t/t9100-git-svn-basic.sh +++ b/t/t9100-git-svn-basic.sh @@ -306,5 +306,13 @@ test_expect_success 'git-svn works in a bare repository' ' git svn fetch ) && rm -rf bare-repo ' +test_expect_success 'git-svn works in in a repository with a gitdir: link' ' + mkdir worktree gitdir && + ( cd worktree && + git svn init "$svnrepo" && + git init --separate-git-dir ../gitdir && + git svn fetch ) && + rm -rf worktree gitdir + ' test_done diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh new file mode 100755 index 0000000000..735a018ecc --- /dev/null +++ b/t/t9402-git-cvsserver-refs.sh @@ -0,0 +1,551 @@ +#!/bin/sh + +test_description='git-cvsserver and git refspecs + +tests ability for git-cvsserver to switch between and compare +tags, branches and other git refspecs' + +. ./test-lib.sh + +######### + +check_start_tree() { + rm -f "$WORKDIR/list.expected" + echo "start $1" >>"${WORKDIR}/check.log" +} + +check_file() { + sandbox="$1" + file="$2" + ver="$3" + GIT_DIR=$SERVERDIR git show "${ver}:${file}" \ + >"$WORKDIR/check.got" 2>"$WORKDIR/check.stderr" + test_cmp "$WORKDIR/check.got" "$sandbox/$file" + stat=$? + echo "check_file $sandbox $file $ver : $stat" >>"$WORKDIR/check.log" + echo "$file" >>"$WORKDIR/list.expected" + return $stat +} + +check_end_tree() { + sandbox="$1" && + find "$sandbox" -name CVS -prune -o -type f -print >"$WORKDIR/list.actual" && + sort <"$WORKDIR/list.expected" >expected && + sort <"$WORKDIR/list.actual" | sed -e "s%cvswork/%%" >actual && + test_cmp expected actual && + rm expected actual +} + +check_end_full_tree() { + sandbox="$1" && + sort <"$WORKDIR/list.expected" >expected && + find "$sandbox" -name CVS -prune -o -type f -print | + sed -e "s%$sandbox/%%" | sort >act1 && + test_cmp expected act1 && + git ls-tree --name-only -r "$2" | sort >act2 && + test_cmp expected act2 && + rm expected act1 act2 +} + +######### + +check_diff() { + diffFile="$1" + vOld="$2" + vNew="$3" + rm -rf diffSandbox + git clone -q -n . diffSandbox && + ( + cd diffSandbox && + git checkout "$vOld" && + git apply -p0 --index <"../$diffFile" && + git diff --exit-code "$vNew" + ) >check_diff_apply.out 2>&1 +} + +######### + +cvs >/dev/null 2>&1 +if test $? -ne 1 +then + skip_all='skipping git-cvsserver tests, cvs not found' + test_done +fi +if ! test_have_prereq PERL +then + skip_all='skipping git-cvsserver tests, perl not available' + test_done +fi +"$PERL_PATH" -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || { + skip_all='skipping git-cvsserver tests, Perl SQLite interface unavailable' + test_done +} + +unset GIT_DIR GIT_CONFIG +WORKDIR=$(pwd) +SERVERDIR=$(pwd)/gitcvs.git +git_config="$SERVERDIR/config" +CVSROOT=":fork:$SERVERDIR" +CVSWORK="$(pwd)/cvswork" +CVS_SERVER=git-cvsserver +export CVSROOT CVS_SERVER + +rm -rf "$CVSWORK" "$SERVERDIR" +test_expect_success 'setup v1, b1' ' + echo "Simple text file" >textfile.c && + echo "t2" >t2 && + mkdir adir && + echo "adir/afile line1" >adir/afile && + echo "adir/afile line2" >>adir/afile && + echo "adir/afile line3" >>adir/afile && + echo "adir/afile line4" >>adir/afile && + echo "adir/a2file" >>adir/a2file && + mkdir adir/bdir && + echo "adir/bdir/bfile line 1" >adir/bdir/bfile && + echo "adir/bdir/bfile line 2" >>adir/bdir/bfile && + echo "adir/bdir/b2file" >adir/bdir/b2file && + git add textfile.c t2 adir && + git commit -q -m "First Commit (v1)" && + git tag v1 && + git branch b1 && + git clone -q --bare "$WORKDIR/.git" "$SERVERDIR" >/dev/null 2>&1 && + GIT_DIR="$SERVERDIR" git config --bool gitcvs.enabled true && + GIT_DIR="$SERVERDIR" git config gitcvs.logfile "$SERVERDIR/gitcvs.log" +' + +rm -rf cvswork +test_expect_success 'cvs co v1' ' + cvs -f -Q co -r v1 -d cvswork master >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_tree cvswork +' + +rm -rf cvswork +test_expect_success 'cvs co b1' ' + cvs -f co -r b1 -d cvswork master >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_tree cvswork +' + +test_expect_success 'cvs co b1 [cvswork3]' ' + cvs -f co -r b1 -d cvswork3 master >cvs.log 2>&1 && + check_start_tree cvswork3 && + check_file cvswork3 textfile.c v1 && + check_file cvswork3 t2 v1 && + check_file cvswork3 adir/afile v1 && + check_file cvswork3 adir/a2file v1 && + check_file cvswork3 adir/bdir/bfile v1 && + check_file cvswork3 adir/bdir/b2file v1 && + check_end_full_tree cvswork3 v1 +' + +test_expect_success 'edit cvswork3 and save diff' ' + ( + cd cvswork3 && + sed -e "s/line1/line1 - data/" adir/afile >adir/afileNEW && + mv -f adir/afileNEW adir/afile && + echo "afile5" >adir/afile5 && + rm t2 && + cvs -f add adir/afile5 && + cvs -f rm t2 && + ! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff" + ) +' + +test_expect_success 'setup v1.2 on b1' ' + git checkout b1 && + echo "new v1.2" >t3 && + rm t2 && + sed -e "s/line3/line3 - more data/" adir/afile >adir/afileNEW && + mv -f adir/afileNEW adir/afile && + rm adir/a2file && + echo "a3file" >>adir/a3file && + echo "bfile line 3" >>adir/bdir/bfile && + rm adir/bdir/b2file && + echo "b3file" >adir/bdir/b3file && + mkdir cdir && + echo "cdir/cfile" >cdir/cfile && + git add -A cdir adir t3 t2 && + git commit -q -m 'v1.2' && + git tag v1.2 && + git push --tags gitcvs.git b1:b1 +' + +test_expect_success 'cvs -f up (on b1 adir)' ' + ( cd cvswork/adir && cvs -f up -d ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1.2 && + check_file cvswork adir/a3file v1.2 && + check_file cvswork adir/bdir/bfile v1.2 && + check_file cvswork adir/bdir/b3file v1.2 && + check_end_tree cvswork +' + +test_expect_success 'cvs up (on b1 /)' ' + ( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1.2 && + check_file cvswork t3 v1.2 && + check_file cvswork adir/afile v1.2 && + check_file cvswork adir/a3file v1.2 && + check_file cvswork adir/bdir/bfile v1.2 && + check_file cvswork adir/bdir/b3file v1.2 && + check_file cvswork cdir/cfile v1.2 && + check_end_tree cvswork +' + +# Make sure "CVS/Tag" files didn't get messed up: +test_expect_success 'cvs up (on b1 /) (again; check CVS/Tag files)' ' + ( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1.2 && + check_file cvswork t3 v1.2 && + check_file cvswork adir/afile v1.2 && + check_file cvswork adir/a3file v1.2 && + check_file cvswork adir/bdir/bfile v1.2 && + check_file cvswork adir/bdir/b3file v1.2 && + check_file cvswork cdir/cfile v1.2 && + check_end_tree cvswork +' + +# update to another version: +test_expect_success 'cvs up -r v1' ' + ( cd cvswork && cvs -f up -r v1 ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_tree cvswork +' + +test_expect_success 'cvs up' ' + ( cd cvswork && cvs -f up ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_tree cvswork +' + +test_expect_success 'cvs up (again; check CVS/Tag files)' ' + ( cd cvswork && cvs -f up -d ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_tree cvswork +' + +test_expect_success 'setup simple b2' ' + git branch b2 v1 && + git push --tags gitcvs.git b2:b2 +' + +test_expect_success 'cvs co b2 [into cvswork2]' ' + cvs -f co -r b2 -d cvswork2 master >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_tree cvswork +' + +test_expect_success 'root dir edit [cvswork2]' ' + ( + cd cvswork2 && echo "Line 2" >>textfile.c && + ! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" && + cvs -f commit -m "edit textfile.c" textfile.c + ) >cvsEdit1.log 2>&1 +' + +test_expect_success 'root dir rm file [cvswork2]' ' + ( + cd cvswork2 && + cvs -f rm -f t2 && + cvs -f diff -u >../cvsEdit2-empty.diff && + ! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" && + cvs -f commit -m "rm t2" + ) >cvsEdit2.log 2>&1 +' + +test_expect_success 'subdir edit/add/rm files [cvswork2]' ' + ( + cd cvswork2 && + sed -e "s/line 1/line 1 (v2)/" adir/bdir/bfile >adir/bdir/bfileNEW && + mv -f adir/bdir/bfileNEW adir/bdir/bfile && + rm adir/bdir/b2file && + cd adir && + cvs -f rm bdir/b2file && + echo "4th file" >bdir/b4file && + cvs -f add bdir/b4file && + ! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" && + git fetch gitcvs.git b2:b2 && + ( + cd .. && + ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" && + ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff" + ) && + cvs -f commit -m "various add/rm/edit" + ) >cvs.log 2>&1 +' + +test_expect_success 'validate result of edits [cvswork2]' ' + git fetch gitcvs.git b2:b2 && + git tag v2 b2 && + git push --tags gitcvs.git b2:b2 && + check_start_tree cvswork2 && + check_file cvswork2 textfile.c v2 && + check_file cvswork2 adir/afile v2 && + check_file cvswork2 adir/a2file v2 && + check_file cvswork2 adir/bdir/bfile v2 && + check_file cvswork2 adir/bdir/b4file v2 && + check_end_full_tree cvswork2 v2 +' + +test_expect_success 'validate basic diffs saved during above cvswork2 edits' ' + test $(grep Index: cvsEdit1.diff | wc -l) = 1 && + test ! -s cvsEdit2-empty.diff && + test $(grep Index: cvsEdit2-N.diff | wc -l) = 1 && + test $(grep Index: cvsEdit3.diff | wc -l) = 3 && + rm -rf diffSandbox && + git clone -q -n . diffSandbox && + ( + cd diffSandbox && + git checkout v1 && + git apply -p0 --index <"$WORKDIR/cvsEdit1.diff" && + git apply -p0 --index <"$WORKDIR/cvsEdit2-N.diff" && + git apply -p0 --directory=adir --index <"$WORKDIR/cvsEdit3.diff" && + git diff --exit-code v2 + ) >"check_diff_apply.out" 2>&1 +' + +test_expect_success 'validate v1.2 diff saved during last cvswork2 edit' ' + test $(grep Index: cvsEdit3-v1.2.diff | wc -l) = 9 && + check_diff cvsEdit3-v1.2.diff v1.2 v2 +' + +test_expect_success 'validate v1.2 v1 diff saved during last cvswork2 edit' ' + test $(grep Index: cvsEdit3-v1.2-v1.diff | wc -l) = 9 && + check_diff cvsEdit3-v1.2-v1.diff v1.2 v1 +' + +test_expect_success 'cvs up [cvswork2]' ' + ( cd cvswork2 && cvs -f up ) >cvs.log 2>&1 && + check_start_tree cvswork2 && + check_file cvswork2 textfile.c v2 && + check_file cvswork2 adir/afile v2 && + check_file cvswork2 adir/a2file v2 && + check_file cvswork2 adir/bdir/bfile v2 && + check_file cvswork2 adir/bdir/b4file v2 && + check_end_full_tree cvswork2 v2 +' + +test_expect_success 'cvs up -r b2 [back to cvswork]' ' + ( cd cvswork && cvs -f up -r b2 ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v2 && + check_file cvswork adir/afile v2 && + check_file cvswork adir/a2file v2 && + check_file cvswork adir/bdir/bfile v2 && + check_file cvswork adir/bdir/b4file v2 && + check_end_full_tree cvswork v2 +' + +test_expect_success 'cvs up -r b1' ' + ( cd cvswork && cvs -f up -r b1 ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1.2 && + check_file cvswork t3 v1.2 && + check_file cvswork adir/afile v1.2 && + check_file cvswork adir/a3file v1.2 && + check_file cvswork adir/bdir/bfile v1.2 && + check_file cvswork adir/bdir/b3file v1.2 && + check_file cvswork cdir/cfile v1.2 && + check_end_full_tree cvswork v1.2 +' + +test_expect_success 'cvs up -A' ' + ( cd cvswork && cvs -f up -A ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_full_tree cvswork v1 +' + +test_expect_success 'cvs up (check CVS/Tag files)' ' + ( cd cvswork && cvs -f up ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_full_tree cvswork v1 +' + +# This is not really legal CVS, but it seems to work anyway: +test_expect_success 'cvs up -r heads/b1' ' + ( cd cvswork && cvs -f up -r heads/b1 ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1.2 && + check_file cvswork t3 v1.2 && + check_file cvswork adir/afile v1.2 && + check_file cvswork adir/a3file v1.2 && + check_file cvswork adir/bdir/bfile v1.2 && + check_file cvswork adir/bdir/b3file v1.2 && + check_file cvswork cdir/cfile v1.2 && + check_end_full_tree cvswork v1.2 +' + +# But this should work even if CVS client checks -r more carefully: +test_expect_success 'cvs up -r heads_-s-b2 (cvsserver escape mechanism)' ' + ( cd cvswork && cvs -f up -r heads_-s-b2 ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v2 && + check_file cvswork adir/afile v2 && + check_file cvswork adir/a2file v2 && + check_file cvswork adir/bdir/bfile v2 && + check_file cvswork adir/bdir/b4file v2 && + check_end_full_tree cvswork v2 +' + +v1hash=$(git rev-parse v1) +test_expect_success 'cvs up -r $(git rev-parse v1)' ' + test -n "$v1hash" && + ( cd cvswork && cvs -f up -r "$v1hash" ) >cvs.log 2>&1 && + check_start_tree cvswork && + check_file cvswork textfile.c v1 && + check_file cvswork t2 v1 && + check_file cvswork adir/afile v1 && + check_file cvswork adir/a2file v1 && + check_file cvswork adir/bdir/bfile v1 && + check_file cvswork adir/bdir/b2file v1 && + check_end_full_tree cvswork v1 +' + +test_expect_success 'cvs diff -r v1 -u' ' + ( cd cvswork && cvs -f diff -r v1 -u ) >cvsDiff.out 2>cvs.log && + test ! -s cvsDiff.out && + test ! -s cvs.log +' + +test_expect_success 'cvs diff -N -r v2 -u' ' + ( cd cvswork && ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log && + test ! -s cvs.log && + test -s cvsDiff.out && + check_diff cvsDiff.out v2 v1 >check_diff.out 2>&1 +' + +test_expect_success 'cvs diff -N -r v2 -r v1.2' ' + ( cd cvswork && ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log && + test ! -s cvs.log && + test -s cvsDiff.out && + check_diff cvsDiff.out v2 v1.2 >check_diff.out 2>&1 +' + +test_expect_success 'apply early [cvswork3] diff to b3' ' + git clone -q . gitwork3 && + ( + cd gitwork3 && + git checkout -b b3 v1 && + git apply -p0 --index <"$WORKDIR/cvswork3edit.diff" && + git commit -m "cvswork3 edits applied" + ) && + git fetch gitwork3 b3:b3 && + git tag v3 b3 +' + +test_expect_success 'check [cvswork3] diff' ' + ( cd cvswork3 && ! cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log && + test ! -s cvs.log && + test -s cvsDiff.out && + test $(grep Index: cvsDiff.out | wc -l) = 3 && + test_cmp cvsDiff.out cvswork3edit.diff && + check_diff cvsDiff.out v1 v3 >check_diff.out 2>&1 +' + +test_expect_success 'merge early [cvswork3] b3 with b1' ' + ( cd gitwork3 && git merge "message" HEAD b1 ) && + git fetch gitwork3 b3:b3 && + git tag v3merged b3 && + git push --tags gitcvs.git b3:b3 +' + +# This test would fail if cvsserver properly created a ".#afile"* file +# for the merge. +# TODO: Validate that the .# file was saved properly, and then +# delete/ignore it when checking the tree. +test_expect_success 'cvs up dirty [cvswork3]' ' + ( + cd cvswork3 && + cvs -f up && + ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" + ) >cvs.log 2>&1 && + test -s cvsDiff.out && + test $(grep Index: cvsDiff.out | wc -l) = 2 && + check_start_tree cvswork3 && + check_file cvswork3 textfile.c v3merged && + check_file cvswork3 t3 v3merged && + check_file cvswork3 adir/afile v3merged && + check_file cvswork3 adir/a3file v3merged && + check_file cvswork3 adir/afile5 v3merged && + check_file cvswork3 adir/bdir/bfile v3merged && + check_file cvswork3 adir/bdir/b3file v3merged && + check_file cvswork3 cdir/cfile v3merged && + check_end_full_tree cvswork3 v3merged +' + +# TODO: test cvs status + +test_expect_success 'cvs commit [cvswork3]' ' + ( + cd cvswork3 && + cvs -f commit -m "dirty sandbox after auto-merge" + ) >cvs.log 2>&1 && + check_start_tree cvswork3 && + check_file cvswork3 textfile.c v3merged && + check_file cvswork3 t3 v3merged && + check_file cvswork3 adir/afile v3merged && + check_file cvswork3 adir/a3file v3merged && + check_file cvswork3 adir/afile5 v3merged && + check_file cvswork3 adir/bdir/bfile v3merged && + check_file cvswork3 adir/bdir/b3file v3merged && + check_file cvswork3 cdir/cfile v3merged && + check_end_full_tree cvswork3 v3merged && + git fetch gitcvs.git b3:b4 && + git tag v4.1 b4 && + git diff --exit-code v4.1 v3merged >check_diff_apply.out 2>&1 +' + +test_done diff --git a/t/t9800-git-p4-basic.sh b/t/t9800-git-p4-basic.sh index 8c5979647f..665607c9cb 100755 --- a/t/t9800-git-p4-basic.sh +++ b/t/t9800-git-p4-basic.sh @@ -30,6 +30,11 @@ test_expect_success 'basic git p4 clone' ' ) ' +test_expect_success 'depot typo error' ' + test_must_fail git p4 clone --dest="$git" /depot 2>errs && + grep "Depot paths must start with" errs +' + test_expect_success 'git p4 clone @all' ' git p4 clone --dest="$git" //depot@all && test_when_finished cleanup_git && @@ -160,9 +165,12 @@ test_expect_success 'clone --bare should make a bare repository' ' test_when_finished cleanup_git && ( cd "$git" && - test ! -d .git && - bare=`git config --get core.bare` && - test "$bare" = true + test_path_is_missing .git && + git config --get --bool core.bare true && + git rev-parse --verify refs/remotes/p4/master && + git rev-parse --verify refs/remotes/p4/HEAD && + git rev-parse --verify refs/heads/master && + git rev-parse --verify HEAD ) ' diff --git a/t/t9802-git-p4-filetype.sh b/t/t9802-git-p4-filetype.sh index 21924dfd7d..eeefa67904 100755 --- a/t/t9802-git-p4-filetype.sh +++ b/t/t9802-git-p4-filetype.sh @@ -8,6 +8,123 @@ test_expect_success 'start p4d' ' start_p4d ' +# +# This series of tests checks newline handling Both p4 and +# git store newlines as \n, and have options to choose how +# newlines appear in checked-out files. +# +test_expect_success 'p4 client newlines, unix' ' + ( + cd "$cli" && + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && + printf "unix\ncrlf\n" >f-unix && + printf "unix\r\ncrlf\r\n" >f-unix-as-crlf && + p4 add -t text f-unix && + p4 submit -d f-unix && + + # LineEnd: unix; should be no change after sync + cp f-unix f-unix-orig && + p4 sync -f && + test_cmp f-unix-orig f-unix && + + # make sure stored in repo as unix newlines + # use sed to eat python-appened newline + p4 -G print //depot/f-unix | marshal_dump data 2 |\ + sed \$d >f-unix-p4-print && + test_cmp f-unix-orig f-unix-p4-print && + + # switch to win, make sure lf -> crlf + p4 client -o | sed "/LineEnd/s/:.*/:win/" | p4 client -i && + p4 sync -f && + test_cmp f-unix-as-crlf f-unix + ) +' + +test_expect_success 'p4 client newlines, win' ' + ( + cd "$cli" && + p4 client -o | sed "/LineEnd/s/:.*/:win/" | p4 client -i && + printf "win\r\ncrlf\r\n" >f-win && + printf "win\ncrlf\n" >f-win-as-lf && + p4 add -t text f-win && + p4 submit -d f-win && + + # LineEnd: win; should be no change after sync + cp f-win f-win-orig && + p4 sync -f && + test_cmp f-win-orig f-win && + + # make sure stored in repo as unix newlines + # use sed to eat python-appened newline + p4 -G print //depot/f-win | marshal_dump data 2 |\ + sed \$d >f-win-p4-print && + test_cmp f-win-as-lf f-win-p4-print && + + # switch to unix, make sure lf -> crlf + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && + p4 sync -f && + test_cmp f-win-as-lf f-win + ) +' + +test_expect_success 'ensure blobs store only lf newlines' ' + test_when_finished cleanup_git && + ( + cd "$git" && + git init && + git p4 sync //depot@all && + + # verify the files in .git are stored only with newlines + o=$(git ls-tree p4/master -- f-unix | cut -f1 | cut -d\ -f3) && + git cat-file blob $o >f-unix-blob && + test_cmp "$cli"/f-unix-orig f-unix-blob && + + o=$(git ls-tree p4/master -- f-win | cut -f1 | cut -d\ -f3) && + git cat-file blob $o >f-win-blob && + test_cmp "$cli"/f-win-as-lf f-win-blob && + + rm f-unix-blob f-win-blob + ) +' + +test_expect_success 'gitattributes setting eol=lf produces lf newlines' ' + test_when_finished cleanup_git && + ( + # checkout the files and make sure core.eol works as planned + cd "$git" && + git init && + echo "* eol=lf" >.gitattributes && + git p4 sync //depot@all && + git checkout master && + test_cmp "$cli"/f-unix-orig f-unix && + test_cmp "$cli"/f-win-as-lf f-win + ) +' + +test_expect_success 'gitattributes setting eol=crlf produces crlf newlines' ' + test_when_finished cleanup_git && + ( + # checkout the files and make sure core.eol works as planned + cd "$git" && + git init && + echo "* eol=crlf" >.gitattributes && + git p4 sync //depot@all && + git checkout master && + test_cmp "$cli"/f-unix-as-crlf f-unix && + test_cmp "$cli"/f-win-orig f-win + ) +' + +test_expect_success 'crlf cleanup' ' + ( + cd "$cli" && + rm f-unix-orig f-unix-as-crlf && + rm f-win-orig f-win-as-lf && + p4 client -o | sed "/LineEnd/s/:.*/:unix/" | p4 client -i && + p4 sync -f + ) +' + test_expect_success 'utf-16 file create' ' ( cd "$cli" && @@ -105,12 +222,13 @@ build_gendouble() { cat >gendouble.py <<-\EOF import sys import struct - import array - s = array.array("c", '\0' * 26) - struct.pack_into(">L", s, 0, 0x00051607) # AppleDouble - struct.pack_into(">L", s, 4, 0x00020000) # version 2 - s.tofile(sys.stdout) + s = struct.pack(">LL18s", + 0x00051607, # AppleDouble + 0x00020000, # version 2 + "" # pad to 26 bytes + ) + sys.stdout.write(s) EOF } diff --git a/t/t9806-git-p4-options.sh b/t/t9806-git-p4-options.sh index fa40cc8bb5..254d428b73 100755 --- a/t/t9806-git-p4-options.sh +++ b/t/t9806-git-p4-options.sh @@ -27,14 +27,102 @@ test_expect_success 'clone no --git-dir' ' test_must_fail git p4 clone --git-dir=xx //depot ' -test_expect_success 'clone --branch' ' +test_expect_success 'clone --branch should checkout master' ' git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot && test_when_finished cleanup_git && ( cd "$git" && - git ls-files >files && - test_line_count = 0 files && - test_path_is_file .git/refs/remotes/p4/sb + git rev-parse refs/remotes/p4/sb >sb && + git rev-parse refs/heads/master >master && + test_cmp sb master && + git rev-parse HEAD >head && + test_cmp sb head + ) +' + +test_expect_success 'sync when no master branch prints a nice error' ' + test_when_finished cleanup_git && + git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot@2 && + ( + cd "$git" && + test_must_fail git p4 sync 2>err && + grep "Error: no branch refs/remotes/p4/master" err + ) +' + +test_expect_success 'sync --branch builds the full ref name correctly' ' + test_when_finished cleanup_git && + ( + cd "$git" && + git init && + + git p4 sync --branch=b1 //depot && + git rev-parse --verify refs/remotes/p4/b1 && + git p4 sync --branch=p4/b2 //depot && + git rev-parse --verify refs/remotes/p4/b2 && + + git p4 sync --import-local --branch=h1 //depot && + git rev-parse --verify refs/heads/p4/h1 && + git p4 sync --import-local --branch=p4/h2 //depot && + git rev-parse --verify refs/heads/p4/h2 && + + git p4 sync --branch=refs/stuff //depot && + git rev-parse --verify refs/stuff + ) +' + +# engages --detect-branches code, which will do filename filtering so +# no sync to either b1 or b2 +test_expect_success 'sync when two branches but no master should noop' ' + test_when_finished cleanup_git && + ( + cd "$git" && + git init && + git p4 sync --branch=refs/remotes/p4/b1 //depot@2 && + git p4 sync --branch=refs/remotes/p4/b2 //depot@2 && + git p4 sync && + git show -s --format=%s refs/remotes/p4/b1 >show && + grep "Initial import" show && + git show -s --format=%s refs/remotes/p4/b2 >show && + grep "Initial import" show + ) +' + +test_expect_success 'sync --branch updates specific branch, no detection' ' + test_when_finished cleanup_git && + ( + cd "$git" && + git init && + git p4 sync --branch=b1 //depot@2 && + git p4 sync --branch=b2 //depot@2 && + git p4 sync --branch=b2 && + git show -s --format=%s refs/remotes/p4/b1 >show && + grep "Initial import" show && + git show -s --format=%s refs/remotes/p4/b2 >show && + grep "change 3" show + ) +' + +# allows using the refname "p4" as a short name for p4/master +test_expect_success 'clone creates HEAD symbolic reference' ' + git p4 clone --dest="$git" //depot && + test_when_finished cleanup_git && + ( + cd "$git" && + git rev-parse --verify refs/remotes/p4/master >master && + git rev-parse --verify p4 >p4 && + test_cmp master p4 + ) +' + +test_expect_success 'clone --branch creates HEAD symbolic reference' ' + git p4 clone --branch=refs/remotes/p4/sb --dest="$git" //depot && + test_when_finished cleanup_git && + ( + cd "$git" && + git rev-parse --verify refs/remotes/p4/sb >sb && + git rev-parse --verify p4 >p4 && + test_cmp sb p4 ) ' @@ -126,37 +214,58 @@ test_expect_success 'clone --use-client-spec' ' exec >/dev/null && test_must_fail git p4 clone --dest="$git" --use-client-spec ) && - cli2=$(test-path-utils real_path "$TRASH_DIRECTORY/cli2") && + # build a different client + cli2="$TRASH_DIRECTORY/cli2" && mkdir -p "$cli2" && test_when_finished "rmdir \"$cli2\"" && + test_when_finished cleanup_git && ( - cd "$cli2" && - p4 client -i <<-EOF - Client: client2 - Description: client2 - Root: $cli2 - View: //depot/sub/... //client2/bus/... - EOF - ) && - P4CLIENT=client2 && + # group P4CLIENT and cli changes in a sub-shell + P4CLIENT=client2 && + cli="$cli2" && + client_view "//depot/sub/... //client2/bus/..." && + git p4 clone --dest="$git" --use-client-spec //depot/... && + ( + cd "$git" && + test_path_is_file bus/dir/f4 && + test_path_is_missing file1 + ) && + cleanup_git && + # same thing again, this time with variable instead of option + ( + cd "$git" && + git init && + git config git-p4.useClientSpec true && + git p4 sync //depot/... && + git checkout -b master p4/master && + test_path_is_file bus/dir/f4 && + test_path_is_missing file1 + ) + ) +' + +test_expect_success 'submit works with no p4/master' ' test_when_finished cleanup_git && - git p4 clone --dest="$git" --use-client-spec //depot/... && + git p4 clone --branch=b1 //depot@1,2 --destination="$git" && ( cd "$git" && - test_path_is_file bus/dir/f4 && - test_path_is_missing file1 - ) && - cleanup_git && + test_commit submit-1-branch && + git config git-p4.skipSubmitEdit true && + git p4 submit --branch=b1 + ) +' - # same thing again, this time with variable instead of option +# The sync/rebase part post-submit will engage detect-branches +# machinery which will not do anything in this particular test. +test_expect_success 'submit works with two branches' ' + test_when_finished cleanup_git && + git p4 clone --branch=b1 //depot@1,2 --destination="$git" && ( cd "$git" && - git init && - git config git-p4.useClientSpec true && - git p4 sync //depot/... && - git checkout -b master p4/master && - test_path_is_file bus/dir/f4 && - test_path_is_missing file1 + git p4 sync --branch=b2 //depot@1,3 && + test_commit submit-2-branches && + git config git-p4.skipSubmitEdit true && + git p4 submit ) ' diff --git a/t/t9807-git-p4-submit.sh b/t/t9807-git-p4-submit.sh index 0ae048f29f..1fb7bc7cf9 100755 --- a/t/t9807-git-p4-submit.sh +++ b/t/t9807-git-p4-submit.sh @@ -17,6 +17,16 @@ test_expect_success 'init depot' ' ) ' +test_expect_failure 'is_cli_file_writeable function' ' + ( + cd "$cli" && + echo a >a && + is_cli_file_writeable a && + ! is_cli_file_writeable file1 && + rm a + ) +' + test_expect_success 'submit with no client dir' ' test_when_finished cleanup_git && git p4 clone --dest="$git" //depot && @@ -200,7 +210,7 @@ test_expect_success 'submit copy' ' ( cd "$cli" && test_path_is_file file5.ta && - test ! -w file5.ta + ! is_cli_file_writeable file5.ta ) ' @@ -219,7 +229,7 @@ test_expect_success 'submit rename' ' cd "$cli" && test_path_is_missing file6.t && test_path_is_file file6.ta && - test ! -w file6.ta + ! is_cli_file_writeable file6.ta ) ' diff --git a/t/t9808-git-p4-chdir.sh b/t/t9808-git-p4-chdir.sh index dc92e60cd6..11d2b5102c 100755 --- a/t/t9808-git-p4-chdir.sh +++ b/t/t9808-git-p4-chdir.sh @@ -42,6 +42,47 @@ test_expect_success 'P4CONFIG and relative dir clone' ' ) ' +# Common setup using .p4config to set P4CLIENT and P4PORT breaks +# if clone destination is relative. Make sure that chdir() expands +# the relative path in --dest to absolute. +test_expect_success 'p4 client root would be relative due to clone --dest' ' + test_when_finished cleanup_git && + ( + echo P4PORT=$P4PORT >git/.p4config && + P4CONFIG=.p4config && + export P4CONFIG && + unset P4PORT && + git p4 clone --dest="git" //depot + ) +' + +# When the p4 client Root is a symlink, make sure chdir() does not use +# getcwd() to convert it to a physical path. +test_expect_success SYMLINKS 'p4 client root symlink should stay symbolic' ' + physical="$TRASH_DIRECTORY/physical" && + symbolic="$TRASH_DIRECTORY/symbolic" && + test_when_finished "rm -rf \"$physical\"" && + test_when_finished "rm \"$symbolic\"" && + mkdir -p "$physical" && + ln -s "$physical" "$symbolic" && + test_when_finished cleanup_git && + ( + P4CLIENT=client-sym && + p4 client -i <<-EOF && + Client: $P4CLIENT + Description: $P4CLIENT + Root: $symbolic + LineEnd: unix + View: //depot/... //$P4CLIENT/... + EOF + git p4 clone --dest="$git" //depot && + cd "$git" && + test_commit file2 && + git config git-p4.skipSubmitEdit true && + git p4 submit + ) +' + test_expect_success 'kill p4d' ' kill_p4d ' diff --git a/t/t9809-git-p4-client-view.sh b/t/t9809-git-p4-client-view.sh index 281be29174..77f63492d9 100755 --- a/t/t9809-git-p4-client-view.sh +++ b/t/t9809-git-p4-client-view.sh @@ -196,7 +196,7 @@ test_expect_success 'exclusion single file' ' test_expect_success 'overlay wildcard' ' client_view "//depot/dir1/... //client/cli/..." \ - "+//depot/dir2/... //client/cli/...\n" && + "+//depot/dir2/... //client/cli/..." && files="cli/file11 cli/file12 cli/file21 cli/file22" && client_verify $files && test_when_finished cleanup_git && @@ -333,7 +333,7 @@ test_expect_success 'subdir clone, submit copy' ' ( cd "$cli" && test_path_is_file dir1/file11a && - test ! -w dir1/file11a + ! is_cli_file_writeable dir1/file11a ) ' @@ -353,7 +353,7 @@ test_expect_success 'subdir clone, submit rename' ' cd "$cli" && test_path_is_missing dir1/file13 && test_path_is_file dir1/file13a && - test ! -w dir1/file13a + ! is_cli_file_writeable dir1/file13a ) ' @@ -365,7 +365,10 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' ' ( cd "$git" && echo git-wild-hash >dir1/git-wild#hash && - echo git-wild-star >dir1/git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + echo git-wild-star >dir1/git-wild\*star + fi && echo git-wild-at >dir1/git-wild@at && echo git-wild-percent >dir1/git-wild%percent && git add dir1/git-wild* && @@ -376,7 +379,10 @@ test_expect_success 'wildcard files submit back to p4, client-spec case' ' ( cd "$cli" && test_path_is_file dir1/git-wild#hash && - test_path_is_file dir1/git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + test_path_is_file dir1/git-wild\*star + fi && test_path_is_file dir1/git-wild@at && test_path_is_file dir1/git-wild%percent ) && diff --git a/t/t9812-git-p4-wildcards.sh b/t/t9812-git-p4-wildcards.sh index 143d413057..67633257f3 100755 --- a/t/t9812-git-p4-wildcards.sh +++ b/t/t9812-git-p4-wildcards.sh @@ -14,7 +14,10 @@ test_expect_success 'add p4 files with wildcards in the names' ' printf "file2\nhas\nsome\nrandom\ntext\n" >file2 && p4 add file2 && echo file-wild-hash >file-wild#hash && - echo file-wild-star >file-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + echo file-wild-star >file-wild\*star + fi && echo file-wild-at >file-wild@at && echo file-wild-percent >file-wild%percent && p4 add -f file-wild* && @@ -28,7 +31,10 @@ test_expect_success 'wildcard files git p4 clone' ' ( cd "$git" && test -f file-wild#hash && - test -f file-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + test -f file-wild\*star + fi && test -f file-wild@at && test -f file-wild%percent ) @@ -40,7 +46,10 @@ test_expect_success 'wildcard files submit back to p4, add' ' ( cd "$git" && echo git-wild-hash >git-wild#hash && - echo git-wild-star >git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + echo git-wild-star >git-wild\*star + fi && echo git-wild-at >git-wild@at && echo git-wild-percent >git-wild%percent && git add git-wild* && @@ -51,7 +60,10 @@ test_expect_success 'wildcard files submit back to p4, add' ' ( cd "$cli" && test_path_is_file git-wild#hash && - test_path_is_file git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + test_path_is_file git-wild\*star + fi && test_path_is_file git-wild@at && test_path_is_file git-wild%percent ) @@ -63,7 +75,10 @@ test_expect_success 'wildcard files submit back to p4, modify' ' ( cd "$git" && echo new-line >>git-wild#hash && - echo new-line >>git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + echo new-line >>git-wild\*star + fi && echo new-line >>git-wild@at && echo new-line >>git-wild%percent && git add git-wild* && @@ -74,7 +89,10 @@ test_expect_success 'wildcard files submit back to p4, modify' ' ( cd "$cli" && test_line_count = 2 git-wild#hash && - test_line_count = 2 git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + test_line_count = 2 git-wild\*star + fi && test_line_count = 2 git-wild@at && test_line_count = 2 git-wild%percent ) @@ -87,7 +105,7 @@ test_expect_success 'wildcard files submit back to p4, copy' ' cd "$git" && cp file2 git-wild-cp#hash && git add git-wild-cp#hash && - cp git-wild\*star file-wild-3 && + cp git-wild#hash file-wild-3 && git add file-wild-3 && git commit -m "wildcard copies" && git config git-p4.detectCopies true && @@ -134,7 +152,10 @@ test_expect_success 'wildcard files submit back to p4, delete' ' ( cd "$cli" && test_path_is_missing git-wild#hash && - test_path_is_missing git-wild\*star && + if test_have_prereq NOT_MINGW NOT_CYGWIN + then + test_path_is_missing git-wild\*star + fi && test_path_is_missing git-wild@at && test_path_is_missing git-wild%percent ) diff --git a/t/t9815-git-p4-submit-fail.sh b/t/t9815-git-p4-submit-fail.sh index d2b7b3d98d..1243d96092 100755 --- a/t/t9815-git-p4-submit-fail.sh +++ b/t/t9815-git-p4-submit-fail.sh @@ -405,8 +405,8 @@ test_expect_success 'cleanup chmod after submit cancel' ' git p4 clone --dest="$git" //depot && ( cd "$git" && - chmod u+x text && - chmod u-x text+x && + test_chmod +x text && + test_chmod -x text+x && git add text text+x && git commit -m "chmod texts" && echo n | test_expect_code 1 git p4 submit @@ -415,10 +415,13 @@ test_expect_success 'cleanup chmod after submit cancel' ' cd "$cli" && test_path_is_file text && ! p4 fstat -T action text && - stat --format=%A text | egrep ^-r-- && test_path_is_file text+x && ! p4 fstat -T action text+x && - stat --format=%A text+x | egrep ^-r-x + if test_have_prereq NOT_CYGWIN + then + stat --format=%A text | egrep ^-r-- && + stat --format=%A text+x | egrep ^-r-x + fi ) ' diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 3cd53f87fb..adc1372b3c 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -13,6 +13,25 @@ complete () return 0 } +# Be careful when updating this list: +# +# (1) The build tree may have build artifact from different branch, or +# the user's $PATH may have a random executable that may begin +# with "git-check" that are not part of the subcommands this build +# will ship, e.g. "check-ignore". The tests for completion for +# subcommand names tests how "check" is expanded; we limit the +# possible candidates to "checkout" and "check-attr" to make sure +# "check-attr", which is known by the filter function as a +# subcommand to be thrown out, while excluding other random files +# that happen to begin with "check" to avoid letting them get in +# the way. +# +# (2) A test makes sure that common subcommands are included in the +# completion for "git <TAB>", and a plumbing is excluded. "add", +# "filter-branch" and "ls-files" are listed for this. + +GIT_TESTING_COMMAND_COMPLETION='add checkout check-attr filter-branch ls-files' + . "$GIT_BUILD_DIR/contrib/completion/git-completion.bash" # We don't need this function to actually join words or do anything special. @@ -196,7 +215,6 @@ test_expect_success 'general options plus command' ' test_completion "git --paginate check" "checkout " && test_completion "git --git-dir=foo check" "checkout " && test_completion "git --bare check" "checkout " && - test_completion "git --help des" "describe " && test_completion "git --exec-path=foo check" "checkout " && test_completion "git --html-path check" "checkout " && test_completion "git --no-pager check" "checkout " && @@ -207,6 +225,11 @@ test_expect_success 'general options plus command' ' test_completion "git --no-replace-objects check" "checkout " ' +test_expect_success 'git --help completion' ' + test_completion "git --help ad" "add " && + test_completion "git --help core" "core-tutorial " +' + test_expect_success 'setup for ref completion' ' echo content >file1 && echo more >file2 && diff --git a/t/t9903-bash-prompt.sh b/t/t9903-bash-prompt.sh index f17c1f8b85..2101d914f2 100755 --- a/t/t9903-bash-prompt.sh +++ b/t/t9903-bash-prompt.sh @@ -360,7 +360,31 @@ test_expect_success 'prompt - dirty status indicator - before root commit' ' test_cmp expected "$actual" ' -test_expect_success 'prompt - dirty status indicator - disabled by config' ' +test_expect_success 'prompt - dirty status indicator - shell variable unset with config disabled' ' + printf " (master)" > expected && + echo "dirty" > file && + test_when_finished "git reset --hard" && + test_config bash.showDirtyState false && + ( + sane_unset GIT_PS1_SHOWDIRTYSTATE && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + +test_expect_success 'prompt - dirty status indicator - shell variable unset with config enabled' ' + printf " (master)" > expected && + echo "dirty" > file && + test_when_finished "git reset --hard" && + test_config bash.showDirtyState true && + ( + sane_unset GIT_PS1_SHOWDIRTYSTATE && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + +test_expect_success 'prompt - dirty status indicator - shell variable set with config disabled' ' printf " (master)" > expected && echo "dirty" > file && test_when_finished "git reset --hard" && @@ -372,6 +396,18 @@ test_expect_success 'prompt - dirty status indicator - disabled by config' ' test_cmp expected "$actual" ' +test_expect_success 'prompt - dirty status indicator - shell variable set with config enabled' ' + printf " (master *)" > expected && + echo "dirty" > file && + test_when_finished "git reset --hard" && + test_config bash.showDirtyState true && + ( + GIT_PS1_SHOWDIRTYSTATE=y && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + test_expect_success 'prompt - dirty status indicator - not shown inside .git directory' ' printf " (GIT_DIR!)" > expected && echo "dirty" > file && @@ -437,6 +473,46 @@ test_expect_success 'prompt - untracked files status indicator - untracked files test_cmp expected "$actual" ' +test_expect_success 'prompt - untracked files status indicator - shell variable unset with config disabled' ' + printf " (master)" > expected && + test_config bash.showUntrackedFiles false && + ( + sane_unset GIT_PS1_SHOWUNTRACKEDFILES && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + +test_expect_success 'prompt - untracked files status indicator - shell variable unset with config enabled' ' + printf " (master)" > expected && + test_config bash.showUntrackedFiles true && + ( + sane_unset GIT_PS1_SHOWUNTRACKEDFILES && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + +test_expect_success 'prompt - untracked files status indicator - shell variable set with config disabled' ' + printf " (master)" > expected && + test_config bash.showUntrackedFiles false && + ( + GIT_PS1_SHOWUNTRACKEDFILES=y && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + +test_expect_success 'prompt - untracked files status indicator - shell variable set with config enabled' ' + printf " (master %%)" > expected && + test_config bash.showUntrackedFiles true && + ( + GIT_PS1_SHOWUNTRACKEDFILES=y && + __git_ps1 > "$actual" + ) && + test_cmp expected "$actual" +' + test_expect_success 'prompt - untracked files status indicator - not shown inside .git directory' ' printf " (GIT_DIR!)" > expected && ( diff --git a/t/test-lib.sh b/t/test-lib.sh index d8ec408dfd..1f510252ad 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -86,7 +86,7 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' PROVE VALGRIND UNZIP - PERF_AGGREGATING_LATER + PERF_ )); my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env); print join("\n", @vars); @@ -666,12 +666,14 @@ case $(uname -s) in # backslashes in pathspec are converted to '/' # exec does not inherit the PID test_set_prereq MINGW + test_set_prereq NOT_CYGWIN test_set_prereq SED_STRIPS_CR ;; *CYGWIN*) test_set_prereq POSIXPERM test_set_prereq EXECKEEPSPID test_set_prereq NOT_MINGW + test_set_prereq CYGWIN test_set_prereq SED_STRIPS_CR ;; *) @@ -679,6 +681,7 @@ case $(uname -s) in test_set_prereq BSLASHPSPEC test_set_prereq EXECKEEPSPID test_set_prereq NOT_MINGW + test_set_prereq NOT_CYGWIN ;; esac @@ -757,3 +760,9 @@ test_lazy_prereq AUTOIDENT ' # When the tests are run as root, permission tests will report that # things are writable when they shouldn't be. test -w / || test_set_prereq SANITY + +GIT_UNZIP=${GIT_UNZIP:-unzip} +test_lazy_prereq UNZIP ' + "$GIT_UNZIP" -v + test $? -ne 127 +' diff --git a/templates/hooks--pre-push.sample b/templates/hooks--pre-push.sample new file mode 100644 index 0000000000..15ab6d8e7e --- /dev/null +++ b/templates/hooks--pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# <local ref> <local sha1> <remote ref> <remote sha1> +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/templates/hooks--update.sample b/templates/hooks--update.sample index 71ab04edc0..d84758373d 100755 --- a/templates/hooks--update.sample +++ b/templates/hooks--update.sample @@ -38,7 +38,7 @@ if [ -z "$GIT_DIR" ]; then fi if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then - echo "Usage: $0 <ref> <oldrev> <newrev>" >&2 + echo "usage: $0 <ref> <oldrev> <newrev>" >&2 exit 1 fi diff --git a/test-chmtime.c b/test-chmtime.c index 92713d16da..02b42badd5 100644 --- a/test-chmtime.c +++ b/test-chmtime.c @@ -114,6 +114,6 @@ int main(int argc, const char *argv[]) return 0; usage: - fprintf(stderr, "Usage: %s %s\n", argv[0], usage_str); + fprintf(stderr, "usage: %s %s\n", argv[0], usage_str); return -1; } diff --git a/test-delta.c b/test-delta.c index af40a3c49e..4595cd6433 100644 --- a/test-delta.c +++ b/test-delta.c @@ -23,7 +23,7 @@ int main(int argc, char *argv[]) unsigned long from_size, data_size, out_size; if (argc != 5 || (strcmp(argv[1], "-d") && strcmp(argv[1], "-p"))) { - fprintf(stderr, "Usage: %s\n", usage_str); + fprintf(stderr, "usage: %s\n", usage_str); return 1; } diff --git a/test-genrandom.c b/test-genrandom.c index b3c28d9a1c..54824d0754 100644 --- a/test-genrandom.c +++ b/test-genrandom.c @@ -12,7 +12,7 @@ int main(int argc, char *argv[]) unsigned char *c; if (argc < 2 || argc > 3) { - fprintf(stderr, "Usage: %s <seed_string> [<size>]\n", argv[0]); + fprintf(stderr, "usage: %s <seed_string> [<size>]\n", argv[0]); return 1; } diff --git a/test-svn-fe.c b/test-svn-fe.c index 0f2d9a4a3d..120ec96b0d 100644 --- a/test-svn-fe.c +++ b/test-svn-fe.c @@ -24,7 +24,7 @@ static int apply_delta(int argc, char *argv[]) die_errno("cannot open preimage"); if (buffer_init(&delta, argv[3])) die_errno("cannot open delta"); - if (svndiff0_apply(&delta, (off_t) strtoull(argv[4], NULL, 0), + if (svndiff0_apply(&delta, (off_t) strtoumax(argv[4], NULL, 0), &preimage_view, stdout)) return 1; if (buffer_deinit(&preimage)) diff --git a/test-wildmatch.c b/test-wildmatch.c index e384c8edb1..a3e2643fbc 100644 --- a/test-wildmatch.c +++ b/test-wildmatch.c @@ -1,9 +1,85 @@ +#ifdef USE_WILDMATCH +#undef USE_WILDMATCH /* We need real fnmatch implementation here */ +#endif #include "cache.h" #include "wildmatch.h" +static int perf(int ac, char **av) +{ + struct timeval tv1, tv2; + struct stat st; + int fd, i, n, flags1 = 0, flags2 = 0; + char *buffer, *p; + uint32_t usec1, usec2; + const char *lang; + const char *file = av[0]; + const char *pattern = av[1]; + + lang = getenv("LANG"); + if (lang && strcmp(lang, "C")) + die("Please test it on C locale."); + + if ((fd = open(file, O_RDONLY)) == -1 || fstat(fd, &st)) + die_errno("file open"); + + buffer = xmalloc(st.st_size + 2); + if (read(fd, buffer, st.st_size) != st.st_size) + die_errno("read"); + + buffer[st.st_size] = '\0'; + buffer[st.st_size + 1] = '\0'; + for (i = 0; i < st.st_size; i++) + if (buffer[i] == '\n') + buffer[i] = '\0'; + + n = atoi(av[2]); + if (av[3] && !strcmp(av[3], "pathname")) { + flags1 = WM_PATHNAME; + flags2 = FNM_PATHNAME; + } + + gettimeofday(&tv1, NULL); + for (i = 0; i < n; i++) { + for (p = buffer; *p; p += strlen(p) + 1) + wildmatch(pattern, p, flags1, NULL); + } + gettimeofday(&tv2, NULL); + + usec1 = (uint32_t)tv2.tv_sec * 1000000 + tv2.tv_usec; + usec1 -= (uint32_t)tv1.tv_sec * 1000000 + tv1.tv_usec; + printf("wildmatch %ds %dus\n", + (int)(usec1 / 1000000), + (int)(usec1 % 1000000)); + + gettimeofday(&tv1, NULL); + for (i = 0; i < n; i++) { + for (p = buffer; *p; p += strlen(p) + 1) + fnmatch(pattern, p, flags2); + } + gettimeofday(&tv2, NULL); + + usec2 = (uint32_t)tv2.tv_sec * 1000000 + tv2.tv_usec; + usec2 -= (uint32_t)tv1.tv_sec * 1000000 + tv1.tv_usec; + if (usec2 > usec1) + printf("fnmatch %ds %dus or %.2f%% slower\n", + (int)((usec2 - usec1) / 1000000), + (int)((usec2 - usec1) % 1000000), + (float)(usec2 - usec1) / usec1 * 100); + else + printf("fnmatch %ds %dus or %.2f%% faster\n", + (int)((usec1 - usec2) / 1000000), + (int)((usec1 - usec2) % 1000000), + (float)(usec1 - usec2) / usec1 * 100); + return 0; +} + int main(int argc, char **argv) { int i; + + if (!strcmp(argv[1], "perf")) + return perf(argc - 2, argv + 2); + for (i = 2; i < argc; i++) { if (argv[i][0] == '/') die("Forward slash is not allowed at the beginning of the\n" @@ -12,9 +88,11 @@ int main(int argc, char **argv) argv[i] += 3; } if (!strcmp(argv[1], "wildmatch")) - return !!wildmatch(argv[3], argv[2], 0); + return !!wildmatch(argv[3], argv[2], WM_PATHNAME, NULL); else if (!strcmp(argv[1], "iwildmatch")) - return !!wildmatch(argv[3], argv[2], FNM_CASEFOLD); + return !!wildmatch(argv[3], argv[2], WM_PATHNAME | WM_CASEFOLD, NULL); + else if (!strcmp(argv[1], "pathmatch")) + return !!wildmatch(argv[3], argv[2], 0, NULL); else if (!strcmp(argv[1], "fnmatch")) return !!fnmatch(argv[3], argv[2], FNM_PATHNAME); else diff --git a/transport-helper.c b/transport-helper.c index 965b778cb3..cb3ef7d38e 100644 --- a/transport-helper.c +++ b/transport-helper.c @@ -666,6 +666,16 @@ static void push_update_ref_status(struct strbuf *buf, free(msg); msg = NULL; } + else if (!strcmp(msg, "fetch first")) { + status = REF_STATUS_REJECT_FETCH_FIRST; + free(msg); + msg = NULL; + } + else if (!strcmp(msg, "needs force")) { + status = REF_STATUS_REJECT_NEEDS_FORCE; + free(msg); + msg = NULL; + } } if (*ref) diff --git a/transport.c b/transport.c index 2673d273ff..eb9eb33e0f 100644 --- a/transport.c +++ b/transport.c @@ -106,7 +106,8 @@ static void insert_packed_refs(const char *packed_refs, struct ref **list) return; for (;;) { - int cmp = cmp, len; + int cmp = 0; /* assigned before used */ + int len; if (!fgets(buffer, sizeof(buffer), f)) { fclose(f); @@ -518,11 +519,9 @@ static int fetch_refs_via_pack(struct transport *transport, int nr_heads, struct ref **to_fetch) { struct git_transport_data *data = transport->data; - struct string_list sought = STRING_LIST_INIT_DUP; const struct ref *refs; char *dest = xstrdup(transport->url); struct fetch_pack_args args; - int i; struct ref *refs_tmp = NULL; memset(&args, 0, sizeof(args)); @@ -536,9 +535,6 @@ static int fetch_refs_via_pack(struct transport *transport, args.no_progress = !transport->progress; args.depth = data->options.depth; - for (i = 0; i < nr_heads; i++) - string_list_append(&sought, to_fetch[i]->name); - if (!data->got_remote_heads) { connect_setup(transport, 0, 0); get_remote_heads(data->fd[0], &refs_tmp, 0, NULL); @@ -547,7 +543,8 @@ static int fetch_refs_via_pack(struct transport *transport, refs = fetch_pack(&args, data->fd, data->conn, refs_tmp ? refs_tmp : transport->remote_refs, - dest, &sought, &transport->pack_lockfile); + dest, to_fetch, nr_heads, + &transport->pack_lockfile); close(data->fd[0]); close(data->fd[1]); if (finish_connect(data->conn)) @@ -557,7 +554,6 @@ static int fetch_refs_via_pack(struct transport *transport, free_refs(refs_tmp); - string_list_clear(&sought, 0); free(dest); return (refs ? 0 : -1); } @@ -659,7 +655,7 @@ static void print_ok_ref_status(struct ref *ref, int porcelain) const char *msg; strcpy(quickref, status_abbrev(ref->old_sha1)); - if (ref->requires_force) { + if (ref->forced_update) { strcat(quickref, "..."); type = '+'; msg = "forced update"; @@ -699,6 +695,14 @@ static int print_one_push_status(struct ref *ref, const char *dest, int count, i print_ref_status('!', "[rejected]", ref, ref->peer_ref, "already exists", porcelain); break; + case REF_STATUS_REJECT_FETCH_FIRST: + print_ref_status('!', "[rejected]", ref, ref->peer_ref, + "fetch first", porcelain); + break; + case REF_STATUS_REJECT_NEEDS_FORCE: + print_ref_status('!', "[rejected]", ref, ref->peer_ref, + "needs force", porcelain); + break; case REF_STATUS_REMOTE_REJECT: print_ref_status('!', "[remote rejected]", ref, ref->deletion ? NULL : ref->peer_ref, @@ -744,12 +748,16 @@ void transport_print_push_status(const char *dest, struct ref *refs, ref->status != REF_STATUS_OK) n += print_one_push_status(ref, dest, n, porcelain); if (ref->status == REF_STATUS_REJECT_NONFASTFORWARD) { - if (!strcmp(head, ref->name)) + if (head != NULL && !strcmp(head, ref->name)) *reject_reasons |= REJECT_NON_FF_HEAD; else *reject_reasons |= REJECT_NON_FF_OTHER; } else if (ref->status == REF_STATUS_REJECT_ALREADY_EXISTS) { *reject_reasons |= REJECT_ALREADY_EXISTS; + } else if (ref->status == REF_STATUS_REJECT_FETCH_FIRST) { + *reject_reasons |= REJECT_FETCH_FIRST; + } else if (ref->status == REF_STATUS_REJECT_NEEDS_FORCE) { + *reject_reasons |= REJECT_NEEDS_FORCE; } } } @@ -1034,6 +1042,62 @@ static void die_with_unpushed_submodules(struct string_list *needs_pushing) die("Aborting."); } +static int run_pre_push_hook(struct transport *transport, + struct ref *remote_refs) +{ + int ret = 0, x; + struct ref *r; + struct child_process proc; + struct strbuf buf; + const char *argv[4]; + + if (!(argv[0] = find_hook("pre-push"))) + return 0; + + argv[1] = transport->remote->name; + argv[2] = transport->url; + argv[3] = NULL; + + memset(&proc, 0, sizeof(proc)); + proc.argv = argv; + proc.in = -1; + + if (start_command(&proc)) { + finish_command(&proc); + return -1; + } + + strbuf_init(&buf, 256); + + for (r = remote_refs; r; r = r->next) { + if (!r->peer_ref) continue; + if (r->status == REF_STATUS_REJECT_NONFASTFORWARD) continue; + if (r->status == REF_STATUS_UPTODATE) continue; + + strbuf_reset(&buf); + strbuf_addf( &buf, "%s %s %s %s\n", + r->peer_ref->name, sha1_to_hex(r->new_sha1), + r->name, sha1_to_hex(r->old_sha1)); + + if (write_in_full(proc.in, buf.buf, buf.len) != buf.len) { + ret = -1; + break; + } + } + + strbuf_release(&buf); + + x = close(proc.in); + if (!ret) + ret = x; + + x = finish_command(&proc); + if (!ret) + ret = x; + + return ret; +} + int transport_push(struct transport *transport, int refspec_nr, const char **refspec, int flags, unsigned int *reject_reasons) @@ -1064,6 +1128,8 @@ int transport_push(struct transport *transport, match_flags |= MATCH_REFS_MIRROR; if (flags & TRANSPORT_PUSH_PRUNE) match_flags |= MATCH_REFS_PRUNE; + if (flags & TRANSPORT_PUSH_FOLLOW_TAGS) + match_flags |= MATCH_REFS_FOLLOW_TAGS; if (match_push_refs(local_refs, &remote_refs, refspec_nr, refspec, match_flags)) { @@ -1074,6 +1140,10 @@ int transport_push(struct transport *transport, flags & TRANSPORT_PUSH_MIRROR, flags & TRANSPORT_PUSH_FORCE); + if (!(flags & TRANSPORT_PUSH_NO_HOOK)) + if (run_pre_push_hook(transport, remote_refs)) + return -1; + if ((flags & TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND) && !is_bare_repository()) { struct ref *ref = remote_refs; for (; ref; ref = ref->next) diff --git a/transport.h b/transport.h index bfd2df5823..9354462708 100644 --- a/transport.h +++ b/transport.h @@ -104,6 +104,8 @@ struct transport { #define TRANSPORT_RECURSE_SUBMODULES_CHECK 64 #define TRANSPORT_PUSH_PRUNE 128 #define TRANSPORT_RECURSE_SUBMODULES_ON_DEMAND 256 +#define TRANSPORT_PUSH_NO_HOOK 512 +#define TRANSPORT_PUSH_FOLLOW_TAGS 1024 #define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3) #define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x) @@ -143,6 +145,8 @@ void transport_set_verbosity(struct transport *transport, int verbosity, #define REJECT_NON_FF_HEAD 0x01 #define REJECT_NON_FF_OTHER 0x02 #define REJECT_ALREADY_EXISTS 0x04 +#define REJECT_FETCH_FIRST 0x08 +#define REJECT_NEEDS_FORCE 0x10 int transport_push(struct transport *connection, int refspec_nr, const char **refspec, int flags, diff --git a/unpack-trees.c b/unpack-trees.c index 0e1a196ace..09e53df3b2 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1020,7 +1020,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options if (!core_apply_sparse_checkout || !o->update) o->skip_sparse_checkout = 1; if (!o->skip_sparse_checkout) { - if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, NULL, &el, 0) < 0) + if (add_excludes_from_file_to_list(git_path("info/sparse-checkout"), "", 0, &el, 0) < 0) o->skip_sparse_checkout = 1; else o->el = ⪙ diff --git a/upload-pack.c b/upload-pack.c index 6142421ea1..f5673ee4c2 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -12,6 +12,7 @@ #include "run-command.h" #include "sigchain.h" #include "version.h" +#include "string-list.h" static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=<n>] <dir>"; @@ -25,13 +26,15 @@ static const char upload_pack_usage[] = "git upload-pack [--strict] [--timeout=< #define SHALLOW (1u << 16) #define NOT_SHALLOW (1u << 17) #define CLIENT_SHALLOW (1u << 18) +#define HIDDEN_REF (1u << 19) static unsigned long oldest_have; -static int multi_ack, nr_our_refs; +static int multi_ack; static int no_done; static int use_thin_pack, use_ofs_delta, use_include_tag; static int no_progress, daemon_mode; +static int allow_tip_sha1_in_want; static int shallow_nr; static struct object_array have_obj; static struct object_array want_obj; @@ -139,7 +142,6 @@ static void create_pack_file(void) { struct async rev_list; struct child_process pack_objects; - int create_full_pack = (nr_our_refs == want_obj.nr && !have_obj.nr); char data[8193], progress[128]; char abort_msg[] = "aborting due to possible repository " "corruption on the remote side."; @@ -151,9 +153,7 @@ static void create_pack_file(void) argv[arg++] = "pack-objects"; if (!shallow_nr) { argv[arg++] = "--revs"; - if (create_full_pack) - argv[arg++] = "--all"; - else if (use_thin_pack) + if (use_thin_pack) argv[arg++] = "--thin"; } @@ -185,15 +185,15 @@ static void create_pack_file(void) } else { FILE *pipe_fd = xfdopen(pack_objects.in, "w"); - if (!create_full_pack) { - int i; - for (i = 0; i < want_obj.nr; i++) - fprintf(pipe_fd, "%s\n", sha1_to_hex(want_obj.objects[i].item->sha1)); - fprintf(pipe_fd, "--not\n"); - for (i = 0; i < have_obj.nr; i++) - fprintf(pipe_fd, "%s\n", sha1_to_hex(have_obj.objects[i].item->sha1)); - } + int i; + for (i = 0; i < want_obj.nr; i++) + fprintf(pipe_fd, "%s\n", + sha1_to_hex(want_obj.objects[i].item->sha1)); + fprintf(pipe_fd, "--not\n"); + for (i = 0; i < have_obj.nr; i++) + fprintf(pipe_fd, "%s\n", + sha1_to_hex(have_obj.objects[i].item->sha1)); fprintf(pipe_fd, "\n"); fflush(pipe_fd); fclose(pipe_fd); @@ -327,9 +327,7 @@ static int got_sha1(char *hex, unsigned char *sha1) if (!has_sha1_file(sha1)) return -1; - o = lookup_object(sha1); - if (!(o && o->parsed)) - o = parse_object(sha1); + o = parse_object(sha1); if (!o) die("oops (%s)", sha1_to_hex(sha1)); if (o->type == OBJ_COMMIT) { @@ -489,6 +487,12 @@ static int get_common_commits(void) } } +static int is_our_ref(struct object *o) +{ + return o->flags & + ((allow_tip_sha1_in_want ? HIDDEN_REF : 0) | OUR_REF); +} + static void check_non_tip(void) { static const char *argv[] = { @@ -525,7 +529,7 @@ static void check_non_tip(void) o = get_indexed_object(--i); if (!o) continue; - if (!(o->flags & OUR_REF)) + if (!is_our_ref(o)) continue; memcpy(namebuf + 1, sha1_to_hex(o->sha1), 40); if (write_in_full(cmd.in, namebuf, 42) < 0) @@ -534,7 +538,7 @@ static void check_non_tip(void) namebuf[40] = '\n'; for (i = 0; i < want_obj.nr; i++) { o = want_obj.objects[i].item; - if (o->flags & OUR_REF) + if (is_our_ref(o)) continue; memcpy(namebuf, sha1_to_hex(o->sha1), 40); if (write_in_full(cmd.in, namebuf, 41) < 0) @@ -568,7 +572,7 @@ error: /* Pick one of them (we know there at least is one) */ for (i = 0; i < want_obj.nr; i++) { o = want_obj.objects[i].item; - if (!(o->flags & OUR_REF)) + if (!is_our_ref(o)) die("git upload-pack: not our ref %s", sha1_to_hex(o->sha1)); } @@ -603,6 +607,8 @@ static void receive_needs(void) object = parse_object(sha1); if (!object) die("did not find object for %s", line); + if (object->type != OBJ_COMMIT) + die("invalid shallow object %s", sha1_to_hex(sha1)); object->flags |= CLIENT_SHALLOW; add_object_array(object, NULL, &shallows); continue; @@ -640,13 +646,13 @@ static void receive_needs(void) if (parse_feature_request(features, "include-tag")) use_include_tag = 1; - o = lookup_object(sha1_buf); + o = parse_object(sha1_buf); if (!o) die("git upload-pack: not our ref %s", sha1_to_hex(sha1_buf)); if (!(o->flags & WANTED)) { o->flags |= WANTED; - if (!(o->flags & OUR_REF)) + if (!is_our_ref(o)) has_non_tip = 1; add_object_array(o, NULL, &want_obj); } @@ -670,10 +676,17 @@ static void receive_needs(void) if (depth == 0 && shallows.nr == 0) return; if (depth > 0) { - struct commit_list *result, *backup; + struct commit_list *result = NULL, *backup = NULL; int i; - backup = result = get_shallow_commits(&want_obj, depth, - SHALLOW, NOT_SHALLOW); + if (depth == INFINITE_DEPTH) + for (i = 0; i < shallows.nr; i++) { + struct object *object = shallows.objects[i].item; + object->flags |= NOT_SHALLOW; + } + else + backup = result = + get_shallow_commits(&want_obj, depth, + SHALLOW, NOT_SHALLOW); while (result) { struct object *object = &result->item->object; if (!(object->flags & (CLIENT_SHALLOW|NOT_SHALLOW))) { @@ -720,45 +733,47 @@ static void receive_needs(void) free(shallows.objects); } +/* return non-zero if the ref is hidden, otherwise 0 */ +static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) +{ + struct object *o = lookup_unknown_object(sha1); + + if (ref_is_hidden(refname)) { + o->flags |= HIDDEN_REF; + return 1; + } + if (!o) + die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); + o->flags |= OUR_REF; + return 0; +} + static int send_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) { static const char *capabilities = "multi_ack thin-pack side-band" " side-band-64k ofs-delta shallow no-progress" " include-tag multi_ack_detailed"; - struct object *o = lookup_unknown_object(sha1); const char *refname_nons = strip_namespace(refname); unsigned char peeled[20]; + if (mark_our_ref(refname, sha1, flag, cb_data)) + return 0; + if (capabilities) - packet_write(1, "%s %s%c%s%s agent=%s\n", + packet_write(1, "%s %s%c%s%s%s agent=%s\n", sha1_to_hex(sha1), refname_nons, 0, capabilities, + allow_tip_sha1_in_want ? " allow-tip-sha1-in-want" : "", stateless_rpc ? " no-done" : "", git_user_agent_sanitized()); else packet_write(1, "%s %s\n", sha1_to_hex(sha1), refname_nons); capabilities = NULL; - if (!(o->flags & OUR_REF)) { - o->flags |= OUR_REF; - nr_our_refs++; - } if (!peel_ref(refname, peeled)) packet_write(1, "%s %s^{}\n", sha1_to_hex(peeled), refname_nons); return 0; } -static int mark_our_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data) -{ - struct object *o = parse_object(sha1); - if (!o) - die("git upload-pack: cannot find object %s:", sha1_to_hex(sha1)); - if (!(o->flags & OUR_REF)) { - o->flags |= OUR_REF; - nr_our_refs++; - } - return 0; -} - static void upload_pack(void) { if (advertise_refs || !stateless_rpc) { @@ -780,6 +795,13 @@ static void upload_pack(void) } } +static int upload_pack_config(const char *var, const char *value, void *unused) +{ + if (!strcmp("uploadpack.allowtipsha1inwant", var)) + allow_tip_sha1_in_want = git_config_bool(var, value); + return parse_hide_refs_config(var, value, "uploadpack"); +} + int main(int argc, char **argv) { char *dir; @@ -831,6 +853,7 @@ int main(int argc, char **argv) die("'%s' does not appear to be a git repository", dir); if (is_repository_shallow()) die("attempt to fetch/clone from a shallow repository"); + git_config(upload_pack_config, NULL); if (getenv("GIT_DEBUG_SEND_PACK")) debug_fd = atoi(getenv("GIT_DEBUG_SEND_PACK")); upload_pack(); diff --git a/userdiff.c b/userdiff.c index ed958ef6b8..ea43a0306f 100644 --- a/userdiff.c +++ b/userdiff.c @@ -184,35 +184,6 @@ static struct userdiff_driver *userdiff_find_by_namelen(const char *k, int len) return NULL; } -static struct userdiff_driver *parse_driver(const char *var, - const char *value, const char *type) -{ - struct userdiff_driver *drv; - const char *dot; - const char *name; - int namelen; - - if (prefixcmp(var, "diff.")) - return NULL; - dot = strrchr(var, '.'); - if (dot == var + 4) - return NULL; - if (strcmp(type, dot+1)) - return NULL; - - name = var + 5; - namelen = dot - name; - drv = userdiff_find_by_namelen(name, namelen); - if (!drv) { - ALLOC_GROW(drivers, ndrivers+1, drivers_alloc); - drv = &drivers[ndrivers++]; - memset(drv, 0, sizeof(*drv)); - drv->name = xmemdupz(name, namelen); - drv->binary = -1; - } - return drv; -} - static int parse_funcname(struct userdiff_funcname *f, const char *k, const char *v, int cflags) { @@ -240,20 +211,34 @@ static int parse_bool(int *b, const char *k, const char *v) int userdiff_config(const char *k, const char *v) { struct userdiff_driver *drv; + const char *name, *type; + int namelen; + + if (parse_config_key(k, "diff", &name, &namelen, &type) || !name) + return 0; + + drv = userdiff_find_by_namelen(name, namelen); + if (!drv) { + ALLOC_GROW(drivers, ndrivers+1, drivers_alloc); + drv = &drivers[ndrivers++]; + memset(drv, 0, sizeof(*drv)); + drv->name = xmemdupz(name, namelen); + drv->binary = -1; + } - if ((drv = parse_driver(k, v, "funcname"))) + if (!strcmp(type, "funcname")) return parse_funcname(&drv->funcname, k, v, 0); - if ((drv = parse_driver(k, v, "xfuncname"))) + if (!strcmp(type, "xfuncname")) return parse_funcname(&drv->funcname, k, v, REG_EXTENDED); - if ((drv = parse_driver(k, v, "binary"))) + if (!strcmp(type, "binary")) return parse_tristate(&drv->binary, k, v); - if ((drv = parse_driver(k, v, "command"))) + if (!strcmp(type, "command")) return git_config_string(&drv->external, k, v); - if ((drv = parse_driver(k, v, "textconv"))) + if (!strcmp(type, "textconv")) return git_config_string(&drv->textconv, k, v); - if ((drv = parse_driver(k, v, "cachetextconv"))) + if (!strcmp(type, "cachetextconv")) return parse_bool(&drv->textconv_want_cache, k, v); - if ((drv = parse_driver(k, v, "wordregex"))) + if (!strcmp(type, "wordregex")) return git_config_string(&drv->word_regex, k, v); return 0; @@ -430,6 +430,27 @@ int same_encoding(const char *src, const char *dst) } /* + * Wrapper for fprintf and returns the total number of columns required + * for the printed string, assuming that the string is utf8. + */ +int utf8_fprintf(FILE *stream, const char *format, ...) +{ + struct strbuf buf = STRBUF_INIT; + va_list arg; + int columns; + + va_start(arg, format); + strbuf_vaddf(&buf, format, arg); + va_end(arg); + + columns = fputs(buf.buf, stream); + if (0 <= columns) /* keep the error from the I/O */ + columns = utf8_strwidth(buf.buf); + strbuf_release(&buf); + return columns; +} + +/* * Given a buffer and its encoding, return it re-encoded * with iconv. If the conversion fails, returns NULL. */ @@ -486,11 +507,66 @@ char *reencode_string(const char *in, const char *out_encoding, const char *in_e if (!in_encoding) return NULL; + conv = iconv_open(out_encoding, in_encoding); - if (conv == (iconv_t) -1) - return NULL; + if (conv == (iconv_t) -1) { + /* + * Some platforms do not have the variously spelled variants of + * UTF-8, so let's fall back to trying the most official + * spelling. We do so only as a fallback in case the platform + * does understand the user's spelling, but not our official + * one. + */ + if (is_encoding_utf8(in_encoding)) + in_encoding = "UTF-8"; + if (is_encoding_utf8(out_encoding)) + out_encoding = "UTF-8"; + conv = iconv_open(out_encoding, in_encoding); + if (conv == (iconv_t) -1) + return NULL; + } + out = reencode_string_iconv(in, strlen(in), conv); iconv_close(conv); return out; } #endif + +/* + * Returns first character length in bytes for multi-byte `text` according to + * `encoding`. + * + * - The `text` pointer is updated to point at the next character. + * - When `remainder_p` is not NULL, on entry `*remainder_p` is how much bytes + * we can consume from text, and on exit `*remainder_p` is reduced by returned + * character length. Otherwise `text` is treated as limited by NUL. + */ +int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding) +{ + int chrlen; + const char *p = *text; + size_t r = (remainder_p ? *remainder_p : SIZE_MAX); + + if (r < 1) + return 0; + + if (is_encoding_utf8(encoding)) { + pick_one_utf8_char(&p, &r); + + chrlen = p ? (p - *text) + : 1 /* not valid UTF-8 -> raw byte sequence */; + } + else { + /* + * TODO use iconv to decode one char and obtain its chrlen + * for now, let's treat encodings != UTF-8 as one-byte + */ + chrlen = 1; + } + + *text += chrlen; + if (remainder_p) + *remainder_p -= chrlen; + + return chrlen; +} @@ -8,6 +8,7 @@ int utf8_strwidth(const char *string); int is_utf8(const char *text); int is_encoding_utf8(const char *name); int same_encoding(const char *, const char *); +int utf8_fprintf(FILE *, const char *, ...); void strbuf_add_wrapped_text(struct strbuf *buf, const char *text, int indent, int indent2, int width); @@ -21,4 +22,6 @@ char *reencode_string(const char *in, const char *out_encoding, const char *in_e #define reencode_string(a,b,c) NULL #endif +int mbs_chrlen(const char **text, size_t *remainder_p, const char *encoding); + #endif diff --git a/wildmatch.c b/wildmatch.c index 2d3ed84364..7192bdc1b8 100644 --- a/wildmatch.c +++ b/wildmatch.c @@ -18,9 +18,6 @@ typedef unsigned char uchar; #define NEGATE_CLASS '!' #define NEGATE_CLASS2 '^' -#define FALSE 0 -#define TRUE 1 - #define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 \ && *(class) == *(litmatch) \ && strncmp((char*)class, litmatch, len) == 0) @@ -55,7 +52,7 @@ typedef unsigned char uchar; #define ISXDIGIT(c) (ISASCII(c) && isxdigit(c)) /* Match pattern "p" against "text" */ -static int dowild(const uchar *p, const uchar *text, int force_lower_case) +static int dowild(const uchar *p, const uchar *text, unsigned int flags) { uchar p_ch; const uchar *pattern = p; @@ -64,10 +61,10 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case) int matched, match_slash, negated; uchar t_ch, prev_ch; if ((t_ch = *text) == '\0' && p_ch != '*') - return ABORT_ALL; - if (force_lower_case && ISUPPER(t_ch)) + return WM_ABORT_ALL; + if ((flags & WM_CASEFOLD) && ISUPPER(t_ch)) t_ch = tolower(t_ch); - if (force_lower_case && ISUPPER(p_ch)) + if ((flags & WM_CASEFOLD) && ISUPPER(p_ch)) p_ch = tolower(p_ch); switch (p_ch) { case '\\': @@ -77,18 +74,21 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case) /* FALLTHROUGH */ default: if (t_ch != p_ch) - return NOMATCH; + return WM_NOMATCH; continue; case '?': /* Match anything but '/'. */ - if (t_ch == '/') - return NOMATCH; + if ((flags & WM_PATHNAME) && t_ch == '/') + return WM_NOMATCH; continue; case '*': if (*++p == '*') { const uchar *prev_p = p - 2; while (*++p == '*') {} - if ((prev_p < pattern || *prev_p == '/') && + if (!(flags & WM_PATHNAME)) + /* without WM_PATHNAME, '*' == '**' */ + match_slash = 1; + else if ((prev_p < pattern || *prev_p == '/') && (*p == '\0' || *p == '/' || (p[0] == '\\' && p[1] == '/'))) { /* @@ -101,135 +101,172 @@ static int dowild(const uchar *p, const uchar *text, int force_lower_case) * both foo/bar and foo/a/bar. */ if (p[0] == '/' && - dowild(p + 1, text, force_lower_case) == MATCH) - return MATCH; - match_slash = TRUE; + dowild(p + 1, text, flags) == WM_MATCH) + return WM_MATCH; + match_slash = 1; } else - return ABORT_MALFORMED; + return WM_ABORT_MALFORMED; } else - match_slash = FALSE; + /* without WM_PATHNAME, '*' == '**' */ + match_slash = flags & WM_PATHNAME ? 0 : 1; if (*p == '\0') { /* Trailing "**" matches everything. Trailing "*" matches * only if there are no more slash characters. */ if (!match_slash) { if (strchr((char*)text, '/') != NULL) - return NOMATCH; + return WM_NOMATCH; } - return MATCH; + return WM_MATCH; + } else if (!match_slash && *p == '/') { + /* + * _one_ asterisk followed by a slash + * with WM_PATHNAME matches the next + * directory + */ + const char *slash = strchr((char*)text, '/'); + if (!slash) + return WM_NOMATCH; + text = (const uchar*)slash; + /* the slash is consumed by the top-level for loop */ + break; } while (1) { if (t_ch == '\0') break; - if ((matched = dowild(p, text, force_lower_case)) != NOMATCH) { - if (!match_slash || matched != ABORT_TO_STARSTAR) + /* + * Try to advance faster when an asterisk is + * followed by a literal. We know in this case + * that the the string before the literal + * must belong to "*". + * If match_slash is false, do not look past + * the first slash as it cannot belong to '*'. + */ + if (!is_glob_special(*p)) { + p_ch = *p; + if ((flags & WM_CASEFOLD) && ISUPPER(p_ch)) + p_ch = tolower(p_ch); + while ((t_ch = *text) != '\0' && + (match_slash || t_ch != '/')) { + if ((flags & WM_CASEFOLD) && ISUPPER(t_ch)) + t_ch = tolower(t_ch); + if (t_ch == p_ch) + break; + text++; + } + if (t_ch != p_ch) + return WM_NOMATCH; + } + if ((matched = dowild(p, text, flags)) != WM_NOMATCH) { + if (!match_slash || matched != WM_ABORT_TO_STARSTAR) return matched; } else if (!match_slash && t_ch == '/') - return ABORT_TO_STARSTAR; + return WM_ABORT_TO_STARSTAR; t_ch = *++text; } - return ABORT_ALL; + return WM_ABORT_ALL; case '[': p_ch = *++p; #ifdef NEGATE_CLASS2 if (p_ch == NEGATE_CLASS2) p_ch = NEGATE_CLASS; #endif - /* Assign literal TRUE/FALSE because of "matched" comparison. */ - negated = p_ch == NEGATE_CLASS? TRUE : FALSE; + /* Assign literal 1/0 because of "matched" comparison. */ + negated = p_ch == NEGATE_CLASS ? 1 : 0; if (negated) { /* Inverted character class. */ p_ch = *++p; } prev_ch = 0; - matched = FALSE; + matched = 0; do { if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; if (p_ch == '\\') { p_ch = *++p; if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; if (t_ch == p_ch) - matched = TRUE; + matched = 1; } else if (p_ch == '-' && prev_ch && p[1] && p[1] != ']') { p_ch = *++p; if (p_ch == '\\') { p_ch = *++p; if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; } if (t_ch <= p_ch && t_ch >= prev_ch) - matched = TRUE; + matched = 1; p_ch = 0; /* This makes "prev_ch" get set to 0. */ } else if (p_ch == '[' && p[1] == ':') { const uchar *s; int i; for (s = p += 2; (p_ch = *p) && p_ch != ']'; p++) {} /*SHARED ITERATOR*/ if (!p_ch) - return ABORT_ALL; + return WM_ABORT_ALL; i = p - s - 1; if (i < 0 || p[-1] != ':') { /* Didn't find ":]", so treat like a normal set. */ p = s - 2; p_ch = '['; if (t_ch == p_ch) - matched = TRUE; + matched = 1; continue; } if (CC_EQ(s,i, "alnum")) { if (ISALNUM(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "alpha")) { if (ISALPHA(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "blank")) { if (ISBLANK(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "cntrl")) { if (ISCNTRL(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "digit")) { if (ISDIGIT(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "graph")) { if (ISGRAPH(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "lower")) { if (ISLOWER(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "print")) { if (ISPRINT(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "punct")) { if (ISPUNCT(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "space")) { if (ISSPACE(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "upper")) { if (ISUPPER(t_ch)) - matched = TRUE; + matched = 1; } else if (CC_EQ(s,i, "xdigit")) { if (ISXDIGIT(t_ch)) - matched = TRUE; + matched = 1; } else /* malformed [:class:] string */ - return ABORT_ALL; + return WM_ABORT_ALL; p_ch = 0; /* This makes "prev_ch" get set to 0. */ } else if (t_ch == p_ch) - matched = TRUE; + matched = 1; } while (prev_ch = p_ch, (p_ch = *++p) != ']'); - if (matched == negated || t_ch == '/') - return NOMATCH; + if (matched == negated || + ((flags & WM_PATHNAME) && t_ch == '/')) + return WM_NOMATCH; continue; } } - return *text ? NOMATCH : MATCH; + return *text ? WM_NOMATCH : WM_MATCH; } /* Match the "pattern" against the "text" string. */ -int wildmatch(const char *pattern, const char *text, int flags) +int wildmatch(const char *pattern, const char *text, + unsigned int flags, struct wildopts *wo) { - return dowild((const uchar*)pattern, (const uchar*)text, - flags & FNM_CASEFOLD ? 1 :0); + return dowild((const uchar*)pattern, (const uchar*)text, flags); } diff --git a/wildmatch.h b/wildmatch.h index 984a38cdc2..4090c8f4bb 100644 --- a/wildmatch.h +++ b/wildmatch.h @@ -1,9 +1,18 @@ -/* wildmatch.h */ +#ifndef WILDMATCH_H +#define WILDMATCH_H -#define ABORT_MALFORMED 2 -#define NOMATCH 1 -#define MATCH 0 -#define ABORT_ALL -1 -#define ABORT_TO_STARSTAR -2 +#define WM_CASEFOLD 1 +#define WM_PATHNAME 2 -int wildmatch(const char *pattern, const char *text, int flags); +#define WM_ABORT_MALFORMED 2 +#define WM_NOMATCH 1 +#define WM_MATCH 0 +#define WM_ABORT_ALL -1 +#define WM_ABORT_TO_STARSTAR -2 + +struct wildopts; + +int wildmatch(const char *pattern, const char *text, + unsigned int flags, + struct wildopts *wo); +#endif diff --git a/wt-status.c b/wt-status.c index 2a9658bad4..54f4391f9c 100644 --- a/wt-status.c +++ b/wt-status.c @@ -45,7 +45,7 @@ static void status_vprintf(struct wt_status *s, int at_bol, const char *color, strbuf_vaddf(&sb, fmt, ap); if (!sb.len) { - strbuf_addch(&sb, '#'); + strbuf_addch(&sb, comment_line_char); if (!trail) strbuf_addch(&sb, ' '); color_print_strbuf(s->fp, color, &sb); @@ -59,7 +59,7 @@ static void status_vprintf(struct wt_status *s, int at_bol, const char *color, strbuf_reset(&linebuf); if (at_bol) { - strbuf_addch(&linebuf, '#'); + strbuf_addch(&linebuf, comment_line_char); if (*line != '\n' && *line != '\t') strbuf_addch(&linebuf, ' '); } @@ -264,7 +264,7 @@ static void wt_status_print_change_data(struct wt_status *s, { struct wt_status_change_data *d = it->util; const char *c = color(change_type, s); - int status = status; + int status; char *one_name; char *two_name; const char *one, *two; @@ -292,6 +292,9 @@ static void wt_status_print_change_data(struct wt_status *s, } status = d->worktree_status; break; + default: + die("BUG: unhandled change_type %d in wt_status_print_change_data", + change_type); } one = quote_path(one_name, -1, &onebuf, s->prefix); @@ -496,9 +499,14 @@ static void wt_status_collect_untracked(struct wt_status *s) { int i; struct dir_struct dir; + struct timeval t_begin; if (!s->show_untracked_files) return; + + if (advice_status_u_option) + gettimeofday(&t_begin, NULL); + memset(&dir, 0, sizeof(dir)); if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES) dir.flags |= @@ -516,7 +524,9 @@ static void wt_status_collect_untracked(struct wt_status *s) if (s->show_ignored_files) { dir.nr = 0; - dir.flags = DIR_SHOW_IGNORED | DIR_SHOW_OTHER_DIRECTORIES; + dir.flags = DIR_SHOW_IGNORED; + if (s->show_untracked_files != SHOW_ALL_UNTRACKED_FILES) + dir.flags |= DIR_SHOW_OTHER_DIRECTORIES; fill_directory(&dir, s->pathspec); for (i = 0; i < dir.nr; i++) { struct dir_entry *ent = dir.entries[i]; @@ -528,6 +538,14 @@ static void wt_status_collect_untracked(struct wt_status *s) } free(dir.entries); + + if (advice_status_u_option) { + struct timeval t_end; + gettimeofday(&t_end, NULL); + s->untracked_in_ms = + (uint64_t)t_end.tv_sec * 1000 + t_end.tv_usec / 1000 - + ((uint64_t)t_begin.tv_sec * 1000 + t_begin.tv_usec / 1000); + } } void wt_status_collect(struct wt_status *s) @@ -760,8 +778,10 @@ static void wt_status_print_tracking(struct wt_status *s) for (cp = sb.buf; (ep = strchr(cp, '\n')) != NULL; cp = ep + 1) color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), - "# %.*s", (int)(ep - cp), cp); - color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "#"); + "%c %.*s", comment_line_char, + (int)(ep - cp), cp); + color_fprintf_ln(s->fp, color(WT_STATUS_HEADER, s), "%c", + comment_line_char); } static int has_unmerged(struct wt_status *s) @@ -870,7 +890,14 @@ static void show_rebase_in_progress(struct wt_status *s, struct stat st; if (has_unmerged(s)) { - status_printf_ln(s, color, _("You are currently rebasing.")); + if (state->branch) + status_printf_ln(s, color, + _("You are currently rebasing branch '%s' on '%s'."), + state->branch, + state->onto); + else + status_printf_ln(s, color, + _("You are currently rebasing.")); if (advice_status_hints) { status_printf_ln(s, color, _(" (fix conflicts and then run \"git rebase --continue\")")); @@ -880,17 +907,38 @@ static void show_rebase_in_progress(struct wt_status *s, _(" (use \"git rebase --abort\" to check out the original branch)")); } } else if (state->rebase_in_progress || !stat(git_path("MERGE_MSG"), &st)) { - status_printf_ln(s, color, _("You are currently rebasing.")); + if (state->branch) + status_printf_ln(s, color, + _("You are currently rebasing branch '%s' on '%s'."), + state->branch, + state->onto); + else + status_printf_ln(s, color, + _("You are currently rebasing.")); if (advice_status_hints) status_printf_ln(s, color, _(" (all conflicts fixed: run \"git rebase --continue\")")); } else if (split_commit_in_progress(s)) { - status_printf_ln(s, color, _("You are currently splitting a commit during a rebase.")); + if (state->branch) + status_printf_ln(s, color, + _("You are currently splitting a commit while rebasing branch '%s' on '%s'."), + state->branch, + state->onto); + else + status_printf_ln(s, color, + _("You are currently splitting a commit during a rebase.")); if (advice_status_hints) status_printf_ln(s, color, _(" (Once your working directory is clean, run \"git rebase --continue\")")); } else { - status_printf_ln(s, color, _("You are currently editing a commit during a rebase.")); + if (state->branch) + status_printf_ln(s, color, + _("You are currently editing a commit while rebasing branch '%s' on '%s'."), + state->branch, + state->onto); + else + status_printf_ln(s, color, + _("You are currently editing a commit during a rebase.")); if (advice_status_hints && !s->amend) { status_printf_ln(s, color, _(" (use \"git commit --amend\" to amend the current commit)")); @@ -921,16 +969,57 @@ static void show_bisect_in_progress(struct wt_status *s, struct wt_status_state *state, const char *color) { - status_printf_ln(s, color, _("You are currently bisecting.")); + if (state->branch) + status_printf_ln(s, color, + _("You are currently bisecting branch '%s'."), + state->branch); + else + status_printf_ln(s, color, + _("You are currently bisecting.")); if (advice_status_hints) status_printf_ln(s, color, _(" (use \"git bisect reset\" to get back to the original branch)")); wt_status_print_trailer(s); } +/* + * Extract branch information from rebase/bisect + */ +static void read_and_strip_branch(struct strbuf *sb, + const char **branch, + const char *path) +{ + unsigned char sha1[20]; + + strbuf_reset(sb); + if (strbuf_read_file(sb, git_path("%s", path), 0) <= 0) + return; + + while (sb->len && sb->buf[sb->len - 1] == '\n') + strbuf_setlen(sb, sb->len - 1); + if (!sb->len) + return; + if (!prefixcmp(sb->buf, "refs/heads/")) + *branch = sb->buf + strlen("refs/heads/"); + else if (!prefixcmp(sb->buf, "refs/")) + *branch = sb->buf; + else if (!get_sha1_hex(sb->buf, sha1)) { + const char *abbrev; + abbrev = find_unique_abbrev(sha1, DEFAULT_ABBREV); + strbuf_reset(sb); + strbuf_addstr(sb, abbrev); + *branch = sb->buf; + } else if (!strcmp(sb->buf, "detached HEAD")) /* rebase */ + ; + else /* bisect */ + *branch = sb->buf; +} + static void wt_status_print_state(struct wt_status *s) { const char *state_color = color(WT_STATUS_HEADER, s); + struct strbuf branch = STRBUF_INIT; + struct strbuf onto = STRBUF_INIT; struct wt_status_state state; struct stat st; @@ -945,17 +1034,28 @@ static void wt_status_print_state(struct wt_status *s) state.am_empty_patch = 1; } else { state.rebase_in_progress = 1; + read_and_strip_branch(&branch, &state.branch, + "rebase-apply/head-name"); + read_and_strip_branch(&onto, &state.onto, + "rebase-apply/onto"); } } else if (!stat(git_path("rebase-merge"), &st)) { if (!stat(git_path("rebase-merge/interactive"), &st)) state.rebase_interactive_in_progress = 1; else state.rebase_in_progress = 1; + read_and_strip_branch(&branch, &state.branch, + "rebase-merge/head-name"); + read_and_strip_branch(&onto, &state.onto, + "rebase-merge/onto"); } else if (!stat(git_path("CHERRY_PICK_HEAD"), &st)) { state.cherry_pick_in_progress = 1; } - if (!stat(git_path("BISECT_LOG"), &st)) + if (!stat(git_path("BISECT_LOG"), &st)) { state.bisect_in_progress = 1; + read_and_strip_branch(&branch, &state.branch, + "BISECT_START"); + } if (state.merge_in_progress) show_merge_in_progress(s, &state, state_color); @@ -967,6 +1067,8 @@ static void wt_status_print_state(struct wt_status *s) show_cherry_pick_in_progress(s, &state, state_color); if (state.bisect_in_progress) show_bisect_in_progress(s, &state, state_color); + strbuf_release(&branch); + strbuf_release(&onto); } void wt_status_print(struct wt_status *s) @@ -1011,6 +1113,18 @@ void wt_status_print(struct wt_status *s) wt_status_print_other(s, &s->untracked, _("Untracked files"), "add"); if (s->show_ignored_files) wt_status_print_other(s, &s->ignored, _("Ignored files"), "add -f"); + if (advice_status_u_option && 2000 < s->untracked_in_ms) { + status_printf_ln(s, GIT_COLOR_NORMAL, ""); + status_printf_ln(s, GIT_COLOR_NORMAL, + _("It took %.2f seconds to enumerate untracked files." + " 'status -uno'"), + s->untracked_in_ms / 1000.0); + status_printf_ln(s, GIT_COLOR_NORMAL, + _("may speed it up, but you have to be careful not" + " to forget to add")); + status_printf_ln(s, GIT_COLOR_NORMAL, + _("new files yourself (see 'git help status').")); + } } else if (s->commitable) status_printf_ln(s, GIT_COLOR_NORMAL, _("Untracked files not listed%s"), advice_status_hints diff --git a/wt-status.h b/wt-status.h index 236b41fd34..74208c06fd 100644 --- a/wt-status.h +++ b/wt-status.h @@ -69,6 +69,7 @@ struct wt_status { struct string_list change; struct string_list untracked; struct string_list ignored; + uint32_t untracked_in_ms; }; struct wt_status_state { @@ -79,6 +80,8 @@ struct wt_status_state { int rebase_interactive_in_progress; int cherry_pick_in_progress; int bisect_in_progress; + const char *branch; + const char *onto; }; void wt_status_prepare(struct wt_status *s); |